From: Ben Kaduk <kaduk@mit.edu>
Date: Wed, 29 May 2013 02:07:06 +0000 (-0400)
Subject: Update the WiX installer to know about afsrfc3961.dll
X-Git-Tag: upstream/1.8.0_pre1^2~1062^2~7
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=94635f727155830b636026441d6d9122803b2e39;p=packages%2Fo%2Fopenafs.git

Update the WiX installer to know about afsrfc3961.dll
---

diff --git a/src/WINNT/install/wix/feature.wxi b/src/WINNT/install/wix/feature.wxi
index 65ef74f87..e1a583d30 100644
--- a/src/WINNT/install/wix/feature.wxi
+++ b/src/WINNT/install/wix/feature.wxi
@@ -115,6 +115,7 @@
                 <ComponentRef Id="cmf_afsclientadmin_DLL" />
                 <ComponentRef Id="cmf_afsvosadmin_DLL" />
                 <ComponentRef Id="cmf_afsrpc_DLL" />
+                <ComponentRef Id="cmf_afsrfc3961_DLL" />
                 <ComponentRef Id="cmf_afshcrypto_DLL" />
                 <ComponentRef Id="cmf_afsroken_DLL" />
                 <ComponentRef Id="cmf_afsauthent2_DLL" />
@@ -179,6 +180,7 @@
                 <ComponentRef Id="cmf_afsadminutil_DLL" />
 
                 <ComponentRef Id="cmf_afsrpc_DLL" />
+                <ComponentRef Id="cmf_afsrfc3961_DLL" />
                 <ComponentRef Id="cmf_afshcrypto_DLL" />
                 <ComponentRef Id="cmf_afsroken_DLL" />
                 <ComponentRef Id="cmf_afsauthent2_DLL" />
@@ -241,6 +243,7 @@
                 <ComponentRef Id="cmf_afsvosadmin_DLL" />
                 <ComponentRef Id="cmf_afsadminutil_DLL" />
                 <ComponentRef Id="cmf_afsrpc_DLL" />
+                <ComponentRef Id="cmf_afsrfc3961_DLL" />
                 <ComponentRef Id="cmf_afshcrypto_DLL" />
                 <ComponentRef Id="cmf_afsroken_DLL" />
                 <ComponentRef Id="cmf_afsauthent2_DLL" />
@@ -361,6 +364,7 @@
 		<ComponentRef Id="cmp_CommonDir" />
 
                 <ComponentRef Id="cmf_afsrpc_DLL" />
+                <ComponentRef Id="cmf_afsrfc3961_DLL" />
                 <ComponentRef Id="cmf_afshcrypto_DLL" />
                 <ComponentRef Id="cmf_afsroken_DLL" />
                 <ComponentRef Id="cmf_afsadminutil_DLL" />
diff --git a/src/WINNT/install/wix/files.wxi b/src/WINNT/install/wix/files.wxi
index befaf58ee..f2fb2d1bb 100644
--- a/src/WINNT/install/wix/files.wxi
+++ b/src/WINNT/install/wix/files.wxi
@@ -50,6 +50,9 @@
                 <Component Win64="$(var.Win64)" Id="cmf_afsrpc_DLL" Guid="$(var.cmf_afsrpc_DLL_guid)">
                     <File Id="fileafsrpc_DLL" Name="afsrpc.dll" LongName="afsrpc.dll" KeyPath="yes" DiskId="1" src="$(var.LibDir)\afsrpc.dll"/>
                 </Component>
+                <Component Win64="$(var.Win64)" Id="cmf_afsrfc3961_DLL" Guid="$(var.cmf_afsrfc3961_DLL_guid)">
+                    <File Id="fileafsrfc3961_DLL" Name="afsrfc39.dll" LongName="afsrfc3961.dll" KeyPath="yes" DiskId="1" src="$(var.LibDir)\afsrfc3961.dll"/>
+                </Component>
                 <Component Win64="$(var.Win64)" Id="cmf_afshcrypto_DLL" Guid="$(var.cmf_afshcrypto_DLL_guid)">
                     <File Id="fileafshcrypto_DLL" Name="afshcryp.dll" LongName="afshcrypto.dll" KeyPath="yes" DiskId="1" src="$(var.LibDir)\afshcrypto.dll"/>
                 </Component>
@@ -88,6 +91,7 @@
               <?endif?>
                 <Component Win64="$(var.Win64)" Id="cmp_CommonCommonDebug" Guid="$(var.cmp_CommonCommonDebug_guid)">
                     <File Id="fileafsrpc_PDB" Name="afsrpc.pdb" LongName="afsrpc.pdb" KeyPath="yes" DiskId="1" src="$(var.LibDir)\afsrpc.pdb"/>
+                    <File Id="fileafsrfc3961_PDB" Name="afsrfc39.pdb" LongName="afsrfc3961.pdb" DiskId="1" src="$(var.LibDir)\afsrfc3961.pdb"/>
                     <File Id="fileafshcrypto_PDB" Name="afshcryp.pdb" LongName="afshcrypto.pdb" DiskId="1" src="$(var.LibDir)\afshcrypto.pdb"/>
                     <File Id="fileafsroken_PDB" Name="afsroken.pdb" LongName="afsroken.pdb" DiskId="1" src="$(var.LibDir)\afsroken.pdb"/>
                     <File Id="filelibafsconf_PDB" Name="libafscf.pdb" LongName="libafsconf.pdb" DiskId="1" src="$(var.LibDir)\libafsconf.pdb"/>
@@ -1501,6 +1505,7 @@
                                 <File Id="fileafsint_H" Name="afsint.h" LongName="afsint.h" DiskId="1" src="$(var.IncDir)afs\afsint.h" /> 
                                 <File Id="fileafskfw_H" Name="afskfw.h" LongName="afskfw.h" DiskId="1" src="$(var.IncDir)afs\afskfw.h" /> 
                                 <File Id="fileafsrpc_H" Name="afsrpc.h" LongName="afsrpc.h" DiskId="1" src="$(var.IncDir)afs\afsrpc.h" /> 
+                                <File Id="filerfc3961_H" Name="rfc3961.h" LongName="rfc3961.h" DiskId="1" src="$(var.IncDir)afs\rfc3961.h" />
                                 <File Id="fileafssyscalls_H" Name="AFSSYSCL.h" LongName="afssyscalls.h" DiskId="1" src="$(var.IncDir)afs\afssyscalls.h" />
                                 <File Id="fileafsutil_H" Name="afsutil.h" LongName="afsutil.h" DiskId="1" src="$(var.IncDir)afs\afsutil.h" /> 
                                 <File Id="fileafsutil_prototypes_H" Name="AFSUTILP.h" LongName="afsutil_prototypes.h" DiskId="1" src="$(var.IncDir)afs\afsutil_prototypes.h" />
@@ -1762,6 +1767,7 @@
                             <File Id="fileafslwp_LIB" Name="afslwp.lib" LongName="afslwp.lib" DiskId="1" src="$(var.LibDir)afslwp.lib" /> 
                             <File Id="fileafspthread_LIB" Name="AFSPTHRD.lib" LongName="afspthread.lib" DiskId="1" src="$(var.LibDir)afspthread.lib" />
                             <File Id="fileafsrpc_LIB" Name="afsrpc.lib" LongName="afsrpc.lib" DiskId="1" src="$(var.LibDir)afsrpc.lib" /> 
+                            <File Id="fileafsrfc3961_LIB" Name="afsrfc39.lib" LongName="afsrfc3961.lib" DiskId="1" src="$(var.LibDir)afsrfc3961.lib" />
                             <File Id="fileafshcrypto_LIB" Name="afshcryp.lib" LongName="afshcrypto.lib" DiskId="1" src="$(var.LibDir)afshcrypto.lib" /> 
                             <File Id="fileafsroken_LIB" Name="afsroken.lib" LongName="afsroken.lib" DiskId="1" src="$(var.LibDir)afsroken.lib" /> 
                             <File Id="fileafsrx_LIB" Name="afsrx.lib" LongName="afsrx.lib" DiskId="1" src="$(var.LibDir)afsrx.lib" /> 
@@ -1777,6 +1783,7 @@
                           <File Id="fileafsauthent_A" Name="afsauth.a" LongName="afsauthent.a" DiskId="1" src="$(var.LibDir)afsauthent.a" />
                           <File Id="fileafspthread_A" Name="afspthrd.a" LongName="afspthread.a" DiskId="1" src="$(var.LibDir)afspthread.a" />
                           <File Id="fileafsrpc_A" Name="afsrpc.a" LongName="afsrpc.a" DiskId="1" src="$(var.LibDir)afsrpc.a" />
+                          <File Id="fileafsrfc3961_A" Name="afsrfc39.a" LongName="afsrfc3961.a" DiskId="1" src="$(var.LibDir)afsrfc3961.a" />
                           <File Id="fileafshcrypto_A" Name="afshcryp.a" LongName="afshcrypto.a" DiskId="1" src="$(var.LibDir)afshcrypto.a" />
                           <File Id="filelibafsconf_A" Name="libafscf.a" LongName="libafsconf.a" DiskId="1" src="$(var.LibDir)libafsconf.a" />
                           <File Id="filelibosi_A" Name="libosi.a" LongName="libosi.a" DiskId="1" src="$(var.ClientDir)libosi.a" /> 
diff --git a/src/WINNT/install/wix/platform.wxi b/src/WINNT/install/wix/platform.wxi
index 1209a1b37..9bd351216 100644
--- a/src/WINNT/install/wix/platform.wxi
+++ b/src/WINNT/install/wix/platform.wxi
@@ -28,6 +28,7 @@
 	<?define cmf_afsvosadmin_DLL_guid="8955900E-E743-41A9-9C54-FCEB91A72ADE"?>
 	<?define cmf_afsadminutil_DLL_guid="72495728-0024-4AAC-81F6-6E826BFFED86"?>
 	<?define cmf_afsrpc_DLL_guid="AE9350B3-21AA-4204-A0A8-3D58C57EB178"?>
+	<?define cmf_afsrfc3961_DLL_guid="FBC41858-4EB1-4EAA-9FD7-AB1029602A70"?>
         <?define cmf_afshcrypto_DLL_guid="4C35B73D-7477-44AA-8763-8C09F570C7BD"?>
         <?define cmf_afsroken_DLL_guid="A9BB2D83-26A4-44BF-8235-F305E59393EA"?>
 	<?define cmf_afsauthent2_DLL_guid="7BD58D90-B600-44B7-BBCB-545861E878EB"?>
@@ -146,6 +147,7 @@
 	<?define cmf_afsvosadmin_DLL_guid="A97E0801-06A5-465C-99E1-E5F0E07166F0"?>
 	<?define cmf_afsadminutil_DLL_guid="A9782D0F-768F-40F4-A600-A7240EFBEC8C"?>
 	<?define cmf_afsrpc_DLL_guid="E75E2FC0-D011-494A-8142-670B3286C5C2"?>
+	<?define cmf_afsrfc3961_DLL_guid="8504A69A-84A1-47BB-9D3C-4A35592BB4CA"?>
         <?define cmf_afshcrypto_DLL_guid="5FB93926-07D4-4BFB-9532-726233D256CA"?>
         <?define cmf_afsroken_DLL_guid="9586EDB5-C1DE-4666-994C-5D2F4FC4D55E"?>
 	<?define cmf_afsauthent2_DLL_guid="7B806F96-0542-4BCC-865B-E126CE3BCDA6"?>