Skip to content

Commit 5c3dc5d

Browse files
committed
update:read me and msbuild.yml
1 parent ad692fc commit 5c3dc5d

File tree

3 files changed

+22
-32
lines changed

3 files changed

+22
-32
lines changed

.github/workflows/msbuild.yml

Lines changed: 6 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,11 @@ on:
1212
jobs:
1313
build:
1414
strategy:
15+
# 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.
1516
fail-fast: false
1617
matrix:
17-
os:
18-
- windows-11-arm
19-
- windows-latest
20-
configuration:
21-
- Debug
22-
- Release
23-
platform:
24-
- x86
25-
- x64
26-
- ARM64
18+
configuration: [Debug ,Release]
19+
platform: [x86 ,x64 ,ARM64]
2720

2821
runs-on: windows-latest # 最新的 Windows 环境
2922

@@ -49,13 +42,13 @@ jobs:
4942

5043
# 设置依赖库的环境变量
5144
- name: Set up Dependency x86_64 Environment
52-
if: matrix.platform == 'x64' || matrix.platform == 'windows-latest'
45+
if: matrix.platform == 'x64'
5346
run: |
5447
echo "XENGINE_INCLUDE=${{ github.workspace }}/xengine" | Out-File -FilePath $env:GITHUB_ENV -Append
5548
echo "XENGINE_LIB64=${{ github.workspace }}/xengine/XEngine_Windows" | Out-File -FilePath $env:GITHUB_ENV -Append
5649
shell: pwsh
5750
- name: Set up Dependency x86_32 Environment
58-
if: matrix.platform == 'x86' || matrix.platform == 'windows-latest'
51+
if: matrix.platform == 'x86'
5952
run: |
6053
$response = Invoke-RestMethod -Uri "https://api.github.com/repos/libxengine/libxengine/releases/latest" -Headers @{"Accept"="application/vnd.github.v3+json"}
6154
$latest_tag = $response.tag_name
@@ -68,7 +61,7 @@ jobs:
6861
echo "XENGINE_LIB32=${{ github.workspace }}/XEngine_Windows/XEngine_Windows" | Out-File -FilePath $env:GITHUB_ENV -Append
6962
shell: pwsh
7063
- name: Set up Dependency ARM64 Environment
71-
if: matrix.platform == 'ARM64' || matrix.platform == 'windows-11-arm'
64+
if: matrix.platform == 'ARM64'
7265
run: |
7366
$response = Invoke-RestMethod -Uri "https://api.github.com/repos/libxengine/libxengine/releases/latest" -Headers @{"Accept"="application/vnd.github.v3+json"}
7467
$latest_tag = $response.tag_name
@@ -120,9 +113,4 @@ jobs:
120113
cp -r XEngine_Source/VSCopy_Arm64.bat XEngine_Release/
121114
cd XEngine_Release
122115
./VSCopy_Arm64.bat
123-
./XEngine_CenterApp -t
124-
./XEngine_Http2App -t
125-
./XEngine_HttpApp -t
126-
./XEngine_SimpleApp -t
127-
./XEngine_WebSocketApp -t
128116
shell: pwsh

README.en.md

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -43,19 +43,20 @@ use vs open and compile,suport windows 7sp1 and above
4343
Just Run it
4444

4545
#### Linux
46-
use makefile compile,UBUNTU22.04 x64 or RockyLinux9 x64
46+
use makefile compile,UBUNTU22.04 or RockyLinux9 and above
4747
Run it on the terminal
4848

49-
#### Macos
50-
use makefile compile,mac 13 and above
51-
Run it on the terminal
52-
53-
##### Screenshot of the program
49+
##### Build Command
5450
execute command in XEngine_Source path
55-
make complie
51+
make RELEASE=0 debug build
52+
make RELEASE=1 release build
5653
make FLAGS=InstallAll Install File
5754
make FLAGS=CleanAll Clear Complie
5855

56+
#### Macos
57+
use makefile compile,mac 13 and above
58+
Run it on the terminal,build command refer linux
59+
5960
## How to develop
6061
XEngine_CenterApp service is mainly used for TCP protocol, you can write your TCP(Business) operation related processing code here
6162
XEngine_HttpApp service is mainly used for HTTP protocol, you can write your HTTP operation related processing code here

README.md

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -44,19 +44,20 @@ git submodule update
4444
直接运行即可
4545

4646
#### Linux
47-
Linux使用Makefile编译,UBUNTU22.04 x64或者RockyLinux9 x64
47+
Linux使用Makefile编译,UBUNTU22.04或者RockyLinux9以及以上系统
4848
在控制台运行
4949

50-
#### Macos
51-
使用makefile编译,控制台运行,需要mac 13以及以上版本
52-
在控制台运行
53-
54-
##### 编译命令
50+
###### 编译命令
5551
在XEngine_Source目录下执行命令
56-
make 编译
52+
make RELEASE=0 调试编译
53+
make RELEASE=1 发布编译
5754
make FLAGS=InstallAll 安装库程序
5855
make FLAGS=CleanAll 清理编译
5956

57+
#### Macos
58+
使用makefile编译,控制台运行,需要mac 13以及以上版本
59+
在控制台运行,编译命令参考linux
60+
6061
## 如何开发
6162
XEngine_CenterApp 服务主要是用于TCP协议,可在这里面编写你的业务服务相关处理代码
6263
XEngine_HttpApp 服务主要用于HTTP协议,可在这里编写你的HTTP操作相关处理代码

0 commit comments

Comments
 (0)