diff options
| author | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-12-09 10:04:08 +0100 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-12-09 10:04:08 +0100 |
| commit | 1110944d4b3dffbd822d22ad2cc75a32eda718d7 (patch) | |
| tree | 09cfadcb5b60f687fc8bf463fca69d80727e8014 /toolkit | |
| parent | 18159927e8f37a1858f9757803b20744fcfff505 (diff) | |
| parent | 647d14de862cedc9332e4e9714edf4f798f4cc65 (diff) | |
| download | UXP-1110944d4b3dffbd822d22ad2cc75a32eda718d7.tar UXP-1110944d4b3dffbd822d22ad2cc75a32eda718d7.tar.gz UXP-1110944d4b3dffbd822d22ad2cc75a32eda718d7.tar.lz UXP-1110944d4b3dffbd822d22ad2cc75a32eda718d7.tar.xz UXP-1110944d4b3dffbd822d22ad2cc75a32eda718d7.zip | |
Merge branch 'master' into release
Diffstat (limited to 'toolkit')
| -rw-r--r-- | toolkit/mozapps/installer/packager-uxp.mk | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/toolkit/mozapps/installer/packager-uxp.mk b/toolkit/mozapps/installer/packager-uxp.mk index 8d7cb4e62..3125c04f1 100644 --- a/toolkit/mozapps/installer/packager-uxp.mk +++ b/toolkit/mozapps/installer/packager-uxp.mk @@ -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 |