windows installer: updated scripts and info
This commit is contained in:
parent
ddd7d61d9e
commit
81b0ad00bc
|
@ -2,8 +2,8 @@
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<DefineSolutionProperties>false</DefineSolutionProperties>
|
<DefineSolutionProperties>false</DefineSolutionProperties>
|
||||||
|
|
||||||
<WixToolPath Condition="'$(WixToolPath)' == ''">$(PROGRAMFILES)\Windows Installer XML v3\bin\</WixToolPath>
|
<WixToolPath Condition="'$(WixToolPath)' == ''">$(PROGRAMFILES)\Windows Installer XML v3.6\bin\</WixToolPath>
|
||||||
<WixTargetsPath Condition="'$(WixTargetsPath)' == ''">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.0\Wix.targets</WixTargetsPath>
|
<WixTargetsPath Condition="'$(WixTargetsPath)' == ''">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
|
||||||
|
|
||||||
<Configuration Condition=" '$(Configuration)' == '' ">Release</Configuration>
|
<Configuration Condition=" '$(Configuration)' == '' ">Release</Configuration>
|
||||||
<Platform Condition=" '$(Platform)' == '' ">x86</Platform>
|
<Platform Condition=" '$(Platform)' == '' ">x86</Platform>
|
||||||
|
|
|
@ -30,7 +30,7 @@
|
||||||
<Shortcut Id='startmenuGui' Directory="ProgramMenuDir" Name='$(var.ProductNameShort)'
|
<Shortcut Id='startmenuGui' Directory="ProgramMenuDir" Name='$(var.ProductNameShort)'
|
||||||
WorkingDirectory='INSTALLDIR' Icon="cppcheckgui.exe" IconIndex="0" Advertise="yes" />
|
WorkingDirectory='INSTALLDIR' Icon="cppcheckgui.exe" IconIndex="0" Advertise="yes" />
|
||||||
</File>
|
</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='qtcore4dll' Name='qtcore4.dll' Source='$(var.QtDllDir)\qtcore4.dll' />
|
||||||
<File Id='qtgui4dll' Name='qtgui4.dll' Source='$(var.QtDllDir)\qtgui4.dll' />
|
<File Id='qtgui4dll' Name='qtgui4.dll' Source='$(var.QtDllDir)\qtgui4.dll' />
|
||||||
<File Id='qtxml4dll' Name='qtxml4.dll' Source='$(var.QtDllDir)\qtxml4.dll' />
|
<File Id='qtxml4dll' Name='qtxml4.dll' Source='$(var.QtDllDir)\qtxml4.dll' />
|
||||||
|
@ -72,7 +72,7 @@
|
||||||
<RemoveFile Id="qtsql4dll" On="install" Name="qtsql4.dll" />
|
<RemoveFile Id="qtsql4dll" On="install" Name="qtsql4.dll" />
|
||||||
</Component>
|
</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>
|
||||||
|
|
||||||
<Directory Id='ProgramMenuFolder' Name='Programs' >
|
<Directory Id='ProgramMenuFolder' Name='Programs' >
|
||||||
|
@ -96,9 +96,11 @@
|
||||||
<ComponentRef Id='ProgramMenuDir' />
|
<ComponentRef Id='ProgramMenuDir' />
|
||||||
<ComponentRef Id='InnoSetupCleanup' />
|
<ComponentRef Id='InnoSetupCleanup' />
|
||||||
</Feature>
|
</Feature>
|
||||||
|
<!--
|
||||||
<Feature Id="CRT" AllowAdvertise="no" Display="hidden" Level="1" Title="Microsoft Visual C++ 2008 Runtime Components ">
|
<Feature Id="CRT" AllowAdvertise="no" Display="hidden" Level="1" Title="Microsoft Visual C++ 2008 Runtime Components ">
|
||||||
<MergeRef Id="CRT"/>
|
<MergeRef Id="CRT"/>
|
||||||
</Feature>
|
</Feature>
|
||||||
|
-->
|
||||||
</Feature>
|
</Feature>
|
||||||
|
|
||||||
<Upgrade Id='$(var.ProductUpgradeCode)'>
|
<Upgrade Id='$(var.ProductUpgradeCode)'>
|
||||||
|
|
|
@ -1,11 +1,11 @@
|
||||||
The Wix Installer for Windows
|
The Wix Installer for Windows
|
||||||
=============================
|
=============================
|
||||||
|
|
||||||
New cppcheck Windows installer is created with WiX:
|
cppcheck Windows installer is created with WiX:
|
||||||
http://wix.sourceforge.net/
|
http://wix.sourceforge.net/
|
||||||
|
|
||||||
You'll need:
|
You'll need:
|
||||||
- latest Wix (3.0 or later)
|
- latest Wix (3.6)
|
||||||
- MSBuild (coming with Visual Studio, also with VS 2008 express)
|
- MSBuild (coming with Visual Studio, also with VS 2008 express)
|
||||||
- VS 2008 CRT merge module
|
- VS 2008 CRT merge module
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue