Bug 840948 - Fix for missing nsis function 'ResetWin8PromptKeys' in builds that don't have enable-metro. Fixes Win64 build bustage. r=bbondy
authorJim Mathies <jmathies@mozilla.com>
Wed, 13 Feb 2013 07:51:34 -0600
changeset 131538 b3e65fe376810018a56dae878c3996e1b09e45b9
parent 131537 84cb7aa96a52652fdc933f0c647d4f2f60c68760
child 131601 081cf5b0121e8e8c0133c68a85ff4fda9e2b5c63
push id2323
push userbbajaj@mozilla.com
push dateMon, 01 Apr 2013 19:47:02 +0000
treeherdermozilla-beta@7712be144d91 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbbondy
bugs840948
milestone21.0a1
first release with
nightly linux32
b3e65fe37681 / 21.0a1 / 20130213102141 / files
nightly linux64
b3e65fe37681 / 21.0a1 / 20130213102141 / files
nightly mac
b3e65fe37681 / 21.0a1 / 20130213102141 / files
nightly win32
b3e65fe37681 / 21.0a1 / 20130213102141 / files
nightly win64
b3e65fe37681 / 21.0a1 / 20130213102141 / files
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
releases
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 840948 - Fix for missing nsis function 'ResetWin8PromptKeys' in builds that don't have enable-metro. Fixes Win64 build bustage. r=bbondy
browser/installer/windows/nsis/installer.nsi
--- a/browser/installer/windows/nsis/installer.nsi
+++ b/browser/installer/windows/nsis/installer.nsi
@@ -278,17 +278,19 @@ Section "-Application" APP_IDX
   ${If} $AddDesktopSC == ""
     StrCpy $AddDesktopSC "1"
   ${EndIf}
 
   ${LogHeader} "Adding Registry Entries"
   SetShellVarContext current  ; Set SHCTX to HKCU
   ${RegCleanMain} "Software\Mozilla"
   ${RegCleanUninstall}
+!ifdef MOZ_METRO
   ${ResetWin8PromptKeys}
+!endif
   ${UpdateProtocolHandlers}
 
   ClearErrors
   WriteRegStr HKLM "Software\Mozilla" "${BrandShortName}InstallerTest" "Write Test"
   ${If} ${Errors}
     StrCpy $TmpVal "HKCU" ; used primarily for logging
   ${Else}
     SetShellVarContext all  ; Set SHCTX to HKLM