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

1 files changed, 16 insertions, 1 deletions

diff --git a/python/mozbuild/mozbuild/mach_commands.py b/python/mozbuild/mozbuild/mach_commands.py
index 05b1f104d3..26c05ee911 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):
@@ -1095,6 +1095,21 @@ class Package(MachCommandBase):
         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."""