tyler.durden
/
notepad-plus-plus
mirror of https://github.com/notepad-plus-plus/notepad-plus-plus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update GetWindowsVersion installer script to 4.1.1 

Closes #1164
Adds support for Windows 8.1 and 10
This commit is contained in:
vlakoff 2015-11-20 06:25:58 +01:00 committed by Don Ho
parent 5d369194d9
commit 14c84f68e1
1 changed files with 29 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
PowerEditor/installer/nppSetup.nsi
View File

@ -53,16 +53,24 @@ InstallDir "$PROGRAMFILES\${APPNAME}"
InstallDirRegKey HKLM "Software\${APPNAME}" "" InstallDirRegKey HKLM "Software\${APPNAME}" ""
OutFile ".\build\npp.${APPVERSION}.Installer.exe" OutFile ".\build\npp.${APPVERSION}.Installer.exe"
; GetWindowsVersion 3.0 (2013-02-07) ; http://nsis.sourceforge.net/Get_Windows_version
; GetWindowsVersion 4.1.1 (2015-06-22)
; ;
; Based on Yazno's function, http://yazno.tripod.com/powerpimpit/ ; Based on Yazno's function, http://yazno.tripod.com/powerpimpit/
; Update by Joost Verburg ; Update by Joost Verburg
; Update (Macro, Define, Windows 7 detection) - John T. Haller of PortableApps.com - 2008-01-07 ; Update (Macro, Define, Windows 7 detection) - John T. Haller of PortableApps.com - 2008-01-07
; Update (Windows 8 detection) - Marek Mizanin (Zanir) - 2013-02-07 ; Update (Windows 8 detection) - Marek Mizanin (Zanir) - 2013-02-07
; Update (Windows 8.1 detection) - John T. Haller of PortableApps.com - 2014-04-04
; Update (Windows 10 TP detection) - John T. Haller of PortableApps.com - 2014-10-01
; Update (Windows 10 TP4 detection, and added include guards) - Kairu - 2015-06-22
; ;
; Usage: ${GetWindowsVersion} $R0 ; Usage: ${GetWindowsVersion} $R0
; ;
; $R0 contains: 95, 98, ME, NT x.x, 2000, XP, 2003, Vista, 7, 8 or '' (for unknown) ; $R0 contains: 95, 98, ME, NT x.x, 2000, XP, 2003, Vista, 7, 8, 8.1, 10.0 or '' (for unknown)
!ifndef __GET_WINDOWS_VERSION_NSH
!define __GET_WINDOWS_VERSION_NSH
Function GetWindowsVersion Function GetWindowsVersion
@ -71,6 +79,7 @@ Function GetWindowsVersion
ClearErrors ClearErrors
; check if Windows NT family
ReadRegStr $R0 HKLM \ ReadRegStr $R0 HKLM \
"SOFTWARE\Microsoft\Windows NT\CurrentVersion" CurrentVersion "SOFTWARE\Microsoft\Windows NT\CurrentVersion" CurrentVersion
@ -114,7 +123,14 @@ Function GetWindowsVersion
StrCmp $R1 '5.2' lbl_winnt_2003 StrCmp $R1 '5.2' lbl_winnt_2003
StrCmp $R1 '6.0' lbl_winnt_vista StrCmp $R1 '6.0' lbl_winnt_vista
StrCmp $R1 '6.1' lbl_winnt_7 StrCmp $R1 '6.1' lbl_winnt_7
StrCmp $R1 '6.2' lbl_winnt_8 lbl_error StrCmp $R1 '6.2' lbl_winnt_8
StrCmp $R1 '6.3' lbl_winnt_81
StrCmp $R1 '6.4' lbl_winnt_10 ; the early Windows 10 tech previews used version 6.4
StrCpy $R1 $R0 4
StrCmp $R1 '10.0' lbl_winnt_10
Goto lbl_error
lbl_winnt_x: lbl_winnt_x:
StrCpy $R0 "NT $R0" 6 StrCpy $R0 "NT $R0" 6
@ -144,6 +160,14 @@ Function GetWindowsVersion
Strcpy $R0 '8' Strcpy $R0 '8'
Goto lbl_done Goto lbl_done
lbl_winnt_81:
Strcpy $R0 '8.1'
Goto lbl_done
lbl_winnt_10:
Strcpy $R0 '10.0'
Goto lbl_done
lbl_error: lbl_error:
Strcpy $R0 '' Strcpy $R0 ''
lbl_done: lbl_done:
@ -160,6 +184,8 @@ FunctionEnd
!define GetWindowsVersion '!insertmacro "GetWindowsVersion"' !define GetWindowsVersion '!insertmacro "GetWindowsVersion"'
!endif
Function LaunchNpp Function LaunchNpp
Exec '"$INSTDIR\notepad++.exe" "$INSTDIR\change.log" ' Exec '"$INSTDIR\notepad++.exe" "$INSTDIR\change.log" '