--- a/process/factory.py
+++ b/process/factory.py
@@ -1355,38 +1355,39 @@ class MercurialBuildFactory(MozillaBuild
mock_workdir_prefix=None,
))
def addBuildInfoSteps(self):
"""Helper function for getting build information into properties.
Looks for self._gotBuildInfo to make sure we only run this set of steps
once."""
if not getattr(self, '_gotBuildInfo', False):
- printconfig_env = self.env.copy()
- del printconfig_env['MOZ_OBJDIR']
- printconfig_workdir = WithProperties('%(basedir)s/build/' + self.objdir)
- printconfig_base_command = [
- 'python2.7', WithProperties('%(basedir)s/build/mach'), 'python',
- 'build%s/config/printconfigsetting.py' % self.mozillaSrcDir,
- 'build/%s/dist/bin/application.ini' % self.mozillaObjdir,
- ]
-
+ if self.mozillaSrcDir:
+ # Thunderbird uses the c-c's config/printconfigsetting.py due to
+ # the removal of configobj.py (bug 957911)
+ useConfigDir = '%s/config' % self.baseWorkDir
+ else:
+ useConfigDir = 'build%s/config' % self.mozillaSrcDir
self.addStep(SetProperty(
- command=printconfig_base_command + ['App', 'BuildID'],
+ command=[
+ 'python', '%s/printconfigsetting.py' % useConfigDir,
+ 'build/%s/dist/bin/application.ini' % self.mozillaObjdir,
+ 'App', 'BuildID'],
property='buildid',
- workdir=printconfig_workdir,
- env=printconfig_env,
+ workdir='.',
description=['getting', 'buildid'],
descriptionDone=['got', 'buildid'],
))
self.addStep(SetProperty(
- command=printconfig_base_command + ['App', 'SourceStamp'],
+ command=[
+ 'python', '%s/printconfigsetting.py' % useConfigDir,
+ 'build/%s/dist/bin/application.ini' % self.mozillaObjdir,
+ 'App', 'SourceStamp'],
property='sourcestamp',
- workdir=printconfig_workdir,
- env=printconfig_env,
+ workdir='.',
description=['getting', 'sourcestamp'],
descriptionDone=['got', 'sourcestamp']
))
self._gotBuildInfo = True
def addBuildAnalysisSteps(self):
if self.platform in ('linux', 'linux64'):
# Analyze the number of ctors
@@ -1641,43 +1642,45 @@ class MercurialBuildFactory(MozillaBuild
haltOnFailure=True
))
if installerFilename:
self.addFilePropertiesSteps(filename=installerFilename,
directory='build/%s/dist/install/sea' % self.mozillaObjdir,
fileType='installer',
haltOnFailure=True)
- printconfig_env = self.env.copy()
- del printconfig_env['MOZ_OBJDIR']
- printconfig_workdir = WithProperties('%(basedir)s/build/' + self.objdir)
- printconfig_base_command = [
- 'python2.7', WithProperties('%(basedir)s/build/mach'), 'python',
- 'build%s/config/printconfigsetting.py' % self.mozillaSrcDir,
- 'build/%s/dist/bin/application.ini' % self.mozillaObjdir,
- ]
+ if self.mozillaSrcDir:
+ useConfigDir = '%s/config' % self.baseWorkDir
+ else:
+ useConfigDir = 'build%s/config' % self.mozillaSrcDir
self.addStep(SetProperty(
- command=printconfig_base_command + ['App', 'BuildID'],
+ command=[
+ 'python', '%s/printconfigsetting.py' % useConfigDir,
+ 'build/%s/dist/bin/application.ini' % self.mozillaObjdir,
+ 'App', 'BuildID'],
property='buildid',
- workdir=printconfig_workdir,
- env=printconfig_env,
+ workdir='.',
name='get_build_id',
))
self.addStep(SetProperty(
- command=printconfig_base_command + ['App', 'Version'],
+ command=[
+ 'python', '%s/printconfigsetting.py' % useConfigDir,
+ 'build/%s/dist/bin/application.ini' % self.mozillaObjdir,
+ 'App', 'Version'],
property='appVersion',
- workdir=printconfig_workdir,
- env=printconfig_env,
+ workdir='.',
name='get_app_version',
))
self.addStep(SetProperty(
- command=printconfig_base_command + ['App', 'Name'],
+ command=[
+ 'python', '%s/printconfigsetting.py' % useConfigDir,
+ 'build/%s/dist/bin/application.ini' % self.mozillaObjdir,
+ 'App', 'Name'],
property='appName',
- workdir=printconfig_workdir,
- env=printconfig_env,
+ workdir='.',
name='get_app_name',
))
self.pkg_env = pkg_env
def addUploadSteps(self):
if self.multiLocale:
self.doUpload(postUploadBuildDir='en-US')
cmd = ['python', '%s/%s' % (self.mozharness_path, self.multiLocaleScript),
@@ -2140,32 +2143,33 @@ class NightlyBuildFactory(MercurialBuild
filename='application.ini',
directory='previous',
filetype='file',
max_depth=4,
property_name='previous_inipath',
workdir=self.absMozillaObjDir,
haltOnFailure=True,
))
- printconfig_env = self.env.copy()
- del printconfig_env['MOZ_OBJDIR']
- printconfig_workdir = WithProperties('%(basedir)s/build/' + self.objdir)
- printconfig_base_command = [
- 'python2.7', WithProperties('%(basedir)s/build/mach'), 'python',
- '%s/config/printconfigsetting.py' % self.absMozillaSrcDir,
- WithProperties(self.absMozillaObjDir + '/%(previous_inipath)s')
- ]
+ if self.mozillaSrcDir:
+ # Thunderbird uses mozilla/ but uses
+ # comm-*'s /config/printconfigsettings.py
+ useConfigDir = '%s/config' % self.baseWorkDir
+ else:
+ useConfigDir = '%s/config' % self.absMozillaSrcDir
self.addStep(SetProperty(
name='set_previous_buildid',
description=['set', 'previous', 'buildid'],
doStepIf=self.previousMarExists,
- command=printconfig_base_command + ['App', 'BuildID'],
+ command=['python',
+ '%s/printconfigsetting.py' % useConfigDir,
+ WithProperties(
+ self.absMozillaObjDir + '/%(previous_inipath)s'),
+ 'App', 'BuildID'],
property='previous_buildid',
- workdir=printconfig_workdir,
- env=printconfig_env,
+ workdir='.',
haltOnFailure=True,
))
for dir in ['current', 'previous']:
self.addStep(ShellCommand(
name='remove pgc files (%s)' % dir,
command="find . -name \*.pgc -print -delete",
env=updateEnv,
workdir="%s/%s" % (self.absMozillaObjDir, dir),
@@ -3512,44 +3516,46 @@ class NightlyRepackFactory(BaseRepackFac
filename='application.ini',
directory='dist/l10n-stage',
filetype='file',
max_depth=5,
property_name='inipath',
workdir=self.absMozillaObjDir,
haltOnFailure=True,
))
- printconfig_env = self.env.copy()
- del printconfig_env['MOZ_OBJDIR']
- printconfig_workdir = WithProperties('%(basedir)s/build/' + self.objdir)
- printconfig_base_command = [
- 'python2.7', WithProperties('%(basedir)s/build/mach'), 'python',
- '%s/config/printconfigsetting.py' % self.absMozillaSrcDir,
- WithProperties('%s/' % self.absMozillaObjDir + '%(inipath)s'),
- ]
+ if self.mozillaSrcDir:
+ useConfigDir = '%s/config' % self.baseWorkDir
+ else:
+ useConfigDir = '%s/config' % self.absMozillaSrcDir
self.addStep(SetProperty(
- command=printconfig_base_command + ['App', 'BuildID'],
+ command=['python', '%s/printconfigsetting.py' % useConfigDir,
+ WithProperties('%s/' % self.absMozillaObjDir + '%(inipath)s'),
+ 'App', 'BuildID'],
name='get_build_id',
- workdir=printconfig_workdir,
- env=printconfig_env,
+ workdir='.',
+ env=self.env,
property='buildid',
))
self.addStep(SetProperty(
- command=printconfig_base_command + ['App', 'Version'],
+ command=['python', '%s/printconfigsetting.py' % useConfigDir,
+ WithProperties('%s/' % self.absMozillaObjDir + '%(inipath)s'),
+ 'App', 'Version'],
property='appVersion',
name='get_app_version',
- workdir=printconfig_workdir,
- env=printconfig_env,
+ workdir='.',
+ env=self.env,
))
self.addStep(SetProperty(
- command=printconfig_base_command + ['App', 'Name'],
+ command=['python', '%s/printconfigsetting.py' % useConfigDir,
+ WithProperties('%s/' % self.absMozillaObjDir + '%(inipath)s'),
+ 'App', 'Name'],
property='appName',
name='get_app_name',
- workdir=printconfig_workdir,
- env=printconfig_env,
+ workdir='.',
+ env=self.env,
))
if self.l10nNightlyUpdate:
self.addFilePropertiesSteps(filename='*.complete.mar',
directory='%s/dist/update' % self.absMozillaObjDir,
fileType='completeMar',
haltOnFailure=True)
