diff options
| author | Tank_Master <tank.master@phoenixviewer.com> | 2014-03-10 12:07:59 -0700 |
|---|---|---|
| committer | Tank_Master <tank.master@phoenixviewer.com> | 2014-03-10 12:07:59 -0700 |
| commit | 328f64b4b9b870661a6d0bb8947dc1ff410ca0f8 (patch) | |
| tree | 769bd24c2300307846e316e230db5dadb641611a /indra/newview/installers/windows | |
| parent | 061eee57d9a56bd50fbe2a8f84b3cff99f63ebfc (diff) | |
| parent | 1ad94b5a9a8d0b6d095938148cbf8b1b56a778bf (diff) | |
Merge
Diffstat (limited to 'indra/newview/installers/windows')
| -rwxr-xr-x | indra/newview/installers/windows/installer_template.nsi | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/indra/newview/installers/windows/installer_template.nsi b/indra/newview/installers/windows/installer_template.nsi index 5db961c2b4..fefec31df3 100755 --- a/indra/newview/installers/windows/installer_template.nsi +++ b/indra/newview/installers/windows/installer_template.nsi @@ -154,12 +154,14 @@ Function dirPre FunctionEnd
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-; Make sure we are not on a verion of Windows older than Vista, except for 32bit XP SP3
+; Make sure we are not on a verion of windows older than XP SP2
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
Function CheckWindowsVersion
- ${IfNot} ${AtLeastWinVista}
+ ${IfNot} ${AtLeastWin2000}
${OrIf} ${IsWinXP}
- ${AndIfNot} ${IsServicePack} 3
+ ${AndIfNot} ${AtLeastServicePack} 1
+ ${OrIf} ${IsWin2003}
+ ${AndIfNot} ${AtLeastServicePack} 1
MessageBox MB_OK $(CheckWindowsVersionMB)
Quit
${EndIf}
@@ -169,7 +171,11 @@ FunctionEnd ;Recommend Upgrading Service Pack
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
Function CheckWindowsServPack
- ${If} ${IsWinVista}
+ ${If} ${IsWinXP}
+ ${AndIfNot} ${IsServicePack} 3
+ ${OrIf} ${IsWin2003}
+ ${AndIfNot} ${IsServicePack} 2
+ ${OrIf} ${IsWinVista}
${AndIfNot} ${IsServicePack} 2
${OrIf} ${IsWin2008}
${AndIfNot} ${IsServicePack} 2
@@ -778,7 +784,7 @@ SectionEnd ; end of uninstall section ;; entry to the language ID selector below
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
Function .onInit
-Call CheckWindowsVersion ; Check the version of windows we are installing on
+Call CheckWindowsVersion ; Don't install if on Windows XP SP1 or older (do to XP x64 only having SP2 and no SP3)
Push $0
${GetParameters} $COMMANDLINE ; get our command line
|