diff options
author | Benjamin Barenblat <benjamin@barenblat.name> | 2017-07-23 08:41:33 -0400 |
---|---|---|
committer | Benjamin Barenblat <benjamin@barenblat.name> | 2017-07-23 08:41:33 -0400 |
commit | 88fa6f57be4b520e2a01dd476d249e91ba7f262e (patch) | |
tree | 491d3b13813610943c60460d3e178d3a73916346 /Makefile.am | |
parent | 6145d9df05f442e29dfa96a0b8e15ffcc2d683dd (diff) | |
parent | f814fd699dc707e810c996062370ee787863d926 (diff) |
Merge branch 'upstream' into dfsg_clean20170720+dfsg
Diffstat (limited to 'Makefile.am')
-rw-r--r-- | Makefile.am | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index 83a08171..f0392de0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -19,6 +19,7 @@ SUBDIRS = src/c smlnj: src/urweb.cm xml/entities.sml mlton: bin/urweb +mlton-tc: bin/urwebtc clean-local: rm -f bin/urweb src/urweb.mlton.* \ @@ -60,6 +61,12 @@ bin/urweb: src/compiler.mlb xml/entities.sml \ src/urweb.mlton.grm.sig src/urweb.mlton.grm.sml mkdir -p bin $(MLTON) $(MLTONARGS) -mlb-path-var 'SRC $(abs_srcdir)/src' -mlb-path-var 'BUILD $(abs_builddir)/src' -output $@ $< +bin/urwebtc: src/compiler.mlb xml/entities.sml \ + src/urweb.mlb $(srcdir)/src/*.sig $(srcdir)/src/*.sml src/config.sml \ + src/urweb.mlton.lex.sml \ + src/urweb.mlton.grm.sig src/urweb.mlton.grm.sml + mkdir -p bin + $(MLTON) $(MLTONARGS) -prefer-abs-paths true -show-def-use compiler.du -stop tc -mlb-path-var 'SRC $(abs_srcdir)/src' -mlb-path-var 'BUILD $(abs_builddir)/src' -output $@ $< xml/entities.sml: xml/parse xml/xhtml-lat1.ent xml/xhtml-special.ent xml/xhtml-symbol.ent $^ > $@ @@ -116,7 +123,7 @@ test: bin/urweb -boot -noEmacs -dbms sqlite -db $(TESTDB) -demo /Demo demo rm -f $(TESTDB) sqlite3 $(TESTDB) < demo/demo.sql - demo/demo.exe -a 127.0.0.1 & echo $$! > $(TESTPID) + demo/demo.exe -q -a 127.0.0.1 & echo $$! > $(TESTPID) sleep 1 (curl -s 'http://localhost:8080/Demo/Hello/main' | diff tests/hello.html -) || (kill `cat $(TESTPID)`; echo "Test 'Hello' failed"; /bin/false) (curl -s 'http://localhost:8080/Demo/Crud1/create?A=1&B=2&C=3&D=4' | diff tests/crud1.html -) || (kill `cat $(TESTPID)`; echo "Test 'Crud1' failed"; /bin/false) @@ -126,7 +133,7 @@ test: echo "Running IPv6 tests."; \ rm -f $(TESTDB); \ sqlite3 $(TESTDB) < demo/demo.sql; \ - demo/demo.exe -A ::1 & echo $$! > $(TESTPID); \ + demo/demo.exe -q -A ::1 & echo $$! > $(TESTPID); \ sleep 1; \ (curl -g -6 -s 'http://[::1]:8080/Demo/Hello/main' | diff tests/hello.html -) || (kill `cat $(TESTPID)`; echo "Test 'Hello' failed"; /bin/false); \ (curl -g -6 -s 'http://[::1]:8080/Demo/Crud1/create?A=1&B=2&C=3&D=4' | diff tests/crud1.html -) || (kill `cat $(TESTPID)`; echo "Test 'Crud1' failed"; /bin/false); \ |