Skip to content

Commit e8ecb1d

Browse files
KangLinKangLin
committed
CI: modify android.yml
1 parent 026609d commit e8ecb1d

2 files changed

Lines changed: 75 additions & 24 deletions

File tree

‎.github/workflows/android.yml‎

Lines changed: 72 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,62 @@ jobs:
143143
run: |
144144
sudo chmod 777 ${QT_ROOT_DIR}/bin/qt-cmake
145145
146+
- name: libpcap
147+
working-directory: ${{env.SOURCE_DIR}}
148+
run: |
149+
if [ ! -f ${{env.INSTALL_DIR}}/lib/libpcap.a ]; then
150+
wget https://www.tcpdump.org/release/libpcap-1.10.6.tar.xz
151+
tar xvf libpcap-1.10.6.tar.xz
152+
cd libpcap-1.10.6
153+
cmake -E make_directory build
154+
cd build
155+
cmake .. -DCMAKE_BUILD_TYPE=Release \
156+
-DBUILD_SHARED_LIBS=OFF \
157+
-DCMAKE_BUILD_TYPE=${{ matrix.BUILD_TYPE }} \
158+
-DCMAKE_INSTALL_PREFIX=${{ env.INSTALL_DIR }} \
159+
-DCMAKE_PREFIX_PATH=${{env.INSTALL_DIR}}/lib/cmake \
160+
-DCMAKE_TOOLCHAIN_FILE="${{env.VCPKG_ROOT}}/scripts/buildsystems/vcpkg.cmake" \
161+
-DANDROID_ABI=${{env.ANDROID_ABI}} \
162+
-DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=${ANDROID_NDK_HOME}/build/cmake/android.toolchain.cmake \
163+
-DVCPKG_VERBOSE=ON \
164+
-DVCPKG_TARGET_TRIPLET=${{matrix.VCPKG_TARGET_TRIPLET}} \
165+
-DX_VCPKG_APPLOCAL_DEPS_INSTALL=ON \
166+
-DVCPKG_TRACE_FIND_PACKAGE=ON \
167+
-DVCPKG_INSTALLED_DIR=${{env.INSTALL_DIR}}/RabbitVNC/vcpkg_installed
168+
cmake --build . --config Release
169+
cmake --build . --config Release --target install
170+
fi
171+
172+
- name: pcapplusplus
173+
#if: false
174+
working-directory: ${{env.SOURCE_DIR}}
175+
run: |
176+
if [ ! -d ${{ env.INSTALL_DIR }}/lib/cmake/pcapplusplus ]; then
177+
git clone -b v25.05 --depth=1 https://github.com/seladb/PcapPlusPlus.git
178+
cd PcapPlusPlus
179+
cmake -E make_directory build
180+
cd build
181+
cmake .. -DCMAKE_BUILD_TYPE=Release \
182+
-DCMAKE_BUILD_TYPE=${{ matrix.BUILD_TYPE }} \
183+
-DCMAKE_INSTALL_PREFIX=${{ env.INSTALL_DIR }} \
184+
-DCMAKE_PREFIX_PATH=${{env.INSTALL_DIR}}/lib/cmake \
185+
-DCMAKE_TOOLCHAIN_FILE="${{env.VCPKG_ROOT}}/scripts/buildsystems/vcpkg.cmake" \
186+
-DANDROID_ABI=${{env.ANDROID_ABI}} \
187+
-DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=${ANDROID_NDK_HOME}/build/cmake/android.toolchain.cmake \
188+
-DVCPKG_VERBOSE=ON \
189+
-DVCPKG_TARGET_TRIPLET=${{matrix.VCPKG_TARGET_TRIPLET}} \
190+
-DX_VCPKG_APPLOCAL_DEPS_INSTALL=ON \
191+
-DVCPKG_TRACE_FIND_PACKAGE=ON \
192+
-DVCPKG_INSTALLED_DIR=${{env.INSTALL_DIR}}/RabbitVNC/vcpkg_installed \
193+
-DPCAPPP_BUILD_EXAMPLES=OFF \
194+
-DPCAPPP_BUILD_TESTS=OFF \
195+
-DPCAPPP_BUILD_TUTORIALS=OFF \
196+
-DPCAP_LIBRARY=${{env.INSTALL_DIR}}/lib/libpcap.a \
197+
-DPCAP_INCLUDE_DIR=${{env.INSTALL_DIR}}/include
198+
cmake --build . --config Release
199+
cmake --build . --config Release --target install
200+
fi
201+
146202
- name: build RabbitVNC
147203
if: false
148204
working-directory: ${{env.SOURCE_DIR}}
@@ -272,49 +328,41 @@ jobs:
272328
fi
273329
274330
- name: build lxqt-build-tools
275-
if: false
331+
if: true
276332
working-directory: ${{env.SOURCE_DIR}}
277333
run: |
278334
if [ ! -d ${{env.INSTALL_DIR}}/share/cmake/lxqt2-build-tools ]; then
279335
git clone -b 2.2.0 --depth=1 "https://github.com/lxqt/lxqt-build-tools.git"
280336
cd lxqt-build-tools
281337
cmake -E make_directory build
282338
cd build
283-
${QT_ROOT_DIR}/bin/qt-cmake .. -DCMAKE_BUILD_TYPE=${{matrix.BUILD_TYPE}} \
284-
-DCMAKE_INSTALL_PREFIX=${{env.INSTALL_DIR}} \
285-
-DQT_HOST_PATH=${QT_ROOT_DIR}/../gcc_64 \
286-
-DCMAKE_PREFIX_PATH=${QT_ROOT_DIR} \
287-
-DQT_CHAINLOAD_TOOLCHAIN_FILE=${{env.VCPKG_ROOT}}/scripts/buildsystems/vcpkg.cmake \
288-
-DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=${ANDROID_NDK_HOME}/build/cmake/android.toolchain.cmake \
289-
-DVCPKG_VERBOSE=ON \
290-
-DVCPKG_TRACE_FIND_PACKAGE=ON \
291-
-DVCPKG_TARGET_TRIPLET=${{matrix.VCPKG_TARGET_TRIPLET}} \
292-
-DX_VCPKG_APPLOCAL_DEPS_INSTALL=ON
339+
${QT_ROOT_DIR}/bin/qt-cmake .. \
340+
-DCMAKE_BUILD_TYPE=${{matrix.BUILD_TYPE}} \
341+
-DCMAKE_INSTALL_PREFIX=${{env.INSTALL_DIR}} \
342+
-DCMAKE_PREFIX_PATH=${QT_ROOT_DIR}:${{env.INSTALL_DIR}}/lib/cmake \
343+
-DQT_HOST_PATH=${QT_ROOT_DIR}/../gcc_64 \
344+
-DQt6LinguistTools_DIR=${QT_ROOT_DIR}/../gcc_64/lib/cmake/Qt6LinguistTools \
345+
-DCMAKE_VERBOSE_MAKEFILE=${BUILD_VERBOSE}
293346
cmake --build . --config ${{matrix.BUILD_TYPE}}
294347
cmake --build . --config ${{matrix.BUILD_TYPE}} --target install
295348
fi
296349
297350
- name: build qtermwidget
298351
working-directory: ${{env.SOURCE_DIR}}
299-
if: false
352+
if: true
300353
run: |
301354
if [ ! -d ${{env.INSTALL_DIR}}/lib/cmake/qtermwidget6 ]; then
302355
git clone --depth=1 "https://github.com/KangLin/qtermwidget.git"
303356
cd qtermwidget
304357
cmake -E make_directory build
305358
cd build
306-
${QT_ROOT_DIR}/bin/qt-cmake .. -DCMAKE_BUILD_TYPE=${{matrix.BUILD_TYPE}} \
359+
${QT_ROOT_DIR}/bin/qt-cmake .. \
360+
-DCMAKE_BUILD_TYPE=${{matrix.BUILD_TYPE}} \
307361
-DCMAKE_INSTALL_PREFIX=${{env.INSTALL_DIR}} \
308362
-Dlxqt2-build-tools_DIR=${{env.INSTALL_DIR}}/share/cmake/lxqt2-build-tools \
309363
-DQT_HOST_PATH=${QT_ROOT_DIR}/../gcc_64 \
310364
-DQt6LinguistTools_DIR=${QT_ROOT_DIR}/../gcc_64/lib/cmake/Qt6LinguistTools \
311-
-DCMAKE_PREFIX_PATH=${QT_ROOT_DIR}:${{env.INSTALL_DIR}}/lib/cmake \
312-
-DQT_CHAINLOAD_TOOLCHAIN_FILE=${{env.VCPKG_ROOT}}/scripts/buildsystems/vcpkg.cmake \
313-
-DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=${ANDROID_NDK_HOME}/build/cmake/android.toolchain.cmake \
314-
-DVCPKG_VERBOSE=ON \
315-
-DVCPKG_TRACE_FIND_PACKAGE=ON \
316-
-DVCPKG_TARGET_TRIPLET=${{matrix.VCPKG_TARGET_TRIPLET}} \
317-
-DX_VCPKG_APPLOCAL_DEPS_INSTALL=ON
365+
-DCMAKE_PREFIX_PATH=${QT_ROOT_DIR}:${{env.INSTALL_DIR}}/lib/cmake
318366
cmake --build . --config ${{matrix.BUILD_TYPE}}
319367
cmake --build . --config ${{matrix.BUILD_TYPE}} --target install
320368
fi
@@ -328,7 +376,8 @@ jobs:
328376
cd qtkeychain
329377
cmake -E make_directory build
330378
cd build
331-
${QT_ROOT_DIR}/bin/qt-cmake .. -DCMAKE_BUILD_TYPE=${{matrix.BUILD_TYPE}} \
379+
${QT_ROOT_DIR}/bin/qt-cmake .. \
380+
-DCMAKE_BUILD_TYPE=${{matrix.BUILD_TYPE}} \
332381
-DCMAKE_INSTALL_PREFIX=${{env.INSTALL_DIR}} \
333382
-DCMAKE_PREFIX_PATH=${QT_ROOT_DIR}:${{env.INSTALL_DIR}}/lib/cmake \
334383
-DQT_HOST_PATH=${QT_ROOT_DIR}/../gcc_64 \
@@ -347,7 +396,8 @@ jobs:
347396
cd QFtpServer
348397
cmake -E make_directory build
349398
cd build
350-
${QT_ROOT_DIR}/bin/qt-cmake .. -DCMAKE_BUILD_TYPE=${{matrix.BUILD_TYPE}} \
399+
${QT_ROOT_DIR}/bin/qt-cmake .. \
400+
-DCMAKE_BUILD_TYPE=${{matrix.BUILD_TYPE}} \
351401
-DCMAKE_INSTALL_PREFIX=${{env.INSTALL_DIR}} \
352402
-DCMAKE_PREFIX_PATH=${QT_ROOT_DIR}:${{env.INSTALL_DIR}}/lib/cmake \
353403
-DQT_HOST_PATH=${QT_ROOT_DIR}/../gcc_64 \

‎.github/workflows/macos.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ jobs:
9595
run: |
9696
# See: https://formulae.brew.sh/
9797
brew update
98-
brew install nasm autoconf automake libtool pkg-config zstd libpcap libvncserver # pcapplusplus qt qtkeychain
98+
brew install nasm autoconf automake ninja make libtool pkg-config zstd libpcap libvncserver # pcapplusplus qt qtkeychain
9999
100100
- name: build RabbitVNC
101101
if: false
@@ -135,7 +135,8 @@ jobs:
135135
-DVCPKG_INSTALLED_DIR=${{env.INSTALL_DIR}}/tigervnc/vcpkg_installed \
136136
-DX_VCPKG_APPLOCAL_DEPS_INSTALL=ON \
137137
-DVCPKG_VERBOSE=ON \
138-
-DVCPKG_TARGET_TRIPLET=${{matrix.VCPKG_TARGET_TRIPLET}}
138+
-DVCPKG_TARGET_TRIPLET=${{matrix.VCPKG_TARGET_TRIPLET}} \
139+
-DCMAKE_MAKE_PROGRAM=make
139140
cmake --build . --config Release
140141
cmake --install . --config Release --strip
141142
fi

0 commit comments

Comments
 (0)