Bug 322206 - Firefox net / stub installer - main stub patch. r=bbondy

browser/branding/aurora/branding.nsi

@@ -12,3 +12,10 @@
 !define CompanyName           "mozilla.org"
 !define URLInfoAbout          "http://www.mozilla.org"
 !define URLUpdateInfo         "http://www.mozilla.org/projects/firefox"
+
+!define URLStubDownload "http://download.mozilla.org/?product=firefox-latest&os=win&lang=${AB_CD}"
+!define URLManualDownload "http://download.mozilla.org/?product=firefox-latest&os=win&lang=${AB_CD}"
+
+# The installer's certificate name and issuer expected by the stub installer
+!define CertNameDownload   "Mozilla Corporation"
+!define CertIssuerDownload "Thawte Code Signing CA - G2"

browser/branding/nightly/branding.nsi

@@ -12,3 +12,10 @@
 !define CompanyName           "mozilla.org"
 !define URLInfoAbout          "http://www.mozilla.org"
 !define URLUpdateInfo         "http://www.mozilla.org/projects/firefox"
+
+!define URLStubDownload "http://download.mozilla.org/?product=firefox-latest&os=win&lang=${AB_CD}"
+!define URLManualDownload "http://download.mozilla.org/?product=firefox-latest&os=win&lang=${AB_CD}"
+
+# The installer's certificate name and issuer expected by the stub installer
+!define CertNameDownload   "Mozilla Corporation"
+!define CertIssuerDownload "Thawte Code Signing CA - G2"

browser/branding/official/branding.nsi

@@ -12,3 +12,10 @@
 !define CompanyName           "Mozilla Corporation"
 !define URLInfoAbout          "http://www.mozilla.com/${AB_CD}/"
 !define URLUpdateInfo         "http://www.mozilla.com/${AB_CD}/firefox/"
+
+!define URLStubDownload "http://download.mozilla.org/?product=firefox-latest&os=win&lang=${AB_CD}"
+!define URLManualDownload "http://download.mozilla.org/?product=firefox-latest&os=win&lang=${AB_CD}"
+
+# The installer's certificate name and issuer expected by the stub installer
+!define CertNameDownload   "Mozilla Corporation"
+!define CertIssuerDownload "Thawte Code Signing CA - G2"

browser/branding/unofficial/branding.nsi

@@ -12,3 +12,10 @@
 !define CompanyName           "mozilla.org"
 !define URLInfoAbout          "http://www.mozilla.org"
 !define URLUpdateInfo         "http://www.mozilla.org/projects/firefox"
+
+!define URLStubDownload "http://download.mozilla.org/?product=firefox-latest&os=win&lang=${AB_CD}"
+!define URLManualDownload "http://download.mozilla.org/?product=firefox-latest&os=win&lang=${AB_CD}"
+
+# The installer's certificate name and issuer expected by the stub installer
+!define CertNameDownload   "Mozilla Corporation"
+!define CertIssuerDownload "Thawte Code Signing CA - G2"

browser/installer/windows/Makefile.in

@@ -22,6 +22,7 @@ INSTALLER_FILES = \
 	app.tag \
 	nsis/installer.nsi \
 	nsis/uninstaller.nsi \
+	nsis/stub.nsi \
 	nsis/shared.nsh \
 	$(NULL)
 
@@ -31,7 +32,6 @@ INSTALLER_FILES += \
 	$(NULL)
 endif
 
-
 BRANDING_FILES = \
 	branding.nsi \
 	appname.bmp \

browser/installer/windows/nsis/defines.nsi.in

@@ -69,3 +69,20 @@ VIAddVersionKey "FileVersion"     "${AppVersion}"
 VIAddVersionKey "ProductVersion"  "${AppVersion}"
 # Comments is not used but left below commented out for future reference
 # VIAddVersionKey "Comments"        "Comments"
+
+!define TO_BE_DELETED "to_be_deleted"
+
+# It isn't possible to get the size of the installation prior to downloading
+# so the stub installer uses an estimate.
+!define APPROXIMATE_REQUIRED_SPACE_MB "42.2"
+
+# UI colors
+!define BOTTOM_BKGRD_COLOR 0xFFFFFF
+!define OPTIONS_BKGRD_COLOR 0xF0F0F0
+!define CONTROL_TEXT_COLOR 0x000000
+!define BLURB_TEXT_COLOR 0x666666
+!define FADED_TEXT_COLOR 0x999999
+# Control positions in Dialog Units
+!define OPTIONS_ITEM_LEFT_DU 90u
+!define OPTIONS_SUBITEM_LEFT_DU 119u
+!define INSTALL_BLURB_TOP_DU 78u

browser/locales/en-US/installer/nsisstrings.properties

@@ -26,6 +26,11 @@ INSTALL_BLURB2=That's because $BrandShortName is made by a non-profit to make br
 INSTALL_BLURB3=You're also joining a global community of users, contributors and developers working to make the best browser in the world.
 
 WARN_MIN_SUPPORTED_OS_MSG=Sorry, $BrandShortName can't be installed. This version of $BrandShortName requires ${MinSupportedVer} or newer.
+WARN_WRITE_ACCESS=You don't have access to write to the installation directory.\n\nClick OK to select a different directory.
+WARN_DISK_SPACE=You don't have sufficient disk space to install to this location.\n\nClick OK to select a different location.
+WARN_ROOT_INSTALL=Unable to install to the root of your disk.\n\nClick OK to select a different location.
+
+ERROR_DOWNLOAD=There was a problem downloading $BrandShortName\n\nClick OK to get the full download.
 
 INSTALL_BUTTON=&Install
 UPGRADE_BUTTON=&Upgrade

toolkit/mozapps/installer/windows/nsis/makensis.mk

@@ -44,6 +44,9 @@ $(CONFIG_DIR)/setup.exe::
 	$(INSTALL) $(addprefix $(MOZILLA_DIR)/other-licenses/nsis/Plugins/,$(CUSTOM_NSIS_PLUGINS)) $(CONFIG_DIR)
 	$(INSTALL) $(addprefix $(MOZILLA_DIR)/other-licenses/nsis/,$(CUSTOM_UI)) $(CONFIG_DIR)
 	cd $(CONFIG_DIR) && $(MAKENSISU) installer.nsi
+ifdef MOZ_STUB_INSTALLER
+	cd $(CONFIG_DIR) && $(MAKENSISU) stub.nsi
+endif
 # Support for building the uninstaller when repackaging locales
 ifeq ($(CONFIG_DIR),l10ngen)
 	cd $(CONFIG_DIR) && $(MAKENSISU) uninstaller.nsi
@@ -62,6 +65,8 @@ installer::
 	$(NSINSTALL) -D $(DIST)/$(PKG_INST_PATH)
 	cat $(CONFIG_DIR)/7zSD.sfx $(CONFIG_DIR)/app.tag $(CONFIG_DIR)/app.7z > "$(DIST)/$(PKG_INST_PATH)$(PKG_INST_BASENAME).exe"
 	chmod 0755 "$(DIST)/$(PKG_INST_PATH)$(PKG_INST_BASENAME).exe"
+	cp $(CONFIG_DIR)/stub.exe "$(DIST)/$(PKG_INST_PATH)$(PKG_INST_BASENAME)-stub.exe"
+	chmod 0755 "$(DIST)/$(PKG_INST_PATH)$(PKG_INST_BASENAME)-stub.exe"
 ifdef MOZ_EXTERNAL_SIGNING_FORMAT
 	$(MOZ_SIGN_CMD) $(foreach f,$(MOZ_EXTERNAL_SIGNING_FORMAT),-f $(f)) "$(DIST)/$(PKG_INST_PATH)$(PKG_INST_BASENAME).exe"
 endif