Permalink
Browse files

Merging from default

changeset:   2529:b15d0c5755e4
parent:      2526:50b2cda3d5b4
user:        Rail Aliiev <rail@mozilla.com>
date:        Fri Aug 24 11:22:53 2012 -0400
summary:     Bug 785215 - increase signing token expiry time for release repack jobs. r=bhearsum

changeset:   2531:155573d58ef3
tag:         tip
parent:      2529:b15d0c5755e4
user:        Ehsan Akhgari <ehsan@mozilla.com>
date:        Fri Aug 24 11:48:51 2012 -0400
summary:     Bug 785066 - make both tier_base and tier_nspr; r=Callek

--HG--
branch : production-0.8
  • Loading branch information...
2 parents d35772f + fa7ebfd commit 91797e4e46d599eae45dac63335c47fad44a5107 @ccooper ccooper committed Aug 24, 2012
Showing with 8 additions and 1 deletion.
  1. +8 −1 process/factory.py
View
@@ -3567,7 +3567,7 @@ def makePartialTools(self):
name='make_bsdiff',
command=['sh', '-c',
'if [ ! -e dist/host/bin/mbsdiff ]; then ' +
- 'make tier_base; make -C config;' +
+ 'make tier_base; make tier_nspr; make -C config;' +
'make -C modules/libmar; make -C modules/libbz2;' +
'make -C other-licenses/bsdiff;'
'fi'],
@@ -3589,6 +3589,13 @@ def doRepack(self):
description=['make tier_base'],
haltOnFailure=True
))
+ self.addStep(ShellCommand(
+ name='make_tier_nspr',
+ command=['make', 'tier_nspr'],
+ workdir='%s/%s' % (self.baseWorkDir, self.mozillaObjdir),
+ description=['make tier_nspr'],
+ haltOnFailure=True
+ ))
if self.l10nNightlyUpdate:
# Because we're generating updates we need to build the libmar tools
self.addStep(ShellCommand(

0 comments on commit 91797e4

Please sign in to comment.