Skip to content

Commit aa77baf

Browse files
pgervaisfundamental
authored andcommitted
Some cleanup in Makefile
Removed obsolete comment Improved help messages for a few targets Factored out the zest invocation Drop redundant target 'trace' which does the same thing as 'verbose'
1 parent 920f88b commit aa77baf

File tree

1 file changed

+12
-18
lines changed

1 file changed

+12
-18
lines changed

Makefile

Lines changed: 12 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ linux:
1212
$(AR) rc deps/libnanovg.a deps/nanovg/src/*.o
1313
cd deps/mruby-file-stat/src && ../configure
1414
cd src/osc-bridge && make lib
15-
# cd mruby && UI_HOTLOAD=1 MRUBY_CONFIG=../build_config.rb rake
1615
# force rebuilding all code that depends on hotloading.
1716
touch src/mruby-widget-lib/src/api.c
1817
cd mruby && $(HOTLOADING) MRUBY_CONFIG=../build_config.rb rake
@@ -122,34 +121,33 @@ stats:
122121
@echo 'total lines of code:'
123122
@wc -l `find src/ -type f | grep -Ee "(qml|rb|c|h)$$" | grep -v fcache` | tail -n 1
124123

125-
126124
verbose: ## Compile mruby with --trace
127-
cd mruby && MRUBY_CONFIG=../build_config.rb rake --trace
128-
129-
trace:
130125
cd mruby && MRUBY_CONFIG=../build_config.rb rake --trace
131126

132127
test:
133-
cd mruby && MRUBY_CONFIG=../build_config.rb rake test
128+
cd mruby && MRUBY_CONFIG=../build_config.rb rake test
134129

135130
rtest:
136131
cd src/mruby-qml-parse && ruby test-non-mruby.rb
137132
cd src/mruby-qml-spawn && ruby test-non-mruby.rb
138133

139-
run: ## Run the toolkit
140-
./zest osc.udp://127.0.0.1:1337
134+
# How to launch zest locally during development.
135+
ZEST_LAUNCH_CMD=./zest osc.udp://127.0.0.1:1337
136+
137+
run: ## Launch zest. Connects to an already running zynaddsubfx via port 1337.
138+
$(ZEST_LAUNCH_CMD)
141139

142-
valgrind: ## Launch with valgrind
143-
valgrind --leak-check=full --show-reachable=yes --log-file=leak-log.txt ./zest osc.udp://127.0.0.1:1337
140+
valgrind: ## Launch zest with valgrind
141+
valgrind --leak-check=full --show-reachable=yes --log-file=leak-log.txt $(ZEST_LAUNCH_CMD)
144142

145-
callgrind: ## Launch with callgrind
146-
valgrind --tool=callgrind --dump-instr=yes --collect-jumps=yes ./zest osc.udp://127.0.0.1:1337
143+
callgrind: ## Launch zest with callgrind
144+
valgrind --tool=callgrind --dump-instr=yes --collect-jumps=yes $(ZEST_LAUNCH_CMD)
147145

148146
gdb:
149-
gdb --args ./zest osc.udp://127.0.0.1:1337
147+
gdb --args $(ZEST_LAUNCH_CMD)
150148

151149
gltrace: ## Launch with apitrace
152-
/work/mytmp/apitrace/build/apitrace trace ./zest osc.udp://127.0.0.1:1337
150+
/work/mytmp/apitrace/build/apitrace trace $(ZEST_LAUNCH_CMD)
153151

154152
qtrace:
155153
/work/mytmp/apitrace/build/qapitrace ./mruby.trace
@@ -199,9 +197,6 @@ put32: ## Push to the server
199197
put64: ## Push to the server
200198
scp zest-dist-x86_64.tar.bz2 [email protected]:/var/www/htdocs/zest/
201199

202-
packsrc:
203-
git-archive-all zynaddsubfx-3.0.0.tar.bz2
204-
205200
putsrc:
206201
scp zynaddsubfx-3.0.0.tar.bz2 [email protected]:/var/www/htdocs/zest/
207202

@@ -210,4 +205,3 @@ putsrc:
210205
help: ## This help
211206
@grep -E '^[a-zA-Z0-9_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'
212207

213-

0 commit comments

Comments
 (0)