diff options
author | Jeffrey Altman <jaltman@secure-endpoints.com> | 2005-12-02 10:29:29 +0000 |
---|---|---|
committer | Jeffrey Altman <jaltman@secure-endpoints.com> | 2005-12-02 10:29:29 +0000 |
commit | 8c2441d9a6928bb6fbe699a4254c83679d4a29f9 (patch) | |
tree | 8fbfb3d22aab60f0acca8f8be8fc2e3de38779dc /src/windows/installer/wix/features.wxi | |
parent | ee2846c05ae4211c2838f1ac35b135b454362489 (diff) | |
download | krb5-8c2441d9a6928bb6fbe699a4254c83679d4a29f9.tar.gz krb5-8c2441d9a6928bb6fbe699a4254c83679d4a29f9.tar.xz krb5-8c2441d9a6928bb6fbe699a4254c83679d4a29f9.zip |
Wix MSI installer for KFW 3.0 Beta 3
Add operating system version check to ensure it is not
installed on Windows 95, 98, ME or NT 4.0
Break out the license text into its own file
Restructure the installer to allow either NetIdMgr or Leash
to be selected (by transform only) as the credentials manager.
The default is to use NetIdMgr.
ticket: new
component: windows
status: resolved
target_version: 1.4.4
tags: pullup
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@17533 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/windows/installer/wix/features.wxi')
-rw-r--r-- | src/windows/installer/wix/features.wxi | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/src/windows/installer/wix/features.wxi b/src/windows/installer/wix/features.wxi index 22630053d7..56dba608e0 100644 --- a/src/windows/installer/wix/features.wxi +++ b/src/windows/installer/wix/features.wxi @@ -40,7 +40,7 @@ InstallDefault="local" Title="$(loc.KerberosClientTitle)" Level="30"> - + <?ifdef DebugSyms?> <Feature Id="feaKfwClientDebug" @@ -55,16 +55,8 @@ </Feature> <?endif?> - <Feature - Id="feaKfwLeashExe" - AllowAdvertise="no" - Description="$(loc.StrLeashExeDesc)" - Display="expand" - InstallDefault="local" - Level="130" - Title="$(loc.StrLeashExeTitle)"> - <ComponentRef Id="cmf_leash32_exe" /> - </Feature> + <ComponentRef Id="cmf_leash32_exe" /> + <ComponentRef Id="csc_leash32_exe" /> <ComponentRef Id="cmf_aklog_exe" /> <ComponentRef Id="cmf_comerr32_dll" /> @@ -94,8 +86,9 @@ <ComponentRef Id="cmf_krb4cred_dll" /> <ComponentRef Id="cmf_krb4cred_en_us_dll" /> <ComponentRef Id="cmf_netidmgr_exe" /> + <ComponentRef Id="cmf_kfwlogon_DLL" /> - + <ComponentRef Id="cmf_kfwcpcc_EXE" /> <!-- Kerberos IV options --> <ComponentRef Id="rcm_krb4_1" /> <ComponentRef Id="rcm_krb4_2" /> @@ -228,7 +221,8 @@ <Feature Id="feaKfwLeashStartup" AllowAdvertise="no" Display="hidden" Level="130"> <Condition Level="30">LEASHAUTOSTART = 1</Condition> - <ComponentRef Id="csc_leashStartup"/> + <ComponentRef Id="csc_NetIDMgrStartup" /> + <ComponentRef Id="csc_LeashStartup" /> </Feature> </Feature> <!-- /feaKfwClient --> |