From 914891f247dee27826b9ad0ca65c3ece364a8f8f Mon Sep 17 00:00:00 2001
From: Kimmo Varis <kimmov@gmail.com>
Date: Mon, 28 Jun 2010 20:47:00 +0300
Subject: [PATCH] MSI Installer: Cleanup runtime files from InnoSetup
 installer.

Remove runtime files installed by earlier InnoSetup installer. These runtime
files might be different versions and might conflict with versions installed
by the MSI installer. Better to be on safe side here.
---
 win_installer/cppcheck.wxs | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/win_installer/cppcheck.wxs b/win_installer/cppcheck.wxs
index 4981398cb..b2d2dda7a 100755
--- a/win_installer/cppcheck.wxs
+++ b/win_installer/cppcheck.wxs
@@ -40,6 +40,12 @@
               <Shortcut Id='startmenuManual' Directory="ProgramMenuDir" Name="Manual" Advertise="yes" />
             </File>
           </Component>
+          <!-- Cleanup runtime files installed by previous InnoSetup installer -->
+          <Component Id='InnoSetupCleanup' Guid='4A3F299D-1EE1-468b-814B-D6577F0698CA'>
+            <RemoveFile Id="msvcp90.dll" On="install" Name="msvcp90.dll" />
+            <RemoveFile Id="msvcr90.dll" On="install" Name="msvcr90.dll" />
+            <RemoveFile Id="Microsoft.VC90.CRT.manifest" On="install" Name="Microsoft.VC90.CRT.manifest" />
+          </Component>
         </Directory>
         <Merge Id="CRT" Language="0" SourceFile="$(var.CrtMergeModule)" DiskId="1" />
       </Directory>
@@ -63,6 +69,7 @@
         <ComponentRef Id='readme.txt' />
         <ComponentRef Id='HtmlHelp' />
         <ComponentRef Id='ProgramMenuDir' />
+        <ComponentRef Id='InnoSetupCleanup' />
       </Feature>
       <Feature Id="CRT" AllowAdvertise="no" Display="hidden" Level="1" Title="Microsoft Visual C++ 2009 Runtime Components ">
         <MergeRef Id="CRT"/>