From 4673020c6395bf0542017c6a118d797fa19285dc Mon Sep 17 00:00:00 2001
From: Tank_Master <tank.master@phoenixviewer.com>
Date: Tue, 10 Feb 2015 16:41:23 -0800
Subject: [PATCH] Update Windows Installer script to block Vista with SP1 and
lower.
---
.../installers/windows/installer_template.nsi | 41 ++++--------------
indra/newview/installers/windows/lang_da.nsi | Bin 8026 -> 8032 bytes
indra/newview/installers/windows/lang_de.nsi | Bin 9346 -> 9352 bytes
.../newview/installers/windows/lang_en-us.nsi | Bin 8120 -> 8126 bytes
indra/newview/installers/windows/lang_es.nsi | Bin 8764 -> 8770 bytes
indra/newview/installers/windows/lang_fr.nsi | Bin 9030 -> 9036 bytes
indra/newview/installers/windows/lang_it.nsi | Bin 8372 -> 8378 bytes
indra/newview/installers/windows/lang_ja.nsi | Bin 7288 -> 7294 bytes
indra/newview/installers/windows/lang_pl.nsi | Bin 8426 -> 8432 bytes
.../newview/installers/windows/lang_pt-br.nsi | Bin 8788 -> 8794 bytes
indra/newview/installers/windows/lang_ru.nsi | Bin 8144 -> 8150 bytes
indra/newview/installers/windows/lang_tr.nsi | Bin 8266 -> 8272 bytes
indra/newview/installers/windows/lang_zh.nsi | Bin 6798 -> 6804 bytes
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 65581a67815..c07ba560a7a 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 2352649b4be36f3da1de963f01bf1e1eb6289dd9..1080fd2e3d6c147301201480e406ab8df9b2f6b7 100755
GIT binary patch
delta 22
dcmca*_rPw07Z+z3LncEpLkUCTW?wE|Q2<$Y26q4e
delta 16
XcmaE0cgt>r7Z-B`L%`->E?!XpHfaSI
diff --git a/indra/newview/installers/windows/lang_de.nsi b/indra/newview/installers/windows/lang_de.nsi
index 397262afe14f1a303fe05a137e4df00b02de4913..fd59bf8f71d372bbfa839e22e1c2384b5dd4f5c5 100755
GIT binary patch
delta 22
dcmZqj?C{)R!OI!OkjYTYP{NS7*_zi~8~{u71^WO1
delta 16
XcmeD1Z1UV-!OI-M5U|;i*IgU{EZhW~
diff --git a/indra/newview/installers/windows/lang_en-us.nsi b/indra/newview/installers/windows/lang_en-us.nsi
index df0d55d9e093f8401f1411d9b17120a9c3455659..4cf605e398a96ae99d69a0b0d2bde3e4a8b2b844 100755
GIT binary patch
delta 28
jcmdmCzt4U{5f^6|LncEpLkUCT<WeqmMx)Jhxuit_gxv@y
delta 22
dcmdmIzr%h*5f^g=L%`%}E_FuZ&5OCDMFCn*2G0Nh
diff --git a/indra/newview/installers/windows/lang_es.nsi b/indra/newview/installers/windows/lang_es.nsi
index 32967a0dfac4cc2d146a04179d870e72b13fc90e..bfc1bf724835e5074e5aa23eefe4a37eb4ce06be 100755
GIT binary patch
delta 22
dcmdnva>!*v5;tcULncEpLkUCT=2Y(MVgOki2Sfk>
delta 16
XcmX@)vd3jZ5;t=ML%`;2?(1RzHkSqE
diff --git a/indra/newview/installers/windows/lang_fr.nsi b/indra/newview/installers/windows/lang_fr.nsi
index 7c75e25360171bac70cea27a54161256b216b7e3..c2ee17fbd450bf95a8d648dd9b717e47d6b93acf 100755
GIT binary patch
delta 22
dcmX@+cE)YP4sOmchD?THh7yLv&AYj~#Q|Z42fY9Q
delta 16
XcmX@(cFb+V4sPZMhJeinxx2*yJZ=VF
diff --git a/indra/newview/installers/windows/lang_it.nsi b/indra/newview/installers/windows/lang_it.nsi
index ce66b61f9fcb17304f8304549abd11277df72d1d..cb97335488b1d4c849a74ff79ac66a46849f4e17 100755
GIT binary patch
delta 22
dcmdnuxXW>a6gOuWLncEpLkUCTW?Am(q5x3p23-IE
delta 16
XcmdnxxW#dU6gP7OL%?Qb?&+ccFq#DZ
diff --git a/indra/newview/installers/windows/lang_ja.nsi b/indra/newview/installers/windows/lang_ja.nsi
index e68830123a10c1390224402f5eaa51f79a6a32b7..3fbf434b6a948599addc753fb6a78449a18acbaa 100755
GIT binary patch
delta 22
ecmexi@y}wzJZ{b~hD?THh7yLv%?r7&3jhFR`3M#O
delta 16
Ycmexo@xx-nJZ|O)hJek>xvvWV06)zJw*UYD
diff --git a/indra/newview/installers/windows/lang_pl.nsi b/indra/newview/installers/windows/lang_pl.nsi
index 788381919014c919d77b0ce35d025fc0cbe8d87f..1564c2529357421c1684240a26327e6f71b7a6d4 100755
GIT binary patch
delta 22
dcmaFm_`z|*HZIOEhD?THh7yLv%{#da#Q<fr2bur?
delta 16
Xcmez1_{wp^HZJA}hJelcxeUbsKRO0G
diff --git a/indra/newview/installers/windows/lang_pt-br.nsi b/indra/newview/installers/windows/lang_pt-br.nsi
index eb3fb2386c0ffa6c9081f0050740a691d94c9adc..8e858c8742361246c852e75bd89bf8bda236695a 100755
GIT binary patch
delta 22
ecmccOa?54I5^l~ghD?THh7yLv&C9vhiU9y(AqUO?
delta 16
YcmccRa>ZrC5^m-QhJej$xz~yT06g&qZvX%Q
diff --git a/indra/newview/installers/windows/lang_ru.nsi b/indra/newview/installers/windows/lang_ru.nsi
index 3b0042fbf54c4367a729ac556c7de1fb1b821d1f..8b98ed50326b95f43e9c5ade4e87d9cfb8af2078 100755
GIT binary patch
delta 22
dcmca$f6abF9T#U9LncEpLkUCT=0+}mQ2<=S2M+)M
delta 16
Xcmca+f5Co39T#&1L%`;CE`Lz~IOzqj
diff --git a/indra/newview/installers/windows/lang_tr.nsi b/indra/newview/installers/windows/lang_tr.nsi
index b9be1eab08205f443d00fa6e2aa7edbbd32ad8a8..7c41811b30e09f0afe17687ebd612ab89450dbc8 100755
GIT binary patch
delta 22
dcmX@*aKT|i9T#U9LncEpLkUCT=0>iQq5xdu2Y&zn
delta 16
XcmccMaLQpr9T#&1L%`;Cu9KnwIYkB_
diff --git a/indra/newview/installers/windows/lang_zh.nsi b/indra/newview/installers/windows/lang_zh.nsi
index 3c6f6fd28915a163597d9ac4005e6db524b8a7df..e89a1e7e5181b7a3940ae85bc96a68bdcaca636e 100755
GIT binary patch
delta 22
dcmeA(onpEnh?6snA(Nq)p@boEb10{!AOK8&1_J;9
delta 16
XcmbPY+Gn~Uh?6;jAz*Vfr==hOEkp#Q
--
GitLab