diff options
| author | Enrico Tassi | 2019-04-20 18:41:05 +0200 |
|---|---|---|
| committer | Enrico Tassi | 2019-04-20 18:41:05 +0200 |
| commit | febcc72ee21d5c874c53a7befd658a93adf103a8 (patch) | |
| tree | 30bfc38b43c16b03d944a6da6be1705f7a5ad421 | |
| parent | 11dd3aeedd5662ea67c89bacb02cce5b562a9532 (diff) | |
| parent | f8690d31f74f18ac1dd03d0b0922d2908b9c6807 (diff) | |
Merge PR #9906: coq_makefile install target: error if any file is missing
Reviewed-by: gares
| -rw-r--r-- | CHANGES.md | 2 | ||||
| -rwxr-xr-x | test-suite/coq-makefile/missing-install/run.sh | 17 | ||||
| -rw-r--r-- | tools/CoqMakefile.in | 3 |
3 files changed, 22 insertions, 0 deletions
diff --git a/CHANGES.md b/CHANGES.md index d441200890..fc7272da65 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -229,6 +229,8 @@ Tools - Coq options can be set on the command line, eg `-set "Universe Polymorphism=true"` +- coq_makefile's install target now errors if any file to install is missing. + Standard Library - Added lemmas about monotonicity of `N.double` and `N.succ_double`, and about diff --git a/test-suite/coq-makefile/missing-install/run.sh b/test-suite/coq-makefile/missing-install/run.sh new file mode 100755 index 0000000000..4f36fdcb1c --- /dev/null +++ b/test-suite/coq-makefile/missing-install/run.sh @@ -0,0 +1,17 @@ +#!/usr/bin/env bash + +. ../template/init.sh + +rm -rf _test; mkdir _test; cd _test + +cat > _CoqProject <<EOF +-R theories Test +theories/a.v +theories/b.v +EOF +mkdir theories +touch theories/a.v theories/b.v + +coq_makefile -f _CoqProject -o Makefile +make theories/b.vo +if make install; then exit 1; fi diff --git a/tools/CoqMakefile.in b/tools/CoqMakefile.in index bd9d8c9221..0236c549d5 100644 --- a/tools/CoqMakefile.in +++ b/tools/CoqMakefile.in @@ -468,6 +468,9 @@ beautify: $(BEAUTYFILES) # Extensions can't assume when they run. install: + $(HIDE)code=0; for f in $(FILESTOINSTALL); do\ + if ! [ -f "$$f" ]; then >&2 echo $$f does not exist; code=1; fi \ + done; exit $$code $(HIDE)for f in $(FILESTOINSTALL); do\ df="`$(COQMKFILE) -destination-of "$$f" $(COQLIBS)`";\ if [ "$$?" != "0" -o -z "$$df" ]; then\ |