dragonleo/NSIS
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Preliminary ManifestSupportedOS and WinVer.nsh Win10 support

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6558 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
anders_k 2014-10-21 23:13:26 +00:00
parent eb5d77214a
commit 46ac05004d
6 changed files with 46 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Include/WinVer.nsh
View file

@ -36,6 +36,9 @@
; 2012
; 8.1
; 2012R2
; 10
;
; Note: Windows 8.1 and later will be detected as Windows 8 unless ManifestSupportedOS is set correctly!
;
; AtLeastServicePack checks if the installer is running on Windows service pack version at least as specified.
; IsServicePack checks if the installer is running on Windows service pack version exactly as specified.
@ -150,6 +153,8 @@
!define WINVER_8.1 0x06030000 ;6.03.9600
!define WINVER_2012R2_NT 0x86030001 ;6.03.9600
!define WINVER_2012R2 0x06030001 ;6.03.9600
!define WINVER_10_NT 0x86040000 ;6.04.????
!define WINVER_10 0x06040000 ;6.04.????
# use this to make all nt > 9x
@ -410,6 +415,7 @@
!insertmacro __WinVer_DefineOSTest ${Test} 2012 '${Suffix}'
!insertmacro __WinVer_DefineOSTest ${Test} 8.1 '${Suffix}'
!insertmacro __WinVer_DefineOSTest ${Test} 2012R2 '${Suffix}'
!insertmacro __WinVer_DefineOSTest ${Test} 10 '${Suffix}'
!macroend
!insertmacro __WinVer_DefineOSTests AtLeast ""