summaryrefslogtreecommitdiffstats
path: root/toolkit/mozapps/installer
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 /toolkit/mozapps/installer
parent185a9a750878ed1d9705fbd162dbfe9bf2e4ea0c (diff)
downloadUXP-52cb294d2a5408d5eac6ac4ad5285165c6877932.tar
UXP-52cb294d2a5408d5eac6ac4ad5285165c6877932.tar.gz
UXP-52cb294d2a5408d5eac6ac4ad5285165c6877932.tar.lz
UXP-52cb294d2a5408d5eac6ac4ad5285165c6877932.tar.xz
UXP-52cb294d2a5408d5eac6ac4ad5285165c6877932.zip
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 'toolkit/mozapps/installer')
-rw-r--r--toolkit/mozapps/installer/packager-uxp.mk23
1 files changed, 23 insertions, 0 deletions
diff --git a/toolkit/mozapps/installer/packager-uxp.mk b/toolkit/mozapps/installer/packager-uxp.mk
new file mode 100644
index 000000000..fdc9ccc18
--- /dev/null
+++ b/toolkit/mozapps/installer/packager-uxp.mk
@@ -0,0 +1,23 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+# We need to include the mozilla packaging routines because we are
+# very much still dependent on them
+include $(MOZILLA_DIR)/toolkit/mozapps/installer/packager.mk
+
+# This is currently only used on Windows and Linux
+# on other platforms such as Mac will fall back to the orginal
+# mozilla packaging
+make-archive:
+ifeq (,$(filter Linux WINNT,$(OS_ARCH)))
+ $(MAKE) make-package
+else
+ $(MAKE) stage-package make-buildinfo-file
+ @echo 'Compressing...'
+ifeq (WINNT,$(OS_ARCH))
+ cd $(DIST); $(CYGWIN_WRAPPER) 7z a -t7z -m0=lzma2 -mx=9 -aoa -bb3 $(PKG_BASENAME).7z $(MOZ_PKG_DIR)
+else
+ cd $(DIST); XZ_OPT=-9e $(TAR) cfJv $(PKG_BASENAME).tar.xz $(MOZ_PKG_DIR)
+endif
+endif