diff options
| -rw-r--r-- | Makefile.build | 8 | ||||
| -rw-r--r-- | Makefile.common | 8 |
2 files changed, 13 insertions, 3 deletions
diff --git a/Makefile.build b/Makefile.build index 2ccf0ee864..89fbd4fa86 100644 --- a/Makefile.build +++ b/Makefile.build @@ -496,6 +496,10 @@ install-pcoq-manpages: # tests ########################################################################### +validate:: $(BESTCHICKEN) $(ALLVO) + $(SHOW)'COQCHK <theories & contrib>' + $(BESTCHICKEN) -boot -o -m $(ALLMODS) + check:: world cd test-suite; \ env COQBIN=../bin COQLIB=.. ./check -$(BEST) | tee check.log @@ -882,8 +886,8 @@ endif $(HIDE)rm -f $*.glob $(HIDE)$(BOOTCOQTOP) -compile $* ifdef VALIDATE - $(SHOW)'COQCHK $(shell basename $*)' - $(HIDE)$(BESTCHICKEN) -silent -norec $(shell basename $*) \ + $(SHOW)'COQCHK $(call vo_to_mod,$@)' + $(HIDE)$(BESTCHICKEN) -boot -silent -norec $(call vo_to_mod,$@) \ || ( RV=$$?; rm -f "$@"; exit $${RV} ) endif diff --git a/Makefile.common b/Makefile.common index b068e72fbc..e323e2d9bc 100644 --- a/Makefile.common +++ b/Makefile.common @@ -810,6 +810,12 @@ CONTRIBVO:= $(OMEGAVO) $(ROMEGAVO) $(MICROMEGAVO) $(RINGVO) $(FIELDVO) \ ALLVO:= $(INITVO) $(THEORIESVO) $(CONTRIBVO) VFILES:= $(ALLVO:.vo=.v) +# convert a (stdlib) filename into a module name: +# remove .vo, replace theories and contrib by Coq, and replace slashes by dots +vo_to_mod = $(subst /,.,$(patsubst theories/%,Coq.%,$(patsubst contrib/%,Coq.%,$(1:.vo=)))) + +ALLMODS:=$(call vo_to_mod,$(ALLVO)) + LIBFILES:=$(THEORIESVO) $(CONTRIBVO) LIBFILESLIGHT:=$(THEORIESLIGHTVO) @@ -871,7 +877,7 @@ VO_TARGETS:=logic arith bool narith zarith qarith lists strings sets \ DOC_TARGETS:=doc doc-html doc-ps doc-pdf stdlib refman tutorial faq rectutorial refman-quick refman-nodep stdlib-nodep STAGE3_TARGETS:=world install coqide coqide-files coq coqlib \ coqlight states pcoq-files check init theories theories-light contrib \ - $(DOC_TARGETS) $(VO_TARGETS) + $(DOC_TARGETS) $(VO_TARGETS) validate # For emacs: |