windows-install-20090527
[openafs.git] / src / WINNT / install / wix / files.wxi
index cb36e1f..21bf041 100644 (file)
@@ -48,6 +48,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_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 +80,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="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"/>
 
                 <!-- 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?>
 
   <?ifndef BinsOnly?>
-         <?if $(var.Language) = "en_US"?>
-            <Component Id="efl_Readme_TXT_en_US" Guid="959DC63A-6C67-4B51-9F7D-2CDEE91F0099">
-                <File Id="fileREADME_TXT_en_US" Name="README.txt" LongName="README.txt" DiskId="1" src="$(var.SrcDir)\WINNT\doc\install\Documentation\en_US\README.txt"/>
-            </Component>
-         <?endif?>
-                        
-         <?if $(var.Language) = "zh_TW"?>
-            <Component Id="efl_Readme_TXT_zh_TW" Guid="BF25CD95-7BCD-4B0C-9999-B246199236F6">
-                <File Id="fileREADME_TXT_zh_TW" Name="README.txt" LongName="README.txt" DiskId="1" src="$(var.SrcDir)\WINNT\doc\install\Documentation\zh_TW\README.txt"/>
-            </Component>
-         <?endif?>
-                        
-         <?if $(var.Language) = "de_DE"?>
-            <Component Id="efl_Readme_TXT_de_DE" Guid="5F1433F0-C57D-46C8-857B-4265B95CEF24">
-                <File Id="fileREADME_TXT_de_DE" Name="README.txt" LongName="README.txt" DiskId="1" src="$(var.SrcDir)\WINNT\doc\install\Documentation\de_DE\README.txt"/>
-            </Component>
-         <?endif?>
-                        
-         <?if $(var.Language) = "es_ES"?>
-            <Component Id="efl_Readme_TXT_es_ES" Guid="8B0C573E-B33E-4EC5-8B3B-C08347FFAB79">
-                <File Id="fileREADME_TXT_es_ES" Name="README.txt" LongName="README.txt" DiskId="1" src="$(var.SrcDir)\WINNT\doc\install\Documentation\es_ES\README.txt"/>
-            </Component>
-         <?endif?>
-                        
-         <?if $(var.Language) = "ja_JP"?>
-            <Component Id="efl_Readme_TXT_ja_JP" Guid="5A15925E-00EB-4B00-A5BE-7461EE7D6C95">
-                <File Id="fileREADME_TXT_ja_JP" Name="README.txt" LongName="README.txt" DiskId="1" src="$(var.SrcDir)\WINNT\doc\install\Documentation\ja_JP\README.txt"/>
-            </Component>
-         <?endif?>
-                        
-         <?if $(var.Language) = "ko_KR"?>
-            <Component Id="efl_Readme_TXT_ko_KR" Guid="715D4A97-6356-41E8-8660-76D74DC88495">
-                <File Id="fileREADME_TXT_ko_KR" Name="README.txt" LongName="README.txt" DiskId="1" src="$(var.SrcDir)\WINNT\doc\install\Documentation\ko_KR\README.txt"/>
-            </Component>
-         <?endif?>
-     
-         <?if $(var.Language) = "pt_BR"?>
-            <Component Id="efl_Readme_TXT_pt_BR" Guid="03682CAA-66D4-472F-86DE-C508F33AE50C">
-                <File Id="fileREADME_TXT_pt_BR" Name="README.txt" LongName="README.txt" DiskId="1" src="$(var.SrcDir)\WINNT\doc\install\Documentation\pt_BR\README.txt"/>
-            </Component>
-         <?endif?>
-                        
-         <?if $(var.Language) = "zh_CN"?>
-            <Component Id="efl_Readme_TXT_zh_CN" Guid="6D1DD8B0-0D61-4BC4-976B-F72E087F83D4">
-                <File Id="fileREADME_TXT_zh_CN" Name="README.txt" LongName="README.txt" DiskId="1" src="$(var.SrcDir)\WINNT\doc\install\Documentation\zh_CN\README.txt"/>
-            </Component>
-         <?endif?>
-  <?endif?>
-
-  <?ifndef BinsOnly?>
             <Directory Id="dirDocumentation" Name="Docum" LongName="Documentation" SourceName="Docs">
-                               <!-- The following directory and everything below it is language dependent. -->
-                    <Directory Id="dirHtml_$(var.Language)" Name="Html" src="$(var.SrcDir)\WINNT\doc\install\Documentation\$(var.Language)\html\">
-                        <Component Id="cmf_index2_HTM_$(var.Language)" Guid="$(var.DocHtmlIndexGuid)">
-                            <File Id="fileindex2_HTM_$(var.Language)" Name="index.htm" LongName="index.htm" KeyPath="yes" DiskId="1">
-                                                               <Shortcut Id="scDoc_$(var.Language)" Directory="dirShortCut" Name="Doc$(var.Language).lnk" LongName="Documentation ($(var.Language)).lnk" Description="$(loc.StrDocLnkDesc)" Icon="ico_Help" IconIndex="0" Show="normal" WorkingDirectory="dirCommon" />
-                            </File>
+                   <!-- The following directory and everything below it is language dependent. -->
+                    <?if $(var.Language) = "en_US"?>
+                        <Component Id="cmp_Sys_Admin_Guide_en_US" Guid="$(var.DocChmSysAdminGuid)">
+                        <File Id="file_admin_guide_CHM_$(var.Language)" Name="AdminGd.chm" LongName="AdminGuide.chm" KeyPath="yes" DiskId="1" src="$(var.DocDir)\xml\AdminGuide\htmlhelp.chm">
+                                 <Shortcut Id="scDocAdmin_en_US" Directory="dirShortCutDocs" Name="AdminGd.lnk" LongName="Administrator Guide.lnk" Description="$(loc.StrDocAdminGdLnkDesc)" Icon="ico_Help" IconIndex="0" Show="normal" WorkingDirectory="dirCommon" />
+                        </File>
                         </Component>
-                        <Component Id="efl_DocHtml_$(var.Language)" Guid="$(var.DocHtmlGuid)">
-                            <File Id="filebanner_GIF_$(var.Language)" Name="banner.gif" LongName="banner.gif" DiskId="1" />
-                            <File Id="filebooks_GIF_$(var.Language)" Name="books.gif" LongName="books.gif" DiskId="1" />
-                            <File Id="filebot_GIF_$(var.Language)" Name="bot.gif" LongName="bot.gif" DiskId="1" />
-                            <File Id="fileindex_GIF_$(var.Language)" Name="index.gif" LongName="index.gif" DiskId="1" />
-                            <File Id="filenext_GIF_$(var.Language)" Name="next.gif" LongName="next.gif" DiskId="1" />
-                            <File Id="fileprev_GIF_$(var.Language)" Name="prev.gif" LongName="prev.gif" DiskId="1" />
-                            <File Id="filetoc_GIF_$(var.Language)" Name="toc.gif" LongName="toc.gif" DiskId="1" />
-                            <File Id="filetop_GIF_$(var.Language)" Name="top.gif" LongName="top.gif" DiskId="1" />
-                            <File Id="file$(var.Language)_RTF" Name="$(var.Language).rtf" LongName="$(var.Language).rtf" KeyPath="yes" DiskId="1" src="$(var.SrcDir)\WINNT\license\lang\$(var.Language).rtf"/>
+                        <Component Id="cmp_User_Guide_en_US" Guid="$(var.DocChmUserGuid)">
+                        <File Id="file_user_guide_CHM_$(var.Language)" Name="UserGd.chm" LongName="UserGuide.chm" KeyPath="yes" DiskId="1"  src="$(var.DocDir)\xml\UserGuide\htmlhelp.chm">
+                                 <Shortcut Id="scDocUser_en_US" Directory="dirShortCutDocs" Name="UserGd.lnk" LongName="User Guide.lnk" Description="$(loc.StrDocUserGdLnkDesc)" Icon="ico_Help" IconIndex="0" Show="normal" WorkingDirectory="dirCommon" />
+                        </File>
                         </Component>
-                        <Directory Id="dirindex_files_$(var.Language)" Name="index" LongName="index_files" src="$(var.SrcDir)\WINNT\doc\install\Documentation\$(var.Language)\html\index_files\">
-                            <Component Id="cmp_index_files_$(var.Language)" Guid="$(var.DocHtmlIndexFilesGuid)">
-                                <File Id="filefilelist_XML_$(var.Language)" Name="filelist.xml" LongName="filelist.xml" DiskId="1" />
-                                <File Id="fileimage001_JPG_$(var.Language)" Name="image001.jpg" LongName="image001.jpg" DiskId="1" />
-                                <File Id="fileimage002_JPG_$(var.Language)" Name="image002.jpg" LongName="image002.jpg" DiskId="1" />
-                            </Component>
-                        </Directory>
+                        <Component Id="cmp_Release_Notes_en_US" Guid="$(var.DocChmRelNotesGuid)">
+                        <File Id="file_relnotes_CHM_$(var.Language)" Name="RelNotes.chm" LongName="ReleaseNotes.chm" KeyPath="yes" DiskId="1"  src="$(var.DocDir)\xml\ReleaseNotesWindows\htmlhelp.chm">
+                                 <Shortcut Id="scDocRelNotes_en_US" Directory="dirShortCutDocs" Name="RelNotes.lnk" LongName="Release Notes.lnk" Description="$(loc.StrDocRelNotesLnkDesc)" Icon="ico_Help" IconIndex="0" Show="normal" WorkingDirectory="dirCommon" />
+                        </File>
+                        </Component>
+                    <?endif?>                        
+                    <Directory Id="dirHtml_$(var.Language)" Name="Html" src="$(var.SrcDir)\WINNT\doc\install\Documentation\$(var.Language)\html\">
                     <?if $(var.Language) = "en_US"?>
                         <Directory Id="dirCmdRef_en_US" Name="CmdRef" src="$(var.DocDir)\man-pages\html\">
                             <Component Id="cmp_Cmd_Ref_en_US" Guid="$(var.DocHtmlCmdRefGuid)">
-                                <File Id="file_CmdRef_Index_HTM_en_US" Name="index.htm" LongName="index.html" KeyPath="yes" DiskId="1" />
+                                <File Id="file_CmdRef_Index_HTM_en_US" Name="index.htm" LongName="index.html" KeyPath="yes" DiskId="1">
+                                 <Shortcut Id="scDocRefMan_$(var.Language)" Directory="dirShortCutDocs" Name="RefMan.lnk" LongName="Reference Manual.lnk" Description="$(loc.StrDocRefManLnkDesc)" Icon="ico_Help" IconIndex="0" Show="normal" WorkingDirectory="dirCommon" />
+                                </File>
                                 <File Id="file_CmdRef_Style_CSS_en_US" Name="style.css" LongName="style.css" DiskId="1" />
                             </Component>
-                        </Directory> <!-- CmdRef -->
-                        <Directory Id="dirCmdRef1_en_US" Name="CmdRef_1" src="$(var.DocDir)\man-pages\html\1\">
+                        <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_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_dpass_html"  Name="dpass.htm"  LongName="dpass.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_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_fs_diskfree_html"  Name="fs_diskf.htm"  LongName="fs_diskfree.html"  DiskId="1"  />
                             <File Id="file_CmdRef_1_fs_examine_html"  Name="fs_exami.htm"  LongName="fs_examine.html"  DiskId="1"  />
                             <File Id="file_CmdRef_1_fs_exportafs_html"  Name="fs_expor.htm"  LongName="fs_exportafs.html"  DiskId="1"  />
                             <File Id="file_CmdRef_1_fs_getcellstatus_html"  Name="fs_getce.htm"  LongName="fs_getcellstatus.html"  DiskId="1"  />
                             <File Id="file_CmdRef_1_fs_getclientaddrs_html"  Name="fs_getcl.htm"  LongName="fs_getclientaddrs.html"  DiskId="1"  />
                             <File Id="file_CmdRef_1_fs_getcrypt_html"  Name="fs_getcr.htm"  LongName="fs_getcrypt.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_1_fs_getfid_html"  Name="fs_getfi.htm"  LongName="fs_getfid.html"  DiskId="1"  />
                             <File Id="file_CmdRef_1_fs_getserverprefs_html"  Name="fs_getse.htm"  LongName="fs_getserverprefs.html"  DiskId="1"  />
                             <File Id="file_CmdRef_1_fs_help_html"  Name="fs_help.htm"  LongName="fs_help.html"  DiskId="1"  />
                             <File Id="file_CmdRef_1_fs_listacl_html"  Name="fs_lista.htm"  LongName="fs_listacl.html"  DiskId="1"  />
                             <File Id="file_CmdRef_1_fs_listcells_html"  Name="fs_listc.htm"  LongName="fs_listcells.html"  DiskId="1"  />
                             <File Id="file_CmdRef_1_fs_listquota_html"  Name="fs_listq.htm"  LongName="fs_listquota.html"  DiskId="1"  />
                             <File Id="file_CmdRef_1_fs_lsmount_html"  Name="fs_lsmou.htm"  LongName="fs_lsmount.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_1_fs_memdump_html"  Name="fs_memdu.htm"  LongName="fs_memdump.html"  DiskId="1"  />
                             <File Id="file_CmdRef_1_fs_messages_html"  Name="fs_messa.htm"  LongName="fs_messages.html"  DiskId="1"  />
                             <File Id="file_CmdRef_1_fs_minidump_html"  Name="fs_minid.htm"  LongName="fs_minidump.html"  DiskId="1"  />
                             <File Id="file_CmdRef_1_fs_mkmount_html"  Name="fs_mkmou.htm"  LongName="fs_mkmount.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_1_fs_monitor_html"  Name="fs_monit.htm"  LongName="fs_monitor.html"  DiskId="1"  />
                             <File Id="file_CmdRef_1_fs_newalias_html"  Name="fs_newal.htm"  LongName="fs_newalias.html"  DiskId="1"  />
                             <File Id="file_CmdRef_1_fs_newcell_html"  Name="fs_newce.htm"  LongName="fs_newcell.html"  DiskId="1"  />
                             <File Id="file_CmdRef_1_fs_quota_html"  Name="fs_quota.htm"  LongName="fs_quota.html"  DiskId="1"  />
                             <File Id="file_CmdRef_1_fs_rmmount_html"  Name="fs_rmmou.htm"  LongName="fs_rmmount.html"  DiskId="1"  />
                             <File Id="file_CmdRef_1_fs_rxstatpeer_html"  Name="fs_rxsta.htm"  LongName="fs_rxstatpeer.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_1_fs_rxstatproc_html"  Name="fs_rxstc.htm"  LongName="fs_rxstatproc.html"  DiskId="1"  />
                             <File Id="file_CmdRef_1_fs_setacl_html"  Name="fs_setac.htm"  LongName="fs_setacl.html"  DiskId="1"  />
                             <File Id="file_CmdRef_1_fs_setcachesize_html"  Name="fs_setca.htm"  LongName="fs_setcachesize.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_1_fs_setcbaddr_html"  Name="fs_setcb.htm"  LongName="fs_setcbaddr.html"  DiskId="1"  />
                             <File Id="file_CmdRef_1_fs_setcell_html"  Name="fs_setce.htm"  LongName="fs_setcell.html"  DiskId="1"  />
                             <File Id="file_CmdRef_1_fs_setclientaddrs_html"  Name="fs_setcl.htm"  LongName="fs_setclientaddrs.html"  DiskId="1"  />
                             <File Id="file_CmdRef_1_fs_setcrypt_html"  Name="fs_setcr.htm"  LongName="fs_setcrypt.html"  DiskId="1"  />
                             <File Id="file_CmdRef_1_fs_setvol_html"  Name="fs_setvo.htm"  LongName="fs_setvol.html"  DiskId="1"  />
                             <File Id="file_CmdRef_1_fs_storebehind_html"  Name="fs_store.htm"  LongName="fs_storebehind.html"  DiskId="1"  />
                             <File Id="file_CmdRef_1_fs_sysname_html"  Name="fs_sysna.htm"  LongName="fs_sysname.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_1_fs_trace_html"  Name="fs_trace.htm"  LongName="fs_trace.html"  DiskId="1"  />
                             <File Id="file_CmdRef_1_fs_uuid_html"  Name="fs_uuid.htm"  LongName="fs_uuid.html"  DiskId="1"  />
                             <File Id="file_CmdRef_1_fs_whereis_html"  Name="fs_where.htm"  LongName="fs_whereis.html"  DiskId="1"  />
                             <File Id="file_CmdRef_1_fs_whichcell_html"  Name="fs_which.htm"  LongName="fs_whichcell.html"  DiskId="1"  />
                             <File Id="file_CmdRef_1_fs_wscell_html"  Name="fs_wscel.htm"  LongName="fs_wscell.html"  DiskId="1"  />
                             <File Id="file_CmdRef_1_klog_html"  Name="klog.htm"  LongName="klog.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_1_klog__krb5_html"  Name="klogkrb5.htm"  LongName="klog.krb5.html"  DiskId="1"  />
                             <File Id="file_CmdRef_1_knfs_html"  Name="knfs.htm"  LongName="knfs.html"  DiskId="1"  />
                             <File Id="file_CmdRef_1_kpasswd_html"  Name="kpasswd.htm"  LongName="kpasswd.html"  DiskId="1"  />
                             <File Id="file_CmdRef_1_livesys_html"  Name="livesys.htm"  LongName="livesys.html"  DiskId="1"  />
-                            <File Id="file_CmdRef_1_package_test_html"  Name="pack_tst.htm"  LongName="package_test.html"  DiskId="1"  />
                             <File Id="file_CmdRef_1_pagsh_html"  Name="pagsh.htm"  LongName="pagsh.html"  DiskId="1"  />
                             <File Id="file_CmdRef_1_pts_html"  Name="pts.htm"  LongName="pts.html"  DiskId="1"  />
                             <File Id="file_CmdRef_1_pts_adduser_html"  Name="pts_addu.htm"  LongName="pts_adduser.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="dirCmdRef5_en_US" Name="CmdRef_5" src="$(var.DocDir)\man-pages\html\5\">
+                        <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_5_afsmonitor_html"  Name="afsmonit.htm"  LongName="afsmonitor.html"    DiskId="1"  />
+                            <File Id="file_CmdRef_5_afszcm_cat_html"  Name="afszcm.htm"  LongName="afszcm.cat.html"    DiskId="1"  />
                             <File Id="file_CmdRef_5_afs_cache_html"  Name="afs_cach.htm"  LongName="afs_cache.html"    DiskId="1"  />
                             <File Id="file_CmdRef_5_afs_volume_header_html"  Name="afs_volu.htm"  LongName="afs_volume_header.html"    DiskId="1"  />
+                            <File Id="file_CmdRef_5_AuthLog_dir_html"  Name="AuthLogD.htm"  LongName="AuthLog.dir.html"    DiskId="1"  />
                             <File Id="file_CmdRef_5_AuthLog_html"  Name="AuthLog.htm"  LongName="AuthLog.html"    DiskId="1"  />
                             <File Id="file_CmdRef_5_BackupLog_html"  Name="BackupLo.htm"  LongName="BackupLog.html"    DiskId="1"  />
+                            <File Id="file_CmdRef_5_bdb_DB0_html"  Name="bdb_DB0.htm"  LongName="bdb.DB0.html"    DiskId="1"  />
                             <File Id="file_CmdRef_5_BosConfig_html"  Name="BosConfi.htm"  LongName="BosConfig.html"    DiskId="1"  />
                             <File Id="file_CmdRef_5_BosLog_html"  Name="BosLog.htm"  LongName="BosLog.html"    DiskId="1"  />
                             <File Id="file_CmdRef_5_butc_html"  Name="butc.htm"  LongName="butc.html"    DiskId="1"  />
                             <File Id="file_CmdRef_5_CellAlias_html"  Name="CellAlia.htm"  LongName="CellAlias.html"    DiskId="1"  />
                             <File Id="file_CmdRef_5_CellServDB_html"  Name="CellServ.htm"  LongName="CellServDB.html"    DiskId="1"  />
                             <File Id="file_CmdRef_5_FileLog_html"  Name="FileLog.htm"  LongName="FileLog.html"    DiskId="1"  />
+                            <File Id="file_CmdRef_5_fms_log_html"  Name="fms_log.htm"  LongName="fms.log.html"    DiskId="1"  />
                             <File Id="file_CmdRef_5_ForceSalvage_html"  Name="ForceSal.htm"  LongName="ForceSalvage.html"    DiskId="1"  />
+                            <File Id="file_CmdRef_5_kaserver_DB0_html"  Name="kaserved.htm"  LongName="kaserver.DB0.html"    DiskId="1"  />
                             <File Id="file_CmdRef_5_kaserverauxdb_html"  Name="kaserver.htm"  LongName="kaserverauxdb.html"    DiskId="1"  />
                             <File Id="file_CmdRef_5_KeyFile_html"  Name="KeyFile.htm"  LongName="KeyFile.html"    DiskId="1"  />
+                            <File Id="file_CmdRef_5_krb_conf_html"  Name="krb_conf.htm"  LongName="krb.conf.html"    DiskId="1"  />
                             <File Id="file_CmdRef_5_NetInfo_html"  Name="NetInfo.htm"  LongName="NetInfo.html"    DiskId="1"  />
                             <File Id="file_CmdRef_5_NetRestrict_html"  Name="NetRestr.htm"  LongName="NetRestrict.html"    DiskId="1"  />
                             <File Id="file_CmdRef_5_NoAuth_html"  Name="NoAuth.htm"  LongName="NoAuth.html"    DiskId="1"  />
-                            <File Id="file_CmdRef_5_package_html"  Name="package.htm"  LongName="package.html"    DiskId="1"  />
+                            <File Id="file_CmdRef_5_prdb_DB0_html"  Name="prdb_DB0.htm"  LongName="prdb.DB0.html"    DiskId="1"  />
+                            <File Id="file_CmdRef_5_Salvage_fs_html"  Name="SalvageF.htm"  LongName="Salvage.fs.html"    DiskId="1"  />
+                            <File Id="file_CmdRef_5_Salvage_lock_html"  Name="SalvageL.htm"  LongName="Salvage.lock.html"    DiskId="1"  />
                             <File Id="file_CmdRef_5_SalvageLog_html"  Name="SalvageL.htm"  LongName="SalvageLog.html"    DiskId="1"  />
                             <File Id="file_CmdRef_5_sysid_html"  Name="sysid.htm"  LongName="sysid.html"    DiskId="1"  />
                             <File Id="file_CmdRef_5_tapeconfig_html"  Name="tapeconf.htm"  LongName="tapeconfig.html"    DiskId="1"  />
                             <File Id="file_CmdRef_5_UserList_html"  Name="UserList.htm"  LongName="UserList.html"    DiskId="1"  />
                             <File Id="file_CmdRef_5_uss_html"  Name="uss.htm"  LongName="uss.html"    DiskId="1"  />
                             <File Id="file_CmdRef_5_uss_bulk_html"  Name="uss_bulk.htm"  LongName="uss_bulk.html"    DiskId="1"  />
+                            <File Id="file_CmdRef_5_vldb_DB0_html"  Name="vldb_DB0.htm"  LongName="vldb.DB0.html"    DiskId="1"  />
                             <File Id="file_CmdRef_5_VLLog_html"  Name="VLLog.htm"  LongName="VLLog.html"    DiskId="1"  />
                             <File Id="file_CmdRef_5_VolserLog_html"  Name="VolserLo.htm"  LongName="VolserLog.html"    DiskId="1"  />
                             </Component>
                         </Directory> <!-- CmdRef_5 -->
-                        <Directory Id="dirCmdRef8_en_US" Name="CmdRef_8" src="$(var.DocDir)\man-pages\html\8\">
+                        <Directory Id="dirCmdRef8_en_US" Name="8" src="$(var.DocDir)\man-pages\html\8\">
                             <Component Id="cmp_Cmd_Ref_8_en_US" Guid="$(var.DocHtmlCmdRef8Guid)">
                             <File Id="file_CmdRef_8_afsd_html"  Name="afsd.htm"  LongName="afsd.html"  KeyPath="yes"  DiskId="1"  />
                             <File Id="file_CmdRef_8_asetkey_html"  Name="asetkey.htm"  LongName="asetkey.html"  DiskId="1"  />
                             <File Id="file_CmdRef_8_kas_unlock_html"  Name="kas_unlo.htm"  LongName="kas_unlock.html"  DiskId="1"  />
                             <File Id="file_CmdRef_8_kdb_html"  Name="kdb.htm"  LongName="kdb.html"  DiskId="1"  />
                             <File Id="file_CmdRef_8_kpwvalid_html"  Name="kpwvalid.htm"  LongName="kpwvalid.html"  DiskId="1"  />
-                            <File Id="file_CmdRef_8_package_html"  Name="package.htm"  LongName="package.html"  DiskId="1"  />
                             <File Id="file_CmdRef_8_prdb_check_html"  Name="prdb_che.htm"  LongName="prdb_check.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"  />
                             <File Id="file_CmdRef_8_upclient_html"  Name="upclient.htm"  LongName="upclient.html"  DiskId="1"  />
                             <File Id="file_CmdRef_8_voldump_html"  Name="voldump.htm"  LongName="voldump.html"  DiskId="1"  />
                             <File Id="file_CmdRef_8_volinfo_html"  Name="volinfo.htm"  LongName="volinfo.html"  DiskId="1"  />
                             <File Id="file_CmdRef_8_volserver_html"  Name="volserve.htm"  LongName="volserver.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_8_vsys_html"  Name="vsys.htm"  LongName="vsys.html"  DiskId="1"  />
                             <File Id="file_CmdRef_8_xfs_size_check_html"  Name="xfs_size.htm"  LongName="xfs_size_check.html"  DiskId="1"  />
                             </Component>
                         </Directory> <!-- CmdRef_8 -->
+                        </Directory> <!-- CmdRef -->
                     <?else?>
                         <Directory Id="dirCmdRef_$(var.Language)" Name="CmdRef" src="$(var.SrcDir)\WINNT\doc\install\Documentation\$(var.Language)\html\CmdRef\">
                             <Component Id="cmp_Cmd_Ref_$(var.Language)" Guid="$(var.DocHtmlCmdRefGuid)">
-                                <File Id="fileauarf000_HTM_$(var.Language)" Name="auarf000.htm" LongName="auarf000.htm" KeyPath="yes" DiskId="1" />
+                                <File Id="fileauarf000_HTM_$(var.Language)" Name="auarf000.htm" LongName="auarf000.htm" KeyPath="yes" DiskId="1">
+                                         <Shortcut Id="scDocRefMan_$(var.Language)" Directory="dirShortCutDocs" Name="RefMan.lnk" LongName="Reference Manual.lnk" Description="$(loc.StrDocRefManLnkDesc)" Icon="ico_Help" IconIndex="0" Show="normal" WorkingDirectory="dirCommon" />
+                                </File>
                                 <File Id="fileauarf002_HTM_$(var.Language)" Name="auarf002.htm" LongName="auarf002.htm" DiskId="1" />
                                 <File Id="fileauarf003_HTM_$(var.Language)" Name="auarf003.htm" LongName="auarf003.htm" DiskId="1" />
                                 <File Id="fileauarf004_HTM_$(var.Language)" Name="auarf004.htm" LongName="auarf004.htm" DiskId="1" />
                                 <File Id="fileawqbg004_HTM_$(var.Language)" Name="awqbg004.htm" LongName="awqbg004.htm" DiskId="1" />
                             </Component>
                         </Directory> <!-- InstallGd -->
-                    <?endif?>
                         <Directory Id="dirSysAdminGd_$(var.Language)" Name="SysAd" LongName="SysAdminGd" SourceName="SysAdm" LongSource="SysAdminGd" src="$(var.SrcDir)\WINNT\doc\install\Documentation\$(var.Language)\html\SysAdminGd\">
                             <Component Id="cmp_Sys_Admin_Guide_$(var.Language)" Guid="$(var.DocHtmlSysAdminGuid)">
                                 <File Id="fileauagd000_HTM_$(var.Language)" Name="auagd.htm" LongName="auagd000.htm" KeyPath="yes" DiskId="1" />
                                 </Component>
                             </Directory>
                         </Directory> <!-- Release Notes -->
+                    <?endif?>
                     </Directory> <!-- Html -->
             </Directory> <!-- Documentation -->
   <?endif?>
                     <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" />
                             <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>
                             <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.LibDir)libafsconf.a" />
+                          <File Id="filelibosi_A" Name="libosi.a" LongName="libosi.a" DiskId="1" src="$(var.ClientDir)libosi.a" /> 
+                        </Component>
+                        <?endif?>
                         <Directory Id="dirLibAfs" Name="afs">
                             <Component Win64="$(var.Win64)" Id="cmp_SDK_Lib_Afs" Guid="$(var.cmp_SDK_Lib_Afs_guid)">
                                 <File Id="fileafsacl_LIB" Name="afsacl.lib" LongName="afsacl.lib" DiskId="1" src="$(var.LibDir)afs\afsacl.lib" /> 
                                 <File Id="fileTaAfsAppLib_LIB" Name="TAAFSA~2.lib" LongName="TaAfsAppLib.lib" DiskId="1" src="$(var.LibDir)afs\TaAfsAppLib.lib" /> 
                                 <File Id="filetalocale_LIB" Name="talocale.lib" LongName="talocale.lib" DiskId="1" src="$(var.LibDir)afs\talocale.lib" /> 
                             </Component>
+                            <?ifdef CygwinArchives?>
+                            <Component Win64="$(var.Win64)" Id="cmp_SDK_Lib_Afs_Cygwin" Guid="$(var.cmp_SDK_Lib_Afs_Cygwin_guid)">
+                                <File Id="fileafsadminutil_A" Name="afsadmut.a" LongName="afsadminutil.a" DiskId="1" src="$(var.ServerDir)afsadminutil.a" /> 
+                                <File Id="fileafsbosadmin_A" Name="afsbosad.a" LongName="afsbosadmin.a" DiskId="1" src="$(var.ServerDir)afsbosadmin.a" /> 
+                                <File Id="fileafscfgadmin_A" Name="afscfgad.a" LongName="afscfgadmin.a" DiskId="1" src="$(var.ServerDir)afscfgadmin.a" /> 
+                                <File Id="fileafsclientadmin_A" Name="afscliad.a" LongName="afsclientadmin.a" DiskId="1" src="$(var.ServerDir)afsclientadmin.a" /> 
+                                <File Id="fileafskasadmin_A" Name="afskasad.a" LongName="afskasadmin.a" DiskId="1" src="$(var.ServerDir)afskasadmin.a" /> 
+                                <File Id="fileafsprocmgmt_A" Name="afsprcmg.a" LongName="afsprocmgmt.a" DiskId="1" src="$(var.ServerDir)afsprocmgmt.a" /> 
+                                <File Id="fileafsptsadmin_A" Name="afsptsad.a" LongName="afsptsadmin.a" DiskId="1" src="$(var.ServerDir)afsptsadmin.a" /> 
+                                <File Id="fileafsvosadmin_A" Name="afsvosad.a" LongName="afsvosadmin.a" DiskId="1" src="$(var.ServerDir)afsvosadmin.a" /> 
+                            </Component>
+                            <?endif?>
                         </Directory>
                     </Directory>
             </Directory> <!-- SDK -->
   <?ifndef BinsOnly ?>
     <!-- References -->
     <Directory Id="ProgramMenuFolder" Name=".">
-        <Directory Id="dirShortCut" Name="OpenAFS"/>
+        <Directory Id="dirShortCut" Name="OpenAFS">
+            <Directory Id="dirShortCutDocs" Name="Docs" LongName="Documentation" />
+        </Directory>
     </Directory>
     <Directory Id="StartupFolder" Name="." />
     <Directory Id="WindowsVolume" Name="." />
                                <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>