git://git.openafs.org / openafs.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw
window-wix-dependencies-two-20080205
[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 bb36097..f366265 100644 (file)
--- a/src/WINNT/install/wix/feature.wxi
+++ b/src/WINNT/install/wix/feature.wxi
@@ -13,6 +13,7 @@
            <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 ?>
@@ -24,39 +25,55 @@
                     <ComponentRef Id="rcm_Loopback"/>
                 </Feature>
 
-                               <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="feaNetIDMgrPlugin" AllowAdvertise="no" Description="$(loc.StrNIDMPluginLongDesc)"
+                    Display="expand" InstallDefault="followParent" Level="30" Title="$(loc.StrNIDMPluginDesc)">
+                    <ComponentRef Id="_afscreds_plugin" />
+                    <ComponentRef Id="_afscreds_en_us" />
+                    <ComponentRef Id="_afscreds_chm" />
+           <?ifdef DebugSyms?>
+                    <Feature Id="DebugSyms" Title="$(loc.StrNIDMDebugDesc)" InstallDefault="$(var.DebugSymInstallDefault)"
+                       Level="$(var.DebugSymLowLevel)" Display="expand" Description="$(loc.StrNIDMDebugLongDesc)">
+                       <ComponentRef Id="_afscreds_debugsym" />
+                    </Feature>
+           <?endif?>
+            </Feature>
+
+               <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">
-                                       <ComponentRef Id="cmp_credsStartup" />
-                                       <Condition Level="130">CREDSSTARTUP = 0</Condition>
-                               </Feature>
+               <Feature Id="feaCredsStartup" AllowAdvertise="no" Display="hidden" InstallDefault="followParent" Level="30">
+                       <ComponentRef Id="cmp_credsStartup" />
+                       <Condition Level="130">CREDSSTARTUP = 0</Condition>
+               </Feature>
                                
-                       <?ifdef DebugSyms?>
-                               <Feature Id="feaClientDebug" AllowAdvertise="no" Description="$(loc.StrAFSClientDebugLongDesc)" Display="expand"
-                                       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?>
+               <?ifdef DebugSyms?>
+                       <Feature Id="feaClientDebug" AllowAdvertise="no" Description="$(loc.StrAFSClientDebugLongDesc)" Display="expand"
+                               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?>
 
-                               <ComponentRef Id="rcm_Client" />
+               <ComponentRef Id="rcm_Client" />
                 <ComponentRef Id="rcm_ClientCacheSize" />
                 <ComponentRef Id="rcm_ClientCachePath" />
                 <ComponentRef Id="rcm_StoreAnsiFilenames" />
 
-                               <ComponentRef Id="cmp_CommonDir" />
+               <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" />
@@ -71,6 +88,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" />
@@ -94,9 +112,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 -->
@@ -106,8 +122,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" />
@@ -138,9 +154,7 @@
                 <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" />
@@ -263,23 +277,40 @@
             <Feature Id="feaBinaries" AllowAdvertise="no" Description="$(loc.StrBinsOnlyLongDesc)"
                 Display="expand" InstallDefault="followParent" Level="100" Title="$(loc.StrBinsOnlyDesc)">
 
-                       <?ifdef DebugSyms?>
-                               <Feature Id="feaClientDebug" AllowAdvertise="no" Description="$(loc.StrAFSClientDebugLongDesc)" Display="expand"
-                                       InstallDefault="$(var.DebugSymInstallDefault)" Level="$(var.DebugSymLowLevel)" Title="$(loc.StrAFSClientDebugDesc)">
+               <?ifdef DebugSyms?>
+                       <Feature Id="feaClientDebug" AllowAdvertise="no" Description="$(loc.StrAFSClientDebugLongDesc)" Display="expand"
+                               InstallDefault="$(var.DebugSymInstallDefault)" Level="$(var.DebugSymLowLevel)" Title="$(loc.StrAFSClientDebugDesc)">
                     <ComponentRef Id="cmp_ClientProgramDebug" />
                     <ComponentRef Id="cmp_CommonCommonDebug" />
                     <?include runtime_debug.wxi?>
                                </Feature>
                        <?endif?>
 
-                               <ComponentRef Id="cmp_CommonDir" />
+            <Feature Id="feaNetIDMgrPlugin" AllowAdvertise="no" Description="$(loc.StrNIDMPluginLongDesc)"
+                    Display="expand" InstallDefault="followParent" Level="30" Title="$(loc.StrNIDMPluginDesc)">
+                    <ComponentRef Id="_afscreds_plugin" />
+                    <ComponentRef Id="_afscreds_en_us" />
+                    <ComponentRef Id="_afscreds_chm" />
+           <?ifdef DebugSyms?>
+                    <Feature Id="DebugSyms" Title="$(loc.StrNIDMDebugDesc)" InstallDefault="$(var.DebugSymInstallDefault)"
+                       Level="$(var.DebugSymLowLevel)" Display="expand" Description="$(loc.StrNIDMDebugLongDesc)">
+                       <ComponentRef Id="_afscreds_debugsym" />
+                    </Feature>
+           <?endif?>
+            </Feature>
+
+               <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" />
@@ -302,9 +333,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