Fixed various bugs in new build scripts.
This commit is contained in:
parent
9e24d6e53f
commit
482ee315b7
@ -59,7 +59,8 @@ elif AMBuild.target['platform'] == 'windows':
|
||||
'lib',
|
||||
'LIB-Release',
|
||||
'libcurl.lib')
|
||||
binary.RelinkIfNewer(path)
|
||||
if os.path.isfile(path):
|
||||
binary.RelinkIfNewer(path)
|
||||
binary['POSTLINKFLAGS'].extend([path, 'ws2_32.lib'])
|
||||
|
||||
SM.AutoVersion('extensions/curl', binary)
|
||||
|
@ -49,7 +49,7 @@ if ($reconf) {
|
||||
$result = `C:\\Python31\\Python.exe ..\\build\\configure.py --enable-optimize`;
|
||||
}
|
||||
print "$result\n";
|
||||
if ($? == -1) {
|
||||
if ($? != 0) {
|
||||
die('Could not configure!');
|
||||
}
|
||||
}
|
||||
|
@ -11,23 +11,16 @@ require 'helpers.pm';
|
||||
chdir('../../../OUTPUT');
|
||||
|
||||
if ($^O eq "linux") {
|
||||
system("python3.1 build.py");
|
||||
$output = `python3.1 build.py 2>&1`;
|
||||
} 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";
|
||||
}
|
||||
elsif ($^O eq "linux" and $? & 127)
|
||||
{
|
||||
die "Build died :(\n";
|
||||
}
|
||||
elsif ($? >> 8 != 0)
|
||||
{
|
||||
die "Build failed with exit code: " . ($? >> 8) . "\n";
|
||||
}
|
||||
else
|
||||
{
|
||||
exit(0);
|
||||
|
Loading…
Reference in New Issue
Block a user