Align mar generation on Windows with other platforms.
parent
cc68b48eb2
commit
1acf780915
|
@ -18,10 +18,6 @@ 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
|
||||
|
|
|
@ -55,6 +55,7 @@ stage-package: $(MOZ_PKG_MANIFEST) $(MOZ_PKG_MANIFEST_DEPS)
|
|||
$(MOZ_PKG_MANIFEST) '$(DIST)' '$(DIST)'/$(STAGEPATH)$(MOZ_PKG_DIR)$(if $(MOZ_PKG_MANIFEST),,$(_BINPATH)) \
|
||||
$(if $(filter omni,$(MOZ_PACKAGER_FORMAT)),$(if $(NON_OMNIJAR_FILES),--non-resource $(NON_OMNIJAR_FILES)))
|
||||
$(PYTHON) $(MOZILLA_DIR)/toolkit/mozapps/installer/find-dupes.py $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)
|
||||
@(cd $(DIST)/$(MOZ_PKG_DIR) && $(CREATE_PRECOMPLETE_CMD))
|
||||
ifdef MOZ_PACKAGE_JSSHELL
|
||||
# Package JavaScript Shell
|
||||
@echo 'Packaging JavaScript Shell...'
|
||||
|
|
|
@ -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)' \
|
||||
|
|
Loading…
Reference in New Issue