Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

merge bug 557260 to production-0.7

--HG--
branch : production-0.7
  • Loading branch information...
commit c3d640f56adbd26b1dd914b9d55919e843897949 2 parents 42aca97 + ef9f449
authored May 17, 2011

Showing 1 changed file with 22 additions and 0 deletions. Show diff stats Hide diff stats

  1. 22  process/factory.py
22  process/factory.py
@@ -5769,6 +5769,14 @@ def addBuildSteps(self):
5769 5769
 
5770 5770
     def addPackageSteps(self):
5771 5771
         self.addStep(ShellCommand,
  5772
+            name='rm_mobile_pkg',
  5773
+            command=['rm', '-rvf', 'dist/fennec*'],
  5774
+            workdir='%s/%s/%s' % (self.baseWorkDir,
  5775
+            self.branchName, self.objdir),
  5776
+            env=self.env,
  5777
+            haltOnFailure=True,
  5778
+        )
  5779
+        self.addStep(ShellCommand,
5772 5780
             name='make_mobile_pkg',
5773 5781
             command=['make', 'package'],
5774 5782
             workdir='%s/%s/%s' % (self.baseWorkDir,
@@ -5938,6 +5946,13 @@ def addPackageSteps(self, multiLocale=False, packageTests=False):
5938 5946
             extraArgs='AB_CD=multi'
5939 5947
             env['MOZ_CHROME_MULTILOCALE'] = ' '.join(self.locales)
5940 5948
         self.addStep(ShellCommand,
  5949
+            name='rm_pkg',
  5950
+            command=[self.scratchboxPath, '-p', '-d',
  5951
+                     '%s' % (self.objdirRelPath),
  5952
+                     'rm -rfv dist/fennec*'],
  5953
+            haltOnFailure=True
  5954
+        )
  5955
+        self.addStep(ShellCommand,
5941 5956
             name='make_pkg',
5942 5957
             command=[self.scratchboxPath, '-p', '-k', '-d',
5943 5958
                      '%s' % (self.objdirRelPath),
@@ -7519,6 +7534,13 @@ def addPackageSteps(self, locale=None):
7519 7534
             makePackageTestsCommand += ['AB_CD=%s' % locale]
7520 7535
 
7521 7536
         self.addStep(ShellCommand,
  7537
+            name='rm_android_pkg',
  7538
+            command=['rm', '-rfv', 'dist/fennec*'],
  7539
+            workdir='%s/%s/%s' % (self.baseWorkDir, self.branchName, self.objdir),
  7540
+            env=envJava,
  7541
+            haltOnFailure=True,
  7542
+        )
  7543
+        self.addStep(ShellCommand,
7522 7544
             name='make_android_pkg',
7523 7545
             command=makePackageCommand,
7524 7546
             workdir='%s/%s/%s' % (self.baseWorkDir, self.branchName, self.objdir),

0 notes on commit c3d640f

Please sign in to comment.
Something went wrong with that request. Please try again.