summaryrefslogtreecommitdiffstats
path: root/src/windows/installer/wix/kfw.wxs
diff options
context:
space:
mode:
Diffstat (limited to 'src/windows/installer/wix/kfw.wxs')
-rwxr-xr-xsrc/windows/installer/wix/kfw.wxs18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/windows/installer/wix/kfw.wxs b/src/windows/installer/wix/kfw.wxs
index d00c6e88e8..e18e6b3a71 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 &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?>