From 3abdec1b914fa70667c61b042539f93efc19a672 Mon Sep 17 00:00:00 2001 From: Jonas Kvinge Date: Thu, 30 Sep 2021 23:08:16 +0200 Subject: [PATCH] Add qopensslbackend.dll to nsi and CI --- .github/workflows/ccpp.yml | 35 +++++++++++++++++++--------------- dist/windows/strawberry.nsi.in | 28 ++++++++++++++++++--------- 2 files changed, 39 insertions(+), 24 deletions(-) diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml index f99ee3220..71350394f 100644 --- a/.github/workflows/ccpp.yml +++ b/.github/workflows/ccpp.yml @@ -1185,21 +1185,21 @@ jobs: working-directory: build run: cp /usr/src/strawberry-mxe/usr/x86_64-w64-mingw32.shared/lib/gio/modules/libgiognutls.dll ${GITHUB_WORKSPACE}/build/gio-modules/ - - name: Copy Qt platforms plugins + - name: Copy Qt platform plugins working-directory: build run: cp /usr/src/strawberry-mxe/usr/x86_64-w64-mingw32.shared/qt5/plugins/platforms/qwindows.dll ${GITHUB_WORKSPACE}/build/platforms/ - - name: Copy Qt styles plugins + - name: Copy Qt styles working-directory: build run: cp /usr/src/strawberry-mxe/usr/x86_64-w64-mingw32.shared/qt5/plugins/styles/qwindowsvistastyle.dll ${GITHUB_WORKSPACE}/build/styles/ - - name: Copy Qt SQL drivers plugins + - name: Copy Qt SQL drivers working-directory: build run: cp /usr/src/strawberry-mxe/usr/x86_64-w64-mingw32.shared/qt5/plugins/sqldrivers/qsqlite.dll ${GITHUB_WORKSPACE}/build/sqldrivers/ - - name: Copy Qt imageformats plugins + - name: Copy Qt imageformats working-directory: build - run: cp /usr/src/strawberry-mxe/usr/x86_64-w64-mingw32.shared/qt5/plugins/imageformats/*.dll ${GITHUB_WORKSPACE}/build/imageformats/ + run: cp /usr/src/strawberry-mxe/usr/x86_64-w64-mingw32.shared/qt5/plugins/imageformats/{qgif.dll,qico.dll,qjpeg.dll} ${GITHUB_WORKSPACE}/build/imageformats/ - name: Copy gstreamer plugins working-directory: build @@ -1328,27 +1328,31 @@ jobs: - name: Create directories working-directory: build - run: mkdir -p gio-modules platforms sqldrivers imageformats styles gstreamer-plugins nsisplugins + run: mkdir -p gio-modules platforms sqldrivers tls imageformats styles gstreamer-plugins nsisplugins - name: Copy GIO modules working-directory: build run: cp /usr/src/strawberry-mxe/usr/x86_64-w64-mingw32.shared/lib/gio/modules/libgiognutls.dll ${GITHUB_WORKSPACE}/build/gio-modules/ - - name: Copy Qt platforms plugins + - name: Copy Qt platform plugins working-directory: build - run: cp /usr/src/strawberry-mxe/usr/x86_64-w64-mingw32.shared/qt5/plugins/platforms/qwindows.dll ${GITHUB_WORKSPACE}/build/platforms/ + run: cp /usr/src/strawberry-mxe/usr/x86_64-w64-mingw32.shared/qt6/plugins/platforms/qwindows.dll ${GITHUB_WORKSPACE}/build/platforms/ - - name: Copy Qt styles plugins + - name: Copy Qt styles working-directory: build - run: cp /usr/src/strawberry-mxe/usr/x86_64-w64-mingw32.shared/qt5/plugins/styles/qwindowsvistastyle.dll ${GITHUB_WORKSPACE}/build/styles/ + run: cp /usr/src/strawberry-mxe/usr/x86_64-w64-mingw32.shared/qt6/plugins/styles/qwindowsvistastyle.dll ${GITHUB_WORKSPACE}/build/styles/ - - name: Copy Qt SQL drivers plugins + - name: Copy Qt TLS plugins working-directory: build - run: cp /usr/src/strawberry-mxe/usr/x86_64-w64-mingw32.shared/qt5/plugins/sqldrivers/qsqlite.dll ${GITHUB_WORKSPACE}/build/sqldrivers/ + run: cp /usr/src/strawberry-mxe/usr/x86_64-w64-mingw32.shared/qt6/plugins/tls/qopensslbackend.dll ${GITHUB_WORKSPACE}/build/tls/ - - name: Copy Qt imageformats plugins + - name: Copy Qt SQL drivers working-directory: build - run: cp /usr/src/strawberry-mxe/usr/x86_64-w64-mingw32.shared/qt5/plugins/imageformats/*.dll ${GITHUB_WORKSPACE}/build/imageformats/ + run: cp /usr/src/strawberry-mxe/usr/x86_64-w64-mingw32.shared/qt6/plugins/sqldrivers/qsqlite.dll ${GITHUB_WORKSPACE}/build/sqldrivers/ + + - name: Copy Qt imageformats + working-directory: build + run: cp /usr/src/strawberry-mxe/usr/x86_64-w64-mingw32.shared/qt6/plugins/imageformats/{qgif.dll,qico.dll,qjpeg.dll} ${GITHUB_WORKSPACE}/build/imageformats/ - name: Copy gstreamer plugins working-directory: build @@ -1415,8 +1419,9 @@ jobs: -F . -F ./platforms -F ./styles - -F ./sqldrivers -F ./imageformats + -F ./tls + -F ./sqldrivers -F ./gstreamer-plugins -R /usr/src/strawberry-mxe/usr/x86_64-w64-mingw32.shared diff --git a/dist/windows/strawberry.nsi.in b/dist/windows/strawberry.nsi.in index b1fa26648..b7f414b2c 100644 --- a/dist/windows/strawberry.nsi.in +++ b/dist/windows/strawberry.nsi.in @@ -340,26 +340,33 @@ Section "GIO modules" gio-modules File "/oname=libgiognutls.dll" "gio-modules\libgiognutls.dll" SectionEnd -Section "Qt Platforms" platforms +Section "Qt Platform plugins" platforms SetOutPath "$INSTDIR\platforms" File "/oname=qwindows.dll" "platforms\qwindows.dll" SectionEnd -Section "Qt SQL Drivers" sqldrivers - SetOutPath "$INSTDIR\sqldrivers" - File "/oname=qsqlite.dll" "sqldrivers\qsqlite.dll" +Section "Qt styles" styles + SetOutPath "$INSTDIR\styles" + File "/oname=qwindowsvistastyle.dll" "styles\qwindowsvistastyle.dll" SectionEnd -Section "Qt image format plugins" imageformats +Section "Qt imageformats" imageformats SetOutPath "$INSTDIR\imageformats" File "/oname=qgif.dll" "imageformats\qgif.dll" File "/oname=qico.dll" "imageformats\qico.dll" File "/oname=qjpeg.dll" "imageformats\qjpeg.dll" SectionEnd -Section "Qt style plugins" styles - SetOutPath "$INSTDIR\styles" - File "/oname=qwindowsvistastyle.dll" "styles\qwindowsvistastyle.dll" +!ifdef with_qt6 +Section "Qt TLS plugins" tls + SetOutPath "$INSTDIR\tls" + File "/oname=qopensslbackend.dll" "tls\qopensslbackend.dll" +SectionEnd +!endif + +Section "Qt SQL Drivers" sqldrivers + SetOutPath "$INSTDIR\sqldrivers" + File "/oname=qsqlite.dll" "sqldrivers\qsqlite.dll" SectionEnd Section "Gstreamer plugins" gstreamer-plugins @@ -564,8 +571,11 @@ Section "Uninstall" Delete "$INSTDIR\gio-modules\libgiognutls.dll" Delete "$INSTDIR\platforms\qwindows.dll" - Delete "$INSTDIR\sqldrivers\qsqlite.dll" Delete "$INSTDIR\styles\qwindowsvistastyle.dll" +!ifdef with_qt6 + Delete "$INSTDIR\tls\qopensslbackend.dll" +!endif + Delete "$INSTDIR\sqldrivers\qsqlite.dll" Delete "$INSTDIR\imageformats\qgif.dll" Delete "$INSTDIR\imageformats\qico.dll"