diff options
| author | Jeffrey Altman <jaltman@secure-endpoints.com> | 2007-10-12 19:01:38 +0000 |
|---|---|---|
| committer | Jeffrey Altman <jaltman@secure-endpoints.com> | 2007-10-12 19:01:38 +0000 |
| commit | 875db8152711c3867569d463d27d5664b0cd3dd0 (patch) | |
| tree | 95ed27103d975d63a972161452c0c8541e2625b4 /src/windows/installer/wix/config.wxi | |
| parent | c0b3626ce1cbcc482f3379d64923552b1eed89e1 (diff) | |
| download | krb5-875db8152711c3867569d463d27d5664b0cd3dd0.tar.gz krb5-875db8152711c3867569d463d27d5664b0cd3dd0.tar.xz krb5-875db8152711c3867569d463d27d5664b0cd3dd0.zip | |
KFW: BUG: WIX: Improve Usability of multiple architecture MSI installations, remove non-unique GUID component identifiers, and include Beta ID in the package name
The WiX installation package suffered from several problems:
* The Beta ID was not being included in the package name.
Fixed this by swapping the priority of "Release" and "Beta".
"Beta" is an official release that has a beta value.
A non-release has a datestamp as part of the package name.
* There were duplicate GUID values being used for registry components.
This would prevent proper removal of the components on uninstall.
* 64-bit Installers were being constructed with the 32-bit installer
schema. This prevented side-by-side installation of the 64-bit and
32-bit versions. This also permitted 64-bit installers to be
installed on 32-bit systems.
* The 64-bit and 32-bit installers had the same package name.
64-bit and 32-bit are now identified in the package name.
* 64-bit files were being installed to the WOW64 environment.
ticket: new
component: windows
tags: pullup
target_version: 1.6.3
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@20117 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/windows/installer/wix/config.wxi')
| -rw-r--r-- | src/windows/installer/wix/config.wxi | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/windows/installer/wix/config.wxi b/src/windows/installer/wix/config.wxi index 734e16c08e..e1f48a8b14 100644 --- a/src/windows/installer/wix/config.wxi +++ b/src/windows/installer/wix/config.wxi @@ -48,23 +48,20 @@ <?define InstallerVersion="110"?> <?define Platform="Intel"?> <?define Win64="no"?> + <?define BinDir="$(var.TargetDir)bin\i386\"?> + <?define LibDir="$(var.TargetDir)lib\i386\"?> <?elseif $(env.CPU) = "AMD64"?> <?define InstallerVersion="200"?> <?define Platform="x64"?> <?define Win64="yes"?> + <?define BinDir="$(var.TargetDir)bin\amd64\"?> + <?define LibDir="$(var.TargetDir)lib\amd64\"?> <?else?> <?error Unknown build type?> <?endif?> <?define KfwRegRoot="SOFTWARE\MIT\Kerberos"?> - <?if $(env.CPU) = "i386"?> - <?define BinDir="$(var.TargetDir)bin\i386\"?> - <?define LibDir="$(var.TargetDir)lib\i386\"?> - <?else?> - <?define BinDir="$(var.TargetDir)bin\amd64\"?> - <?define LibDir="$(var.TargetDir)lib\amd64\"?> - <?endif?> <?define DocDir="$(var.TargetDir)doc\"?> <?define IncDir="$(var.TargetDir)inc\"?> <?define InstallDir="$(var.TargetDir)install\"?> |