|
@@ -0,0 +1,308 @@
|
|
|
|
+# HG changeset patch
|
|
|
|
+# User Frank-Rainer Grahl <frgrahl@gmx.net>
|
|
|
|
+# Date 1687039063 -7200
|
|
|
|
+# Parent df334c4248616fffa14cbf55779e785e6a170efe
|
|
|
|
+Bug 1841165 - Clean up SeaMonkey Windows installer files. r=IanN
|
|
|
|
+
|
|
|
|
+diff --git a/suite/installer/windows/Makefile.in b/suite/installer/windows/Makefile.in
|
|
|
|
+--- a/suite/installer/windows/Makefile.in
|
|
|
|
++++ b/suite/installer/windows/Makefile.in
|
|
|
|
+@@ -9,17 +9,16 @@ SFX_MODULE = $(topsrcdir)/comm/other-lic
|
|
|
|
+
|
|
|
|
+ EXPAND_COMM_LOCALE_SRCDIR = $(if $(filter en-US,$(AB_CD)),$(topsrcdir)/comm/$(1)/en-US,$(or $(realpath $(L10NBASEDIR)),$(abspath $(L10NBASEDIR)))/$(AB_CD)/$(subst /locales,,$(1)))
|
|
|
|
+
|
|
|
|
+ INSTALLER_FILES = \
|
|
|
|
+ app.tag \
|
|
|
|
+ nsis/installer.nsi \
|
|
|
|
+ nsis/uninstaller.nsi \
|
|
|
|
+ nsis/shared.nsh \
|
|
|
|
+- nsis/custom.nsi \
|
|
|
|
+ $(NULL)
|
|
|
|
+
|
|
|
|
+ BRANDING_FILES = \
|
|
|
|
+ branding.nsi \
|
|
|
|
+ wizHeader.bmp \
|
|
|
|
+ wizHeaderRTL.bmp \
|
|
|
|
+ wizWatermark.bmp \
|
|
|
|
+ $(NULL)
|
|
|
|
+diff --git a/suite/installer/windows/nsis/custom.nsi b/suite/installer/windows/nsis/custom.nsi
|
|
|
|
+deleted file mode 100644
|
|
|
|
+--- a/suite/installer/windows/nsis/custom.nsi
|
|
|
|
++++ /dev/null
|
|
|
|
+@@ -1,68 +0,0 @@
|
|
|
|
+-# This Source Code Form is subject to the terms of the Mozilla Public
|
|
|
|
+-# License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
|
|
+-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
|
|
|
+-
|
|
|
|
+-!macro checkSuiteComponents
|
|
|
|
+- ; If no extensions are available skip the components page
|
|
|
|
+- ${Unless} ${FileExists} "$EXEDIR\optional\extensions\debugQA@mozilla.org.xpi"
|
|
|
|
+- ${AndUnless} ${FileExists} "$EXEDIR\optional\extensions\{f13b157f-b174-47e7-a34d-4815ddfdfeb8}.xpi"
|
|
|
|
+- Abort
|
|
|
|
+- ${EndUnless}
|
|
|
|
+-!macroend
|
|
|
|
+-
|
|
|
|
+-!macro createSuiteComponentsIni
|
|
|
|
+- WriteINIStr "$PLUGINSDIR\components.ini" "Field 1" Type "label"
|
|
|
|
+- WriteINIStr "$PLUGINSDIR\components.ini" "Field 1" Text "$(OPTIONAL_COMPONENTS_LABEL)"
|
|
|
|
+- WriteINIStr "$PLUGINSDIR\components.ini" "Field 1" Left "0"
|
|
|
|
+- WriteINIStr "$PLUGINSDIR\components.ini" "Field 1" Right "-1"
|
|
|
|
+- WriteINIStr "$PLUGINSDIR\components.ini" "Field 1" Top "0"
|
|
|
|
+- WriteINIStr "$PLUGINSDIR\components.ini" "Field 1" Bottom "15"
|
|
|
|
+-
|
|
|
|
+- StrCpy $R1 2
|
|
|
|
+- ; Top of checkbox
|
|
|
|
+- StrCpy $R2 15
|
|
|
|
+- ; Bottom of checkbox
|
|
|
|
+- StrCpy $R3 25
|
|
|
|
+- ; Seperation between titles/text
|
|
|
|
+- StrCpy $R4 25
|
|
|
|
+-
|
|
|
|
+- ${If} ${FileExists} "$EXEDIR\optional\extensions\debugQA@mozilla.org.xpi"
|
|
|
|
+- WriteINIStr "$PLUGINSDIR\components.ini" "Field $R1" Type "checkbox"
|
|
|
|
+- WriteINIStr "$PLUGINSDIR\components.ini" "Field $R1" Text "$(DEBUGQA_TITLE)"
|
|
|
|
+- WriteINIStr "$PLUGINSDIR\components.ini" "Field $R1" Left "15"
|
|
|
|
+- WriteINIStr "$PLUGINSDIR\components.ini" "Field $R1" Right "-1"
|
|
|
|
+- WriteINIStr "$PLUGINSDIR\components.ini" "Field $R1" Top "$R2"
|
|
|
|
+- WriteINIStr "$PLUGINSDIR\components.ini" "Field $R1" Bottom "$R3"
|
|
|
|
+- WriteINIStr "$PLUGINSDIR\components.ini" "Field $R1" State "1"
|
|
|
|
+- WriteINIStr "$PLUGINSDIR\components.ini" "Field $R1" Flags "GROUP"
|
|
|
|
+- ${GetSize} "$EXEDIR\optional\extensions\debugQA@mozilla.org.xpi" "/S=0K" $0 $8 $9
|
|
|
|
+- SectionSetSize ${DEBUG_IDX} $0
|
|
|
|
+- IntOp $R1 $R1 + 1
|
|
|
|
+- IntOp $R2 $R2 + $R4
|
|
|
|
+- IntOp $R3 $R3 + $R4
|
|
|
|
+- ${Else}
|
|
|
|
+- ; Hide debugQA in the components page if it isn't available.
|
|
|
|
+- SectionSetText ${DEBUG_IDX} ""
|
|
|
|
+- ${EndIf}
|
|
|
|
+-
|
|
|
|
+- ; Set new values for the top and bottom of labels
|
|
|
|
+- ; Top of label box
|
|
|
|
+- StrCpy $R2 27
|
|
|
|
+- ; Bottom of label box
|
|
|
|
+- StrCpy $R3 47
|
|
|
|
+-
|
|
|
|
+- ${If} ${FileExists} "$EXEDIR\optional\extensions\debugQA@mozilla.org.xpi"
|
|
|
|
+- WriteINIStr "$PLUGINSDIR\components.ini" "Field $R1" Type "label"
|
|
|
|
+- WriteINIStr "$PLUGINSDIR\components.ini" "Field $R1" Text "$(DEBUGQA_TEXT)"
|
|
|
|
+- WriteINIStr "$PLUGINSDIR\components.ini" "Field $R1" Left "30"
|
|
|
|
+- WriteINIStr "$PLUGINSDIR\components.ini" "Field $R1" Right "-1"
|
|
|
|
+- WriteINIStr "$PLUGINSDIR\components.ini" "Field $R1" Top "$R2"
|
|
|
|
+- WriteINIStr "$PLUGINSDIR\components.ini" "Field $R1" Bottom "$R3"
|
|
|
|
+- IntOp $R1 $R1 + 1
|
|
|
|
+- IntOp $R2 $R2 + $R4
|
|
|
|
+- IntOp $R3 $R3 + $R4
|
|
|
|
+- ${EndIf}
|
|
|
|
+-
|
|
|
|
+- WriteINIStr "$PLUGINSDIR\components.ini" "Settings" NumFields "$R1"
|
|
|
|
+-
|
|
|
|
+-!macroend
|
|
|
|
+diff --git a/suite/installer/windows/nsis/installer.nsi b/suite/installer/windows/nsis/installer.nsi
|
|
|
|
+--- a/suite/installer/windows/nsis/installer.nsi
|
|
|
|
++++ b/suite/installer/windows/nsis/installer.nsi
|
|
|
|
+@@ -51,17 +51,16 @@ Var RegisterDefaultAgent
|
|
|
|
+ !insertmacro GetSize
|
|
|
|
+ !insertmacro WordFind
|
|
|
|
+
|
|
|
|
+ ; The following includes are custom.
|
|
|
|
+ !include branding.nsi
|
|
|
|
+ !include defines.nsi
|
|
|
|
+ !include common.nsh
|
|
|
|
+ !include locales.nsi
|
|
|
|
+-!include custom.nsi
|
|
|
|
+
|
|
|
|
+ VIAddVersionKey "FileDescription" "${BrandShortName} Installer"
|
|
|
|
+ VIAddVersionKey "OriginalFilename" "setup.exe"
|
|
|
|
+
|
|
|
|
+ ; Must be inserted before other macros that use logging
|
|
|
|
+ !insertmacro _LoggingCommon
|
|
|
|
+
|
|
|
|
+ ; Most commonly used macros for managing shortcuts
|
|
|
|
+@@ -137,19 +136,16 @@ ShowInstDetails nevershow
|
|
|
|
+ ; License Page
|
|
|
|
+ !define MUI_PAGE_CUSTOMFUNCTION_SHOW showLicense
|
|
|
|
+ !define MUI_LICENSEPAGE_CHECKBOX
|
|
|
|
+ !insertmacro MUI_PAGE_LICENSE license.txt
|
|
|
|
+
|
|
|
|
+ ; Custom Options Page
|
|
|
|
+ Page custom preOptions leaveOptions
|
|
|
|
+
|
|
|
|
+-; Custom Components Page
|
|
|
|
+-Page custom preComponents leaveComponents
|
|
|
|
+-
|
|
|
|
+ ; Select Install Directory Page
|
|
|
|
+ !define MUI_PAGE_CUSTOMFUNCTION_PRE preDirectory
|
|
|
|
+ !define MUI_PAGE_CUSTOMFUNCTION_LEAVE leaveDirectory
|
|
|
|
+ !define MUI_DIRECTORYPAGE_VERIFYONLEAVE
|
|
|
|
+ !insertmacro MUI_PAGE_DIRECTORY
|
|
|
|
+
|
|
|
|
+ ; Custom Shortcuts Page
|
|
|
|
+ Page custom preShortcuts leaveShortcuts
|
|
|
|
+@@ -195,30 +191,16 @@ Section "-InstallStartCleanup"
|
|
|
|
+ ; If the user closed the application it can take several seconds for it to
|
|
|
|
+ ; shut down completely. If the application is being used by another user we
|
|
|
|
+ ; can rename the file and then delete is when the system is restarted.
|
|
|
|
+ Sleep 5000
|
|
|
|
+ ${DeleteFile} "$INSTDIR\${FileMainEXE}"
|
|
|
|
+ ClearErrors
|
|
|
|
+ ${EndIf}
|
|
|
|
+
|
|
|
|
+- ${If} $InstallType == ${INSTALLTYPE_CUSTOM}
|
|
|
|
+- ; Custom installs.
|
|
|
|
+- ; If DebugQA is installed and this install includes DebugQA remove it
|
|
|
|
+- ; from the installation directory. This will remove it if the user
|
|
|
|
+- ; deselected DebugQA on the components page.
|
|
|
|
+- ${If} ${FileExists} "$EXEDIR\optional\extensions\debugQA@mozilla.org.xpi"
|
|
|
|
+- ${DeleteFile} "$INSTDIR\extensions\debugQA@mozilla.org.xpi"
|
|
|
|
+- ${If} ${FileExists} "$INSTDIR\extensions\debugQA@mozilla.org"
|
|
|
|
+- RmDir /r "$INSTDIR\extensions\debugQA@mozilla.org"
|
|
|
|
+- ${EndIf}
|
|
|
|
+- ${EndIf}
|
|
|
|
+-
|
|
|
|
+- ${EndIf}
|
|
|
|
+-
|
|
|
|
+ ; setup the application model id registration value
|
|
|
|
+ ${InitHashAppModelId} "$INSTDIR" "Software\Mozilla\${AppName}\TaskBarIDs"
|
|
|
|
+
|
|
|
|
+ ; Remove the updates directory for Windows 7 and above
|
|
|
|
+ ${CleanUpdateDirectories} "Mozilla\SeaMonkey" "Mozilla\updates"
|
|
|
|
+
|
|
|
|
+ ${RemoveDeprecatedFiles}
|
|
|
|
+
|
|
|
|
+@@ -459,32 +441,16 @@ Section "-Application" APP_IDX
|
|
|
|
+ ApplicationID::Set "$DESKTOP\${BrandFullName}.lnk" "$AppUserModelID"
|
|
|
|
+ ${EndIf}
|
|
|
|
+ ${LogMsg} "Added Shortcut: $DESKTOP\${BrandFullName}.lnk"
|
|
|
|
+ ${EndIf}
|
|
|
|
+
|
|
|
|
+ !insertmacro MUI_STARTMENU_WRITE_END
|
|
|
|
+ SectionEnd
|
|
|
|
+
|
|
|
|
+-Section /o "Debug and QA Tools" DEBUG_IDX
|
|
|
|
+- ${If} ${FileExists} "$EXEDIR\optional\extensions\debugQA@mozilla.org.xpi"
|
|
|
|
+- SetDetailsPrint both
|
|
|
|
+- DetailPrint $(STATUS_INSTALL_OPTIONAL)
|
|
|
|
+- SetDetailsPrint none
|
|
|
|
+-
|
|
|
|
+- ${RemoveDir} "$INSTDIR\extensions\debugQA@mozilla.org"
|
|
|
|
+- ${DeleteFile} "$INSTDIR\extensions\debugQA@mozilla.org.xpi"
|
|
|
|
+- ${DeleteFile} "$INSTDIR\distribution\extensions\debugQA@mozilla.org.xpi"
|
|
|
|
+- ClearErrors
|
|
|
|
+- ${LogHeader} "Installing Debug and QA Tools"
|
|
|
|
+- CopyFiles /SILENT "$EXEDIR\optional\extensions\debugQA@mozilla.org.xpi" \
|
|
|
|
+- "$INSTDIR\extensions\"
|
|
|
|
+- ${EndIf}
|
|
|
|
+-SectionEnd
|
|
|
|
+-
|
|
|
|
+ ; Cleanup operations to perform at the end of the installation.
|
|
|
|
+ Section "-InstallEndCleanup"
|
|
|
|
+ SetDetailsPrint both
|
|
|
|
+ DetailPrint "$(STATUS_CLEANUP)"
|
|
|
|
+ SetDetailsPrint none
|
|
|
|
+
|
|
|
|
+ ; Refresh desktop icons
|
|
|
|
+ System::Call "shell32::SHChangeNotify(i, i, i, i) v (0x08000000, 0, 0, 0)"
|
|
|
|
+@@ -626,39 +592,16 @@ Function leaveOptions
|
|
|
|
+
|
|
|
|
+ ${LeaveOptionsCommon}
|
|
|
|
+
|
|
|
|
+ ${If} $InstallType == ${INSTALLTYPE_BASIC}
|
|
|
|
+ Call CheckExistingInstall
|
|
|
|
+ ${EndIf}
|
|
|
|
+ FunctionEnd
|
|
|
|
+
|
|
|
|
+-Function preComponents
|
|
|
|
+- ${CheckCustomCommon}
|
|
|
|
+- !insertmacro checkSuiteComponents
|
|
|
|
+- !insertmacro MUI_HEADER_TEXT "$(OPTIONAL_COMPONENTS_TITLE)" "$(OPTIONAL_COMPONENTS_SUBTITLE)"
|
|
|
|
+- !insertmacro MUI_INSTALLOPTIONS_DISPLAY "components.ini"
|
|
|
|
+-FunctionEnd
|
|
|
|
+-
|
|
|
|
+-Function leaveComponents
|
|
|
|
+- ; If debugQA exists then it will be Field 2.
|
|
|
|
+- StrCpy $R1 2
|
|
|
|
+-
|
|
|
|
+- ${If} ${FileExists} "$EXEDIR\optional\extensions\debugQA@mozilla.org.xpi"
|
|
|
|
+- ${MUI_INSTALLOPTIONS_READ} $R0 "components.ini" "Field $R1" "State"
|
|
|
|
+- ; State will be 1 for checked and 0 for unchecked so we can use that to set
|
|
|
|
+- ; the section flags for installation.
|
|
|
|
+- SectionSetFlags ${DEBUG_IDX} $R0
|
|
|
|
+- IntOp $R1 $R1 + 1
|
|
|
|
+- ${Else}
|
|
|
|
+- SectionSetFlags ${DEBUG_IDX} 0 ; Disable install for debugQA
|
|
|
|
+- ${EndIf}
|
|
|
|
+-
|
|
|
|
+-FunctionEnd
|
|
|
|
+-
|
|
|
|
+ Function preDirectory
|
|
|
|
+ ${PreDirectoryCommon}
|
|
|
|
+ FunctionEnd
|
|
|
|
+
|
|
|
|
+ Function leaveDirectory
|
|
|
|
+ ${If} $InstallType == ${INSTALLTYPE_BASIC}
|
|
|
|
+ Call CheckExistingInstall
|
|
|
|
+ ${EndIf}
|
|
|
|
+@@ -837,17 +780,16 @@ Function .onInit
|
|
|
|
+ ${EndUnless}
|
|
|
|
+ SetRegView 64
|
|
|
|
+ !endif
|
|
|
|
+
|
|
|
|
+ ${InstallOnInitCommon} "$(WARN_MIN_SUPPORTED_OSVER_CPU_MSG)"
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+ !insertmacro InitInstallOptionsFile "options.ini"
|
|
|
|
+- !insertmacro InitInstallOptionsFile "components.ini"
|
|
|
|
+ !insertmacro InitInstallOptionsFile "shortcuts.ini"
|
|
|
|
+ !insertmacro InitInstallOptionsFile "summary.ini"
|
|
|
|
+
|
|
|
|
+ ; Setup the options.ini file for the Custom Options Page
|
|
|
|
+ WriteINIStr "$PLUGINSDIR\options.ini" "Settings" NumFields "5"
|
|
|
|
+
|
|
|
|
+ WriteINIStr "$PLUGINSDIR\options.ini" "Field 1" Type "label"
|
|
|
|
+ WriteINIStr "$PLUGINSDIR\options.ini" "Field 1" Text "$(OPTIONS_SUMMARY)"
|
|
|
|
+@@ -882,19 +824,16 @@ Function .onInit
|
|
|
|
+
|
|
|
|
+ WriteINIStr "$PLUGINSDIR\options.ini" "Field 5" Type "label"
|
|
|
|
+ WriteINIStr "$PLUGINSDIR\options.ini" "Field 5" Text "$(OPTION_CUSTOM_DESC)"
|
|
|
|
+ WriteINIStr "$PLUGINSDIR\options.ini" "Field 5" Left "30"
|
|
|
|
+ WriteINIStr "$PLUGINSDIR\options.ini" "Field 5" Right "-1"
|
|
|
|
+ WriteINIStr "$PLUGINSDIR\options.ini" "Field 5" Top "67"
|
|
|
|
+ WriteINIStr "$PLUGINSDIR\options.ini" "Field 5" Bottom "87"
|
|
|
|
+
|
|
|
|
+- ; Setup the components.ini file for the Components page
|
|
|
|
+- !insertmacro createSuiteComponentsINI
|
|
|
|
+-
|
|
|
|
+ ; Setup the shortcuts.ini file for the Custom Shortcuts Page
|
|
|
|
+ WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Settings" NumFields "4"
|
|
|
|
+
|
|
|
|
+ WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Field 1" Type "label"
|
|
|
|
+ WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Field 1" Text "$(CREATE_ICONS_DESC)"
|
|
|
|
+ WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Field 1" Left "0"
|
|
|
|
+ WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Field 1" Right "-1"
|
|
|
|
+ WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Field 1" Top "5"
|
|
|
|
+diff --git a/suite/locales/en-US/installer/windows/custom.properties b/suite/locales/en-US/installer/windows/custom.properties
|
|
|
|
+--- a/suite/locales/en-US/installer/windows/custom.properties
|
|
|
|
++++ b/suite/locales/en-US/installer/windows/custom.properties
|
|
|
|
+@@ -14,21 +14,16 @@
|
|
|
|
+ # $BrandFullNameDA allows the string to contain an ampersand (e.g. DA stands
|
|
|
|
+ # for double ampersand) and prevents the letter following the ampersand from
|
|
|
|
+ # being used as an accesskey.
|
|
|
|
+
|
|
|
|
+ # You can use \n to create a newline in the string but only when the string
|
|
|
|
+ # from en-US contains a \n.
|
|
|
|
+
|
|
|
|
+ REG_APP_DESC=$BrandShortName delivers safe, easy web browsing. A familiar user interface, enhanced security features including protection from online identity theft, and integrated search let you get the most out of the web.
|
|
|
|
+-OPTIONAL_COMPONENTS_TITLE=Choose Optional Components
|
|
|
|
+-OPTIONAL_COMPONENTS_SUBTITLE=Choose which features of $BrandFullNameDA you want to install.
|
|
|
|
+-OPTIONAL_COMPONENTS_LABEL=Optional Components:
|
|
|
|
+-DEBUGQA_TITLE=Debug and QA UI
|
|
|
|
+-DEBUGQA_TEXT=Provides additional debug and QA UI for $BrandShortName development.
|
|
|
|
+ CONTEXT_OPTIONS=$BrandShortName &Options
|
|
|
|
+ CONTEXT_SAFE_MODE=$BrandShortName &Safe Mode
|
|
|
|
+ SAFE_MODE=Safe Mode
|
|
|
|
+ # MAILNEWS_TEXT appears in Windows (All) Programs menu as "SeaMonkey $(MAILNEWS_TEXT)"
|
|
|
|
+ MAILNEWS_TEXT=Mail
|
|
|
|
+ PROFILE_TEXT=Profile Manager
|
|
|
|
+ OPTIONS_PAGE_TITLE=Setup Type
|
|
|
|
+ OPTIONS_PAGE_SUBTITLE=Choose setup options
|