diff options
| author | Ben Kaduk <kaduk@mit.edu> | 2012-08-15 14:50:42 -0400 |
|---|---|---|
| committer | Ben Kaduk <kaduk@mit.edu> | 2012-08-29 14:50:21 -0400 |
| commit | 356f0c238e02812d30d04b0cc6e22b0dab2b6c0a (patch) | |
| tree | 4403f46c832d11fcb47f274cb08064b63a0b7a1f /src/windows/installer | |
| parent | 69d4743dc83a2050e4e2c2fd60929abccfef498b (diff) | |
| download | krb5-356f0c238e02812d30d04b0cc6e22b0dab2b6c0a.tar.gz krb5-356f0c238e02812d30d04b0cc6e22b0dab2b6c0a.tar.xz krb5-356f0c238e02812d30d04b0cc6e22b0dab2b6c0a.zip | |
Make finding 32-bit libs easier
Our 64-bit installer provides 32-bit libraries as well as 64-bit
libraries, but not all 32-bit applications (e.g., PuTTY, Pidgin)
are able to locate them in C:\Program Files\MIT\Kerberos .
Including an InstallDir key under the Wow6432Node tree lets them
work out-of-the-box; while here set all the registry keys in this
component in the compatibility tree, for consistency.
ticket: 7337 (new)
queue: kfw
target_version: 1.10.4
tags: pullup
Diffstat (limited to 'src/windows/installer')
| -rw-r--r-- | src/windows/installer/wix/config.wxi | 3 | ||||
| -rw-r--r-- | src/windows/installer/wix/files.wxi | 14 |
2 files changed, 16 insertions, 1 deletions
diff --git a/src/windows/installer/wix/config.wxi b/src/windows/installer/wix/config.wxi index 40bdb7ccab..afafd35636 100644 --- a/src/windows/installer/wix/config.wxi +++ b/src/windows/installer/wix/config.wxi @@ -52,6 +52,7 @@ <?endif?> <?define KfwRegRoot="SOFTWARE\MIT\Kerberos"?> + <?define KfwRegWow6432Root="SOFTWARE\Wow6432Node\MIT\Kerberos"?> <?define DocDir="$(var.TargetDir)doc\"?> <?define IncDir="$(var.TargetDir)include\"?> @@ -182,4 +183,4 @@ <?define UseNetIDMgr="1"?> <?endif?> <?endif?> -</Include>
\ No newline at end of file +</Include> diff --git a/src/windows/installer/wix/files.wxi b/src/windows/installer/wix/files.wxi index 5a9b5114e6..6b8d8cf789 100644 --- a/src/windows/installer/wix/files.wxi +++ b/src/windows/installer/wix/files.wxi @@ -493,6 +493,20 @@ <Registry Id="reg_common7" Root="HKLM" Key="$(var.KfwRegRoot)\CurrentVersion" Action="removeKeyOnInstall"/> <Registry Id="reg_common8" Root="HKLM" Key="$(var.KfwRegRoot)\$(var.VersionString)" Action="removeKeyOnInstall"/> <?endif?> + <?if $(var.Platform) = "x64"?> + <Registry Id="reg_common0_32" Root="HKLM" Key="$(var.KfwRegWow6432Root)" Action="createKeyAndRemoveKeyOnUninstall" /> + <!-- Cannot set KeyPath twice in one Component --> + <Registry Id="reg_common2_32" Root="HKLM" Key="$(var.KfwRegWow6432Root)" Name="InstallDir" Type="string" Value="[KERBEROSDIR]"/> + <?ifdef Debug?> + <Registry Id="reg_common3_32" Root="HKLM" Key="$(var.KfwRegWow6432Root)\CurrentVersion" Action="createKeyAndRemoveKeyOnUninstall"/> + <Registry Id="reg_common4_32" Root="HKLM" Key="$(var.KfwRegWow6432Root)\CurrentVersion" Name="Debug" Type="integer" Value="1"/> + <Registry Id="reg_common5_32" Root="HKLM" Key="$(var.KfwRegWow6432Root)\$(var.VersionString)" Action="createKeyAndRemoveKeyOnUninstall"/> + <Registry Id="reg_common6_32" Root="HKLM" Key="$(var.KfwRegWow6432Root)\$(var.VersionString)" Name="Debug" Type="integer" Value="1"/> + <?else?> + <Registry Id="reg_common7_32" Root="HKLM" Key="$(var.KfwRegWow6432Root)\CurrentVersion" Action="removeKeyOnInstall"/> + <Registry Id="reg_common8_32" Root="HKLM" Key="$(var.KfwRegWow6432Root)\$(var.VersionString)" Action="removeKeyOnInstall"/> + <?endif?> + <?endif?> </Component> <Component Win64="$(var.Win64)" Id="rcm_client" Guid="901179B2-7369-43b1-ACF3-4C7F37482CC7"> |