Skip to content

Commit 9264f28

Browse files
xengine-qytxengine-qyt
authored
Merge pull request #82 from libxengine/develop
V3.16 Merge
2 parents 5d26ebf + 119b8ee commit 9264f28

File tree

97 files changed

+1302
-964
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

97 files changed

+1302
-964
lines changed

‎.github/workflows/cppcheck.yml‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
name: cpp check workflows
2+
3+
on:
4+
push:
5+
branches:
6+
- 'develop'
7+
paths:
8+
- 'XEngine_Source/**'
9+
- 'XEngine_Release/**'
10+
- '.github/**'
11+
12+
jobs:
13+
build:
14+
runs-on: ubuntu-latest
15+
16+
steps:
17+
- name: Checkout main repository code
18+
uses: actions/checkout@v4
19+
with:
20+
ref: 'develop'
21+
22+
- name: Create static_analysis directory
23+
run: mkdir -p static_analysis
24+
25+
- name: Run Cppcheck
26+
run: |
27+
sudo apt-get install -y cppcheck
28+
cppcheck --enable=all --language=c++ --std=c++20 ./XEngine_Source/ --output-file=static_analysis/log.xml --xml
29+
continue-on-error: true
30+
31+
- name: Upload Cppcheck Results
32+
uses: actions/upload-artifact@v4
33+
with:
34+
name: cppcheck_results
35+
path: static_analysis/log.xml

‎.github/workflows/macbuild.yml‎

Lines changed: 32 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,20 @@ name: macos build workflows
22

33
on:
44
push:
5-
branches: [ "develop" ]
5+
branches:
6+
- 'develop'
67
paths:
78
- 'XEngine_Source/**'
89
- 'XEngine_Release/**'
9-
10-
permissions:
11-
contents: read
10+
- '.github/**'
1211

1312
jobs:
1413
build:
1514
strategy:
1615
matrix:
1716
include:
1817
- os: macos-13
18+
- os: macos-14
1919
runs-on: ${{ matrix.os }}
2020

2121
steps:
@@ -30,7 +30,6 @@ jobs:
3030
with:
3131
repository: libxengine/libxengine
3232
path: libxengine
33-
ref: 'master'
3433

3534
- name: sub module checkout (opensource)
3635
run: |
@@ -40,14 +39,30 @@ jobs:
4039
- name: brew install
4140
run: /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
4241

43-
# 设置依赖库的环境变量
44-
- name: Set up Dependency Environment Variables
42+
- name: Set up Dependency x86_64 Environment
43+
if: matrix.os == 'macos-13'
4544
run: |
4645
cd libxengine
4746
chmod 777 *
4847
./XEngine_LINEnv.sh -i 3
49-
cd ..
50-
#编译
48+
- name: Set up Dependency Arm64 Environment
49+
if: matrix.os == 'macos-14'
50+
run: |
51+
cd libxengine
52+
chmod 777 *
53+
./XEngine_LINEnv.sh -i 0
54+
55+
latest_tag=$(git ls-remote --tags --sort="v:refname" https://github.com/libxengine/libxengine.git | awk '{print $2}' | sed 's/refs\/tags\///' | tail -n 1)
56+
57+
wget https://github.com/libxengine/libxengine/releases/download/$latest_tag/XEngine_Mac_Arm64.zip
58+
unzip ./XEngine_Mac_Arm64.zip -d ./XEngine_Mac_Arm64
59+
cd XEngine_Mac_Arm64
60+
61+
sudo mkdir -p /usr/local/include
62+
sudo mkdir -p /usr/local/lib
63+
sudo cp -rf ./XEngine_Include /usr/local/include
64+
sudo find ./XEngine_Mac -name "*.dylib" -exec cp {} /usr/local/lib \;
65+
5166
- name: make debug
5267
run: |
5368
cd XEngine_Source
@@ -65,8 +80,15 @@ jobs:
6580
cd XEngine_Release
6681
./XEngine_AuthorizeService -t
6782
68-
- name: Upload folder as artifact with mac
83+
- name: Upload folder as artifact with mac x64
84+
if: matrix.os == 'macos-13'
6985
uses: actions/upload-artifact@v4
7086
with:
7187
name: XEngine_AuthorizeService-x86_64-Mac
88+
path: XEngine_Release/
89+
- name: Upload folder as artifact with mac arm
90+
if: matrix.os == 'macos-14'
91+
uses: actions/upload-artifact@v4
92+
with:
93+
name: XEngine_AuthorizeService-Arm64-Mac
7294
path: XEngine_Release/

‎.github/workflows/msbuild.yml‎

Lines changed: 24 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@ name: windows build workflows
33
on:
44
push:
55
branches:
6-
- develop
6+
- 'develop'
77
paths:
88
- 'XEngine_Source/**'
99
- 'XEngine_Release/**'
10+
- '.github/**'
1011

1112
jobs:
1213
build:
1314
strategy:
14-
# Set fail-fast to false to ensure that feedback is delivered for all matrix combinations. Consider changing this to true when your workflow is stable.
1515
fail-fast: false
1616
matrix:
1717
configuration: [Debug ,Release]
@@ -31,29 +31,41 @@ jobs:
3131
uses: actions/checkout@v4
3232
with:
3333
repository: libxengine/libxengine
34-
path: xengine
34+
path: libxengine
3535

3636
- name: sub module checkout (opensource)
3737
run: |
3838
git submodule init
3939
git submodule update
4040
shell: pwsh
4141

42-
# 设置依赖库的环境变量
43-
- name: Set up Dependency Environment Variables
42+
- name: Set up Dependency x86_64 Environment
43+
if: matrix.platform == 'x64'
4444
run: |
45-
echo "XENGINE_INCLUDE=${{ github.workspace }}/xengine" | Out-File -FilePath $env:GITHUB_ENV -Append
46-
echo "XENGINE_LIB32=${{ github.workspace }}/xengine/XEngine_Windows/x86" | Out-File -FilePath $env:GITHUB_ENV -Append
47-
echo "XENGINE_LIB64=${{ github.workspace }}/xengine/XEngine_Windows/x64" | Out-File -FilePath $env:GITHUB_ENV -Append
45+
echo "XENGINE_INCLUDE=${{ github.workspace }}/libxengine" | Out-File -FilePath $env:GITHUB_ENV -Append
46+
echo "XENGINE_LIB64=${{ github.workspace }}/libxengine/XEngine_Windows" | Out-File -FilePath $env:GITHUB_ENV -Append
47+
shell: pwsh
48+
- name: Set up Dependency x86_32 Environment
49+
if: matrix.platform == 'x86'
50+
run: |
51+
$response = Invoke-RestMethod -Uri "https://api.github.com/repos/libxengine/libxengine/releases/latest" -Headers @{"Accept"="application/vnd.github.v3+json"}
52+
$latest_tag = $response.tag_name
53+
Write-Host "Latest Tag: $latest_tag"
54+
55+
$url = "https://github.com/libxengine/libxengine/releases/download/$latest_tag/XEngine_Windows_x86-32.zip"
56+
Invoke-WebRequest -Uri $url -OutFile "XEngine_Windows_x86-32.zip"
57+
Expand-Archive -Path ./XEngine_Windows_x86-32.zip -DestinationPath ./XEngine_Windows -Force
58+
59+
echo "XENGINE_INCLUDE=${{ github.workspace }}/XEngine_Windows" | Out-File -FilePath $env:GITHUB_ENV -Append
60+
echo "XENGINE_LIB32=${{ github.workspace }}/XEngine_Windows/XEngine_Windows" | Out-File -FilePath $env:GITHUB_ENV -Append
4861
shell: pwsh
4962

50-
# 配置 MSBuild 的路径，准备构建 VC++ 项目
5163
- name: Setup MSBuild
5264
uses: microsoft/setup-msbuild@v2
53-
#编译
65+
5466
- name: Build Solution
5567
run: msbuild XEngine_Source/XEngine.sln /p:Configuration=${{ matrix.configuration }} /p:Platform=${{ matrix.platform }}
56-
#测试
68+
5769
- name: Conditional Step for x86 Release
5870
if: matrix.configuration == 'Release' && matrix.platform == 'x86'
5971
run: |
@@ -73,8 +85,7 @@ jobs:
7385
cd XEngine_Release
7486
./VSCopy_x64.bat
7587
shell: pwsh
76-
77-
#将文件夹打包为 artifact
88+
7889
- name: Upload folder as artifact with x86
7990
if: matrix.configuration == 'Release' && matrix.platform == 'x86'
8091
uses: actions/upload-artifact@v4

‎.github/workflows/release.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ jobs:
1616
with:
1717
fetch-depth: 0
1818

19-
- name: Download linuxbuild
19+
- name: Download ubuntubuild
2020
uses: dawidd6/action-download-artifact@v6
2121
with:
22-
workflow: linuxbuild.yml
22+
workflow: ubuntubuild.yml
2323
workflow_conclusion: success
2424
check_artifacts: false
2525
skip_unpack: true
@@ -84,6 +84,6 @@ jobs:
8484
draft: false
8585
prerelease: false
8686
tag_name: ${{ steps.versioning.outputs.new_tag }}
87-
name: XEngine_AuthorizeService ${{ steps.versioning.outputs.new_tag }}
87+
name: XEngine_Authorize ${{ steps.versioning.outputs.new_tag }}
8888
body_path: release_notes.txt
8989
files: ./XRelease/*.zip

.github/workflows/linuxbuild.yml renamed to .github/workflows/ubuntubuild.yml

Lines changed: 31 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@ name: ubuntu build workflows
22

33
on:
44
push:
5-
branches: [ "develop" ]
5+
branches:
6+
- 'develop'
67
paths:
78
- 'XEngine_Source/**'
89
- 'XEngine_Release/**'
9-
permissions:
10-
contents: read
10+
- '.github/**'
1111

1212
jobs:
1313
build:
@@ -17,17 +17,15 @@ jobs:
1717
matrix:
1818
include:
1919
- os: ubuntu-22.04
20-
#- os: ubuntu-24.04
20+
- os: ubuntu-24.04
2121
runs-on: ${{ matrix.os }}
2222

2323
steps:
24-
# 检出您的主仓库代码
2524
- name: Checkout main repository code
2625
uses: actions/checkout@v4
2726
with:
2827
ref: 'develop'
2928

30-
# 检出依赖的xengine仓库到指定的xengine目录
3129
- name: Checkout dependency repository (xengine)
3230
uses: actions/checkout@v4
3331
with:
@@ -39,14 +37,28 @@ jobs:
3937
git submodule init
4038
git submodule update
4139
42-
# 设置依赖库的环境变量
43-
- name: Set up Dependency Environment Variables
40+
- name: Set up Dependency ubuntu24.04 Environment
41+
if: matrix.os == 'ubuntu-24.04'
4442
run: |
4543
cd libxengine
4644
chmod 777 *
4745
sudo ./XEngine_LINEnv.sh -i 3
48-
cd ..
49-
#编译
46+
- name: Set up Dependency ubuntu22.04 Environment
47+
if: matrix.os == 'ubuntu-22.04'
48+
run: |
49+
cd libxengine
50+
chmod 777 *
51+
sudo ./XEngine_LINEnv.sh -i 0
52+
53+
latest_tag=$(curl -s https://api.github.com/repos/libxengine/libxengine/releases/latest | jq -r .tag_name)
54+
wget https://github.com/libxengine/libxengine/releases/download/$latest_tag/XEngine_UBuntu_22.04_x86-64.zip
55+
unzip ./XEngine_UBuntu_22.04_x86-64.zip -d ./XEngine_UBuntu_22.04_x86-64
56+
cd XEngine_UBuntu_22.04_x86-64
57+
58+
sudo cp -rf ./XEngine_Include /usr/local/include
59+
sudo find ./XEngine_Linux -name "*.so" -exec cp {} /usr/local/lib \;
60+
sudo ldconfig
61+
5062
- name: make
5163
run: |
5264
cd XEngine_Source
@@ -63,8 +75,15 @@ jobs:
6375
cd XEngine_Release
6476
./XEngine_AuthorizeService -t
6577
66-
- name: Upload folder as artifact with ubuntu
78+
- name: Upload folder as artifact with ubuntu22.04
79+
if: matrix.os == 'ubuntu-22.04'
80+
uses: actions/upload-artifact@v4
81+
with:
82+
name: XEngine_AuthorizeService-x86_64-Ubuntu-22.04
83+
path: XEngine_Release/
84+
- name: Upload folder as artifact with ubuntu24.04
85+
if: matrix.os == 'ubuntu-24.04'
6786
uses: actions/upload-artifact@v4
6887
with:
69-
name: XEngine_AuthorizeService-x86_64-Ubuntu
88+
name: XEngine_AuthorizeService-x86_64-Ubuntu-24.04
7089
path: XEngine_Release/

‎CHANGELOG‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,25 @@
1+
XEngine_Authorize V3.16.0.1001
2+
3+
更新:匹配XEngineV9
4+
更新:依赖库
5+
更新:升级编译器到c++20,c17
6+
修改:windows的构建从ansi修改为unicode版本
7+
修改:测试启动取消了发送信息报告的功能
8+
修正:app应用在windows构建问题
9+
修正:在其他语言系统下乱码问题
10+
修正:通告乱码问题
11+
修正:拷贝序列号错误
12+
13+
update:match xengine v9.x
14+
update:depend library
15+
update:compiler version to c++20 and c17
16+
modify:windows build character to unicode from ansi
17+
modify:cancel send info report when test start
18+
fixed:app build on windows
19+
fixed:Displays incorrectly in other language systems
20+
fixed:announcement context Garbled characters
21+
fixed:copy serial number incorrect
22+
================================================================
123
XEngine_Authorize V3.15.0.1001
224

325
增加:密码加密

‎README.en.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ feature list:
5353
## install
5454

5555
#### XEngine Evn
56-
you must install XEngine,need V8.15 or above,install XEngine can be refer to xengine Readme docment
56+
you must install XEngine,need V9.x or above,install XEngine can be refer to xengine Readme docment
5757
GITEE:https://gitee.com/libxengine/libxengine
5858
GITHUB:https://github.com/libxengine/libxengine
5959

@@ -74,7 +74,7 @@ Just Run it,use XEngine_AuthorizeService
7474
XEngine_AuthorizeApp is pc management tools
7575

7676
#### Linux
77-
use makefile compile,UBUNTU22.04 x64 or RockyLinux 9 x64
77+
use makefile compile,UBUNTU22.04 or above
7878
Run it on the terminal,use XEngine_AuthorizeService
7979

8080
#### Macos

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ XEngine_Authorize
6161
## 安装教程
6262

6363
#### XEngine环境
64-
必须安装XEngine,版本需要V8.15或者以上版本,安装XEngine可以参考其Readme文档
64+
必须安装XEngine,版本需要V9.x或者以上版本,安装XEngine可以参考其Readme文档
6565
GITEE:https://gitee.com/libxengine/libxengine
6666
GITHUB:https://github.com/libxengine/libxengine
6767

@@ -83,7 +83,7 @@ git submodule update
8383
XEngine_AuthorizeApp为PC端管理工具
8484

8585
#### Linux
86-
Linux使用Makefile编译,UBUNTU22.04 x64或者RockyLinux 9 x64
86+
Linux使用Makefile编译,UBUNTU22.04或者以上系统
8787
在控制台运行,使用XEngine_AuthorizeService
8888

8989
#### Macos

0 commit comments

Comments
 (0)