Merge branch 'master' into ported-moebius

# Conflicts:
#	browser/installer/windows/nsis/stub.nsi

1 files changed, 18 insertions, 0 deletions

diff --git a/python/mozbuild/mozbuild/mach_commands.py b/python/mozbuild/mozbuild/mach_commands.py
index b6802a47c..ae71d0868 100644
--- a/python/mozbuild/mozbuild/mach_commands.py
+++ b/python/mozbuild/mozbuild/mach_commands.py
@@ -1076,6 +1076,24 @@ class Package(MachCommandBase):
         return ret
 
 @CommandProvider
+class Installer(MachCommandBase):
+    """Create the windows installer for the built product."""
+
+    @Command('installer', category='post-build',
+        description='Create the installer for the built product for distribution.')
+    def installer(self):
+        return self._run_make(directory=".", target='installer', ensure_exit_code=False)
+
+@CommandProvider
+class Mar(MachCommandBase):
+    """Create the mar file for the built product."""
+
+    @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)
+
+@CommandProvider
 class Install(MachCommandBase):
     """Install a package."""