Bug 568298 - don't subclass compareLocales, allowing mergeLocales to …

…run on alpha/beta releases - r=bhearsum
mozilla-releng · Jul 20, 2010 · af3a340 · af3a340
1 parent da961a2
commit af3a340
Showing 1 changed file with 11 additions and 25 deletions.
diff --git a/process/factory.py b/process/factory.py
@@ -2802,12 +2802,12 @@ def doRepack(self):
              haltOnFailure=True
             )
         self.addStep(ShellCommand,
-         name='make_locale_installers',
+         name='repack_installers',
+         description=['repack', 'installers'],
          command=['sh','-c',
                   WithProperties('make installers-%(locale)s LOCALE_MERGEDIR=$PWD/merged')],
          env = self.env,
          haltOnFailure=True,
-         description=['make','installers'],
          workdir='%s/%s/%s/locales' % (self.baseWorkDir, self.objdir, self.appName),
         )
         self.addStep(FindFile(
@@ -2937,10 +2937,9 @@ def makeLongVersion(self, version):
         return version
 
 
-
 class ReleaseRepackFactory(BaseRepackFactory, ReleaseFactory):
     def __init__(self, platform, buildRevision, version, buildNumber,
-                 env={}, brandName=None, **kwargs):
+                 env={}, brandName=None, mergeLocales=False, **kwargs):
         self.buildRevision = buildRevision
         self.version = version
         self.buildNumber = buildNumber
@@ -2962,7 +2961,8 @@ def __init__(self, platform, buildRevision, version, buildNumber,
                              '-v %s ' % self.version + \
                              '-n %s ' % self.buildNumber + \
                              '--release-to-candidates-dir'
-        BaseRepackFactory.__init__(self, env=env, platform=platform, **kwargs)
+        BaseRepackFactory.__init__(self, env=env, platform=platform,
+                                   mergeLocales=mergeLocales, **kwargs)
 
     def updateSources(self):
         self.addStep(ShellCommand,
@@ -3046,23 +3046,6 @@ def downloadBuilds(self):
              haltOnFailure=True
             )
 
-    def compareLocales(self):
-        self.addStep(ShellCommand,
-         name='comparing_locales',
-         command=['python',
-                  '../../../compare-locales/scripts/compare-locales',
-                  "l10n.ini",
-                  "../../../%s" % self.l10nRepoPath,
-                  WithProperties('%(locale)s')],
-         description='comparing locale',
-         env={'PYTHONPATH': ['../../../compare-locales/lib']},
-         flunkOnWarnings=True,
-         haltOnFailure=True,
-         workdir="%s/%s/%s/locales" % (self.baseWorkDir,
-                                       self.origSrcDir,
-                                       self.appName),
-        )
-
     def doRepack(self):
         # For releases we have to make memory/jemalloc
         if self.platform.startswith('win32'):
@@ -3093,8 +3076,10 @@ def doRepack(self):
             )
 
         self.addStep(ShellCommand,
-         name='make_installers_locale',
-         command=['make', WithProperties('installers-%(locale)s')],
+         name='repack_installers',
+         description=['repack', 'installers'],
+         command=['sh','-c',
+                  WithProperties('make installers-%(locale)s LOCALE_MERGEDIR=$PWD/merged')],
          env=self.env,
          haltOnFailure=True,
          workdir='build/'+self.objdir+'/'+self.appName+'/locales'
@@ -6799,7 +6784,8 @@ def tinderboxPrintRevisions(self):
 
     def doRepack(self):
         self.addStep(ShellCommand,
-         name='repack_locales',
+         name='repack_installers',
+         description=['repack', 'installers'],
          command=['sh','-c',
                   WithProperties('make installers-%(locale)s LOCALE_MERGEDIR=$PWD/merged')],
          haltOnFailure=True,