bug 544963 - re-enable option to build cab installer r=mfinkle

This commit is contained in:
Brad Lassey 2010-02-09 12:46:29 -05:00
parent a334449a6a
commit b6c41f7bd2

View File

@ -46,6 +46,7 @@ include $(DEPTH)/config/autoconf.mk
GRE_MILESTONE = $(shell $(PYTHON) $(topsrcdir)/config/printconfigsetting.py $(LIBXUL_DIST)/bin/platform.ini Build Milestone)
GRE_BUILDID = $(shell $(PYTHON) $(topsrcdir)/config/printconfigsetting.py $(LIBXUL_DIST)/bin/platform.ini Build BuildID)
ABS_OBJDIR=`cd $(DEPTH); pwd`
ABS_TOPSRCDIR=$(shell cd $(topsrcdir); pwd)
BASE64_ICON = dist/branding/fennec_maemo_icon26.txt
MOZ_DEB_TIMESTAMP = "$(shell date +"%a, %d %b %Y %T %z" )"
MOZ_APP_BUILDID = "$(shell date +"%Y%m%d%H%M%S" )"
@ -183,11 +184,23 @@ VSINSTALLDIR ?= $(error VSINSTALLDIR not set, must be set to the Visual Studio i
UNPACKAGE = $(LIBXUL_DIST)/xulrunner*$(PKG_SUFFIX)
installer: stage-package package-xulrunner
ifdef MOZ_FASTSTART
CABARGS += -faststart
endif
cab: stage-package package-xulrunner
cd $(DIST) && $(PYTHON) $(ABS_TOPSRCDIR)/build/package/wince/make_wince_cab.py $(CABARGS) "$(VSINSTALLDIR)/SmartDevices/SDK/SDKTools/cabwiz.exe" "$(MOZ_PKG_DIR)" "$(MOZ_APP_DISPLAYNAME)" "$(PKG_PATH)$(PKG_BASENAME).cab" && echo "Installer $(PKG_PATH)$(PKG_BASENAME).cab created!"
installer: 7zip-installer zip
zip:
cd $(DIST) && $(ZIP) -r9D $(PACKAGE) $(MOZ_PKG_DIR)
7zip-installer: stage-package package-xulrunner
$(NSINSTALL) -D $(DIST)/$(PKG_PATH)
cd $(DIST) && $(PYTHON) $(topsrcdir)/build/package/wince/make_wince_cab.py -setupdll -s "$(VSINSTALLDIR)/SmartDevices/SDK/SDKTools/cabwiz.exe" "$(MOZ_PKG_DIR)" "$(MOZ_APP_DISPLAYNAME)" "$(MOZ_PKG_DIR)/setup.cab"
cd $(DIST) && $(PYTHON) $(ABS_TOPSRCDIR)/build/package/wince/make_wince_cab.py -setupdll -s "$(VSINSTALLDIR)/SmartDevices/SDK/SDKTools/cabwiz.exe" "$(MOZ_PKG_DIR)" "$(MOZ_APP_DISPLAYNAME)" "$(MOZ_PKG_DIR)/setup.cab"
$(NSINSTALL) $(DIST)/$(MOZ_PKG_DIR)/setup.ini $(DIST)
cd $(DIST) && mv $(MOZ_PKG_DIR)/xulrunner/uninstall.exe $(MOZ_PKG_DIR)/ && 7z a $(PKG_PATH)$(PKG_BASENAME).7z $(MOZ_PKG_DIR) setup.ini -x!$(MOZ_PKG_DIR)/xulrunner/xulrunner-stub-installer.sfx -x!$(MOZ_PKG_DIR)/setup.ini && cat $(MOZ_PKG_DIR)/xulrunner/xulrunner-stub-installer.sfx $(PKG_PATH)$(PKG_BASENAME).7z>$(PKG_PATH)$(PKG_BASENAME).exe && rm $(PKG_PATH)$(PKG_BASENAME).7z && rm setup.ini && $(ZIP) -r9D $(PACKAGE) $(MOZ_PKG_DIR)
cd $(DIST) && mv $(MOZ_PKG_DIR)/xulrunner/uninstall.exe $(MOZ_PKG_DIR)/ && 7z a $(PKG_PATH)$(PKG_BASENAME).7z $(MOZ_PKG_DIR) setup.ini -x!$(MOZ_PKG_DIR)/xulrunner/xulrunner-stub-installer.sfx -x!$(MOZ_PKG_DIR)/setup.ini && cat $(MOZ_PKG_DIR)/xulrunner/xulrunner-stub-installer.sfx $(PKG_PATH)$(PKG_BASENAME).7z>$(PKG_PATH)$(PKG_BASENAME).exe && rm $(PKG_PATH)$(PKG_BASENAME).7z && rm setup.ini
endif