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

Updated windows intaller: 

- Use VS2015 merge modules
- Added addons as optional feature
- Added gnu.cfg
This commit is contained in:
PKEuS 2015-09-04 13:18:18 +02:00
parent 5428813534
commit 2ba3e6d443
3 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
win_installer/config.wxi
View File

@ -4,14 +4,15 @@
<?define GuiBuildDir = "..\bin" ?>
<?define TranslationsDir = "..\gui" ?>
<?define CfgsDir = "..\cfg" ?>
<?define AddonsDir = "..\addons" ?>
<?define HelpDir = "..\gui\help" ?>
<?define QtDllDir = "..\bin" ?>
<?if $(var.Platform) = x64 ?>
<?define CrtMergeModule = "$(env.CommonProgramFiles)\Merge Modules\Microsoft_VC120_CRT_x64.msm" ?>
<?define CrtMergeModule = "$(env.CommonProgramFiles)\Merge Modules\Microsoft_VC140_CRT_x64.msm" ?>
<?define PlatformProgramFilesFolder = "ProgramFiles64Folder" ?>
<?else?>
<?define CrtMergeModule = "$(env.CommonProgramFiles)\Merge Modules\Microsoft_VC120_CRT_x86.msm" ?>
<?define CrtMergeModule = "$(env.CommonProgramFiles)\Merge Modules\Microsoft_VC140_CRT_x86.msm" ?>
<?define PlatformProgramFilesFolder = "ProgramFilesFolder" ?>
<?endif?>
</Include>

21
win_installer/cppcheck.wxs
View File

@ -65,13 +65,22 @@
<File Id='std.cfg' Name='std.cfg' Source='$(var.CfgsDir)\std.cfg' />
</Component>
<Component Id='OptionalCfgs' Guid='$(var.optionalCfgsGUID)'>
<File Id='avr.cfg' Name='avr.cfg' Source='$(var.CfgsDir)\avr.cfg' />
<File Id='gnu.cfg' Name='gnu.cfg' Source='$(var.CfgsDir)\gnu.cfg' />
<File Id='gtk.cfg' Name='gtk.cfg' Source='$(var.CfgsDir)\gtk.cfg' />
<File Id='microsoft_sal.cfg' Name='microsoft_sal.cfg' Source='$(var.CfgsDir)\microsoft_sal.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='windows.cfg' Name='windows.cfg' Source='$(var.CfgsDir)\windows.cfg' />
<File Id='microsoft_sal.cfg' Name='microsoft_sal.cfg' Source='$(var.CfgsDir)\microsoft_sal.cfg' />
<File Id='avr.cfg' Name='avr.cfg' Source='$(var.CfgsDir)\avr.cfg' />
</Component>
</Directory>
<Directory Id='AddonsFolder' Name='addons'>
<Component Id='Addons' Guid='$(var.addonsGUID)'>
<File Id='cppcheckdata.py' Name='cppcheckdata.py' Source='$(var.AddonsDir)\cppcheckdata.py' />
<File Id='cert.py' Name='cert.py' Source='$(var.AddonsDir)\cert.py' />
<File Id='naming.py' Name='naming.py' Source='$(var.AddonsDir)\naming.py' />
<File Id='threadsafety.py' Name='threadsafety.py' Source='$(var.AddonsDir)\threadsafety.py' />
</Component>
</Directory>
<Component Id='BaseDocs' Guid='$(var.basedocsGUID)'>
@ -107,8 +116,8 @@
<RemoveFile Id='qtgui4dll' On='install' Name='qtgui4.dll' />
</Component>
</Directory>
<Merge Id="CRT" Language="0" SourceFile="$(var.CrtMergeModule)" DiskId="1" />
</Directory>
<Merge Id="CRT" Language="0" SourceFile="$(var.CrtMergeModule)" DiskId="1" />
<Directory Id='ProgramMenuFolder' Name='Programs' >
<Directory Id='ProgramMenuDir' Name='$(var.ProductName)'>
@ -120,6 +129,7 @@
</Directory>
</Directory>
<Property Id="INSTALLLEVEL" Value="1" />
<Feature Id='Complete' Title='$(var.ProductName)' Description='The complete package.'
Display='expand' Level='1' AllowAdvertise='no' ConfigurableDirectory='INSTALLDIR' >
<Feature Id='CppcheckCore' Display='hidden' AllowAdvertise='no' Title='Cppcheck-Core' Description='Cppcheck core components' Level='1'>
@ -144,7 +154,10 @@
<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">
<Feature Id='PythonAddons' Title='Python addons' AllowAdvertise='no' Description='Contains several addons requiring python' Level='2'>
<ComponentRef Id='Addons' />
</Feature>
<Feature Id="CRT" AllowAdvertise="no" Display="hidden" Level="1" Title="Microsoft Visual C++ 2015 Runtime Components">
<MergeRef Id="CRT"/>
</Feature>
</Feature>

1
win_installer/productInfo.wxi
View File

@ -10,6 +10,7 @@
<?define ProductUpgradeCode = "7E94124C-1CD1-433F-9423-4614E52300DD" ?>
<?define cppcheckGUID = "1c31dd76-07fa-4420-b9b5-5463742d6a48" ?>
<?define cppcheckcoreGUID = "1c31dd76-07fa-4420-b9b5-5463742d6a49" ?>
<?define addonsGUID = "25DACF7E-4D29-890D-433F-6922A391C312" ?>
<?define guiGUID = "D7D3FF8E-1D82-4215-B59B-4715A748C540" ?>
<?define qtplatformsGUID = "E2C326DF-11F1-4C05-A955-2E2D2A3B0515" ?>
<?define guiTranslationsGUID = "24738151-890D-4fcc-824C-DA7FF63E0D7F" ?>