Bug 322206 - Firefox net / stub installer - stub build system prep. r=bbondy
authorRobert Strong <robert.bugzilla@gmail.com>
Fri, 28 Sep 2012 15:46:22 -0700
changeset 108670 5da759429ea1cafe171434cc44f1291fb9294d86
parent 108669 f76ec4fa1f970b1bcbded3b152da0f7d9e950717
child 108671 d2ec58a4464751e311807058c7a4f21155a101d1
push id82
push usershu@rfrn.org
push dateFri, 05 Oct 2012 13:20:22 +0000
reviewersbbondy
bugs322206
milestone18.0a1
Bug 322206 - Firefox net / stub installer - stub build system prep. r=bbondy
browser/branding/aurora/Makefile.in
browser/branding/nightly/Makefile.in
browser/branding/official/Makefile.in
browser/branding/unofficial/Makefile.in
browser/installer/windows/Makefile.in
toolkit/mozapps/installer/windows/nsis/makensis.mk
--- a/browser/branding/aurora/Makefile.in
+++ b/browser/branding/aurora/Makefile.in
@@ -17,16 +17,23 @@ DIRS = \
 PREF_JS_EXPORTS = $(srcdir)/pref/firefox-branding.js
 
 include $(topsrcdir)/config/rules.mk
 
 WINDOWS_BRANDING_FILES = \
 	firefox.ico \
 	document.ico \
 	branding.nsi \
+	appname.bmp \
+	bgintro.bmp \
+	bgplain.bmp \
+	clock.bmp \
+	particles.bmp \
+	pencil.bmp \
+	pencil-rtl.bmp \
 	wizHeader.bmp \
 	wizHeaderRTL.bmp \
 	wizWatermark.bmp \
 	newwindow.ico \
 	newtab.ico \
 	pbmode.ico \
 	$(NULL)
 
--- a/browser/branding/nightly/Makefile.in
+++ b/browser/branding/nightly/Makefile.in
@@ -17,16 +17,23 @@ DIRS = \
 PREF_JS_EXPORTS = $(srcdir)/pref/firefox-branding.js
 
 include $(topsrcdir)/config/rules.mk
 
 WINDOWS_BRANDING_FILES = \
 	firefox.ico \
 	document.ico \
 	branding.nsi \
+	appname.bmp \
+	bgintro.bmp \
+	bgplain.bmp \
+	clock.bmp \
+	particles.bmp \
+	pencil.bmp \
+	pencil-rtl.bmp \
 	wizHeader.bmp \
 	wizHeaderRTL.bmp \
 	wizWatermark.bmp \
 	newwindow.ico \
 	newtab.ico \
 	pbmode.ico \
 	$(NULL)
 
--- a/browser/branding/official/Makefile.in
+++ b/browser/branding/official/Makefile.in
@@ -17,16 +17,23 @@ DIRS = \
 PREF_JS_EXPORTS = $(srcdir)/pref/firefox-branding.js
 
 include $(topsrcdir)/config/rules.mk
 
 WINDOWS_BRANDING_FILES = \
 	firefox.ico \
 	document.ico \
 	branding.nsi \
+	appname.bmp \
+	bgintro.bmp \
+	bgplain.bmp \
+	clock.bmp \
+	particles.bmp \
+	pencil.bmp \
+	pencil-rtl.bmp \
 	wizHeader.bmp \
 	wizHeaderRTL.bmp \
 	wizWatermark.bmp \
 	newwindow.ico \
 	newtab.ico \
 	pbmode.ico \
 	$(NULL)
 
--- a/browser/branding/unofficial/Makefile.in
+++ b/browser/branding/unofficial/Makefile.in
@@ -17,16 +17,23 @@ DIRS = \
 PREF_JS_EXPORTS = $(srcdir)/pref/firefox-branding.js
 
 include $(topsrcdir)/config/rules.mk
 
 WINDOWS_BRANDING_FILES = \
 	firefox.ico \
 	document.ico \
 	branding.nsi \
+	appname.bmp \
+	bgintro.bmp \
+	bgplain.bmp \
+	clock.bmp \
+	particles.bmp \
+	pencil.bmp \
+	pencil-rtl.bmp \
 	wizHeader.bmp \
 	wizHeaderRTL.bmp \
 	wizWatermark.bmp \
 	newwindow.ico \
 	newtab.ico \
 	pbmode.ico \
 	$(NULL)
 
--- a/browser/installer/windows/Makefile.in
+++ b/browser/installer/windows/Makefile.in
@@ -29,16 +29,23 @@ ifdef MOZ_MAINTENANCE_SERVICE
 INSTALLER_FILES += \
 	nsis/maintenanceservice_installer.nsi \
 	$(NULL)
 endif
 
 
 BRANDING_FILES = \
 	branding.nsi \
+	appname.bmp \
+	bgintro.bmp \
+	bgplain.bmp \
+	clock.bmp \
+	particles.bmp \
+	pencil.bmp \
+	pencil-rtl.bmp \
 	wizHeader.bmp \
 	wizHeaderRTL.bmp \
 	wizWatermark.bmp \
 	$(NULL)
 
 DEFINES += \
 	-DAB_CD=$(AB_CD) \
 	-DMOZ_APP_NAME=$(MOZ_APP_NAME) \
--- a/toolkit/mozapps/installer/windows/nsis/makensis.mk
+++ b/toolkit/mozapps/installer/windows/nsis/makensis.mk
@@ -19,21 +19,23 @@ TOOLKIT_NSIS_FILES = \
 	setup.ico \
 	version.nsh \
 	$(NULL)
 
 CUSTOM_NSIS_PLUGINS = \
 	AccessControl.dll \
 	AppAssocReg.dll \
 	ApplicationID.dll \
+	CertCheck.dll \
 	CityHash.dll \
+	InetBgDL.dll \
 	InvokeShellVerb.dll \
+	ServicesHelper.dll \
 	ShellLink.dll \
 	UAC.dll \
-	ServicesHelper.dll \
 	$(NULL)
 
 $(CONFIG_DIR)/setup.exe::
 	$(INSTALL) $(addprefix $(MOZILLA_DIR)/toolkit/mozapps/installer/windows/nsis/,$(TOOLKIT_NSIS_FILES)) $(CONFIG_DIR)
 	$(INSTALL) $(addprefix $(MOZILLA_DIR)/other-licenses/nsis/Plugins/,$(CUSTOM_NSIS_PLUGINS)) $(CONFIG_DIR)
 	cd $(CONFIG_DIR) && $(MAKENSISU) installer.nsi
 # Support for building the uninstaller when repackaging locales
 ifeq ($(CONFIG_DIR),l10ngen)