Bug 1322331 - Add Windows 10 detection to the installer. r=mhowell a=gchang
authorRobert Strong <robert.bugzilla@gmail.com>
Wed, 07 Dec 2016 10:35:05 -1000
changeset 352904 6dc907d4ad6fe78389479f9299e396441535bc8b
parent 352903 d20a6ec3db1eb57ac68379c384a41256859b6601
child 352905 2f4972fb62ed4305a920b99c72e9e6a2239de0e1
push id6795
push userjlund@mozilla.com
push dateMon, 23 Jan 2017 14:19:46 +0000
treeherdermozilla-esr52@76101b503191 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmhowell, gchang
bugs1322331
milestone52.0a2
Bug 1322331 - Add Windows 10 detection to the installer. r=mhowell a=gchang
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
@@ -6154,18 +6154,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