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

This commit is contained in:
Roy Tam 2019-12-10 10:51:12 +08:00
commit 39b5cb2fd9
6 changed files with 38 additions and 20 deletions

View file

@ -18,6 +18,10 @@ else
ifeq (WINNT,$(OS_ARCH))
cd $(DIST); $(CYGWIN_WRAPPER) 7z a -t7z -m0=lzma2 -mx=9 -aoa -bb3 $(PKG_BASENAME).7z $(MOZ_PKG_DIR)
else
# Other platforms such as Linux need the Package routine to spawn a pre-complete file
# Windows does not require this because it is dependent on generating the NSIS
# Installer which has its own call to generate the precomplete file
cd $(DIST)/$(MOZ_PKG_DIR); $(CREATE_PRECOMPLETE_CMD)
cd $(DIST); XZ_OPT=-9e $(TAR) cfJv $(PKG_BASENAME).tar.xz $(MOZ_PKG_DIR)
endif
endif