git://git.openafs.org / openafs.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw
Windows: install control panel only if afs_config
[openafs.git] / src / WINNT / install / wix / feature.wxi
diff --git a/src/WINNT/install/wix/feature.wxi b/src/WINNT/install/wix/feature.wxi
index b003271..0249349 100644 (file)
--- a/src/WINNT/install/wix/feature.wxi
+++ b/src/WINNT/install/wix/feature.wxi
@@ -10,10 +10,6 @@
            <ComponentRef Id="efl_uninstall_EXE" />
 
            <ComponentRef Id="cmp_Release_Notes_en_US" />
-           <ComponentRef Id="cmf_index2_HTM_en_US" />
-           <ComponentRef Id="cmp_index_files_en_US" />
-           <ComponentRef Id="cmp_logo_files_en_US" />
-           <ComponentRef Id="cmp_relnotes_files_en_US" />
   <?endif?>
 
   <?ifndef BinsOnly ?>
@@ -21,11 +17,11 @@
                 InstallDefault="followParent" Level="30" Title="$(loc.StrAFSClientDesc)">
                 
                 <Feature Id="feaLoopback" AllowAdvertise="no" Description="$(loc.StrLoopbackLongDesc)"
-                    Display="expand" InstallDefault="followParent" Level="30" Title="$(loc.StrLoopbackDesc)">
+               Display="expand" InstallDefault="followParent" Level="1030" Title="$(loc.StrLoopbackDesc)">
                     <ComponentRef Id="rcm_Loopback"/>
+        <Condition Level="30">USEREDIRECTOR = 0</Condition>
                 </Feature>
 
-  <?if $(env.CPU) = "i386"?>
             <Feature Id="feaNetIDMgrPlugin" AllowAdvertise="no" Description="$(loc.StrNIDMPluginLongDesc)"
                     Display="expand" InstallDefault="followParent" Level="30" Title="$(loc.StrNIDMPluginDesc)">
                     <ComponentRef Id="_afscreds_plugin" />
@@ -38,16 +34,15 @@
                     </Feature>
            <?endif?>
             </Feature>
-  <?endif?>
 
                <Feature Id="feaKB301673" AllowAdvertise="no" Absent="disallow" Display="hidden" InstallDefault="followParent" Level="0">
                        <ComponentRef Id="rcm_KB301673" />
                        <Condition Level="30">VersionNT = 500 And ServicePackLevel &lt; 3</Condition>
                </Feature>
                                
-               <Feature Id="feaCredsStartup" AllowAdvertise="no" Display="hidden" InstallDefault="followParent" Level="30">
+      <Feature Id="feaCredsStartup" AllowAdvertise="no" Display="hidden" InstallDefault="followParent" Level="1030">
                        <ComponentRef Id="cmp_credsStartup" />
-                       <Condition Level="130">CREDSSTARTUP = 0</Condition>
+       <Condition Level="30">CREDSSTARTUP &lt;&gt; 0 And USEAFSCREDS &lt;&gt; 0 And USEREDIRECTOR = 0</Condition>
                </Feature>
                                
                <?ifdef DebugSyms?>
@@ -55,12 +50,57 @@
                                InstallDefault="$(var.DebugSymInstallDefault)" Level="$(var.DebugSymLowLevel)" Title="$(loc.StrAFSClientDebugDesc)">
                                <ComponentRef Id="cmp_ClientProgramDebug" />
                                <ComponentRef Id="cmp_CommonCommonDebug" />
-                               <ComponentRef Id="cmp_ClientCommonDebug" />
                                <ComponentRef Id="cmp_ClientSystemDebug" />
                                <?include runtime_debug.wxi?>
                        </Feature>
                <?endif?>
 
+      <Feature Id="feaClientDriver" AllowAdvertise="no" Description="$(loc.StrAFSClientDriverLongDesc)" Display="expand"
+               InstallDefault="followParent" Level="30" Title="$(loc.StrAFSClientDriverDesc)">
+  <?ifndef BinsOnly ?>
+        <ComponentRef Id="Drv_FSRDR" />
+        <ComponentRef Id="Drv_FSRDR_NP" />
+        <Condition Level="1030">USEREDIRECTOR = 0</Condition>
+        <?ifdef DebugSyms?>
+        <Feature Id="feaClientDriverDebug" AllowAdvertise="no" Description="$(loc.StrAFSClientDriverDebugLongDesc)" Display="expand"
+                 InstallDefault="$(var.DebugSymInstallDefault)" Level="$(var.DebugSymLowLevel)" Title="$(loc.StrAFSClientDebugDesc)">
+          <ComponentRef Id="Drv_FSRDR_Debug" />
+          <ComponentRef Id="Drv_FSRDR_NP_Debug" />
+          <Condition Level="1030">USEREDIRECTOR = 0</Condition>
+        </Feature>
+       <?endif?>
+  <?endif?>
+      </Feature>
+
+      <Feature Id="feaAfsCreds" AllowAdvertise="no" Description="$(loc.StrAFSCredsLongDesc)" Display="expand"
+               InstallDefault="followParent" Level="1030" Title="$(loc.StrAFSCredsDesc)">
+        <ComponentRef Id="cmf_afscreds_EXE" />
+        <ComponentRef Id="cmf_afscreds_$(var.LanguageCode)_DLL" />
+        <Condition Level="30">USEAFSCREDS &lt;&gt; 0 And USEREDIRECTOR = 0</Condition>
+        <?ifdef DebugSyms?>
+        <Feature Id="feaAfsCredsDebug" AllowAdvertise="no" Description="$(loc.StrAFSCredsDebugLongDesc)" Display="expand"
+                 InstallDefault="$(var.DebugSymInstallDefault)" Level="$(var.DebugSymHighLevel)" Title="$(loc.StrAFSCredsDebugDesc)">
+          <ComponentRef Id="cmp_AfsCredsDebug" />
+          <Condition Level="$(var.DebugSymLowLevel)">USEAFSCREDS &lt;&gt; 0 And USEREDIRECTOR = 0</Condition>
+        </Feature>
+        <?endif?>
+      </Feature>
+
+      <Feature Id="feaAfsConfig" AllowAdvertise="no" Description="$(loc.StrAFSConfigLongDesc)" Display="expand"
+               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"
+                 InstallDefault="$(var.DebugSymInstallDefault)" Level="$(var.DebugSymHighLevel)" Title="$(loc.StrAFSConfigDebugDesc)">
+          <ComponentRef Id="cmp_ClientConfigDebug" />
+          <Condition Level="$(var.DebugSymLowLevel)">USEAFSCONFIG &lt;&gt; 0 And USEREDIRECTOR = 0</Condition>
+        </Feature>
+        <?endif?>
+      </Feature>
+
                <ComponentRef Id="rcm_Client" />
                 <ComponentRef Id="rcm_ClientCacheSize" />
                 <ComponentRef Id="rcm_ClientCachePath" />
@@ -68,25 +108,26 @@
 
                <ComponentRef Id="cmp_CommonDir" />
 
-                <ComponentRef Id="efl_Readme_TXT_$(var.Language)" />
                 <ComponentRef Id="efl_CellServDB" />
                 <ComponentRef Id="cpf_CellServDB" />
-                <ComponentRef Id="cmf_afs_cpa_CPL" />
 
+                <ComponentRef Id="cmf_afsadminutil_DLL" />
+                <ComponentRef Id="cmf_afsclientadmin_DLL" />
+                <ComponentRef Id="cmf_afsvosadmin_DLL" />
                 <ComponentRef Id="cmf_afsrpc_DLL" />
+                <ComponentRef Id="cmf_afshcrypto_DLL" />
+                <ComponentRef Id="cmf_afsroken_DLL" />
                 <ComponentRef Id="cmf_afsauthent2_DLL" />
                 <ComponentRef Id="cmf_afspthread_DLL" />
                 <ComponentRef Id="cmf_TaAfsAppLib_DLL" />
                 <ComponentRef Id="cmf_afsprocmgmt_DLL" />
-                <ComponentRef Id="cmf_afs_config_EXE" />
 
                 <ComponentRef Id="cmf_afs_nt_HLP_$(var.Language)"/>
                 <ComponentRef Id="cmf_TaAfsAppLib_$(var.LanguageCode)_DLL" />
-                <ComponentRef Id="cmf_afscreds_$(var.LanguageCode)_DLL" />
-                <ComponentRef Id="cmf_afs_config_$(var.LanguageCode)_DLL" />
                 <ComponentRef Id="cmf_afs_cpa_$(var.LanguageCode)_DLL" />
                 <ComponentRef Id="cmf_afs_shl_ext_$(var.LanguageCode)_DLL" />
 
+                <ComponentRef Id="cmf_instloop_EXE" />
                 <ComponentRef Id="cmf_afsshare_EXE" />
                 <ComponentRef Id="cmf_libosi_DLL" />
                 <ComponentRef Id="cmf_libafsconf_DLL" />
@@ -95,7 +136,6 @@
                 <ComponentRef Id="cmf_unlog_EXE" />
                 <ComponentRef Id="cmf_fs_EXE" />
                 <ComponentRef Id="cmf_afsdacl_EXE" />
-                <ComponentRef Id="cmf_afscreds_EXE" />
                 <ComponentRef Id="cmf_afs_shl_ext_DLL" />
                 <ComponentRef Id="cmf_afsd_service_EXE" />
                 <ComponentRef Id="cmf_afslogon_DLL" />
@@ -110,20 +150,19 @@
                 <ComponentRef Id="cmf_translate_et_EXE" />
                 <ComponentRef Id="cmf_rxdebug_EXE" />
                 <ComponentRef Id="cmf_backup_EXE" />
-                <?if $(env.CPU) = "i386"?>
-                   <ComponentRef Id="cmf_aklog_EXE" />
-               <?endif?>
+               <ComponentRef Id="cmf_aklog_EXE" />
                 <ComponentRef Id="cmf_cmdebug_EXE" />
                 
                 <!-- Runtime -->
                 <?include runtime.wxi?>
             </Feature>
-            
+
+            <?ifndef LiteClient ?>
             <Feature Id="feaServer" AllowAdvertise="no" Description="$(loc.StrAFSServerLongDesc)" Display="expand"
                 InstallDefault="followParent" Level="130" Title="$(loc.StrAFSServerDesc)">
 
-                               <ComponentRef Id="rcm_Server" />
-                               <ComponentRef Id="cmp_CommonDir" />
+               <ComponentRef Id="rcm_Server" />
+               <ComponentRef Id="cmp_CommonDir" />
 
                 <ComponentRef Id="cmf_afsserver_CPL" />
                 <ComponentRef Id="cmf_afsbosadmin_DLL" />
@@ -135,6 +174,8 @@
                 <ComponentRef Id="cmf_afsadminutil_DLL" />
 
                 <ComponentRef Id="cmf_afsrpc_DLL" />
+                <ComponentRef Id="cmf_afshcrypto_DLL" />
+                <ComponentRef Id="cmf_afsroken_DLL" />
                 <ComponentRef Id="cmf_afsauthent2_DLL" />
                 <ComponentRef Id="cmf_afspthread_DLL" />
                 <ComponentRef Id="cmf_TaAfsAppLib_DLL" />
@@ -147,16 +188,12 @@
                 <ComponentRef Id="cmf_afs_nt_HLP_$(var.Language)" />
                 <ComponentRef Id="cmp_Lang_$(var.Language)" />
             
-                <ComponentRef Id="efl_Readme_TXT_$(var.Language)" />
-
                 <ComponentRef Id="cmf_vlserver_EXE" />
                 <ComponentRef Id="cmf_volinfo_EXE" />
                 <ComponentRef Id="cmf_volserver_EXE" />
                 <ComponentRef Id="cmf_afskill_EXE" />
                 <ComponentRef Id="cmf_afssvrcfg_EXE" />
-               <?if $(env.CPU) = "i386"?>
-                       <ComponentRef Id="cmf_asetkey_EXE" />
-               <?endif?>
+                <ComponentRef Id="cmf_asetkey_EXE" />
                 <ComponentRef Id="cmf_bosctlsvc_EXE" />
                 <ComponentRef Id="cmf_bosserver_EXE" />
                 <ComponentRef Id="cmf_buserver_EXE" />
@@ -165,6 +202,8 @@
                 <ComponentRef Id="cmf_butc_EXE" />
                 <ComponentRef Id="cmf_kaserver_EXE" />
                 <ComponentRef Id="cmf_ptserver_EXE" />
+                <ComponentRef Id="cmf_ptclient_EXE" />
+                <ComponentRef Id="cmf_pt_util_EXE" />
                 <ComponentRef Id="cmf_salvager_EXE" />
                 <ComponentRef Id="cmf_upclient_EXE" />
                 <ComponentRef Id="cmf_upserver_EXE" />
@@ -179,17 +218,17 @@
                                        <?include runtime_debug.wxi?>
                 </Feature>
             <?endif?>
-
                 <!-- Runtime -->
                 <?include runtime.wxi?>
             </Feature>
+            <?endif?>
+            <?ifndef LiteClient ?>
             <Feature Id="feaControlCenter" AllowAdvertise="no" Description="$(loc.StrAFSCCLongDesc)"
                 Display="expand" InstallDefault="followParent" Level="130" Title="$(loc.StrAFSCCDesc)">
                 
                 <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" />
@@ -198,11 +237,12 @@
                 <ComponentRef Id="cmf_afsvosadmin_DLL" />
                 <ComponentRef Id="cmf_afsadminutil_DLL" />
                 <ComponentRef Id="cmf_afsrpc_DLL" />
+                <ComponentRef Id="cmf_afshcrypto_DLL" />
+                <ComponentRef Id="cmf_afsroken_DLL" />
                 <ComponentRef Id="cmf_afsauthent2_DLL" />
                 <ComponentRef Id="cmf_afspthread_DLL" />
                 <ComponentRef Id="cmf_TaAfsAppLib_DLL" />
                 <ComponentRef Id="cmf_afsprocmgmt_DLL" />
-                <ComponentRef Id="cmf_afs_config_EXE" />
                                <ComponentRef Id="cmf_TaAfsServerManager_EXE" />
                                <ComponentRef Id="cmf_TaAfsAdmSvr_EXE" />
                                <ComponentRef Id="cmf_TaAfsAccountManager_EXE" />
@@ -213,8 +253,6 @@
                 <ComponentRef Id="cmf_TaAfsAccountManager_$(var.LanguageCode)_DLL" />
                 <ComponentRef Id="cmf_TaAfsAppLib_$(var.LanguageCode)_DLL" />
                 <ComponentRef Id="cmf_TaAfsServerManager_$(var.LanguageCode)_DLL" />
-                <ComponentRef Id="cmf_afscreds_$(var.LanguageCode)_DLL" />
-                <ComponentRef Id="cmf_afs_config_$(var.LanguageCode)_DLL" />
                 <ComponentRef Id="cmf_afs_cpa_$(var.LanguageCode)_DLL" />
                 <ComponentRef Id="cmf_afs_shl_ext_$(var.LanguageCode)_DLL" />
                 <ComponentRef Id="cmf_afs_nt_HLP_$(var.Language)" />
@@ -226,29 +264,32 @@
                                        <ComponentRef Id="cmp_Control_CenterDebug" />
                                        <ComponentRef Id="cmp_ServerCommonDebug" />
                                        <ComponentRef Id="cmp_CommonCommonDebug" />
-                                       <ComponentRef Id="cmp_ClientCommonDebug" />
                                        <?include runtime_debug.wxi?>
                                </Feature>
             <?endif?>
             
-                <ComponentRef Id="efl_Readme_TXT_$(var.Language)" />
-                
                 <!-- Runtime -->
                 <?include runtime.wxi?>
             </Feature>
+            <?endif?>
+            <?ifndef LiteClient ?>
             <Feature Id="feaSDK" AllowAdvertise="no" Description="$(loc.StrAFSSDKLongDesc)" Display="expand"
                 InstallDefault="followParent" Level="130" Title="$(loc.StrAFSSDKDesc)">
 
                                <ComponentRef Id="rcm_SDK" />
 
-                <ComponentRef Id="efl_Readme_TXT_$(var.Language)" />                
                                <ComponentRef Id="cmp_SDK_Sample" />
                                <ComponentRef Id="cmp_SDK_Include" />
                                <ComponentRef Id="cmp_SDK_Include_afs" />
+                               <ComponentRef Id="cmp_SDK_Include_hcrypto" />
                                <ComponentRef Id="cmp_SDK_Include_rx" />
                                <ComponentRef Id="cmp_SDK_Include_Winnt" />
                                <ComponentRef Id="cmp_SDK_Lib" />
                                <ComponentRef Id="cmp_SDK_Lib_Afs" />
+                <?ifdef CygwinArchives ?>
+                <ComponentRef Id="cmp_SDK_Lib_Cygwin" />
+                <ComponentRef Id="cmp_SDK_Lib_Afs_Cygwin" />
+                <?endif?>
 
                        <?ifdef DebugSyms?>
                                <Feature Id="feaSDKDebug" AllowAdvertise="no" Description="$(loc.StrAFSSDKDebugLongDesc)" Display="expand"
@@ -259,23 +300,27 @@
                 <!-- Runtime -->
                 <?include runtime.wxi?>
             </Feature>
+            <?endif?>
             
             <Feature Id="feaDocumentation" AllowAdvertise="no" Description="$(loc.StrAFSDocLongDesc)"
                 Display="expand" InstallDefault="followParent" Level="130" Title="$(loc.StrAFSDocDesc)">
 
-                               <ComponentRef Id="rcm_Documentation" />
-                
-                <ComponentRef Id="efl_Readme_TXT_$(var.Language)" />                
-                <ComponentRef Id="efl_DocHtml_en_US" />
+               <ComponentRef Id="rcm_Documentation" />
                 <ComponentRef Id="cmp_Cmd_Ref_en_US" />
-                <ComponentRef Id="cmp_Install_Guide_en_US" />
+                <ComponentRef Id="cmp_Cmd_Ref_1_en_US" />
+                <ComponentRef Id="cmp_Cmd_Ref_3_en_US" />
+                <ComponentRef Id="cmp_Cmd_Ref_5_en_US" />
+                <ComponentRef Id="cmp_Cmd_Ref_8_en_US" />
                 <ComponentRef Id="cmp_Sys_Admin_Guide_en_US" />
+                <ComponentRef Id="cmp_User_Guide_en_US" />
 
                 <ComponentRef Id="cmf_afs_nt_HLP_en_US" />
                 <ComponentRef Id="cmp_Lang_en_US" />
                
             </Feature>
-  <?else?>
+   <?else?> <!-- 32-bit tools only -->
+
+
             <Feature Id="feaBinaries" AllowAdvertise="no" Description="$(loc.StrBinsOnlyLongDesc)"
                 Display="expand" InstallDefault="followParent" Level="100" Title="$(loc.StrBinsOnlyDesc)">
 
@@ -288,7 +333,6 @@
                                </Feature>
                        <?endif?>
 
-  <?if $(env.CPU) = "i386"?>
             <Feature Id="feaNetIDMgrPlugin" AllowAdvertise="no" Description="$(loc.StrNIDMPluginLongDesc)"
                     Display="expand" InstallDefault="followParent" Level="30" Title="$(loc.StrNIDMPluginDesc)">
                     <ComponentRef Id="_afscreds_plugin" />
@@ -301,16 +345,32 @@
                     </Feature>
            <?endif?>
             </Feature>
-  <?endif?>
+
+      <Feature Id="feaClientDriver" AllowAdvertise="no" Description="$(loc.StrAFSClientDriverLongDesc)" Display="expand"
+               InstallDefault="followParent" Level="30" Title="$(loc.StrAFSClientDriverDesc)">
+        <ComponentRef Id="Drv_FSRDR_NP" />
+       <?ifdef DebugSyms?>
+        <Feature Id="feaClientDriverDebug" AllowAdvertise="no" Description="$(loc.StrAFSClientDriverDebugLongDesc)" Display="expand"
+                 InstallDefault="$(var.DebugSymInstallDefault)" Level="$(var.DebugSymLowLevel)" Title="$(loc.StrAFSClientDebugDesc)">
+          <ComponentRef Id="Drv_FSRDR_NP_Debug" />
+        </Feature>
+       <?endif?>
+      </Feature>
 
                <ComponentRef Id="cmp_CommonDir" />
 
                 <ComponentRef Id="cmf_afsrpc_DLL" />
+                <ComponentRef Id="cmf_afshcrypto_DLL" />
+                <ComponentRef Id="cmf_afsroken_DLL" />
+                <ComponentRef Id="cmf_afsadminutil_DLL" />
+                <ComponentRef Id="cmf_afsclientadmin_DLL" />
+                <ComponentRef Id="cmf_afsvosadmin_DLL" />
                 <ComponentRef Id="cmf_afsauthent2_DLL" />
                 <ComponentRef Id="cmf_afspthread_DLL" />
                 <ComponentRef Id="cmf_TaAfsAppLib_DLL" />
                 <ComponentRef Id="cmf_afsprocmgmt_DLL" />
 
+                <ComponentRef Id="cmf_instloop_EXE" />
                 <ComponentRef Id="cmf_afsshare_EXE" />
                 <ComponentRef Id="cmf_libosi_DLL" />
                 <ComponentRef Id="cmf_libafsconf_DLL" />
@@ -333,9 +393,7 @@
                 <ComponentRef Id="cmf_afs_shl_ext_$(var.LanguageCode)_DLL" />
 
                 <ComponentRef Id="rcm_BinsOnly_Parm" />
-                <?if $(env.CPU) = "i386"?>
-                   <ComponentRef Id="cmf_aklog_EXE" />
-               <?endif?>
+               <ComponentRef Id="cmf_aklog_EXE" />
                 <ComponentRef Id="cmf_cmdebug_EXE" />
                 
                 <!-- Runtime -->
OpenAFS Master Repository