From: Jeffrey Altman <jaltman@your-file-system.com>
Date: Wed, 16 Nov 2011 15:33:41 +0000 (-0500)
Subject: Windows: Do not install IBM AFS HLP files
X-Git-Tag: upstream/1.8.0_pre1^2~3033
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=1c97c04add6639a11e88d412e369771bf6f0f281;p=packages%2Fo%2Fopenafs.git

Windows: Do not install IBM AFS HLP files

The IBM AFS HLP files are so out of date at this point
that they are simply confusing.  They reference tools and screens
that no longer exist and claim the product is "IBM AFS".  Incorrect
documentation is worse than no documentation.

The HLP files cannot be updated since we do not have the sources.

HLP file format is no longer supported on Windows Vista or 7.

The afs-nt.hlp file will continue to be installed conditionally
when afscreds.exe is installed but the shortcut to it in the
Start menu is being removed.  afscreds.exe is not installed by
default.

Change-Id: I3443a5c4ca65472a16cbf7ae1d52da39e917136a
Reviewed-on: http://gerrit.openafs.org/6065
Tested-by: Jeffrey Altman <jaltman@secure-endpoints.com>
Reviewed-by: Jeffrey Altman <jaltman@secure-endpoints.com>
---

diff --git a/src/WINNT/install/wix/feature.wxi b/src/WINNT/install/wix/feature.wxi
index 789243d9d..b650f3097 100644
--- a/src/WINNT/install/wix/feature.wxi
+++ b/src/WINNT/install/wix/feature.wxi
@@ -191,7 +191,6 @@
                 <ComponentRef Id="cmf_afssvrcfg_$(var.LanguageCode)_DLL" />
                 <ComponentRef Id="cmf_TaAfsAppLib_$(var.LanguageCode)_DLL" />
                 <ComponentRef Id="cmf_afs_nt_HLP_$(var.Language)" />
-                <ComponentRef Id="cmp_Lang_$(var.Language)" />
             
                 <ComponentRef Id="cmf_vlserver_EXE" />
                 <ComponentRef Id="cmf_volinfo_EXE" />
@@ -260,7 +259,6 @@
                 <ComponentRef Id="cmf_TaAfsServerManager_$(var.LanguageCode)_DLL" />
                 <ComponentRef Id="cmf_afs_cpa_$(var.LanguageCode)_DLL" />
                 <ComponentRef Id="cmf_afs_nt_HLP_$(var.Language)" />
-                <ComponentRef Id="cmp_Lang_$(var.Language)" />
 
             <?ifdef DebugSyms?>
 				<Feature Id="feaControlCenterDebug" AllowAdvertise="no" Description="$(loc.StrAFSCCDebugLongDesc)"
@@ -319,7 +317,6 @@
                 <ComponentRef Id="cmp_User_Guide_en_US" />
 
                 <ComponentRef Id="cmf_afs_nt_HLP_en_US" />
-                <ComponentRef Id="cmp_Lang_en_US" />
 		
             </Feature>
    <?else?> <!-- 32-bit tools only -->
diff --git a/src/WINNT/install/wix/files.wxi b/src/WINNT/install/wix/files.wxi
index d86e8361e..3392749bd 100644
--- a/src/WINNT/install/wix/files.wxi
+++ b/src/WINNT/install/wix/files.wxi
@@ -135,22 +135,6 @@
                 <Component Win64="$(var.Win64)" Id="cmf_afs_cpa_1033_DLL" Guid="$(var.cmf_afs_cpa_1033_DLL_guid)">
                     <File Id="fileafs_cpa_1033_DLL" Name="acpa1033.dll" LongName="afs_cpa_1033.dll" KeyPath="yes" DiskId="1" src="$(var.ClientDir)\afs_cpa_1033.dll"/>
                 </Component>
-
-                <Directory Id="dirCommon_en_US" Name="en_US" src="$(var.SrcDir)\WINNT\doc\help\en_US\">
-
-                    <Component Id="cmp_Lang_en_US" Guid="9B6B5AB2-8BD1-402D-BFC0-63255740A653">
-                        <File Id="filetaafssvrmgr_CNT_en_US" Name="taafs.cnt" LongName="taafssvrmgr.cnt" DiskId="1" />
-                        <File Id="filetaafsusrmgr_CNT_en_US" Name="taafsusr.cnt" LongName="taafsusrmgr.cnt" DiskId="1" />
-                        <File Id="fileafs_cc_CNT_en_US" Name="afs-cc.cnt" LongName="afs-cc.cnt" DiskId="1" />
-                        <File Id="fileafs_light_CNT_en_US" Name="afs-lgt.cnt" LongName="afs-light.cnt" DiskId="1" />
-                        <File Id="filetaafscfg_CNT_en_US" Name="taafscfg.cnt" LongName="taafscfg.cnt" DiskId="1" />
-                        <File Id="filetaafssvrmgr2_HLP_en_US" Name="taafsvrm.hlp" LongName="taafssvrmgr.hlp" KeyPath="yes" DiskId="1" />
-                        <File Id="filetaafsusrmgr2_HLP_en_US" Name="taafusrm.hlp" LongName="taafsusrmgr.hlp" DiskId="1" />
-                        <File Id="fileafs_cc2_HLP_en_US" Name="afs-cc.hlp" LongName="afs-cc.hlp" DiskId="1" />
-                        <File Id="fileafs_light2_HLP_en_US" Name="afs-lgt.hlp" LongName="afs-light.hlp" DiskId="1" />
-                        <File Id="filetaafscfg2_HLP_en_US" Name="taafscfg.hlp" LongName="taafscfg.hlp" DiskId="1" />
-                    </Component>
-                </Directory>
             <?endif?>
                 <!-- <</LanguageSpecific:1033/en_US>> -->
   <?endif?> <!-- /ifndef BinsOnly -->
@@ -1109,9 +1093,7 @@
         <!-- en_US help -->
 
                     <Component Id="cmf_afs_nt_HLP_en_US" Guid="E9CAF872-E71B-466E-9560-9E6F542128E4">
-                        <File Id="fileafs_nt_HLP_en_US" Name="afs-nt.hlp" LongName="afs-nt.hlp" KeyPath="yes" DiskId="1" src="$(var.SrcDir)WINNT\doc\help\en_US\afs-nt.hlp">
-							<Shortcut Id="scClientHelp_en_US" Directory="dirShortCut" Name="CliHelp.lnk" LongName="Client Help.lnk" Description="$(loc.StrHlpFileDesc)" Icon="ico_Help" IconIndex="0" Show="normal" WorkingDirectory="dirCommon" />
-                        </File>
+                        <File Id="fileafs_nt_HLP_en_US" Name="afs-nt.hlp" LongName="afs-nt.hlp" KeyPath="yes" DiskId="1" src="$(var.SrcDir)WINNT\doc\help\en_US\afs-nt.hlp" />
                         <File Id="fileafs_nt2_CNT_en_US" Name="afs-nt.cnt" LongName="afs-nt.cnt" DiskId="1" src="$(var.SrcDir)WINNT\doc\help\en_US\afs-nt.cnt" />
                     </Component>