fix for bug #340167. exit survey checkbox not appearing in NSIS uninstaller. r/a=rstrong

browser/installer/Makefile.in

@@ -66,6 +66,8 @@ ifneq (,$(filter-out OS2 Darwin,$(OS_ARCH)))
 MOZ_PKG_MANIFEST_P = $(srcdir)/unix/packages-static
 endif
 endif
+else
+$(error you need a "--enable-static --disable-shared" build to create an installer)
 endif
 
 MOZ_NONLOCALIZED_PKG_LIST = \

browser/installer/windows/Makefile.in

@@ -111,6 +111,7 @@ installer:
 	  ../removed-files > instgen/removed-files.log
 	$(PERL) $(topsrcdir)/config/preprocessor.pl -Fsubstitution $(DEFINES) $(ACDEFINES) \
 	  $(srcdir)/nsis/defines.nsi.in > instgen/defines.nsi
+	cp $(topsrcdir)/browser/locales/$(AB_CD)/installer/appLocale.nsi instgen/appLocale.nsi
 	$(INSTALL) $(addprefix $(srcdir)/nsis/,$(NSIS_FILES)) instgen
 	cd $(topsrcdir)/toolkit/mozapps/installer && \
 	  perl build_static.pl -config "$(CONFIG_DIR)" -srcDir "$(SRC_DIR)" \

browser/locales/en-US/installer/appLocale.nsi

@@ -0,0 +1,3 @@
+; uncomment the define below if your product and locale
+; can do the uninstall survey.  see SURVEY_TEXT and SurveyURL
+!define DO_UNINSTALL_SURVEY

toolkit/locales/en-US/installer/windows/commonLocale.nsh

@@ -55,7 +55,7 @@ LangString OPTIONS_PAGE_TITLE ${LANG_ENGLISH} "Setup Type"
 LangString OPTIONS_PAGE_SUBTITLE ${LANG_ENGLISH} "Choose setup options"
 LangString SHORTCUTS_PAGE_TITLE ${LANG_ENGLISH} "Set Up Shortcuts"
 LangString SHORTCUTS_PAGE_SUBTITLE ${LANG_ENGLISH} "Create Program Icons"
-# only define SURVEY_TEXT if the survey should be available on uninstall
+# to enable the survey, see DO_UNINSTALL_SURVEY in appLocale.nsi
 LangString SURVEY_TEXT ${LANG_ENGLISH} "&Tell us what you thought of ${BrandShortName}"
 LangString LAUNCH_TEXT ${LANG_ENGLISH} '&Launch ${BrandFullName} now'
 LangString WARN_APP_RUNNING_INSTALL ${LANG_ENGLISH} '${BrandFullName} must be closed to proceed with the installation.$\r$\n$\r$\nClick "OK" to exit ${BrandFullName} automatically and continue.'

toolkit/mozapps/installer/windows/install_sub.pl

@@ -241,6 +241,8 @@ sub BuildPlatformInstaller
       die "copy $inConfigFiles/instfiles-extra.nsi $gDirDistInstall/nsis: $!\n";
     copy("$inConfigFiles/SetProgramAccess.nsi", "$gDirDistInstall/nsis") ||
       die "copy $inConfigFiles/SetProgramAccess.nsi $gDirDistInstall/nsis: $!\n";
+    copy("$inConfigFiles/appLocale.nsi", "$gDirDistInstall/nsis") ||
+      die "copy $inConfigFiles/appLocale.nsi $gDirDistInstall/nsis: $!\n";
     copy("$gDirDistInstall/license.txt", "$gDirDistInstall/nsis") ||
       die "copy $gDirDistInstall/license.txt $gDirDistInstall/nsis: $!\n";
     copy("$inDistPath/branding/wizHeader.bmp", "$gDirDistInstall/nsis") ||

toolkit/mozapps/installer/windows/nsis/installer.nsi

@@ -54,6 +54,7 @@ CRCCheck on
 !include SetProgramAccess.nsi
 !include common.nsh
 !include version.nsh
+!include appLocale.nsi
 
 Name "${BrandFullName}"
 OutFile "setup.exe"
@@ -167,7 +168,7 @@ Page custom preShortcuts ChangeShortcuts
 
 ; Only setup the survey controls, functions, etc. when the text for the control
 ; has been localized.
-!ifdef SURVEY_TEXT
+!ifdef DO_UNINSTALL_SURVEY
 !define MUI_FINISHPAGE_SHOWREADME_TEXT $(SURVEY_TEXT)
 !define MUI_FINISHPAGE_SHOWREADME_FUNCTION un.survey
 !endif
@@ -258,7 +259,7 @@ FunctionEnd
 
 ; Only setup the survey controls, functions, etc. when the text for the control
 ; has been localized.
-!ifdef SURVEY_TEXT
+!ifdef DO_UNINSTALL_SURVEY
 Function un.survey
   Exec "$\"$TmpVal$\" $\"${SurveyURL}$\""
 FunctionEnd
@@ -794,7 +795,7 @@ Function un.disableCancel
 
   ; Only display the survey checkbox if we can find IE and the survey text has
   ; been translated.
-  !ifndef SURVEY_TEXT
+  !ifndef DO_UNINSTALL_SURVEY
     !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "settings" "NumFields" "3"
   !else
     StrCpy $TmpVal "SOFTWARE\Microsoft\IE Setup\Setup"