diff options
| author | John MacFarlane <jgm@berkeley.edu> | 2014-10-18 16:16:49 -0700 |
|---|---|---|
| committer | John MacFarlane <jgm@berkeley.edu> | 2014-10-18 16:39:33 -0700 |
| commit | fb143fbc1705bb4d59b5d4ebbb5454866cf1b76c (patch) | |
| tree | 1becd79cad3a3554197b2b66b5bdcd0b7b49952f /Makefile | |
| parent | 3bd95fb5113d5e805556a124a3a4e84c43882adb (diff) | |
Use browserify to make js code more modular.
* Moved js library code to `js/lib`.
* `js/stmd.js` is now generated from these files using browserify.
* Factored out `html5-entities.js` and `from-code-point.js` from main
js parsing code (which is now `index.js`).
* Moved `js/markdown` to `js/bin`.
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 10 |
1 files changed, 7 insertions, 3 deletions
@@ -4,6 +4,7 @@ SRCDIR?=src DATADIR?=data BENCHINP?=bench.md PROG?=./stmd +JSMODULES=$(wildcard js/lib/*.js) .PHONY: all test spec benchjs testjs all: $(SRCDIR)/case_fold_switch.inc $(PROG) @@ -31,9 +32,11 @@ spec.pdf: spec.md template.tex specfilter.hs test: spec.txt perl runtests.pl $< $(PROG) +js/stmd.js: js/lib/index.js ${JSMODULES} + browserify --standalone stmd $< -o $@ + testjs: spec.txt node js/test.js -# perl runtests.pl js/markdown $< benchjs: node js/bench.js ${BENCHINP} @@ -56,7 +59,7 @@ $(SRCDIR)/html/html_unescape.h: $(SRCDIR)/html/html_unescape.gperf .PHONY: leakcheck clean fuzztest dingus upload -dingus: +dingus: js/stmd.js cd js && echo "Starting dingus server at http://localhost:9000" && python -m SimpleHTTPServer 9000 leakcheck: $(PROG) @@ -70,7 +73,7 @@ fuzztest: for i in `seq 1 10`; do \ time cat /dev/urandom | head -c 100000 | iconv -f latin1 -t utf-8 | $(PROG) >/dev/null; done -update-site: spec.html narrative.html +update-site: spec.html narrative.html js/stmd.js cp spec.html _site/ cp narrative.html _site/index.html cp -r js/* _site/js/ @@ -78,6 +81,7 @@ update-site: spec.html narrative.html clean: -rm -f test $(SRCDIR)/*.o $(SRCDIR)/scanners.c $(SRCDIR)/html/*.o + -rm js/stmd.js -rm -rf *.dSYM -rm -f README.html -rm -f spec.md fuzz.txt spec.html |