Merge V3.10.0.1001

.github/workflows/RockyArm64_build.yml

@@ -0,0 +1,82 @@
+name: rocky Arm64 build workflows
+
+on:
+  push:
+    branches: 
+      - 'develop'
+    paths:
+      - 'XEngine_Source/**'
+      - 'XEngine_Release/**'
+      - '.github/**'
+
+permissions:
+  contents: read
+
+jobs:
+  build:
+    runs-on: ubuntu-24.04
+    env:
+      IMAGE_NAME: rockylinux/rockylinux:9.5
+
+    strategy:
+      fail-fast: false
+      matrix:
+        arch: [linux/arm64]
+
+    steps:
+       # 检出您的主仓库代码
+      - name: Checkout main repository code
+        uses: actions/checkout@v4
+        with:
+          ref: 'develop'
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: Build ${{ matrix.arch }}
+        run: |
+          docker run --platform ${{ matrix.arch }} --rm \
+            -v ${{ github.workspace }}:/workspace \
+            -w /workspace ${{ env.IMAGE_NAME }} /bin/sh -c '
+            set -e
+            dnf update -y
+            dnf install --allowerasing git make g++ wget curl jq unzip -y
+
+            git config --global --add safe.directory /workspace
+            git submodule init
+            git submodule update
+
+            latest_tag=$(curl -s https://api.github.com/repos/libxengine/libxengine/releases/latest | jq -r .tag_name)
+            wget https://github.com/libxengine/libxengine/releases/download/$latest_tag/XEngine_RockyLinux_9_Arm64.zip
+            unzip ./XEngine_RockyLinux_9_Arm64.zip -d ./XEngine_RockyLinux_9_Arm64
+            cd XEngine_RockyLinux_9_Arm64
+
+            chmod 777 ./XEngine_LINEnv.sh
+            ./XEngine_LINEnv.sh -i 0
+
+            dnf install lua-devel opencv-devel qrencode-devel leptonica-devel tesseract-devel -y
+
+            cp -rf ./XEngine_Include /usr/local/include
+            find ./XEngine_Linux -name "*.so" -exec cp {} /usr/lib64 \;         
+            ldconfig
+            cd ..
+
+            cd XEngine_Source
+            make ARCH=Arm64 RELEASE=1
+            make FLAGS=InstallAll
+            make FLAGS=CleanAll  
+            cd ..
+
+            cd XEngine_Release
+            chmod 777 copydb.sh
+            ./copydb.sh
+            ./XEngine_APIServiceApp -t
+            chown -R $(id -u):$(id -g) .
+            chmod -R a+r .  '
+
+      - name: Upload folder as artifact with RockyLinux
+        uses: actions/upload-artifact@v4
+        with:
+          name: XEngine_APIServiceApp-RockyLinux_9_Arm64
+          path: XEngine_Release/
+          retention-days: 1

.github/workflows/RockyX86_64_build.yml

@@ -0,0 +1,99 @@
+name: rocky x86_64 build workflows
+
+on:
+  push:
+    branches: 
+      - 'develop'
+    paths:
+      - 'XEngine_Source/**'
+      - 'XEngine_Release/**'
+      - '.github/**'
+
+permissions:
+  contents: read
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    container:
+      image: rockylinux/rockylinux:9.5
+
+    steps:
+       # 检出您的主仓库代码
+      - name: Checkout main repository code
+        uses: actions/checkout@v4
+        with:
+          ref: 'develop'
+
+       # 检出依赖的xengine仓库到指定的xengine目录
+      - name: Checkout dependency repository (xengine)
+        uses: actions/checkout@v4
+        with:
+          repository: libxengine/libxengine
+          path: libxengine
+
+      - name: sub module checkout (XEngine_OPenSource)
+        uses: actions/checkout@v4
+        with:
+          repository: libxengine/XEngine_OPenSource
+          path: XEngine_Source/XEngine_Depend
+      - name: sub module checkout (XEngine_PhoneData)
+        uses: actions/checkout@v4
+        with:
+          repository: libxengine/XEngine_PhoneData
+          path: XEngine_Source/XEngine_DBDepend/XEngine_PhoneData
+      - name: sub module checkout (XEngine_IPMacData)
+        uses: actions/checkout@v4
+        with:
+          repository: libxengine/XEngine_IPMacData
+          path: XEngine_Source/XEngine_DBDepend/XEngine_IPMacData
+
+      - name: install system package
+        run: |
+            dnf update -y
+            ls -al ./XEngine_Source/XEngine_DBDepend/
+            ls -al ./XEngine_Source/XEngine_DBDepend/XEngine_IPMacData/XEngine_Source
+            dnf install gcc g++ make git jq unzip -y
+      # 设置依赖库的环境变量
+      - name: Set up Dependency rocky linux Environment
+        run: |
+            cd libxengine
+            chmod 777 *
+            ./XEngine_LINEnv.sh -i 0
+            dnf install lua-devel opencv-devel qrencode-devel leptonica-devel tesseract-devel -y
+
+      - name: install xengine library
+        run: |           
+            latest_tag=$(curl -s https://api.github.com/repos/libxengine/libxengine/releases/latest | jq -r .tag_name)
+            wget https://github.com/libxengine/libxengine/releases/download/$latest_tag/XEngine_RockyLinux_9_x86-64.zip
+            unzip ./XEngine_RockyLinux_9_x86-64.zip -d ./XEngine_RockyLinux_9_x86-64
+            cd XEngine_RockyLinux_9_x86-64
+
+            cp -rf ./XEngine_Include /usr/local/include
+            find ./XEngine_Linux -name "*.so" -exec cp {} /usr/lib64 \;         
+            ldconfig
+
+      - name: make
+        run: | 
+            cd XEngine_Source
+            make
+            make FLAGS=InstallAll
+            make FLAGS=CleanAll
+
+            make RELEASE=1
+            make FLAGS=InstallAll
+            make FLAGS=CleanAll
+
+      - name: test
+        run: |
+            cd XEngine_Release
+            chmod 777 copydb.sh
+            ./copydb.sh
+            ./XEngine_APIServiceApp -t
+
+      - name: Upload folder as artifact with RockyLinux
+        uses: actions/upload-artifact@v4
+        with:
+          name: XEngine_APIServiceApp-RockyLinux_9_x86_64
+          path: XEngine_Release/
+          retention-days: 1

.github/workflows/UbuntuArm64_build.yml

@@ -0,0 +1,77 @@
+name: ubuntu Arm64 build workflows
+
+on:
+  push:
+    branches: 
+      - 'develop'
+    paths:
+      - 'XEngine_Source/**'
+      - 'XEngine_Release/**'
+      - '.github/**'
+
+jobs:
+  build:
+    runs-on: ubuntu-24.04
+    env:
+      IMAGE_NAME: ubuntu:24.04
+
+    strategy:
+      fail-fast: false
+      matrix:
+        arch: [linux/arm64]
+
+    steps:
+      - name: Checkout main repository code
+        uses: actions/checkout@v4
+        with:
+          ref: 'develop'
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: Build ${{ matrix.arch }}
+        run: |
+          docker run --platform ${{ matrix.arch }} --rm \
+            -v ${{ github.workspace }}:/workspace \
+            -w /workspace ${{ env.IMAGE_NAME }} /bin/sh -c '
+            set -e
+            apt update -y
+            apt install git make g++ wget curl jq unzip -y
+            apt install liblua5.4-dev libopencv-dev libopencv-contrib-dev libqrencode-dev libleptonica-dev libtesseract-dev -y
+
+            git config --global --add safe.directory /workspace
+            git submodule init
+            git submodule update
+
+            latest_tag=$(curl -s https://api.github.com/repos/libxengine/libxengine/releases/latest | jq -r .tag_name)
+            wget https://github.com/libxengine/libxengine/releases/download/$latest_tag/XEngine_UBuntu_24.04_Arm64.zip
+            unzip ./XEngine_UBuntu_24.04_Arm64.zip -d ./XEngine_UBuntu_24.04_Arm64
+            cd XEngine_UBuntu_24.04_Arm64
+
+            chmod 777 ./XEngine_LINEnv.sh
+            ./XEngine_LINEnv.sh -i 0
+
+            cp -rf ./XEngine_Include /usr/local/include
+            find ./XEngine_Linux -name "*.so" -exec cp {} /usr/local/lib \;         
+            ldconfig
+            cd ..
+
+            cd XEngine_Source
+            make ARCH=Arm64 RELEASE=1
+            make FLAGS=InstallAll
+            make FLAGS=CleanAll  
+            cd ..
+
+            cd XEngine_Release
+            chmod 777 copydb.sh
+            ./copydb.sh
+            ./XEngine_APIServiceApp -t 
+            chown -R $(id -u):$(id -g) .
+            chmod -R a+r .  '
+
+      - name: Upload folder as artifact with ubuntu Arm64
+        uses: actions/upload-artifact@v4
+        with:
+          name: XEngine_APIServiceApp-Ubuntu_24.04_Arm64
+          path: XEngine_Release/
+          retention-days: 1

.github/workflows/ubuntubuild.yml → .github/workflows/Ubuntux86_64_build.yml

@@ -1,4 +1,4 @@
-name: ubuntu build workflows
+name: ubuntu x86_64 build workflows
 
 on:
   push:
@@ -83,20 +83,22 @@ jobs:
       - name: test
         run: |
             cd XEngine_Release
+            chmod 777 copydb.sh
+            ./copydb.sh
             ./XEngine_APIServiceApp -t
 
       - name: Upload folder as artifact with ubuntu22.04
         if: matrix.os == 'ubuntu-22.04'
         uses: actions/upload-artifact@v4
         with:
-          name: XEngine_APIServiceApp-x86_64-Ubuntu-22.04
+          name: XEngine_APIServiceApp-Ubuntu_22.04_x86_64
           path: XEngine_Release/
           retention-days: 1
 
       - name: Upload folder as artifact with ubuntu24.04
         if: matrix.os == 'ubuntu-24.04'
         uses: actions/upload-artifact@v4
         with:
-          name: XEngine_APIServiceApp-x86_64-Ubuntu-24.04
+          name: XEngine_APIServiceApp-Ubuntu_24.04_x86_64
           path: XEngine_Release/
           retention-days: 1

.github/workflows/macbuild.yml

@@ -79,19 +79,21 @@ jobs:
       - name: test
         run: |
             cd XEngine_Release
+            chmod 777 copydb.sh
+            ./copydb.sh
             ./XEngine_APIServiceApp -t
 
       - name: Upload folder as artifact with mac x64
         if: matrix.os == 'macos-13'
         uses: actions/upload-artifact@v4
         with:
-          name: XEngine_APIServiceApp-x86_64-Mac
+          name: XEngine_APIServiceApp-Mac_x86_64
           path: XEngine_Release/
           retention-days: 1
       - name: Upload folder as artifact with mac arm
         if: matrix.os == 'macos-14'
         uses: actions/upload-artifact@v4
         with:
-          name: XEngine_APIServiceApp-Arm64-Mac
+          name: XEngine_APIServiceApp-Mac_Arm64
           path: XEngine_Release/
           retention-days: 1