bug 550319 - update m-c mozconfigs, fix packaging scripts for compatability r=mfinkle
--- a/mobile/installer/Makefile.in
+++ b/mobile/installer/Makefile.in
@@ -122,16 +122,22 @@ else
PACKAGE_XULRUNNER = package-xulrunner
UNPACKAGE = $(LIBXUL_DIST)/xulrunner*$(PKG_SUFFIX)
endif
include $(topsrcdir)/toolkit/mozapps/installer/packager.mk
DEBDESTDIR=debian/$(MOZ_APP_NAME)
+ifdef LIBXUL_SDK
+MOZ_GRE_PKG_DIR=$(MOZ_PKG_DIR)/xulrunner
+else
+MOZ_GRE_PKG_DIR=$(MOZ_PKG_DIR)
+endif
+
package-xulrunner:
ifdef LIBXUL_SDK
ifndef SYSTEM_LIBXUL
@echo "Packaging xulrunner..."
@rm -rf $(LIBXUL_DIST)/xulrunner*
@$(MAKE) -C $(LIBXUL_DIST)/.. package || echo "Perhaps you're trying to package a prebuilt SDK. See 'https://wiki.mozilla.org/Mobile/Build/Fennec#Build' for more information."
@cd $(DIST)/$(MOZ_PKG_DIR); $(UNMAKE_PACKAGE)
@echo "Removing unpackaged files... (the ones xulrunner/installer keeps)"
@@ -213,14 +219,24 @@ 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) $(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
+ifdef LIBXUL_SDK
+ mv $(DIST)/$(MOZ_GRE_PKG_DIR)/uninstall.exe $(DIST)/$(MOZ_PKG_DIR)/
+endif
+ cd $(DIST) && \
+ 7z a $(PKG_PATH)$(PKG_BASENAME).7z $(MOZ_PKG_DIR) setup.ini \
+ -x!$(MOZ_GRE_PKG_DIR)/xulrunner-stub-installer.sfx \
+ -x!$(MOZ_PKG_DIR)/setup.ini && \
+ cat $(MOZ_GRE_PKG_DIR)/xulrunner-stub-installer.sfx \
+ $(PKG_PATH)$(PKG_BASENAME).7z>$(PKG_PATH)$(PKG_BASENAME).exe && \
+ rm $(PKG_PATH)$(PKG_BASENAME).7z && \
+ rm setup.ini
endif
# relative to $(DIST)
UPLOAD_EXTRA_FILES += ../mobile/$(DEB_PKG_NAME)