Bug 1322331 - Add Windows 10 detection to the installer. r=mhowell
authorRobert Strong <robert.bugzilla@gmail.com>
Wed, 07 Dec 2016 10:35:05 -1000
changeset 325390 2a0223e35b0e3102fcf31edaff48a7319eeed142
parent 325389 2ff0d7460eb608032bce7a991b0d95ca78794dda
child 325391 928bb2ef0ef68cef61aa2e15d4d0d1861bcd0c73
push id24
push usermaklebus@msu.edu
push dateTue, 20 Dec 2016 03:11:33 +0000
reviewersmhowell
bugs1322331
milestone53.0a1
Bug 1322331 - Add Windows 10 detection to the installer. r=mhowell
toolkit/mozapps/installer/windows/nsis/common.nsh
toolkit/mozapps/installer/windows/nsis/overrides.nsh
--- a/toolkit/mozapps/installer/windows/nsis/common.nsh
+++ b/toolkit/mozapps/installer/windows/nsis/common.nsh
@@ -6123,18 +6123,20 @@
       ${ElseIf} ${IsWinVista}
         ${LogMsg} "OS Name    : Windows Vista"
       ${ElseIf} ${IsWin7}
         ${LogMsg} "OS Name    : Windows 7"
       ${ElseIf} ${IsWin8}
         ${LogMsg} "OS Name    : Windows 8"
       ${ElseIf} ${IsWin8.1}
         ${LogMsg} "OS Name    : Windows 8.1"
-      ${ElseIf} ${AtLeastWin8.1}
-        ${LogMsg} "OS Name    : Above Windows 8.1"
+      ${ElseIf} ${IsWin10}
+        ${LogMsg} "OS Name    : Windows 10"
+      ${ElseIf} ${AtLeastWin10}
+        ${LogMsg} "OS Name    : Above Windows 10"
       ${Else}
         ${LogMsg} "OS Name    : Unable to detect"
       ${EndIf}
 
       !ifdef HAVE_64BIT_BUILD
         ${LogMsg} "Target CPU : x64"
       !else
         ${LogMsg} "Target CPU : x86"
--- a/toolkit/mozapps/installer/windows/nsis/overrides.nsh
+++ b/toolkit/mozapps/installer/windows/nsis/overrides.nsh
@@ -43,16 +43,21 @@
   !insertmacro __MOZ__WinVer_DefineOSTests 2012
 !endif
 
 !ifndef WINVER_2012R2
   !define WINVER_2012R2    0x06030001 ;6.03.9600
   !insertmacro __MOZ__WinVer_DefineOSTests 2012R2
 !endif
 
+!ifndef WINVER_10
+  !define WINVER_10        0x0A000000 ;10.0.10240
+  !insertmacro __MOZ__WinVer_DefineOSTests 10
+!endif
+
 !verbose push
 !verbose 3
 !ifndef _OVERRIDE_VERBOSE
   !define _OVERRIDE_VERBOSE 3
 !endif
 !verbose ${_OVERRIDE_VERBOSE}
 !define OVERRIDE_VERBOSE `!insertmacro OVERRIDE_VERBOSE`
 !define _OVERRIDE_UN