[26240] in CVS-changelog-for-Kerberos-V5
svn rev #25580: trunk/src/windows/installer/wix/
daemon@ATHENA.MIT.EDU (tlyu@mit.edu)
Mon Dec 12 15:47:05 2011
Date: Mon, 12 Dec 2011 15:47:02 -0500
From: tlyu@mit.edu
Message-Id: <201112122047.pBCKl2Z4007349@drugstore.mit.edu>
To: cvs-krb5@mit.edu
Reply-To: krbdev@mit.edu
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: cvs-krb5-bounces@mit.edu
http://src.mit.edu/fisheye/changelog/krb5/?cs=25580
Commit By: tlyu
Log Message:
ticket: 7050
subject: kfw installer: install leash help file (leash.chm)
Signed-off-by: Kevin Wasserman <kevin.wasserman@painless-security.com>
Changed Files:
U trunk/src/windows/installer/wix/features.wxi
U trunk/src/windows/installer/wix/files.wxi
Modified: trunk/src/windows/installer/wix/features.wxi
===================================================================
--- trunk/src/windows/installer/wix/features.wxi 2011-12-12 20:46:59 UTC (rev 25579)
+++ trunk/src/windows/installer/wix/features.wxi 2011-12-12 20:47:02 UTC (rev 25580)
@@ -96,11 +96,7 @@
<ComponentRef Id="rcm_leash_5" />
<ComponentRef Id="rcm_leash_6" />
-<!-- <?ifdef OldHelp?>
- <ComponentRef Id="cmf_leash32_hlp" />
- <?else?>
<ComponentRef Id="cmf_leash32_chm" />
- <?endif?> -->
<!-- Leash dll options -->
<ComponentRef Id="rcm_leashdll_1" />
Modified: trunk/src/windows/installer/wix/files.wxi
===================================================================
--- trunk/src/windows/installer/wix/files.wxi 2011-12-12 20:46:59 UTC (rev 25579)
+++ trunk/src/windows/installer/wix/files.wxi 2011-12-12 20:47:02 UTC (rev 25580)
@@ -197,15 +197,9 @@
<Condition>USELEASH</Condition>
</Component> -->
-<!-- <?ifdef OldHelp?>
- <Component Win64="$(var.Win64)" Id="cmf_leash32_hlp" Guid="$(var.cmf_leash32_hlp_guid)" DiskId="1">
- <File Id="fil_leash32_hlp" Name="leash32.hlp" KeyPath="yes" />
- </Component>
- <?else?>
<Component Win64="$(var.Win64)" Id="cmf_leash32_chm" Guid="$(var.cmf_leash32_chm_guid)" DiskId="1">
- <File Id="fil_leash32_chm" Name="leash32.chm" KeyPath="yes" />
+ <File Id="fil_leash32_chm" Name="leash.chm" KeyPath="yes" />
</Component>
- <?endif?> -->
<Component Win64="$(var.Win64)" Id="cmf_leashw32_dll" Guid="$(var.cmf_leashw32_dll_guid)" DiskId="1">
<File Id="fil_leashw32_dll" Name="$(var.cmf_leashw32_dll_name)" KeyPath="yes" />
_______________________________________________
cvs-krb5 mailing list
cvs-krb5@mit.edu
https://mailman.mit.edu/mailman/listinfo/cvs-krb5
