diff options
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?> |