From 061eee57d9a56bd50fbe2a8f84b3cff99f63ebfc Mon Sep 17 00:00:00 2001
From: Tank_Master <tank.master@phoenixviewer.com>
Date: Sat, 18 Jan 2014 11:05:33 -0800
Subject: Block installation on any Windows OS below Vista, except for 32bit XP
 with SP3

---
 indra/newview/installers/windows/installer_template.nsi | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/installers/windows/installer_template.nsi b/indra/newview/installers/windows/installer_template.nsi
index fefec31df3..5db961c2b4 100755
--- a/indra/newview/installers/windows/installer_template.nsi
+++ b/indra/newview/installers/windows/installer_template.nsi
@@ -154,14 +154,12 @@ Function dirPre
 FunctionEnd    
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-; Make sure we are not on a verion of windows older than XP SP2
+; Make sure we are not on a verion of Windows older than Vista, except for 32bit XP SP3
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 Function CheckWindowsVersion
-  ${IfNot} ${AtLeastWin2000}
+  ${IfNot} ${AtLeastWinVista}
   ${OrIf} ${IsWinXP}
-  ${AndIfNot} ${AtLeastServicePack} 1
-  ${OrIf} ${IsWin2003}
-  ${AndIfNot} ${AtLeastServicePack} 1
+  ${AndIfNot} ${IsServicePack} 3
     MessageBox MB_OK $(CheckWindowsVersionMB)
     Quit
   ${EndIf}
@@ -171,11 +169,7 @@ FunctionEnd
 ;Recommend Upgrading Service Pack
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 Function CheckWindowsServPack
-  ${If} ${IsWinXP}
-  ${AndIfNot} ${IsServicePack} 3
-  ${OrIf} ${IsWin2003}
-  ${AndIfNot} ${IsServicePack} 2
-  ${OrIf} ${IsWinVista}
+  ${If} ${IsWinVista}
   ${AndIfNot} ${IsServicePack} 2
   ${OrIf} ${IsWin2008}
   ${AndIfNot} ${IsServicePack} 2
@@ -784,7 +778,7 @@ SectionEnd 				; end of uninstall section
 ;;  entry to the language ID selector below
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 Function .onInit
-Call CheckWindowsVersion		; Don't install if on Windows XP SP1 or older (do to XP x64 only having SP2 and no SP3)
+Call CheckWindowsVersion		; Check the version of windows we are installing on
     Push $0
     ${GetParameters} $COMMANDLINE              ; get our command line
 
-- 
cgit v1.2.3