Update Windows Installer script to block Vista with SP1 and lower.

13 files changed, 9 insertions, 32 deletions

diff --git a/indra/newview/installers/windows/installer_template.nsi b/indra/newview/installers/windows/installer_template.nsi
index 65581a6781..c07ba560a7 100755
--- a/indra/newview/installers/windows/installer_template.nsi
+++ b/indra/newview/installers/windows/installer_template.nsi
@@ -27,12 +27,12 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

 ;; Compiler flags

 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-SetOverwrite on				; overwrite files

-SetCompress auto			; compress iff saves space

-SetCompressor /solid lzma	; compress whole installer as one block

-SetDatablockOptimize off	; only saves us 0.1%, not worth it

-XPStyle on                  ; add an XP manifest to the installer

-RequestExecutionLevel admin	; on Vista we must be admin because we write to Program Files

+SetOverwrite on				; Overwrite files

+SetCompress auto			; Compress if saves space

+SetCompressor /solid lzma	; Compress whole installer as one block

+SetDatablockOptimize off	; Only saves us 0.1%, not worth it

+XPStyle on                  ; Add an XP manifest to the installer

+RequestExecutionLevel admin	; For when we write to Program Files

 

 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

 ;;; Project flags

@@ -118,7 +118,6 @@ Var DO_UNINSTALL_V2     ; If non-null, path to a previous Viewer 2 installation
 !insertmacro GetParameters

 !insertmacro GetOptions

 !include WinVer.nsh			; For OS and SP detection

-!include x64.nsh			; For 64bit OS detection

 

 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

 ;;; After install completes, launch app

@@ -145,26 +144,18 @@ FunctionEnd
 ; Currently: Windows 32bit XP SP3, 64bit XP SP2 and Server 2003 SP2

 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

 Function CheckWindowsVersion

-  ${If} ${AtMostWin2000}

+  ${If} ${AtMostWin2003}

     MessageBox MB_OK $(CheckWindowsVersionMB)

     Quit

   ${EndIf}

 

-  ${If} ${IsWinXP}

-  ${AndIfNot} ${RunningX64}

-  ${AndIfNot} ${IsServicePack} 3

-    MessageBox MB_OK $(CheckWindowsVersionMB)

-    Quit

-  ${EndIf}

-

-  ${If} ${IsWinXP}

-  ${AndIf} ${RunningX64}

+  ${If} ${IsWinVista}

   ${AndIfNot} ${IsServicePack} 2

     MessageBox MB_OK $(CheckWindowsVersionMB)

     Quit

   ${EndIf}

 

-  ${If} ${IsWin2003}

+  ${If} ${IsWin2008}

   ${AndIfNot} ${IsServicePack} 2

     MessageBox MB_OK $(CheckWindowsVersionMB)

     Quit

@@ -175,20 +166,6 @@ FunctionEnd
 ;Recommend Upgrading Service Pack

 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

 Function CheckWindowsServPack

-  ${If} ${IsWinVista}

-  ${AndIfNot} ${IsServicePack} 2

-    MessageBox MB_OK $(CheckWindowsServPackMB)

-    DetailPrint $(UseLatestServPackDP)

-    Return

-  ${EndIf}

-

-  ${If} ${IsWin2008}

-  ${AndIfNot} ${IsServicePack} 2

-    MessageBox MB_OK $(CheckWindowsServPackMB)

-    DetailPrint $(UseLatestServPackDP)

-    Return

-  ${EndIf}

-

   ${If} ${IsWin7}

   ${AndIfNot} ${IsServicePack} 1

     MessageBox MB_OK $(CheckWindowsServPackMB)

diff --git a/indra/newview/installers/windows/lang_da.nsi b/indra/newview/installers/windows/lang_da.nsi
index 2352649b4b..1080fd2e3d 100755
--- a/indra/newview/installers/windows/lang_da.nsi
+++ b/indra/newview/installers/windows/lang_da.nsi
diff --git a/indra/newview/installers/windows/lang_de.nsi b/indra/newview/installers/windows/lang_de.nsi
index 397262afe1..fd59bf8f71 100755
--- a/indra/newview/installers/windows/lang_de.nsi
+++ b/indra/newview/installers/windows/lang_de.nsi
diff --git a/indra/newview/installers/windows/lang_en-us.nsi b/indra/newview/installers/windows/lang_en-us.nsi
index df0d55d9e0..4cf605e398 100755
--- a/indra/newview/installers/windows/lang_en-us.nsi
+++ b/indra/newview/installers/windows/lang_en-us.nsi
diff --git a/indra/newview/installers/windows/lang_es.nsi b/indra/newview/installers/windows/lang_es.nsi
index 32967a0dfa..bfc1bf7248 100755
--- a/indra/newview/installers/windows/lang_es.nsi
+++ b/indra/newview/installers/windows/lang_es.nsi
diff --git a/indra/newview/installers/windows/lang_fr.nsi b/indra/newview/installers/windows/lang_fr.nsi
index 7c75e25360..c2ee17fbd4 100755
--- a/indra/newview/installers/windows/lang_fr.nsi
+++ b/indra/newview/installers/windows/lang_fr.nsi
diff --git a/indra/newview/installers/windows/lang_it.nsi b/indra/newview/installers/windows/lang_it.nsi
index ce66b61f9f..cb97335488 100755
--- a/indra/newview/installers/windows/lang_it.nsi
+++ b/indra/newview/installers/windows/lang_it.nsi
diff --git a/indra/newview/installers/windows/lang_ja.nsi b/indra/newview/installers/windows/lang_ja.nsi
index e68830123a..3fbf434b6a 100755
--- a/indra/newview/installers/windows/lang_ja.nsi
+++ b/indra/newview/installers/windows/lang_ja.nsi
diff --git a/indra/newview/installers/windows/lang_pl.nsi b/indra/newview/installers/windows/lang_pl.nsi
index 7883819190..1564c25293 100755
--- a/indra/newview/installers/windows/lang_pl.nsi
+++ b/indra/newview/installers/windows/lang_pl.nsi
diff --git a/indra/newview/installers/windows/lang_pt-br.nsi b/indra/newview/installers/windows/lang_pt-br.nsi
index eb3fb2386c..8e858c8742 100755
--- a/indra/newview/installers/windows/lang_pt-br.nsi
+++ b/indra/newview/installers/windows/lang_pt-br.nsi
diff --git a/indra/newview/installers/windows/lang_ru.nsi b/indra/newview/installers/windows/lang_ru.nsi
index 3b0042fbf5..8b98ed5032 100755
--- a/indra/newview/installers/windows/lang_ru.nsi
+++ b/indra/newview/installers/windows/lang_ru.nsi
diff --git a/indra/newview/installers/windows/lang_tr.nsi b/indra/newview/installers/windows/lang_tr.nsi
index b9be1eab08..7c41811b30 100755
--- a/indra/newview/installers/windows/lang_tr.nsi
+++ b/indra/newview/installers/windows/lang_tr.nsi
diff --git a/indra/newview/installers/windows/lang_zh.nsi b/indra/newview/installers/windows/lang_zh.nsi
index 3c6f6fd289..e89a1e7e51 100755
--- a/indra/newview/installers/windows/lang_zh.nsi
+++ b/indra/newview/installers/windows/lang_zh.nsi