git://git.openafs.org / openafs.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw
windows-install-20090527
[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..da42ec2 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 ?>
@@ -25,7 +21,6 @@
                     <ComponentRef Id="rcm_Loopback"/>
                 </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,7 +33,6 @@
                     </Feature>
            <?endif?>
             </Feature>
-  <?endif?>
 
                <Feature Id="feaKB301673" AllowAdvertise="no" Absent="disallow" Display="hidden" InstallDefault="followParent" Level="0">
                        <ComponentRef Id="rcm_KB301673" />
@@ -68,11 +62,13 @@
 
                <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_afsauthent2_DLL" />
                 <ComponentRef Id="cmf_afspthread_DLL" />
@@ -87,6 +83,7 @@
                 <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" />
@@ -110,9 +107,7 @@
                 <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 -->
@@ -122,8 +117,8 @@
             <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" />
@@ -147,16 +142,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 +156,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" />
@@ -231,8 +224,6 @@
                                </Feature>
             <?endif?>
             
-                <ComponentRef Id="efl_Readme_TXT_$(var.Language)" />
-                
                 <!-- Runtime -->
                 <?include runtime.wxi?>
             </Feature>
@@ -241,7 +232,6 @@
 
                                <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" />
@@ -249,6 +239,10 @@
                                <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"
@@ -263,13 +257,13 @@
             <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_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" />
@@ -288,7 +282,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 +294,19 @@
                     </Feature>
            <?endif?>
             </Feature>
-  <?endif?>
 
                <ComponentRef Id="cmp_CommonDir" />
 
                 <ComponentRef Id="cmf_afsrpc_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 +329,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