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

diff --git a/src/windows/installer/wix/features.wxi b/src/windows/installer/wix/features.wxi
index ff6302709f6175d578863bdd6bdb5ec63bc0a448..398ddda6f37f14475f077ca75d2c78ae92bb6dc9 100644 (file)
--- 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 d00c6e88e8b4f80568630cab32bce8e1912cda1b..e18e6b3a71e137edcf7d11d823f1c648fb2b45bc 100755 (executable)
--- 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 &gt;= 501</Condition>
-        <Condition Message="$(loc.OsXPSP3)">(Not (VersionNT = 501)) Or (ServicePackLevel &gt;= 3)</Condition>
-        <Condition Message="$(loc.OsVistaSP2)">(Not (VersionNT = 600)) Or (ServicePackLevel &gt;= 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 &gt;= 501</Condition>
+        <Condition Message="!(loc.OsXPSP3)">(Not (VersionNT = 501)) Or (ServicePackLevel &gt;= 3)</Condition>
+        <Condition Message="!(loc.OsVistaSP2)">(Not (VersionNT = 600)) Or (ServicePackLevel &gt;= 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 5875e72817f5ccc0404e4eed69278c75580592d8..78f26d31e258b13800f383a584ac5261890a9ca1 100644 (file)
--- 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 3e52f046d27b1d3a01c8d49eda87ea106ae31f77..70504c181ce04d57aee6945ba99bce90fe585741 100644 (file)
--- 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>