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

Windows release: tweaks

This commit is contained in:
Daniel Marjamäki 2020-05-30 23:19:27 +02:00
parent 5cbed0464c
commit 04073a896b
4 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.github/workflows/release-windows.yml vendored
View File

@ -60,7 +60,7 @@ jobs:
- name: Build x64 release GUI - name: Build x64 release GUI
run: | run: |
call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat" call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
cd gui cd gui
qmake HAVE_QCHART=yes qmake HAVE_QCHART=yes
nmake release nmake release
@ -78,10 +78,11 @@ jobs:
- name: Build Installer - name: Build Installer
run: | run: |
call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
mkdir bin mkdir bin
xcopy /S Build\gui bin xcopy /S Build\gui bin
cd win_installer cd win_installer
msbuild -m cppcheck.wixproj /p:Platform=x64,ProductVersion=0.123 msbuild -m cppcheck.wixproj /p:Platform=x64,ProductVersion=2.0.${{ github.run_number }}
- uses: actions/upload-artifact@v2 - uses: actions/upload-artifact@v2
with: with:

5
win_installer/config.wxi
View File

@ -7,12 +7,13 @@
<?define PtfsDir = "..\platforms" ?> <?define PtfsDir = "..\platforms" ?>
<?define AddonsDir = "..\addons" ?> <?define AddonsDir = "..\addons" ?>
<?define QtDllDir = "..\bin" ?> <?define QtDllDir = "..\bin" ?>
<?define Z3DllDir = "..\externals\z3\bin" ?>
<?if $(var.Platform) = x64 ?> <?if $(var.Platform) = x64 ?>
<?define CrtMergeModule = "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Redist\MSVC\14.25.28508\MergeModules\Microsoft_VC142_CRT_x64.msm" ?> <?define CrtMergeModule = "$(env.VCToolsRedistDir)\MergeModules\Microsoft_VC142_CRT_x64.msm" ?>
<?define PlatformProgramFilesFolder = "ProgramFiles64Folder" ?> <?define PlatformProgramFilesFolder = "ProgramFiles64Folder" ?>
<?else?> <?else?>
<?define CrtMergeModule = "$(env.CommonProgramFiles)\Merge Modules\Microsoft_VC142_CRT_x86.msm" ?> <?define CrtMergeModule = "$(env.VCToolsRedistDir)\MergeModules\Microsoft_VC142_CRT_x86.msm" ?>
<?define PlatformProgramFilesFolder = "ProgramFilesFolder" ?> <?define PlatformProgramFilesFolder = "ProgramFilesFolder" ?>
<?endif?> <?endif?>
</Include> </Include>

4
win_installer/cppcheck.wxs
View File

@ -20,6 +20,9 @@
<Component Id='cppcheckcore.dll' Guid='$(var.cppcheckcoreGUID)'> <Component Id='cppcheckcore.dll' Guid='$(var.cppcheckcoreGUID)'>
<File Id='cppcheckcore.dll' Name='cppcheck-core.dll' DiskId='1' Source='$(var.CliBuildDir)\cppcheck-core.dll' KeyPath='yes' /> <File Id='cppcheckcore.dll' Name='cppcheck-core.dll' DiskId='1' Source='$(var.CliBuildDir)\cppcheck-core.dll' KeyPath='yes' />
</Component> </Component>
<Component Id='libz3.dll' Guid='$(var.libz3GUID)'>
<File Id='libz3.dll' Name='libz3.dll' DiskId='1' Source='$(var.Z3DllDir)\libz3.dll' KeyPath='yes' />
</Component>
<Component Id='cppcheck.exe' Guid='$(var.cppcheckGUID)'> <Component Id='cppcheck.exe' Guid='$(var.cppcheckGUID)'>
<File Id='cppcheck.exe' Name='cppcheck.exe' DiskId='1' Source='$(var.CliBuildDir)\cppcheck.exe' KeyPath='yes' /> <File Id='cppcheck.exe' Name='cppcheck.exe' DiskId='1' Source='$(var.CliBuildDir)\cppcheck.exe' KeyPath='yes' />
</Component> </Component>
@ -142,6 +145,7 @@
Display='expand' Level='1' AllowAdvertise='no' ConfigurableDirectory='INSTALLDIR' > Display='expand' Level='1' AllowAdvertise='no' ConfigurableDirectory='INSTALLDIR' >
<Feature Id='CppcheckCore' Display='hidden' AllowAdvertise='no' Title='Cppcheck-Core' Description='Cppcheck core components' Level='1'> <Feature Id='CppcheckCore' Display='hidden' AllowAdvertise='no' Title='Cppcheck-Core' Description='Cppcheck core components' Level='1'>
<ComponentRef Id='cppcheckcore.dll' /> <ComponentRef Id='cppcheckcore.dll' />
<ComponentRef Id='libz3.dll' />
<ComponentRef Id='RegistryEntries' /> <ComponentRef Id='RegistryEntries' />
<ComponentRef Id='BaseDocs' /> <ComponentRef Id='BaseDocs' />
<ComponentRef Id='MandatoryCfgs' /> <ComponentRef Id='MandatoryCfgs' />

1
win_installer/productInfo.wxi
View File

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