Skip to content

Commit a0759a5

Browse files
committed
s [skip ci]
1 parent b6a19bc commit a0759a5

File tree

2 files changed

+22
-7
lines changed

2 files changed

+22
-7
lines changed

.github/workflows/release-windows.yml

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,11 +77,12 @@ jobs:
7777
7878
- name: Build x64 release GUI
7979
run: |
80-
; TODO: enable rules?
81-
; specify Release build so matchcompiler is used
80+
:: TODO: enable rules?
81+
:: specify Release build so matchcompiler is used
8282
cmake -S . -B build -DCMAKE_BUILD_TYPE=Release -DBUILD_GUI=On -DWITH_QCHART=On -DBUILD_ONLINE_HELP=On || exit /b !errorlevel!
8383
cmake --build build --target cppcheck-gui --config Release || exit /b !errorlevel!
8484
85+
# TODO: package PDBs
8586
- name: Deploy app
8687
run: |
8788
windeployqt build\bin\Release || exit /b !errorlevel!
@@ -95,13 +96,22 @@ jobs:
9596
- name: Build CLI x64 release configuration using MSBuild
9697
run: msbuild -m cppcheck.sln -t:cli -p:Configuration=Release-PCRE -p:Platform=x64 || exit /b !errorlevel!
9798

98-
- name: Compile misra.py executable
99+
- name: Install missing Python packages
99100
run: |
100101
pip install -U pyinstaller || exit /b !errorlevel!
102+
103+
- name: Compile misra.py executable
104+
run: |
101105
cd addons || exit /b !errorlevel!
102106
pyinstaller --hidden-import xml --hidden-import xml.etree --hidden-import xml.etree.ElementTree misra.py || exit /b !errorlevel!
103107
del *.spec || exit /b !errorlevel!
104108
109+
- name: Compile cppcheck-htmlreport executable
110+
run: |
111+
cd htmlreport || exit /b !errorlevel!
112+
pyinstaller cppcheck-htmlreport || exit /b !errorlevel!
113+
del *.spec || exit /b !errorlevel!
114+
105115
- name: Collect files
106116
run: |
107117
move build\bin\Release win_installer\files || exit /b !errorlevel!
@@ -119,6 +129,7 @@ jobs:
119129
xcopy /s gui\help win_installer\files\help || exit /b !errorlevel!
120130
del win_installer\files\translations\*.qm || exit /b !errorlevel!
121131
move gui\*.qm win_installer\files\translations || exit /b !errorlevel!
132+
copy htmlreport\dist\cppcheck-htmlreport\*.* win_installer\files || exit /b !errorlevel!
122133
:: copy libcrypto-3-x64.dll and libssl-3-x64.dll
123134
copy %RUNNER_WORKSPACE%\Qt\Tools\OpenSSLv3\Win_x64\bin\lib*.dll win_installer\files || exit /b !errorlevel!
124135

lib/cppcheck.vcxproj

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -323,7 +323,8 @@
323323
<LargeAddressAware>true</LargeAddressAware>
324324
</Link>
325325
<PostBuildEvent>
326-
<Command>xcopy "$(SolutionDir)addons" "$(OutDir)addons" /E /I /D /Y
326+
<Command>xcopy "$(SolutionDir)addons/*.py" "$(OutDir)addons" /E /I /D /Y
327+
xcopy "$(SolutionDir)addons/*.json" "$(OutDir)addons" /E /I /D /Y
327328
xcopy "$(SolutionDir)cfg" "$(OutDir)cfg" /E /I /D /Y
328329
xcopy "$(SolutionDir)platforms" "$(OutDir)platforms" /E /I /D /Y</Command>
329330
</PostBuildEvent>
@@ -355,7 +356,8 @@ xcopy "$(SolutionDir)platforms" "$(OutDir)platforms" /E /I /D /Y</Command>
355356
<LargeAddressAware>true</LargeAddressAware>
356357
</Link>
357358
<PostBuildEvent>
358-
<Command>xcopy "$(SolutionDir)addons" "$(OutDir)addons" /E /I /D /Y
359+
<Command>xcopy "$(SolutionDir)addons/*.py" "$(OutDir)addons" /E /I /D /Y
360+
xcopy "$(SolutionDir)addons/*.json" "$(OutDir)addons" /E /I /D /Y
359361
xcopy "$(SolutionDir)cfg" "$(OutDir)cfg" /E /I /D /Y
360362
xcopy "$(SolutionDir)platforms" "$(OutDir)platforms" /E /I /D /Y</Command>
361363
</PostBuildEvent>
@@ -395,7 +397,8 @@ xcopy "$(SolutionDir)platforms" "$(OutDir)platforms" /E /I /D /Y</Command>
395397
<LargeAddressAware>true</LargeAddressAware>
396398
</Link>
397399
<PostBuildEvent>
398-
<Command>xcopy "$(SolutionDir)addons" "$(OutDir)addons" /E /I /D /Y
400+
<Command>xcopy "$(SolutionDir)addons/*.py" "$(OutDir)addons" /E /I /D /Y
401+
xcopy "$(SolutionDir)addons/*.json" "$(OutDir)addons" /E /I /D /Y
399402
xcopy "$(SolutionDir)cfg" "$(OutDir)cfg" /E /I /D /Y
400403
xcopy "$(SolutionDir)platforms" "$(OutDir)platforms" /E /I /D /Y</Command>
401404
</PostBuildEvent>
@@ -436,7 +439,8 @@ xcopy "$(SolutionDir)platforms" "$(OutDir)platforms" /E /I /D /Y</Command>
436439
<LargeAddressAware>true</LargeAddressAware>
437440
</Link>
438441
<PostBuildEvent>
439-
<Command>xcopy "$(SolutionDir)addons" "$(OutDir)addons" /E /I /D /Y
442+
<Command>xcopy "$(SolutionDir)addons/*.py" "$(OutDir)addons" /E /I /D /Y
443+
xcopy "$(SolutionDir)addons/*.json" "$(OutDir)addons" /E /I /D /Y
440444
xcopy "$(SolutionDir)cfg" "$(OutDir)cfg" /E /I /D /Y
441445
xcopy "$(SolutionDir)platforms" "$(OutDir)platforms" /E /I /D /Y</Command>
442446
</PostBuildEvent>

0 commit comments

Comments
 (0)