Windows: run windeployqt also for the helper binary

And manually install liblzma.dll as windeployqt doesn't seem to pick it
FedoraQt · Dec 7, 2023 · 710988a · 710988a
1 parent 753f591
commit 710988a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/.github/workflows/pr-check.yml b/.github/workflows/pr-check.yml
@@ -3,7 +3,7 @@ name: pr-check
 on: [pull_request]
 
 env:
- QT_VERSION: '6.5.3'
+ QT_VERSION: '6.6.0'
 
 jobs:
  Linux:
@@ -142,7 +142,7 @@ jobs:
  eval "$(./dist/win/make-vs2019-env.bat)"
  git clone https://git.tukaani.org/xz.git
  cd xz
- git checkout v5.2
+ git checkout v5.4.5
  sed -i 's/#include "config.h"//' src/common/common_w32res.rc
  sed -i 's/PACKAGE_NAME/"liblzma"/' src/common/common_w32res.rc
  sed -i 's/PACKAGE_URL/"https:\/\/tukaani.org\/xz\/"/' src/common/common_w32res.rc
@@ -169,7 +169,8 @@ jobs:
  cd build/app/release
  mv ../../src/app/helper.exe .
  mv ../../src/app/mediawriter.exe .
- $Qt6_DIR/bin/windeployqt.exe mediawriter.exe --verbose 2 --qmldir ../../.. --compiler-runtime --release
+ cp $Qt6_DIR/bin/liblzma.dll .
+ $Qt6_DIR/bin/windeployqt.exe mediawriter.exe helper.exe liblzma.dll --verbose 2 --qmldir ../../.. --compiler-runtime --release
  find . -type d -not -path '*/\.*' | sed 's/^\.\///g' | sed 's@\/@\\@g' | grep -v "^.$" > uninstall.log
  find . -type f -not -path '*/\.*' | sed 's/^\.\///g' | sed 's@\/@\\@g' | sort >> uninstall.log
 

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -112,7 +112,7 @@ jobs:
  eval "$(./dist/win/make-vs2019-env.bat)"
  git clone https://git.tukaani.org/xz.git
  cd xz
- git checkout v5.2
+ git checkout v5.4.5
  sed -i 's/#include "config.h"//' src/common/common_w32res.rc
  sed -i 's/PACKAGE_NAME/"liblzma"/' src/common/common_w32res.rc
  sed -i 's/PACKAGE_URL/"https:\/\/tukaani.org\/xz\/"/' src/common/common_w32res.rc
@@ -139,7 +139,8 @@ jobs:
  cd build/app/release
  mv ../../src/app/helper.exe .
  mv ../../src/app/mediawriter.exe .
- $Qt6_DIR/bin/windeployqt.exe mediawriter.exe --verbose 2 --qmldir ../../.. --compiler-runtime --release
+ $Qt6_DIR/bin/windeployqt.exe mediawriter.exe helper.exe liblzma.dll --verbose 2 --qmldir ../../.. --compiler-runtime --release
+ cp $Qt6_DIR/bin/liblzma.dll .
  find . -type d -not -path '*/\.*' | sed 's/^\.\///g' | sed 's@\/@\\@g' | grep -v "^.$" > uninstall.log
  find . -type f -not -path '*/\.*' | sed 's/^\.\///g' | sed 's@\/@\\@g' | sort >> uninstall.log