From 52cb294d2a5408d5eac6ac4ad5285165c6877932 Mon Sep 17 00:00:00 2001 From: "Matt A. Tobin" Date: Wed, 27 Nov 2019 13:21:01 -0500 Subject: No Issue - Use alternative packaging for Pale Moon and Basilisk * This adds what will eventually be a rewritten packaging routine while maintaining backwards compatibility with the original mozilla routine * Changes the build target and installer makefile to use the alternative packaging * Adds build target to specifically invoke the original mozilla routine * Update mach commands accordingly --- python/mozbuild/mozbuild/mach_commands.py | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) (limited to 'python') diff --git a/python/mozbuild/mozbuild/mach_commands.py b/python/mozbuild/mozbuild/mach_commands.py index 05b1f104d..26c05ee91 100644 --- a/python/mozbuild/mozbuild/mach_commands.py +++ b/python/mozbuild/mozbuild/mach_commands.py @@ -1084,7 +1084,7 @@ class Package(MachCommandBase): """Package the built product for distribution.""" @Command('package', category='post-build', - description='Package the built product for distribution as an APK, DMG, etc.') + description='Package the built product for distribution as an archive.') @CommandArgument('-v', '--verbose', action='store_true', help='Verbose output for what commands the packaging process is running.') def package(self, verbose=False): @@ -1094,6 +1094,21 @@ class Package(MachCommandBase): self.notify('Packaging complete') return ret +@CommandProvider +class Mozpackage(MachCommandBase): + """Package the built product for distribution.""" + + @Command('mozpackage', category='post-build', + description='Package the built product for distribution as an archive. (mozilla orginal routine)') + @CommandArgument('-v', '--verbose', action='store_true', + help='Verbose output for what commands the packaging process is running.') + def mozpackage(self, verbose=False): + ret = self._run_make(directory=".", target='mozpackage', + silent=not verbose, ensure_exit_code=False) + if ret == 0: + self.notify('Packaging complete') + return ret + @CommandProvider class Installer(MachCommandBase): """Create the windows installer for the built product.""" -- cgit v1.2.3