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/lang/config_1033.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/lang/config_1033.wxi')
| -rw-r--r-- | src/windows/installer/wix/lang/config_1033.wxi | 26 |
1 files changed, 17 insertions, 9 deletions
diff --git a/src/windows/installer/wix/lang/config_1033.wxi b/src/windows/installer/wix/lang/config_1033.wxi index 0fc62e3d17..5875e72817 100644 --- a/src/windows/installer/wix/lang/config_1033.wxi +++ b/src/windows/installer/wix/lang/config_1033.wxi @@ -27,22 +27,30 @@ <Include xmlns="http://schemas.microsoft.com/wix/2003/01/wi"> <?define VersionString="$(var.VersionMajor).$(var.VersionMinor).$(var.VersionPatch)"?> + <?if $(var.Platform) = "x64" ?> + <?define BaseProductName="$(loc.ProductName64)"?> + <?define BaseProductNameShort="$(loc.ProductNameShort64)"?> + <?elseif $(var.Platform) = "Intel" ?> + <?define BaseProductName="$(loc.ProductName)"?> + <?define BaseProductNameShort="$(loc.ProductNameShort)"?> + <?else?> + <?error Unknown build type?> + <?endif?> - <?ifdef var.Release?> + <?ifdef var.Beta?> <?ifndef var.Debug?> - <?define ProductFullName="$(loc.ProductMIT) $(loc.ProductName) $(var.VersionString)"?> + <?define ProductFullName="$(loc.ProductMIT) $(var.BaseProductName) $(var.VersionString) $(loc.ProductBeta) $(var.Beta) "?> <?else?> - <?define ProductFullName="$(loc.ProductMIT) $(loc.ProductName) $(var.VersionString) $(loc.ProductDebug)"?> + <?define ProductFullName="$(loc.ProductMIT) $(var.BaseProductName) $(var.VersionString) $(loc.ProductBeta) $(var.Beta) $(loc.ProductDebug)"?> <?endif?> <?else?> - <?ifdef var.Beta?> + <?ifdef var.Release?> <?ifndef var.Debug?> - <?define ProductFullName="$(loc.ProductMIT) $(loc.ProductName) $(var.VersionString) $(loc.ProductBeta) $(var.Beta) "?> + <?define ProductFullName="$(loc.ProductMIT) $(var.BaseProductName) $(var.VersionString)"?> <?else?> - <?define ProductFullName="$(loc.ProductMIT) $(loc.ProductName) $(var.VersionString) $(loc.ProductBeta) $(var.Beta) $(loc.ProductDebug)"?> + <?define ProductFullName="$(loc.ProductMIT) $(var.BaseProductName) $(var.VersionString) $(loc.ProductDebug)"?> <?endif?> <?else?> - <?ifndef var.Date?> <?error Date string must be specified?> <?endif?> @@ -52,9 +60,9 @@ <?endif?> <?ifndef var.Debug?> - <?define ProductFullName="$(loc.ProductMIT) $(loc.ProductName) $(var.VersionString) $(var.Date) $(var.Time)"?> + <?define ProductFullName="$(loc.ProductMIT) $(var.BaseProductName) $(var.VersionString) $(var.Date) $(var.Time)"?> <?else?> - <?define ProductFullName="$(loc.ProductMIT) $(loc.ProductName) $(var.VersionString) $(var.Date) $(var.Time) $(loc.ProductDebug)"?> + <?define ProductFullName="$(loc.ProductMIT) $(var.BaseProductName) $(var.VersionString) $(var.Date) $(var.Time) $(loc.ProductDebug)"?> <?endif?> <?endif?> <?endif?> |