diff options
| author | Jeffrey Altman <jaltman@secure-endpoints.com> | 2007-03-06 23:30:47 +0000 |
|---|---|---|
| committer | Jeffrey Altman <jaltman@secure-endpoints.com> | 2007-03-06 23:30:47 +0000 |
| commit | 812295e5f8aad7d4cfd015676ca0b8406e4c0329 (patch) | |
| tree | 7eceaabfc9fab0c6ea3b01208505a301dada7a32 /src/windows/installer/wix/features.wxi | |
| parent | 86a1cb93d4370dceab9e0960597a1c6c042c2967 (diff) | |
| download | krb5-812295e5f8aad7d4cfd015676ca0b8406e4c0329.tar.gz krb5-812295e5f8aad7d4cfd015676ca0b8406e4c0329.tar.xz krb5-812295e5f8aad7d4cfd015676ca0b8406e4c0329.zip | |
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
Diffstat (limited to 'src/windows/installer/wix/features.wxi')
| -rw-r--r-- | src/windows/installer/wix/features.wxi | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/windows/installer/wix/features.wxi b/src/windows/installer/wix/features.wxi index 7dd2f0b9d1..72480a94cc 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" /> |