From: Asanka Herath <asanka@secure-endpoints.com>
Date: Mon, 30 Jun 2008 14:40:22 +0000 (+0000)
Subject: DEVEL15-windows-wix-install-idn-redist-20080630
X-Git-Tag: openafs-devel-1_5_50~58
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=24c9747f23d59bd973094109553c7287ebce6f75;p=packages%2Fo%2Fopenafs.git

DEVEL15-windows-wix-install-idn-redist-20080630

LICENSE MIT

Only install IDN redistributables on XP and 2003


(cherry picked from commit 7460987e758fa299849d877633053c05cb431977)
---

diff --git a/src/WINNT/install/wix/openafs.wxs b/src/WINNT/install/wix/openafs.wxs
index 0b65b5a16..b1f3548b8 100644
--- a/src/WINNT/install/wix/openafs.wxs
+++ b/src/WINNT/install/wix/openafs.wxs
@@ -235,7 +235,7 @@
             <Custom Action="RollbackNetProvider" After="WriteRegistryValues">&amp;feaClient=3</Custom>
 			<Custom Action="InstallNetProvider" After="RollbackNetProvider">&amp;feaClient=3</Custom>
 			<Custom Action="RemoveNetProvider" After="InstallNetProvider">&amp;feaClient=2</Custom>
-      <Custom Action="InstallIDNMRedistributable" After="WriteRegistryValues">&amp;feaClient=3</Custom>
+      <Custom Action="InstallIDNMRedistributable" After="WriteRegistryValues">!feaClient=2 And &amp;feaClient=3 And (VersionNT=501 Or VersionNT=502)</Custom>
 			<Custom Action="ConfigureClient" After="InstallServices">&amp;feaClient=3</Custom>
 			<Custom Action="ConfigureServer" After="ConfigureClient">&amp;feaServer=3</Custom>
 			<!-- <Custom Action="RemoveAFSAdminGroup" Before="">&amp;feaClient=2</Custom> -->