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

win_installer: update building. all files needed are collected in a single folder. the 'deploy' artifact will contain all the files.

This commit is contained in:
Daniel Marjamäki 2021-10-16 13:59:39 +02:00
parent 9c16f13651
commit 27d7609d89
2 changed files with 28 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -81,11 +81,27 @@ jobs:
- name: Build CLI x64 release configuration using MSBuild - name: Build CLI x64 release configuration using MSBuild
run: msbuild -m cppcheck.sln /t:cli /p:Configuration=Release-PCRE /p:Platform=x64 run: msbuild -m cppcheck.sln /t:cli /p:Configuration=Release-PCRE /p:Platform=x64
- name: Collect files
run: |
move Build\gui win_installer\files
mkdir win_installer\files\addons
copy addons\*.* win_installer\files\addons
mkdir win_installer\files\cfg
copy cfg\*.cfg win_installer\files\cfg
mkdir win_installer\files\platforms
copy platforms\*.xml win_installer\files\platforms
copy bin\cppcheck.exe win_installer\files
copy bin\cppcheck-core.dll win_installer\files
copy externals\z3\bin\libz3.dll win_installer\files
mkdir win_installer\files\help
xcopy /s gui\help win_installer\files\help
del win_installer\files\translations\*.qm
move gui\*.qm win_installer\files\translations
- name: Build Installer - name: Build Installer
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"
mkdir bin
xcopy /S Build\gui bin
cd win_installer cd win_installer
REM Read ProductVersion REM Read ProductVersion
for /f "tokens=4 delims= " %%a in ('find "ProductVersion" productInfo.wxi') do set PRODUCTVER=%%a for /f "tokens=4 delims= " %%a in ('find "ProductVersion" productInfo.wxi') do set PRODUCTVER=%%a
@ -102,4 +118,4 @@ jobs:
- uses: actions/upload-artifact@v2 - uses: actions/upload-artifact@v2
with: with:
name: deploy name: deploy
path: Build\gui path: win_installer\files

18
win_installer/config.wxi
View File

@ -1,14 +1,14 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Include> <Include>
<?define CliBuildDir = "..\bin" ?> <?define CliBuildDir = "files" ?>
<?define GuiBuildDir = "..\bin" ?> <?define GuiBuildDir = "files" ?>
<?define GuiHelpDir = "..\gui\help" ?> <?define GuiHelpDir = "files\help" ?>
<?define TranslationsDir = "..\gui" ?> <?define TranslationsDir = "files\translations" ?>
<?define CfgsDir = "..\cfg" ?> <?define CfgsDir = "files\cfg" ?>
<?define PtfsDir = "..\platforms" ?> <?define PtfsDir = "files\platforms" ?>
<?define AddonsDir = "..\addons" ?> <?define AddonsDir = "files\addons" ?>
<?define QtDllDir = "..\bin" ?> <?define QtDllDir = "files" ?>
<?define Z3DllDir = "..\externals\z3\bin" ?> <?define Z3DllDir = "files" ?>
<?if $(var.Platform) = x64 ?> <?if $(var.Platform) = x64 ?>
<?define CrtMergeModule = "$(env.VCToolsRedistDir)\MergeModules\Microsoft_VC142_CRT_x64.msm" ?> <?define CrtMergeModule = "$(env.VCToolsRedistDir)\MergeModules\Microsoft_VC142_CRT_x64.msm" ?>