2.0a1 build1 configs, with no multilocale, no single locales.
authorAki Sasaki <asasaki@mozilla.com>
Mon, 23 Aug 2010 10:47:00 -0700
changeset 2871 32203231beb2304d674477067d954a9223ca78e1
parent 2870 5964475203fd7bfd94ca9b29bbf44822fe906bbd
child 2872 971ab381acec4fef6b965e31329b0d9e9e2bfb5e
push id2258
push userasasaki@mozilla.com
push dateMon, 23 Aug 2010 17:47:04 +0000
bugs2
2.0a1 build1 configs, with no multilocale, no single locales.
mozilla2-staging/l10n-changesets_mobile-2.0.json
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_config1.py
mozilla2-staging/release_mobile_config2.py
mozilla2-staging/release_mobile_master.py
mozilla2/l10n-changesets_mobile-2.0.json
mozilla2/release-fennec-1.0.py
mozilla2/release-fennec-1.1.py
mozilla2/release-fennec-2.0.py
mozilla2/release_mobile_config1.py
mozilla2/release_mobile_config2.py
--- a/mozilla2-staging/l10n-changesets_mobile-2.0.json
+++ b/mozilla2-staging/l10n-changesets_mobile-2.0.json
@@ -1,10 +1,2 @@
 {
-  "de": {
-    "revision": "default",
-    "platforms": ["maemo", "maemo-multilocale"]
-  },
-  "el": {
-    "revision": "default",
-    "platforms": ["maemo"]
-  }
 }
--- a/mozilla2-staging/release-fennec-1.0.py
+++ b/mozilla2-staging/release-fennec-1.0.py
@@ -16,16 +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
 # 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,16 +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
 # 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
@@ -7,39 +7,41 @@ mozSourceRepoName      = 'mozilla-centra
 # It is not used for anything else.
 mozSourceRepoClonePath = 'mozilla-central'
 mozSourceRepoPath      = 'users/stage-ffxbld/mozilla-central'
 mozSourceRepoRevision  = 'default'
 mobileSourceRepoName      = 'mobile-browser'
 mobileSourceRepoClonePath = 'mobile-browser'
 mobileSourceRepoPath      = 'users/stage-ffxbld/mobile-browser'
 mobileSourceRepoRevision  = 'default'
-mozRelbranchOverride   = ''
+mozRelbranchOverride   = 'GECKO20b5pre_20100820_RELBRANCH'
 l10nRelbranchOverride   = ''
 mobileRelbranchOverride   = ''
 l10nRepoClonePath   = 'l10n-central'
 l10nRepoPath        = 'users/stage-ffxbld'
 l10nRevisionFile    = 'l10n-changesets_mobile-2.0.json'
 productName         = 'fennec'
 appName             = 'mobile'
 mergeLocales        = True
+disableMultiLocale  = 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             = '2.0a1'
 appVersion          = version
 milestone           = '2.0b5pre'
 buildNumber         = 1
 baseTag             = 'FENNEC_2_0a1'
-enUSPlatforms       = ('maemo4', 'maemo5-gtk', 'maemo5-qt', 'android-r7')
-l10nPlatforms       = ('maemo4', 'maemo5-gtk', 'maemo5-qt')
+#enUSPlatforms       = ('maemo4', 'maemo5-gtk', 'maemo5-qt', 'android-r7')
+enUSPlatforms       = ('maemo5-gtk', 'android-r7')
+l10nPlatforms       = ()
 enUSDesktopPlatforms = ('linux-i686', 'macosx-i686', 'win32-i686')
 l10nDesktopPlatforms = ()
 talosTestPlatforms  = ()
 ftpServer           = 'staging-stage.build.mozilla.org'
 stagingServer       = 'staging-stage.build.mozilla.org'
 stageBasePath       = '/home/ftp/pub/mobile/candidates'
 base_enUS_binaryURL = 'http://%s/pub/mozilla.org/mobile/candidates/%s-candidates/build%d' % (ftpServer, version, buildNumber)
-doPartnerRepacks    = True
+doPartnerRepacks    = False
 partnersRepoPath    = 'build/partner-repacks'
 partnerRepackPlatforms = ('maemo4', 'maemo5-gtk')
--- a/mozilla2-staging/release_mobile_config1.py
+++ b/mozilla2-staging/release_mobile_config1.py
@@ -1,1 +1,1 @@
-release-fennec-1.0.py
\ No newline at end of file
+release-fennec-1.1.py
\ No newline at end of file
--- a/mozilla2-staging/release_mobile_config2.py
+++ b/mozilla2-staging/release_mobile_config2.py
@@ -1,1 +1,1 @@
-release-fennec-1.1.py
\ No newline at end of file
+release-fennec-2.0.py
\ No newline at end of file
--- a/mozilla2-staging/release_mobile_master.py
+++ b/mozilla2-staging/release_mobile_master.py
@@ -231,16 +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:
+            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'],
@@ -262,17 +266,17 @@ for platform in enUSPlatforms:
             baseBuildDir=releaseBuildDir,
             baseUploadDir=baseUploadDir,
             buildToolsRepoPath=branchConfig['build_tools_repo_path'],
             clobberURL=branchConfig['base_clobber_url'],
             clobberTime=clobberTime,
             buildSpace=10,
             mergeLocales=mergeLocales,
             locales=platform_locales['maemo-multilocale'].keys(),
-            multiLocale=mobileBranchConfig['enable_multi_locale'],
+            multiLocale=multiLocale,
             l10nRepoPath=l10nRepoPath,
             triggerBuilds=False,
         )
     elif platform.startswith('android'):
         mozconfig = 'mobile/android/%s/release' % (mobileSourceRepoName)
         releaseWorkDir  = pf['base_workdir'] + '-release'
         build_factory = AndroidReleaseBuildFactory(
             env=pf['env'],
--- a/mozilla2/l10n-changesets_mobile-2.0.json
+++ b/mozilla2/l10n-changesets_mobile-2.0.json
@@ -1,118 +1,2 @@
 {
-  "ar": {
-    "revision": "38181904e8c8",
-    "platforms": ["maemo"]
-  },
-  "be": {
-    "revision": "fbc2edf0476f",
-    "platforms": ["maemo"]
-  },
-  "ca": {
-    "revision": "f01206d74820",
-    "platforms": ["maemo"]
-  },
-  "cs": {
-    "revision": "fec12d251b2a",
-    "platforms": ["maemo", "maemo-multilocale"]
-  },
-  "da": {
-    "revision": "5dda2066fb9b",
-    "platforms": ["maemo", "maemo-multilocale"]
-  },
-  "de": {
-    "revision": "4750d99e2858",
-    "platforms": ["maemo", "maemo-multilocale"]
-  },
-  "el": {
-    "revision": "e8aac0a45a06",
-    "platforms": ["maemo"]
-  },
-  "es-AR": {
-    "revision": "10792a2c9ea0",
-    "platforms": ["maemo"]
-  },
-  "es-ES": {
-    "revision": "479b935b0e65",
-    "platforms": ["maemo", "maemo-multilocale"]
-  },
-  "et": {
-    "revision": "dc3daba5b4a4",
-    "platforms": ["maemo"]
-  },
-  "fi": {
-    "revision": "3d70fc139ca0",
-    "platforms": ["maemo", "maemo-multilocale"]
-  },
-  "fr": {
-    "revision": "5a14b2199b71",
-    "platforms": ["maemo", "maemo-multilocale"]
-  },
-  "fy-NL": {
-    "revision": "8c9625d93f7b",
-    "platforms": ["maemo"]
-  },
-  "ga-IE": {
-    "revision": "634806567813",
-    "platforms": ["maemo"]
-  },
-  "hu": {
-    "revision": "80dcb0391369",
-    "platforms": ["maemo"]
-  },
-  "it": {
-    "revision": "25a745a2308d",
-    "platforms": ["maemo", "maemo-multilocale"]
-  },
-  "lt": {
-    "revision": "1ea72c1ee7b8",
-    "platforms": ["maemo"]
-  },
-  "nb-NO": {
-    "revision": "dcd3998111de",
-    "platforms": ["maemo", "maemo-multilocale"]
-  },
-  "nl": {
-    "revision": "9c80e5950e24",
-    "platforms": ["maemo", "maemo-multilocale"]
-  },
-  "pa-IN": {
-    "revision": "b6593b6fd6ba",
-    "platforms": ["maemo"]
-  },
-  "pl": {
-    "revision": "803f7ef94cbf",
-    "platforms": ["maemo", "maemo-multilocale"]
-  },
-  "pt-BR": {
-    "revision": "b64129d7e165",
-    "platforms": ["maemo"]
-  },
-  "pt-PT": {
-    "revision": "62d7b5bdb38f",
-    "platforms": ["maemo", "maemo-multilocale"]
-  },
-  "ru": {
-    "revision": "d55e904d6ea0",
-    "platforms": ["maemo", "maemo-multilocale"]
-  },
-  "sk": {
-    "revision": "79ae187d8cee",
-    "platforms": ["maemo"]
-  },
-  "sl": {
-    "revision": "a7632caf2cc5",
-    "platforms": ["maemo"]
-  },
-  "uk": {
-    "revision": "8a3b4ebf1e77",
-    "platforms": ["maemo"]
-  },
-  "zh-CN": {
-    "revision": "0c860eb0f63f",
-    "platforms": ["maemo"]
-  },
-  "zh-TW": {
-    "revision": "f0e8736193b1",
-    "platforms": ["maemo"]
-  }
 }
--- a/mozilla2/release-fennec-1.0.py
+++ b/mozilla2/release-fennec-1.0.py
@@ -13,16 +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
 # 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,16 +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
 # 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
@@ -1,42 +1,43 @@
 hgUsername          = 'ffxbld'
 hgSshKey            = '~cltbld/.ssh/ffxbld_dsa'
 mobileBranchNick    = 'mobile-trunk'
 mozSourceRepoName      = 'mozilla-central'
 # This parameter (and its l10n equivalent) is for staging only and necessary
 # because the repo_setup builder needs to know where to clone repositories from.
 # It is not used for anything else.
 mozSourceRepoPath      = 'mozilla-central'
-mozSourceRepoRevision  = 'FILLMEIN'
+mozSourceRepoRevision  = '7b8aa3e966a4'
 mobileSourceRepoName      = 'mobile-browser'
 mobileSourceRepoPath      = 'mobile-browser'
-mobileSourceRepoRevision  = 'FILLMEIN'
+mobileSourceRepoRevision  = '88c8ffbb40dd'
 mozRelbranchOverride      = 'GECKO20b5pre_20100820_RELBRANCH'
 l10nRelbranchOverride     = ''
 mobileRelbranchOverride   = ''
 l10nRepoPath        = 'l10n-central'
 l10nRevisionFile    = 'l10n-changesets_mobile-2.0.json'
 productName         = 'fennec'
 appName             = 'mobile'
 mergeLocales        = True
+disableMultiLocale  = 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             = '2.0a1'
 appVersion          = version
 milestone           = '2.0b5pre'
 buildNumber         = 1
 baseTag             = 'FENNEC_2_0a1'
-enUSPlatforms       = ('maemo4', 'maemo5-gtk', 'maemo5-qt', 'android-r7')
-l10nPlatforms       = ('maemo4', 'maemo5-gtk', 'maemo5-qt')
+enUSPlatforms       = ('maemo5-gtk', 'android-r7')
+l10nPlatforms       = ()
 enUSDesktopPlatforms = ('linux-i686', 'macosx-i686', 'win32-i686')
 l10nDesktopPlatforms = ()
 talosTestPlatforms  = ()
 ftpServer           = 'ftp.mozilla.org'
 stagingServer       = 'stage.mozilla.org'
 stageBasePath       = '/home/ftp/pub/mobile/candidates'
 base_enUS_binaryURL = 'http://%s/pub/mozilla.org/mobile/candidates/%s-candidates/build%d' % (ftpServer, version, buildNumber)
-doPartnerRepacks    = True
+doPartnerRepacks    = False
 partnersRepoPath    = 'build/partner-repacks'
 partnerRepackPlatforms = ('maemo4', 'maemo5-gtk')
--- a/mozilla2/release_mobile_config1.py
+++ b/mozilla2/release_mobile_config1.py
@@ -1,1 +1,1 @@
-release-fennec-1.0.py
\ No newline at end of file
+release-fennec-1.1.py
\ No newline at end of file
--- a/mozilla2/release_mobile_config2.py
+++ b/mozilla2/release_mobile_config2.py
@@ -1,1 +1,1 @@
-release-fennec-1.1.py
\ No newline at end of file
+release-fennec-2.0.py
\ No newline at end of file