Skip to content

Commit

Permalink
More error messages when .coq-version creation fails (#144)
Browse files Browse the repository at this point in the history
  • Loading branch information
JasonGross committed Dec 24, 2023
1 parent 0388980 commit 2f02ada
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 5 deletions.
12 changes: 10 additions & 2 deletions Makefile
Expand Up @@ -34,10 +34,18 @@ ifneq ($(COQ_EXTENDED_VERSION),$(COQ_EXTENDED_VERSION_OLD))
$(COQ_VERSION_FILE)::
$(SHOW)'echo $$COQ_VERSION_INFO ($(COQ_VERSION)) > $@'
ifneq (,$(strip $(COQ_EXTENDED_VERSION_OLD)))
$(SHOW)'Replacing $(COQ_EXTENDED_VERSION_OLD)'
$(SHOW)' with $(COQ_EXTENDED_VERSION)'
@echo 'Replacing $(COQ_EXTENDED_VERSION_OLD)'
@echo ' with $(COQ_EXTENDED_VERSION)'
endif
$(HIDE)echo '$(COQ_EXTENDED_VERSION)' > $@
else
ifeq (,$(wildcard $(COQ_VERSION_FILE)))
$(COQ_VERSION_FILE)::
@echo 'Error: Invalid empty COQ_EXTENDED_VERSION:'
$(COQ_VERSION_COQC_CMD) || true
$(COQ_VERSION_COQTOP_CMD) || true
$(HIDE)exit 1
endif
endif

_CoqProject: _CoqProject.in
Expand Down
9 changes: 6 additions & 3 deletions Makefile.local.common
Expand Up @@ -8,10 +8,13 @@ TIMER_FULL=$(if $(TIMED), $(STDTIME_FULL), $(TIMECMD_FULL))

COQ_VERSION_FILE = .coq-version
COQ_VERSION_PREFIX = The Coq Proof Assistant, version
COQ_VERSION := $(firstword $(subst $(COQ_VERSION_PREFIX),,$(shell $(COQBIN)coqc --version 2>/dev/null)))
COQ_VERSION_COQTOP_CMD := $(COQBIN)coqtop </dev/null
COQ_VERSION_COQC_CMD := $(COQBIN)coqc --version
COQC_VERSION_FULL := $(shell $(COQ_VERSION_COQC_CMD) 2>/dev/null)
COQ_VERSION := $(firstword $(subst $(COQ_VERSION_PREFIX),,$(COQC_VERSION_FULL)))

COQ_EXTENDED_VERSION := $(shell (echo | $(COQBIN)coqtop 2>/dev/null; $(COQBIN)coqc --version 2>/dev/null))
COQ_EXTENDED_VERSION_OLD := $(shell cat $(COQ_VERSION_FILE) 2>/dev/null)
COQ_EXTENDED_VERSION:=$(strip $(shell $(COQ_VERSION_COQTOP_CMD) 2>/dev/null) $(COQC_VERSION_FULL))
COQ_EXTENDED_VERSION_OLD:=$(strip $(shell cat $(COQ_VERSION_FILE) 2>/dev/null))

ifneq (,$(filter 8.15%,$(COQ_VERSION)))
EXPECTED_EXT:=.v815
Expand Down

0 comments on commit 2f02ada

Please sign in to comment.