Imported Upstream version 1.15.1

[platform/upstream/krb5.git] / src / windows / installer / wix / features.wxi

diff --git a/src/windows/installer/wix/features.wxi b/src/windows/installer/wix/features.wxi
index fa8c8f0..398ddda 100644 (file)
--- a/src/windows/installer/wix/features.wxi
+++ b/src/windows/installer/wix/features.wxi
@@ -28,33 +28,43 @@
     <Feature 
         Id="feaKfw"
         AllowAdvertise="no"
-        Description="$(loc.KerberosDesc)"
+        Description="!(loc.KerberosDesc)"
         InstallDefault="local"
-        Title="$(loc.KerberosTitle)"
+        Title="!(loc.KerberosTitle)"
         ConfigurableDirectory="KERBEROSDIR"
         Level="30">
         <Feature
             Id="feaKfwClient"
             AllowAdvertise="no"
-            Description="$(loc.KerberosClientDesc)"
+            Description="!(loc.KerberosClientDesc)"
             InstallDefault="local"
-            Title="$(loc.KerberosClientTitle)"
+            Title="!(loc.KerberosClientTitle)"
             Level="30">
 
             <?ifdef DebugSyms?>
                <Feature 
                     Id="feaKfwClientDebug" 
                     AllowAdvertise="no" 
-                    Description="$(loc.StrKerberosClientDebugDesc)" 
+                    Description="!(loc.StrKerberosClientDebugDesc)"
                     Display="expand"
                    InstallDefault="$(var.DebugSymInstallDefault)" 
                     Level="$(var.DebugSymLowLevel)" 
-                    Title="$(loc.StrKerberosClientDebugTitle)">
+                    Title="!(loc.StrKerberosClientDebugTitle)">
                     <ComponentRef Id="cmf_bin_debug"/>
                    <ComponentRef Id="cmp_ClientSystemDebug"/>
                     <?include runtime_debug.wxi?>
                </Feature>
            <?endif?>
+      <?if $(var.Platform)="x64"?>
+          <ComponentRef Id="cmf_comerr64_dll" />
+          <ComponentRef Id="cmf_gssapi64_dll" />
+          <ComponentRef Id="cmf_k5sprt64_dll" />
+          <ComponentRef Id="cmf_krb5_64_dll" />
+          <ComponentRef Id="cmf_krbcc64_dll" />
+          <ComponentRef Id="cmf_leashw64_dll" />
+          <ComponentRef Id="cmf_wshelp64_dll" />
+          <ComponentRef Id="cmf_xpprof64_dll" />
+       <?endif?>
 
             <ComponentRef Id="cmf_comerr32_dll" />
             <ComponentRef Id="cmf_gss_client_exe" />
@@ -116,8 +126,6 @@
             <ComponentRef Id="rcm_leashdll_16" />
             <ComponentRef Id="rcm_leashdll_17" />
             
-            <ComponentRef Id="cmf_psapi_dll" />
-            
             <ComponentRef Id="cmf_krb5_ini" />
             
             <ComponentRef Id="rcm_common" />
@@ -125,21 +133,20 @@
             
             <Feature Id="feaKfwLeashStartup" AllowAdvertise="no" Display="hidden" Level="130">
                 <Condition Level="30">LEASHAUTOSTART = 1</Condition>
-                <?if $(var.Platform) = "Intel"?>
-<!--                        <ComponentRef Id="csc_LeashStartup" /> -->
-                <?endif?>
+                <ComponentRef Id="csc_LeashStartup" />
             </Feature>
-            <ComponentRef Id="cmf_remove_folder" />
+            <ComponentRef Id="SMshortcut" />
+            <ComponentRef Id="Dshortcut" />
             <?include runtime.wxi?>
         </Feature> <!-- /feaKfwClient -->
         
         <Feature
             Id="feaKfwSDK" 
             AllowAdvertise="no" 
-            Description="$(loc.KerberosSDKDesc)" 
+            Description="!(loc.KerberosSDKDesc)"
             InstallDefault="local" 
             Level="130" 
-            Title="$(loc.KerberosSDKTitle)">
+            Title="!(loc.KerberosSDKTitle)">
             
         <?if $(var.Platform) = "Intel" ?>
             <ComponentRef Id="cmp_dirlib_i386" />
@@ -161,10 +168,10 @@
         <Feature
             Id="feaKfwDocs" 
             AllowAdvertise="no" 
-            Description="$(loc.KerberosDocDesc)" 
+            Description="!(loc.KerberosDocDesc)"
             InstallDefault="local" 
             Level="30" 
-            Title="$(loc.KerberosDocTitle)">
+            Title="!(loc.KerberosDocTitle)">
 
 <!--            <?if $(var.Platform) = "Intel"?>
                     <ComponentRef Id="efl_leash_userdoc_pdf" />