зеркало из https://github.com/mozilla/pjs.git
BranchTag was being ignored, moving the logic to BuildIt() function.
This commit is contained in:
Родитель
eb17461c0f
Коммит
d2cceda963
|
@ -18,7 +18,7 @@ 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.24 $ ';
|
||||
$::UtilsVersion = '$Revision: 1.25 $ ';
|
||||
|
||||
package TinderUtils;
|
||||
|
||||
|
@ -107,9 +107,6 @@ sub ParseArgs {
|
|||
}
|
||||
}
|
||||
|
||||
# Set up tag stuff.
|
||||
$Settings::CVSCO .= " -r $Settings::BuildTag"
|
||||
unless not defined($Settings::BuildTag) or $Settings::BuildTag eq '';
|
||||
|
||||
|
||||
return $args;
|
||||
|
@ -523,6 +520,11 @@ sub BuildIt {
|
|||
# Bypass profile at startup.
|
||||
$ENV{MOZ_BYPASS_PROFILE_AT_STARTUP} = 1;
|
||||
|
||||
# Set up tag stuff.
|
||||
# Only one tag per file, so -r will override any -D settings.
|
||||
$Settings::CVSCO .= " -r $Settings::BuildTag"
|
||||
unless not defined($Settings::BuildTag) or $Settings::BuildTag eq '';
|
||||
|
||||
print "Starting dir is : $build_dir\n";
|
||||
|
||||
while (not $exit_early) {
|
||||
|
|
Загрузка…
Ссылка в новой задаче