walkero
/
cppcheck
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

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.
This commit is contained in:
Kimmo Varis 2010-06-28 20:47:00 +03:00
parent 357e76484d
commit 914891f247
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
win_installer/cppcheck.wxs
View File

@ -40,6 +40,12 @@
<Shortcut Id='startmenuManual' Directory="ProgramMenuDir" Name="Manual" Advertise="yes" /> <Shortcut Id='startmenuManual' Directory="ProgramMenuDir" Name="Manual" Advertise="yes" />
</File> </File>
</Component> </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> </Directory>
<Merge Id="CRT" Language="0" SourceFile="$(var.CrtMergeModule)" DiskId="1" /> <Merge Id="CRT" Language="0" SourceFile="$(var.CrtMergeModule)" DiskId="1" />
</Directory> </Directory>
@ -63,6 +69,7 @@
<ComponentRef Id='readme.txt' /> <ComponentRef Id='readme.txt' />
<ComponentRef Id='HtmlHelp' /> <ComponentRef Id='HtmlHelp' />
<ComponentRef Id='ProgramMenuDir' /> <ComponentRef Id='ProgramMenuDir' />
<ComponentRef Id='InnoSetupCleanup' />
</Feature> </Feature>
<Feature Id="CRT" AllowAdvertise="no" Display="hidden" Level="1" Title="Microsoft Visual C++ 2009 Runtime Components "> <Feature Id="CRT" AllowAdvertise="no" Display="hidden" Level="1" Title="Microsoft Visual C++ 2009 Runtime Components ">
<MergeRef Id="CRT"/> <MergeRef Id="CRT"/>