Change disableMultiLocale = False -> enableMultiLocale = True. bug 608430, r=jhford
authorAki Sasaki <asasaki@mozilla.com>
Fri, 12 Nov 2010 20:06:43 -0800
changeset 3253 a4b5faf45480cc00c7a7cd925adbc4a8d0e7dbc5
parent 3252 962d5b4be0577fe081065b8c2634ca3d29c2d40b
child 3254 09e7b416f1610dcc8376cf34af665e245e4a017d
push id1
push userroot
push dateWed, 17 Dec 2014 00:18:48 +0000
reviewersjhford
bugs608430
Change disableMultiLocale = False -> enableMultiLocale = True. bug 608430, r=jhford
mozilla2-staging/release-fennec-1.0.py
mozilla2-staging/release-fennec-1.1.py
mozilla2-staging/release-fennec-2.0.py
mozilla2-staging/release_mobile_master.py
mozilla2/release-fennec-1.0.py
mozilla2/release-fennec-1.1.py
mozilla2/release-fennec-2.0.py
mozilla2/release_mobile_master.py
--- a/mozilla2-staging/release-fennec-1.0.py
+++ b/mozilla2-staging/release-fennec-1.0.py
@@ -16,17 +16,17 @@ mozRelbranchOverride   = 'GECKO1921_2010
 l10nRelbranchOverride   = 'GECKO1921_20100126_RELBRANCH'
 mobileRelbranchOverride   = 'GECKO1921_20100126_RELBRANCH'
 l10nRepoClonePath   = 'releases/l10n-mozilla-1.9.2'
 l10nRepoPath        = 'users/stage-ffxbld'
 l10nRevisionFile    = 'l10n-changesets_mobile-1.0.json'
 productName         = 'fennec'
 appName             = 'mobile'
 mergeLocales        = True
-disableMultiLocale  = False
+enableMultiLocale   = True
 # 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             = '1.0.1rc1'
 appVersion          = '1.0.1'
 milestone           = '1.9.2.1'
--- a/mozilla2-staging/release-fennec-1.1.py
+++ b/mozilla2-staging/release-fennec-1.1.py
@@ -16,17 +16,17 @@ mozRelbranchOverride   = ''
 l10nRelbranchOverride   = ''
 mobileRelbranchOverride   = ''
 l10nRepoClonePath   = 'releases/l10n-mozilla-1.9.2'
 l10nRepoPath        = 'users/stage-ffxbld'
 l10nRevisionFile    = 'l10n-changesets_mobile-1.1.json'
 productName         = 'fennec'
 appName             = 'mobile'
 mergeLocales        = True
-disableMultiLocale  = False
+enableMultiLocale   = True
 # 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             = '1.1rc1'
 appVersion          = '1.1'
 milestone           = '1.9.2.5'
--- a/mozilla2-staging/release-fennec-2.0.py
+++ b/mozilla2-staging/release-fennec-2.0.py
@@ -16,17 +16,17 @@ mozRelbranchOverride   = ''
 l10nRelbranchOverride   = ''
 mobileRelbranchOverride   = ''
 l10nRepoClonePath   = 'l10n-central'
 l10nRepoPath        = 'users/stage-ffxbld'
 l10nRevisionFile    = 'l10n-changesets_mobile-2.0.json'
 productName         = 'fennec'
 appName             = 'mobile'
 mergeLocales        = True
-disableMultiLocale  = False
+enableMultiLocale   = True
 # 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             = '4.0b2'
 appVersion          = version
 milestone           = '4.0b7pre'
--- a/mozilla2-staging/release_mobile_master.py
+++ b/mozilla2-staging/release_mobile_master.py
@@ -231,20 +231,20 @@ for platform in enUSPlatforms:
     baseUploadDir='%s-candidates/build%d' % (version, buildNumber)
     candidatesPath = '%s/%s' % (stageBasePath, baseUploadDir)
     build_factory = None
     repack_factory = None
     pf = mobileBranchConfig['platforms'][platform]
     clobberTime = pf.get('clobber_time', branchConfig['default_clobber_time'])
 
     if platform.startswith('maemo'):
-        if disableMultiLocale:
+        if enableMultiLocale:
+            multiLocale = mobileBranchConfig['enable_multi_locale']
+        else:
             multiLocale = False
-        else:
-            multiLocale = mobileBranchConfig['enable_multi_locale']
         mozconfig = 'mobile/%s/%s/release' % (platform, mobileSourceRepoName)
         releaseWorkDir  = pf['base_workdir'] + '-release'
         releaseBuildDir = pf['base_builddir'] + '-release'
         build_factory = MaemoReleaseBuildFactory(
             env=pf['env'],
             hgHost=branchConfig['hghost'],
             repoPath=mozSourceRepoPath,
             configRepoPath=branchConfig['config_repo_path'],
--- a/mozilla2/release-fennec-1.0.py
+++ b/mozilla2/release-fennec-1.0.py
@@ -13,17 +13,17 @@ mobileSourceRepoRevision  = '3cc29c13fb8
 mozRelbranchOverride      = 'GECKO1921_20100126_RELBRANCH'
 l10nRelbranchOverride     = 'GECKO1921_20100126_RELBRANCH'
 mobileRelbranchOverride   = 'GECKO1921_20100126_RELBRANCH'
 l10nRepoPath        = 'releases/l10n-mozilla-1.9.2'
 l10nRevisionFile    = 'l10n-changesets_mobile-1.0.json'
 productName         = 'fennec'
 appName             = 'mobile'
 mergeLocales        = False
-disableMultiLocale  = False
+enableMultiLocale   = True
 # 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             = '1.0.1rc1'
 appVersion          = '1.0.1'
 milestone           = '1.9.2.1'
--- a/mozilla2/release-fennec-1.1.py
+++ b/mozilla2/release-fennec-1.1.py
@@ -13,17 +13,17 @@ mobileSourceRepoRevision  = '5c06d8f81a1
 mozRelbranchOverride      = 'GECKO1925_20100602_RELBRANCH'
 l10nRelbranchOverride     = 'GECKO1925_20100602_RELBRANCH'
 mobileRelbranchOverride   = 'GECKO1925_20100602_RELBRANCH'
 l10nRepoPath        = 'releases/l10n-mozilla-1.9.2'
 l10nRevisionFile    = 'l10n-changesets_mobile-1.1.json'
 productName         = 'fennec'
 appName             = 'mobile'
 mergeLocales        = False
-disableMultiLocale  = False
+enableMultiLocale   = True
 # 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             = '1.1rc1'
 appVersion          = '1.1'
 milestone           = '1.9.2.5'
--- a/mozilla2/release-fennec-2.0.py
+++ b/mozilla2/release-fennec-2.0.py
@@ -13,17 +13,17 @@ mobileSourceRepoRevision  = 'a73da861034
 mozRelbranchOverride      = 'GECKO20b7pre_20101029_RELBRANCH'
 l10nRelbranchOverride     = 'GECKO20b7pre_20101029_RELBRANCH'
 mobileRelbranchOverride   = 'GECKO20b7pre_20101029_RELBRANCH'
 l10nRepoPath        = 'l10n-central'
 l10nRevisionFile    = 'l10n-changesets_mobile-2.0.json'
 productName         = 'fennec'
 appName             = 'mobile'
 mergeLocales        = True
-disableMultiLocale  = False
+enableMultiLocale   = True
 # 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             = '4.0b2'
 appVersion          = version
 milestone           = '2.0b7pre'
--- a/mozilla2/release_mobile_master.py
+++ b/mozilla2/release_mobile_master.py
@@ -189,20 +189,20 @@ for platform in enUSPlatforms:
     baseUploadDir='%s-candidates/build%d' % (version, buildNumber)
     candidatesPath = '%s/%s' % (stageBasePath, baseUploadDir)
     build_factory = None
     repack_factory = None
     pf = mobileBranchConfig['platforms'][platform]
     clobberTime = pf.get('clobber_time', branchConfig['default_clobber_time'])
 
     if platform.startswith('maemo'):
-        if disableMultiLocale:
+        if enableMultiLocale:
+            multiLocale = mobileBranchConfig['enable_multi_locale']
+        else:
             multiLocale = False
-        else:
-            multiLocale = mobileBranchConfig['enable_multi_locale']
         mozconfig = 'mobile/%s/%s/release' % (platform, mobileSourceRepoName)
         releaseWorkDir  = pf['base_workdir'] + '-release'
         releaseBuildDir = pf['base_builddir'] + '-release'
         build_factory = MaemoReleaseBuildFactory(
             env=pf['env'],
             hgHost=branchConfig['hghost'],
             repoPath=mozSourceRepoPath,
             configRepoPath=branchConfig['config_repo_path'],