зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1376550 - Make OSX complete.mar's generated via ./mach repackage mozharness configs r=aki
Support OSX Signed nightlies (in the complete.mar too) MozReview-Commit-ID: 6iPrPhjj34g --HG-- extra : rebase_source : 55a6bcf1910f1cae084cf32f6cf47ecf44b500aa
This commit is contained in:
Родитель
acdc65c932
Коммит
0142e0f146
|
@ -2,16 +2,23 @@ import os
|
|||
|
||||
config = {
|
||||
"input_home": "{abs_work_dir}/inputs",
|
||||
"output_home": "{abs_work_dir}/artifacts",
|
||||
"src_mozconfig": "browser/config/mozconfigs/macosx64/repack",
|
||||
|
||||
"download_config": {
|
||||
"target.tar.gz": os.environ.get("SIGNED_INPUT"),
|
||||
"mar": os.environ.get("UNSIGNED_MAR"),
|
||||
},
|
||||
|
||||
"repackage_config": [[
|
||||
"dmg",
|
||||
"-i", "{abs_work_dir}/inputs/target.tar.gz",
|
||||
"-o", "{output_home}/target.dmg"
|
||||
], [
|
||||
"mar",
|
||||
"-i", "{abs_work_dir}/inputs/target.tar.gz",
|
||||
"--mar", "{abs_work_dir}/inputs/mar",
|
||||
"-o", "{output_home}/target.complete.mar"
|
||||
]],
|
||||
|
||||
# ToolTool
|
||||
|
|
|
@ -37,6 +37,10 @@ class Repackage(BaseScript):
|
|||
if not status:
|
||||
self.fatal("Unable to fetch signed input from %s" % url)
|
||||
|
||||
if 'mar' in path:
|
||||
# Ensure mar is executable
|
||||
self.chmod(os.path.join(input_home, path), 0755)
|
||||
|
||||
def setup(self):
|
||||
self._run_tooltool()
|
||||
self._get_mozconfig()
|
||||
|
@ -46,13 +50,14 @@ class Repackage(BaseScript):
|
|||
if self.abs_dirs:
|
||||
return self.abs_dirs
|
||||
abs_dirs = super(Repackage, self).query_abs_dirs()
|
||||
config = self.config
|
||||
for directory in abs_dirs:
|
||||
value = abs_dirs[directory]
|
||||
abs_dirs[directory] = value
|
||||
dirs = {}
|
||||
dirs['abs_tools_dir'] = os.path.join(abs_dirs['abs_work_dir'], 'tools')
|
||||
dirs['abs_mozilla_dir'] = os.path.join(abs_dirs['abs_work_dir'], 'src')
|
||||
dirs['output_home'] = os.path.join(abs_dirs['abs_work_dir'], 'artifacts')
|
||||
dirs['output_home'] = config['output_home'].format(**abs_dirs)
|
||||
for key in dirs.keys():
|
||||
if key not in abs_dirs:
|
||||
abs_dirs[key] = dirs[key]
|
||||
|
|
Загрузка…
Ссылка в новой задаче