From: Jeffrey Altman <jaltman@your-file-system.com>
Date: Sun, 18 Sep 2011 17:13:18 +0000 (-0400)
Subject: Windows: install control panel only if afs_config
X-Git-Tag: upstream/1.8.0_pre1^2~3243
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=c8f64e04b8cfb1085a2f3227785492d5e3f487ff;p=packages%2Fo%2Fopenafs.git

Windows: install control panel only if afs_config

Add the AFS control panel to the AFS Configuration Tool
component so that it is installed only if afs_config.exe
is going to be installed.

Change-Id: I9016ad70f3b201bbe440ec39e9987c6209cae0cc
Reviewed-on: http://gerrit.openafs.org/5462
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Jeffrey Altman <jaltman@openafs.org>
Tested-by: Jeffrey Altman <jaltman@openafs.org>
---

diff --git a/src/WINNT/install/wix/feature.wxi b/src/WINNT/install/wix/feature.wxi
index 1d40b728a..024934933 100644
--- a/src/WINNT/install/wix/feature.wxi
+++ b/src/WINNT/install/wix/feature.wxi
@@ -90,6 +90,7 @@
                InstallDefault="followParent" Level="1030" Title="$(loc.StrAFSConfigDesc)">
         <ComponentRef Id="cmf_afs_config_EXE" />
         <ComponentRef Id="cmf_afs_config_$(var.LanguageCode)_DLL" />
+        <ComponentRef Id="cmf_afs_cpa_CPL" />
         <Condition Level="30">USEAFSCONFIG &lt;&gt; 0 And USEREDIRECTOR = 0</Condition>
         <?ifdef DebugSyms?>
         <Feature Id="feaAfsConfigDebug" AllowAdvertise="no" Description="$(loc.StrAFSConfigDebugLongDesc)" Display="expand"
@@ -109,7 +110,6 @@
 
                 <ComponentRef Id="efl_CellServDB" />
                 <ComponentRef Id="cpf_CellServDB" />
-                <ComponentRef Id="cmf_afs_cpa_CPL" />
 
                 <ComponentRef Id="cmf_afsadminutil_DLL" />
                 <ComponentRef Id="cmf_afsclientadmin_DLL" />
@@ -229,7 +229,6 @@
                 <ComponentRef Id="rcm_Control_Center" />
                 <ComponentRef Id="cmp_CommonDir" />
                 
-                <ComponentRef Id="cmf_afs_cpa_CPL" />
                 <ComponentRef Id="cmf_afsbosadmin_DLL" />
                 <ComponentRef Id="cmf_afscfgadmin_DLL" />
                 <ComponentRef Id="cmf_afsclientadmin_DLL" />