Skip to content

Commit 4d73e1f

Browse files
committed
Move compilation of 'trp-rt/' into the subfolder
1 parent 1410512 commit 4d73e1f

File tree

5 files changed

+19
-10
lines changed

5 files changed

+19
-10
lines changed

.github/workflows/run_tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,8 +108,8 @@ jobs:
108108
echo "Runtime built successfully, troupe.mjs found"
109109
- name: compile lib
110110
run: make lib
111-
- name: compile service
112-
run: make service
111+
- name: compile trp-rt
112+
run: make trp-rt
113113
- name: run basic test
114114
run: ./local.sh tests/rt/pos/core/fib10.trp
115115
- name: run ci network test

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,5 +31,4 @@ yarn-error.log
3131
*.swp
3232
bin/troupe
3333
bin/understudy
34-
trp-rt/out/
3534
*.#*

Makefile

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
.PHONY: rt compiler lib p2p-tools
1+
.PHONY: rt trp-rt compiler lib p2p-tools
22

33
# TODO: Rename to 'build/*' ?
4-
all: npm rt compiler p2p-tools lib service
4+
all: npm compiler rt trp-rt p2p-tools lib
55

66
npm:
77
npm install
@@ -20,16 +20,16 @@ p2p-tools:
2020
lib:
2121
cd lib; $(MAKE) build
2222

23-
service:
24-
mkdir -p ./trp-rt/out
25-
$(COMPILER) ./trp-rt/service.trp -l
23+
trp-rt:
24+
cd trp-rt/; $(MAKE) build
2625

27-
# TODO: Rename to 'clean/*' ?
28-
clean: clean/compiler clean/rt clean/lib
26+
clean: clean/compiler clean/rt clean/trp-rt clean/p2p-tools clean/lib
2927
clean/compiler:
3028
cd compiler; $(MAKE) clean
3129
clean/rt:
3230
cd rt; $(MAKE) clean
31+
clean/trp-rt:
32+
cd lib; $(MAKE) clean
3333
clean/p2p-tools:
3434
cd p2p-tools; $(MAKE) clean
3535
clean/lib:

trp-rt/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/out

trp-rt/Makefile

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
COMPILER=../bin/troupec
2+
3+
build:
4+
mkdir -p out
5+
# Standard Library
6+
$(COMPILER) ./service.trp -l
7+
8+
clean:
9+
rm -rf out

0 commit comments

Comments
 (0)