From 63cdfa2d852b1968c597cc1e5756245ccbf584a8 Mon Sep 17 00:00:00 2001
From: sledgehammer999 <hammered999@gmail.com>
Date: Sun, 29 May 2022 01:08:51 +0300
Subject: [PATCH] Update CIs to correctly regenerate translations files

---
 .appveyor.yml                     | 10 ++++++++--
 .github/workflows/ci_macos.yaml   |  4 ++--
 .github/workflows/ci_ubuntu.yaml  |  4 ++--
 .github/workflows/ci_windows.yaml |  2 +-
 4 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index fb3471120..cdb7ec973 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -51,8 +51,14 @@ before_build:
 
 build_script:
   - cd "%REPO_DIR%"
-  # scan only as lupdate is prone to hang
-  - lupdate -extensions c,cpp,h,hpp,ui .
+  # lupdate chokes when it parses headers from system inludes, especially Boost
+  # it also chokes with the sources from src/app/qtlocalpeer (formerly qtsingleapplication)
+  # Workaround: temporarily rename them to run lupdate with the .pro file
+  - RENAME conf.pri conf.pri.temp
+  - RENAME src\app\qtlocalpeer qtlocalpeer.temp
+  - lupdate qbittorrent.pro
+  - RENAME conf.pri.temp conf.pri
+  - RENAME src\app\qtlocalpeer.temp qtlocalpeer
   - qmake qbittorrent.pro && cd src && qmake src.pro
   - jom -j2 -f Makefile.Release
 
diff --git a/.github/workflows/ci_macos.yaml b/.github/workflows/ci_macos.yaml
index 458ce6d08..6a3fafa73 100644
--- a/.github/workflows/ci_macos.yaml
+++ b/.github/workflows/ci_macos.yaml
@@ -80,7 +80,6 @@ jobs:
       - name: Build qBittorrent (Qt5)
         if: ${{ startsWith(matrix.qt_version, 5) }}
         run: |
-          lupdate -extensions c,cpp,h,hpp,ui ./
           cmake \
             -B build \
             -G "Ninja" \
@@ -90,12 +89,12 @@ jobs:
             -DOPENSSL_ROOT_DIR="${{ env.openssl_root }}" \
             -DVERBOSE_CONFIGURE=ON \
             -D${{ matrix.qbt_gui }}
+          cmake --build build --target qbt_update_translations
           cmake --build build
 
       - name: Build qBittorrent (Qt6)
         if: ${{ startsWith(matrix.qt_version, 6) }}
         run: |
-          lupdate -extensions c,cpp,h,hpp,ui ./
           cmake \
             -B build \
             -G "Ninja" \
@@ -106,6 +105,7 @@ jobs:
             -DQT6=ON \
             -DVERBOSE_CONFIGURE=ON \
             -D${{ matrix.qbt_gui }}
+          cmake --build build --target qbt_update_translations
           cmake --build build
 
       - name: Prepare build artifacts
diff --git a/.github/workflows/ci_ubuntu.yaml b/.github/workflows/ci_ubuntu.yaml
index a7832c83b..790ad2e95 100644
--- a/.github/workflows/ci_ubuntu.yaml
+++ b/.github/workflows/ci_ubuntu.yaml
@@ -64,7 +64,6 @@ jobs:
       - name: Build qBittorrent (Qt5)
         if: ${{ startsWith(matrix.qt_version, 5) }}
         run: |
-          lupdate -extensions c,cpp,h,hpp,ui ./
           cmake \
             -B build \
             -G "Ninja" \
@@ -73,13 +72,13 @@ jobs:
             -DCMAKE_INSTALL_PREFIX="/usr" \
             -DVERBOSE_CONFIGURE=ON \
             -D${{ matrix.qbt_gui }}
+          cmake --build build --target qbt_update_translations
           cmake --build build
           DESTDIR="qbittorrent" cmake --install build
 
       - name: Build qBittorrent (Qt6)
         if: ${{ startsWith(matrix.qt_version, 6) }}
         run: |
-          lupdate -extensions c,cpp,h,hpp,ui ./
           cmake \
             -B build \
             -G "Ninja" \
@@ -89,6 +88,7 @@ jobs:
             -DQT6=ON \
             -DVERBOSE_CONFIGURE=ON \
             -D${{ matrix.qbt_gui }}
+          cmake --build build --target qbt_update_translations
           cmake --build build
           DESTDIR="qbittorrent" cmake --install build
 
diff --git a/.github/workflows/ci_windows.yaml b/.github/workflows/ci_windows.yaml
index 501f626d5..a9d7c34f0 100644
--- a/.github/workflows/ci_windows.yaml
+++ b/.github/workflows/ci_windows.yaml
@@ -105,7 +105,6 @@ jobs:
 
       - name: Build qBittorrent
         run: |
-          lupdate -extensions c,cpp,h,hpp,ui .
           cmake `
             -B build `
             -G "Ninja" `
@@ -119,6 +118,7 @@ jobs:
             -DVCPKG_TARGET_TRIPLET=x64-windows-static-release `
             -DVERBOSE_CONFIGURE=ON `
             --graphviz=build/target_graph.dot
+          cmake --build build --target qbt_update_translations
           cmake --build build
 
       - name: Prepare build artifacts