Bug 1507618 - Use TB version as default version in Win registry. r=Paenglab a=jorgk
authorRob Lemley <rob@thunderbird.net>
Fri, 12 Apr 2019 16:36:36 -0400
changeset 32190 7787632227e0da0b59c1ee1a946ce1d048b9199f
parent 32189 33e9c7be67682a74b1558f4fc474f64ad003de7c
child 32191 531b287058d3307aeb92a80051badbac99a50f63
push id188
push usermozilla@jorgk.com
push dateTue, 30 Apr 2019 18:38:30 +0000
treeherdercomm-esr60@43f5186b8b6e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersPaenglab, jorgk
bugs1507618
Bug 1507618 - Use TB version as default version in Win registry. r=Paenglab a=jorgk Write $AppVersion (Thunderbird version) to the default value in the registry. Create a separate GeckoVersion key for GREVersion.
mail/installer/windows/nsis/shared.nsh
--- a/mail/installer/windows/nsis/shared.nsh
+++ b/mail/installer/windows/nsis/shared.nsh
@@ -592,18 +592,19 @@
   StrCpy $0 "Software\Mozilla\${BrandFullNameInternal} ${AppVersion}\extensions"
   ${WriteRegStr2} $TmpVal "$0" "Components" "$8\components" 0
   ${WriteRegStr2} $TmpVal "$0" "Plugins" "$8\plugins" 0
 
   StrCpy $0 "Software\Mozilla\${BrandFullNameInternal} ${AppVersion}"
   ${WriteRegStr2} $TmpVal "$0" "GeckoVer" "${GREVersion}" 0
 
   StrCpy $0 "Software\Mozilla\${BrandFullNameInternal}"
-  ${WriteRegStr2} $TmpVal "$0" "" "${GREVersion}" 0
+  ${WriteRegStr2} $TmpVal "$0" "" "${AppVersion}" 0
   ${WriteRegStr2} $TmpVal "$0" "CurrentVersion" "${AppVersion} (${AB_CD})" 0
+  ${WriteRegStr2} $TmpVal "$0" "GeckoVersion" "${GREVersion}" 0
 !macroend
 !define SetAppKeys "!insertmacro SetAppKeys"
 
 ; Add uninstall registry entries. This macro tests for write access to determine
 ; if the uninstall keys should be added to HKLM or HKCU.
 !macro SetUninstallKeys
   StrCpy $0 "Software\Microsoft\Windows\CurrentVersion\Uninstall\${BrandFullNameInternal} ${AppVersion} (${ARCH} ${AB_CD})"