From 54a7aa1116f4cb2f72da959d6b6159097ab214e0 Mon Sep 17 00:00:00 2001 From: David Anderson Date: Sat, 29 Aug 2009 20:01:32 -0700 Subject: [PATCH] startbuild should use new build invocation now. --- tools/buildbot/bootstrap.pl | 5 +++-- tools/buildbot/startbuild.pl | 26 +++++++++++--------------- 2 files changed, 14 insertions(+), 17 deletions(-) diff --git a/tools/buildbot/bootstrap.pl b/tools/buildbot/bootstrap.pl index f4a86256..a7d3dcfa 100755 --- a/tools/buildbot/bootstrap.pl +++ b/tools/buildbot/bootstrap.pl @@ -51,8 +51,6 @@ if ($reconf) { print "$result\n"; if ($? == -1) { die('Could not configure!'); - } elsif ($? >> 8 != 0) { - die('Could not configure!'); } } @@ -68,3 +66,6 @@ sub IsNewer return $mtime > $time; } +exit(0); + + diff --git a/tools/buildbot/startbuild.pl b/tools/buildbot/startbuild.pl index 924e1c93..cde85c68 100755 --- a/tools/buildbot/startbuild.pl +++ b/tools/buildbot/startbuild.pl @@ -1,4 +1,5 @@ #!/usr/bin/perl +# vim: set ts=2 sw=2 tw=99 noet: use File::Basename; @@ -7,33 +8,28 @@ chdir($path); require 'helpers.pm'; -chdir('..'); -chdir('..'); +chdir('../../OUTPUT'); -my ($cmd, $output); - -$cmd = Build::PathFormat('tools/builder/builder.exe') . ' build.cfg'; # 2>&1'; - -if ($^O eq "linux") -{ - $cmd = 'mono ' . $cmd; +if ($^O eq "linux") { + system("python3.1 build.py"); +} else { + system("C:\\Python31\\python.exe build.py"); } -system($cmd); - if ($? == -1) { - die "Build failed: $!\n"; + die "Build failed: $!\n"; } elsif ($^O eq "linux" and $? & 127) { - die "Build died :(\n"; + die "Build died :(\n"; } elsif ($? >> 8 != 0) { - die "Build failed with exit code: " . ($? >> 8) . "\n"; + die "Build failed with exit code: " . ($? >> 8) . "\n"; } else { - exit(0); + exit(0); } +