Align mar generation on Windows with other platforms

This makes mar generation dependent on packaging not installer
This commit is contained in:
Matt A. Tobin 2020-04-07 21:55:11 -04:00 • committed by Roy Tam
commit 837665b8d9
2 changed files with 1 additions and 11 deletions

View file

@ -15,13 +15,10 @@ ifeq (,$(filter SunOS Linux WINNT,$(OS_ARCH)))
else
$(MAKE) stage-package make-buildinfo-file
@echo 'Compressing...'
cd $(DIST)/$(MOZ_PKG_DIR); $(CREATE_PRECOMPLETE_CMD)
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