Skip to content

Commit 42e377a

Browse files
committed
update:build improved
ci:delete issue-translator.yml
1 parent 416ce75 commit 42e377a

4 files changed

Lines changed: 24 additions & 26 deletions

File tree

.github/workflows/codeql.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,11 +59,13 @@ jobs:
5959
uses: github/codeql-action/init@v4
6060
with:
6161
languages: ${{ matrix.language }}
62+
build-mode: manual
63+
queries: security-and-quality
6264

63-
- name: make
65+
- name: make check
6466
run: |
6567
cd XEngine_Source
66-
make
68+
make BUILDTYPE=2
6769
6870
- name: Perform CodeQL Analysis
6971
uses: github/codeql-action/analyze@v4

.github/workflows/issue-translator.yml

Lines changed: 0 additions & 15 deletions
This file was deleted.

.github/workflows/release.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
fetch-depth: 0
1818

1919
- name: Download ubuntu build
20-
uses: dawidd6/action-download-artifact@v20
20+
uses: dawidd6/action-download-artifact@v21
2121
with:
2222
workflow: Ubuntu_build.yml
2323
workflow_conclusion: success
@@ -26,7 +26,7 @@ jobs:
2626
if_no_artifact_found: fail
2727
path: ./XRelease/
2828
- name: Download debian build
29-
uses: dawidd6/action-download-artifact@v20
29+
uses: dawidd6/action-download-artifact@v21
3030
with:
3131
workflow: debian_build.yml
3232
workflow_conclusion: success
@@ -35,7 +35,7 @@ jobs:
3535
if_no_artifact_found: fail
3636
path: ./XRelease/
3737
- name: Download fedora build
38-
uses: dawidd6/action-download-artifact@v20
38+
uses: dawidd6/action-download-artifact@v21
3939
with:
4040
workflow: fedora_build.yml
4141
workflow_conclusion: success
@@ -44,7 +44,7 @@ jobs:
4444
if_no_artifact_found: fail
4545
path: ./XRelease/
4646
- name: Download Rocky build
47-
uses: dawidd6/action-download-artifact@v20
47+
uses: dawidd6/action-download-artifact@v21
4848
with:
4949
workflow: Rocky_build.yml
5050
workflow_conclusion: success
@@ -53,7 +53,7 @@ jobs:
5353
if_no_artifact_found: fail
5454
path: ./XRelease/
5555
- name: Download CentOS build
56-
uses: dawidd6/action-download-artifact@v20
56+
uses: dawidd6/action-download-artifact@v21
5757
with:
5858
workflow: Centos_build.yml
5959
workflow_conclusion: success
@@ -62,7 +62,7 @@ jobs:
6262
if_no_artifact_found: fail
6363
path: ./XRelease/
6464
- name: Download macbuild
65-
uses: dawidd6/action-download-artifact@v20
65+
uses: dawidd6/action-download-artifact@v21
6666
with:
6767
workflow: macbuild.yml
6868
workflow_conclusion: success
@@ -71,7 +71,7 @@ jobs:
7171
if_no_artifact_found: fail
7272
path: ./XRelease/
7373
- name: Download msbuild
74-
uses: dawidd6/action-download-artifact@v20
74+
uses: dawidd6/action-download-artifact@v21
7575
with:
7676
workflow: msbuild.yml
7777
workflow_conclusion: success

XEngine_Source/Makefile

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
RELEASE = 0
22
UNICODE = 0
33
PLATFORM=linux
4+
BUILDTYPE=0
45
FLAGS=
56

67
#要编译的模块
@@ -31,12 +32,22 @@ else ifeq ($(PLATFORM),mac)
3132
FILEEXT = dylib
3233
endif
3334

34-
XENGINE_MODULES = libjsoncpp.so libXEngine_InfoReport.so libXEngine_Verification.so libXEngine_PluginExtension.so \
35-
libXEngine_ModuleConfigure.so libXEngine_ModuleDatabase.so libXEngine_ModuleProtocol.so libXEngine_ModuleSystem.so libXEngine_ModuleHelp.so \
35+
# 第三方库模块
36+
MODULES_THIRD = libjsoncpp.so libXEngine_InfoReport.so libXEngine_Verification.so libXEngine_PluginExtension.so
37+
# 业务模块 + 应用
38+
MODULES_APP = libXEngine_ModuleConfigure.so libXEngine_ModuleDatabase.so libXEngine_ModuleProtocol.so libXEngine_ModuleSystem.so libXEngine_ModuleHelp.so \
3639
libModulePlugin_Zodiac.so libModulePlugin_Password.so libModulePlugin_Timezone.so libModulePlugin_BMIndex.so libModulePlugin_Meter.so \
3740
libXEngine_APIModulePhone.so libXEngine_APIModuleIPMac.so \
3841
XEngine_HttpApp.exe
3942

43+
ifeq ($(BUILDTYPE),0)
44+
XENGINE_MODULES = $(MODULES_THIRD) $(MODULES_APP)
45+
else ifeq ($(BUILDTYPE),1)
46+
XENGINE_MODULES = $(MODULES_THIRD)
47+
else ifeq ($(BUILDTYPE),2)
48+
XENGINE_MODULES = $(MODULES_APP)
49+
endif
50+
4051
.PHONY:MakeAll
4152
MakeAll:$(XENGINE_MODULES)
4253

0 commit comments

Comments
 (0)