software/x-tools
1
0
Fork 0
mirror of https://github.com/x-tools-author/x-tools.git synced 2025-09-15 15:28:40 +08:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

fix: ble error sometimes

Browse Source
This commit is contained in:
x-tools-author 2025-04-25 10:16:38 +08:00
parent a6b0d170e4
commit ff69eb96c0
2 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.github/workflows/build-android-linux.yml vendored
View File

@ -51,17 +51,18 @@ jobs:
run: |
git fetch --tags
export JAVA_HOME=%JAVA_HOME_17_X64%
${{ github.workspace }}/Qt/${{ matrix.version }}/android_armv7/bin/qt-cmake.sh ^
cmake ^
-G "MinGW Makefiles" ^
-S . ^
-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" ^
-DCMAKE_CXX_COMPILER:FILEPATH="%ANDROID_NDK_ROOT%/toolchains/llvm/prebuilt/linux-x86_64/bin/clang++" ^
-DANDROID_SDK_ROOT:PATH="%ANDROID_SDK_ROOT%" ^
-DANDROID_NDK_ROOT:PATH="%ANDROID_NDK_ROOT%" ^
-DBUILD_SHARED_LIBS:BOOL=OFF ^
-DWITH_TOOLS:BOOL=OFF
-DWITH_TOOLS:BOOL=OFF ^
-DCMAKE_PREFIX_PATH:PATH="${{ github.workspace }}/Qt/${{ matrix.version }}/android_armv7"
- name: Dir build/armeabi_v7a
run: |
dir build/armeabi_v7a

34
docker/20.04-android/Dockerfile
View File

@ -13,6 +13,7 @@ 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
@ -22,10 +23,10 @@ ENV QT_WEB_SOCKETS_URL=https://download.qt.io/online/qtsdkrepository/linux_x64/d
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
ENV QT_PREFIX_GCC=/opt/qt/gcc_64
# Extract Qt
RUN mkdir -p ${QT_PREFIX}
RUN mkdir -p ${QT_PREFIX_GCC}
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
@ -35,18 +36,21 @@ 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
RUN 7z x qtbase.7z -o${QT_PREFIX_GCC} && rm qtbase.7z
RUN 7z x qtcharts.7z -o${QT_PREFIX_GCC} && rm qtcharts.7z
RUN 7z x qtserialport.7z -o${QT_PREFIX_GCC} && rm qtserialport.7z
RUN 7z x qtserialbus.7z -o${QT_PREFIX_GCC} && rm qtserialbus.7z
RUN 7z x qtwebsockets.7z -o${QT_PREFIX_GCC} && rm qtwebsockets.7z
RUN 7z x qtsvg.7z -o${QT_PREFIX_GCC} && rm qtsvg.7z
RUN 7z x qttools.7z -o${QT_PREFIX_GCC} && rm qttools.7z
RUN 7z x icu.7z -o${QT_PREFIX_GCC}/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/
ENV LD_LIBRARY_PATH ${QT_PREFIX_GCC}/lib:$LD_LIBRARY_PATH
ENV PATH ${QT_PREFIX_GCC}/bin:$PATH
ENV QT_PLUGIN_PATH ${QT_PREFIX_GCC}/plugins/
ENV QML_IMPORT_PATH ${QT_PREFIX_GCC}/qml/
ENV QML2_IMPORT_PATH ${QT_PREFIX_GCC}/qml/
#---------------------------------------------------------------------------------------------------
# Qt Android