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

Windows Installer: Always install std.cfg (#5318)

This commit is contained in:
PKEuS 2014-03-23 11:15:53 +01:00
parent 5f2067e401
commit b26d9c148d
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
win_installer/cppcheck.wxs
View File

@ -24,7 +24,7 @@
<File Id='cppcheck.exe' Name='cppcheck.exe' DiskId='1' Source='$(var.CliBuildDir)\cppcheck.exe' KeyPath='yes' />
</Component>
<Component Id='RegistryEntries' Guid='$(var.registrykeysGUID)'>
<RegistryKey Root="HKCU" Key="SOFTWARE\$(var.ProductNameShort)" Action="createAndRemoveOnUninstall">
<RegistryKey Root="HKCU" Key="SOFTWARE\$(var.ProductNameShort)" ForceDeleteOnUninstall="yes">
<RegistryValue Name="InstallationPath" Value="[INSTALLDIR]" Type="string" KeyPath="yes" />
<RegistryValue Name="Version" Value="$(var.ProductVersion)" Type="string" />
</RegistryKey>
@ -54,12 +54,14 @@
</Component>
</Directory>
<Directory Id='CfgsFolder' Name='cfg'>
<Component Id='Cfgs' Guid='$(var.cfgsGUID)'>
<Component Id='MandatoryCfgs' Guid='$(var.mandatoryCfgsGUID)'>
<File Id='std.cfg' Name='std.cfg' Source='$(var.CfgsDir)\std.cfg' />
</Component>
<Component Id='OptionalCfgs' Guid='$(var.optionalCfgsGUID)'>
<File Id='gtk.cfg' Name='gtk.cfg' Source='$(var.CfgsDir)\gtk.cfg' />
<File Id='posix.cfg' Name='posix.cfg' Source='$(var.CfgsDir)\posix.cfg' />
<File Id='qt.cfg' Name='qt.cfg' Source='$(var.CfgsDir)\qt.cfg' />
<File Id='sdl.cfg' Name='sdl.cfg' Source='$(var.CfgsDir)\sdl.cfg' />
<File Id='std.cfg' Name='std.cfg' Source='$(var.CfgsDir)\std.cfg' />
<File Id='windows.cfg' Name='windows.cfg' Source='$(var.CfgsDir)\windows.cfg' />
</Component>
</Directory>
@ -114,6 +116,7 @@
<ComponentRef Id='RegistryEntries' />
<ComponentRef Id='BaseDocs' />
<ComponentRef Id='InnoSetupCleanup' />
<ComponentRef Id='MandatoryCfgs' />
</Feature>
<Feature Id='CLI' Title='Command line interface' AllowAdvertise='no' Description='Cppcheck as a command line tool' Level='1'>
<ComponentRef Id='cppcheck.exe' />
@ -126,8 +129,8 @@
</Feature>
<ComponentRef Id='ProgramMenuDir' />
</Feature>
<Feature Id='ConfigFiles' Title='Default configurations' AllowAdvertise='no' Description='Provide default configuration files, for example for standard library or GTK' Level='1'>
<ComponentRef Id='Cfgs' />
<Feature Id='ConfigFiles' Title='Additional configurations' AllowAdvertise='no' Description='Provide additional configuration files, for example for WinAPI, GTK and SDL' Level='1'>
<ComponentRef Id='OptionalCfgs' />
</Feature>
<Feature Id="CRT" AllowAdvertise="no" Display="hidden" Level="1" Title="Microsoft Visual C++ 2010 Runtime Components">
<MergeRef Id="CRT"/>

5
win_installer/productInfo.wxi
View File

@ -12,7 +12,8 @@
<?define cppcheckcoreGUID = "1c31dd76-07fa-4420-b9b5-5463742d6a49" ?>
<?define guiGUID = "D7D3FF8E-1D82-4215-B59B-4715A748C540" ?>
<?define guiTranslationsGUID = "24738151-890D-4fcc-824C-DA7FF63E0D7F" ?>
<?define cfgsGUID = "3A8AE067-5F41-4D29-A35C-CC0FAB648608" ?>
<?define mandatoryCfgsGUID = "EE95621C-25E7-491A-8DE9-EA6E6967C176" ?>
<?define optionalCfgsGUID = "3A8AE067-5F41-4D29-A35C-CC0FAB648608" ?>
<?define basedocsGUID = "9F62B23C-CD2B-4826-A567-6AB6F75A2AEA" ?>
<?define registrykeysGUID = "8CB515B1-6EF6-4A2A-97A0-F8A13E3A505E" ?>
</Include>
</Include>