diff --git a/tools/release/Makefile b/tools/release/Makefile index f048e789ae2..9cf49113222 100644 --- a/tools/release/Makefile +++ b/tools/release/Makefile @@ -23,11 +23,11 @@ stage: chmod -R g+rwxs /home/ftp/pub/firefox chmod -R o+rx /home/ftp/pub # staging environment - mkdir -p /data/cltbld/firefox-2.0.0.11/batch1/stage - # download 2.0.0.10, for l10n verify - cd /data && wget -nv --cut-dirs=3 -np -r -e robots=off http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/2.0.0.10-candidates/rc1/ && mv ftp.mozilla.org/nightly/* /home/ftp/pub/firefox/nightly/ && rm -rfv ftp.mozilla.org - # download 2.0.0.10 release, for update verify - cd /data && wget -nv --cut-dirs=3 -np -r -e robots=off http://releases.mozilla.org/pub/mozilla.org/firefox/releases/2.0.0.10/ && mv releases.mozilla.org/releases/* /home/ftp/pub/firefox/releases/ && rm -rfv releases.mozilla.org + mkdir -p /data/cltbld/firefox-2.0.0.12/batch1/stage + # download 2.0.0.11, for l10n verify + cd /data && wget -nv --cut-dirs=3 -np -r -e robots=off http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/2.0.0.11-candidates/rc1/ && mv ftp.mozilla.org/nightly/* /home/ftp/pub/firefox/nightly/ && rm -rfv ftp.mozilla.org + # download 2.0.0.11 release, for update verify + cd /data && wget -nv --cut-dirs=3 -np -r -e robots=off http://releases.mozilla.org/pub/mozilla.org/firefox/releases/2.0.0.11/ && mv releases.mozilla.org/releases/* /home/ftp/pub/firefox/releases/ && rm -rfv releases.mozilla.org cvsmirror: cvsmirror_mofo cvsmirror_main @@ -37,12 +37,12 @@ cvsmirror_main: rsync -a --delete-after cvs-mirror.mozilla.org::l10n/ /builds/cvsmirror.clean/l10n/ chgrp -R cvs /builds/cvsmirror.clean/cvsroot /builds/cvsmirror.clean/l10n chmod -R g+rw /builds/cvsmirror.clean/cvsroot /builds/cvsmirror.clean/l10n - cvs -d /builds/cvsmirror.clean/cvsroot rtag -d FIREFOX_2_0_0_11_RELEASE mozilla - cvs -d /builds/cvsmirror.clean/cvsroot rtag -d FIREFOX_2_0_0_11_RELEASE_l10n mozilla/tools/tinderbox-configs/ - cvs -d /builds/cvsmirror.clean/cvsroot rtag -d FIREFOX_2_0_0_11_RC1 mozilla - cvs -d /builds/cvsmirror.clean/cvsroot rtag -d FIREFOX_2_0_0_11_RC1_l10n mozilla/tools/tinderbox-configs/ - cvs -d /builds/cvsmirror.clean/l10n rtag -d FIREFOX_2_0_0_11_RELEASE l10n - cvs -d /builds/cvsmirror.clean/l10n rtag -d FIREFOX_2_0_0_11_RC1 l10n + cvs -d /builds/cvsmirror.clean/cvsroot rtag -d FIREFOX_2_0_0_12_RELEASE mozilla + cvs -d /builds/cvsmirror.clean/cvsroot rtag -d FIREFOX_2_0_0_12_RELEASE_l10n mozilla/tools/tinderbox-configs/ + cvs -d /builds/cvsmirror.clean/cvsroot rtag -d FIREFOX_2_0_0_12_RC1 mozilla + cvs -d /builds/cvsmirror.clean/cvsroot rtag -d FIREFOX_2_0_0_12_RC1_l10n mozilla/tools/tinderbox-configs/ + cvs -d /builds/cvsmirror.clean/l10n rtag -d FIREFOX_2_0_0_12_RELEASE l10n + cvs -d /builds/cvsmirror.clean/l10n rtag -d FIREFOX_2_0_0_12_RC1 l10n cvsmirror_mofo: mkdir -p /builds/cvsmirror.clean/tmp/mofo diff --git a/tools/release/configs/fx-moz18-staging-bootstrap.cfg b/tools/release/configs/fx-moz18-staging-bootstrap.cfg index e046b4fe07a..bba66c5c2b3 100644 --- a/tools/release/configs/fx-moz18-staging-bootstrap.cfg +++ b/tools/release/configs/fx-moz18-staging-bootstrap.cfg @@ -1,15 +1,15 @@ -version = 2.0.0.11 -milestone = 1.8.1.11 +version = 2.0.0.12 +milestone = 1.8.1.12 # _RCn and _RELEASE will be appended as-needed -productTag = FIREFOX_2_0_0_11 +productTag = FIREFOX_2_0_0_12 # Branch name and pull dates to use for base tag branchTag = MOZILLA_1_8_BRANCH -RelbranchOverride = GECKO181_20071115_RELBRANCH -pullDate = 2007-12-21 15:05 PST -l10n_pullDate = 2007-12-21 15:05 PST +#RelbranchOverride = GECKO181_20071115_RELBRANCH +pullDate = 2008-01-15 14:20 PST +l10n_pullDate = 2008-01-15 14:20 PST rc = 1 # oldVersion and oldRc refer to the previous release -oldVersion = 2.0.0.10 +oldVersion = 2.0.0.11 oldRc = 1 appName = browser product = firefox