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 --- toolkit/mozapps/installer/packager-uxp.mk | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 toolkit/mozapps/installer/packager-uxp.mk (limited to 'toolkit/mozapps/installer') 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 -- cgit v1.2.3