Fixed buildbot Perl scripts for Mac OS X build (bug 5601, r=dvander).
Former-commit-id: 375e91c1d22c5cc2a9107bbc804cbc17794421d4
This commit is contained in:
@@ -14,7 +14,7 @@ chdir(Build::PathFormat('../..'));
|
||||
|
||||
#Do the annoying revision bumping.
|
||||
#Linux needs some help here.
|
||||
if ($^O eq "linux")
|
||||
if ($^O eq "linux" || $^O eq "darwin")
|
||||
{
|
||||
Build::Command("flip -u modules.versions");
|
||||
Build::Command("flip -u support/versionchanger.pl");
|
||||
@@ -26,7 +26,7 @@ my $DEVENV = "C:\\Windows\\Microsoft.NET\\Framework\\v4.0.30319\\MSBuild.exe";
|
||||
|
||||
#Build the amxmodx builder tool.
|
||||
chdir('installer/builder');
|
||||
if ($^O eq "linux") {
|
||||
if ($^O eq "linux" || $^O eq "darwin") {
|
||||
Build::Command("make");
|
||||
} else {
|
||||
Build::Command("\"$DEVENV\" builder.csproj /p:Configuration=Release /t:Rebuild");
|
||||
@@ -45,13 +45,15 @@ Build::Command("mkdir " . Build::PathFormat('../OUTPUT'));
|
||||
open(DIRECTIONS, '>installer/builder/directions.info');
|
||||
if ($^O eq "linux") {
|
||||
print DIRECTIONS "compress = /bin/tar\n";
|
||||
} elsif ($^O eq "darwin") {
|
||||
print DIRECTIONS "compress = /usr/bin/zip\n";
|
||||
} else {
|
||||
print DIRECTIONS "compress = C:\\WINDOWS\\zip.exe\n";
|
||||
}
|
||||
print DIRECTIONS "source = " . Cwd::abs_path('.') . "\n";
|
||||
print DIRECTIONS "makeopts = \n";
|
||||
print DIRECTIONS "output = " . Cwd::abs_path('../OUTPUT') . "\n";
|
||||
if ($^O eq "linux") {
|
||||
if ($^O eq "linux" || $^O eq "darwin") {
|
||||
print DIRECTIONS "devenv = /usr/bin/make\n";
|
||||
} else {
|
||||
print DIRECTIONS "devenv = $DEVENV\n";
|
||||
|
||||
Reference in New Issue
Block a user