Advertisement
Guest User

Untitled

a guest
Mar 31st, 2015
196
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 24.44 KB | None | 0 0
  1. diff --git a/misc.py b/misc.py
  2. index 6fb50d8..3372329 100644
  3. --- a/misc.py
  4. +++ b/misc.py
  5. @@ -1685,17 +1685,16 @@ def generateBranchObjects(config, name, secrets=None):
  6. factory_kwargs = {
  7. 'env': pf['env'],
  8. 'objdir': pf['platform_objdir'],
  9. 'platform': platform,
  10. 'hgHost': config['hghost'],
  11. 'repoPath': config['repo_path'],
  12. 'buildToolsRepoPath': config['build_tools_repo_path'],
  13. 'configRepoPath': config['config_repo_path'],
  14. - 'configSubDir': config['config_subdir'],
  15. 'profiledBuild': per_checkin_build_uses_pgo,
  16. 'productName': pf['product_name'],
  17. 'mozconfig': pf['mozconfig'],
  18. 'srcMozconfig': pf.get('src_mozconfig'),
  19. 'use_mock': pf.get('use_mock'),
  20. 'mock_target': pf.get('mock_target'),
  21. 'mock_packages': pf.get('mock_packages'),
  22. 'mock_copyin_files': pf.get('mock_copyin_files'),
  23. @@ -1970,17 +1969,16 @@ def generateBranchObjects(config, name, secrets=None):
  24. mozilla2_nightly_factory = NightlyBuildFactory(
  25. env=nightly_env,
  26. objdir=pf['platform_objdir'],
  27. platform=platform,
  28. hgHost=config['hghost'],
  29. repoPath=config['repo_path'],
  30. buildToolsRepoPath=config['build_tools_repo_path'],
  31. configRepoPath=config['config_repo_path'],
  32. - configSubDir=config['config_subdir'],
  33. profiledBuild=nightly_pgo,
  34. productName=pf['product_name'],
  35. mozconfig=pf['mozconfig'],
  36. srcMozconfig=pf.get('src_mozconfig'),
  37. use_mock=pf.get('use_mock'),
  38. mock_target=pf.get('mock_target'),
  39. mock_packages=pf.get('mock_packages'),
  40. mock_copyin_files=pf.get('mock_copyin_files'),
  41. @@ -2303,17 +2301,16 @@ def generateBranchObjects(config, name, secrets=None):
  42. mozilla2_xulrunner_factory = NightlyBuildFactory(
  43. env=xr_env,
  44. objdir=pf['platform_objdir'],
  45. platform=platform,
  46. hgHost=config['hghost'],
  47. repoPath=config['repo_path'],
  48. buildToolsRepoPath=config['build_tools_repo_path'],
  49. configRepoPath=config['config_repo_path'],
  50. - configSubDir=config['config_subdir'],
  51. profiledBuild=False,
  52. productName='xulrunner',
  53. mozconfig=mozconfig,
  54. srcMozconfig=pf.get('src_xulrunner_mozconfig'),
  55. stageServer=config['stage_server'],
  56. stageUsername=config['stage_username_xulrunner'],
  57. stageGroup=config['stage_group'],
  58. stageSshKey=config['stage_ssh_xulrunner_key'],
  59. diff --git a/process/factory.py b/process/factory.py
  60. index 7a381ed..678a1e6 100644
  61. --- a/process/factory.py
  62. +++ b/process/factory.py
  63. @@ -796,34 +796,34 @@ class MozillaBuildFactory(RequestSortingBuildFactory, MockMixin):
  64. server_cert=SIGNING_SERVER_CERT,
  65. slavedest=token,
  66. workdir='.',
  67. name='download_token',
  68. ))
  69.  
  70.  
  71. class MercurialBuildFactory(MozillaBuildFactory, MockMixin, TooltoolMixin):
  72. - def __init__(self, objdir, platform, configRepoPath, configSubDir,
  73. + def __init__(self, objdir, platform, configRepoPath,
  74. profiledBuild, mozconfig, srcMozconfig=None,
  75. productName=None,
  76. buildRevision=None, stageServer=None, stageUsername=None,
  77. stageGroup=None, stageSshKey=None, stageBasePath=None,
  78. stageProduct=None, post_upload_include_platform=False,
  79. ausBaseUploadDir=None, updatePlatform=None,
  80. downloadBaseURL=None, ausUser=None, ausSshKey=None,
  81. ausHost=None, nightly=False,
  82. checkTest=False, valgrindCheck=False,
  83. graphServer=None, graphSelector=None, graphBranch=None,
  84. baseName=None, uploadPackages=True, uploadSymbols=True,
  85. createSnippet=False, createPartial=False, doCleanup=True,
  86. packageSDK=False, packageTests=False, mozillaDir=None,
  87. mozillaSrcDir=None,
  88. enable_ccache=False, stageLogBaseUrl=None,
  89. triggeredSchedulers=None, triggerBuilds=False,
  90. - mozconfigBranch="production", useSharedCheckouts=False,
  91. + useSharedCheckouts=False,
  92. stagePlatform=None, testPrettyNames=False, l10nCheckTest=False,
  93. disableSymbols=False,
  94. doBuildAnalysis=False,
  95. doPostLinkerSize=False,
  96. downloadSubdir=None,
  97. multiLocale=False,
  98. multiLocaleMerge=True,
  99. compareLocalesRepoPath=None,
  100. @@ -856,17 +856,16 @@ class MercurialBuildFactory(MozillaBuildFactory, MockMixin, TooltoolMixin):
  101. self.addStep(FunctionalStep(
  102. name='set_buildids',
  103. func=setBuildIDProps,
  104. ))
  105.  
  106. self.objdir = objdir
  107. self.platform = platform
  108. self.configRepoPath = configRepoPath
  109. - self.configSubDir = configSubDir
  110. self.profiledBuild = profiledBuild
  111. self.mozconfig = mozconfig
  112. self.srcMozconfig = srcMozconfig
  113. self.productName = productName
  114. self.buildRevision = buildRevision
  115. self.stageServer = stageServer
  116. self.stageUsername = stageUsername
  117. self.stageGroup = stageGroup
  118. @@ -900,17 +899,16 @@ class MercurialBuildFactory(MozillaBuildFactory, MockMixin, TooltoolMixin):
  119. self.doCleanup = doCleanup
  120. self.packageSDK = packageSDK
  121. self.enablePackaging = enablePackaging
  122. self.enableInstaller = enableInstaller
  123. self.packageTests = packageTests
  124. self.enable_ccache = enable_ccache
  125. self.triggeredSchedulers = triggeredSchedulers
  126. self.triggerBuilds = triggerBuilds
  127. - self.mozconfigBranch = mozconfigBranch
  128. self.post_upload_include_platform = post_upload_include_platform
  129. self.useSharedCheckouts = useSharedCheckouts
  130. self.testPrettyNames = testPrettyNames
  131. self.l10nCheckTest = l10nCheckTest
  132. self.tooltool_manifest_src = tooltool_manifest_src
  133. self.tooltool_url_list = tooltool_url_list or []
  134. self.tooltool_script = tooltool_script or ['/tools/tooltool.py']
  135. self.tooltool_bootstrap = tooltool_bootstrap
  136. @@ -1352,38 +1350,19 @@ class MercurialBuildFactory(MozillaBuildFactory, MockMixin, TooltoolMixin):
  137. name='set_comments',
  138. property_name="comments",
  139. value=lambda build: build.source.changes[-
  140. 1].comments if len(
  141. build.source.changes) > 0 else "",
  142. ))
  143.  
  144. def addConfigSteps(self):
  145. - assert self.configRepoPath is not None
  146. - assert self.configSubDir is not None
  147. - assert self.mozconfig is not None
  148. -
  149. - configRepo = self.getRepository(self.configRepoPath)
  150. - hg_mozconfig = '%s/raw-file/%s/%s/%s/mozconfig' % (
  151. - configRepo, self.mozconfigBranch, self.configSubDir, self.mozconfig)
  152. - if self.srcMozconfig:
  153. - cmd = ['bash', '-c',
  154. - '''if [ -f "%(src_mozconfig)s" ]; then
  155. - echo Using in-tree mozconfig;
  156. - cp %(src_mozconfig)s .mozconfig;
  157. - else
  158. - echo Downloading mozconfig;
  159. - wget -O .mozconfig %(hg_mozconfig)s;
  160. - fi'''.replace("\n", "") % {'src_mozconfig': self.srcMozconfig, 'hg_mozconfig': hg_mozconfig}]
  161. - else:
  162. - cmd = ['wget', '-O', '.mozconfig', hg_mozconfig]
  163. -
  164. - self.addStep(RetryingShellCommand(
  165. + self.addStep(ShellCommand(
  166. name='get_mozconfig',
  167. - command=cmd,
  168. + command=['cp', self.srcMozconfig, '.mozconfig'],
  169. description=['getting', 'mozconfig'],
  170. descriptionDone=['got', 'mozconfig'],
  171. haltOnFailure=True
  172. ))
  173. self.addStep(ShellCommand(
  174. name='cat_mozconfig',
  175. command=['cat', '.mozconfig'],
  176. ))
  177. @@ -3053,18 +3032,18 @@ class BaseRepackFactory(MozillaBuildFactory, TooltoolMixin):
  178. # Override ignore_dirs so that we don't delete l10n nightly builds
  179. # before running a l10n nightly build
  180. ignore_dirs = MozillaBuildFactory.ignore_dirs + [normalizeName('*-nightly')]
  181.  
  182. extraConfigureArgs = []
  183.  
  184. def __init__(self, project, appName, l10nRepoPath,
  185. compareLocalesRepoPath, compareLocalesTag, stageServer,
  186. - stageUsername, stageSshKey=None, objdir='', platform='',
  187. - mozconfig=None,
  188. + stageUsername, mozconfig, stageSshKey=None, objdir='',
  189. + platform='',
  190. tree="notset", mozillaDir=None, mozillaSrcDir=None,
  191. l10nTag='default',
  192. mergeLocales=True,
  193. testPrettyNames=False,
  194. callClientPy=False,
  195. clientPyConfig=None,
  196. tooltool_manifest_src=None,
  197. tooltool_bootstrap="setup.sh",
  198. @@ -3215,31 +3194,19 @@ class BaseRepackFactory(MozillaBuildFactory, TooltoolMixin):
  199.  
  200. def processCommand(self, **kwargs):
  201. '''This function is overriden by MaemoNightlyRepackFactory to
  202. adjust the command and workdir approprietaly for mock
  203. '''
  204. return kwargs
  205.  
  206. def getMozconfig(self):
  207. - if not self.mozconfig:
  208. - return
  209. -
  210. - cmd = ['bash', '-c',
  211. - '''if [ -f "%(mozconfig)s" ]; then
  212. - echo Using in-tree mozconfig;
  213. - cp %(mozconfig)s .mozconfig;
  214. - else
  215. - echo Could not find in-tree mozconfig;
  216. - exit 1;
  217. - fi'''.replace("\n", "") % {'mozconfig': self.mozconfig}]
  218. -
  219. - self.addStep(RetryingShellCommand(
  220. + self.addStep(ShellCommand(
  221. name='get_mozconfig',
  222. - command=cmd,
  223. + command=['cp', self.mozconfig, '.mozconfig'],
  224. description=['getting', 'mozconfig'],
  225. descriptionDone=['got', 'mozconfig'],
  226. workdir='build/' + self.origSrcDir,
  227. haltOnFailure=True,
  228. ))
  229. self.addStep(ShellCommand(
  230. name='cat_mozconfig',
  231. command=['cat', '.mozconfig'],
  232. @@ -4025,30 +3992,45 @@ class StagingRepositorySetupFactory(ReleaseFactory):
  233. # Wait for hg.m.o to catch up
  234. self.addStep(ShellCommand(
  235. name='wait_for_hg',
  236. command=['sleep', '600'],
  237. description=['wait', 'for', 'hg'],
  238. ))
  239.  
  240.  
  241. -class SingleSourceFactory(ReleaseFactory):
  242. - def __init__(self, productName, version, baseTag, stagingServer,
  243. - stageUsername, stageSshKey, buildNumber, mozconfig,
  244. - configRepoPath, configSubDir, objdir='',
  245. - mozillaDir=None, mozillaSrcDir=None, autoconfDirs=['.'], buildSpace=2,
  246. - mozconfigBranch="production", appVersion=None, **kwargs):
  247. +class SingleSourceFactory(ReleaseFactory, TooltoolMixin):
  248. + def __init__(self,
  249. + productName,
  250. + version,
  251. + baseTag,
  252. + stagingServer,
  253. + stageUsername,
  254. + stageSshKey,
  255. + buildNumber,
  256. + mozconfig,
  257. + appVersion=None,
  258. + objdir='',
  259. + mozillaDir=None,
  260. + mozillaSrcDir=None,
  261. + autoconfDirs=['.'],
  262. + buildSpace=2,
  263. + tooltool_manifest_src=None,
  264. + tooltool_bootstrap="setup.sh",
  265. + tooltool_url_list=None,
  266. + tooltool_script=None,
  267. + **kwargs):
  268. ReleaseFactory.__init__(self, buildSpace=buildSpace, **kwargs)
  269.  
  270. self.mozconfig = mozconfig
  271. - self.configRepoPath = configRepoPath
  272. - self.configSubDir = configSubDir
  273. - self.mozconfigBranch = mozconfigBranch
  274. + self.tooltool_manifest_src = tooltool_manifest_src
  275. + self.tooltool_url_list = tooltool_url_list or []
  276. + self.tooltool_script = tooltool_script or ['/tools/tooltool.py']
  277. + self.tooltool_bootstrap = tooltool_bootstrap
  278. self.releaseTag = '%s_RELEASE' % (baseTag)
  279. -
  280. self.origSrcDir = self.branchName
  281.  
  282. # Mozilla subdir
  283. if mozillaDir:
  284. self.mozillaDir = '/%s' % mozillaDir
  285. self.mozillaSrcDir = '%s/%s' % (self.origSrcDir, mozillaDir)
  286. else:
  287. self.mozillaDir = ''
  288. @@ -4104,16 +4086,18 @@ class SingleSourceFactory(ReleaseFactory):
  289. ))
  290. self.addStep(SetProperty(
  291. name='hg_ident_revision',
  292. command=['hg', 'identify', '-i'],
  293. property='revision',
  294. workdir=self.mozillaSrcDir,
  295. haltOnFailure=True
  296. ))
  297. + if self.tooltool_manifest_src:
  298. + self.addTooltoolStep(workdir=self.origSrcDir)
  299. self.addConfigSteps(workdir=self.mozillaSrcDir)
  300. self.addStep(MockCommand(
  301. name='configure',
  302. command=self.makeCmd + ['-f', 'client.mk', 'configure'],
  303. workdir=self.mozillaSrcDir,
  304. env=self.env,
  305. description=['configure'],
  306. mock=self.use_mock,
  307. @@ -4140,55 +4124,23 @@ class SingleSourceFactory(ReleaseFactory):
  308. workdir="%s/%s" % (self.mozillaSrcDir, self.mozillaObjdir),
  309. env=uploadEnv,
  310. description=['upload files'],
  311. mock=self.use_mock,
  312. target=self.mock_target,
  313. ))
  314.  
  315. def addConfigSteps(self, workdir='build'):
  316. - assert self.configRepoPath is not None
  317. - assert self.configSubDir is not None
  318. - assert self.mozconfig is not None
  319. - configRepo = self.getRepository(self.configRepoPath)
  320. -
  321. - self.mozconfig = 'configs/%s/%s/mozconfig' % (self.configSubDir,
  322. - self.mozconfig)
  323. self.addStep(ShellCommand(
  324. - name='rm_configs',
  325. - command=['rm', '-rf', 'configs'],
  326. - description=['removing', 'configs'],
  327. - descriptionDone=['remove', 'configs'],
  328. - haltOnFailure=True,
  329. - workdir='.'
  330. - ))
  331. - self.addStep(MercurialCloneCommand(
  332. - name='hg_clone_configs',
  333. - command=['hg', 'clone', configRepo, 'configs'],
  334. - description=['checking', 'out', 'configs'],
  335. - descriptionDone=['checkout', 'configs'],
  336. - haltOnFailure=True,
  337. - workdir='.'
  338. - ))
  339. - self.addStep(ShellCommand(
  340. - name='hg_update',
  341. - command=['hg', 'update', '-r', self.mozconfigBranch],
  342. - description=['updating', 'mozconfigs'],
  343. - haltOnFailure=True,
  344. - workdir='./configs'
  345. - ))
  346. - self.addStep(ShellCommand(
  347. - # cp configs/mozilla2/$platform/$repo/$type/mozconfig
  348. - # .mozconfig
  349. name='cp_mozconfig',
  350. - command=['cp', self.mozconfig, '%s/.mozconfig' % workdir],
  351. + command=['cp', self.mozconfig, '.mozconfig'],
  352. description=['copying', 'mozconfig'],
  353. descriptionDone=['copy', 'mozconfig'],
  354. haltOnFailure=True,
  355. - workdir='.'
  356. + workdir=workdir,
  357. ))
  358. self.addStep(ShellCommand(
  359. name='cat_mozconfig',
  360. command=['cat', '.mozconfig'],
  361. workdir=workdir
  362. ))
  363.  
  364.  
  365. diff --git a/process/release.py b/process/release.py
  366. index 75b8213..b56ffd5 100644
  367. --- a/process/release.py
  368. +++ b/process/release.py
  369. @@ -494,18 +494,18 @@ def generateReleaseBranchObjects(releaseConfig, branchConfig,
  370. properties={
  371. 'platform': None,
  372. 'branch': 'release-%s' % sourceRepoInfo['name'],
  373. },
  374. env=dummy_builder_env,
  375. ))
  376.  
  377. if not releaseConfig.get('skip_source'):
  378. - pf = branchConfig['platforms']['linux']
  379. - mozconfig = 'linux/%s/release' % sourceRepoInfo['name']
  380. + pf = branchConfig['platforms']['linux64']
  381. + mozconfig = '%s/config/mozconfigs/linux64/release' % releaseConfig['appName']
  382. platform_env = pf['env'].copy()
  383. platform_env['COMM_REV'] = releaseTag
  384. platform_env['MOZILLA_REV'] = releaseTag
  385. # do not use use_mock(platform) check because we are building source
  386. # packages on the linux platform, else the |platform in mock_platforms|
  387. # check will fail for android.
  388. source_use_mock = releaseConfig.get('use_mock')
  389.  
  390. @@ -522,24 +522,24 @@ def generateReleaseBranchObjects(releaseConfig, branchConfig,
  391. stagingServer=branchConfig['stage_server'],
  392. stageUsername=branchConfig['stage_username'],
  393. stageSshKey=branchConfig['stage_ssh_key'],
  394. buildNumber=releaseConfig['buildNumber'],
  395. autoconfDirs=['.', 'js/src'],
  396. clobberURL=clobberer_url,
  397. clobberBranch='release-%s' % sourceRepoInfo['name'],
  398. mozconfig=mozconfig,
  399. - configRepoPath=branchConfig['config_repo_path'],
  400. - configSubDir=branchConfig['config_subdir'],
  401. signingServers=getSigningServers('linux'),
  402. - mozconfigBranch=releaseTag,
  403. use_mock=source_use_mock,
  404. mock_target=pf.get('mock_target'),
  405. mock_packages=pf.get('mock_packages'),
  406. mock_copyin_files=pf.get('mock_copyin_files'),
  407. + tooltool_manifest_src=pf.get('tooltool_manifest_src', None),
  408. + tooltool_url_list=branchConfig.get('tooltool_url_list', []),
  409. + tooltool_script=pf.get('tooltool_script'),
  410. )
  411.  
  412. builders.append({
  413. 'name': builderPrefix('%s_source' % releaseConfig['productName']),
  414. 'slavenames': branchConfig['platforms']['linux']['slaves'] +
  415. branchConfig['platforms']['linux64']['slaves'],
  416. 'category': builderPrefix(''),
  417. 'builddir': builderPrefix(
  418. @@ -556,17 +556,17 @@ def generateReleaseBranchObjects(releaseConfig, branchConfig,
  419. 'platform': None,
  420. 'branch': 'release-%s' % sourceRepoInfo['name'],
  421. }
  422. })
  423. deliverables_builders.append(
  424. builderPrefix('%s_source' % releaseConfig['productName']))
  425.  
  426. if releaseConfig.get('xulrunnerPlatforms'):
  427. - mozconfig = 'linux/%s/xulrunner' % sourceRepoInfo['name']
  428. + mozconfig = '%s/config/mozconfigs/linux64/release' % releaseConfig['appName']
  429. xulrunner_source_factory = SingleSourceFactory(
  430. env=pf['env'],
  431. objdir=pf['platform_objdir'],
  432. hgHost=branchConfig['hghost'],
  433. buildToolsRepoPath=tools_repo_path,
  434. repoPath=sourceRepoInfo['path'],
  435. productName='xulrunner',
  436. version=releaseConfig['version'],
  437. @@ -575,24 +575,24 @@ def generateReleaseBranchObjects(releaseConfig, branchConfig,
  438. stagingServer=branchConfig['stage_server'],
  439. stageUsername=branchConfig['stage_username_xulrunner'],
  440. stageSshKey=branchConfig['stage_ssh_xulrunner_key'],
  441. buildNumber=releaseConfig['buildNumber'],
  442. autoconfDirs=['.', 'js/src'],
  443. clobberURL=clobberer_url,
  444. clobberBranch='release-%s' % sourceRepoInfo['name'],
  445. mozconfig=mozconfig,
  446. - configRepoPath=branchConfig['config_repo_path'],
  447. - configSubDir=branchConfig['config_subdir'],
  448. signingServers=getSigningServers('linux'),
  449. - mozconfigBranch=releaseTag,
  450. use_mock=use_mock('linux'),
  451. mock_target=pf.get('mock_target'),
  452. mock_packages=pf.get('mock_packages'),
  453. mock_copyin_files=pf.get('mock_copyin_files'),
  454. + tooltool_manifest_src=pf.get('tooltool_manifest_src', None),
  455. + tooltool_url_list=branchConfig.get('tooltool_url_list', []),
  456. + tooltool_script=pf.get('tooltool_script'),
  457. )
  458.  
  459. builders.append({
  460. 'name': builderPrefix('xulrunner_source'),
  461. 'slavenames': branchConfig['platforms']['linux']['slaves'] +
  462. branchConfig['platforms']['linux64']['slaves'],
  463. 'category': builderPrefix(''),
  464. 'builddir': builderPrefix('xulrunner_source'),
  465. @@ -679,17 +679,16 @@ def generateReleaseBranchObjects(releaseConfig, branchConfig,
  466. build_factory = ReleaseBuildFactory(
  467. env=platform_env,
  468. objdir=pf['platform_objdir'],
  469. platform=platform,
  470. hgHost=branchConfig['hghost'],
  471. repoPath=sourceRepoInfo['path'],
  472. buildToolsRepoPath=tools_repo_path,
  473. configRepoPath=branchConfig['config_repo_path'],
  474. - configSubDir=branchConfig['config_subdir'],
  475. profiledBuild=pf['profiled_build'],
  476. mozconfig=mozconfig,
  477. srcMozconfig=releaseConfig.get('mozconfigs', {}).get(platform),
  478. buildRevision=releaseTag,
  479. stageServer=branchConfig['stage_server'],
  480. stageUsername=branchConfig['stage_username'],
  481. stageGroup=branchConfig['stage_group'],
  482. stageSshKey=branchConfig['stage_ssh_key'],
  483. @@ -723,17 +722,16 @@ def generateReleaseBranchObjects(releaseConfig, branchConfig,
  484. mozharnessRepoPath=mozharness_repo_path,
  485. mozharnessTag=releaseTag,
  486. multiLocaleScript=pf.get('multi_locale_script'),
  487. multiLocaleConfig=multiLocaleConfig,
  488. mozharnessMultiOptions=mozharnessMultiOptions,
  489. usePrettyNames=releaseConfig.get('usePrettyNames', True),
  490. enableUpdatePackaging=releaseConfig.get(
  491. 'enableUpdatePackaging', True),
  492. - mozconfigBranch=releaseTag,
  493. signingServers=getSigningServers(platform),
  494. createPartial=releaseConfig.get(
  495. 'enablePartialMarsAtBuildTime', True),
  496. mozillaDir=mozillaDir,
  497. mozillaSrcDir=mozillaSrcDir,
  498. enableInstaller=pf.get('enable_installer', False),
  499. tooltool_manifest_src=pf.get('tooltool_manifest_src', None),
  500. tooltool_url_list=branchConfig.get('tooltool_url_list', []),
  501. @@ -983,17 +981,16 @@ def generateReleaseBranchObjects(releaseConfig, branchConfig,
  502. xulrunner_build_factory = XulrunnerReleaseBuildFactory(
  503. env=xr_env,
  504. objdir=pf['platform_objdir'],
  505. platform=platform,
  506. hgHost=branchConfig['hghost'],
  507. repoPath=sourceRepoInfo['path'],
  508. buildToolsRepoPath=tools_repo_path,
  509. configRepoPath=branchConfig['config_repo_path'],
  510. - configSubDir=branchConfig['config_subdir'],
  511. profiledBuild=None,
  512. mozconfig='%s/%s/xulrunner' % (
  513. platform, sourceRepoInfo['name']),
  514. srcMozconfig=releaseConfig.get(
  515. 'xulrunner_mozconfigs', {}).get(platform),
  516. buildRevision=releaseTag,
  517. stageServer=branchConfig['stage_server'],
  518. stageUsername=branchConfig['stage_username_xulrunner'],
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement