Bug 502933: mobile installer changes to enable custom non-CAB installer, r=blassey
authorAlex Pakhotkin <alexp@mozilla.com>
Tue, 17 Nov 2009 13:07:13 -0800
changeset 65813 8af741558ebb992dcdd0b9cdbf554f94f018247d
parent 65812 108f9a52f92a8b383a008c27714631e35ec5d227
child 65814 0b2fce36e1ef1ff0840adf326599ac8baf7381a4
push id1
push userroot
push dateTue, 26 Apr 2011 22:38:44 +0000
treeherdermozilla-beta@bfdb6e623a36 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersblassey
bugs502933
Bug 502933: mobile installer changes to enable custom non-CAB installer, r=blassey
mobile/installer/Makefile.in
mobile/locales/en-US/installer/setup.ini
--- a/mobile/installer/Makefile.in
+++ b/mobile/installer/Makefile.in
@@ -155,17 +155,18 @@ endif
 ifeq ($(OS_TARGET),WINCE)
 
 VSINSTALLDIR ?= $(error VSINSTALLDIR not set, must be set to the Visual Studio install directory)
 
 UNPACKAGE = $(LIBXUL_DIST)/xulrunner*$(PKG_SUFFIX)
 
 installer: stage-package package-xulrunner
 	$(NSINSTALL) -D $(DIST)/$(PKG_PATH)
-	cd $(DIST) && $(PYTHON) $(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" && $(ZIP) -r9D $(PACKAGE) $(MOZ_PKG_DIR) && echo "Installer $(PKG_PATH)$(PKG_BASENAME).cab created!"
+	$(NSINSTALL) $(srcdir)/../locales/$(AB_CD)/installer/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 && 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
 
 DEB_BUILD_ARCH = $(shell dpkg-architecture -qDEB_BUILD_ARCH)
 # package name comes from mobile/installer/debian/changelog.in
 DEB_PKG_NAME  = $(MOZ_PKG_APPNAME)_$(MOZ_APP_VERSION)_$(DEB_BUILD_ARCH).deb
 # relative to $(DIST)
 UPLOAD_EXTRA_FILES += ../mobile/$(DEB_PKG_NAME)
new file mode 100644
--- /dev/null
+++ b/mobile/locales/en-US/installer/setup.ini
@@ -0,0 +1,17 @@
+; This file is in the UTF-8 encoding
+[Strings]
+AppShortName=Fennec
+AppLongName=Mozilla Fennec
+WindowCaption=Mozilla Fennec Setup
+InstallTo=Install Fennec to
+Install=Install
+Cancel=Cancel
+InstalledSuccessfully=Mozilla Fennec has been installed successfully.
+ExtractionError=Archive extraction error:
+ThereWereErrors=There were errors during installation:
+CreatingUserProfile=Creating user profile. Please wait...
+UninstallCaption=Mozilla Fennec Uninstall
+FilesWillBeRemoved=All files will be removed from
+AreYouSure=Are you sure?
+InstallationNotFound=Mozilla Fennec installation not found.
+UninstalledSuccessfully=Mozilla Fennec has been uninstalled successfully.