Merge from default production
authorRail Aliiev <rail@mozilla.com>
Thu, 26 Apr 2012 14:02:10 -0400
branchproduction
changeset 5863 2737c8ba94d3a9456fe7096b51759c7477f85ce2
parent 5862 1098a91870d0b921690caaa08e26fbe257ba5cff (current diff)
parent 5861 183ed613452175f4e6c8f57b64a3ecefdbf72724 (diff)
child 5873 394a63c870dec0418a79cd9b9f338debb5fcda12
push id1
push userroot
push dateWed, 17 Dec 2014 00:18:48 +0000
bugs748448, 735393, 744600, 729667, 742131
Merge from default changeset: 5857:5628149a914b parent: 5855:f7dd72bec2da user: John Ford <jhford@mozilla.com> date: Wed Apr 25 11:42:32 2012 -0700 summary: bug 748448 - turn off b2g builds on beta, aurora and release r=catlee changeset: 5858:154ee392ee3f user: Aki Sasaki <asasaki@mozilla.com> date: Wed Apr 25 12:31:01 2012 -0700 summary: bug 735393 - point esr10 multilocale at appropriate config file. r=coop changeset: 5859:fcab65d66e50 tag: THUNDERBIRD_13_0b1_BUILD1 tag: THUNDERBIRD_13_0b1_RELEASE user: Nick Thomas <nthomas@mozilla.com> date: Thu Apr 26 10:08:09 2012 +1200 summary: Bug 744600, release config for Thunderbird 13.0b1, r=jhopkins changeset: 5860:46305c5be1db user: Nick Thomas <nthomas@mozilla.com> date: Thu Apr 26 10:08:24 2012 +1200 summary: Added tag THUNDERBIRD_13_0b1_RELEASE, THUNDERBIRD_13_0b1_BUILD1 for changeset fcab65d66e50 changeset: 5861:183ed6134521 user: Nick Thomas <nthomas@mozilla.com> date: Thu Apr 26 17:18:49 2012 +1200 summary: Bug 729667/742131, fix up host for try symbol uploads, r=bhearsum on the original patch
.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -925,8 +925,10 @@ 14ea154b4ce07969b5211734e62bd043cff6bc96
 14ea154b4ce07969b5211734e62bd043cff6bc96 FENNEC_10_0_4esr_RELEASE
 14ea154b4ce07969b5211734e62bd043cff6bc96 FENNEC_10_0_4esr_BUILD1
 ef3f61f598a603577f5c83975aad1b74c664ee79 THUNDERBIRD_10_0_4esr_RELEASE
 ef3f61f598a603577f5c83975aad1b74c664ee79 THUNDERBIRD_10_0_4esr_BUILD1
 405b2f4373f25883c78afad6fb71198f513c026d FIREFOX_13_0b1_BUILD1
 405b2f4373f25883c78afad6fb71198f513c026d FIREFOX_13_0b1_RELEASE
 405b2f4373f25883c78afad6fb71198f513c026d FENNEC_13_0b1_BUILD1
 405b2f4373f25883c78afad6fb71198f513c026d FENNEC_13_0b1_RELEASE
+fcab65d66e50d88cec2694bb045f384fbf5b91f8 THUNDERBIRD_13_0b1_RELEASE
+fcab65d66e50d88cec2694bb045f384fbf5b91f8 THUNDERBIRD_13_0b1_BUILD1
--- a/mozilla/config.py
+++ b/mozilla/config.py
@@ -1179,16 +1179,17 @@ BRANCHES['mozilla-release']['upload_mobi
 # temp disable nightlies (which includes turning off enable_l10n and l10nNightlyUpdate)
 BRANCHES['mozilla-release']['enable_nightly'] = False
 BRANCHES['mozilla-release']['enable_blocklist_update'] = False
 BRANCHES['mozilla-release']['blocklist_update_on_closed_tree'] = False
 del BRANCHES['mozilla-release']['platforms']['win64']
 BRANCHES['mozilla-release']['enable_valgrind'] = False
 BRANCHES['mozilla-release']['platforms']['android']['env']['MOZ_SYMBOLS_EXTRA_BUILDID'] = 'mozilla-release'
 BRANCHES['mozilla-release']['platforms']['android-xul']['env']['MOZ_SYMBOLS_EXTRA_BUILDID'] = 'android-xul-mozilla-release'
+BRANCHES['mozilla-release']['enabled_products'] = ['firefox', 'mobile']
 
 ######## mozilla-beta
 BRANCHES['mozilla-beta']['repo_path'] = 'releases/mozilla-beta'
 BRANCHES['mozilla-beta']['l10n_repo_path'] = 'releases/l10n/mozilla-beta'
 BRANCHES['mozilla-beta']['enable_weekly_bundle'] = True
 BRANCHES['mozilla-beta']['update_channel'] = 'beta'
 BRANCHES['mozilla-beta']['start_hour'] = [3]
 BRANCHES['mozilla-beta']['start_minute'] = [2]
@@ -1231,16 +1232,17 @@ BRANCHES['mozilla-beta']['enable_blockli
 BRANCHES['mozilla-beta']['blocklist_update_on_closed_tree'] = False
 del BRANCHES['mozilla-beta']['platforms']['win64']
 BRANCHES['mozilla-beta']['enable_valgrind'] = False
 BRANCHES['mozilla-beta']['platforms']['android']['env']['MOZ_SYMBOLS_EXTRA_BUILDID'] = 'mozilla-beta'
 BRANCHES['mozilla-beta']['platforms']['android-xul']['env']['MOZ_SYMBOLS_EXTRA_BUILDID'] = 'android-xul-mozilla-beta'
 BRANCHES['mozilla-beta']['platforms']['android']['enable_dep'] = True
 BRANCHES['mozilla-beta']['platforms']['android-debug']['enable_dep'] = True
 BRANCHES['mozilla-beta']['platforms']['android-xul']['enable_dep'] = True
+BRANCHES['mozilla-beta']['enabled_products'] = ['firefox', 'mobile']
 
 ######## mozilla-aurora
 BRANCHES['mozilla-aurora']['repo_path'] = 'releases/mozilla-aurora'
 BRANCHES['mozilla-aurora']['l10n_repo_path'] = 'releases/l10n/mozilla-aurora'
 BRANCHES['mozilla-aurora']['enable_weekly_bundle'] = True
 BRANCHES['mozilla-aurora']['start_hour'] = [4]
 BRANCHES['mozilla-aurora']['start_minute'] = [20]
 # Enable XULRunner / SDK builds
@@ -1295,16 +1297,17 @@ BRANCHES['mozilla-aurora']['platforms'][
 # aurora nightlies should use our nightly signing server
 BRANCHES['mozilla-aurora']['platforms']['linux']['nightly_signing_servers'] = 'nightly-signing'
 BRANCHES['mozilla-aurora']['platforms']['linux64']['nightly_signing_servers'] = 'nightly-signing'
 BRANCHES['mozilla-aurora']['platforms']['win32']['nightly_signing_servers'] = 'nightly-signing'
 BRANCHES['mozilla-aurora']['platforms']['macosx64-debug']['nightly_signing_servers'] = 'mac-nightly-signing'
 BRANCHES['mozilla-aurora']['platforms']['macosx64']['nightly_signing_servers'] = 'mac-nightly-signing'
 BRANCHES['mozilla-aurora']['platforms']['macosx-debug']['nightly_signing_servers'] = 'mac-nightly-signing'
 BRANCHES['mozilla-aurora']['l10n_extra_configure_args']= ['--with-macbundlename-prefix=Firefox']
+BRANCHES['mozilla-aurora']['enabled_products'] = ['firefox', 'mobile']
 
 ######## mozilla-esr10
 BRANCHES['mozilla-esr10']['repo_path'] = 'releases/mozilla-esr10'
 BRANCHES['mozilla-esr10']['update_channel'] = 'nightly-esr10'
 BRANCHES['mozilla-esr10']['l10n_repo_path'] = 'releases/l10n/mozilla-release'
 BRANCHES['mozilla-esr10']['enable_weekly_bundle'] = True
 BRANCHES['mozilla-esr10']['start_hour'] = [3]
 BRANCHES['mozilla-esr10']['start_minute'] = [45]
--- a/mozilla/release-fennec-mozilla-esr10.py
+++ b/mozilla/release-fennec-mozilla-esr10.py
@@ -114,17 +114,17 @@ releaseConfig['disableStandaloneRepacks'
 releaseConfig['disableL10nVerification']  = True
 releaseConfig['disablePermissionCheck']   = True
 releaseConfig['disableVirusCheck']        = True
 releaseConfig['disablePushToMirrors']     = True
 
 releaseConfig['multilocale_config'] = {
     'platforms': {
         'linux-android':
-            'multi_locale/release_mozilla-release_linux-android.json',
+            'multi_locale/release_mozilla-esr10_linux-android.json',
     },
     'multilocaleOptions': [
         '--tag-override=%s_RELEASE' % releaseConfig['baseTag'],
         '--only-pull-locale-source',
         '--only-add-locales',
         '--only-package-multi',
     ]
 }
--- a/thunderbird/l10n-thunderbird-changesets-beta
+++ b/thunderbird/l10n-thunderbird-changesets-beta
@@ -1,55 +1,55 @@
 ar cb347f2e3681
 ast 8a28b3adb606
 be fc2548860d2b
 bg 53920203d75d
 bn-BD c4ae76a06caa
-br beff023694aa
-ca 598d9b5ff247
+br 3ca1321085d0
+ca eae1dddfe45a
 cs f4eed0e2c385
-da 4008fb5f48fb
-de b4d8ddaa208b
+da e7a157c5637c
+de a7a9ef3f3bca
 el 213eb620afd4
 en-GB e8860363c8f0
-es-AR ad5a5dae4216
-es-ES d91c7d29d8ae
-et 8bfc8d71d477
-eu 543eaa752b1a
-fi 2122f360ec55
+es-AR 694c19289bac
+es-ES 91edb5e326e4
+et c4b76a570cfa
+eu 0d402d4d4150
+fi 359220200d46
 fr e647d7f02f6e
-fy-NL da9258930443
+fy-NL 094d560e481d
 ga-IE 69abbc9527e3
-gd 6b275ae29f83
+gd 04e2c804f95a
 gl 0ce459232ace
 he 261bc03b3dda
-hr d02a73dda986
+hr f98c9e827ea9
 hu 254a86ffcf68
-hy-AM 5ed047ce1af4
+hy-AM e7214a77e77b
 id bdd6602c58f3
-is fadd59fc6ed1
-it 4be1dc156bed
-ja 09cdc2c4cc27
-ja-JP-mac 47d7fb53e7cd
+is 8d5c856b9575
+it ad3f2fc0ecae
+ja 47eeb04b0b3c
+ja-JP-mac 82c02e9c2d07
 ko 6e55146e9c5d
-lt 5b604edb3670
+lt 590ef3de6a3b
 nb-NO ac8cce3cc028
-nl 9b4925862f3c
+nl 62e751a31d13
 nn-NO 605f62ee741d
 pa-IN 1579a219f210
-pl a723b91907c1
-pt-BR e371d768aba7
-pt-PT 40ef6aa2e8ab
-rm 91d99b2f7e9e
+pl 43cd38737135
+pt-BR c231550224ab
+pt-PT 575b8428a824
+rm cacf33d969ab
 ro 11917935d218
-ru 6e220c48efe8
-si 77d50db27668
-sk f96ac0196681
-sl ecccbc471eaf
-sq c6bcc86dce28
+ru 8415b689dbfd
+si 4d9242b3a408
+sk e70064f93e51
+sl 17ce6c98fd9b
+sq 8cf1eef8be2d
 sr 8a6205ac3dd5
 sv-SE 953d2d6de33e
 ta-LK 70286dc65519
 tr 15529eaba668
 uk 02ebbb3584c8
 vi 84a40c2f0cd6
-zh-CN b84ce2e290c7
-zh-TW 248aa4a0f359
+zh-CN fcff660712f1
+zh-TW b757f2d373e0
--- a/thunderbird/release_master.py
+++ b/thunderbird/release_master.py
@@ -130,25 +130,25 @@ gloConfig = {
     },
     'beta': {
         'hgUsername'                 : 'tbirdbld',
         'hgSshKey'                   : '~cltbld/.ssh/tbirdbld_dsa',
         'relbranchPrefix'            : 'COMM',
         'sourceRepoName'             : 'comm-beta', # buildbot branch name
         'sourceRepoPath'             : 'releases/comm-beta',
         'oldRepoPath'                : 'releases/comm-beta',
-        'sourceRepoRevision'         : '33ee8cf6630f',
+        'sourceRepoRevision'         : '01799e9c180d',
         # 'If' blank, automation will create its own branch based on COMM_<date>_RELBRANCH
         'relbranchOverride'          : '',
         'mozillaRepoPath'            : 'releases/mozilla-beta',
-        'mozillaRepoRevision'        : '0ad498bb833f',
+        'mozillaRepoRevision'        : 'e60ca2e387a8',
         # 'If' blank, automation will create its own branch based on COMM_<date>_RELBRANCH
         # 'You' typically want to set this to the gecko relbranch if doing a release off
         # 'a' specific gecko version.
-        'mozillaRelbranchOverride'   : 'GECKO120_2012041716_RELBRANCH', # put Gecko relbranch here that we base upon
+        'mozillaRelbranchOverride'   : 'GECKO130_2012042512_RELBRANCH', # put Gecko relbranch here that we base upon
         'inspectorRepoPath'          : '', #'dom-inspector', # leave empty if inspector is not to be tagged
         'inspectorRepoRevision'      : '',
         'inspectorRelbranchOverride' : '',
         'buildToolsRepoPath'            : '', # leave empty if buildTools is not to be tagged
         'buildToolsRepoRevision'        : '',
         #buildToolsRepoRevision        : '479375734669'
         'buildToolsRelbranchOverride'   : '',
         'venkmanRepoPath'            : '', # leave empty if venkman is not to be tagged
@@ -169,27 +169,27 @@ gloConfig = {
         'brandName'                  : 'Thunderbird',
         'appName'                    : APP_NAME,
         'ftpName'                    : APP_NAME,
         # 'Sometimes' we need the application version to be different from what we "call"
         # 'the' build, eg public release candidates for a major release (3.1 RC1).
         # 'appVersion' and oldAppVersion are optional definitions used in places that
         # 'don''t care about what we call it. Eg, when version bumping we will bump to
         # 'appVersion', not version.
-        'version'                    : '12.0b5',
-        'oldVersion'                 : '12.0b4',
-        'appVersion'                 : '12.0', # no 'b1' suffix for betas
+        'version'                    : '13.0b1',
+        'oldVersion'                 : '12.0b5',
+        'appVersion'                 : '13.0', # no 'b1' suffix for betas
         'oldAppVersion'              : '12.0',
         'buildNumber'                : 1,
         'oldBuildNumber'             : 1,
-        'baseTag'                    : 'THUNDERBIRD_12_0b5',
-        'oldBaseTag'                 : 'THUNDERBIRD_12_0b4',
+        'baseTag'                    : 'THUNDERBIRD_13_0b1',
+        'oldBaseTag'                 : 'THUNDERBIRD_12_0b5',
         #XXX: 'Not' entirely certain if/where this is used.
         # 'Derived' from mozillaRelbranchOverride. eg: COMM19211_20101004_RELBRANCH == 1.9.2.11
-        'milestone'                  : '12.0',
+        'milestone'                  : '13.0',
         # 'The' old version is the revision from which we should generate update snippets.
         'enable_weekly_bundle'       : True,
         'enUSPlatforms'              : ('linux', 'linux64', 'win32', 'macosx64'),
         #'l10nPlatforms'              : (),
         'xulrunnerPlatforms'         : (),
         'patcherConfig'              : 'mozBeta-thunderbird-branch-patcher2.cfg',
         'patcherToolsTag'            : 'UPDATE_PACKAGING_R15',
         'patcherToolsTagMU'          : 'UPDATE_PACKAGING_R11_1_MU',