Skip to content

Commit 1260de1

Browse files
Rearrange submodules
1 parent 25dc06d commit 1260de1

File tree

4 files changed

+20
-21
lines changed

4 files changed

+20
-21
lines changed

.gitmodules

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
[submodule "main/embedded-bdi"]
2-
path = main/embedded-bdi
3-
url = https://github.com/matuzalemmuller/embedded-bdi.git
41
[submodule "ESP8266_RTOS_SDK"]
52
path = ESP8266_RTOS_SDK
63
url = https://github.com/matuzalemmuller/ESP8266_RTOS_SDK
4+
[submodule "embedded-bdi"]
5+
path = embedded-bdi
6+
url = https://github.com/matuzalemmuller/embedded-bdi

Makefile

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,23 @@
22
# This is a project Makefile. It is assumed the directory this Makefile resides in is a
33
# project subdirectory.
44
#
5-
65
############# MAKE AGENTSPEAK CODE TRANSLATION AND FLASH TO BOARD #############
76

87
interface=/dev/ttyUSB0
98

109
translate:
11-
javac -cp main/embedded-bdi/lib/parser/lib/jason-2.6.jar \
12-
main/embedded-bdi/lib/parser/src/translator/As2Json.java \
13-
main/embedded-bdi/lib/parser/src/translator/PlanSkeleton.java \
14-
main/embedded-bdi/lib/parser/src/translator/BodyInstruction.java \
15-
main/embedded-bdi/lib/parser/src/translator/EventOperatorType.java \
16-
main/embedded-bdi/lib/parser/src/translator/HeaderCreator.java
17-
18-
java -cp main/embedded-bdi/lib/parser/lib/jason-2.6.jar:main/embedded-bdi/lib/parser/src \
19-
translator.As2Json \
20-
main/data/agentspeak.asl \
21-
main/data/functions.h \
22-
main/src/config/configuration.h \
10+
javac -cp embedded-bdi/lib/parser/lib/jason-2.6.jar \
11+
embedded-bdi/lib/parser/src/translator/As2Json.java \
12+
embedded-bdi/lib/parser/src/translator/PlanSkeleton.java \
13+
embedded-bdi/lib/parser/src/translator/BodyInstruction.java \
14+
embedded-bdi/lib/parser/src/translator/EventOperatorType.java \
15+
embedded-bdi/lib/parser/src/translator/HeaderCreator.java
16+
17+
java -cp embedded-bdi/lib/parser/lib/jason-2.6.jar:embedded-bdi/lib/parser/src \
18+
translator.As2Json \
19+
data/agentspeak.asl \
20+
data/functions.h \
21+
src/config/configuration.h \
2322
$(EVENT_BASE_SIZE) $(INTENTION_BASE_SIZE) $(INTENTION_STACK_SIZE)
2423

2524
agent: translate

main/CMakeLists.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
cmake_minimum_required(VERSION 3.5)
22

3-
FILE(GLOB EMB_BDI_AGENT_SOURCES embedded-bdi/lib/agent/*.cpp)
4-
FILE(GLOB EMB_BDI_BDI_SOURCES embedded-bdi/lib/bdi/*.cpp)
5-
FILE(GLOB EMB_BDI_LIB_SOURCES embedded-bdi/lib/lib/*.cpp)
6-
FILE(GLOB EMB_BDI_SYNTAX_SOURCES embedded-bdi/lib/syntax/*.cpp)
3+
FILE(GLOB EMB_BDI_AGENT_SOURCES ../embedded-bdi/lib/agent/*.cpp)
4+
FILE(GLOB EMB_BDI_BDI_SOURCES ../embedded-bdi/lib/bdi/*.cpp)
5+
FILE(GLOB EMB_BDI_LIB_SOURCES ../embedded-bdi/lib/lib/*.cpp)
6+
FILE(GLOB EMB_BDI_SYNTAX_SOURCES ../embedded-bdi/lib/syntax/*.cpp)
77

88
set(COMPONENT_SRCS src/agent_loop.cpp ${EMB_BDI_AGENT_SOURCES} ${EMB_BDI_BDI_SOURCES} ${EMB_BDI_LIB_SOURCES} ${EMB_BDI_SYNTAX_SOURCES})
9-
set(COMPONENT_ADD_INCLUDEDIRS "src embedded-bdi/lib data")
9+
set(COMPONENT_ADD_INCLUDEDIRS "src ../embedded-bdi/lib data")
1010

1111
register_component()

0 commit comments

Comments
 (0)