Merge remote-tracking branch 'origin/master' into custom

This commit is contained in:
Roy Tam 2019-11-28 10:34:50 +08:00
commit 09a915bd50
24 changed files with 392 additions and 74 deletions

View file

@ -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

View file

@ -98,7 +98,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)

View file

@ -6,13 +6,16 @@ installer:
@$(MAKE) -C application/palemoon/installer installer
package:
@$(MAKE) -C application/palemoon/installer
@$(MAKE) -C application/palemoon/installer make-archive
mozpackage:
@$(MAKE) -C application/palemoon/installer make-package
package-compare:
@$(MAKE) -C application/palemoon/installer package-compare
stage-package:
@$(MAKE) -C application/palemoon/installer stage-package
@$(MAKE) -C application/palemoon/installer stage-package make-buildinfo-file
install::
@$(MAKE) -C application/palemoon/installer install

View file

@ -109,7 +109,7 @@ INSTALL_SDK = 1
endif
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)