Skip to content

Commit e486e8c

Browse files
PKEuSPKEuS
committed
Updated WiX installer and VS solution to VS12 and Qt5
1 parent 3c94071 commit e486e8c

File tree

7 files changed

+49
-12
lines changed

7 files changed

+49
-12
lines changed

‎cli/cli.vcxproj‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,41 +43,49 @@
4343
<ConfigurationType>Application</ConfigurationType>
4444
<CharacterSet>Unicode</CharacterSet>
4545
<WholeProgramOptimization>false</WholeProgramOptimization>
46+
<PlatformToolset>v120_xp</PlatformToolset>
4647
</PropertyGroup>
4748
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-PCRE|Win32'" Label="Configuration">
4849
<ConfigurationType>Application</ConfigurationType>
4950
<CharacterSet>Unicode</CharacterSet>
5051
<WholeProgramOptimization>false</WholeProgramOptimization>
52+
<PlatformToolset>v120_xp</PlatformToolset>
5153
</PropertyGroup>
5254
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
5355
<ConfigurationType>Application</ConfigurationType>
5456
<CharacterSet>Unicode</CharacterSet>
5557
<WholeProgramOptimization>false</WholeProgramOptimization>
58+
<PlatformToolset>v120</PlatformToolset>
5659
</PropertyGroup>
5760
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-PCRE|x64'" Label="Configuration">
5861
<ConfigurationType>Application</ConfigurationType>
5962
<CharacterSet>Unicode</CharacterSet>
6063
<WholeProgramOptimization>false</WholeProgramOptimization>
64+
<PlatformToolset>v120</PlatformToolset>
6165
</PropertyGroup>
6266
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
6367
<ConfigurationType>Application</ConfigurationType>
6468
<CharacterSet>Unicode</CharacterSet>
6569
<WholeProgramOptimization>false</WholeProgramOptimization>
70+
<PlatformToolset>v120_xp</PlatformToolset>
6671
</PropertyGroup>
6772
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-PCRE|Win32'" Label="Configuration">
6873
<ConfigurationType>Application</ConfigurationType>
6974
<CharacterSet>Unicode</CharacterSet>
7075
<WholeProgramOptimization>false</WholeProgramOptimization>
76+
<PlatformToolset>v120_xp</PlatformToolset>
7177
</PropertyGroup>
7278
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
7379
<ConfigurationType>Application</ConfigurationType>
7480
<CharacterSet>Unicode</CharacterSet>
7581
<WholeProgramOptimization>false</WholeProgramOptimization>
82+
<PlatformToolset>v120</PlatformToolset>
7683
</PropertyGroup>
7784
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-PCRE|x64'" Label="Configuration">
7885
<ConfigurationType>Application</ConfigurationType>
7986
<CharacterSet>Unicode</CharacterSet>
8087
<WholeProgramOptimization>false</WholeProgramOptimization>
88+
<PlatformToolset>v120</PlatformToolset>
8189
</PropertyGroup>
8290
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
8391
<ImportGroup Label="ExtensionSettings" />

‎cppcheck.sln‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

22
Microsoft Visual Studio Solution File, Format Version 11.00
3-
# Visual Studio 2010
3+
# Visual Studio Express 2013 for Windows Desktop
44
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cli", "cli\cli.vcxproj", "{35CBDF51-2456-3EC3-99ED-113C30858883}"
55
ProjectSection(ProjectDependencies) = postProject
66
{C183DB5B-AD6C-423D-80CA-1F9549555A1A} = {C183DB5B-AD6C-423D-80CA-1F9549555A1A}

‎lib/cppcheck.vcxproj‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,41 +134,49 @@
134134
<ConfigurationType>DynamicLibrary</ConfigurationType>
135135
<CharacterSet>Unicode</CharacterSet>
136136
<WholeProgramOptimization>false</WholeProgramOptimization>
137+
<PlatformToolset>v120_xp</PlatformToolset>
137138
</PropertyGroup>
138139
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-PCRE|Win32'" Label="Configuration">
139140
<ConfigurationType>DynamicLibrary</ConfigurationType>
140141
<CharacterSet>Unicode</CharacterSet>
141142
<WholeProgramOptimization>false</WholeProgramOptimization>
143+
<PlatformToolset>v120_xp</PlatformToolset>
142144
</PropertyGroup>
143145
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
144146
<ConfigurationType>DynamicLibrary</ConfigurationType>
145147
<CharacterSet>Unicode</CharacterSet>
146148
<WholeProgramOptimization>false</WholeProgramOptimization>
149+
<PlatformToolset>v120</PlatformToolset>
147150
</PropertyGroup>
148151
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-PCRE|x64'" Label="Configuration">
149152
<ConfigurationType>DynamicLibrary</ConfigurationType>
150153
<CharacterSet>Unicode</CharacterSet>
151154
<WholeProgramOptimization>false</WholeProgramOptimization>
155+
<PlatformToolset>v120</PlatformToolset>
152156
</PropertyGroup>
153157
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
154158
<ConfigurationType>DynamicLibrary</ConfigurationType>
155159
<CharacterSet>Unicode</CharacterSet>
156160
<WholeProgramOptimization>false</WholeProgramOptimization>
161+
<PlatformToolset>v120_xp</PlatformToolset>
157162
</PropertyGroup>
158163
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-PCRE|Win32'" Label="Configuration">
159164
<ConfigurationType>DynamicLibrary</ConfigurationType>
160165
<CharacterSet>Unicode</CharacterSet>
161166
<WholeProgramOptimization>false</WholeProgramOptimization>
167+
<PlatformToolset>v120_xp</PlatformToolset>
162168
</PropertyGroup>
163169
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
164170
<ConfigurationType>DynamicLibrary</ConfigurationType>
165171
<CharacterSet>Unicode</CharacterSet>
166172
<WholeProgramOptimization>false</WholeProgramOptimization>
173+
<PlatformToolset>v120</PlatformToolset>
167174
</PropertyGroup>
168175
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-PCRE|x64'" Label="Configuration">
169176
<ConfigurationType>DynamicLibrary</ConfigurationType>
170177
<CharacterSet>Unicode</CharacterSet>
171178
<WholeProgramOptimization>false</WholeProgramOptimization>
179+
<PlatformToolset>v120</PlatformToolset>
172180
</PropertyGroup>
173181
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
174182
<ImportGroup Label="ExtensionSettings" />

‎test/testrunner.vcxproj‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,21 +100,25 @@
100100
<ConfigurationType>Application</ConfigurationType>
101101
<CharacterSet>Unicode</CharacterSet>
102102
<WholeProgramOptimization>false</WholeProgramOptimization>
103+
<PlatformToolset>v120_xp</PlatformToolset>
103104
</PropertyGroup>
104105
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
105106
<ConfigurationType>Application</ConfigurationType>
106107
<CharacterSet>Unicode</CharacterSet>
107108
<WholeProgramOptimization>false</WholeProgramOptimization>
109+
<PlatformToolset>v120</PlatformToolset>
108110
</PropertyGroup>
109111
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
110112
<ConfigurationType>Application</ConfigurationType>
111113
<CharacterSet>Unicode</CharacterSet>
112114
<WholeProgramOptimization>false</WholeProgramOptimization>
115+
<PlatformToolset>v120_xp</PlatformToolset>
113116
</PropertyGroup>
114117
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
115118
<ConfigurationType>Application</ConfigurationType>
116119
<CharacterSet>Unicode</CharacterSet>
117120
<WholeProgramOptimization>false</WholeProgramOptimization>
121+
<PlatformToolset>v120</PlatformToolset>
118122
</PropertyGroup>
119123
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
120124
<ImportGroup Label="ExtensionSettings" />

‎win_installer/config.wxi‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,12 @@
1010
<?define CfgsDir = "..\cfg" ?>
1111
<?define HelpDir = "..\gui\help" ?>
1212
<?define QtDllDir = "..\bin" ?>
13-
<?define CrtMergeModule = "$(env.CommonProgramFiles)\Merge Modules\Microsoft_VC100_CRT_x86.msm" ?>
13+
14+
<?if $(var.Platform) = x64 ?>
15+
<?define CrtMergeModule = "$(env.CommonProgramFiles)\Merge Modules\Microsoft_VC120_CRT_x64.msm" ?>
16+
<?define PlatformProgramFilesFolder = "ProgramFiles64Folder" ?>
17+
<?else?>
18+
<?define CrtMergeModule = "$(env.CommonProgramFiles)\Merge Modules\Microsoft_VC120_CRT_x86.msm" ?>
19+
<?define PlatformProgramFilesFolder = "ProgramFilesFolder" ?>
20+
<?endif?>
1421
</Include>

‎win_installer/cppcheck.wxs‎

Lines changed: 19 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@
88

99
<Package Id='*' Keywords='Installer' Description="$(var.ProductName) Setup"
1010
Comments='$(var.ProductDescription)' Manufacturer='$(var.ProductManufacturer)'
11-
InstallerVersion='300' Languages='1033' Compressed='yes' SummaryCodepage='1252' InstallScope='perMachine'/>
11+
InstallerVersion='450' Languages='1033' Compressed='yes' SummaryCodepage='1252' InstallScope='perMachine'/>
1212

1313
<Media Id='1' Cabinet='Cppcheck.cab' EmbedCab='yes' CompressionLevel='high' DiskPrompt='CD-ROM 1' />
1414
<Property Id='DiskPrompt' Value='Cppcheck installation [1]' />
1515

1616
<Directory Id='TARGETDIR' Name='SourceDir'>
17-
<Directory Id='SystemFolder' FileSource='SystemFolder' />
18-
<Directory Id='ProgramFilesFolder' Name='PFiles'>
17+
<Directory Id='System32' FileSource='SystemFolder' />
18+
<Directory Id='$(var.PlatformProgramFilesFolder)' Name='PFiles'>
1919
<Directory Id='INSTALLDIR' Name='$(var.ProductNameShort)'>
2020
<Component Id='cppcheckcore.dll' Guid='$(var.cppcheckcoreGUID)'>
2121
<File Id='cppcheckcore.dll' Name='cppcheck-core.dll' DiskId='1' Source='$(var.CliBuildDir)\cppcheck-core.dll' KeyPath='yes' />
@@ -34,9 +34,15 @@
3434
<Shortcut Id='startmenuGui' Directory="ProgramMenuDir" Name='$(var.ProductNameShort)'
3535
WorkingDirectory='INSTALLDIR' Icon="cppcheckgui.exe" IconIndex="0" Advertise="yes" />
3636
</File>
37-
<File Id='qtcore4dll' Name='qtcore4.dll' Source='$(var.QtDllDir)\qtcore4.dll' />
38-
<File Id='qtgui4dll' Name='qtgui4.dll' Source='$(var.QtDllDir)\qtgui4.dll' />
37+
<File Id='Qt5Coredll' Name='Qt5Core.dll' Source='$(var.QtDllDir)\Qt5Core.dll' />
38+
<File Id='Qt5Guidll' Name='Qt5Gui.dll' Source='$(var.QtDllDir)\Qt5Gui.dll' />
39+
<File Id='Qt5Widgetsdll' Name='Qt5Widgets.dll' Source='$(var.QtDllDir)\Qt5Widgets.dll' />
3940
</Component>
41+
<Directory Id='QtPlatformsFolder' Name='platforms'>
42+
<Component Id='QtPlatforms' DiskId='1' Guid='$(var.qtplatformsGUID)'>
43+
<File Id='qwindowsdll' Name='qwindows.dll' Source='$(var.QtDllDir)\platforms\qwindows.dll' />
44+
</Component>
45+
</Directory>
4046
<Directory Id='TranslationsFolder' Name='lang'>
4147
<Component Id='GuiTranslations' Guid='$(var.guiTranslationsGUID)'>
4248
<File Id='cppcheck_de.qm' Name='cppcheck_de.qm' Source='$(var.TranslationsDir)\cppcheck_de.qm' />
@@ -94,6 +100,8 @@
94100
<RemoveFile Id="qtnetwork4dll" On="install" Name="qtnetwork4.dll" />
95101
<RemoveFile Id="qtsql4dll" On="install" Name="qtsql4.dll" />
96102
<RemoveFile Id='qtxml4dll' On='install' Name='qtxml4.dll' />
103+
<RemoveFile Id='qtcore4dll' On='install' Name='qtcore4.dll' />
104+
<RemoveFile Id='qtgui4dll' On='install' Name='qtgui4.dll' />
97105
</Component>
98106
</Directory>
99107
<Merge Id="CRT" Language="0" SourceFile="$(var.CrtMergeModule)" DiskId="1" />
@@ -124,6 +132,7 @@
124132
<Feature Id='GUI' Title='Graphical interface' AllowAdvertise='no' Description='Cppcheck with a graphical user interface' Level='1'>
125133
<ComponentRef Id='RegistryEntries' />
126134
<ComponentRef Id='GuiExecutable' />
135+
<ComponentRef Id='QtPlatforms' />
127136
<Feature Id='Translations' Title='GUI Translations' AllowAdvertise='no' Description='Translations for graphical user interface' Level='1'>
128137
<ComponentRef Id='GuiTranslations' />
129138
</Feature>
@@ -146,11 +155,11 @@
146155
<Custom Action='UninstallOld155' After='InstallFinalize'>NOT Installed</Custom>
147156
<Custom Action='UninstallOld156' After='InstallFinalize'>NOT Installed</Custom>
148157
</InstallExecuteSequence>
149-
<CustomAction Id='UninstallOld152' Directory='SystemFolder' ExeCommand="msiexec.exe /X {836AF028-6EE2-457C-B242-19D61701BAA3} /qn" Execute="immediate" Return="asyncNoWait"/>
150-
<CustomAction Id='UninstallOld153' Directory='SystemFolder' ExeCommand="msiexec.exe /X {42850B7E-CD5F-449A-B6DA-C423156D2ACF} /qn" Execute="immediate" Return="asyncNoWait"/>
151-
<CustomAction Id='UninstallOld154' Directory='SystemFolder' ExeCommand="msiexec.exe /X {7722557B-4B10-4E8F-918A-78FBAEFB09B1} /qn" Execute="immediate" Return="asyncNoWait"/>
152-
<CustomAction Id='UninstallOld155' Directory='SystemFolder' ExeCommand="msiexec.exe /X {211B2B89-3FE0-4F49-88CC-27E283BEC010} /qn" Execute="immediate" Return="asyncNoWait"/>
153-
<CustomAction Id='UninstallOld156' Directory='SystemFolder' ExeCommand="msiexec.exe /X {1CC8C271-A877-4DF0-B1DE-C1B7D83521BC} /qn" Execute="immediate" Return="asyncNoWait"/>
158+
<CustomAction Id='UninstallOld152' Directory='System32' ExeCommand="msiexec.exe /X {836AF028-6EE2-457C-B242-19D61701BAA3} /qn" Execute="immediate" Return="asyncNoWait"/>
159+
<CustomAction Id='UninstallOld153' Directory='System32' ExeCommand="msiexec.exe /X {42850B7E-CD5F-449A-B6DA-C423156D2ACF} /qn" Execute="immediate" Return="asyncNoWait"/>
160+
<CustomAction Id='UninstallOld154' Directory='System32' ExeCommand="msiexec.exe /X {7722557B-4B10-4E8F-918A-78FBAEFB09B1} /qn" Execute="immediate" Return="asyncNoWait"/>
161+
<CustomAction Id='UninstallOld155' Directory='System32' ExeCommand="msiexec.exe /X {211B2B89-3FE0-4F49-88CC-27E283BEC010} /qn" Execute="immediate" Return="asyncNoWait"/>
162+
<CustomAction Id='UninstallOld156' Directory='System32' ExeCommand="msiexec.exe /X {1CC8C271-A877-4DF0-B1DE-C1B7D83521BC} /qn" Execute="immediate" Return="asyncNoWait"/>
154163

155164
<Property Id="WIXUI_INSTALLDIR" Value="INSTALLDIR" />
156165
<UIRef Id="WixUI_FeatureTree"/>

‎win_installer/productInfo.wxi‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
<?define cppcheckGUID = "1c31dd76-07fa-4420-b9b5-5463742d6a48" ?>
1212
<?define cppcheckcoreGUID = "1c31dd76-07fa-4420-b9b5-5463742d6a49" ?>
1313
<?define guiGUID = "D7D3FF8E-1D82-4215-B59B-4715A748C540" ?>
14+
<?define qtplatformsGUID = "E2C326DF-11F1-4C05-A955-2E2D2A3B0515" ?>
1415
<?define guiTranslationsGUID = "24738151-890D-4fcc-824C-DA7FF63E0D7F" ?>
1516
<?define mandatoryCfgsGUID = "EE95621C-25E7-491A-8DE9-EA6E6967C176" ?>
1617
<?define optionalCfgsGUID = "3A8AE067-5F41-4D29-A35C-CC0FAB648608" ?>

0 commit comments

Comments
 (0)