Windows: add missing dafs man pages to wix installer
[openafs.git] / src / WINNT / install / wix / files.wxi
index e99dec7..c53c3ec 100644 (file)
@@ -31,6 +31,7 @@
                     <File Id="fileafsvosadmin_DLL" Name="afsvosad.dll" LongName="afsvosadmin.dll" KeyPath="yes" DiskId="1" src="$(var.ServerDir)\afsvosadmin.dll"/>
                 </Component>
   <?ifndef BinsOnly?>
+  <?ifndef LiteClient?>
                 <Component Win64="$(var.Win64)" Id="cmf_afsbosadmin_DLL" Guid="$(var.cmf_afsbosadmin_DLL_guid)">
                     <File Id="fileafsbosadmin_DLL" Name="afsbosad.dll" LongName="afsbosadmin.dll" KeyPath="yes" DiskId="1" src="$(var.ServerDir)\afsbosadmin.dll"/>
                 </Component>
                     <File Id="fileafsptsadmin_DLL" Name="afsptsad.dll" LongName="afsptsadmin.dll" KeyPath="yes" DiskId="1" src="$(var.ServerDir)\afsptsadmin.dll"/>
                 </Component>
   <?endif?>
+  <?endif?>
 
                 <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_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>
+                <Component Win64="$(var.Win64)" Id="cmf_afsroken_DLL" Guid="$(var.cmf_afsroken_DLL_guid)">
+                    <File Id="fileafsroken_DLL" Name="afsroken.dll" LongName="afsroken.dll" KeyPath="yes" DiskId="1" src="$(var.LibDir)\afsroken.dll"/>
+                </Component>
+                <Component Win64="$(var.Win64)" Id="cmf_libafsconf_DLL" Guid="$(var.cmf_libafsconf_DLL_guid)">
+                    <File Id="filelibafsconf_DLL" Name="libafscf.dll" LongName="libafsconf.dll" KeyPath="yes" DiskId="1"  src="$(var.LibDir)\libafsconf.dll"/>
+                </Component>
                 <Component Win64="$(var.Win64)" Id="cmf_afsauthent2_DLL" Guid="$(var.cmf_afsauthent2_DLL_guid)">
                     <File Id="fileafsauthent2_DLL" Name="afsauth.dll" LongName="afsauthent.dll" KeyPath="yes" DiskId="1" src="$(var.LibDir)\afsauthent.dll"/>
                 </Component>
@@ -77,6 +88,9 @@
               <?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="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"/>
                     <File Id="fileafsauthent_PDB" Name="afsauth.pdb" LongName="afsauthent.pdb" DiskId="1" src="$(var.LibDir)\afsauthent.pdb"/>
                     <File Id="fileafspthread_PDB" Name="afspthrd.pdb" LongName="afspthread.pdb" DiskId="1" src="$(var.LibDir)\afspthread.pdb"/>
                     <File Id="fileTaAfsAppLib_PDB" Name="TaAfsApL.pdb" LongName="TaAfsAppLib.pdb" DiskId="1" src="$(var.ServerDir)\TaAfsAppLib.pdb"/>
   <?ifndef BinsOnly ?>
                 <!-- <<LanguageSpecific:1033/en_US>> -->
             <?if $(var.Language) ="en_US"?>
+            <?ifndef LiteClient?>
                 <Component Win64="$(var.Win64)" Id="cmf_afseventmsg_1033_DLL" Guid="$(var.cmf_afseventmsg_1033_DLL_guid)">
                     <File Id="fileafseventmsg_1033_DLL" Name="afse1033.dll" LongName="afseventmsg_1033.dll" KeyPath="yes" DiskId="1" src="$(var.ServerDir)\afseventmsg_1033.dll"/>
                 </Component>
                 <Component Win64="$(var.Win64)" Id="cmf_TaAfsAccountManager_1033_DLL" Guid="$(var.cmf_TaAfsAccountManager_1033_DLL_guid)">
                     <File Id="fileTaAfsAccountManager_1033_DLL" Name="tacm1033.dll" LongName="TaAfsAccountManager_1033.dll" KeyPath="yes" DiskId="1" src="$(var.ServerDir)\TaAfsAccountManager_1033.dll"/>
                 </Component>
-                <Component Win64="$(var.Win64)" Id="cmf_TaAfsAppLib_1033_DLL" Guid="$(var.cmf_TaAfsAppLib_1033_DLL_guid)">
-                    <File Id="fileTaAfsAppLib_1033_DLL" Name="taal1033.dll" LongName="TaAfsAppLib_1033.dll" KeyPath="yes" DiskId="1" src="$(var.ServerDir)\TaAfsAppLib_1033.dll"/>
-                </Component>
                 <Component Win64="$(var.Win64)" Id="cmf_TaAfsServerManager_1033_DLL" Guid="$(var.cmf_TaAfsServerManager_1033_DLL_guid)">
                     <File Id="fileTaAfsServerManager_1033_DLL" Name="tasm1033.dll" LongName="TaAfsServerManager_1033.dll" KeyPath="yes" DiskId="1" src="$(var.ServerDir)\TaAfsServerManager_1033.dll"/>
                 </Component>
+              <?endif?>
+                <Component Win64="$(var.Win64)" Id="cmf_TaAfsAppLib_1033_DLL" Guid="$(var.cmf_TaAfsAppLib_1033_DLL_guid)">
+                    <File Id="fileTaAfsAppLib_1033_DLL" Name="taal1033.dll" LongName="TaAfsAppLib_1033.dll" KeyPath="yes" DiskId="1" src="$(var.ServerDir)\TaAfsAppLib_1033.dll"/>
+                </Component>
                 <Component Win64="$(var.Win64)" Id="cmf_afs_config_1033_DLL" Guid="$(var.cmf_afs_config_1033_DLL_guid)">
                     <File Id="fileafs_config_1033_DLL" Name="acfg1033.dll" LongName="afs_config_1033.dll" KeyPath="yes" DiskId="1" src="$(var.ClientDir)\afs_config_1033.dll"/>
                 </Component>
 
                 <!-- Runtime libraries -->
           <?ifndef Debug?>
-                       <!-- Note that for AFSVER_CL=1400, the runtime libraries are included via merge modules
-                            at the TARGETDIR level, since we use shared assemblies instead of private assemblies. -->
+
+                       <!-- Note that for AFSVER_CL=1400 and 1500, the runtime
+                            libraries are included via merge modules at the
+                            TARGETDIR level, since we use shared assemblies
+                            instead of private assemblies. -->
+
             <?if $(env.AFSVER_CL) = "1310"?>
                                <?ifdef comment?>
                                        While we would love to just use the merge modules, they are unfortunately
           <?endif?>
             </Directory> <!-- /common -->
 
-  <?ifndef BinsOnly ?>            
+  <?ifndef BinsOnly ?>
+  <?ifndef LiteClient ?>
             <Directory Id="dirControl_Center" Name="Contr" LongName="Control Center" SourceName="ControlC" LongSource="Control Center">
                 <Component Win64="$(var.Win64)" Id="cmf_TaAfsServerManager_EXE" Guid="$(var.cmf_TaAfsServerManager_EXE_guid)">
                     <File Id="fileTaAfsServerManager_EXE" Name="TaAfsSvM.exe" LongName="TaAfsServerManager.exe" KeyPath="yes" DiskId="1" src="$(var.ServerDir)\TaAfsServerManager.exe">
             <?endif?>
             </Directory> <!-- /Control center -->
   <?endif?>
+  <?endif?>
 
   <?ifndef BinsOnly?>
             <Directory Id="dirDocumentation" Name="Docum" LongName="Documentation" SourceName="Docs">
                         <Directory Id="dirCmdRef1_en_US" Name="1" src="$(var.DocDir)\man-pages\html\1\">
                             <Component Id="cmp_Cmd_Ref_1_en_US" Guid="$(var.DocHtmlCmdRef1Guid)">
                             <File Id="file_CmdRef_1_afs_html" Name="afs.htm" LongName="afs.html" KeyPath="yes" DiskId="1" />
+                            <File Id="file_CmdRef_1_afs_compile_et_html" Name="afs_comp.htm" LongName="afs_compile_et.html" DiskId="1" />
                             <File Id="file_CmdRef_1_afsmonitor_html" Name="afsmonit.htm" LongName="afsmonitor.html" DiskId="1" />
                             <File Id="file_CmdRef_1_aklog_html" Name="aklog.htm" LongName="aklog.html" DiskId="1" />
                             <File Id="file_CmdRef_1_cmdebug_html" Name="cmdebug.htm" LongName="cmdebug.html" DiskId="1" />
-                            <File Id="file_CmdRef_1_compile_et_html" Name="compile_.htm" LongName="compile_et.html" DiskId="1" />
                             <File Id="file_CmdRef_1_copyauth_html" Name="copyauth.htm" LongName="copyauth.html" DiskId="1" />
                             <File Id="file_CmdRef_1_dlog_html" Name="dlog.htm" LongName="dlog.html" DiskId="1" />
                             <File Id="file_CmdRef_1_fs_html"  Name="fs.htm"  LongName="fs.html"  DiskId="1"  />
                             <File Id="file_CmdRef_1_fs_apropos_html"  Name="fs_aprop.htm"  LongName="fs_apropos.html"  DiskId="1"  />
                             <File Id="file_CmdRef_1_fs_checkservers_html"  Name="fs_chsrv.htm"  LongName="fs_checkservers.html"  DiskId="1"  />
                             <File Id="file_CmdRef_1_fs_checkvolumes_html"  Name="fs_chvol.htm"  LongName="fs_checkvolumes.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_1_fs_chgrp_html"  Name="fs_chgrp.htm"  LongName="fs_chgrp.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_1_fs_chown_html"  Name="fs_chown.htm"  LongName="fs_chown.html"  DiskId="1"  />
                             <File Id="file_CmdRef_1_fs_cleanacl_html"  Name="fs_clean.htm"  LongName="fs_cleanacl.html"  DiskId="1"  />
                             <File Id="file_CmdRef_1_fs_copyacl_html"  Name="fs_copya.htm"  LongName="fs_copyacl.html"  DiskId="1"  />
                             <File Id="file_CmdRef_1_fs_cscpolicy_html"  Name="fs_cscpo.htm"  LongName="fs_cscpolicy.html"  DiskId="1"  />
                             <File Id="file_CmdRef_1_pts_setmax_html"  Name="pts_setm.htm"  LongName="pts_setmax.html"  DiskId="1"  />
                             <File Id="file_CmdRef_1_pts_sleep_html"  Name="pts_slee.htm"  LongName="pts_sleep.html"  DiskId="1"  />
                             <File Id="file_CmdRef_1_pts_source_html"  Name="pts_sour.htm"  LongName="pts_source.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_1_restorevol_html"  Name="restorev.htm"  LongName="restorevol.html"  DiskId="1"  />
                             <File Id="file_CmdRef_1_rxdebug_html"  Name="rxdebug.htm"  LongName="rxdebug.html"  DiskId="1"  />
                             <File Id="file_CmdRef_1_rxgen_html"  Name="rxgen.htm"  LongName="rxgen.html"  DiskId="1"  />
                             <File Id="file_CmdRef_1_scout_html"  Name="scout.htm"  LongName="scout.html"  DiskId="1"  />
                             <File Id="file_CmdRef_1_xstat_fs_test_html"  Name="xstat_fs.htm"  LongName="xstat_fs_test.html"  DiskId="1"  />
                             </Component>
                         </Directory> <!-- CmdRef_1 -->
+                        <Directory Id="dirCmdRef3_en_US" Name="3" src="$(var.DocDir)\man-pages\html\3\">
+                            <Component Id="cmp_Cmd_Ref_3_en_US" Guid="$(var.DocHtmlCmdRef3Guid)">
+                            <File Id="file_CmdRef_3_AFS_ukernel_html"  Name="AFS_uker.htm"  LongName="AFS.ukernel.html"  KeyPath="yes"  DiskId="1"  />
+                            </Component>
+                        </Directory> <!-- CmdRef_3 -->
                         <Directory Id="dirCmdRef5_en_US" Name="5" src="$(var.DocDir)\man-pages\html\5\">
                             <Component Id="cmp_Cmd_Ref_5_en_US" Guid="$(var.DocHtmlCmdRef5Guid)">
                             <File Id="file_CmdRef_5_afs_html"  Name="afs.htm"  LongName="afs.html"  KeyPath="yes"  DiskId="1"  />
                             <File Id="file_CmdRef_8_bos_util_html"  Name="bos_util.htm"  LongName="bos_util.html"  DiskId="1"  />
                             <File Id="file_CmdRef_8_buserver_html"  Name="buserver.htm"  LongName="buserver.html"  DiskId="1"  />
                             <File Id="file_CmdRef_8_butc_html"  Name="butc.htm"  LongName="butc.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_8_dafileserver_html"  Name="dafilese.htm"  LongName="dafileserver.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_8_dasalvager_html"  Name="dasalvag.htm"  LongName="dasalvager.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_8_davolserver_html"  Name="davolser.htm"  LongName="davolserver.html"  DiskId="1"  />
                             <File Id="file_CmdRef_8_fileserver_html"  Name="fileserv.htm"  LongName="fileserver.html"  DiskId="1"  />
                             <File Id="file_CmdRef_8_fms_html"  Name="fms.htm"  LongName="fms.html"  DiskId="1"  />
                             <File Id="file_CmdRef_8_fstrace_html"  Name="fstrace.htm"  LongName="fstrace.html"  DiskId="1"  />
                             <File Id="file_CmdRef_8_ptserver_html"  Name="ptserver.htm"  LongName="ptserver.html"  DiskId="1"  />
                             <File Id="file_CmdRef_8_pt_util_html"  Name="pt_util.htm"  LongName="pt_util.html"  DiskId="1"  />
                             <File Id="file_CmdRef_8_read_tape_html"  Name="read_tap.htm"  LongName="read_tape.html"  DiskId="1"  />
-                            <File Id="file_CmdRef_8_restorevol_html"  Name="restorev.htm"  LongName="restorevol.html"  DiskId="1"  />
                             <File Id="file_CmdRef_8_rmtsysd_html"  Name="rmtsysd.htm"  LongName="rmtsysd.html"  DiskId="1"  />
                             <File Id="file_CmdRef_8_salvager_html"  Name="salvager.htm"  LongName="salvager.html"  DiskId="1"  />
                             <File Id="file_CmdRef_8_salvageserver_html"  Name="salvages.htm"  LongName="salvageserver.html"  DiskId="1"  />
                     <Component Win64="$(var.Win64)" Id="cmf_libosi_DLL" Guid="$(var.cmf_libosi_DLL_guid)">
                         <File Id="filelibosi_DLL" Name="libosi.dll" LongName="libosi.dll" KeyPath="yes" DiskId="1" />
                     </Component>
-                    <Component Win64="$(var.Win64)" Id="cmf_libafsconf_DLL" Guid="$(var.cmf_libafsconf_DLL_guid)">
-                        <File Id="filelibafsconf_DLL" Name="libafscf.dll" LongName="libafsconf.dll" KeyPath="yes" DiskId="1" />
-                    </Component>
                     <Component Win64="$(var.Win64)" Id="cmf_klog_EXE" Guid="$(var.cmf_klog_EXE_guid)">
                         <File Id="fileklog_EXE" Name="klog.exe" LongName="klog.exe" KeyPath="yes" DiskId="1" />
                     </Component>
                      <Component Win64="$(var.Win64)" Id="cmp_ClientProgramDebug" Guid="$(var.cmp_ClientProgramDebug_guid)">
                         <File Id="fileafsshare_PDB" Name="afsshare.pdb" LongName="afsshare.pdb" DiskId="1" />
                         <File Id="filelibosi_PDB" Name="libosi.pdb" LongName="libosi.pdb" DiskId="1" />
-                        <File Id="filelibafsconf_PDB" Name="libafscf.pdb" LongName="libafsconf.pdb" DiskId="1" />
                         <File Id="fileklog_PDB" Name="klog.pdb" LongName="klog.pdb" DiskId="1" />
                         <File Id="filetokens_PDB" Name="tokens.pdb" LongName="tokens.pdb" DiskId="1" />
                         <File Id="fileunlog_PDB" Name="unlog.pdb" LongName="unlog.pdb" DiskId="1" />
                 </Directory> <!-- /Program -->
             </Directory> <!-- /Client -->
   <?ifndef BinsOnly ?>
+  <?ifndef LiteClient ?>
             <Directory Id="dirServer" Name="Server">
                 <Directory Id="dirusr" Name="usr">
                     <Directory Id="dirafs" Name="afs">
                             <Component Win64="$(var.Win64)" Id="cmf_ptserver_EXE" Guid="$(var.cmf_ptserver_EXE_guid)">
                                 <File Id="fileptserver_EXE" Name="ptser.exe" LongName="ptserver.exe" KeyPath="yes" DiskId="1" />
                             </Component>
+                             <Component Win64="$(var.Win64)" Id="cmf_ptclient_EXE" Guid="$(var.cmf_ptclient_EXE_guid)">
+                                <File Id="fileptclient_EXE" Name="ptclient.exe" LongName="ptclient.exe" KeyPath="yes" DiskId="1" src="$(var.BinDir)\ptclient.exe" />
+                            </Component>
+                             <Component Win64="$(var.Win64)" Id="cmf_pt_util_EXE" Guid="$(var.cmf_pt_util_EXE_guid)">
+                                <File Id="filept_util_EXE" Name="pt_util.exe" LongName="pt_util.exe" KeyPath="yes" DiskId="1" src="$(var.BinDir)\pt_util.exe" />
+                            </Component>
                             <Component Win64="$(var.Win64)" Id="cmf_salvager_EXE" Guid="$(var.cmf_salvager_EXE_guid)">
                                 <File Id="filesalvager_EXE" Name="salva.exe" LongName="salvager.exe" KeyPath="yes" DiskId="1" />
                             </Component>
                 </Directory>
             </Directory> <!-- Server -->
   <?endif?>
-  <?ifndef BinsOnly?>                  
+  <?endif?>
+  <?ifndef BinsOnly?>
+  <?ifndef LiteClient ?>
             <Directory Id="dirSDK" Name="SDK">
                     <Directory Id="dirSample" Name="Sample">
                         <Component Id="cmp_SDK_Sample" Guid="F9373E95-F410-4AA5-AA79-07C11EE00334">
                         </Component>
                     </Directory>
                     <Directory Id="dirInclude" Name="Include">
-                        <Component Id="cmp_SDK_Include" Guid="9B12B216-B104-4E49-BE31-4042F2CBD318">
+                        <Component Id="cmp_SDK_Include" Guid="2229E5F7-1D23-4088-AF85-917CCDB2634D">
                             <File Id="filebasic_H" Name="basic.h" LongName="basic.h" DiskId="1" src="$(var.IncDir)basic.h" /> 
-                            <File Id="filecrypt_H" Name="crypt.h" LongName="crypt.h" DiskId="1" src="$(var.IncDir)crypt.h" /> 
                             <File Id="filedbrpc_H" Name="dbrpc.h" LongName="dbrpc.h" DiskId="1" src="$(var.IncDir)dbrpc.h" /> 
-                            <File Id="filedes_H" Name="des.h" LongName="des.h" DiskId="1" src="$(var.IncDir)des.h" /> 
-                            <File Id="filedes_conf_H" Name="des_conf.h" LongName="des_conf.h" DiskId="1" src="$(var.IncDir)des_conf.h" /> 
-                            <File Id="filedes_odd_H" Name="des_odd.h" LongName="des_odd.h" DiskId="1" src="$(var.IncDir)des_odd.h" /> 
+                            <File Id="filedirent_H" Name="dirent.h" LongName="dirent.h" DiskId="1" src="$(var.IncDir)dirent.h" />
                             <File Id="filelargeint_H" Name="largeint.h" LongName="largeint.h" DiskId="1" src="$(var.IncDir)largeint.h" /> 
                             <File Id="filelock_H" Name="lock.h" LongName="lock.h" DiskId="1" src="$(var.IncDir)lock.h" /> 
                             <File Id="filelwp_H" Name="lwp.h" LongName="lwp.h" DiskId="1" src="$(var.IncDir)lwp.h" /> 
                             <File Id="filemain_H" Name="main.h" LongName="main.h" DiskId="1" src="$(var.IncDir)main.h" /> 
-                            <File Id="filemit_cpyright_H" Name="MIT-CP~1.h" LongName="mit-cpyright.h" DiskId="1" src="$(var.IncDir)mit-cpyright.h" /> 
                             <File Id="fileosi_H" Name="osi.h" LongName="osi.h" DiskId="1" src="$(var.IncDir)osi.h" /> 
                             <File Id="fileosibasel_H" Name="osibasel.h" LongName="osibasel.h" DiskId="1" src="$(var.IncDir)osibasel.h" /> 
                             <File Id="fileosidb_H" Name="osidb.h" LongName="osidb.h" DiskId="1" src="$(var.IncDir)osidb.h" /> 
                             <File Id="filetrylock_H" Name="trylock.h" LongName="trylock.h" DiskId="1" src="$(var.IncDir)trylock.h" /> 
                             <File Id="fileubik_H" Name="ubik.h" LongName="ubik.h" DiskId="1" src="$(var.IncDir)ubik.h" /> 
                             <File Id="fileubik_int_H" Name="ubik_int.h" LongName="ubik_int.h" DiskId="1" src="$(var.IncDir)ubik_int.h" /> 
+                            <File Id="fileroken_H" Name="roken.h" LongName="roken.h" DiskId="1" src="$(var.IncDir)roken.h" /> 
                         </Component>
                         <Directory Id="dirIncludeAfs" Name="afs">
-                            <Component Id="cmp_SDK_Include_afs" Guid="692D18AD-4901-4124-8B1F-5D414E65A7D0">
+                            <Component Id="cmp_SDK_Include_afs" Guid="DDAE87DF-AFA8-4EAF-BE9C-6A32D6D4ED06">
                                 <File Id="fileacl_H" Name="acl.h" LongName="acl.h" DiskId="1" src="$(var.IncDir)afs\acl.h" /> 
                                 <File Id="fileafscbint_H" Name="afscbint.h" LongName="afscbint.h" DiskId="1" src="$(var.IncDir)afs\afscbint.h" /> 
                                 <File Id="fileafsconfig_H" Name="AFSCON~1.h" LongName="afsconfig.h" DiskId="1" src="$(var.IncDir)afs\afsconfig.h" /> 
                                 <File Id="fileafs_sysnames_H" Name="AFS_SY~1.h" LongName="afs_sysnames.h" DiskId="1" src="$(var.IncDir)afs\afs_sysnames.h" /> 
                                 <File Id="fileafs_utilAdmin_H" Name="AFS_UT~1.h" LongName="afs_utilAdmin.h" DiskId="1" src="$(var.IncDir)afs\afs_utilAdmin.h" /> 
                                 <File Id="fileafs_vosAdmin_H" Name="AFS_VO~1.h" LongName="afs_vosAdmin.h" DiskId="1" src="$(var.IncDir)afs\afs_vosAdmin.h" /> 
-                                <File Id="fileassert_H" Name="assert.h" LongName="assert.h" DiskId="1" src="$(var.IncDir)afs\assert.h" /> 
+                                <File Id="fileassert_H" Name="AFS_AS~1.h" LongName="afs_assert.h" DiskId="1" src="$(var.IncDir)afs\afs_assert.h" /> 
                                 <File Id="fileaudit_H" Name="audit.h" LongName="audit.h" DiskId="1" src="$(var.IncDir)afs\audit.h" /> 
                                 <File Id="fileauth_H" Name="auth.h" LongName="auth.h" DiskId="1" src="$(var.IncDir)afs\auth.h" /> 
                                 <File Id="filebnode_H" Name="bnode.h" LongName="bnode.h" DiskId="1" src="$(var.IncDir)afs\bnode.h" /> 
                                 <File Id="filecm_vnodeops_H" Name="CM_VNO~1.h" LongName="cm_vnodeops.h" DiskId="1" src="$(var.IncDir)afs\cm_vnodeops.h" /> 
                                 <File Id="filecm_volume_H" Name="CM_VOL~1.h" LongName="cm_volume.h" DiskId="1" src="$(var.IncDir)afs\cm_volume.h" /> 
                                 <File Id="filecom_err_H" Name="com_err.h" LongName="com_err.h" DiskId="1" src="$(var.IncDir)afs\com_err.h" /> 
-                                <File Id="filedebug_H" Name="debug.h" LongName="debug.h" DiskId="1" src="$(var.IncDir)afs\debug.h" /> 
                                 <File Id="filedir_H" Name="dir.h" LongName="dir.h" DiskId="1" src="$(var.IncDir)afs\dir.h" /> 
-                                <File Id="filedirent_H" Name="dirent.h" LongName="dirent.h" DiskId="1" src="$(var.IncDir)afs\dirent.h" /> 
                                 <File Id="filedirpath_H" Name="dirpath.h" LongName="dirpath.h" DiskId="1" src="$(var.IncDir)afs\dirpath.h" /> 
                                 <File Id="fileerrmap_nt_H" Name="ERRMAP~1.h" LongName="errmap_nt.h" DiskId="1" src="$(var.IncDir)afs\errmap_nt.h" /> 
                                 <File Id="fileerrors_H" Name="errors.h" LongName="errors.h" DiskId="1" src="$(var.IncDir)afs\errors.h" /> 
                                 <File Id="filefs_utils_H" Name="fs_utils.h" LongName="fs_utils.h" DiskId="1" src="$(var.IncDir)afs\fs_utils.h" /> 
                                 <File Id="fileicl_H" Name="icl.h" LongName="icl.h" DiskId="1" src="$(var.IncDir)afs\icl.h" /> 
                                 <File Id="fileihandle_H" Name="ihandle.h" LongName="ihandle.h" DiskId="1" src="$(var.IncDir)afs\ihandle.h" /> 
-                                <File Id="fileitc_H" Name="itc.h" LongName="itc.h" DiskId="1" src="$(var.IncDir)afs\itc.h" /> 
                                 <File Id="filekaport_H" Name="kaport.h" LongName="kaport.h" DiskId="1" src="$(var.IncDir)afs\kaport.h" /> 
                                 <File Id="filekauth_H" Name="kauth.h" LongName="kauth.h" DiskId="1" src="$(var.IncDir)afs\kauth.h" /> 
                                 <File Id="filekautils_H" Name="kautils.h" LongName="kautils.h" DiskId="1" src="$(var.IncDir)afs\kautils.h" /> 
                                 <File Id="filevolume_H" Name="volume.h" LongName="volume.h" DiskId="1" src="$(var.IncDir)afs\volume.h" />
                             </Component>
                         </Directory>
+
+                        <Directory Id="dirIncludeHcrypto" Name="hcrypto">
+                            <Component Id="cmp_SDK_Include_hcrypto" Guid="726B86EF-3431-4DF2-83EC-E4CFA379AE34">
+                                <File Id="file_hcrypto_aes_H" Name="aes.h" LongName="aes.h" DiskId="1" src="$(var.IncDir)hcrypto\aes.h" />
+                                <File Id="file_hcrypto_des_H" Name="des.h" LongName="des.h" DiskId="1" src="$(var.IncDir)hcrypto\des.h" />
+                                <File Id="file_hcrypto_engine_H" Name="engine.h" LongName="engine.h" DiskId="1" src="$(var.IncDir)hcrypto\engine.h" />
+                                <File Id="file_hcrypto_evp_cc_H" Name="evp-cc.h" LongName="evp-cc.h" DiskId="1" src="$(var.IncDir)hcrypto\evp-cc.h" />
+                                <File Id="file_hcrypto_evp_hcrypto_H" Name="evp-hcry.h" LongName="evp-hcrypto.h" DiskId="1" src="$(var.IncDir)hcrypto\evp-hcrypto.h" />
+                                <File Id="file_hcrypto_evp_H" Name="evp.h" LongName="evp.h" DiskId="1" src="$(var.IncDir)hcrypto\evp.h" />
+                                <File Id="file_hcrypto_hmac_H" Name="hmac.h" LongName="hmac.h" DiskId="1" src="$(var.IncDir)hcrypto\hmac.h" />
+                                <File Id="file_hcrypto_md2_H" Name="md2.h" LongName="md2.h" DiskId="1" src="$(var.IncDir)hcrypto\md2.h" />
+                                <File Id="file_hcrypto_md4_H" Name="md4.h" LongName="md4.h" DiskId="1" src="$(var.IncDir)hcrypto\md4.h" />
+                                <File Id="file_hcrypto_md5_H" Name="md5.h" LongName="md5.h" DiskId="1" src="$(var.IncDir)hcrypto\md5.h" />
+                                <File Id="file_hcrypto_rand_H" Name="rand.h" LongName="rand.h" DiskId="1" src="$(var.IncDir)hcrypto\rand.h" />
+                                <File Id="file_hcrypto_rc2_H" Name="rc2.h" LongName="rc2.h" DiskId="1" src="$(var.IncDir)hcrypto\rc2.h" />
+                                <File Id="file_hcrypto_rc4_H" Name="rc4.h" LongName="rc4.h" DiskId="1" src="$(var.IncDir)hcrypto\rc4.h" />
+                                <File Id="file_hcrypto_sha_H" Name="sha.h" LongName="sha.h" DiskId="1" src="$(var.IncDir)hcrypto\sha.h" />
+                                <File Id="file_hcrypto_ui_H" Name="ui.h" LongName="ui.h" DiskId="1" src="$(var.IncDir)hcrypto\ui.h" />
+                            </Component>
+                        </Directory>
+
                         <Directory Id="dirIncludeRx" Name="rx">
                             <Component Id="cmp_SDK_Include_rx" Guid="2E215D10-C080-42A3-B692-AFF94C7A1A2B">
                                 <File Id="fileasn1_err_H" Name="asn1_err.h" LongName="asn1_err.h" DiskId="1" src="$(var.IncDir)rx\asn1_err.h" /> 
                                 <File Id="filefcrypt_H" Name="fcrypt.h" LongName="fcrypt.h" DiskId="1" src="$(var.IncDir)rx\fcrypt.h" /> 
-                                <File Id="filehash_H" Name="hash.h" LongName="hash.h" DiskId="1" src="$(var.IncDir)rx\hash.h" /> 
-                                <File Id="filemd4_H" Name="md4.h" LongName="md4.h" DiskId="1" src="$(var.IncDir)rx\md4.h" /> 
-                                <File Id="filemd5_H" Name="md5.h" LongName="md5.h" DiskId="1" src="$(var.IncDir)rx\md5.h" /> 
                                 <File Id="filerx_H" Name="rx.h" LongName="rx.h" DiskId="1" src="$(var.IncDir)rx\rx.h" /> 
                                 <File Id="filerxkad_H" Name="rxkad.h" LongName="rxkad.h" DiskId="1" src="$(var.IncDir)rx\rxkad.h" /> 
                                 <File Id="filerxkad_prototypes_H" Name="RXKAD_~1.h" LongName="rxkad_prototypes.h" DiskId="1" src="$(var.IncDir)rx\rxkad_prototypes.h" /> 
                     <Directory Id="dirLib" Name="lib">
                         <Component Win64="$(var.Win64)" Id="cmp_SDK_Lib" Guid="$(var.cmp_SDK_Lib_guid)">
                             <File Id="fileafsauthent_LIB" Name="AFSAUT~1.lib" LongName="afsauthent.lib" DiskId="1" src="$(var.LibDir)afsauthent.lib" /> 
-                            <File Id="fileafsdes_LIB" Name="afsdes.lib" LongName="afsdes.lib" DiskId="1" src="$(var.LibDir)afsdes.lib" /> 
                             <File Id="fileafskfw_LIB" Name="afskfw.lib" LongName="afskfw.lib" DiskId="1" src="$(var.LibDir)afskfw.lib" /> 
                             <File Id="fileafslogon_LIB" Name="afslogon.lib" LongName="afslogon.lib" DiskId="1" src="$(var.LibDir)afslogon.lib" /> 
                             <File Id="fileafslwp_LIB" Name="afslwp.lib" LongName="afslwp.lib" DiskId="1" src="$(var.LibDir)afslwp.lib" /> 
                             <File Id="fileafspthread_LIB" Name="AFSPTH~1.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="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" /> 
                             <File Id="fileafsrxkad_LIB" Name="afsrxkad.lib" LongName="afsrxkad.lib" DiskId="1" src="$(var.LibDir)afsrxkad.lib" /> 
                             <File Id="fileafsrxstat_LIB" Name="AFSRXS~1.lib" LongName="afsrxstat.lib" DiskId="1" src="$(var.LibDir)afsrxstat.lib" /> 
                             <File Id="filelanahelper_LIB" Name="LANAHE~1.lib" LongName="lanahelper.lib" DiskId="1" src="$(var.LibDir)lanahelper.lib" /> 
                             <File Id="filelibafsconf_LIB" Name="LIBAFS~1.lib" LongName="libafsconf.lib" DiskId="1" src="$(var.LibDir)libafsconf.lib" /> 
                             <File Id="filelibosi_LIB" Name="libosi.lib" LongName="libosi.lib" DiskId="1" src="$(var.LibDir)libosi.lib" /> 
-                            <File Id="filecm_config_OBJ" Name="CM_CON~1.obj" LongName="cm_config.obj" DiskId="1" src="$(var.LibDir)cm_config.obj" /> 
-                            <File Id="filecm_dns_OBJ" Name="cm_dns.obj" LongName="cm_dns.obj" DiskId="1" src="$(var.LibDir)cm_dns.obj" /> 
                         </Component>
                         <?ifdef CygwinArchives?>
                         <Component Win64="$(var.Win64)" Id="cmp_SDK_Lib_Cygwin" Guid="$(var.cmp_SDK_Lib_Cygwin_guid)">
                           <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="filelibafsconf_A" Name="libafscf.a" LongName="libafsconf.a" DiskId="1" src="$(var.ClientDir)libafsconf.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" /> 
                         </Component>
                         <?endif?>
                     </Directory>
             </Directory> <!-- SDK -->
   <?endif?>
+  <?endif?>
 
         </Directory> <!-- AFS -->
     </Directory> <!-- program files -->
                                <Merge Id="MSVCRT8PFL" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\policy_8_0_Microsoft_VC80_MFCLOC_x86.msm"/>
                        <?endif?>
                <?endif?>
+
+    <?elseif $(env.AFSVER_CL) = "1500"?>
+
+               <?ifdef env.CommonProgramFiles6432?>
+                 <?define CPF="$(env.CommonProgramFiles(x86)"?>
+               <?else?>
+                 <?define CPF="$(env.CommonProgramFiles)"?>
+               <?endif?>
+
+               <?if $(var.Platform) = "x64" ?>
+                       <?ifndef Debug?>
+                               <Merge Id="MSVCRT9MEM" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\Microsoft_VC90_CRT_x86_x64.msm"/>
+                               <Merge Id="MSVCRT9POL" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\policy_9_0_Microsoft_VC90_CRT_x86_x64.msm"/>
+                               <Merge Id="MSVCRT9MFC" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\Microsoft_VC90_MFC_x86_x64.msm"/>
+                               <Merge Id="MSVCRT9PFC" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\policy_9_0_Microsoft_VC90_MFC_x86_x64.msm"/>
+                               <Merge Id="MSVCRT9MFL" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\Microsoft_VC90_MFCLOC_x86_x64.msm"/>
+                               <Merge Id="MSVCRT9PFL" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\policy_9_0_Microsoft_VC90_MFCLOC_x86_x64.msm"/>
+                       <?else?>
+                               <Merge Id="MSVCRT9MEM" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\Microsoft_VC90_DebugCRT_x86_x64.msm"/>
+                               <Merge Id="MSVCRT9POL" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\policy_9_0_Microsoft_VC90_DebugCRT_x86_x64.msm"/>
+                               <Merge Id="MSVCRT9MFC" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\Microsoft_VC90_DebugMFC_x86_x64.msm"/>
+                               <Merge Id="MSVCRT9PFC" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\policy_9_0_Microsoft_VC90_DebugMFC_x86_x64.msm"/>
+                               <Merge Id="MSVCRT9MFL" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\Microsoft_VC90_MFCLOC_x86_x64.msm"/>
+                               <Merge Id="MSVCRT9PFL" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\policy_9_0_Microsoft_VC90_MFCLOC_x86_x64.msm"/>
+                       <?endif?>
+               <?else?>
+                       <?ifndef Debug?>
+                               <Merge Id="MSVCRT9MEM" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\Microsoft_VC90_CRT_x86.msm"/>
+                               <Merge Id="MSVCRT9POL" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\policy_9_0_Microsoft_VC90_CRT_x86.msm"/>
+                               <Merge Id="MSVCRT9MFC" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\Microsoft_VC90_MFC_x86.msm"/>
+                               <Merge Id="MSVCRT9PFC" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\policy_9_0_Microsoft_VC90_MFC_x86.msm"/>
+                               <Merge Id="MSVCRT9MFL" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\Microsoft_VC90_MFCLOC_x86.msm"/>
+                               <Merge Id="MSVCRT9PFL" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\policy_9_0_Microsoft_VC90_MFCLOC_x86.msm"/>
+                       <?else?>
+                               <Merge Id="MSVCRT9MEM" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\Microsoft_VC90_DebugCRT_x86.msm"/>
+                               <Merge Id="MSVCRT9POL" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\policy_9_0_Microsoft_VC90_DebugCRT_x86.msm"/>
+                               <Merge Id="MSVCRT9MFC" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\Microsoft_VC90_DebugMFC_x86.msm"/>
+                               <Merge Id="MSVCRT9PFC" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\policy_9_0_Microsoft_VC90_DebugMFC_x86.msm"/>
+                               <Merge Id="MSVCRT9MFL" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\Microsoft_VC90_MFCLOC_x86.msm"/>
+                               <Merge Id="MSVCRT9PFL" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\policy_9_0_Microsoft_VC90_MFCLOC_x86.msm"/>
+                       <?endif?>
+               <?endif?>
+
        <?endif?>
 </Include>