Merge pull request #32 from xengine-qyt/develop

github actions support

Author: xengine-qyt

.github/workflows/macbuild.yml

@@ -41,13 +41,7 @@ jobs:
       - name: install library
         run: |
           brew install lua opencv qrencode
-          echo "==============opencv4================"
-          ls -al /opt/homebrew/Cellar/opencv/4.10.0_15/include/opencv4/opencv2
-          echo "==============tesseract================"
-          ls -al /opt/homebrew/opt/tesseract/include/tesseract
-          echo "==============qrencode================"
-          ls -al /opt/homebrew/opt/qrencode/include
-      # 设置依赖库的环境变量
+
       - name: Set up Dependency x86_64 Environment 
         if: matrix.os == 'macos-13'
         run: |
@@ -71,7 +65,7 @@ jobs:
             sudo mkdir -p /usr/local/lib
             sudo cp -rf ./XEngine_Include /usr/local/include
             sudo find ./XEngine_Mac -name "*.dylib" -exec cp {} /usr/local/lib \;
-      #编译
+
       - name: make debug
         run: | 
             cd XEngine_Source

.github/workflows/msbuild.yml

@@ -21,7 +21,8 @@ jobs:
         platform: [x86 ,x64]
 
     runs-on: windows-latest # 最新的 Windows 环境
-
+    env:
+      ACTIONS_STEP_DEBUG: true
     steps:
        # 检出您的主仓库代码
       - name: Checkout main repository code
@@ -65,16 +66,26 @@ jobs:
             ./vcpkg.exe integrate install
         shell: pwsh
 
-      # 设置依赖库的环境变量
-      - name: Set up Dependency Environment Variables
+      - name: Set up Dependency x86_64 Environment
+        if: matrix.platform == 'x64'
         run: |
           echo "XENGINE_INCLUDE=${{ github.workspace }}/libxengine" | Out-File -FilePath $env:GITHUB_ENV -Append
-          echo "XENGINE_LIB32=${{ github.workspace }}/libxengine/XEngine_Windows" | Out-File -FilePath $env:GITHUB_ENV -Append
           echo "XENGINE_LIB64=${{ github.workspace }}/libxengine/XEngine_Windows" | Out-File -FilePath $env:GITHUB_ENV -Append
         shell: pwsh
-        
-      - name: Set code page
-        run: chcp 65001
+      - name: Set up Dependency x86_32 Environment
+        if: matrix.platform == 'x86'
+        run: |
+          $response = Invoke-RestMethod -Uri "https://api.github.com/repos/libxengine/libxengine/releases/latest" -Headers @{"Accept"="application/vnd.github.v3+json"}
+          $latest_tag = $response.tag_name
+          Write-Host "Latest Tag: $latest_tag"
+    
+          $url = "https://github.com/libxengine/libxengine/releases/download/$latest_tag/XEngine_Windows_x86-32.zip"
+          Invoke-WebRequest -Uri $url -OutFile "XEngine_Windows_x86-32.zip"
+          Expand-Archive -Path ./XEngine_Windows_x86-32.zip -DestinationPath ./XEngine_Windows -Force
+
+          echo "XENGINE_INCLUDE=${{ github.workspace }}/XEngine_Windows" | Out-File -FilePath $env:GITHUB_ENV -Append
+          echo "XENGINE_LIB32=${{ github.workspace }}/XEngine_Windows/XEngine_Windows" | Out-File -FilePath $env:GITHUB_ENV -Append
+        shell: pwsh
 
       # 配置 MSBuild 的路径，准备构建 VC++ 项目
       - name: Setup MSBuild
@@ -83,6 +94,7 @@ jobs:
       #编译
       - name: Build Solution
         run: msbuild XEngine_Source/XEngine.sln /p:Configuration=${{ matrix.configuration }} /p:Platform=${{ matrix.platform }}
+
       #测试
       - name: Conditional Step for x86 Release
         if: matrix.configuration == 'Release' && matrix.platform == 'x86'
@@ -92,8 +104,7 @@ jobs:
           cp -r XEngine_Source/VSCopy_x86.bat XEngine_Release/
           cd XEngine_Release
           ./VSCopy_x86.bat
-          ./XEngine_APIServiceApp.exe -t
-        shell: pwsh
+          ./XEngine_HttpApp.exe -t
       - name: Conditional Step for x64 Release
         if: matrix.configuration == 'Release' && matrix.platform == 'x64'
         run: |
@@ -116,4 +127,4 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: XEngine_APIServiceApp-x86_64-Windows
-          path: XEngine_Release/
+          path: XEngine_Release/

.github/workflows/ubuntubuild.yml

@@ -45,7 +45,7 @@ jobs:
         run: |
           sudo apt update -y
           sudo apt upgrade -y
-          sudo apt install liblua5.4-dev libopencv-dev libopencv-contrib-dev libqrencode-dev -y
+          sudo apt install liblua5.4-dev libopencv-dev libopencv-contrib-dev libqrencode-dev libleptonica-dev libtesseract-dev -y
 
       # 设置依赖库的环境变量
       - name: Set up Dependency ubuntu24.04 Environment

XEngine_Source/VSCopy_Debug.bat

@@ -10,6 +10,8 @@ copy /y "D:\XEngine\XEngine_SourceCode\Debug\XClient_Stream.dll" "./"
 copy /y "D:\XEngine\XEngine_SourceCode\Debug\XClient_Socket.dll" "./"
 
 copy /y "D:\XEngine\XEngine_SourceCode\Debug\NetHelp_XSocket.dll" "./"
+copy /y "D:\XEngine\XEngine_SourceCode\Debug\NetHelp_APIAddr.dll" "./"
+copy /y "D:\XEngine\XEngine_SourceCode\Debug\NetHelp_APIHelp.dll" "./"
 copy /y "D:\XEngine\XEngine_SourceCode\Debug\XEngine_SystemApi.dll" "./"
 
 copy /y "D:\XEngine\XEngine_SourceCode\Debug\HelpComponents_DataBase.dll" "./"

XEngine_Source/VSCopy_x64.bat

@@ -7,9 +7,11 @@ copy /y "%XEngine_Lib64%\XEngine_Core\XEngine_Cryption.dll" "./"
 
 copy /y "%XEngine_Lib64%\XEngine_Client\XClient_APIHelp.dll" "./"
 copy /y "%XEngine_Lib64%\XEngine_Client\XClient_Stream.dll" "./"
-copy /y "%XEngine_Lib32%\XEngine_Client\XClient_Socket.dll" "./"
+copy /y "%XEngine_Lib64%\XEngine_Client\XClient_Socket.dll" "./"
 
-copy /y "%XEngine_Lib32%\XEngine_NetHelp\NetHelp_XSocket.dll" "./"
+copy /y "%XEngine_Lib64%\XEngine_NetHelp\NetHelp_XSocket.dll" "./"
+copy /y "%XEngine_Lib64%\XEngine_NetHelp\NetHelp_APIAddr.dll" "./"
+copy /y "%XEngine_Lib64%\XEngine_NetHelp\NetHelp_APIHelp.dll" "./"
 copy /y "%XEngine_Lib64%\XEngine_SystemSdk\XEngine_SystemApi.dll" "./"
 
 copy /y "%XEngine_Lib64%\XEngine_HelpComponents\HelpComponents_DataBase.dll" "./"

XEngine_Source/VSCopy_x86.bat

@@ -10,6 +10,8 @@ copy /y "%XEngine_Lib32%\XEngine_Client\XClient_Stream.dll" "./"
 copy /y "%XEngine_Lib32%\XEngine_Client\XClient_Socket.dll" "./"
 
 copy /y "%XEngine_Lib32%\XEngine_NetHelp\NetHelp_XSocket.dll" "./"
+copy /y "%XEngine_Lib32%\XEngine_NetHelp\NetHelp_APIAddr.dll" "./"
+copy /y "%XEngine_Lib32%\XEngine_NetHelp\NetHelp_APIHelp.dll" "./"
 copy /y "%XEngine_Lib32%\XEngine_SystemSdk\XEngine_SystemApi.dll" "./"
 
 copy /y "%XEngine_Lib32%\XEngine_HelpComponents\HelpComponents_DataBase.dll" "./"

XEngine_Source/XEngine_ModuleHelp/Makefile

@@ -19,7 +19,7 @@ ifeq ($(MACRO_QR_SUPPORT),1)
 	LIB += -lqrencode
 endif
 ifeq ($(MACRO_OPENCV_SUPPORT),1)
-	LIB += -llzma -lpng16 -lopencv_core -lopencv_imgcodecs -lopencv_imgproc -ltiff -lopencv_wechat_qrcode -ltesseract 
+	LIB += -llzma -lopencv_core -lopencv_imgcodecs -lopencv_imgproc -lopencv_wechat_qrcode -ltesseract -lleptonica
 endif
 
 ifeq ($(RELEASE),1)
@@ -58,8 +58,8 @@ else ifeq ($(PLATFORM),mac)
 	PLATVER = -D __MACOS__
 	PLATDIR = XEngine_Mac
 	FILEEXT = dylib
-	LOADHDR += -I /opt/homebrew/opt/opencv/include/opencv4 -I /opt/homebrew/opt/tesseract/include -I /opt/homebrew/opt/qrencode/include -I /opt/homebrew/opt/lua/include
-	LOADSO += -L /opt/homebrew/opt/opencv/lib -L /opt/homebrew/opt/tesseract/lib -L /opt/homebrew/opt/qrencode/lib -L /opt/homebrew/opt/lua/lib
+	LOADHDR += -I /opt/homebrew/opt/leptonica/include -I /opt/homebrew/opt/opencv/include/opencv4 -I /opt/homebrew/opt/tesseract/include -I /opt/homebrew/opt/qrencode/include
+	LOADSO += -L /opt/homebrew/opt/leptonica/lib -L /opt/homebrew/opt/opencv/lib -L /opt/homebrew/opt/tesseract/lib -L /opt/homebrew/opt/qrencode/lib
 	LIBFLAG = -dynamiclib
 	LIBEX = -lpthread -ldl
 	LOADBIN = -Wl,-rpath,@loader_path/./

XEngine_Source/XEngine_ModuleHelp/pch.h

@@ -30,8 +30,6 @@
 #include <opencv4/opencv2/opencv.hpp>
 #include <opencv4/opencv2/core/utils/logger.hpp>
 #include <opencv4/opencv2/wechat_qrcode.hpp>
-#include <leptonica/allheaders.h>
-#include <tesseract/capi.h>
 #else
 #include <opencv2/opencv.hpp>
 #include <opencv2/core/utils/logger.hpp>
@@ -41,6 +39,8 @@
 #include <opencv2/wechat_qrcode.hpp>
 #include <sys/socket.h>
 #endif
+#include <leptonica/allheaders.h>
+#include <tesseract/capi.h>
 #include <qrencode.h>
 #endif
 using namespace std;

XEngine_Source/XEngine_ModulePlugin/Makefile

@@ -54,6 +54,10 @@ else ifeq ($(PLATFORM),mac)
 	PLATDIR = XEngine_Mac
 	FILEEXT = dylib
 	LIBFLAG = -dynamiclib
+
+	LOADHDR += -I /opt/homebrew/opt/lua/include/lua
+	LOADSO += -L /opt/homebrew/opt/lua/lib
+
 	ifeq ($(MACRO_LUA_SUPPORT),1)
 		LIB += -llua
 	endif