From 7d68e264f307ab1eec83490d10349a6c7459e412 Mon Sep 17 00:00:00 2001 From: "nrthomas@gmail.com" Date: Wed, 11 Mar 2009 17:44:54 -0700 Subject: [PATCH] bug 481079, tb 2.0.0.x needs to bump milestone.txt, r=bhearsum --- tools/release/Bootstrap/Step/Tag/Bump.pm | 5 ++-- tools/release/configs/fx-moz18-bootstrap.cfg | 1 + .../release/configs/fx-moz18-staging-bootstrap.cfg | 1 + tools/release/configs/fx-moz19-bootstrap.cfg | 1 + .../release/configs/fx-moz19-staging-bootstrap.cfg | 1 + tools/release/configs/tb-moz18-bootstrap.cfg | 1 + .../release/configs/tb-moz18-staging-bootstrap.cfg | 31 +++++++++++----------- 7 files changed, 24 insertions(+), 17 deletions(-) diff --git a/tools/release/Bootstrap/Step/Tag/Bump.pm b/tools/release/Bootstrap/Step/Tag/Bump.pm index cd4d2404c..d5db7dc59 100644 --- a/tools/release/Bootstrap/Step/Tag/Bump.pm +++ b/tools/release/Bootstrap/Step/Tag/Bump.pm @@ -34,6 +34,7 @@ sub Execute { my $hgToolsRepo = $config->Get(var => 'hgToolsRepo'); my $tagDir = $config->Get(var => 'tagDir'); my $geckoBranchTag = $config->Get(var => 'geckoBranchTag'); + my $bumpMilestoneTxt = $config->Get(var => 'bumpMilestoneTxt'); my $releaseTag = $productTag . '_RELEASE'; my $buildTag = $productTag . '_BUILD' . $build; @@ -59,8 +60,8 @@ sub Execute { my @bumpFiles = ('client.mk', $moduleVer, $versionTxt); - # milestone changes only occur with Firefox releases - if ($product eq 'firefox') { + # milestone changes based on configuration + if ($bumpMilestoneTxt) { @bumpFiles = (@bumpFiles, $milestoneTxt); } diff --git a/tools/release/configs/fx-moz18-bootstrap.cfg b/tools/release/configs/fx-moz18-bootstrap.cfg index 217b712f1..0c3d9487a 100644 --- a/tools/release/configs/fx-moz18-bootstrap.cfg +++ b/tools/release/configs/fx-moz18-bootstrap.cfg @@ -87,3 +87,4 @@ hgUsername = ffxbld win32_hgSshKey = /home/cltbld/.ssh/ffxbld_dsa linux_hgSshKey = /home/cltbld/.ssh/ffxbld_dsa macosx_hgSshKey = /Users/cltbld/.ssh/ffxbld_dsa +bumpMilestoneTxt = 1 diff --git a/tools/release/configs/fx-moz18-staging-bootstrap.cfg b/tools/release/configs/fx-moz18-staging-bootstrap.cfg index 2f99df39d..84076ff42 100644 --- a/tools/release/configs/fx-moz18-staging-bootstrap.cfg +++ b/tools/release/configs/fx-moz18-staging-bootstrap.cfg @@ -86,3 +86,4 @@ hgUsername = stage-ffxbld win32_hgSshKey = /home/cltbld/.ssh/ffxbld_dsa linux_hgSshKey = /home/cltbld/.ssh/ffxbld_dsa macosx_hgSshKey = /Users/cltbld/.ssh/ffxbld_dsa +bumpMilestoneTxt = 1 diff --git a/tools/release/configs/fx-moz19-bootstrap.cfg b/tools/release/configs/fx-moz19-bootstrap.cfg index 92f5d06ca..34decee43 100644 --- a/tools/release/configs/fx-moz19-bootstrap.cfg +++ b/tools/release/configs/fx-moz19-bootstrap.cfg @@ -90,3 +90,4 @@ hgUsername = ffxbld win32_hgSshKey = /c/Documents and Settings/cltbld/.ssh/ffxbld_dsa linux_hgSshKey = /home/cltbld/.ssh/ffxbld_dsa macosx_hgSshKey = /Users/cltbld/.ssh/ffxbld_dsa +bumpMilestoneTxt = 1 diff --git a/tools/release/configs/fx-moz19-staging-bootstrap.cfg b/tools/release/configs/fx-moz19-staging-bootstrap.cfg index d56f28147..1c70a70aa 100644 --- a/tools/release/configs/fx-moz19-staging-bootstrap.cfg +++ b/tools/release/configs/fx-moz19-staging-bootstrap.cfg @@ -90,3 +90,4 @@ hgUsername = stage-ffxbld win32_hgSshKey = /c/Documents and Settings/cltbld/.ssh/ffxbld_dsa linux_hgSshKey = /home/cltbld/.ssh/ffxbld_dsa macosx_hgSshKey = /Users/cltbld/.ssh/ffxbld_dsa +bumpMilestoneTxt = 1 diff --git a/tools/release/configs/tb-moz18-bootstrap.cfg b/tools/release/configs/tb-moz18-bootstrap.cfg index 4b17a2d61..a3c41aa4a 100644 --- a/tools/release/configs/tb-moz18-bootstrap.cfg +++ b/tools/release/configs/tb-moz18-bootstrap.cfg @@ -79,3 +79,4 @@ hgUsername = ffxbld win32_hgSshKey = /home/cltbld/.ssh/ffxbld_dsa linux_hgSshKey = /home/cltbld/.ssh/ffxbld_dsa macosx_hgSshKey = /Users/cltbld/.ssh/ffxbld_dsa +bumpMilestoneTxt = 1 diff --git a/tools/release/configs/tb-moz18-staging-bootstrap.cfg b/tools/release/configs/tb-moz18-staging-bootstrap.cfg index 0a3ae5412..0c98f4f65 100644 --- a/tools/release/configs/tb-moz18-staging-bootstrap.cfg +++ b/tools/release/configs/tb-moz18-staging-bootstrap.cfg @@ -1,15 +1,15 @@ -version = 2.0.0.13 -milestone = 1.8.1.13 +version = 2.0.0.21 +milestone = 1.8.1.21 # _BUILDn and _RELEASE will be appended as-needed -productTag = THUNDERBIRD_2_0_0_13 +productTag = THUNDERBIRD_2_0_0_21 # Branch name and pull dates to use for base tag branchTag = MOZILLA_1_8_BRANCH #RelbranchOverride = GECKO181_20071115_RELBRANCH -pullDate = 2008-03-09 23:00 PST -l10n_pullDate = 2008-03-09 23:00 PST +pullDate = 2009-03-01 16:14 PST +l10n_pullDate = 2009-03-01 16:14 PST build = 1 # oldVersion and oldRc refer to the previous release -oldVersion = 2.0.0.12 +oldVersion = 2.0.0.19 oldBuild = 1 appName = mail product = thunderbird @@ -24,13 +24,13 @@ win32_l10n_buildDir = /cygdrive/e/builds/tinderbox/Tb-Mozilla1.8-l10n-Release linux_logDir = /builds/logs macosx_logDir = /builds/logs win32_logDir = /builds/logs -sourceDir = /builds/source -mozillaCvsroot = staging-1.8-master.build.mozilla.org:/builds/cvsmirror/cvsroot -l10nCvsroot = staging-1.8-master.build.mozilla.org:/builds/cvsmirror/l10n -mofoCvsroot = staging-1.8-master.build.mozilla.org:/builds/cvsmirror/mofo +mozillaCvsroot = staging-stage.build.mozilla.org:/builds/cvsmirrors/staging-1.8/cvsroot +l10nCvsroot = staging-stage.build.mozilla.org:/builds/cvsmirrors/staging-1.8/l10n +mofoCvsroot = staging-stage.build.mozilla.org:/builds/cvsmirrors/staging-1.8/mofo anonCvsroot = :pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot # private staging area stageHome = /data/cltbld +sourceDir = /builds/source updateDir = /builds/updates verifyDir = /builds/verify tagDir = /builds/tags @@ -45,10 +45,10 @@ macosx_l10n_buildPlatform = Darwin_8.7.0_Depend win32_l10n_buildPlatform = WINNT_5.0_Depend from = staging-bootstrap@mozilla.org to = nrthomas@gmail.com -cc = rtessner@mozillamessaging.com +cc = nobody@mozilla.org patcherConfig = moz18-branch-patcher2.cfg # Tag to use for building MAR/MBSDIFF and other update tools -patcherToolsRev = UPDATE_PACKAGING_R4 +patcherToolsRev = UPDATE_PACKAGING_R7 linux_verifyConfig = moz18-thunderbird-linux.cfg win32_verifyConfig = moz18-thunderbird-win32.cfg macosx_verifyConfig = moz18-thunderbird-mac.cfg @@ -58,8 +58,8 @@ sendmail = /usr/sbin/sendmail dumpLogs = 1 # username and server to push update snippets to ausUser = cltbld -ausServer = staging-1.8-master.build.mozilla.org -ausServerUrl = http://staging-1.8-master.build.mozilla.org +ausServer = staging-stage.build.mozilla.org +ausServerUrl = http://staging-stage.build.mozilla.org # Tinderbox server tree that clients should report to buildTree = MozillaTest # where QA updates/builds go @@ -74,7 +74,7 @@ sshUser = cltbld sshServer = staging-prometheus-vm.build.mozilla.org # force 1.8 specific behavior useTalkback = 0 -symbolServer = staging-1.8-master.build.mozilla.org +symbolServer = staging-stage.build.mozilla.org symbolServerUser = cltbld symbolServerPath = /data/symbols symbolServerKey = /home/cltbld/.ssh/id_rsa @@ -86,3 +86,4 @@ hgUsername = stage-ffxbld win32_hgSshKey = /home/cltbld/.ssh/ffxbld_dsa linux_hgSshKey = /home/cltbld/.ssh/ffxbld_dsa macosx_hgSshKey = /Users/cltbld/.ssh/ffxbld_dsa +bumpMilestoneTxt = 1 -- 2.11.4.GIT