Merge remote-tracking branch 'origin/tracking' into custom

This commit is contained in:
roytam1 2022-04-19 22:11:35 +08:00
commit 96fb72ec56
106 changed files with 4038 additions and 1148 deletions

View file

@ -1137,8 +1137,13 @@ class Mar(MachCommandBase):
@Command('mar', category='post-build',
description='Create the mar file for the built product for distribution.')
def mar(self):
return self._run_make(directory="./tools/update-packaging/", target='', ensure_exit_code=False)
@CommandArgument('--bz2', action='store_true',
help='Compress the mar package with old-style bz2 instead of xz')
def mar(self, bz2):
if bz2:
return self._run_make(directory="./tools/update-packaging/", target='mar-package-bz2', ensure_exit_code=False)
else:
return self._run_make(directory="./tools/update-packaging/", target='mar-package', ensure_exit_code=False)
@CommandProvider
class Install(MachCommandBase):