diff --git a/tools/tinderbox/build-seamonkey-util.pl b/tools/tinderbox/build-seamonkey-util.pl index 422fb4e865f..48f6407be41 100644 --- a/tools/tinderbox/build-seamonkey-util.pl +++ b/tools/tinderbox/build-seamonkey-util.pl @@ -6,6 +6,15 @@ use Sys::Hostname; use POSIX "sys_wait_h"; use Cwd; +sub InitVars { + for (@ARGV) { + # Save DATA section for printing the example. + return if /^--example-config$/; + } + eval while ; # See __END__ section below +} + + sub GetSystemInfo { $OS = `uname -s`; $OSVer = `uname -r`; @@ -95,6 +104,18 @@ sub GetSystemInfo { } } +sub LoadConfig { + if (-r 'tinder-config.pl') { + require 'tinder-config.pl'; + } else { + warn "Error: Need tinderbox config file, tinder-config.pl\n"; + warn " To get started, run the following,\n"; + warn " $0 --example-config > tinder-config.pl\n"; + exit; + } + +} + sub SetupEnv { umask 0; #$ENV{CVSROOT} = ':pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot'; diff --git a/tools/tinderbox/build-seamonkey.pl b/tools/tinderbox/build-seamonkey.pl index 3995854426c..3b58c854baf 100755 --- a/tools/tinderbox/build-seamonkey.pl +++ b/tools/tinderbox/build-seamonkey.pl @@ -10,7 +10,7 @@ use Sys::Hostname; use POSIX "sys_wait_h"; use Cwd; -$Version = '$Revision: 1.40 $ '; +$Version = '$Revision: 1.41 $ '; sub PrintUsage { @@ -91,14 +91,6 @@ sub ParseArgs { &PrintUsage if $BuildTree =~ /^\s+$/i; } -sub InitVars { - for (@ARGV) { - # Save DATA section for printing the example. - return if /^--example-config$/; - } - eval while ; # See __END__ section below -} - sub PrintExampleConfig { print "#- tinder-config.pl - Tinderbox configuration file.\n"; print "#- Uncomment the variables you need to set.\n"; @@ -119,19 +111,6 @@ sub ConditionalArgs { } - -sub LoadConfig { - if (-r 'tinder-config.pl') { - require 'tinder-config.pl'; - } else { - warn "Error: Need tinderbox config file, tinder-config.pl\n"; - warn " To get started, run the following,\n"; - warn " $0 --example-config > tinder-config.pl\n"; - exit; - } - -} - sub BuildIt { my $EarlyExit, $LastTime, $SaveCVSCO, $comptmp;