Bug 391320, use sysvar for logDir lookups, r=preed
authornrthomas@gmail.com
Fri, 10 Aug 2007 16:30:01 -0700
changeset 4505 1dc2a9b2b3834de38c9c591734810e63fb1ff21a
parent 4504 2629a0f7c7cf6074976b0b2a45efd31171734589
child 4506 0f1b7da7647bda9d9249298ab0c44d4f4cd22f02
push idunknown
push userunknown
push dateunknown
reviewerspreed
bugs391320
milestone1.9a8pre
Bug 391320, use sysvar for logDir lookups, r=preed
tools/release/Bootstrap/Step.pm
tools/release/Bootstrap/Step/Build.pm
tools/release/Bootstrap/Step/PatcherConfig.pm
tools/release/Bootstrap/Step/Repack.pm
tools/release/Bootstrap/Step/Sign.pm
tools/release/Bootstrap/Step/Source.pm
tools/release/Bootstrap/Step/Stage.pm
tools/release/Bootstrap/Step/Tag.pm
tools/release/Bootstrap/Step/Tag/Bump.pm
tools/release/Bootstrap/Step/Tag/Mozilla.pm
tools/release/Bootstrap/Step/Tag/Talkback.pm
tools/release/Bootstrap/Step/Tag/l10n.pm
tools/release/Bootstrap/Step/TinderConfig.pm
tools/release/Bootstrap/Step/Updates.pm
tools/release/configs/fx-moz18-bootstrap.cfg
tools/release/configs/fx-moz180-bootstrap.cfg
tools/release/configs/tb-moz18-bootstrap.cfg
tools/release/configs/tb-moz180-bootstrap.cfg
--- a/tools/release/Bootstrap/Step.pm
+++ b/tools/release/Bootstrap/Step.pm
@@ -35,17 +35,17 @@ sub Shell {
     my $timeout = exists($args{'timeout'}) ? $args{'timeout'} :
      $DEFAULT_TIMEOUT;
     my $ignoreExitValue = exists($args{'ignoreExitValue'}) ? 
      $args{'ignoreExitValue'} : 0;
     my $rv = '';
     my $config = new Bootstrap::Config();
 
     my $logFile = exists($args{'logFile'}) ? $args{'logFile'} : 
-     catfile($config->Get(var => 'logDir'), $DEFAULT_LOGFILE);
+     catfile($config->Get(sysvar => 'logDir'), $DEFAULT_LOGFILE);
 
     if (ref($cmdArgs) ne 'ARRAY') {
         die("ASSERT: Bootstrap::Step::Shell(): cmdArgs is not an array ref\n");
     }
 
     my %runShellCommandArgs = (command => $cmd,
                                args => $cmdArgs,
                                timeout => $timeout,
--- a/tools/release/Bootstrap/Step/Build.pm
+++ b/tools/release/Bootstrap/Step/Build.pm
@@ -10,17 +10,17 @@ use Bootstrap::Step;
 sub Execute {
     my $this = shift;
 
     my $config = new Bootstrap::Config();
     my $buildDir = $config->Get(sysvar => 'buildDir');
     my $productTag = $config->Get(var => 'productTag');
     my $rc = $config->Get(var => 'rc');
     my $buildPlatform = $config->Get(sysvar => 'buildPlatform');
-    my $logDir = $config->Get(var => 'logDir');
+    my $logDir = $config->Get(sysvar => 'logDir');
     my $rcTag = $productTag . '_RC' . $rc;
 
     my $lastBuilt = catfile($buildDir, $buildPlatform, 'last-built');
     if (! unlink($lastBuilt)) {
         $this->Log(msg => "Cannot unlink last-built file $lastBuilt: $!");
     } else {
         $this->Log(msg => "Unlinked $lastBuilt");
     }
@@ -42,17 +42,17 @@ sub Execute {
 sub Verify {
     my $this = shift;
 
     my $config = new Bootstrap::Config();
     my $buildDir = $config->Get(sysvar => 'buildDir');
     my $productTag = $config->Get(var => 'productTag');
     my $rc = $config->Get(var => 'rc');
     my $rcTag = $productTag.'_RC'.$rc;
-    my $logDir = $config->Get(var => 'logDir');
+    my $logDir = $config->Get(sysvar => 'logDir');
 
     my $buildLog = catfile($logDir, 'build_' . $rcTag . '-build.log');
 
     $this->CheckLog(
         log => $buildLog,
         notAllowed => 'tinderbox: status: failed',
     );
 
@@ -69,17 +69,17 @@ sub Verify {
 }
 
 sub Push {
     my $this = shift;
 
     my $config = new Bootstrap::Config();
     my $productTag = $config->Get(var => 'productTag');
     my $rc = $config->Get(var => 'rc');
-    my $logDir = $config->Get(var => 'logDir');
+    my $logDir = $config->Get(sysvar => 'logDir');
     my $sshUser = $config->Get(var => 'sshUser');
     my $sshServer = $config->Get(var => 'sshServer');
 
     my $rcTag = $productTag . '_RC' . $rc;
     my $buildLog = catfile($logDir, 'build_' . $rcTag . '-build.log');
     my $pushLog  = catfile($logDir, 'build_' . $rcTag . '-push.log');
 
     my $logParser = new MozBuild::TinderLogParse(
@@ -122,17 +122,17 @@ sub Push {
 sub Announce {
     my $this = shift;
 
     my $config = new Bootstrap::Config();
     my $product = $config->Get(var => 'product');
     my $productTag = $config->Get(var => 'productTag');
     my $version = $config->Get(var => 'version');
     my $rc = $config->Get(var => 'rc');
-    my $logDir = $config->Get(var => 'logDir');
+    my $logDir = $config->Get(sysvar => 'logDir');
 
     my $rcTag = $productTag . '_RC' . $rc;
     my $buildLog = catfile($logDir, 'build_' . $rcTag . '-build.log');
 
     my $logParser = new MozBuild::TinderLogParse(
         logFile => $buildLog,
     );
     my $buildID = $logParser->GetBuildID();
--- a/tools/release/Bootstrap/Step/PatcherConfig.pm
+++ b/tools/release/Bootstrap/Step/PatcherConfig.pm
@@ -18,17 +18,17 @@ use Bootstrap::Util qw(CvsCatfile GetBou
 use strict;
 
 my $RELEASE_CANDIDATE_CHANNELS = ['beta', 'betatest'];
 
 sub Execute {
     my $this = shift;
 
     my $config = new Bootstrap::Config();
-    my $logDir = $config->Get(var => 'logDir');
+    my $logDir = $config->Get(sysvar => 'logDir');
     my $configBumpDir = $config->Get(var => 'configBumpDir');
     my $version = $config->Get(var => 'version');
     my $oldVersion = $config->Get(var => 'oldVersion');
     my $mofoCvsroot = $config->Get(var => 'mofoCvsroot');
     my $patcherConfig = $config->Get(var => 'patcherConfig');
 
     # Create patcher config area in the config bump area.
     if (not -d $configBumpDir) {
--- a/tools/release/Bootstrap/Step/Repack.pm
+++ b/tools/release/Bootstrap/Step/Repack.pm
@@ -11,17 +11,17 @@ use MozBuild::Util qw(MkdirWithPath);
 
 sub Execute {
     my $this = shift;
 
     my $config = new Bootstrap::Config();
     my $l10n_buildDir = $config->Get(sysvar => 'l10n_buildDir');
     my $productTag = $config->Get(var => 'productTag');
     my $rc = $config->Get(var => 'rc');
-    my $logDir = $config->Get(var => 'logDir');
+    my $logDir = $config->Get(sysvar => 'logDir');
     my $l10n_buildPlatform = $config->Get(sysvar => 'l10n_buildPlatform');
     my $rcTag = $productTag . '_RC' . $rc;
 
     my $buildLog = catfile($logDir, 'repack_' . $rcTag . '-build-l10n.log');
     my $lastBuilt = catfile($l10n_buildDir, $l10n_buildPlatform, 'last-built');
     unlink($lastBuilt) 
       or $this->Log(msg => "Cannot unlink last-built file $lastBuilt: $!");
     $this->Log(msg => "Unlinked $lastBuilt");
@@ -40,17 +40,17 @@ sub Execute {
 sub Verify {
     my $this = shift;
 
     my $config = new Bootstrap::Config();
     my $productTag = $config->Get(var => 'productTag');
     my $product = $config->Get(var => 'product');
     my $rc = $config->Get(var => 'rc');
     my $oldRc = $config->Get(var => 'oldRc');
-    my $logDir = $config->Get(var => 'logDir');
+    my $logDir = $config->Get(sysvar => 'logDir');
     my $version = $config->Get(var => 'version');
     my $oldVersion = $config->Get(var => 'oldVersion');
     my $mozillaCvsroot = $config->Get(var => 'mozillaCvsroot');
     my $verifyDir = $config->Get(var => 'verifyDir');
 
     my $rcTag = $productTag.'_RC'.$rc;
 
     # l10n metadiff test
@@ -162,17 +162,17 @@ sub Verify {
 }
 
 sub Push {
     my $this = shift;
 
     my $config = new Bootstrap::Config();
     my $productTag = $config->Get(var => 'productTag');
     my $rc = $config->Get(var => 'rc');
-    my $logDir = $config->Get(var => 'logDir');  
+    my $logDir = $config->Get(sysvar => 'logDir');  
     my $sshUser = $config->Get(var => 'sshUser');
     my $sshServer = $config->Get(var => 'sshServer');
 
     my $rcTag = $productTag . '_RC' . $rc;
     my $buildLog = catfile($logDir, 'repack_' . $rcTag . '-build-l10n.log');
     my $pushLog  = catfile($logDir, 'repack_' . $rcTag . '-push-l10n.log');
     
     my $logParser = new MozBuild::TinderLogParse(
@@ -215,17 +215,17 @@ sub Push {
 sub Announce {
     my $this = shift;
 
     my $config = new Bootstrap::Config();
     my $product = $config->Get(var => 'product');
     my $productTag = $config->Get(var => 'productTag');
     my $version = $config->Get(var => 'version');
     my $rc = $config->Get(var => 'rc');
-    my $logDir = $config->Get(var => 'logDir');
+    my $logDir = $config->Get(sysvar => 'logDir');
 
     my $rcTag = $productTag . '_RC' . $rc;
     my $buildLog = catfile($logDir, 'repack_' . $rcTag . '-build-l10n.log');
 
     my $logParser = new MozBuild::TinderLogParse(
         logFile => $buildLog,
     );
     my $buildID = $logParser->GetBuildID();
--- a/tools/release/Bootstrap/Step/Sign.pm
+++ b/tools/release/Bootstrap/Step/Sign.pm
@@ -5,30 +5,30 @@ package Bootstrap::Step::Sign;
 use Bootstrap::Step;
 use Bootstrap::Config;
 @ISA = ("Bootstrap::Step");
 
 sub Execute {
     my $this = shift;
 
     my $config = new Bootstrap::Config();
-    my $logDir = $config->Get(var => 'logDir');
+    my $logDir = $config->Get(sysvar => 'logDir');
 
     $this->Shell(
       cmd => 'echo',
       cmdArgs => ['sign'],
       logFile => catfile($logDir, 'sign.log'),
     );
 }
 
 sub Verify {
     my $this = shift;
 
     my $config = new Bootstrap::Config();
-    my $logDir = $config->Get(var => 'logDir');
+    my $logDir = $config->Get(sysvar => 'logDir');
 
     $this->Shell(
       cmd => 'echo',
       cmdArgs => ['Verify sign'],
       logFile => catfile($logDir, 'sign_verify.log'),
     );
 }
 
--- a/tools/release/Bootstrap/Step/Source.pm
+++ b/tools/release/Bootstrap/Step/Source.pm
@@ -12,17 +12,17 @@ use MozBuild::Util qw(MkdirWithPath);
 sub Execute {
     my $this = shift;
 
     my $config = new Bootstrap::Config();
     my $product = $config->Get(var => 'product');
     my $productTag = $config->Get(var => 'productTag');
     my $version = $config->Get(var => 'version');
     my $rc = $config->Get(var => 'rc');
-    my $logDir = $config->Get(var => 'logDir');
+    my $logDir = $config->Get(sysvar => 'logDir');
     my $stageHome = $config->Get(var => 'stageHome');
 
     # create staging area
     my $stageDir = catfile($stageHome, $product . '-' . $version, 
                            'batch-source', 'rc' . $rc);
 
     if (not -d $stageDir) {
         MkdirWithPath(dir => $stageDir) 
@@ -40,17 +40,17 @@ sub Execute {
     move("$stageDir/../*.bz2", $stageDir);
     chmod(0644, glob("$stageDir/*.bz2"));
 }
 
 sub Verify {
     my $this = shift;
 
     my $config = new Bootstrap::Config();
-    my $logDir = $config->Get(var => 'logDir');
+    my $logDir = $config->Get(sysvar => 'logDir');
 
     my $logFile = catfile($logDir, 'source.log');
 
     $this->CheckLog(
         log => $logFile,
         checkFor => '^checkout finish',
     );
 
@@ -62,17 +62,17 @@ sub Verify {
 
 sub Push {
     my $this = shift;
 
     my $config = new Bootstrap::Config();
     my $product = $config->Get(var => 'product');
     my $version = $config->Get(var => 'version');
     my $rc = $config->Get(var => 'rc');
-    my $logDir = $config->Get(var => 'logDir');
+    my $logDir = $config->Get(sysvar => 'logDir');
     my $stageHome = $config->Get(var => 'stageHome');
 
     my $stageDir =  catfile($stageHome, $product . '-' . $version);
     my $candidateDir = catfile('/home', 'ftp', 'pub', $product, 'nightly',
                             $version . '-candidates', 'rc' . $rc ) . '/';
 
     if (not -d $candidateDir) {
         MkdirWithPath(dir => $candidateDir) 
--- a/tools/release/Bootstrap/Step/Stage.pm
+++ b/tools/release/Bootstrap/Step/Stage.pm
@@ -187,17 +187,17 @@ sub GetStageDir {
 
 sub Execute {
     my $this = shift;
 
     my $config = new Bootstrap::Config();
     my $product = $config->Get(var => 'product');
     my $version = $config->Get(var => 'version');
     my $rc = $config->Get(var => 'rc');
-    my $logDir = $config->Get(var => 'logDir');
+    my $logDir = $config->Get(sysvar => 'logDir');
     my $stageHome = $config->Get(var => 'stageHome');
     my $appName = $config->Get(var => 'appName');
     my $mozillaCvsroot = $config->Get(var => 'mozillaCvsroot');
     my $releaseTag = $config->Get(var => 'productTag') . '_RELEASE';
  
     ## Prepare the staging directory for the release.
     # Create the staging directory.
 
@@ -390,17 +390,17 @@ sub Execute {
 }
 
 sub Verify {
     my $this = shift;
 
     my $config = new Bootstrap::Config();
     my $product = $config->Get(var => 'product');
     my $appName = $config->Get(var => 'appName');
-    my $logDir = $config->Get(var => 'logDir');
+    my $logDir = $config->Get(sysvar => 'logDir');
     my $version = $config->Get(var => 'version');
     my $rc = $config->Get(var => 'rc');
     my $stageHome = $config->Get(var => 'stageHome');
     my $productTag = $config->Get(var => 'productTag');
     my $mozillaCvsroot = $config->Get(var => 'mozillaCvsroot');
  
     ## Prepare the staging directory for the release.
     # Create the staging directory.
--- a/tools/release/Bootstrap/Step/Tag.pm
+++ b/tools/release/Bootstrap/Step/Tag.pm
@@ -33,17 +33,17 @@ sub Execute {
     my $config = new Bootstrap::Config();
     my $productTag = $config->Get(var => 'productTag');
     my $rc = $config->Get(var => 'rc');
     my $milestone = $config->Get(var => 'milestone');
     my $tagDir = $config->Get(var => 'tagDir');
     my $mozillaCvsroot = $config->Get(var => 'mozillaCvsroot');
     my $branchTag = $config->Get(var => 'branchTag');
     my $pullDate = $config->Get(var => 'pullDate');
-    my $logDir = $config->Get(var => 'logDir');
+    my $logDir = $config->Get(sysvar => 'logDir');
 
     my $releaseTag = $productTag . '_RELEASE';
     my $rcTag = $productTag . '_RC' . $rc;
     my $releaseTagDir = catfile($tagDir, $releaseTag);
     my $rcTagDir = catfile($tagDir, $rcTag);
 
     # create the main tag directory
     if (not -d $rcTagDir) {
@@ -219,17 +219,17 @@ sub Execute {
         }
     }
 }
 
 sub Verify {
     my $this = shift;
 
     my $config = new Bootstrap::Config();
-    my $logDir = $config->Get(var => 'logDir');
+    my $logDir = $config->Get(sysvar => 'logDir');
 
     # This step doesn't really do anything now, because the verification it used
     # to do (which wasn't much) is now done in the Execute() method, since the
     # biz logic for rc 1 vs. rc > 1 is different.
 }
 
 sub CvsTag {
     my $this = shift;
@@ -251,17 +251,17 @@ sub CvsTag {
      if (!exists($args{'logFile'}));
     my $logFile = $args{'logFile'};
    
     my $branch = exists($args{'branch'}) ? $args{'branch'} : 0;
     my $files = exists($args{'files'}) ? $args{'files'} : [];
     my $force = exists($args{'force'}) ? $args{'force'} : 0;
 
     my $config = new Bootstrap::Config();
-    my $logDir = $config->Get(var => 'logDir');
+    my $logDir = $config->Get(sysvar => 'logDir');
 
     # only force or branch specific files, not the whole tree
     if ($force && scalar(@{$files}) <= 0) {
         die("ASSERT: Bootstrap::Step::Tag::CvsTag(): Cannot specify force without files");
     } elsif ($branch && scalar(@{$files}) <= 0) {
         die("ASSERT: Bootstrap::Step::Tag::CvsTag(): Cannot specify branch without files");
     } elsif ($branch && $force) {
         die("ASSERT: Bootstrap::Step::Tag::CvsTag(): Cannot specify both branch and force");
--- a/tools/release/Bootstrap/Step/Tag/Bump.pm
+++ b/tools/release/Bootstrap/Step/Tag/Bump.pm
@@ -24,17 +24,17 @@ sub Execute {
     my $productTag = $config->Get(var => 'productTag');
     my $branchTag = $config->Get(var => 'branchTag');
     my $pullDate = $config->Get(var => 'pullDate');
     my $version = $config->Get(var => 'version');
     my $rc = int($config->Get(var => 'rc'));
     my $milestone = $config->Exists(var => 'milestone') ? 
      $config->Get(var => 'milestone') : undef;
     my $appName = $config->Get(var => 'appName');
-    my $logDir = $config->Get(var => 'logDir');
+    my $logDir = $config->Get(sysvar => 'logDir');
     my $mozillaCvsroot = $config->Get(var => 'mozillaCvsroot');
     my $tagDir = $config->Get(var => 'tagDir');
     my $geckoBranchTag = $config->Get(var => 'geckoBranchTag');
 
     my $releaseTag = $productTag . '_RELEASE';
     my $rcTag = $productTag . '_RC' . $rc;
 
     my $rcTagDir = catfile($tagDir, $rcTag);
@@ -164,17 +164,17 @@ sub Execute {
       logFile => catfile($logDir, 'tag-bump_checkin.log'),
     );
 }
 
 sub Verify {
     my $this = shift;
 
     my $config = new Bootstrap::Config();
-    my $logDir = $config->Get(var => 'logDir');
+    my $logDir = $config->Get(sysvar => 'logDir');
     my $appName = $config->Get(var => 'appName');
     my $milestone = $config->Exists(var => 'milestone') ? 
      $config->Get(var => 'milestone') : undef;
     my $rc = $config->Get(var => 'rc');
 
     if ($rc > 1) {
         $this->Log(msg => "Skipping Tag::Bump::Verify substep for RC $rc.");
         return;
--- a/tools/release/Bootstrap/Step/Tag/Mozilla.pm
+++ b/tools/release/Bootstrap/Step/Tag/Mozilla.pm
@@ -16,17 +16,17 @@ use strict;
 our @ISA = ("Bootstrap::Step::Tag");
 
 sub Execute {
     my $this = shift;
 
     my $config = new Bootstrap::Config();
     my $productTag = $config->Get(var => 'productTag');
     my $rc = int($config->Get(var => 'rc'));
-    my $logDir = $config->Get(var => 'logDir');
+    my $logDir = $config->Get(sysvar => 'logDir');
     my $mozillaCvsroot = $config->Get(var => 'mozillaCvsroot');
     my $tagDir = $config->Get(var => 'tagDir');
 
     my $releaseTag = $productTag . '_RELEASE';
     my $rcTag = $productTag . '_RC' . $rc;
     my $rcTagDir = catfile($tagDir, $rcTag);
     my $cvsrootTagDir = catfile($rcTagDir, 'cvsroot');
 
@@ -80,17 +80,17 @@ sub Execute {
 
 }
 
 sub Verify {
     my $this = shift;
 
     my $config = new Bootstrap::Config();
     my $productTag = $config->Get(var => 'productTag');
-    my $logDir = $config->Get(var => 'logDir');
+    my $logDir = $config->Get(sysvar => 'logDir');
     my $rc = $config->Get(var => 'rc');
 
     my $releaseTag = $productTag . '_RELEASE';
     my $rcTag = $productTag . '_RC' . $rc;
 
     my @checkTags = ($rcTag);
 
     # If RC > 1 and we took no changes in cvsroot for that RC, the _RELEASE
--- a/tools/release/Bootstrap/Step/Tag/Talkback.pm
+++ b/tools/release/Bootstrap/Step/Tag/Talkback.pm
@@ -19,17 +19,17 @@ our @ISA = ("Bootstrap::Step::Tag");
 sub Execute {
     my $this = shift;
 
     my $config = new Bootstrap::Config();
     my $productTag = $config->Get(var => 'productTag');
     my $branchTag = $config->Get(var => 'branchTag');
     my $rc = int($config->Get(var => 'rc'));
     my $pullDate = $config->Get(var => 'pullDate');
-    my $logDir = $config->Get(var => 'logDir');
+    my $logDir = $config->Get(sysvar => 'logDir');
     my $mofoCvsroot = $config->Get(var => 'mofoCvsroot');
     my $tagDir = $config->Get(var => 'tagDir');
 
     my $releaseTag = $productTag . '_RELEASE';
     my $rcTag = $productTag . '_RC' . $rc;
     my $releaseTagDir = catfile($tagDir, $rcTag);
 
     # Since talkback so seldom changes, we don't include it in our fancy
@@ -63,17 +63,17 @@ sub Execute {
                          'tag-talkback_mofo-tag-' . $releaseTag . '.log'),
     );
 }
 
 sub Verify {
     my $this = shift;
 
     my $config = new Bootstrap::Config();
-    my $logDir = $config->Get(var => 'logDir');
+    my $logDir = $config->Get(sysvar => 'logDir');
     my $productTag = $config->Get(var => 'productTag');
     my $rc = $config->Get(var => 'rc');
 
     if ($rc > 1) {
         $this->Log(msg => "Not verifying Talkback repo for RC $rc.");
         return;
     }
 
--- a/tools/release/Bootstrap/Step/Tag/l10n.pm
+++ b/tools/release/Bootstrap/Step/Tag/l10n.pm
@@ -23,17 +23,17 @@ sub Execute {
 
     my $config = new Bootstrap::Config();
     my $product = $config->Get(var => 'product');
     my $productTag = $config->Get(var => 'productTag');
     my $branchTag = $config->Get(var => 'branchTag');
     my $l10n_pullDate = $config->Get(var => 'l10n_pullDate');
     my $rc = int($config->Get(var => 'rc'));
     my $appName = $config->Get(var => 'appName');
-    my $logDir = $config->Get(var => 'logDir');
+    my $logDir = $config->Get(sysvar => 'logDir');
     my $l10nCvsroot = $config->Get(var => 'l10nCvsroot');
     my $tagDir = $config->Get(var => 'tagDir');
 
     my $releaseTag = $productTag . '_RELEASE';
     my $rcTag = $productTag . '_RC' . $rc;
     my $releaseTagDir = catfile($tagDir, $rcTag);
 
     # Create the l10n tag directory.
@@ -137,17 +137,17 @@ sub Execute {
         $this->CvsTag(%releaseTagArgs); 
     }
 }
 
 sub Verify {
     my $this = shift;
 
     my $config = new Bootstrap::Config();
-    my $logDir = $config->Get(var => 'logDir');
+    my $logDir = $config->Get(sysvar => 'logDir');
     my $productTag = $config->Get(var => 'productTag');
     my $rc = $config->Get(var => 'rc');
 
     my $releaseTag = $productTag . '_RELEASE';
     my $rcTag = $productTag . '_RC' . $rc;
 
     my @checkTags = ($rcTag);
 
--- a/tools/release/Bootstrap/Step/TinderConfig.pm
+++ b/tools/release/Bootstrap/Step/TinderConfig.pm
@@ -16,17 +16,17 @@ sub Execute {
     my $this = shift;
 
     my $config = new Bootstrap::Config();
     my $configBumpDir = $config->Get(var => 'configBumpDir');
     my $productTag = $config->Get(var => 'productTag');
     my $version = $config->Get(var => 'version');
     my $mozillaCvsroot = $config->Get(var => 'mozillaCvsroot');
     my $product = $config->Get(var => 'product');
-    my $logDir = $config->Get(var => 'logDir');
+    my $logDir = $config->Get(sysvar => 'logDir');
     my $branchTag = $config->Get(var => 'branchTag');
     my $osname = $config->SystemInfo(var => 'osname');
 
     my $releaseTag = $productTag . '_RELEASE';
 
     MkdirWithPath(dir => $configBumpDir)
       or die("Cannot mkdir $configBumpDir: $!");
 
@@ -62,17 +62,17 @@ sub Execute {
     }
 }
 
 sub Verify {
     my $this = shift;
 
     my $config = new Bootstrap::Config();
     my $branchTag = $config->Get(var => 'branchTag');
-    my $logDir = $config->Get(var => 'logDir');
+    my $logDir = $config->Get(sysvar => 'logDir');
 
     foreach my $branch ($branchTag . '_release', $branchTag . '_l10n_release') {
         $this->CheckLog(
             log => catfile($logDir, 
              'build_config-checkout-' . $branch . '.log'),
             notAllowed => 'fail',
         );
         $this->CheckLog(
--- a/tools/release/Bootstrap/Step/Updates.pm
+++ b/tools/release/Bootstrap/Step/Updates.pm
@@ -15,17 +15,17 @@ use MozBuild::Util qw(MkdirWithPath);
 
 @ISA = ("Bootstrap::Step");
 
 sub Execute {
     my $this = shift;
 
     my $config = new Bootstrap::Config();
     my $product = $config->Get(var => 'product');
-    my $logDir = $config->Get(var => 'logDir');
+    my $logDir = $config->Get(sysvar => 'logDir');
     my $oldVersion = $config->Get(var => 'oldVersion');
     my $version = $config->Get(var => 'version');
     my $mozillaCvsroot = $config->Get(var => 'mozillaCvsroot');
     my $mofoCvsroot = $config->Get(var => 'mofoCvsroot');
     my $updateDir = $config->Get(var => 'updateDir');
     my $patcherConfig = $config->Get(var => 'patcherConfig');
     my $patcherToolsRev = $config->Get(var => 'patcherToolsRev');
 
@@ -121,17 +121,17 @@ sub Execute {
 	die("Execute: Snippets failed location checks: $snippetErrors\n");
     }
 }
 
 sub Verify {
     my $this = shift;
 
     my $config = new Bootstrap::Config();
-    my $logDir = $config->Get(var => 'logDir');
+    my $logDir = $config->Get(sysvar => 'logDir');
     my $version = $config->Get(var => 'version');
     my $mozillaCvsroot = $config->Get(var => 'mozillaCvsroot');
     my $verifyDir = $config->Get(var => 'verifyDir');
     my $product = $config->Get(var => 'product');
     my $verifyConfig = $config->Get(sysvar => 'verifyConfig');
 
     # Create verification area.
     my $verifyDirVersion = catfile($verifyDir, $product . '-' . $version);
@@ -202,17 +202,17 @@ sub ReleaseBetaAusCallback {
            $snippetErrors .= "\nNon-release: $dir";
     }
 }
 
 sub Push {
     my $this = shift;
 
     my $config = new Bootstrap::Config();
-    my $logDir = $config->Get(var => 'logDir');
+    my $logDir = $config->Get(sysvar => 'logDir');
     my $product = $config->Get(var => 'product');
     my $version = $config->Get(var => 'version');
     my $rc = $config->Get(var => 'rc');
     my $oldVersion = $config->Get(var => 'oldVersion');
     my $sshUser = $config->Get(var => 'sshUser');
     my $sshServer = $config->Get(var => 'sshServer');
     my $ausUser = $config->Get(var => 'ausUser');
     my $ausServer = $config->Get(var => 'ausServer');
--- a/tools/release/configs/fx-moz18-bootstrap.cfg
+++ b/tools/release/configs/fx-moz18-bootstrap.cfg
@@ -19,16 +19,17 @@ product         = firefox
 linux_buildDir       = /builds/tinderbox/Fx-Mozilla1.8-release
 macosx_buildDir      = /builds/tinderbox/Fx-Mozilla1.8-release
 win32_buildDir       = /cygdrive/c/builds/tinderbox/Fx-Mozilla1.8-release
 linux_l10n_buildDir  = /builds/tinderbox/Fx-Mozilla1.8-l10n-release
 macosx_l10n_buildDir = /builds/tinderbox/Fx-Mozilla1.8-l10n-release
 win32_l10n_buildDir  = /cygdrive/c/builds/tinderbox/Fx-Mozilla1.8-l10n-release
 # Absolute path to store bootstrap's logs
 logDir          = /builds/release/logs
+win32_logDir    = /cygdrive/c//builds/release/logs
 mozillaCvsroot  = :ext:cltbld@cvs.mozilla.org:/cvsroot
 l10nCvsroot     = :ext:cltbld@cvs.mozilla.org:/l10n
 mofoCvsroot     = :ext:cltbld@cvs.mozilla.org:/mofo
 # private staging area 
 stageHome       = /data/cltbld
 updateDir       = /builds/updates
 verifyDir       = /builds/verify
 tagDir          = /builds/tags
--- a/tools/release/configs/fx-moz180-bootstrap.cfg
+++ b/tools/release/configs/fx-moz180-bootstrap.cfg
@@ -17,16 +17,17 @@ product         = firefox
 linux_buildDir       = /builds/tinderbox/Fx-Mozilla1.8.0-Release
 macosx_buildDir      = /builds/tinderbox/Fx-Mozilla1.8.0-Release
 win32_buildDir       = /cygdrive/c/builds/tinderbox/Fx-Mozilla1.8.0-Release
 linux_l10n_buildDir  = /builds/tinderbox/Fx-Mozilla1.8.0-l10n-Release
 macosx_l10n_buildDir = /builds/tinderbox/Fx-Mozilla1.8.0-l10n-Release
 win32_l10n_buildDir  = /cygdrive/c/builds/tinderbox/Fx-Mozilla1.8.0-l10n-Release
 # Absolute path to store bootstrap's logs
 logDir          = /builds/release/logs
+win32_logDir    = /cygdrive/c/builds/release/logs
 mozillaCvsroot  = :ext:cltbld@cvs.mozilla.org:/cvsroot
 l10nCvsroot     = :ext:cltbld@cvs.mozilla.org:/l10n
 mofoCvsroot     = :ext:cltbld@cvs.mozilla.org:/mofo
 # private staging area 
 stageHome       = /data/cltbld
 updateDir       = /builds/updates
 verifyDir       = /builds/verify
 tagDir          = /builds/tags
--- a/tools/release/configs/tb-moz18-bootstrap.cfg
+++ b/tools/release/configs/tb-moz18-bootstrap.cfg
@@ -14,16 +14,18 @@ appName              = mail
 product              = thunderbird
 linux_buildDir       = /builds/tinderbox/Tb-Mozilla1.8-Release
 linux_l10n_buildDir  = /builds/tinderbox/Tb-Mozilla1.8-l10n-Release
 macosx_buildDir      = /builds/tinderbox/Tb-Mozilla1.8-Release
 macosx_l10n_buildDir = /builds/tinderbox/Tb-Mozilla1.8-l10n-Release
 win32_buildDir       = /cygdrive/e/builds/tinderbox/Tb-Mozilla1.8-Release
 win32_l10n_buildDir  = /cygdrive/c/builds/tinderbox/Tb-Mozilla1.8-l10n-Release
 logDir               = /builds/release/logs
+# NB this will need to be changed locally on the l10n box
+win32_logDir         = /cygdrive/e/builds/release/logs
 mozillaCvsroot       = :ext:cltbld@cvs.mozilla.org:/cvsroot
 l10nCvsroot          = :ext:cltbld@cvs.mozilla.org:/l10n
 mofoCvsroot          = :ext:cltbld@cvs.mozilla.org:/mofo
 stageHome            = /data/cltbld
 updateDir            = /builds/updates
 verifyDir            = /builds/verify
 tagDir               = /builds/tags
 configBumpDir        = /builds/config
--- a/tools/release/configs/tb-moz180-bootstrap.cfg
+++ b/tools/release/configs/tb-moz180-bootstrap.cfg
@@ -16,16 +16,17 @@ product         = thunderbird
 linux_buildDir       = /builds/tinderbox/Tb-Mozilla1.8.0-Release
 macosx_buildDir      = /builds/tinderbox/Tb-Mozilla1.8.0-Release
 win32_buildDir       = /cygdrive/c/builds/tinderbox/Tb-Mozilla1.8.0-Release
 linux_l10n_buildDir  = /builds/tinderbox/Tb-Mozilla1.8.0-l10n-Release
 macosx_l10n_buildDir = /builds/tinderbox/Tb-Mozilla1.8.0-l10n-Release
 win32_l10n_buildDir  = /cygdrive/c/builds/tinderbox/Tb-Mozilla1.8.0-l10n-Release
 # Absolute path to store bootstrap's logs
 logDir          = /builds/release/logs
+win32_logDir    = /cygdrive/c/builds/release/logs
 mozillaCvsroot  = :ext:cltbld@cvs.mozilla.org:/cvsroot
 l10nCvsroot     = :ext:cltbld@cvs.mozilla.org:/l10n
 mofoCvsroot     = :ext:cltbld@cvs.mozilla.org:/mofo
 # private staging area 
 stageHome       = /data/cltbld
 updateDir       = /builds/updates
 verifyDir       = /builds/verify
 tagDir          = /builds/tags