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

Fixed various bugs in new build scripts.

Browse Source
This commit is contained in:
David Anderson 2009-08-29 20:49:33 -07:00
parent 9e24d6e53f
commit 482ee315b7
3 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
extensions/curl/AMBuilder
View File

@ -59,7 +59,8 @@ elif AMBuild.target['platform'] == 'windows':
'lib', 'lib',
'LIB-Release', 'LIB-Release',
'libcurl.lib') 'libcurl.lib')
binary.RelinkIfNewer(path) if os.path.isfile(path):
binary.RelinkIfNewer(path)
binary['POSTLINKFLAGS'].extend([path, 'ws2_32.lib']) binary['POSTLINKFLAGS'].extend([path, 'ws2_32.lib'])
SM.AutoVersion('extensions/curl', binary) SM.AutoVersion('extensions/curl', binary)

2
tools/buildbot/bootstrap.pl
View File

@ -49,7 +49,7 @@ if ($reconf) {
$result = `C:\\Python31\\Python.exe ..\\build\\configure.py --enable-optimize`; $result = `C:\\Python31\\Python.exe ..\\build\\configure.py --enable-optimize`;
} }
print "$result\n"; print "$result\n";
if ($? == -1) { if ($? != 0) {
die('Could not configure!'); die('Could not configure!');
} }
} }

15
tools/buildbot/startbuild.pl
View File

@ -11,23 +11,16 @@ require 'helpers.pm';
chdir('../../../OUTPUT'); chdir('../../../OUTPUT');
if ($^O eq "linux") { if ($^O eq "linux") {
system("python3.1 build.py"); $output = `python3.1 build.py 2>&1`;
} else { } else {
system("C:\\Python31\\python.exe build.py"); $output = `C:\\Python31\\python.exe build.py 2>&1`;
} }
print($output);
if ($? == -1) if ($? != 0)
{ {
die "Build failed: $!\n"; die "Build failed: $!\n";
} }
elsif ($^O eq "linux" and $? & 127)
{
die "Build died :(\n";
}
elsif ($? >> 8 != 0)
{
die "Build failed with exit code: " . ($? >> 8) . "\n";
}
else else
{ {
exit(0); exit(0);