From d0eee8f01d74d6a936ec7515b40b8b50f114bc9a Mon Sep 17 00:00:00 2001 From: "Matt A. Tobin" Date: Tue, 7 Apr 2020 21:55:11 -0400 Subject: Align mar generation on Windows with other platforms This makes mar generation dependent on packaging not installer --- toolkit/mozapps/installer/packager-uxp.mk | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'toolkit/mozapps') diff --git a/toolkit/mozapps/installer/packager-uxp.mk b/toolkit/mozapps/installer/packager-uxp.mk index 3125c04f1..856ca434c 100644 --- a/toolkit/mozapps/installer/packager-uxp.mk +++ b/toolkit/mozapps/installer/packager-uxp.mk @@ -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 -- cgit v1.2.3