summaryrefslogtreecommitdiffstats
path: root/application/basilisk
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 /application/basilisk
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 'application/basilisk')
-rw-r--r--application/basilisk/build.mk7
-rw-r--r--application/basilisk/installer/Makefile.in2
2 files changed, 6 insertions, 3 deletions
diff --git a/application/basilisk/build.mk b/application/basilisk/build.mk
index 539c57ab1..f78105d9d 100644
--- a/application/basilisk/build.mk
+++ b/application/basilisk/build.mk
@@ -6,13 +6,16 @@ installer:
@$(MAKE) -C application/basilisk/installer installer
package:
- @$(MAKE) -C application/basilisk/installer
+ @$(MAKE) -C application/basilisk/installer make-archive
+
+mozpackage:
+ @$(MAKE) -C application/basilisk/installer make-package
package-compare:
@$(MAKE) -C application/basilisk/installer package-compare
stage-package:
- @$(MAKE) -C application/basilisk/installer stage-package
+ @$(MAKE) -C application/basilisk/installer stage-package make-buildinfo-file
sdk:
@$(MAKE) -C application/basilisk/installer make-sdk
diff --git a/application/basilisk/installer/Makefile.in b/application/basilisk/installer/Makefile.in
index 1ca3b8ee0..ef7df8bf4 100644
--- a/application/basilisk/installer/Makefile.in
+++ b/application/basilisk/installer/Makefile.in
@@ -95,7 +95,7 @@ endif
INSTALL_SDK = 1
include $(topsrcdir)/toolkit/mozapps/installer/signing.mk
-include $(topsrcdir)/toolkit/mozapps/installer/packager.mk
+include $(topsrcdir)/toolkit/mozapps/installer/packager-uxp.mk
ifeq (bundle, $(MOZ_FS_LAYOUT))
BINPATH = $(_BINPATH)