From: Jeffrey Altman <jaltman@secure-endpoints.com>
Date: Tue, 6 Mar 2007 23:30:47 +0000 (+0000)
Subject: reverting commit to windows WIX installer (revision 19207)
X-Git-Tag: krb5-1.7-alpha1~1265
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=812295e5f8aad7d4cfd015676ca0b8406e4c0329;p=krb5.git

reverting commit to windows WIX installer (revision 19207)

	Revision 19207 committed by Kevin Koch does not document changes
	made to the Wix installer files.  The changes that were made remove
	the installation of the configuration files and the inclusion of
	leash32.chm.

	When the decision is made to remove Leash from the installer,
	the entire Leash feature and the associated properties used to
	determine when it is installed must be removed.  Commenting out
	individual file components is not sufficient.

	Configuration files must be installed as part of KFW.  The
	source of the configuration files is defined by the variable
	"ConfigDir" within the site-local.wxi directory.

	Any changes made to the WIX installer must also be made to the NSIS
	installer.

	The changes to the src/windows/wix directory from 19207 are
	therefore reverted.

ticket: new
component: windows

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@19211 dc483132-0cff-0310-8789-dd5450dbe970
---

diff --git a/src/windows/installer/wix/features.wxi b/src/windows/installer/wix/features.wxi
index 7dd2f0b9d..72480a94c 100644
--- a/src/windows/installer/wix/features.wxi
+++ b/src/windows/installer/wix/features.wxi
@@ -111,8 +111,8 @@
             
         <?ifdef OldHelp?>
             <ComponentRef Id="cmf_leash32_hlp" />
-<!--        <?else?>
-            <ComponentRef Id="cmf_leash32_chm" />	-->
+        <?else?>
+            <ComponentRef Id="cmf_leash32_chm" />
         <?endif?>
             <ComponentRef Id="cmf_leashw32_dll" />
             
@@ -213,9 +213,9 @@
                 <?endif?>
             <?endif?>
         <?endif?>
-<!--            <ComponentRef Id="cmf_krb5_ini" />
+            <ComponentRef Id="cmf_krb5_ini" />
             <ComponentRef Id="cmf_krb_con" />
-            <ComponentRef Id="cmf_krbrealm_con" />	-->
+            <ComponentRef Id="cmf_krbrealm_con" />
             
             <ComponentRef Id="rcm_common" />
             <ComponentRef Id="rcm_client" />
diff --git a/src/windows/installer/wix/files.wxi b/src/windows/installer/wix/files.wxi
index ee46a0736..5fc096631 100644
--- a/src/windows/installer/wix/files.wxi
+++ b/src/windows/installer/wix/files.wxi
@@ -231,9 +231,9 @@
 	                    <File Id="fil_leash32_hlp" LongName="leash32.hlp" Name="leash32.hlp" KeyPath="yes" />
                     </Component>
                 <?else?>
-<!--                    <Component Id="cmf_leash32_chm" Guid="C50E5E0A-B822-4419-855B-1713637BCA6A" DiskId="1">
+                    <Component Id="cmf_leash32_chm" Guid="C50E5E0A-B822-4419-855B-1713637BCA6A" DiskId="1">
 	                    <File Id="fil_leash32_chm" LongName="leash32.chm" Name="leash32.chm" KeyPath="yes" />
-                    </Component>	-->
+                    </Component>
                 <?endif?>
                     <Component Id="cmf_leashw32_dll" Guid="8C145D48-A2FC-4C28-BC05-4368545F1184" DiskId="1">
 	                    <File Id="fil_leashw32_dll" LongName="leashw32.dll" Name="leashw32.dll" KeyPath="yes" />
@@ -888,7 +888,7 @@
         </Directory> <!-- /MIT -->
     </Directory> <!-- /Program Files -->
     <Directory Id="WindowsFolder">
-<!--        <Component Id="cmf_krb5_ini" Guid="C1AF0670-BBF1-4AA6-B2A6-6C8B1584A1F4" NeverOverwrite="yes" Permanent="yes" DiskId="1">
+        <Component Id="cmf_krb5_ini" Guid="C1AF0670-BBF1-4AA6-B2A6-6C8B1584A1F4" NeverOverwrite="yes" Permanent="yes" DiskId="1">
 	        <File Id="fil_krb5_ini" LongName="krb5.ini" Name="krb5.ini" src="$(var.ConfigDir)krb5.ini" KeyPath="yes" />
         </Component>
         <Component Id="cmf_krb_con" Guid="5E91A051-CF14-45FF-BF64-CEE78A7A90C2" NeverOverwrite="yes" Permanent="yes" DiskId="1">
@@ -896,7 +896,7 @@
         </Component>
         <Component Id="cmf_krbrealm_con" Guid="D667B54F-1C98-43FB-87C6-0F0517623B90" NeverOverwrite="yes" Permanent="yes" DiskId="1">
 	        <File Id="fil_krbrealm_con" LongName="krbrealm.con" Name="krbrealm.con" src="$(var.ConfigDir)krbrealm.con" KeyPath="yes" />
-        </Component>	-->
+        </Component>
     </Directory>
     
     <Directory Id="ProgramMenuFolder">