From 81b0ad00bc99a899816fc9bc82a4c6dc97de11bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Marjam=C3=A4ki?= <danielm77@spray.se>
Date: Sun, 15 Apr 2012 11:28:06 +0200
Subject: [PATCH] windows installer: updated scripts and info

---
 win_installer/cppcheck.wixproj | 4 ++--
 win_installer/cppcheck.wxs     | 6 ++++--
 win_installer/readme.txt       | 4 ++--
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/win_installer/cppcheck.wixproj b/win_installer/cppcheck.wixproj
index f83b9e289..f490e1688 100644
--- a/win_installer/cppcheck.wixproj
+++ b/win_installer/cppcheck.wixproj
@@ -2,8 +2,8 @@
   <PropertyGroup>
     <DefineSolutionProperties>false</DefineSolutionProperties>
     
-    <WixToolPath Condition="'$(WixToolPath)' == ''">$(PROGRAMFILES)\Windows Installer XML v3\bin\</WixToolPath>
-    <WixTargetsPath Condition="'$(WixTargetsPath)' == ''">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.0\Wix.targets</WixTargetsPath>
+    <WixToolPath Condition="'$(WixToolPath)' == ''">$(PROGRAMFILES)\Windows Installer XML v3.6\bin\</WixToolPath>
+    <WixTargetsPath Condition="'$(WixTargetsPath)' == ''">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
     
     <Configuration Condition=" '$(Configuration)' == '' ">Release</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
diff --git a/win_installer/cppcheck.wxs b/win_installer/cppcheck.wxs
index 5ef889767..af9ace578 100644
--- a/win_installer/cppcheck.wxs
+++ b/win_installer/cppcheck.wxs
@@ -30,7 +30,7 @@
               <Shortcut Id='startmenuGui' Directory="ProgramMenuDir" Name='$(var.ProductNameShort)'
                   WorkingDirectory='INSTALLDIR' Icon="cppcheckgui.exe" IconIndex="0" Advertise="yes" />
             </File>
-            <!-- <File Id='mingwm10dll' Name='mingwm10.dll' Source='mingwm10.dll' /> -->
+            <File Id='mingwm10dll' Name='mingwm10.dll' Source='mingwm10.dll' />
             <File Id='qtcore4dll' Name='qtcore4.dll' Source='$(var.QtDllDir)\qtcore4.dll' />
             <File Id='qtgui4dll' Name='qtgui4.dll' Source='$(var.QtDllDir)\qtgui4.dll' />
             <File Id='qtxml4dll' Name='qtxml4.dll' Source='$(var.QtDllDir)\qtxml4.dll' />
@@ -72,7 +72,7 @@
             <RemoveFile Id="qtsql4dll" On="install" Name="qtsql4.dll" />
           </Component>
         </Directory>
-        <Merge Id="CRT" Language="0" SourceFile="$(var.CrtMergeModule)" DiskId="1" />
+        <!-- <Merge Id="CRT" Language="0" SourceFile="$(var.CrtMergeModule)" DiskId="1" /> -->
       </Directory>
 
       <Directory Id='ProgramMenuFolder' Name='Programs' >
@@ -96,9 +96,11 @@
         <ComponentRef Id='ProgramMenuDir' />
         <ComponentRef Id='InnoSetupCleanup' />
       </Feature>
+      <!--
       <Feature Id="CRT" AllowAdvertise="no" Display="hidden" Level="1" Title="Microsoft Visual C++ 2008 Runtime Components ">
         <MergeRef Id="CRT"/>
       </Feature>
+      -->
     </Feature>
 
     <Upgrade Id='$(var.ProductUpgradeCode)'>
diff --git a/win_installer/readme.txt b/win_installer/readme.txt
index 9b0c7cb58..568e942fc 100644
--- a/win_installer/readme.txt
+++ b/win_installer/readme.txt
@@ -1,11 +1,11 @@
 The Wix Installer for Windows
 =============================
 
-New cppcheck Windows installer is created with WiX:
+cppcheck Windows installer is created with WiX:
 http://wix.sourceforge.net/
 
 You'll need:
- - latest Wix (3.0 or later)
+ - latest Wix (3.6)
  - MSBuild (coming with Visual Studio, also with VS 2008 express)
  - VS 2008 CRT merge module