Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

merge bug 557260 to production-0.7

--HG--
branch : production-0.7
  • Loading branch information...
commit c3d640f56adbd26b1dd914b9d55919e843897949 2 parents 42aca97 + ef9f449
@jhford jhford authored
Showing with 22 additions and 0 deletions.
  1. +22 −0 process/factory.py
View
22 process/factory.py
@@ -5769,6 +5769,14 @@ def addBuildSteps(self):
def addPackageSteps(self):
self.addStep(ShellCommand,
+ name='rm_mobile_pkg',
+ command=['rm', '-rvf', 'dist/fennec*'],
+ workdir='%s/%s/%s' % (self.baseWorkDir,
+ self.branchName, self.objdir),
+ env=self.env,
+ haltOnFailure=True,
+ )
+ self.addStep(ShellCommand,
name='make_mobile_pkg',
command=['make', 'package'],
workdir='%s/%s/%s' % (self.baseWorkDir,
@@ -5938,6 +5946,13 @@ def addPackageSteps(self, multiLocale=False, packageTests=False):
extraArgs='AB_CD=multi'
env['MOZ_CHROME_MULTILOCALE'] = ' '.join(self.locales)
self.addStep(ShellCommand,
+ name='rm_pkg',
+ command=[self.scratchboxPath, '-p', '-d',
+ '%s' % (self.objdirRelPath),
+ 'rm -rfv dist/fennec*'],
+ haltOnFailure=True
+ )
+ self.addStep(ShellCommand,
name='make_pkg',
command=[self.scratchboxPath, '-p', '-k', '-d',
'%s' % (self.objdirRelPath),
@@ -7519,6 +7534,13 @@ def addPackageSteps(self, locale=None):
makePackageTestsCommand += ['AB_CD=%s' % locale]
self.addStep(ShellCommand,
+ name='rm_android_pkg',
+ command=['rm', '-rfv', 'dist/fennec*'],
+ workdir='%s/%s/%s' % (self.baseWorkDir, self.branchName, self.objdir),
+ env=envJava,
+ haltOnFailure=True,
+ )
+ self.addStep(ShellCommand,
name='make_android_pkg',
command=makePackageCommand,
workdir='%s/%s/%s' % (self.baseWorkDir, self.branchName, self.objdir),
Please sign in to comment.
Something went wrong with that request. Please try again.