Bug 391320, use sysvar for logDir lookups, r=preed

tools/release/Bootstrap/Step.pm

@@ -40,7 +40,7 @@ sub Shell {
     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");

tools/release/Bootstrap/Step/Build.pm

@@ -15,7 +15,7 @@ sub Execute {
     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');
@@ -47,7 +47,7 @@ sub Verify {
     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');
 
@@ -74,7 +74,7 @@ sub Push {
     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');
 
@@ -127,7 +127,7 @@ sub Announce {
     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');

tools/release/Bootstrap/Step/PatcherConfig.pm

@@ -23,7 +23,7 @@ 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');

tools/release/Bootstrap/Step/Repack.pm

@@ -16,7 +16,7 @@ sub Execute {
     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;
 
@@ -45,7 +45,7 @@ sub Verify {
     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');
@@ -167,7 +167,7 @@ sub Push {
     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');
 
@@ -220,7 +220,7 @@ sub Announce {
     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');

tools/release/Bootstrap/Step/Sign.pm

@@ -10,7 +10,7 @@ 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',
@@ -23,7 +23,7 @@ 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',

tools/release/Bootstrap/Step/Source.pm

@@ -17,7 +17,7 @@ sub Execute {
     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
@@ -45,7 +45,7 @@ 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');
 
@@ -67,7 +67,7 @@ sub Push {
     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);

tools/release/Bootstrap/Step/Stage.pm

@@ -192,7 +192,7 @@ sub Execute {
     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');
@@ -395,7 +395,7 @@ sub Verify {
     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');

tools/release/Bootstrap/Step/Tag.pm

@@ -38,7 +38,7 @@ sub Execute {
     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;
@@ -224,7 +224,7 @@ 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
@@ -256,7 +256,7 @@ sub CvsTag {
     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) {

tools/release/Bootstrap/Step/Tag/Bump.pm

@@ -29,7 +29,7 @@ sub Execute {
     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');
@@ -169,7 +169,7 @@ 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;

tools/release/Bootstrap/Step/Tag/Mozilla.pm

@@ -21,7 +21,7 @@ sub Execute {
     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');
 
@@ -85,7 +85,7 @@ sub Verify {
 
     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';

tools/release/Bootstrap/Step/Tag/Talkback.pm

@@ -24,7 +24,7 @@ sub Execute {
     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');
 
@@ -68,7 +68,7 @@ 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');
 

tools/release/Bootstrap/Step/Tag/l10n.pm

@@ -28,7 +28,7 @@ sub Execute {
     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');
 
@@ -142,7 +142,7 @@ 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');
 

tools/release/Bootstrap/Step/TinderConfig.pm

@@ -21,7 +21,7 @@ sub Execute {
     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');
 
@@ -67,7 +67,7 @@ sub Verify {
 
     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(

tools/release/Bootstrap/Step/Updates.pm

@@ -20,7 +20,7 @@ sub Execute {
 
     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');
@@ -126,7 +126,7 @@ 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');
@@ -207,7 +207,7 @@ 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');

tools/release/configs/fx-moz18-bootstrap.cfg

@@ -24,6 +24,7 @@ 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

tools/release/configs/fx-moz180-bootstrap.cfg

@@ -22,6 +22,7 @@ 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

tools/release/configs/tb-moz18-bootstrap.cfg

@@ -19,6 +19,8 @@ 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

tools/release/configs/tb-moz180-bootstrap.cfg

@@ -21,6 +21,7 @@ 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