diff options
| author | Ben Kaduk <kaduk@mit.edu> | 2013-06-28 18:08:21 -0400 |
|---|---|---|
| committer | Ben Kaduk <kaduk@mit.edu> | 2013-10-04 14:21:21 -0400 |
| commit | abeed0da177a5c58eb3fa0a72e473fed294ae884 (patch) | |
| tree | e4aacf85617cc074fc1382977b5e841c532b6546 /src/windows/installer/wix/features.wxi | |
| parent | 36c8a474bdd05d3f5be94b007dae46f0986adfa2 (diff) | |
| download | krb5-abeed0da177a5c58eb3fa0a72e473fed294ae884.tar.gz krb5-abeed0da177a5c58eb3fa0a72e473fed294ae884.tar.xz krb5-abeed0da177a5c58eb3fa0a72e473fed294ae884.zip | |
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
Diffstat (limited to 'src/windows/installer/wix/features.wxi')
| -rw-r--r-- | src/windows/installer/wix/features.wxi | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/windows/installer/wix/features.wxi b/src/windows/installer/wix/features.wxi index ff6302709f..398ddda6f3 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" /> |