@@ -22,6 +22,7 @@ TIDIED_FILES = deps*/*.c deps*/*.h term*/*.c term*/*.h ctable*/*.c ctable*/*.h *
22
22
reproc-test/*.c reproc-test/*.h \
23
23
list-test/*.c list-test/*.h \
24
24
*-test/*.c *-test/*.h \
25
+ intro*/*.c intro*/*.h \
25
26
# #######################################################
26
27
TRIGGER_FILE=.trigger.c
27
28
# #############################################################
@@ -39,10 +40,8 @@ uncrustify:
39
40
@$(UNCRUSTIFY ) -c etc/uncrustify.cfg --replace $(TIDIED_FILES ) || true
40
41
uncrustify-clean :
41
42
@find . -type f -maxdepth 2 -name " *unc-back*" | xargs -I % unlink %
42
-
43
43
clean :
44
44
@rm -rf build .cache
45
-
46
45
fix-dbg :
47
46
@$(SED ) ' s|, % c);|, %c);|g' -i $(TIDIED_FILES )
48
47
@$(SED ) ' s|, % u);|, %u);|g' -i $(TIDIED_FILES )
@@ -53,9 +52,9 @@ fix-dbg:
53
52
do-meson :
54
53
@eval cd . && { meson build || { meson build --reconfigure || { meson build --wipe; } && meson build; }; echo MESON OK; }
55
54
do-ninja :
56
- @eval cd . && { ninja -C build; echo NINJA OK ; }
55
+ @ninja -C build
57
56
do-ninja-test :
58
- @eval cd . && { passh ninja test -C build -v; echo NINJA TEST OK ; }
57
+ @passh ninja test -C build -v
59
58
do-deps-test :
60
59
@passh ./build/deps-test/deps-test -v
61
60
do-sync :
@@ -77,16 +76,15 @@ do-nodemon:
77
76
-w " chan-test/*.c" -w " chan-test/*.h" \
78
77
-w " reproc-test/*.c" -w " reproc-test/*.h" \
79
78
-w " *-test/*.c" -w " *-test/*.h" \
79
+ -w " */*.c" -w " */*.h" \
80
80
-w " introspect-test/*.c" -w " introspect-test/*.h" \
81
81
-w " introspect/*.c" -w " introspect/*.h" \
82
82
-w " term-tests-test" \
83
83
-e Makefile,tpl,build,sh,c,h,Makefile \
84
- -x env -- bash -xc ' make'
85
-
84
+ -x env -- bash -c ' make||true'
86
85
tests-log :
87
86
@rm .test* .log 2> /dev/null|| true
88
87
@./build/deps-test/deps-test -l | tee $(TESTS_LIST_LOG_FILE ) > /dev/null
89
-
90
88
tests-tests : tests-log
91
89
@grep -v " ^* Suite .*:" $(TESTS_LIST_LOG_FILE ) \
92
90
| cut -d: -f1| cut -d ' ' -f3| sort -u | tee $(TESTS_TESTS_LOG_FILE ) > /dev/null
@@ -106,20 +104,16 @@ do-encode-tests: do-build do-tests tests-clean
106
104
do-tests : tests-log tests-suite-tests tests-suites
107
105
@rm .tests.json 2> /dev/null|| true
108
106
@./scripts/tests-encoder.sh > .tests.json && clear && jq -c < .tests.json
109
-
110
107
git-submodules-pull :
111
108
@git submodule foreach git pull origin master --jobs=10
112
-
113
109
git-submodules-update :
114
110
@git submodule update --init
115
- # --recursive
116
-
117
111
git-pull :
118
112
@git pull --recurse-submodules
119
-
120
113
do-uncrustify : uncrustify uncrustify-clean fix-dbg
121
114
do-build : do-meson do-ninja
122
- do-test : do-ninja-test do-deps-test
115
+ do-test : do-ninja-test
116
+ deps-test : do-deps-test
123
117
test : do-test
124
118
build : do-meson do-build
125
119
ansi : all do-sync do-ansi-make
@@ -135,6 +129,5 @@ trigger:
135
129
@touch $(TRIGGER_FILE )
136
130
meson-introspect-targets :
137
131
@meson introspect --targets -i meson.build
138
-
139
132
meson-binaries :
140
133
@meson introspect --targets meson.build -i | jq ' map(select(.type == "executable").filename)|flatten|join("\n")' -Mrc
0 commit comments