diff options
| author | Matt A. Tobin <email@mattatobin.com> | 2020-04-07 21:55:11 -0400 |
|---|---|---|
| committer | Matt A. Tobin <email@mattatobin.com> | 2020-04-07 21:55:11 -0400 |
| commit | d0eee8f01d74d6a936ec7515b40b8b50f114bc9a (patch) | |
| tree | 3ef6987344119230b19fd6400d12feb2e7e9938b | |
| parent | 2383a02b59a11e248f86b361be4a675e8682ba1b (diff) | |
| download | uxp-d0eee8f01d74d6a936ec7515b40b8b50f114bc9a.tar.gz | |
Align mar generation on Windows with other platforms
This makes mar generation dependent on packaging not installer
| -rw-r--r-- | toolkit/mozapps/installer/packager-uxp.mk | 5 | ||||
| -rw-r--r-- | tools/update-packaging/Makefile.in | 7 |
2 files changed, 1 insertions, 11 deletions
diff --git a/toolkit/mozapps/installer/packager-uxp.mk b/toolkit/mozapps/installer/packager-uxp.mk index 3125c04f13..856ca434c3 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 diff --git a/tools/update-packaging/Makefile.in b/tools/update-packaging/Makefile.in index 7c55958b62..4788a55752 100644 --- a/tools/update-packaging/Makefile.in +++ b/tools/update-packaging/Makefile.in @@ -34,8 +34,6 @@ OVERRIDE_DEFAULT_GOAL := full-update full-update:: complete-patch ifeq ($(OS_TARGET), WINNT) -MOZ_PKG_FORMAT := SFX7Z -UNPACKAGE = '$(subst $(DIST),$(ABS_DIST),$(INSTALLER_PACKAGE))' ifdef AB_CD UNPACKAGE = '$(PACKAGE_BASE_DIR)/$(PACKAGE)' endif @@ -54,11 +52,6 @@ endif dir-stage := $(call mkdir_deps,$(STAGE_DIR)) complete-patch:: $(dir-stage) -ifeq ($(OS_TARGET), WINNT) - test -f $(UNPACKAGE) - $(RM) -rf '$(PACKAGE_DIR)' - cd $(PACKAGE_BASE_DIR) && $(INNER_UNMAKE_PACKAGE) -endif MAR=$(MAR_BIN) \ $(srcdir)/make_full_update.sh \ '$(DIST)/$(COMPLETE_MAR)' \ |