From ad8d545a1281e024ee5debeca41a4185d3218fe1 Mon Sep 17 00:00:00 2001 From: "mcafee%netscape.com" Date: Thu, 23 Mar 2000 06:05:10 +0000 Subject: [PATCH] Abstracting a few variables for checkout target. git-svn-id: svn://10.0.0.236/trunk@63830 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/tools/tinderbox/build-seamonkey-util.pl | 15 ++++++++------- mozilla/tools/tinderbox/build-seamonkey.pl | 9 ++++++--- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/mozilla/tools/tinderbox/build-seamonkey-util.pl b/mozilla/tools/tinderbox/build-seamonkey-util.pl index 61d1325af48..696b80a2f71 100644 --- a/mozilla/tools/tinderbox/build-seamonkey-util.pl +++ b/mozilla/tools/tinderbox/build-seamonkey-util.pl @@ -18,15 +18,15 @@ use POSIX qw(sys_wait_h strftime); use Cwd; use File::Basename; # for basename(); use Config; # for $Config{sig_name} and $Config{sig_num} -$::UtilsVersion = '$Revision: 1.11 $ '; +$::UtilsVersion = '$Revision: 1.12 $ '; package TinderUtils; # # Driver script should call into this file like this: -# TinderUtils::InitAndParseArgs() +# TinderUtils::Setup() # tree_specific_overrides() -# TinderUtils::SetupAndBuild($args); +# TinderUtils::Build($args); # sub Setup { @@ -544,8 +544,8 @@ sub BuildIt { PrintEnv(); - unless (-e "mozilla/client.mk") { - run_shell_command "$Settings::CVS $cvsco mozilla/client.mk"; + unless (-e "$TreeSpecific::name/client.mk") { + run_shell_command "$Settings::CVS $cvsco $TreeSpecific::name/client.mk"; } chdir $Settings::Topsrcdir or die "chdir $Settings::Topsrcdir: $!\n"; @@ -556,8 +556,9 @@ sub BuildIt { DeleteBinary($full_binary_name); my $make = "$Settings::Make -f client.mk"; - my $targets = ''; - $targets = 'checkout realclean build' unless $Settings::BuildDepend; + my $targets = $TreeSpecific::checkout_target; + $targets = $TreeSpecific::checkout_clobber_target unless $Settings::BuildDepend; + my $status = run_shell_command "$make $targets"; if ($status != 0) { $build_status = 'busted'; diff --git a/mozilla/tools/tinderbox/build-seamonkey.pl b/mozilla/tools/tinderbox/build-seamonkey.pl index cdd5605156e..ff296fb31e9 100755 --- a/mozilla/tools/tinderbox/build-seamonkey.pl +++ b/mozilla/tools/tinderbox/build-seamonkey.pl @@ -10,9 +10,9 @@ use strict; # "use strict" complains if we do not define these. # They are not initialized here. The default values are after "__END__". -$TreeSpecific::checkout_command = $::Version = undef; +$TreeSpecific::name = $TreeSpecific::checkout_target = $TreeSpecific::checkout_clobber_target = $::Version = undef; -$::Version = '$Revision: 1.93 $ '; +$::Version = '$Revision: 1.94 $ '; { TinderUtils::Setup(); @@ -28,7 +28,10 @@ $::Version = '$Revision: 1.93 $ '; sub tree_specific_overides { $ENV{CVSROOT} = ":pserver:$ENV{USER}%netscape.com\@cvs.mozilla.org:/cvsroot"; - $TreeSpecific::checkout_command = "aaaa"; + $TreeSpecific::name = 'mozilla'; + $TreeSpecific::checkout_target = ''; + $TreeSpecific::checkout_clobber_target = "checkout realclean build"; + }