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

startbuild should use new build invocation now.

Browse Source
This commit is contained in:
David Anderson 2009-08-29 20:01:32 -07:00
parent 6e264b6eea
commit 54a7aa1116
2 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tools/buildbot/bootstrap.pl
View File

@ -51,8 +51,6 @@ if ($reconf) {
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!');
} }
} }
@ -68,3 +66,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);
} }