From 7e0b564af9ea4aaa35feced8c6fda6a97c7f8948 Mon Sep 17 00:00:00 2001 From: Gulliver Date: Thu, 11 Sep 2014 20:31:59 +0200 Subject: using only includes from system --- Makefile | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 55b6645..11e2141 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,7 @@ DATADIR=data PROG=./stmd .PHONY: all oldtests test spec benchjs testjs -all: $(SRCDIR)/case_fold_switch.c $(PROG) +all: $(SRCDIR)/case_fold_switch.inc $(PROG) README.html: README.md template.html pandoc --template template.html -S -s -t html5 -o $@ $< @@ -41,15 +41,21 @@ testjs: spec.txt benchjs: node js/bench.js ${BENCHINP} -$(PROG): $(SRCDIR)/main.c $(SRCDIR)/inlines.o $(SRCDIR)/blocks.o $(SRCDIR)/detab.o $(SRCDIR)/bstrlib.o $(SRCDIR)/scanners.o $(SRCDIR)/print.o $(SRCDIR)/html.o $(SRCDIR)/utf8.o - $(CC) $(LDFLAGS) -o $@ $^ +HTML_OBJ=$(SRCDIR)/html/html.o $(SRCDIR)/html/houdini_href_e.o $(SRCDIR)/html/houdini_html_e.o $(SRCDIR)/html/houdini_html_u.o +STMD_OBJ=$(SRCDIR)/inlines.o $(SRCDIR)/buffer.o $(SRCDIR)/blocks.o $(SRCDIR)/scanners.c $(SRCDIR)/print.o $(SRCDIR)/utf8.o $(SRCDIR)/references.c + +$(PROG): $(SRCDIR)/html/html_unescape.h $(SRCDIR)/case_fold_switch.inc $(HTML_OBJ) $(STMD_OBJ) $(SRCDIR)/main.c + $(CC) $(LDFLAGS) -o $@ $(HTML_OBJ) $(STMD_OBJ) $(SRCDIR)/main.c $(SRCDIR)/scanners.c: $(SRCDIR)/scanners.re re2c --case-insensitive -bis $< > $@ || (rm $@ && false) -$(SRCDIR)/case_fold_switch.c: $(DATADIR)/CaseFolding-3.2.0.txt +$(SRCDIR)/case_fold_switch.inc: $(DATADIR)/CaseFolding-3.2.0.txt perl mkcasefold.pl < $< > $@ +$(SRCDIR)/html/html_unescape.h: $(SRCDIR)/html/html_unescape.gperf + gperf -I -t -N find_entity -H hash_entity -K entity -C -l --null-strings -m5 $< > $@ + .PHONY: leakcheck clean fuzztest dingus upload dingus: @@ -58,6 +64,9 @@ dingus: leakcheck: $(PROG) cat oldtests/*/*.markdown | valgrind --leak-check=full --dsymutil=yes $(PROG) +operf: $(PROG) + operf $(PROG) /dev/null + 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 @@ -69,7 +78,7 @@ update-site: spec.html narrative.html (cd _site ; git pull ; git commit -a -m "Updated site for latest spec, narrative, js" ; git push; cd ..) clean: - -rm test $(SRCDIR)/*.o $(SRCDIR)/scanners.c - -rm -r *.dSYM - -rm README.html - -rm spec.md fuzz.txt spec.html + -rm -f test $(SRCDIR)/*.o $(SRCDIR)/scanners.c $(SRCDIR)/html/*.o + -rm -rf *.dSYM + -rm -f README.html + -rm -f spec.md fuzz.txt spec.html -- cgit v1.2.3 From 59753048c91a12d82f7d62477e5aa96b8fd605c6 Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Thu, 6 Nov 2014 21:49:11 -0800 Subject: Keep original Makefile. --- Makefile | 115 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 115 insertions(+) create mode 100644 Makefile (limited to 'Makefile') diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..8c229be --- /dev/null +++ b/Makefile @@ -0,0 +1,115 @@ +CFLAGS?=-g -O3 -Wall -Wextra -std=c99 -Isrc -Wno-missing-field-initializers -fPIC $(OPTCFLAGS) +LDFLAGS?=-g -O3 -Wall -Werror -fPIC $(OPTLDFLAGS) +SRCDIR?=src +DATADIR?=data +BENCHINP?=README.md +PROG?=./cmark +JSMODULES=$(wildcard js/lib/*.js) +PREFIX?=/usr/local +SPEC=spec.txt +SITE=_site +SPECVERSION=$(shell grep version: $(SPEC) | sed -e 's/version: *//') + +.PHONY: all spec leakcheck clean fuzztest dingus upload jshint test testjs benchjs update-site upload-site + +all: $(SRCDIR)/case_fold_switch.inc $(PROG) libcmark.so + +README.html: README.md template.html + pandoc --template template.html -S -s -t html5 -o $@ $< + +spec: test spec.html + +spec.md: $(SPEC) + perl spec2md.pl < $< > $@ + +spec.html: spec.md template.html + pandoc --no-highlight --number-sections --template template.html -s --toc -S $< > $@ # | perl -pe 's/␣/ <\/span>/g' > $@ + +spec.pdf: spec.md template.tex specfilter.hs + pandoc -s $< --template template.tex \ + --filter ./specfilter.hs -o $@ --latex-engine=xelatex --toc \ + --number-sections -V documentclass=report -V tocdepth=2 \ + -V classoption=twosides + +test: $(SPEC) + perl runtests.pl $< $(PROG) + +js/commonmark.js: js/lib/index.js ${JSMODULES} + browserify --standalone commonmark $< -o $@ + +testjs: $(SPEC) + node js/test.js + +jshint: + jshint ${JSMODULES} + +benchjs: + node js/bench.js ${BENCHINP} + +HTML_OBJ=$(SRCDIR)/html/html.o $(SRCDIR)/html/houdini_href_e.o $(SRCDIR)/html/houdini_html_e.o $(SRCDIR)/html/houdini_html_u.o + +CMARK_OBJ=$(SRCDIR)/inlines.o $(SRCDIR)/buffer.o $(SRCDIR)/blocks.o $(SRCDIR)/scanners.c $(SRCDIR)/print.o $(SRCDIR)/utf8.o $(SRCDIR)/references.o + +CMARK_HDR = $(SRCDIR)/cmark.h $(SRCDIR)/buffer.h $(SRCDIR)/references.h \ + $(SRCDIR)/chunk.h $(SRCDIR)/debug.h $(SRCDIR)/utf8.h \ + $(SRCDIR)/scanners.h $(SRCDIR)/inlines.h + +HTML_HDR = $(SRCDIR)/html/html_unescape.h $(SRCDIR)/html/houdini.h + +$(PROG): $(SRCDIR)/html/html_unescape.h $(SRCDIR)/case_fold_switch.inc $(HTML_OBJ) $(CMARK_OBJ) $(SRCDIR)/main.c + $(CC) $(LDFLAGS) -o $@ $(HTML_OBJ) $(CMARK_OBJ) $(SRCDIR)/main.c + +$(SRCDIR)/scanners.c: $(SRCDIR)/scanners.re + re2c --case-insensitive -bis $< > $@ || (rm $@ && false) + +$(SRCDIR)/case_fold_switch.inc: $(DATADIR)/CaseFolding-3.2.0.txt + perl mkcasefold.pl < $< > $@ + +$(SRCDIR)/html/html_unescape.h: $(SRCDIR)/html/html_unescape.gperf + gperf -I -t -N find_entity -H hash_entity -K entity -C -l --null-strings -m5 $< > $@ + +libcmark.so: $(HTML_OBJ) $(CMARK_OBJ) + $(CC) $(LDFLAGS) -shared -o $@ $^ + +install: libcmark.so $(cmark_HDR) $(HTML_HDR) + install -d $(PREFIX)/lib $(PREFIX)/include/cmark/html + install libcmark.so $(PREFIX)/lib/ + install $(cmark_HDR) $(PREFIX)/include/cmark/ + install $(HTML_HDR) $(PREFIX)/include/cmark/html/ + +dingus: js/commonmark.js + echo "Starting dingus server at http://localhost:9000" && python -m SimpleHTTPServer 9000 + +leakcheck: $(PROG) + cat leakcheck.md | valgrind --leak-check=full --dsymutil=yes $(PROG) + +operf: $(PROG) + operf $(PROG) <$(BENCHINP) >/dev/null + +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 + +$(SITE)/index.html: spec.txt + ./make_site_index.sh $(SPECVERSION) | \ + pandoc --template template.html -S -s -t html5 -o $@ + +$(SITE)/$(SPECVERSION)/index.html: spec.html + mkdir -p $(SITE)/$(SPECVERSION) + cp $< $@ + cd $(SITE); git add $(SPECVERSION)/index.html; git commit -a -m "Added version $(SPECVERSION) of spec"; cd .. + +$(SITE)/%: % + cp $< $@ + +update-site: $(SITE)/dingus.html $(SITE)/js/commonmark.js $(SITE)/index.html $(SITE)/$(SPECVERSION)/index.html $(SITE)/js/LICENSE + +upload-site: + cd $(SITE) ; git pull; git commit -a -m "Updated site for latest spec, js" ; git push; cd .. + +clean: + -rm -f test $(SRCDIR)/*.o $(SRCDIR)/scanners.c $(SRCDIR)/html/*.o libcmark.so + -rm -f js/commonmark.js + -rm -rf *.dSYM + -rm -f README.html + -rm -f spec.md fuzz.txt spec.html -- cgit v1.2.3 From 48c64a6ce073fbc4e42761a32840ec1a7def4555 Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Thu, 6 Nov 2014 22:22:10 -0800 Subject: cmake: Create and install shared library. --- Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 8c229be..9b45db3 100644 --- a/Makefile +++ b/Makefile @@ -12,7 +12,7 @@ SPECVERSION=$(shell grep version: $(SPEC) | sed -e 's/version: *//') .PHONY: all spec leakcheck clean fuzztest dingus upload jshint test testjs benchjs update-site upload-site -all: $(SRCDIR)/case_fold_switch.inc $(PROG) libcmark.so +all: $(SRCDIR)/case_fold_switch.inc $(PROG) libcommonmark.so README.html: README.md template.html pandoc --template template.html -S -s -t html5 -o $@ $< @@ -68,12 +68,12 @@ $(SRCDIR)/case_fold_switch.inc: $(DATADIR)/CaseFolding-3.2.0.txt $(SRCDIR)/html/html_unescape.h: $(SRCDIR)/html/html_unescape.gperf gperf -I -t -N find_entity -H hash_entity -K entity -C -l --null-strings -m5 $< > $@ -libcmark.so: $(HTML_OBJ) $(CMARK_OBJ) +ibcommonmark.so: $(HTML_OBJ) $(CMARK_OBJ) $(CC) $(LDFLAGS) -shared -o $@ $^ -install: libcmark.so $(cmark_HDR) $(HTML_HDR) +install: libcommonmark.so $(cmark_HDR) $(HTML_HDR) install -d $(PREFIX)/lib $(PREFIX)/include/cmark/html - install libcmark.so $(PREFIX)/lib/ + install libcommonmark.so $(PREFIX)/lib/ install $(cmark_HDR) $(PREFIX)/include/cmark/ install $(HTML_HDR) $(PREFIX)/include/cmark/html/ @@ -108,7 +108,7 @@ upload-site: cd $(SITE) ; git pull; git commit -a -m "Updated site for latest spec, js" ; git push; cd .. clean: - -rm -f test $(SRCDIR)/*.o $(SRCDIR)/scanners.c $(SRCDIR)/html/*.o libcmark.so + -rm -f test $(SRCDIR)/*.o $(SRCDIR)/scanners.c $(SRCDIR)/html/*.o libcommonmark.so -rm -f js/commonmark.js -rm -rf *.dSYM -rm -f README.html -- cgit v1.2.3 From 5b2acc638ba7ee8296d9902a796bad1e7617f200 Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Thu, 6 Nov 2014 22:39:30 -0800 Subject: Makefile: use cmake for all, install. --- Makefile | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 9b45db3..461256e 100644 --- a/Makefile +++ b/Makefile @@ -12,7 +12,11 @@ SPECVERSION=$(shell grep version: $(SPEC) | sed -e 's/version: *//') .PHONY: all spec leakcheck clean fuzztest dingus upload jshint test testjs benchjs update-site upload-site -all: $(SRCDIR)/case_fold_switch.inc $(PROG) libcommonmark.so +all: + mkdir -p build; cd build; cmake ..; make + +install: + mkdir -p build; cd build; cmake ..; make install README.html: README.md template.html pandoc --template template.html -S -s -t html5 -o $@ $< @@ -71,11 +75,11 @@ $(SRCDIR)/html/html_unescape.h: $(SRCDIR)/html/html_unescape.gperf ibcommonmark.so: $(HTML_OBJ) $(CMARK_OBJ) $(CC) $(LDFLAGS) -shared -o $@ $^ -install: libcommonmark.so $(cmark_HDR) $(HTML_HDR) - install -d $(PREFIX)/lib $(PREFIX)/include/cmark/html - install libcommonmark.so $(PREFIX)/lib/ - install $(cmark_HDR) $(PREFIX)/include/cmark/ - install $(HTML_HDR) $(PREFIX)/include/cmark/html/ +#install: libcommonmark.so $(cmark_HDR) $(HTML_HDR) +# install -d $(PREFIX)/lib $(PREFIX)/include/cmark/html +# install libcommonmark.so $(PREFIX)/lib/ +# install $(cmark_HDR) $(PREFIX)/include/cmark/ +# install $(HTML_HDR) $(PREFIX)/include/cmark/html/ dingus: js/commonmark.js echo "Starting dingus server at http://localhost:9000" && python -m SimpleHTTPServer 9000 -- cgit v1.2.3 From 96dd58ea314cc73a155911ecbf21c36dcec37b06 Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Thu, 6 Nov 2014 22:48:07 -0800 Subject: Reorganized Makefile to use cmake. --- Makefile | 75 +++++++++++++++++++++++++++++++++++++--------------------------- 1 file changed, 43 insertions(+), 32 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 461256e..6bcaa93 100644 --- a/Makefile +++ b/Makefile @@ -3,20 +3,30 @@ LDFLAGS?=-g -O3 -Wall -Werror -fPIC $(OPTLDFLAGS) SRCDIR?=src DATADIR?=data BENCHINP?=README.md -PROG?=./cmark JSMODULES=$(wildcard js/lib/*.js) PREFIX?=/usr/local SPEC=spec.txt SITE=_site SPECVERSION=$(shell grep version: $(SPEC) | sed -e 's/version: *//') -.PHONY: all spec leakcheck clean fuzztest dingus upload jshint test testjs benchjs update-site upload-site +BUILDDIR=build +PROG?=$(BUILDDIR)/src/cmark -all: - mkdir -p build; cd build; cmake ..; make +.PHONY: all spec leakcheck clean fuzztest dingus upload jshint test testjs benchjs update-site upload-site check -install: - mkdir -p build; cd build; cmake ..; make install +all: check + mkdir -p $(BUILDDIR); cd build; cmake ..; make + +install: check + mkdir -p $(BUILDDIR); cd build; cmake ..; make install + +clean: + rm -rf $(BUILDDIR) + +check: + @cmake --version >/dev/null || (echo "You need cmake to build this program: http://www.cmake.org/download/" && exit 1) + +$(PROG): all README.html: README.md template.html pandoc --template template.html -S -s -t html5 -o $@ $< @@ -50,31 +60,32 @@ jshint: benchjs: node js/bench.js ${BENCHINP} -HTML_OBJ=$(SRCDIR)/html/html.o $(SRCDIR)/html/houdini_href_e.o $(SRCDIR)/html/houdini_html_e.o $(SRCDIR)/html/houdini_html_u.o - -CMARK_OBJ=$(SRCDIR)/inlines.o $(SRCDIR)/buffer.o $(SRCDIR)/blocks.o $(SRCDIR)/scanners.c $(SRCDIR)/print.o $(SRCDIR)/utf8.o $(SRCDIR)/references.o - -CMARK_HDR = $(SRCDIR)/cmark.h $(SRCDIR)/buffer.h $(SRCDIR)/references.h \ - $(SRCDIR)/chunk.h $(SRCDIR)/debug.h $(SRCDIR)/utf8.h \ - $(SRCDIR)/scanners.h $(SRCDIR)/inlines.h - -HTML_HDR = $(SRCDIR)/html/html_unescape.h $(SRCDIR)/html/houdini.h - -$(PROG): $(SRCDIR)/html/html_unescape.h $(SRCDIR)/case_fold_switch.inc $(HTML_OBJ) $(CMARK_OBJ) $(SRCDIR)/main.c - $(CC) $(LDFLAGS) -o $@ $(HTML_OBJ) $(CMARK_OBJ) $(SRCDIR)/main.c - -$(SRCDIR)/scanners.c: $(SRCDIR)/scanners.re - re2c --case-insensitive -bis $< > $@ || (rm $@ && false) - -$(SRCDIR)/case_fold_switch.inc: $(DATADIR)/CaseFolding-3.2.0.txt - perl mkcasefold.pl < $< > $@ - -$(SRCDIR)/html/html_unescape.h: $(SRCDIR)/html/html_unescape.gperf - gperf -I -t -N find_entity -H hash_entity -K entity -C -l --null-strings -m5 $< > $@ - -ibcommonmark.so: $(HTML_OBJ) $(CMARK_OBJ) - $(CC) $(LDFLAGS) -shared -o $@ $^ - +#HTML_OBJ=$(SRCDIR)/html/html.o $(SRCDIR)/html/houdini_href_e.o $(SRCDIR)/html/houdini_html_e.o $(SRCDIR)/html/houdini_html_u.o +# +#CMARK_OBJ=$(SRCDIR)/inlines.o $(SRCDIR)/buffer.o $(SRCDIR)/blocks.o $(SRCDIR)/scanners.c $(SRCDIR)/print.o $(SRCDIR)/utf8.o $(SRCDIR)/references.o +# +#CMARK_HDR = $(SRCDIR)/cmark.h $(SRCDIR)/buffer.h $(SRCDIR)/references.h \ +# $(SRCDIR)/chunk.h $(SRCDIR)/debug.h $(SRCDIR)/utf8.h \ +# $(SRCDIR)/scanners.h $(SRCDIR)/inlines.h +# +#HTML_HDR = $(SRCDIR)/html/html_unescape.h $(SRCDIR)/html/houdini.h +# +#$(PROG): $(SRCDIR)/html/html_unescape.h $(SRCDIR)/case_fold_switch.inc $(HTML_OBJ) $(CMARK_OBJ) $(SRCDIR)/main.c +# $(CC) $(LDFLAGS) -o $@ $(HTML_OBJ) $(CMARK_OBJ) $(SRCDIR)/main.c +# +#$(SRCDIR)/scanners.c: $(SRCDIR)/scanners.re +# re2c --case-insensitive -bis $< > $@ || (rm $@ && false) +# +#$(SRCDIR)/case_fold_switch.inc: $(DATADIR)/CaseFolding-3.2.0.txt +# perl mkcasefold.pl < $< > $@ +# +#$(SRCDIR)/html/html_unescape.h: $(SRCDIR)/html/html_unescape.gperf +# gperf -I -t -N find_entity -H hash_entity -K entity -C -l +# --null-strings -m5 $< > $@ +# +#libcommonmark.so: $(HTML_OBJ) $(CMARK_OBJ) +# $(CC) $(LDFLAGS) -shared -o $@ $^ +# #install: libcommonmark.so $(cmark_HDR) $(HTML_HDR) # install -d $(PREFIX)/lib $(PREFIX)/include/cmark/html # install libcommonmark.so $(PREFIX)/lib/ @@ -111,7 +122,7 @@ update-site: $(SITE)/dingus.html $(SITE)/js/commonmark.js $(SITE)/index.html $(S upload-site: cd $(SITE) ; git pull; git commit -a -m "Updated site for latest spec, js" ; git push; cd .. -clean: +distclean: clean -rm -f test $(SRCDIR)/*.o $(SRCDIR)/scanners.c $(SRCDIR)/html/*.o libcommonmark.so -rm -f js/commonmark.js -rm -rf *.dSYM -- cgit v1.2.3 From bc978561c1616985df6a73657db5015822c4b33b Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Thu, 6 Nov 2014 23:23:50 -0800 Subject: More cmake improvements. --- Makefile | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 6bcaa93..9ff52b1 100644 --- a/Makefile +++ b/Makefile @@ -75,10 +75,11 @@ benchjs: # #$(SRCDIR)/scanners.c: $(SRCDIR)/scanners.re # re2c --case-insensitive -bis $< > $@ || (rm $@ && false) -# -#$(SRCDIR)/case_fold_switch.inc: $(DATADIR)/CaseFolding-3.2.0.txt -# perl mkcasefold.pl < $< > $@ -# + + +$(SRCDIR)/case_fold_switch.inc: $(DATADIR)/CaseFolding-3.2.0.txt + perl mkcasefold.pl < $< > $@ + #$(SRCDIR)/html/html_unescape.h: $(SRCDIR)/html/html_unescape.gperf # gperf -I -t -N find_entity -H hash_entity -K entity -C -l # --null-strings -m5 $< > $@ @@ -92,6 +93,12 @@ benchjs: # install $(cmark_HDR) $(PREFIX)/include/cmark/ # install $(HTML_HDR) $(PREFIX)/include/cmark/html/ +#CMARK_HDR = $(SRCDIR)/cmark.h $(SRCDIR)/buffer.h $(SRCDIR)/references.h \ +# $(SRCDIR)/chunk.h $(SRCDIR)/debug.h $(SRCDIR)/utf8.h \ +# $(SRCDIR)/scanners.h $(SRCDIR)/inlines.h +# +#HTML_HDR = $(SRCDIR)/html/html_unescape.h $(SRCDIR)/html/houdini.h + dingus: js/commonmark.js echo "Starting dingus server at http://localhost:9000" && python -m SimpleHTTPServer 9000 -- cgit v1.2.3