win_installer: remove trailing spaces

This commit is contained in:
XhmikosR 2012-09-22 21:39:25 +03:00 committed by Daniel Marjamäki
parent 1656a978c7
commit 95b6288d25
3 changed files with 7 additions and 7 deletions

View File

@ -1,19 +1,19 @@
<Project DefaultTargets="All" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project DefaultTargets="All" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup> <PropertyGroup>
<DefineSolutionProperties>false</DefineSolutionProperties> <DefineSolutionProperties>false</DefineSolutionProperties>
<WixToolPath Condition="'$(WixToolPath)' == ''">$(PROGRAMFILES)\Windows Installer XML v3.5\bin\</WixToolPath> <WixToolPath Condition="'$(WixToolPath)' == ''">$(PROGRAMFILES)\Windows Installer XML v3.5\bin\</WixToolPath>
<WixTargetsPath Condition="'$(WixTargetsPath)' == ''">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\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>
<OutputName Condition=" '$(ProductVersion)' != '' ">cppcheck-$(ProductVersion)-$(Platform)-Setup</OutputName> <OutputName Condition=" '$(ProductVersion)' != '' ">cppcheck-$(ProductVersion)-$(Platform)-Setup</OutputName>
<OutputPath>..\Build\</OutputPath> <OutputPath>..\Build\</OutputPath>
<IntermediateOutputPath>..\BuildTmp\Wix\$(Platform)\</IntermediateOutputPath> <IntermediateOutputPath>..\BuildTmp\Wix\$(Platform)\</IntermediateOutputPath>
<OutputType>package</OutputType> <OutputType>package</OutputType>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<WixExtension Include="$(WixToolPath)WixUIExtension.dll" /> <WixExtension Include="$(WixToolPath)WixUIExtension.dll" />
<Compile Include="cppcheck.wxs"/> <Compile Include="cppcheck.wxs"/>

View File

@ -88,7 +88,7 @@
</Directory> </Directory>
</Directory> </Directory>
<Feature Id='Complete' Title='$(var.ProductName)' Description='The complete package.' <Feature Id='Complete' Title='$(var.ProductName)' Description='The complete package.'
Display='expand' Level='1' ConfigurableDirectory='INSTALLDIR' > Display='expand' Level='1' ConfigurableDirectory='INSTALLDIR' >
<Feature Id='MainProgram' Title='Command line interface' Description='Command line tool' Level='1'> <Feature Id='MainProgram' Title='Command line interface' Description='Command line tool' Level='1'>
<ComponentRef Id='cppcheck.exe' /> <ComponentRef Id='cppcheck.exe' />

View File

@ -8,7 +8,7 @@ You'll need:
- latest Wix (3.6) - 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
Configuring Configuring
----------- -----------
@ -27,7 +27,7 @@ Before building the installer make sure all the components are build:
- CLI executable (cppcheck.exe) - CLI executable (cppcheck.exe)
- GUI executable (cppcheck-gui.exe) - GUI executable (cppcheck-gui.exe)
- GUI translations (*.qm) - generated by the Qt's lrelease -tool - GUI translations (*.qm) - generated by the Qt's lrelease -tool
And that runtime files are available: And that runtime files are available:
- Qt runtimes: - Qt runtimes:
QtCore4.dll, QtGui4.dll and QtXml4.dll QtCore4.dll, QtGui4.dll and QtXml4.dll