DEVEL15-windows-wix-amd64-nim-provider-20070828

Add network identity manager afs provider for amd64

(cherry picked from commit 43d5267be5c2649110b160d82cf12bed4a60742a)

diff --git a/src/WINNT/install/wix/feature.wxi b/src/WINNT/install/wix/feature.wxi
index b0032715b299b3bfd880312b9bcc7020263450a0..d16d2068dd132995ce92721e2f3ee40b7df8cbe2 100644 (file)
--- a/src/WINNT/install/wix/feature.wxi
+++ b/src/WINNT/install/wix/feature.wxi
@@ -25,7 +25,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 +37,6 @@
                     </Feature>
            <?endif?>
             </Feature>
-  <?endif?>
 
                <Feature Id="feaKB301673" AllowAdvertise="no" Absent="disallow" Display="hidden" InstallDefault="followParent" Level="0">
                        <ComponentRef Id="rcm_KB301673" />

diff --git a/src/WINNT/install/wix/files.wxi b/src/WINNT/install/wix/files.wxi
index 532ea9a8f04ce503530b99f1c298e9183845f52f..92eb20a1c1500d3ab9f45c174beadcaeb8b537c9 100644 (file)
--- a/src/WINNT/install/wix/files.wxi
+++ b/src/WINNT/install/wix/files.wxi
@@ -868,7 +868,6 @@
                         <File Id="fileafs_shl_ext_1033_DLL" Name="ashl1033.dll" LongName="afs_shl_ext_1033.dll" KeyPath="yes" DiskId="1" src="$(var.ClientDir)\afs_shl_ext_1033.dll"/>
                     </Component>
 
-  <?if $(env.CPU)="i386"?>
                     <Component Win64="$(var.Win64)" Id="_afscreds_en_us"
                         Guid="$(var._afscreds_en_us_guid)" DiskId="1">
                         <File Id="file_afscred_en_us_dll" Name="afscenu.dll" LongName="afscred_en_us.dll" KeyPath="yes"/>
@@ -902,7 +901,6 @@
                         Guid="$(var._afscreds_chm_guid)" DiskId="1">
                         <File Id="file_afsplhlp_chm" Name="afsplhlp.chm" LongName="afsplhlp.chm" KeyPath="yes" />
                     </Component>
-  <?endif?>
 
   <?ifndef BinsOnly ?>
                     <Component Win64="$(var.Win64)" Id="cmf_afsd_service_EXE" Guid="$(var.cmf_afsd_service_EXE_guid)">

diff --git a/src/WINNT/install/wix/platform.wxi b/src/WINNT/install/wix/platform.wxi
index 53ccc92cc01d815432cb005e54a0edf7250f77bb..675c7a4c8ea3176771f8410ce8ff7d6eb528cf2c 100644 (file)
--- a/src/WINNT/install/wix/platform.wxi
+++ b/src/WINNT/install/wix/platform.wxi
@@ -98,6 +98,10 @@
        <?define cmf_afsserver_CPL_guid="7B0D1145-DB1B-47BA-A874-3AB26F86FFB6"?>
        <?define cmp_Server_Program_Debug_guid="1EDCDA16-216B-434E-A06E-AD1A9D40F5A2"?>
         <?define rcm_binsonly_parm_guid="A4969933-E01B-476C-B923-4F2EFBA2B78C"?>
+        <?define _afscreds_en_us_guid="512F071E-20A0-4349-B2BE-C3754666744A"?>
+        <?define _afscreds_plugin_guid="2F12FF1B-5BD7-4CE3-93B4-86D3FCFC49C6"?>
+        <?define _afscreds_debugsym_guid="38DC7EA0-3130-4C27-8FD5-442660197208"?>
+        <?define _afscreds_chm_guid="24A87704-5F47-43Af-9F2B-568AB103ADAF"?>
         <?define clsid_afs_shl_ext="5F820CA1-3DDE-11DB-B2CE-001558092DB5"?>
 
 <?elseif $(var.Platform) = "Intel"?>