summaryrefslogtreecommitdiff
path: root/python
diff options
context:
space:
mode:
authorMatt A. Tobin <email@mattatobin.com>2019-11-27 13:21:01 -0500
committerMatt A. Tobin <email@mattatobin.com>2019-11-27 13:21:01 -0500
commit52cb294d2a5408d5eac6ac4ad5285165c6877932 (patch)
tree73410f3e5648ce9039180915834ad3a2d47f0b47 /python
parent185a9a750878ed1d9705fbd162dbfe9bf2e4ea0c (diff)
downloaduxp-52cb294d2a5408d5eac6ac4ad5285165c6877932.tar.gz
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
Diffstat (limited to 'python')
-rw-r--r--python/mozbuild/mozbuild/mach_commands.py17
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."""