From e94234ae738363d4cf1217c8dc7b7616904e70e8 Mon Sep 17 00:00:00 2001 From: David Anderson Date: Sat, 29 Aug 2009 20:10:19 -0700 Subject: [PATCH] Builds now occur above source folder. --- tools/buildbot/bootstrap.pl | 11 ++++++----- tools/buildbot/startbuild.pl | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/tools/buildbot/bootstrap.pl b/tools/buildbot/bootstrap.pl index a7d3dcfa..91be959a 100755 --- a/tools/buildbot/bootstrap.pl +++ b/tools/buildbot/bootstrap.pl @@ -10,8 +10,8 @@ chdir($path); require 'helpers.pm'; -#Go back to main source dir. -chdir(Build::PathFormat('../..')); +#Go back above build dir +chdir(Build::PathFormat('../../..')); #Get the source path. our ($root) = getcwd(); @@ -26,7 +26,7 @@ if (!(-d 'OUTPUT')) { if (-d 'OUTPUT/sentinel') { my @s = stat('OUTPUT/sentinel'); my $mtime = $s[9]; - my @files = ('pushbuild.txt', 'AMBuildScript', 'product.version'); + my @files = ('build/pushbuild.txt', 'build/AMBuildScript', 'build/product.version'); my ($i); for ($i = 0; $i <= $#files; $i++) { if (IsNewer($files[$i], $mtime)) { @@ -44,9 +44,9 @@ if ($reconf) { my ($result); print "Attempting to reconfigure...\n"; if ($^O eq "linux") { - $result = `python3.1 ../configure.py --enable-optimize`; + $result = `python3.1 build/configure.py --enable-optimize`; } else { - $result = `C:\\Python31\\Python.exe ..\\configure.py --enable-optimize`; + $result = `C:\\Python31\\Python.exe build\\configure.py --enable-optimize`; } print "$result\n"; if ($? == -1) { @@ -55,6 +55,7 @@ if ($reconf) { } open(FILE, '>OUTPUT/sentinel'); +print FILE "this is nothing.\n"; close(FILE); sub IsNewer diff --git a/tools/buildbot/startbuild.pl b/tools/buildbot/startbuild.pl index cde85c68..d5a491bd 100755 --- a/tools/buildbot/startbuild.pl +++ b/tools/buildbot/startbuild.pl @@ -8,7 +8,7 @@ chdir($path); require 'helpers.pm'; -chdir('../../OUTPUT'); +chdir('../../../OUTPUT'); if ($^O eq "linux") { system("python3.1 build.py");