Bug 737833 - Add logiclib tests for Windows 8. r=rstrong
authorBrian R. Bondy <netzen@gmail.com>
Tue, 11 Sep 2012 14:59:07 -0400
changeset 107782 e5198b6afda0debef61bc257781ce4f1cfa1636b
parent 107781 568593839470a107667b954bc3e6eb447c8662f2
child 107783 451c73598cc77c3659904c50c0b1b5c6c757383a
push id82
push usershu@rfrn.org
push dateFri, 05 Oct 2012 13:20:22 +0000
reviewersrstrong
bugs737833
milestone18.0a1
Bug 737833 - Add logiclib tests for Windows 8. r=rstrong
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
@@ -74,30 +74,16 @@
 
 ; When including WinVer.nsh check if ___WINVER__NSH___ is defined to prevent
 ; loading the file a second time. NSIS versions prior to 2.21 didn't include
 ; WinVer.nsh so include it with the /NOFATAL option.
 !ifndef ___WINVER__NSH___
   !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.
 !include overrides.nsh
 
 !define SHORTCUTS_LOG "shortcuts_log.ini"
 
 
--- a/toolkit/mozapps/installer/windows/nsis/overrides.nsh
+++ b/toolkit/mozapps/installer/windows/nsis/overrides.nsh
@@ -13,16 +13,37 @@
 !ifmacrondef TEXTFUNC_VERBOSE
 !include TextFunc.nsh
 !endif
 
 !ifmacrondef FILEFUNC_VERBOSE
 !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
   !define _OVERRIDE_VERBOSE 3
 !endif
 !verbose ${_OVERRIDE_VERBOSE}
 !define OVERRIDE_VERBOSE `!insertmacro OVERRIDE_VERBOSE`
 !define _OVERRIDE_UN