Skip to content

Commit 703665f

Browse files
committed
CI: add qtermwidget in android.yml
1 parent 5d18268 commit 703665f

2 files changed

Lines changed: 41 additions & 6 deletions

File tree

.github/workflows/android.yml

Lines changed: 37 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,7 @@ jobs:
265265
if: false
266266
working-directory: ${{env.SOURCE_DIR}}
267267
env:
268-
QT_ROOT: ${{env.Qt5_Dir}}
268+
QT_ROOT: ${{env.Qt6_DIR}}
269269
run: |
270270
if [ ! -d ${{env.INSTALL_DIR}}/lib/cmake/qxmpp ]; then
271271
git clone -b v1.10.3 https://invent.kde.org/libraries/qxmpp.git
@@ -279,6 +279,7 @@ jobs:
279279
-DCMAKE_VERBOSE_MAKEFILE=ON \
280280
-DCMAKE_AUTOGEN_VERBOSE=ON \
281281
-DQT_HOST_PATH=${Qt6_DIR}/../gcc_64 \
282+
-DQt6LinguistTools_DIR=${Qt6_DIR}/../gcc_64/lib/cmake/Qt6LinguistTools \
282283
-DQT_CHAINLOAD_TOOLCHAIN_FILE=${{env.VCPKG_ROOT}}/scripts/buildsystems/vcpkg.cmake \
283284
-DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=${ANDROID_NDK_HOME}/build/cmake/android.toolchain.cmake \
284285
-DVCPKG_VERBOSE=ON \
@@ -292,6 +293,39 @@ jobs:
292293
cmake --install . --config ${{matrix.BUILD_TYPE}} --strip
293294
fi
294295
296+
- name: build lxqt-build-tools
297+
working-directory: ${{env.SOURCE_DIR}}
298+
run: |
299+
if [ ! -d ${{env.INSTALL_DIR}}/share/cmake/lxqt2-build-tools ]; then
300+
git clone -b 2.2.0 --depth=1 "https://github.com/lxqt/lxqt-build-tools.git"
301+
cd lxqt-build-tools
302+
cmake -E make_directory build
303+
cd build
304+
${Qt6_DIR}/bin/qt-cmake .. -DCMAKE_BUILD_TYPE=${{matrix.BUILD_TYPE}} \
305+
-DCMAKE_INSTALL_PREFIX=${{env.INSTALL_DIR}} \
306+
-DQt6LinguistTools_DIR=${Qt6_DIR}/../gcc_64/lib/cmake/Qt6LinguistTools \
307+
-DQT_HOST_PATH=${Qt6_DIR}/../gcc_64
308+
cmake --build . --config ${{matrix.BUILD_TYPE}}
309+
cmake --build . --config ${{matrix.BUILD_TYPE}} --target install
310+
fi
311+
312+
- name: build qtermwidget
313+
working-directory: ${{env.SOURCE_DIR}}
314+
run: |
315+
if [ ! -d ${{env.INSTALL_DIR}}/lib/cmake/qtermwidget6 ]; then
316+
git clone --depth=1 "https://github.com/KangLin/qtermwidget.git"
317+
cd qtermwidget
318+
cmake -E make_directory build
319+
cd build
320+
${Qt6_DIR}/bin/qt-cmake .. -DCMAKE_BUILD_TYPE=${{matrix.BUILD_TYPE}} \
321+
-DCMAKE_INSTALL_PREFIX=${{env.INSTALL_DIR}} \
322+
-Dlxqt2-build-tools_DIR=${{env.INSTALL_DIR}}/share/cmake/lxqt2-build-tools \
323+
-DQt6LinguistTools_DIR=${Qt6_DIR}/../gcc_64/lib/cmake/Qt6LinguistTools \
324+
-DQT_HOST_PATH=${Qt6_DIR}/../gcc_64
325+
cmake --build . --config ${{matrix.BUILD_TYPE}}
326+
cmake --build . --config ${{matrix.BUILD_TYPE}} --target install
327+
fi
328+
295329
- name: git clone RabbitCommon
296330
working-directory: ${{env.SOURCE_DIR}}
297331
run: git clone https://github.com/KangLin/RabbitCommon.git
@@ -332,7 +366,8 @@ jobs:
332366
-DRabbitVNC_DIR=${{env.INSTALL_DIR}}/lib/cmake/RabbitVNC \
333367
-Dtigervnc_DIR=${{env.INSTALL_DIR}}/lib/cmake/tigervnc \
334368
-DQXmpp_DIR=${{env.INSTALL_DIR}}/lib/cmake/qxmpp \
335-
-DBUILD_FREERDP=ON
369+
-DBUILD_FREERDP=ON \
370+
-Dqtermwidget6_DIR=${{env.INSTALL_DIR}}/lib/cmake/qtermwidget6
336371
cmake --build . --parallel $(nproc) --verbose --config ${{matrix.BUILD_TYPE}} --target all
337372
APK_FILE=`find . -name "android-*.apk"`
338373
cp $APK_FILE RabbitRemoteControl_${{env.RabbitRemoteControl_VERSION}}_${{matrix.qt_arch}}_qt${{matrix.qt_version}}_${{matrix.BUILD_TYPE}}.apk

.github/workflows/msvc.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -336,8 +336,8 @@ jobs:
336336
cd build
337337
cmake .. -DCMAKE_BUILD_TYPE=${{matrix.BUILD_TYPE}} ^
338338
-DCMAKE_INSTALL_PREFIX=${{env.INSTALL_DIR}}
339-
cmake --build . --config Release
340-
cmake --build . --config Release --target install
339+
cmake --build . --config ${{matrix.BUILD_TYPE}}
340+
cmake --build . --config ${{matrix.BUILD_TYPE}} --target install
341341
)
342342
343343
- name: qtermwidget6
@@ -352,8 +352,8 @@ jobs:
352352
cmake .. -DCMAKE_BUILD_TYPE=${{matrix.BUILD_TYPE}} ^
353353
-DCMAKE_INSTALL_PREFIX=${{env.INSTALL_DIR}} ^
354354
-Dlxqt2-build-tools_DIR=${{env.INSTALL_DIR}}\share\cmake\lxqt2-build-tools
355-
cmake --build . --config Release
356-
cmake --build . --config Release --target install
355+
cmake --build . --config ${{matrix.BUILD_TYPE}}
356+
cmake --build . --config ${{matrix.BUILD_TYPE}} --target install
357357
)
358358
359359
- name: RabbitCommon

0 commit comments

Comments
 (0)