Skip to content

Commit 784b526

Browse files
firewavefirewave
authored
installer: added missing library configurations and removed unneeded Qt DLLs / refs #10771 - added initial portable package (#4669)
1 parent 0f70f19 commit 784b526

File tree

3 files changed

+35
-9
lines changed

3 files changed

+35
-9
lines changed

‎.github/workflows/release-windows.yml‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,3 +143,27 @@ jobs:
143143
with:
144144
name: deploy
145145
path: win_installer\files
146+
147+
- name: Clean up deploy
148+
run: |
149+
del win_installer\files\addons\*.dll || exit /b !errorlevel!
150+
del win_installer\files\addons\*.pyd || exit /b !errorlevel!
151+
del win_installer\files\addons\base_library.zip || exit /b !errorlevel!
152+
rmdir /s /q win_installer\files\bearer || exit /b !errorlevel!
153+
rmdir /s /q win_installer\files\help || exit /b !errorlevel!
154+
rmdir /s /q win_installer\files\iconengines || exit /b !errorlevel!
155+
rmdir /s /q win_installer\files\imageformats || exit /b !errorlevel!
156+
rmdir /s /q win_installer\files\printsupport || exit /b !errorlevel!
157+
rmdir /s /q win_installer\files\sqldrivers || exit /b !errorlevel!
158+
ren win_installer\files\translations lang || exit /b !errorlevel!
159+
del win_installer\files\d3dcompiler_47.dll || exit /b !errorlevel!
160+
del win_installer\files\libEGL.dll || exit /b !errorlevel!
161+
del win_installer\files\libGLESv2.dll || exit /b !errorlevel!
162+
del win_installer\files\opengl32sw.dll || exit /b !errorlevel!
163+
del win_installer\files\Qt5Svg.dll || exit /b !errorlevel!
164+
del win_installer\files\vc_redist.x64.exe || exit /b !errorlevel!
165+
166+
- uses: actions/upload-artifact@v3
167+
with:
168+
name: portable
169+
path: win_installer\files

‎win_installer/cppcheck.wxs‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -59,13 +59,6 @@
5959
<File Id='qwindowsvistastyledll' Name='qwindowsvistastyle.dll' Source='$(var.QtDllDir)\styles\qwindowsvistastyle.dll' />
6060
</Component>
6161
</Directory>
62-
<Directory Id='QtSqlDriversFolder' Name='sqldrivers'>
63-
<Component Id='QtSqlDrivers' DiskId='1' Guid='$(var.qtsqldriversGUID)'>
64-
<File Id='qsqlitedll' Name='qsqlite.dll' Source='$(var.QtDllDir)\sqldrivers\qsqlite.dll' />
65-
<File Id='qsqlodbcdll' Name='qsqlodbc.dll' Source='$(var.QtDllDir)\sqldrivers\qsqlodbc.dll' />
66-
<File Id='qsqlpsqldll' Name='qsqlpsql.dll' Source='$(var.QtDllDir)\sqldrivers\qsqlpsql.dll' />
67-
</Component>
68-
</Directory>
6962
<Directory Id='TranslationsFolder' Name='lang'>
7063
<Component Id='GuiTranslations' Guid='$(var.guiTranslationsGUID)'>
7164
<File Id='cppcheck_de.qm' Name='cppcheck_de.qm' Source='$(var.TranslationsDir)\cppcheck_de.qm' />
@@ -94,12 +87,16 @@
9487
<File Id='boost.cfg' Name='boost.cfg' Source='$(var.CfgsDir)\boost.cfg' />
9588
<File Id='bsd.cfg' Name='bsd.cfg' Source='$(var.CfgsDir)\bsd.cfg' />
9689
<File Id='cairo.cfg' Name='cairo.cfg' Source='$(var.CfgsDir)\cairo.cfg' />
90+
<File Id='cppcheck_lib.cfg' Name='cppcheck-lib.cfg' Source='$(var.CfgsDir)\cppcheck-lib.cfg' />
9791
<File Id='cppunit.cfg' Name='cppunit.cfg' Source='$(var.CfgsDir)\cppunit.cfg' />
9892
<File Id='dpdk.cfg' Name='dpdk.cfg' Source='$(var.CfgsDir)\dpdk.cfg' />
9993
<File Id='embedded_sql.cfg' Name='embedded_sql.cfg' Source='$(var.CfgsDir)\embedded_sql.cfg' />
94+
<File Id='emscripten.cfg' Name='emscripten.cfg' Source='$(var.CfgsDir)\emscripten.cfg' />
95+
<File Id='ginac.cfg' Name='ginac.cfg' Source='$(var.CfgsDir)\ginac.cfg' />
10096
<File Id='gnu.cfg' Name='gnu.cfg' Source='$(var.CfgsDir)\gnu.cfg' />
10197
<File Id='googletest.cfg' Name='googletest.cfg' Source='$(var.CfgsDir)\googletest.cfg' />
10298
<File Id='gtk.cfg' Name='gtk.cfg' Source='$(var.CfgsDir)\gtk.cfg' />
99+
<File Id='icu.cfg' Name='icu.cfg' Source='$(var.CfgsDir)\icu.cfg' />
103100
<File Id='kde.cfg' Name='kde.cfg' Source='$(var.CfgsDir)\kde.cfg' />
104101
<File Id='libcerror.cfg' Name='libcerror.cfg' Source='$(var.CfgsDir)\libcerror.cfg' />
105102
<File Id='libcurl.cfg' Name='libcurl.cfg' Source='$(var.CfgsDir)\libcurl.cfg' />
@@ -111,10 +108,12 @@
111108
<File Id='microsoft_unittest.cfg' Name='microsoft_unittest.cfg' Source='$(var.CfgsDir)\microsoft_unittest.cfg' />
112109
<File Id='motif.cfg' Name='motif.cfg' Source='$(var.CfgsDir)\motif.cfg' />
113110
<File Id='nspr.cfg' Name='nspr.cfg' Source='$(var.CfgsDir)\nspr.cfg' />
111+
<File Id='ntl.cfg' Name='ntl.cfg' Source='$(var.CfgsDir)\ntl.cfg' />
114112
<File Id='opencv2.cfg' Name='opencv2.cfg' Source='$(var.CfgsDir)\opencv2.cfg' />
115113
<File Id='opengl.cfg' Name='opengl.cfg' Source='$(var.CfgsDir)\opengl.cfg' />
116114
<File Id='openmp.cfg' Name='openmp.cfg' Source='$(var.CfgsDir)\openmp.cfg' />
117115
<File Id='openssl.cfg' Name='openssl.cfg' Source='$(var.CfgsDir)\openssl.cfg' />
116+
<File Id='pcre.cfg' Name='pcre.cfg' Source='$(var.CfgsDir)\pcre.cfg' />
118117
<File Id='posix.cfg' Name='posix.cfg' Source='$(var.CfgsDir)\posix.cfg' />
119118
<File Id='python.cfg' Name='python.cfg' Source='$(var.CfgsDir)\python.cfg' />
120119
<File Id='qt.cfg' Name='qt.cfg' Source='$(var.CfgsDir)\qt.cfg' />
@@ -125,6 +124,8 @@
125124
<File Id='tinyxml2.cfg' Name='tinyxml2.cfg' Source='$(var.CfgsDir)\tinyxml2.cfg' />
126125
<File Id='vcl.cfg' Name='vcl.cfg' Source='$(var.CfgsDir)\vcl.cfg' />
127126
<File Id='wxwidgets.cfg' Name='wxwidgets.cfg' Source='$(var.CfgsDir)\wxwidgets.cfg' />
127+
<File Id='wxsqlite3.cfg' Name='wxsqlite3.cfg' Source='$(var.CfgsDir)\wxsqlite3.cfg' />
128+
<File Id='wxsvg.cfg' Name='wxsvg.cfg' Source='$(var.CfgsDir)\wxsvg.cfg' />
128129
<File Id='zlib.cfg' Name='zlib.cfg' Source='$(var.CfgsDir)\zlib.cfg' />
129130
</Component>
130131
</Directory>
@@ -149,14 +150,17 @@
149150
</Directory>
150151
<Directory Id='AddonsFolder' Name='addons'>
151152
<Component Id='Addons' Guid='$(var.addonsGUID)'>
153+
<File Id='cppcheck.py' Name='cppcheck.py' Source='$(var.AddonsDir)\cppcheck.py' />
152154
<File Id='cppcheckdata.py' Name='cppcheckdata.py' Source='$(var.AddonsDir)\cppcheckdata.py' />
153155
<File Id='findcasts.py' Name='findcasts.py' Source='$(var.AddonsDir)\findcasts.py' />
154156
<File Id='misc.py' Name='misc.py' Source='$(var.AddonsDir)\misc.py' />
155157
<File Id='misra.py' Name='misra.py' Source='$(var.AddonsDir)\misra.py' />
156158
<File Id='misra_9.py' Name='misra_9.py' Source='$(var.AddonsDir)\misra_9.py' />
159+
<File Id='naming.json' Name='naming.json' Source='$(var.AddonsDir)\naming.json' />
157160
<File Id='naming.py' Name='naming.py' Source='$(var.AddonsDir)\naming.py' />
158161
<File Id='namingng.py' Name='namingng.py' Source='$(var.AddonsDir)\namingng.py' />
159162
<File Id='ROS_naming.json' Name='ROS_naming.json' Source='$(var.AddonsDir)\ROS_naming.json' />
163+
<File Id='runaddon.py' Name='runaddon.py' Source='$(var.AddonsDir)\runaddon.py' />
160164
<File Id='threadsafety.py' Name='threadsafety.py' Source='$(var.AddonsDir)\threadsafety.py' />
161165
<File Id='y2038.py' Name='y2038.py' Source='$(var.AddonsDir)\y2038.py' />
162166
</Component>
@@ -200,7 +204,6 @@
200204
<ComponentRef Id='GuiExecutable' />
201205
<ComponentRef Id='QtPlatforms' />
202206
<ComponentRef Id='QtStyles' />
203-
<ComponentRef Id='QtSqlDrivers' />
204207
<Feature Id='Translations' Title='GUI Translations' AllowAdvertise='no' Description='Translations for graphical user interface' Level='1'>
205208
<ComponentRef Id='GuiTranslations' />
206209
</Feature>

‎win_installer/productInfo.wxi‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
<?define guiGUID = "D7D3FF8E-1D82-4215-B59B-4715A748C540" ?>
1515
<?define qtplatformsGUID = "E2C326DF-11F1-4C05-A955-2E2D2A3B0515" ?>
1616
<?define qtstylesGUID = "A9CC70D0-52BA-4A8E-9EAF-FABF8DDEB200" ?>
17-
<?define qtsqldriversGUID = "619FF989-BA0B-48D7-BE49-CE48C6E899E8" ?>
1817
<?define guiTranslationsGUID = "24738151-890D-4fcc-824C-DA7FF63E0D7F" ?>
1918
<?define mandatoryCfgsGUID = "EE95621C-25E7-491A-8DE9-EA6E6967C176" ?>
2019
<?define optionalCfgsGUID = "3A8AE067-5F41-4D29-A35C-CC0FAB648608" ?>

0 commit comments

Comments
 (0)