From 69d72dbd000e9d67f15bf39aadf5d639489b39d9 Mon Sep 17 00:00:00 2001 From: Matt Young Date: Thu, 10 Oct 2024 22:24:27 +0200 Subject: [PATCH] Build fixes 17 --- .github/workflows/windows.yml | 7 +------ scripts/buildTool.py | 5 ++++- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 14dda8e6..9e5fc864 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -154,17 +154,12 @@ jobs: Expand-Archive -Path C:/_/build/nsis/Nsislog.zip -DestinationPath C:/_/build/nsis/Nsislog Tree /f C:/_/build - # Somehow, running the configure script sets up CMake to use Ninja rather than Makefiles, which is then in - # conflict with our other assumptions about CMake. Error message says remove CMakeCache.txt before running CMake, - # so we do that as a short-term fix (on the assumption that, longer term, we'll be moving to Meson). + # The configure script does default set-up for CMake that is enough for us here - name: CMake Config shell: msys2 {0} run: | cd /C/_ ./configure -# cd build -# rm CMakeCache.txt -# cmake .. -DCMAKE_RC_COMPILER:FILEPATH=windres.exe -G "MinGW Makefiles" - name: Build (with Meson) shell: msys2 {0} diff --git a/scripts/buildTool.py b/scripts/buildTool.py index 9e9b4f48..27169038 100755 --- a/scripts/buildTool.py +++ b/scripts/buildTool.py @@ -1923,11 +1923,14 @@ def doPackage(): # folder tree "containing the Qt-related dependencies (libraries, QML imports, plugins, and translations) # required to run the application from that folder". # + # In the MSYS2 packaging of Qt6 at least, per https://packages.msys2.org/packages/mingw-w64-x86_64-qt6-base, + # windeployqt is renamed to windeployqt6. + # log.debug('Running windeployqt') previousWorkingDirectory = pathlib.Path.cwd().as_posix() os.chdir(dir_packages_win_bin) btUtils.abortOnRunFail( - subprocess.run(['windeployqt', + subprocess.run(['windeployqt6', '--verbose', '2', # 2 is the maximum projectName + '.exe'], capture_output=False)