Allowing 'pull all 1' in the prefs file to turn on pulling for the build scripts. Also change from using $0 to cwd() to enable calling scripts to work better. NOT PART OF THE BUILD

This commit is contained in:
sfraser%netscape.com 2000-10-27 20:42:24 +00:00
Родитель 2e5bc79403
Коммит 28ab9656a4
4 изменённых файлов: 14 добавлений и 11 удалений

Просмотреть файл

@ -224,6 +224,8 @@ sub Checkout($)
unless ( $main::pull{all} ) { return; }
my($start_time) = TimeStart();
# assertRightDirectory();
my($cvsfile) = AskAndPersistFile($main::filepaths{"sessionpath"});
my($session) = Moz::MacCVS->new( $cvsfile );
@ -275,6 +277,8 @@ sub Checkout($)
}
close(CHECKOUT_FILE);
TimeEnd($start_time, "Checkout");
}
@ -301,6 +305,12 @@ sub RunBuild($$$$)
$input_files->{"buildflags"},
$build_prefs);
# If we were told to pull, make sure we do, overriding prefs etc.
if ($do_pull)
{
$main::pull{"all"} = 1;
}
# setup the build log
SetupBuildLog($main::filepaths{"buildlogfilepath"}, $main::USE_TIMESTAMPED_LOGS);
StopForErrors();
@ -311,14 +321,7 @@ sub RunBuild($$$$)
# run a pre-build check to see that the tools etc are in order
DoPrebuildCheck();
if ($do_pull) {
my($start_time) = TimeStart();
Checkout($input_files->{"checkoutdata"});
TimeEnd($start_time, "Checkout");
}
Checkout($input_files->{"checkoutdata"});
unless ($do_build) { return; }

Просмотреть файл

@ -224,7 +224,7 @@ sub PropagateAllFlags($)
my($build_array) = @_;
# if "all" is set, set all the flags to 1
unless ($build_array->[0][0] eq "all") { die "Error: 'all' must come first in the build array\n"; }
unless ($build_array->[0][0] eq "all") { die "Error: 'all' must come first in the flags array\n"; }
if ($build_array->[0][1] == 1)
{

Просмотреть файл

@ -107,7 +107,7 @@ sub SetupBuildRootDir($)
{
my($rel_path_to_script) = @_;
my($cur_dir) = dirname($0);
my($cur_dir) = cwd();
$cur_dir =~ s/$rel_path_to_script$//;
chdir($cur_dir);
$main::MOZ_SRC = cwd();

Просмотреть файл

@ -8,7 +8,7 @@
#-------------------------------------------------------------------------------
pull_flags
all 1
all 0
build_flags
all 1