diff options
| author | Jeffrey Altman <jaltman@secure-endpoints.com> | 2004-12-15 16:53:29 +0000 |
|---|---|---|
| committer | Jeffrey Altman <jaltman@secure-endpoints.com> | 2004-12-15 16:53:29 +0000 |
| commit | 1132e0a2b222a79aef4eb901b4b156e1dc01aa4b (patch) | |
| tree | e22e8375a7f30c51bbe87524ac43d23ced3e4ac2 | |
| parent | 273d8c674cf5a471485218de5859394e700be7b4 (diff) | |
| download | krb5-1132e0a2b222a79aef4eb901b4b156e1dc01aa4b.tar.gz krb5-1132e0a2b222a79aef4eb901b4b156e1dc01aa4b.tar.xz krb5-1132e0a2b222a79aef4eb901b4b156e1dc01aa4b.zip | |
Update for WiX 2.1 installer
ticket: 2805
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@16938 dc483132-0cff-0310-8789-dd5450dbe970
| -rw-r--r-- | src/windows/installer/wix/ChangeLog | 2 | ||||
| -rw-r--r-- | src/windows/installer/wix/features.wxi | 1 | ||||
| -rw-r--r-- | src/windows/installer/wix/files.wxi | 8 | ||||
| -rw-r--r-- | src/windows/installer/wix/lang/ChangeLog | 4 | ||||
| -rw-r--r-- | src/windows/installer/wix/lang/strings_1033.wxl | 2 |
5 files changed, 10 insertions, 7 deletions
diff --git a/src/windows/installer/wix/ChangeLog b/src/windows/installer/wix/ChangeLog index 38f3aa889d..ac56835487 100644 --- a/src/windows/installer/wix/ChangeLog +++ b/src/windows/installer/wix/ChangeLog @@ -2,6 +2,8 @@ Add kcpytkt.exe, kdeltkt.exe, k5sprt32.dll mit2ms.exe + Update to Wix 2.1 installer + 2004-09-16 Jeffrey Altman <jaltman@mit.edu> Remove trailing slash from PATH diff --git a/src/windows/installer/wix/features.wxi b/src/windows/installer/wix/features.wxi index ada31027e4..dcc99faecb 100644 --- a/src/windows/installer/wix/features.wxi +++ b/src/windows/installer/wix/features.wxi @@ -39,7 +39,6 @@ Description="$(loc.KerberosClientDesc)" InstallDefault="local" Title="$(loc.KerberosClientTitle)" - FollowParent="yes" Level="30"> <ComponentRef Id="cmf_aklog_exe" /> diff --git a/src/windows/installer/wix/files.wxi b/src/windows/installer/wix/files.wxi index 908bc2e55b..386402ce73 100644 --- a/src/windows/installer/wix/files.wxi +++ b/src/windows/installer/wix/files.wxi @@ -137,8 +137,7 @@ <Environment Id="env_kclient_path" Action="set" Name="PATH" Part="last" System="yes" Value="[KERBEROSDIR]bin" /> </Component> <Component Id="cmf_k5sprt32_dll" Guid="F2381331-9201-4c02-866F-2038676771D4" DiskId="1"> - <File Id="fil_k5sprt32_dll" LongName="k5sprt32.dll" Name="k5sprt32.dll" KeyPath="yes" /> - <Environment Id="env_kclient_path" Action="set" Name="PATH" Part="last" System="yes" Value="[KERBEROSDIR]bin" /> + <File Id="fil_k5sprt32_dll" LongName="k5sprt32.dll" Name="k5sprt32.dll" /> </Component> <Component Id="cmf_krb524_dll" Guid="98685874-A9AA-4BC5-9830-271D9CF52C17" DiskId="1"> <File Id="fil_krb524_dll" LongName="krb524.dll" Name="krb524.dll" KeyPath="yes" /> @@ -313,7 +312,7 @@ <File Id="fil_kpasswd_pdb" LongName="kpasswd.pdb" Name="kpasswd.pdb" /> <File Id="fil_kvno_pdb" LongName="kvno.pdb" Name="kvno.pdb" /> <File Id="fil_krb5_32_pdb" LongName="krb5_32.pdb" Name="krb5_32.pdb" KeyPath="yes" /> - <File Id="fil_k5sprt32_pdb" LongName="k5sprt32.pdb" Name="k5sprt32.pdb" KeyPath="yes" /> + <File Id="fil_k5sprt32_pdb" LongName="k5sprt32.pdb" Name="k5sprt32.pdb" /> <File Id="fil_krb524_pdb" LongName="krb524.pdb" Name="krb524.pdb" /> <File Id="fil_krbcc32_pdb" LongName="krbcc32.pdb" Name="krbcc32.pdb" /> <File Id="fil_krbcc32s_pdb" LongName="krbcc32s.pdb" Name="krbcc32s.pdb" /> @@ -624,7 +623,6 @@ <File Id="fil_kclnt32_lib" LongName="kclnt32.lib" Name="kclnt32.lib" /> <File Id="fil_krb524_lib" LongName="krb524.lib" Name="krb524.lib" /> <File Id="fil_krb5_32_lib" LongName="krb5_32.lib" Name="krb5_32.lib" KeyPath="yes" /> - <File Id="fil_k5sprt32_lib" LongName="k5sprt32.lib" Name="k5sprt32.lib" KeyPath="yes" /> <File Id="fil_krbcc32_lib" LongName="krbcc32.lib" Name="krbcc32.lib" /> <File Id="fil_krbv4w32_lib" LongName="krbv4w32.lib" Name="krbv4w32.lib" /> <File Id="fil_leashw32_lib" LongName="leashw32.lib" Name="leashw32.lib" /> @@ -720,7 +718,7 @@ </Directory> <Directory Id="ProgramMenuFolder"> - <Directory Id="dirShortcut" LongName="$(loc.ProductName)" Name="$(loc.ProductNameShort)"> + <Directory Id="dirShortcut" LongName="$(loc.ProductName)" Name="KFW"> </Directory> </Directory> <Directory Id="StartupFolder"> diff --git a/src/windows/installer/wix/lang/ChangeLog b/src/windows/installer/wix/lang/ChangeLog index f8aa27c9a4..ca8e72edda 100644 --- a/src/windows/installer/wix/lang/ChangeLog +++ b/src/windows/installer/wix/lang/ChangeLog @@ -1,3 +1,7 @@ +2004-08-20 Jeffrey Altman <jaltman@mit.edu> + + Update for WiX 2.1 installer + 2004-08-20 Asanka Herath <asanka@mit.edu> New WiX 2.0 MSI for KFW
\ No newline at end of file diff --git a/src/windows/installer/wix/lang/strings_1033.wxl b/src/windows/installer/wix/lang/strings_1033.wxl index 324831d923..c2ab6967a0 100644 --- a/src/windows/installer/wix/lang/strings_1033.wxl +++ b/src/windows/installer/wix/lang/strings_1033.wxl @@ -26,7 +26,7 @@ --> <String Id="ProductName">Kerberos for Windows</String> - <String Id="ProductNameShort">Kerberos</String> + <String Id="ProductNameShort">KFW</String> <String Id="ProductMIT">MIT</String> <String Id="ProductDebug">Debug/Checked</String> <String Id="ProductBeta">Beta</String> |