X-Git-Url: https://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=Makefile;h=37ff17de389ecba5797780bf1ed49f88a87ef1ba;hp=d3e05e9fcd256390642547ea701829fa0823705d;hb=1ddb7420f1ac53c060aec62e26702d1d7029fc54;hpb=963fa5ca9303d146d635e2fba04814f4f791c559

diff --git a/Makefile b/Makefile
index d3e05e9f..37ff17de 100644
--- a/Makefile
+++ b/Makefile
@@ -1,94 +1,97 @@
-# Hacky makefile to compile everything and run the tests in some kind of sane order.
-# V=--verbose for verbose tests.
+# Hacky makefile to compile everything and run the tests in some kind
+# of sane order.
 
-# This can be overridden on cmdline to generate pages elsewhere.
-WEBDIR=~/www/html/ccan/
+# Main targets:
+# 
+# check: run tests on all ccan modules (use 'make check V=--verbose' for more)
+#        Includes building libccan.a.
+# libccan.a: A library with all the ccan modules in it.
+# tools: build useful tools in tools/ dir.
+#        Especially tools/ccanlint/ccanlint and tools/namespacize.
+# distclean: destroy everything back to pristine state
 
-CFLAGS=-g -Wall -Wstrict-prototypes -Wold-style-definition -Wmissing-prototypes -Wmissing-declarations -Werror -Iccan -I.
+# Where make scores puts the results
+SCOREDIR=scores/$(shell whoami)/$(shell uname -s)-$(shell uname -m)-$(CC)-$(shell git describe --always --dirty)
+CCANLINT=tools/ccanlint/ccanlint --deps-fail-ignore
+CCANLINT_FAST=$(CCANLINT) -x tests_pass_valgrind -x tests_compile_coverage
 
-ALL=$(patsubst ccan/%/test, %, $(wildcard ccan/*/test))
-ALL_DIRS=$(patsubst %, ccan/%, $(ALL))
-ALL_DEPENDS=$(patsubst %, ccan/%/.depends, $(ALL))
-ALL_PAGES=$(patsubst ccan/%, $(WEBDIR)/info/%.html, $(ALL_DIRS))
-DIRECT_TARBALLS=$(patsubst ccan/%, $(WEBDIR)/tarballs/%.tar.bz2, $(ALL_DIRS))
-DEPEND_TARBALLS=$(patsubst ccan/%, $(WEBDIR)/tarballs/with-deps/%.tar.bz2, $(ALL_DIRS))
-WEB_SUBDIRS=$(WEBDIR)/tarballs $(WEBDIR)/tarballs/with-deps $(WEBDIR)/info
+default: all_info libccan.a
 
-include Makefile-ccan
-
-check: $(ALL_DIRS:%=test-%)
+ALL_DEPENDS=$(patsubst %, ccan/%/.depends, $(MODS))
 
-distclean: clean
-	rm -f $(ALL_DEPENDS)
-	rm -rf $(WEBDIR)
+# By default, we skip modules with external deps (or plaform specific)
+MODS_EXCLUDE:=altstack generator jmap jset nfs ogg_to_pcm tal/talloc wwviaudio
+# This randomly fails, and reliably fails under Jenkins :(
+MODS_FLAKY:=altstack
+MODS_RELIABLE=$(filter-out $(MODS_FLAKY),$(MODS))
 
-webpages: $(WEB_SUBDIRS) $(WEBDIR)/junkcode $(ALL_PAGES) $(WEBDIR)/list.html $(WEBDIR)/index.html $(WEBDIR)/upload.html $(WEBDIR)/uploader.php $(WEBDIR)/example-config.h $(WEBDIR)/ccan.jpg $(DIRECT_TARBALLS) $(DEPEND_TARBALLS) $(WEBDIR)/ccan.tar.bz2 $(WEBDIR)/Makefile-ccan
-
-$(WEB_SUBDIRS):
-	mkdir -p $@
-
-$(WEBDIR)/junkcode:
-	cp -a junkcode $@
+include Makefile-ccan
 
-# Override implicit attempt to link directory.
-$(ALL_DIRS):
-	@touch $@
+fastcheck: $(MODS_RELIABLE:%=summary-fastcheck/%)
 
-$(WEBDIR)/ccan.tar.bz2:
-	tar cvfj $@ `bzr ls --versioned --kind=file ccan`
+check: $(MODS_RELIABLE:%=summary-check/%)
 
-$(ALL_PAGES): tools/doc_extract web/staticmoduleinfo.php
+distclean: clean
+	rm -f $(ALL_DEPENDS)
 
-$(WEBDIR)/list.html: web/staticall.php tools/doc_extract $(DIRECT_TARBALLS) $(DEPEND_TARBALLS) $(WEBDIR)/ccan.tar.bz2
-	php5 web/staticall.php ccan/ $(WEBDIR) > $@
+scores: $(SCOREDIR)/SUMMARY
 
-$(WEBDIR)/upload.html: web/staticupload.php
-	php5 web/staticupload.php > $@
+$(SCOREDIR)/SUMMARY: $(MODS:%=$(SCOREDIR)/%.score)
+	git describe --always > $@
+	uname -a >> $@
+	$(CC) -v >> $@
+	cat $^ | grep 'Total score:' >> $@
 
-# cpp inserts gratuitous linebreaks at start of file, makes for php problems.
-$(WEBDIR)/uploader.php: web/uploader.php.cpp
-	cpp -w -C -P $< | grep . > $@
+$(SCOREDIR)/%.score: ccan/%/_info tools/ccanlint/ccanlint $(OBJFILES)
+	mkdir -p `dirname $@`
+	$(CCANLINT) -v -s ccan/$* > $@ || true
 
-$(WEBDIR)/index.html: web/staticindex.php
-	php5 web/staticindex.php > $@
+$(ALL_DEPENDS): %/.depends: %/_info tools/ccan_depends
+	tools/ccan_depends $* > $@ || ( rm -f $@; exit 1 )
 
-$(WEBDIR)/example-config.h: config.h
-	cp $< $@
+# Actual dependencies are created in inter-depends
+check/%: tools/ccanlint/ccanlint
+	$(CCANLINT) ccan/$*
 
-$(WEBDIR)/Makefile-ccan: Makefile-ccan
-	cp $< $@
+fastcheck/%: tools/ccanlint/ccanlint
+	$(CCANLINT_FAST) ccan/$*
 
-$(WEBDIR)/ccan.jpg: web/ccan.jpg
-	cp $< $@
+# Doesn't test dependencies, doesn't print verbose fail results.
+summary-check/%: tools/ccanlint/ccanlint $(OBJFILES)
+	$(CCANLINT) -s ccan/$*
 
-$(WEBDIR)/info/%.html: ccan/% ccan/%/test $(WEBDIR)/tarballs/%.tar.bz2 $(WEBDIR)/tarballs/with-deps/%.tar.bz2
-	URLPREFIX=../ php5 web/staticmoduleinfo.php ccan/$* > $@
+summary-fastcheck/%: tools/ccanlint/ccanlint $(OBJFILES)
+	$(CCANLINT_FAST) -s ccan/$*
 
-$(WEBDIR)/tarballs/%.tar.bz2: ccan/% ccan/%/test
-	tar -c -v -j -f $@ `bzr ls --versioned --kind=file ccan/$*`
+ccan/%/info: ccan/%/_info config.h
+	$(CC) $(CCAN_CFLAGS) -I. -o $@ $(CFLAGS_FORCE_C_SOURCE) $<
 
-$(WEBDIR)/tarballs/with-deps/%.tar.bz2: ccan/% ccan/%/test tools/ccan_depends
-	tar cvfj $@ $$(echo ccan/$* $$(tools/ccan_depends ccan/$*) | xargs -n 1 bzr ls --versioned --kind=file)
+all_info: $(MODS:%=ccan/%/info)
 
-$(ALL_DEPENDS): %/.depends: tools/ccan_depends
-	tools/ccan_depends $* > $@ || ( rm -f $@; exit 1 )
+clean: tools-clean
+	rm -f `find * -name '*.o'` `find * -name '.depends'` `find * -name '*.a'`  `find * -name info` `find * -name '*.d'` `find ccan -name '*-Makefile'`
+	rm -f config.h
+	rm -f inter-depends lib-depends test-depends
 
-test-ccan/%: tools/run_tests ccan/%.o
-	@echo Testing $*...
-	@if tools/run_tests $(V) ccan/$* | grep ^'not ok'; then exit 1; else exit 0; fi
+# Creates a dependency from the tests to the object files which it needs.
+inter-depends: $(ALL_DEPENDS) Makefile
+	for f in $(ALL_DEPENDS); do echo check-$$(basename $$(dirname $$f) ): $$(for dir in $$(cat $$f) $$(dirname $$f); do [ "$$(echo $$dir/*.c)" = "$$dir/*.c" ] || echo ccan/"$$(basename $$dir)".o; done); done > $@
 
-ccanlint: tools/ccanlint/ccanlint
+# Creates dependencies between tests, so if foo depends on bar, bar is tested
+# first 
+test-depends: $(ALL_DEPENDS) Makefile
+	for f in $(ALL_DEPENDS); do echo check/`basename \`dirname $$f\``: `sed -n 's,ccan/\(.*\),check/\1,p' < $$f`; done > $@
 
-clean: tools-clean
-	$(RM) `find . -name '*.o'` `find . -name '.depends'` `find . -name '*.a'`  `find . -name _info`
-	$(RM) inter-depends lib-depends test-depends
+TAGS: FORCE
+	find * -name '*.[ch]' | xargs etags
 
-inter-depends: $(ALL_DEPENDS)
-	for f in $(ALL_DEPENDS); do echo test-ccan/`basename \`dirname $$f\``: `sed -n 's,ccan/\(.*\),ccan/\1.o,p' < $$f`; done > $@
+FORCE:
 
-test-depends: $(ALL_DEPENDS)
-	for f in $(ALL_DEPENDS); do echo test-ccan/`basename \`dirname $$f\``: `sed -n 's,ccan/\(.*\),test-ccan/\1,p' < $$f`; done > $@
+# Ensure we don't end up with empty file if configurator fails!
+config.h: tools/configurator/configurator Makefile Makefile-ccan
+	tools/configurator/configurator $(CC) $(CCAN_CFLAGS) > $@.tmp && mv $@.tmp $@
 
 include tools/Makefile
 -include inter-depends
 -include test-depends
+-include Makefile-web