wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 737833 - Add logiclib tests for Windows 8. r=rstrong

Browse Source
This commit is contained in:
Brian R. Bondy 2012-09-11 14:59:07 -04:00
parent 779abadc38
commit 487815a611
2 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
toolkit/mozapps/installer/windows/nsis/common.nsh
View File

@ -79,20 +79,6 @@
!include /NONFATAL WinVer.nsh
!endif
; Add Windows 7 / 2008 support for versions of WinVer.nsh that don't support
; them. This can be removed after bug 571381 is fixed.
!ifndef WINVER_7
!define WINVER_7 0x601
!macro __MOZ__WinVer_DefineOSTests Test
!insertmacro __WinVer_DefineOSTest ${Test} 7
!macroend
!insertmacro __MOZ__WinVer_DefineOSTests AtLeast
!insertmacro __MOZ__WinVer_DefineOSTests Is
!insertmacro __MOZ__WinVer_DefineOSTests AtMost
!endif
!include x64.nsh
; NSIS provided macros that we have overridden.

21
toolkit/mozapps/installer/windows/nsis/overrides.nsh
View File

@ -18,6 +18,27 @@
!include FileFunc.nsh
!endif
!macro __MOZ__WinVer_DefineOSTests WinVer
!insertmacro __WinVer_DefineOSTest AtLeast ${WinVer} ""
!insertmacro __WinVer_DefineOSTest AtMost ${WinVer} ""
!insertmacro __WinVer_DefineOSTest Is ${WinVer} ""
!macroend
!ifndef WINVER_7
!define WINVER_7 0x06010000 ;6.01.????
!insertmacro __MOZ__WinVer_DefineOSTests 7
!endif
!ifndef WINVER_2008R2
!define WINVER_2008R2 0x06010001 ;6.01.????
!insertmacro __MOZ__WinVer_DefineOSTests 2008R2
!endif
!ifndef WINVER_8
!define WINVER_8 0x06020000 ;6.02.????
!insertmacro __MOZ__WinVer_DefineOSTests 8
!endif
!verbose push
!verbose 3
!ifndef _OVERRIDE_VERBOSE