mirror of
https://github.com/x-tools-author/x-tools.git
synced 2025-09-15 15:28:40 +08:00
fix: ble error sometimes
This commit is contained in:
x-tools-author
parent
39bfb3adb0
commit
a6b0d170e4
20
.github/workflows/build-android-linux.yml
vendored
20
.github/workflows/build-android-linux.yml
vendored
@ -20,7 +20,7 @@ jobs:
|
||||
os: [ubuntu-24.04]
|
||||
version: [6.8.3]
|
||||
env:
|
||||
QT_ANDROID_KEYSTORE_PATH: ${{ github.workspace }}\res\android\android_release.keystore
|
||||
QT_ANDROID_KEYSTORE_PATH: ${{ github.workspace }}/res/android/android_release.keystore
|
||||
QT_ANDROID_KEYSTORE_ALIAS: ${{ secrets.ANDROID_KEYSTORE_ALIAS }}
|
||||
QT_ANDROID_KEYSTORE_STORE_PASS: ${{ secrets.ANDROID_KEYSTORE_STORE_PASS }}
|
||||
QT_ANDROID_KEYSTORE_KEY_PASS: ${{ secrets.ANDROID_KEYSTORE_KEY_PASS }}
|
||||
@ -51,32 +51,32 @@ jobs:
|
||||
run: |
|
||||
git fetch --tags
|
||||
export JAVA_HOME=%JAVA_HOME_17_X64%
|
||||
${{ github.workspace }}\Qt\${{ matrix.version }}\android_armv7\bin\qt-cmake.sh ^
|
||||
${{ github.workspace }}/Qt/${{ matrix.version }}/android_armv7/bin/qt-cmake.sh ^
|
||||
-G "MinGW Makefiles" ^
|
||||
-S . ^
|
||||
-B "build\armeabi_v7a" ^
|
||||
-DQT_HOST_PATH:PATH="${{ github.workspace }}\Qt\${{ matrix.version }}\linux_gcc_64" ^
|
||||
-B "build/armeabi_v7a" ^
|
||||
-DQT_HOST_PATH:PATH="${{ github.workspace }}/Qt/${{ matrix.version }}/linux_gcc_64" ^
|
||||
-DCMAKE_BUILD_TYPE:STRING=Release ^
|
||||
-DCMAKE_CXX_COMPILER:FILEPATH="%ANDROID_NDK_ROOT%/toolchains/llvm/prebuilt/linux-x86_64/bin/clang++.exe" ^
|
||||
-DANDROID_SDK_ROOT:PATH="%ANDROID_SDK_ROOT%" ^
|
||||
-DANDROID_NDK_ROOT:PATH="%ANDROID_NDK_ROOT%" ^
|
||||
-DBUILD_SHARED_LIBS:BOOL=OFF ^
|
||||
-DWITH_TOOLS:BOOL=OFF
|
||||
- name: Dir build\armeabi_v7a
|
||||
- name: Dir build/armeabi_v7a
|
||||
run: |
|
||||
dir build\armeabi_v7a
|
||||
dir build/armeabi_v7a
|
||||
- name: Build for android
|
||||
run: |
|
||||
export JAVA_HOME=%JAVA_HOME_17_X64%
|
||||
echo %JAVA_HOME%
|
||||
cmake --build build\armeabi_v7a --target all --config Release
|
||||
cmake --build build/armeabi_v7a --target all --config Release
|
||||
- name: Deploy for Android
|
||||
run: |
|
||||
export JAVA_HOME=%JAVA_HOME_17_X64%
|
||||
echo %JAVA_HOME%
|
||||
${{ github.workspace }}\Qt\${{ matrix.version }}\linux_gcc_64\bin\androiddeployqt ^
|
||||
--input build\armeabi_v7a\android-xTools-deployment-settings.json ^
|
||||
--output build\armeabi_v7a\android-build ^
|
||||
${{ github.workspace }}/Qt/${{ matrix.version }}/linux_gcc_64/bin/androiddeployqt ^
|
||||
--input build/armeabi_v7a/android-xTools-deployment-settings.json ^
|
||||
--output build/armeabi_v7a/android-build ^
|
||||
--android-platform android-35 ^
|
||||
--sign ${{ env.QT_ANDROID_KEYSTORE_PATH }} ${{ env.QT_ANDROID_KEYSTORE_ALIAS }} --storepass ${{ env.QT_ANDROID_KEYSTORE_STORE_PASS }} --keypass ${{ env.QT_ANDROID_KEYSTORE_KEY_PASS }} ^
|
||||
--jdk %JAVA_HOME% --gradle --release
|
||||
|
||||
52
docker/20.04-android/Dockerfile
Normal file
52
docker/20.04-android/Dockerfile
Normal file
@ -0,0 +1,52 @@
|
||||
FROM ubuntu:20.04
|
||||
|
||||
RUN apt-get -y update
|
||||
RUN apt-get install -y libxcb-xinerama0 libxcb-cursor-dev libudev-dev ninja-build libopengl-dev libglu1-mesa-dev mesa-common-dev
|
||||
RUN export DEBIAN_FRONTEND=noninteractive && apt-get install -y gcc g++ wget p7zip-full libicu-dev tree grep git libglib2.0-dev
|
||||
RUN apt-get install -y libxkb* libdbus*
|
||||
RUN apt-get install -y libegl1-mesa-dev libfontconfig1-dev libfreetype6-dev libfreetype-dev
|
||||
RUN export DEBIAN_FRONTEND=noninteractive && apt-get install -y fuse libfuse2 libfuse-dev kmod
|
||||
|
||||
# CMake
|
||||
RUN wget https://cmake.org/files/v3.30/cmake-3.30.8-linux-x86_64.sh
|
||||
RUN chmod +x cmake-3.30.8-linux-x86_64.sh
|
||||
RUN ./cmake-3.30.8-linux-x86_64.sh --skip-license --prefix=/usr/local
|
||||
RUN rm cmake-3.30.8-linux-x86_64.sh
|
||||
|
||||
# Qt
|
||||
ENV QT_BAST_URL=https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_683/qt6_683/qt.qt6.683.linux_gcc_64/6.8.3-0-202503201345qtbase-Linux-RHEL_8_10-GCC-Linux-RHEL_8_10-X86_64.7z
|
||||
ENV QT_CHARTS_URL=https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_683/qt6_683/qt.qt6.683.addons.qtcharts.linux_gcc_64/6.8.3-0-202503201345qtcharts-Linux-RHEL_8_10-GCC-Linux-RHEL_8_10-X86_64.7z
|
||||
ENV QT_SERIAL_PORT_URL=https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_683/qt6_683/qt.qt6.683.addons.qtserialport.linux_gcc_64/6.8.3-0-202503201345qtserialport-Linux-RHEL_8_10-GCC-Linux-RHEL_8_10-X86_64.7z
|
||||
ENV QT_SERIAL_BUS_URL=https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_683/qt6_683/qt.qt6.683.addons.qtserialbus.linux_gcc_64/6.8.3-0-202503201345qtserialbus-Linux-RHEL_8_10-GCC-Linux-RHEL_8_10-X86_64.7z
|
||||
ENV QT_WEB_SOCKETS_URL=https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_683/qt6_683/qt.qt6.683.addons.qtwebsockets.linux_gcc_64/6.8.3-0-202503201345qtwebsockets-Linux-RHEL_8_10-GCC-Linux-RHEL_8_10-X86_64.7z
|
||||
ENV QT_SVG_URL=https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_683/qt6_683/qt.qt6.683.linux_gcc_64/6.8.3-0-202503201345qtsvg-Linux-RHEL_8_10-GCC-Linux-RHEL_8_10-X86_64.7z
|
||||
ENV QT_TOOLS_URL=https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_683/qt6_683/qt.qt6.683.linux_gcc_64/6.8.3-0-202503201345qttools-Linux-RHEL_8_10-GCC-Linux-RHEL_8_10-X86_64.7z
|
||||
ENV QT_ICU_URL=https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_683/qt6_683/qt.qt6.683.linux_gcc_64/6.8.3-0-202503201345icu-linux-Rhel8.6-x86_64.7z
|
||||
ENV QT_PREFIX=/opt/qt
|
||||
|
||||
# Extract Qt
|
||||
RUN mkdir -p ${QT_PREFIX}
|
||||
RUN wget ${QT_BAST_URL} -O qtbase.7z
|
||||
RUN wget ${QT_CHARTS_URL} -O qtcharts.7z
|
||||
RUN wget ${QT_SERIAL_PORT_URL} -O qtserialport.7z
|
||||
RUN wget ${QT_SERIAL_BUS_URL} -O qtserialbus.7z
|
||||
RUN wget ${QT_WEB_SOCKETS_URL} -O qtwebsockets.7z
|
||||
RUN wget ${QT_SVG_URL} -O qtsvg.7z
|
||||
RUN wget ${QT_TOOLS_URL} -O qttools.7z
|
||||
RUN wget ${QT_ICU_URL} -O icu.7z
|
||||
|
||||
RUN 7z x qtbase.7z -o${QT_PREFIX} && rm qtbase.7z
|
||||
RUN 7z x qtcharts.7z -o${QT_PREFIX} && rm qtcharts.7z
|
||||
RUN 7z x qtserialport.7z -o${QT_PREFIX} && rm qtserialport.7z
|
||||
RUN 7z x qtserialbus.7z -o${QT_PREFIX} && rm qtserialbus.7z
|
||||
RUN 7z x qtwebsockets.7z -o${QT_PREFIX} && rm qtwebsockets.7z
|
||||
RUN 7z x qtsvg.7z -o${QT_PREFIX} && rm qtsvg.7z
|
||||
RUN 7z x qttools.7z -o${QT_PREFIX} && rm qttools.7z
|
||||
RUN 7z x icu.7z -o${QT_PREFIX}/lib && rm icu.7z
|
||||
|
||||
# Set environment variables for Qt
|
||||
ENV LD_LIBRARY_PATH ${QT_PREFIX}/lib:$LD_LIBRARY_PATH
|
||||
ENV PATH ${QT_PREFIX}/bin:$PATH
|
||||
ENV QT_PLUGIN_PATH ${QT_PREFIX}/plugins/
|
||||
ENV QML_IMPORT_PATH ${QT_PREFIX}/qml/
|
||||
ENV QML2_IMPORT_PATH ${QT_PREFIX}/qml/
|
||||
Loading…
Reference in New Issue
Block a user