|
@@ -0,0 +1,106 @@
|
|
|
+# HG changeset patch
|
|
|
+# User Bill Gianopoulos <wgianopoulos@gmail.com>
|
|
|
+# Date 1688066916 0
|
|
|
+Bug 9999999 - Port bug 1824420 to suite.
|
|
|
+
|
|
|
+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
|
|
|
+@@ -67,17 +67,17 @@ VIAddVersionKey "OriginalFilename" "setu
|
|
|
+ ; Most commonly used macros for managing shortcuts
|
|
|
+ !insertmacro _LoggingShortcutsCommon
|
|
|
+
|
|
|
+ !insertmacro AddDisabledDDEHandlerValues
|
|
|
+ !insertmacro AddHandlerValues
|
|
|
+ !insertmacro ChangeMUIHeaderImage
|
|
|
+ !insertmacro CheckForFilesInUse
|
|
|
+ !insertmacro CheckIfRegistryKeyExists
|
|
|
+-!insertmacro CleanUpdateDirectories
|
|
|
++!insertmacro CleanMantenanceServiceLogs
|
|
|
+ !insertmacro CopyFilesFromDir
|
|
|
+ !insertmacro CreateRegKey
|
|
|
+ !insertmacro FindSMProgramsDir
|
|
|
+ !insertmacro GetPathFromString
|
|
|
+ !insertmacro GetParent
|
|
|
+ !insertmacro InitHashAppModelId
|
|
|
+ !insertmacro IsHandlerForInstallDir
|
|
|
+ !insertmacro ManualCloseAppPrompt
|
|
|
+@@ -213,17 +213,17 @@ Section "-InstallStartCleanup"
|
|
|
+ ${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"
|
|
|
++ ${CleanMaintenanceServiceLogs) "SeaMonkey"
|
|
|
+
|
|
|
+ ${RemoveDeprecatedFiles}
|
|
|
+
|
|
|
+ ${InstallStartCleanupCommon}
|
|
|
+ SectionEnd
|
|
|
+
|
|
|
+ Section "-Application" APP_IDX
|
|
|
+ ${StartUninstallLog}
|
|
|
+diff --git a/suite/installer/windows/nsis/uninstaller.nsi b/suite/installer/windows/nsis/uninstaller.nsi
|
|
|
+--- a/suite/installer/windows/nsis/uninstaller.nsi
|
|
|
++++ b/suite/installer/windows/nsis/uninstaller.nsi
|
|
|
+@@ -61,17 +61,17 @@ VIAddVersionKey "FileDescription" "${Bra
|
|
|
+ VIAddVersionKey "OriginalFilename" "helper.exe"
|
|
|
+
|
|
|
+ ; Most commonly used macros for managing shortcuts
|
|
|
+ !insertmacro _LoggingShortcutsCommon
|
|
|
+
|
|
|
+ !insertmacro AddDisabledDDEHandlerValues
|
|
|
+ !insertmacro AddHandlerValues
|
|
|
+ !insertmacro CheckIfRegistryKeyExists
|
|
|
+-!insertmacro CleanUpdateDirectories
|
|
|
++!insertmacro CleanMaintenanceServiceLogs
|
|
|
+ !insertmacro CleanVirtualStore
|
|
|
+ !insertmacro FindSMProgramsDir
|
|
|
+ !insertmacro GetLongPath
|
|
|
+ !insertmacro GetPathFromString
|
|
|
+ !insertmacro InitHashAppModelId
|
|
|
+ !insertmacro IsHandlerForInstallDir
|
|
|
+ !insertmacro RegCleanMain
|
|
|
+ !insertmacro RegCleanUninstall
|
|
|
+@@ -79,17 +79,17 @@ VIAddVersionKey "OriginalFilename" "help
|
|
|
+ !insertmacro UnloadUAC
|
|
|
+ !insertmacro UpdateShortcutAppModelIDs
|
|
|
+ !insertmacro WordReplace
|
|
|
+ !insertmacro WriteRegDWORD2
|
|
|
+ !insertmacro WriteRegStr2
|
|
|
+
|
|
|
+ !insertmacro un.ChangeMUIHeaderImage
|
|
|
+ !insertmacro un.CheckForFilesInUse
|
|
|
+-!insertmacro un.CleanUpdateDirectories
|
|
|
++!insertmacro un.CleanMaintenanceServiceLogs
|
|
|
+ !insertmacro un.CleanVirtualStore
|
|
|
+ !insertmacro un.DeleteShortcuts
|
|
|
+ !insertmacro un.GetLongPath
|
|
|
+ !insertmacro un.GetSecondInstallPath
|
|
|
+ !insertmacro un.InitHashAppModelId
|
|
|
+ !insertmacro un.ManualCloseAppPrompt
|
|
|
+ !insertmacro un.ParseUninstallLog
|
|
|
+ !insertmacro un.RegCleanAppHandler
|
|
|
+@@ -200,17 +200,17 @@ Section "Uninstall"
|
|
|
+ ${un.InitHashAppModelId} "$INSTDIR" "Software\Mozilla\${AppName}\TaskBarIDs"
|
|
|
+
|
|
|
+ ; Unregister resources associated with Win7 taskbar jump lists.
|
|
|
+ ${If} "$AppUserModelID" != ""
|
|
|
+ ApplicationID::UninstallJumpLists "$AppUserModelID"
|
|
|
+ ${EndIf}
|
|
|
+
|
|
|
+ ; Remove the updates directory for Vista and above
|
|
|
+- ${un.CleanUpdateDirectories} "Mozilla\SeaMonkey" "Mozilla\updates"
|
|
|
++ ${un.CleanMaintenanceServiceLogs} "SeaMonkey"
|
|
|
+
|
|
|
+ ; Remove any app model id's stored in the registry for this install path
|
|
|
+ DeleteRegValue HKCU "Software\Mozilla\${AppName}\TaskBarIDs" "$INSTDIR"
|
|
|
+ DeleteRegValue HKLM "Software\Mozilla\${AppName}\TaskBarIDs" "$INSTDIR"
|
|
|
+
|
|
|
+ ClearErrors
|
|
|
+ WriteRegStr HKLM "Software\Mozilla" "${BrandShortName}InstallerTest" "Write Test"
|
|
|
+ ${If} ${Errors}
|