Skip to content

Commit 20440fa

Browse files
xengine-qytxengine-qyt
committed
ci:modify depend library path
1 parent 11f0df0 commit 20440fa

File tree

10 files changed

+26
-59
lines changed

10 files changed

+26
-59
lines changed

‎.github/workflows/Rocky_build.yml‎

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -42,21 +42,10 @@ jobs:
4242
repository: libxengine/libxengine
4343
path: libxengine
4444

45-
- name: sub module checkout (XEngine_OPenSource)
46-
uses: actions/checkout@v4
47-
with:
48-
repository: libxengine/XEngine_OPenSource
49-
path: XEngine_Source/XEngine_Depend
50-
- name: sub module checkout (XEngine_PhoneData)
51-
uses: actions/checkout@v4
52-
with:
53-
repository: libxengine/XEngine_PhoneData
54-
path: XEngine_Source/XEngine_DBDepend/XEngine_PhoneData
55-
- name: sub module checkout (XEngine_IPMacData)
56-
uses: actions/checkout@v4
57-
with:
58-
repository: libxengine/XEngine_IPMacData
59-
path: XEngine_Source/XEngine_DBDepend/XEngine_IPMacData
45+
- name: sub module checkout (opensource)
46+
run: |
47+
git submodule init
48+
git submodule update
6049
6150
- name: Set TERM variable
6251
run: echo "TERM=xterm" >> $GITHUB_ENV

‎.github/workflows/debian_build.yml‎

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -38,21 +38,10 @@ jobs:
3838
repository: libxengine/libxengine
3939
path: libxengine
4040

41-
- name: sub module checkout (XEngine_OPenSource)
42-
uses: actions/checkout@v4
43-
with:
44-
repository: libxengine/XEngine_OPenSource
45-
path: XEngine_Source/XEngine_Depend
46-
- name: sub module checkout (XEngine_PhoneData)
47-
uses: actions/checkout@v4
48-
with:
49-
repository: libxengine/XEngine_PhoneData
50-
path: XEngine_Source/XEngine_DBDepend/XEngine_PhoneData
51-
- name: sub module checkout (XEngine_IPMacData)
52-
uses: actions/checkout@v4
53-
with:
54-
repository: libxengine/XEngine_IPMacData
55-
path: XEngine_Source/XEngine_DBDepend/XEngine_IPMacData
41+
- name: sub module checkout (opensource)
42+
run: |
43+
git submodule init
44+
git submodule update
5645
5746
- name: Set TERM variable
5847
run: echo "TERM=xterm" >> $GITHUB_ENV

‎.github/workflows/fedora_build.yml‎

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -42,21 +42,10 @@ jobs:
4242
repository: libxengine/libxengine
4343
path: libxengine
4444

45-
- name: sub module checkout (XEngine_OPenSource)
46-
uses: actions/checkout@v4
47-
with:
48-
repository: libxengine/XEngine_OPenSource
49-
path: XEngine_Source/XEngine_Depend
50-
- name: sub module checkout (XEngine_PhoneData)
51-
uses: actions/checkout@v4
52-
with:
53-
repository: libxengine/XEngine_PhoneData
54-
path: XEngine_Source/XEngine_DBDepend/XEngine_PhoneData
55-
- name: sub module checkout (XEngine_IPMacData)
56-
uses: actions/checkout@v4
57-
with:
58-
repository: libxengine/XEngine_IPMacData
59-
path: XEngine_Source/XEngine_DBDepend/XEngine_IPMacData
45+
- name: sub module checkout (opensource)
46+
run: |
47+
git submodule init
48+
git submodule update
6049
6150
- name: install system package
6251
run: |

‎XEngine_Source/XEngine_ModuleConfigure/Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ CC = g++ -Wall -std=c++20 -fPIC
22
PLATVER =
33
FILEEXT =
44
LIBFLAG =
5-
LOADHDR = -I ./ -I ../XEngine_Depend/XEngine_Module/jsoncpp
6-
LOADSO = -L ../XEngine_Depend/XEngine_Module/jsoncpp
5+
LOADHDR = -I ./ -I ../XEngine_DependLibrary/XEngine_OPenSource/XEngine_Module/jsoncpp
6+
LOADSO = -L ../XEngine_DependLibrary/XEngine_OPenSource/XEngine_Module/jsoncpp
77
LIB = -ljsoncpp
88
LIBEX =
99
OBJECTS = ModuleConfigure_Json.o pch.o

‎XEngine_Source/XEngine_ModuleProtocol/Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ CC = g++ -Wall -std=c++20 -fPIC
22
PLATVER =
33
FILEEXT =
44
LIBFLAG =
5-
LOADHDR = -I ./ -I ../XEngine_Depend/XEngine_Module/jsoncpp
6-
LOADSO = -L ../XEngine_Depend/XEngine_Module/jsoncpp
5+
LOADHDR = -I ./ -I ../XEngine_DependLibrary/XEngine_OPenSource/XEngine_Module/jsoncpp
6+
LOADSO = -L ../XEngine_DependLibrary/XEngine_OPenSource/XEngine_Module/jsoncpp
77
LIB = -lXEngine_BaseLib -lNetHelp_XSocket -lXEngine_SystemApi -lNetHelp_APIAddr -ljsoncpp
88
LIBEX =
99
OBJECTS = ModuleProtocol_Packet.o ModuleProtocol_Parse.o pch.o

‎XEngine_Source/XEngine_PluginModule/ModulePlugin_BMIndex/Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ CC = g++ -Wall -std=c++20 -fPIC
22
PLATVER =
33
FILEEXT =
44
LIBFLAG =
5-
LOADHDR = -I ./ -I ../../XEngine_Depend/XEngine_Module/jsoncpp
6-
LOADSO = -L ../../XEngine_Depend/XEngine_Module/jsoncpp
5+
LOADHDR = -I ./ -I ../XEngine_DependLibrary/XEngine_OPenSource/XEngine_Module/jsoncpp
6+
LOADSO = -L ../XEngine_DependLibrary/XEngine_OPenSource/XEngine_Module/jsoncpp
77
LIB = -lXEngine_BaseLib -ljsoncpp
88
LIBEX =
99
OBJECTS = Plugin_BMIndex.o pch.o

‎XEngine_Source/XEngine_PluginModule/ModulePlugin_Meter/Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ CC = g++ -Wall -std=c++20 -fPIC
22
PLATVER =
33
FILEEXT =
44
LIBFLAG =
5-
LOADHDR = -I ./ -I ../../XEngine_Depend/XEngine_Module/jsoncpp
6-
LOADSO = -L ../../XEngine_Depend/XEngine_Module/jsoncpp
5+
LOADHDR = -I ./ -I ../XEngine_DependLibrary/XEngine_OPenSource/XEngine_Module/jsoncpp
6+
LOADSO = -L ../XEngine_DependLibrary/XEngine_OPenSource/XEngine_Module/jsoncpp
77
LIB = -lXEngine_BaseLib -ljsoncpp
88
LIBEX =
99
OBJECTS = Plugin_Meter.o pch.o

‎XEngine_Source/XEngine_PluginModule/ModulePlugin_Password/Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ CC = g++ -Wall -std=c++20 -fPIC
22
PLATVER =
33
FILEEXT =
44
LIBFLAG =
5-
LOADHDR = -I ./ -I ../../XEngine_Depend/XEngine_Module/jsoncpp
6-
LOADSO = -L ../../XEngine_Depend/XEngine_Module/jsoncpp
5+
LOADHDR = -I ./ -I ../XEngine_DependLibrary/XEngine_OPenSource/XEngine_Module/jsoncpp
6+
LOADSO = -L ../XEngine_DependLibrary/XEngine_OPenSource/XEngine_Module/jsoncpp
77
LIB = -lXEngine_BaseLib -ljsoncpp
88
LIBEX =
99
OBJECTS = Plugin_Password.o pch.o

‎XEngine_Source/XEngine_PluginModule/ModulePlugin_Timezone/Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ CC = g++ -Wall -std=c++20 -fPIC
22
PLATVER =
33
FILEEXT =
44
LIBFLAG =
5-
LOADHDR = -I ./ -I ../../XEngine_Depend/XEngine_Module/jsoncpp
6-
LOADSO = -L ../../XEngine_Depend/XEngine_Module/jsoncpp
5+
LOADHDR = -I ./ -I ../XEngine_DependLibrary/XEngine_OPenSource/XEngine_Module/jsoncpp
6+
LOADSO = -L ../XEngine_DependLibrary/XEngine_OPenSource/XEngine_Module/jsoncpp
77
LIB = -lXEngine_BaseLib -ljsoncpp
88
LIBEX =
99
OBJECTS = Plugin_Timezone.o pch.o

‎XEngine_Source/XEngine_PluginModule/ModulePlugin_Zodiac/Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ CC = g++ -Wall -std=c++20 -fPIC
22
PLATVER =
33
FILEEXT =
44
LIBFLAG =
5-
LOADHDR = -I ./ -I ../../XEngine_Depend/XEngine_Module/jsoncpp
6-
LOADSO = -L ../../XEngine_Depend/XEngine_Module/jsoncpp
5+
LOADHDR = -I ./ -I ../XEngine_DependLibrary/XEngine_OPenSource/XEngine_Module/jsoncpp
6+
LOADSO = -L ../XEngine_DependLibrary/XEngine_OPenSource/XEngine_Module/jsoncpp
77
LIB = -lXEngine_BaseLib -lXEngine_Algorithm -ljsoncpp
88
LIBEX =
99
OBJECTS = Plugin_Zodiac.o pch.o

0 commit comments

Comments
 (0)