krb5 commit: Use new-style variable expansion for light.exe
Benjamin Kaduk
kaduk at MIT.EDU
Fri Oct 4 15:56:39 EDT 2013
https://github.com/krb5/krb5/commit/abeed0da177a5c58eb3fa0a72e473fed294ae884
commit abeed0da177a5c58eb3fa0a72e473fed294ae884
Author: Ben Kaduk <kaduk at mit.edu>
Date: Fri Jun 28 18:08:21 2013 -0400
Use new-style variable expansion for light.exe
With WiX 3.x, the preprocessor candle.exe expands variables using
$(); the linker light.exe expands localization and similar variables
using !(), though it accepts the $() form and prints a warning.
Switch to using the expected form to silence the warnings.
ticket: 7390
tags: pullup
target_version 1.11.4
src/windows/installer/wix/features.wxi | 20 ++++++++++----------
src/windows/installer/wix/kfw.wxs | 18 +++++++++---------
src/windows/installer/wix/lang/config_1033.wxi | 24 ++++++++++++------------
src/windows/installer/wix/property.wxi | 6 +++---
4 files changed, 34 insertions(+), 34 deletions(-)
diff --git a/src/windows/installer/wix/features.wxi b/src/windows/installer/wix/features.wxi
index ff63027..398ddda 100644
--- a/src/windows/installer/wix/features.wxi
+++ b/src/windows/installer/wix/features.wxi
@@ -28,28 +28,28 @@
<Feature
Id="feaKfw"
AllowAdvertise="no"
- Description="$(loc.KerberosDesc)"
+ Description="!(loc.KerberosDesc)"
InstallDefault="local"
- Title="$(loc.KerberosTitle)"
+ Title="!(loc.KerberosTitle)"
ConfigurableDirectory="KERBEROSDIR"
Level="30">
<Feature
Id="feaKfwClient"
AllowAdvertise="no"
- Description="$(loc.KerberosClientDesc)"
+ Description="!(loc.KerberosClientDesc)"
InstallDefault="local"
- Title="$(loc.KerberosClientTitle)"
+ Title="!(loc.KerberosClientTitle)"
Level="30">
<?ifdef DebugSyms?>
<Feature
Id="feaKfwClientDebug"
AllowAdvertise="no"
- Description="$(loc.StrKerberosClientDebugDesc)"
+ Description="!(loc.StrKerberosClientDebugDesc)"
Display="expand"
InstallDefault="$(var.DebugSymInstallDefault)"
Level="$(var.DebugSymLowLevel)"
- Title="$(loc.StrKerberosClientDebugTitle)">
+ Title="!(loc.StrKerberosClientDebugTitle)">
<ComponentRef Id="cmf_bin_debug"/>
<ComponentRef Id="cmp_ClientSystemDebug"/>
<?include runtime_debug.wxi?>
@@ -143,10 +143,10 @@
<Feature
Id="feaKfwSDK"
AllowAdvertise="no"
- Description="$(loc.KerberosSDKDesc)"
+ Description="!(loc.KerberosSDKDesc)"
InstallDefault="local"
Level="130"
- Title="$(loc.KerberosSDKTitle)">
+ Title="!(loc.KerberosSDKTitle)">
<?if $(var.Platform) = "Intel" ?>
<ComponentRef Id="cmp_dirlib_i386" />
@@ -168,10 +168,10 @@
<Feature
Id="feaKfwDocs"
AllowAdvertise="no"
- Description="$(loc.KerberosDocDesc)"
+ Description="!(loc.KerberosDocDesc)"
InstallDefault="local"
Level="30"
- Title="$(loc.KerberosDocTitle)">
+ Title="!(loc.KerberosDocTitle)">
<!-- <?if $(var.Platform) = "Intel"?>
<ComponentRef Id="efl_leash_userdoc_pdf" />
diff --git a/src/windows/installer/wix/kfw.wxs b/src/windows/installer/wix/kfw.wxs
index d00c6e8..e18e6b3 100755
--- a/src/windows/installer/wix/kfw.wxs
+++ b/src/windows/installer/wix/kfw.wxs
@@ -34,7 +34,7 @@
Id="$(var.ProductCode)"
Codepage="$(var.CodePage)"
Language="$(var.Language)"
- Manufacturer="$(loc.Manufacturer)"
+ Manufacturer="!(loc.Manufacturer)"
Name="$(var.ProductName)"
UpgradeCode="$(var.UpgradeCode)"
Version="$(var.VersionString)">
@@ -45,7 +45,7 @@
Keywords="Installer,MSI,Database"
Description="$(var.ProductName)"
Comments="$(var.ProductFullName)"
- Manufacturer="$(loc.Manufacturer)"
+ Manufacturer="!(loc.Manufacturer)"
InstallerVersion="$(var.InstallerVersion)"
Languages="$(var.Language)"
Compressed="yes"
@@ -59,14 +59,14 @@
<?include property.wxi?>
<!-- Launch conditions -->
- <Condition Message="$(loc.AdminRequired)">Privileged</Condition>
- <Condition Message="$(loc.OsVersionRequired)">VersionNT >= 501</Condition>
- <Condition Message="$(loc.OsXPSP3)">(Not (VersionNT = 501)) Or (ServicePackLevel >= 3)</Condition>
- <Condition Message="$(loc.OsVistaSP2)">(Not (VersionNT = 600)) Or (ServicePackLevel >= 2)</Condition>
- <Condition Message="$(loc.CMNotSelected)">USELEASH Or USENETIDMGR</Condition>
- <Condition Message="$(loc.CMDupSelected)">Not (USELEASH And USENETIDMGR)</Condition>
+ <Condition Message="!(loc.AdminRequired)">Privileged</Condition>
+ <Condition Message="!(loc.OsVersionRequired)">VersionNT >= 501</Condition>
+ <Condition Message="!(loc.OsXPSP3)">(Not (VersionNT = 501)) Or (ServicePackLevel >= 3)</Condition>
+ <Condition Message="!(loc.OsVistaSP2)">(Not (VersionNT = 600)) Or (ServicePackLevel >= 2)</Condition>
+ <Condition Message="!(loc.CMNotSelected)">USELEASH Or USENETIDMGR</Condition>
+ <Condition Message="!(loc.CMDupSelected)">Not (USELEASH And USENETIDMGR)</Condition>
<?if $(var.Platform) = "x64" ?>
- <Condition Message="$(loc.StrPlatform64)">
+ <Condition Message="!(loc.StrPlatform64)">
<![CDATA[VersionNT64]]>
</Condition>
<?endif?>
diff --git a/src/windows/installer/wix/lang/config_1033.wxi b/src/windows/installer/wix/lang/config_1033.wxi
index 5875e72..78f26d3 100644
--- a/src/windows/installer/wix/lang/config_1033.wxi
+++ b/src/windows/installer/wix/lang/config_1033.wxi
@@ -28,27 +28,27 @@
<?define VersionString="$(var.VersionMajor).$(var.VersionMinor).$(var.VersionPatch)"?>
<?if $(var.Platform) = "x64" ?>
- <?define BaseProductName="$(loc.ProductName64)"?>
- <?define BaseProductNameShort="$(loc.ProductNameShort64)"?>
+ <?define BaseProductName="!(loc.ProductName64)"?>
+ <?define BaseProductNameShort="!(loc.ProductNameShort64)"?>
<?elseif $(var.Platform) = "Intel" ?>
- <?define BaseProductName="$(loc.ProductName)"?>
- <?define BaseProductNameShort="$(loc.ProductNameShort)"?>
+ <?define BaseProductName="!(loc.ProductName)"?>
+ <?define BaseProductNameShort="!(loc.ProductNameShort)"?>
<?else?>
<?error Unknown build type?>
<?endif?>
<?ifdef var.Beta?>
<?ifndef var.Debug?>
- <?define ProductFullName="$(loc.ProductMIT) $(var.BaseProductName) $(var.VersionString) $(loc.ProductBeta) $(var.Beta) "?>
+ <?define ProductFullName="!(loc.ProductMIT) $(var.BaseProductName) $(var.VersionString) !(loc.ProductBeta) $(var.Beta) "?>
<?else?>
- <?define ProductFullName="$(loc.ProductMIT) $(var.BaseProductName) $(var.VersionString) $(loc.ProductBeta) $(var.Beta) $(loc.ProductDebug)"?>
+ <?define ProductFullName="!(loc.ProductMIT) $(var.BaseProductName) $(var.VersionString) !(loc.ProductBeta) $(var.Beta) !(loc.ProductDebug)"?>
<?endif?>
<?else?>
<?ifdef var.Release?>
<?ifndef var.Debug?>
- <?define ProductFullName="$(loc.ProductMIT) $(var.BaseProductName) $(var.VersionString)"?>
+ <?define ProductFullName="!(loc.ProductMIT) $(var.BaseProductName) $(var.VersionString)"?>
<?else?>
- <?define ProductFullName="$(loc.ProductMIT) $(var.BaseProductName) $(var.VersionString) $(loc.ProductDebug)"?>
+ <?define ProductFullName="!(loc.ProductMIT) $(var.BaseProductName) $(var.VersionString) !(loc.ProductDebug)"?>
<?endif?>
<?else?>
<?ifndef var.Date?>
@@ -60,9 +60,9 @@
<?endif?>
<?ifndef var.Debug?>
- <?define ProductFullName="$(loc.ProductMIT) $(var.BaseProductName) $(var.VersionString) $(var.Date) $(var.Time)"?>
+ <?define ProductFullName="!(loc.ProductMIT) $(var.BaseProductName) $(var.VersionString) $(var.Date) $(var.Time)"?>
<?else?>
- <?define ProductFullName="$(loc.ProductMIT) $(var.BaseProductName) $(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?>
@@ -72,5 +72,5 @@
<?define CodePage="1252"?>
<?define Language="1033"?>
- <?define ARPComments="$(loc.ARPComments) $(var.Date) $(var.Time)"?>
-</Include>
\ No newline at end of file
+ <?define ARPComments="!(loc.ARPComments) $(var.Date) $(var.Time)"?>
+</Include>
diff --git a/src/windows/installer/wix/property.wxi b/src/windows/installer/wix/property.wxi
index 3e52f04..70504c1 100644
--- a/src/windows/installer/wix/property.wxi
+++ b/src/windows/installer/wix/property.wxi
@@ -48,8 +48,8 @@
<RegistrySearch Win64="no" Id="regsrch_NSISV" Root="HKLM" Key="Software\Microsoft\Windows\CurrentVersion\Uninstall\Kerberos for Windows" Name="DisplayVersion" Type="raw" />
</Property>
- <Property Id="CantRemoveNSISError">$(loc.CantRemoveNSIS)</Property>
- <Property Id="NoIE501Error">$(loc.IE501Required)</Property>
+ <Property Id="CantRemoveNSISError">!(loc.CantRemoveNSIS)</Property>
+ <Property Id="NoIE501Error">!(loc.IE501Required)</Property>
<!-- Additional properties relating to the UI are in the appropriate UI.wxi file -->
@@ -93,4 +93,4 @@
<?ifdef UseNetIDMgr?>
<Property Id="USENETIDMGR" Admin="yes" Secure="yes">$(var.UseNetIDMgr)</Property>
<?endif?>
-</Include>
\ No newline at end of file
+</Include>
More information about the cvs-krb5
mailing list