Bug 1390850 - Enable the 32 bit to 64 bit migration for Thunderbird. r=jorgk
authorRichard Marti <richard.marti@gmail.com>
Mon, 03 Jun 2019 20:01:45 +0200
changeset 35754 ae833bff1165829fb5ae9d8469e5c54ebb6a98e6
parent 35753 70e2ac37e75368ab67767582f61011b12d66c3ff
child 35755 af589662271683181930592f05f4959291dee392
push id392
push userclokep@gmail.com
push dateMon, 02 Sep 2019 20:17:19 +0000
reviewersjorgk
bugs1390850
Bug 1390850 - Enable the 32 bit to 64 bit migration for Thunderbird. r=jorgk
mail/installer/windows/nsis/installer.nsi
mail/installer/windows/nsis/shared.nsh
--- a/mail/installer/windows/nsis/installer.nsi
+++ b/mail/installer/windows/nsis/installer.nsi
@@ -383,19 +383,17 @@ Section "-Application" APP_IDX
     DeleteRegValue HKLM "Software\Mozilla" "${BrandShortName}InstallerTest"
     StrCpy $TmpVal "HKLM" ; used primarily for logging
     ${RegCleanMain} "Software\Mozilla"
     ${RegCleanUninstall}
     ${UpdateProtocolHandlers}
   ${EndIf}
 
   ${RemoveDeprecatedKeys}
-  ; The following macro call is disabled until we are ready for the 32bit to
-  ; 64bit migration. See meta bug 634233 and enabling bug 1390850.
-  ; ${Set32to64DidMigrateReg}
+  ${Set32to64DidMigrateReg}
 
   ; The previous installer adds several regsitry values to both HKLM and HKCU.
   ; We now try to add to HKLM and if that fails to HKCU
 
   ; The order that reg keys and values are added is important if you use the
   ; uninstall log to remove them on uninstall. When using the uninstall log you
   ; MUST add children first so they will be removed first on uninstall so they
   ; will be empty when the key is deleted. This allows the uninstaller to
--- a/mail/installer/windows/nsis/shared.nsh
+++ b/mail/installer/windows/nsis/shared.nsh
@@ -80,19 +80,17 @@
       SetShellVarContext current
     ${EndIf}
   ${EndIf}
 
   ; Adds a pinned Task Bar shortcut (see MigrateTaskBarShortcut for details).
   ${MigrateTaskBarShortcut}
 
   ${RemoveDeprecatedKeys}
-  ; The following macro call is disabled until we are ready for the 32bit to
-  ; 64bit migration. See meta bug 634233 and enabling bug 1390850.
-  ; ${Set32to64DidMigrateReg}
+  ${Set32to64DidMigrateReg}
 
   ${SetAppKeys}
   ${SetUninstallKeys}
 
   ; Remove files that may be left behind by the application in the
   ; VirtualStore directory.
   ${CleanVirtualStore}