UNLOZE/sourcemod
10
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge.

Browse Source
This commit is contained in:
David Anderson 2009-08-29 20:38:45 -07:00
commit 9e24d6e53f
2 changed files with 20 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tools/buildbot/bootstrap.pl
View File

@ -10,8 +10,8 @@ chdir($path);
require 'helpers.pm'; require 'helpers.pm';
#Go back to main source dir. #Go back above build dir
chdir(Build::PathFormat('../..')); chdir(Build::PathFormat('../../..'));
#Get the source path. #Get the source path.
our ($root) = getcwd(); our ($root) = getcwd();
@ -26,7 +26,7 @@ if (!(-d 'OUTPUT')) {
if (-d 'OUTPUT/sentinel') { if (-d 'OUTPUT/sentinel') {
my @s = stat('OUTPUT/sentinel'); my @s = stat('OUTPUT/sentinel');
my $mtime = $s[9]; my $mtime = $s[9];
my @files = ('pushbuild.txt', 'AMBuildScript', 'product.version'); my @files = ('build/pushbuild.txt', 'build/AMBuildScript', 'build/product.version');
my ($i); my ($i);
for ($i = 0; $i <= $#files; $i++) { for ($i = 0; $i <= $#files; $i++) {
if (IsNewer($files[$i], $mtime)) { if (IsNewer($files[$i], $mtime)) {
@ -44,19 +44,18 @@ if ($reconf) {
my ($result); my ($result);
print "Attempting to reconfigure...\n"; print "Attempting to reconfigure...\n";
if ($^O eq "linux") { if ($^O eq "linux") {
$result = `python3.1 ../configure.py --enable-optimize`; $result = `python3.1 ../build/configure.py --enable-optimize`;
} else { } else {
$result = `C:\\Python31\\Python.exe ..\\configure.py --enable-optimize`; $result = `C:\\Python31\\Python.exe ..\\build\\configure.py --enable-optimize`;
} }
print "$result\n"; print "$result\n";
if ($? == -1) { if ($? == -1) {
die('Could not configure!'); die('Could not configure!');
} elsif ($? >> 8 != 0) {
die('Could not configure!');
} }
} }
open(FILE, '>OUTPUT/sentinel'); open(FILE, '>OUTPUT/sentinel');
print FILE "this is nothing.\n";
close(FILE); close(FILE);
sub IsNewer sub IsNewer
@ -68,3 +67,6 @@ sub IsNewer
return $mtime > $time; return $mtime > $time;
} }
exit(0);

26
tools/buildbot/startbuild.pl
View File

@ -1,4 +1,5 @@
#!/usr/bin/perl #!/usr/bin/perl
# vim: set ts=2 sw=2 tw=99 noet:
use File::Basename; use File::Basename;
@ -7,33 +8,28 @@ chdir($path);
require 'helpers.pm'; require 'helpers.pm';
chdir('..'); chdir('../../../OUTPUT');
chdir('..');
my ($cmd, $output); if ($^O eq "linux") {
system("python3.1 build.py");
$cmd = Build::PathFormat('tools/builder/builder.exe') . ' build.cfg'; # 2>&1'; } else {
system("C:\\Python31\\python.exe build.py");
if ($^O eq "linux")
{
$cmd = 'mono ' . $cmd;
} }
system($cmd);
if ($? == -1) if ($? == -1)
{ {
die "Build failed: $!\n"; die "Build failed: $!\n";
} }
elsif ($^O eq "linux" and $? & 127) elsif ($^O eq "linux" and $? & 127)
{ {
die "Build died :(\n"; die "Build died :(\n";
} }
elsif ($? >> 8 != 0) elsif ($? >> 8 != 0)
{ {
die "Build failed with exit code: " . ($? >> 8) . "\n"; die "Build failed with exit code: " . ($? >> 8) . "\n";
} }
else else
{ {
exit(0); exit(0);
} }