Bug 873037 - Cleaning update directory should be changed from CleanUpdatesDir to CleanUpdateDirectories for SeaMonkey, r=IanN
authorFrank Wein <mcsmurf@mcsmurf.de>
Fri, 16 Aug 2013 14:22:48 +0200
changeset 12927 afd06f7ad97e3fd073454f4ff3d943f77a727446
parent 12926 a6ab55f00e21d3853600edc7f449367437a63f75
child 12928 c8a2615da2fbf1aed7d9eefe497c4c81a2185890
push id9424
push usermcsmurf@mcsmurf.de
push dateFri, 16 Aug 2013 12:24:09 +0000
treeherdercomm-central@afd06f7ad97e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersIanN
bugs873037
Bug 873037 - Cleaning update directory should be changed from CleanUpdatesDir to CleanUpdateDirectories for SeaMonkey, r=IanN CLOSED TREE
suite/installer/windows/nsis/installer.nsi
suite/installer/windows/nsis/uninstaller.nsi
--- a/suite/installer/windows/nsis/installer.nsi
+++ b/suite/installer/windows/nsis/installer.nsi
@@ -59,17 +59,17 @@ VIAddVersionKey "OriginalFilename" "setu
 
 ; Most commonly used macros for managing shortcuts
 !insertmacro _LoggingShortcutsCommon
 
 !insertmacro AddDDEHandlerValues
 !insertmacro AddHandlerValues
 !insertmacro ChangeMUIHeaderImage
 !insertmacro CheckForFilesInUse
-!insertmacro CleanUpdatesDir
+!insertmacro CleanUpdateDirectories
 !insertmacro CopyFilesFromDir
 !insertmacro CreateRegKey
 !insertmacro FindSMProgramsDir
 !insertmacro GetPathFromString
 !insertmacro GetParent
 !insertmacro InitHashAppModelId
 !insertmacro IsHandlerForInstallDir
 !insertmacro ManualCloseAppPrompt
@@ -248,18 +248,21 @@ Section "-InstallStartCleanup"
       ${DeleteFile} "$INSTDIR\distribution\extensions\langpack-${AB_CD}@venkman.mozilla.org.xpi"
       ${DeleteFile} "$INSTDIR\extensions\langpack-${AB_CD}@venkman.mozilla.org.xpi"
       ${If} ${FileExists} "$INSTDIR\extensions\langpack-${AB_CD}@venkman.mozilla.org"
         RmDir /r "$INSTDIR\extensions\langpack-${AB_CD}@venkman.mozilla.org"
       ${EndIf}
     ${EndIf}
   ${EndIf}
 
+  ; setup the application model id registration value
+  ${InitHashAppModelId} "$INSTDIR" "Software\Mozilla\${AppName}\TaskBarIDs"
+
   ; Remove the updates directory for Vista and above
-  ${CleanUpdatesDir} "Mozilla\SeaMonkey"
+  ${CleanUpdateDirectories} "Mozilla\SeaMonkey" "Mozilla\updates"
 
   ${InstallStartCleanupCommon}
 SectionEnd
 
 Section "-Application" APP_IDX
   ${StartUninstallLog}
 
   SetDetailsPrint both 
@@ -325,19 +328,16 @@ Section "-Application" APP_IDX
   ${LogUninstall} "File: \active-update.xml"
   ${LogUninstall} "File: \install.log"
   ${LogUninstall} "File: \install_status.log"
   ${LogUninstall} "File: \install_wizard.log"
   ${LogUninstall} "File: \updates.xml"
 
   ClearErrors
 
-  ; setup the application model id registration value
-  ${InitHashAppModelId} "$INSTDIR" "Software\Mozilla\${AppName}\TaskBarIDs"
-
   ; Default for creating Start Menu folder and shortcuts
   ; (1 = create, 0 = don't create)
   ${If} $AddStartMenuSC == ""
     StrCpy $AddStartMenuSC "1"
   ${EndIf}
 
   ; Default for creating Quick Launch shortcut (1 = create, 0 = don't create)
   ${If} $AddQuickLaunchSC == ""
--- a/suite/installer/windows/nsis/uninstaller.nsi
+++ b/suite/installer/windows/nsis/uninstaller.nsi
@@ -56,16 +56,17 @@ Var TmpVal
 VIAddVersionKey "FileDescription" "${BrandShortName} Helper"
 VIAddVersionKey "OriginalFilename" "helper.exe"
 
 ; Most commonly used macros for managing shortcuts
 !insertmacro _LoggingShortcutsCommon
 
 !insertmacro AddDDEHandlerValues
 !insertmacro AddHandlerValues
+!insertmacro CleanUpdateDirectories
 !insertmacro CleanVirtualStore
 !insertmacro FindSMProgramsDir
 !insertmacro GetLongPath
 !insertmacro GetPathFromString
 !insertmacro InitHashAppModelId
 !insertmacro IsHandlerForInstallDir
 !insertmacro RegCleanMain
 !insertmacro RegCleanUninstall
@@ -73,17 +74,17 @@ VIAddVersionKey "OriginalFilename" "help
 !insertmacro UnloadUAC
 !insertmacro UpdateShortcutAppModelIDs
 !insertmacro WordReplace
 !insertmacro WriteRegDWORD2
 !insertmacro WriteRegStr2
 
 !insertmacro un.ChangeMUIHeaderImage
 !insertmacro un.CheckForFilesInUse
-!insertmacro un.CleanUpdatesDir
+!insertmacro un.CleanUpdateDirectories
 !insertmacro un.CleanVirtualStore
 !insertmacro un.DeleteShortcuts
 !insertmacro un.GetLongPath
 !insertmacro un.GetSecondInstallPath
 !insertmacro un.InitHashAppModelId
 !insertmacro un.ManualCloseAppPrompt
 !insertmacro un.ParseUninstallLog
 !insertmacro un.RegCleanAppHandler
@@ -194,16 +195,19 @@ Section "Uninstall"
   ${un.InitHashAppModelId} "$INSTDIR" "Software\Mozilla\${AppName}\TaskBarIDs"
 
   ; Unregister resources associated with Win7 taskbar jump lists.
   ${If} ${AtLeastWin7}
   ${AndIf} "$AppUserModelID" != ""
     ApplicationID::UninstallJumpLists "$AppUserModelID"
   ${EndIf}
 
+  ; Remove the updates directory for Vista and above
+  ${un.CleanUpdateDirectories} "Mozilla\SeaMonkey" "Mozilla\updates"
+
   ; 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}
     StrCpy $TmpVal "HKCU" ; used primarily for logging
@@ -333,19 +337,16 @@ Section "Uninstall"
   ; them if they still exist.
   ${If} ${FileExists} "$INSTDIR\MapiProxy_InUse.dll"
     Delete /REBOOTOK "$INSTDIR\MapiProxy_InUse.dll"
   ${EndIf}
   ${If} ${FileExists} "$INSTDIR\mozMapi32_InUse.dll"
     Delete /REBOOTOK "$INSTDIR\mozMapi32_InUse.dll"
   ${EndIf}
 
-  ; Remove the updates directory for Vista and above
-  ${un.CleanUpdatesDir} "Mozilla\SeaMonkey"
-
   ; Remove files that may be left behind by the application in the
   ; VirtualStore directory.
   ${un.CleanVirtualStore}
 
   ; Parse the uninstall log to unregister dll's and remove all installed
   ; files / directories this install is responsible for.
   ${un.ParseUninstallLog}