Преглед изворни кода

ci: windows: Copy the styles directory when packaging

Qt can make use of qwindowsvistastyle.dll if present, and our MinGW
container has the library, but it was not being copied during the
packaging process. Thus, yuzu looked like a Windows 98 application when
using the PR-verify artifacts.

This copies over the DLL during packaging, for that sweet-sweet Windows
Vista style.

In addition, set the Qt plugins path instead of the plugins/platforms
path. This way we can use the directory directly, rather than appending
a `..` everytime we need something just outside of it.
lat9nq пре 5 година
родитељ
комит
ad8aab915b
1 измењених фајлова са 6 додато и 5 уклоњено
  1. 6 5
      .ci/scripts/windows/docker.sh

+ 6 - 5
.ci/scripts/windows/docker.sh

@@ -18,19 +18,20 @@ cd ..
 mkdir package
 mkdir package
 
 
 if [ -d "/usr/x86_64-w64-mingw32/lib/qt5/plugins/platforms/" ]; then
 if [ -d "/usr/x86_64-w64-mingw32/lib/qt5/plugins/platforms/" ]; then
-  QT_PLATFORM_DLL_PATH='/usr/x86_64-w64-mingw32/lib/qt5/plugins/platforms/'
+  QT_PLUGINS_PATH='/usr/x86_64-w64-mingw32/lib/qt5/plugins'
 else
 else
   #fallback to qt
   #fallback to qt
-  QT_PLATFORM_DLL_PATH='/usr/x86_64-w64-mingw32/lib/qt/plugins/platforms/'
+  QT_PLUGINS_PATH='/usr/x86_64-w64-mingw32/lib/qt/plugins'
 fi
 fi
 
 
 find build/ -name "yuzu*.exe" -exec cp {} 'package' \;
 find build/ -name "yuzu*.exe" -exec cp {} 'package' \;
 
 
 # copy Qt plugins
 # copy Qt plugins
 mkdir package/platforms
 mkdir package/platforms
-cp "${QT_PLATFORM_DLL_PATH}/qwindows.dll" package/platforms/
-cp -rv "${QT_PLATFORM_DLL_PATH}/../mediaservice/" package/
-cp -rv "${QT_PLATFORM_DLL_PATH}/../imageformats/" package/
+cp -v "${QT_PLUGINS_PATH}/platforms/qwindows.dll" package/platforms/
+cp -rv "${QT_PLUGINS_PATH}/mediaservice/" package/
+cp -rv "${QT_PLUGINS_PATH}/imageformats/" package/
+cp -rv "${QT_PLUGINS_PATH}/styles/" package/
 rm -f package/mediaservice/*d.dll
 rm -f package/mediaservice/*d.dll
 
 
 for i in package/*.exe; do
 for i in package/*.exe; do