Skip to content

Fix coqc in Makefile #1596

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
affeldt-aist merged 3 commits into from
Apr 30, 2025
Merged

Fix coqc in Makefile #1596

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8ca1778
Fix opam file
proux01 Apr 29, 2025
37c253e
Fix makefile
proux01 Apr 29, 2025
9ce6d63
Compile without coq shim on Rocq 9.0
proux01 Apr 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions Makefile.common
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,11 @@
# pre-makefile::, this-clean:: and __always__:: may be extended #
# Additionally, the following variables may be customized: #
SUBDIRS?=
COQBIN?=$(dir $(shell which coqtop))
COQMAKEFILE?=$(COQBIN)coq_makefile
COQDEP?=$(COQBIN)coqdep
COQBIN?=$(dir $(shell command -v coqtop || command -v rocq))
COQMAKEFILE?=$(shell command -v coq_makefile || echo "$(COQBIN)rocq makefile")
COQC?=$(shell command -v coqc || echo "$(COQBIN)rocq c")
COQDEP?=$(shell command -v coqdep || echo "$(COQBIN)rocq dep")
COQDOC?=$(shell command -v coqdoc || echo "$(COQBIN)rocq doc")
COQPROJECT?=_CoqProject
COQMAKEOPTIONS?=
COQMAKEFILEOPTIONS?=
Expand Down Expand Up @@ -44,7 +46,7 @@ all: config build

Makefile.coq: pre-makefile $(COQPROJECT) Makefile
(echo "From mathcomp.algebra Require Import interval_inference." > test_interval_inference.v \
&& (rocq c test_interval_inference.v > /dev/null 2>&1) \
&& ($(COQC) test_interval_inference.v > /dev/null 2>&1) \
&& test -f interval_inference.v -o -f reals/interval_inference.v \
&& touch rm_interval_inference) || true
$(RM) test_interval_inference.v
Expand Down Expand Up @@ -135,7 +137,7 @@ doc: __always__ Makefile.coq
# let's forget about the dependency graph for the time being...
# cd _build_doc && grep -v vio: .Makefile.coq.d > depend
# cd _build_doc && cat depend | $(MATHCOMP)etc/buildlibgraph $(COQFILES) > htmldoc/depend.js
cd _build_doc && $(COQBIN)coqdoc -t "MathComp Analysis" \
cd _build_doc && $(COQDOC) -t "MathComp Analysis" \
-g --utf8 -Q classical mathcomp.classical -Q theories mathcomp.analysis \
--parse-comments \
--multi-index $(COQFILES) -d htmldoc
Expand All @@ -147,7 +149,7 @@ doc-clean:
rm -rf _build_doc/

coq2html:
coqdep -f _CoqProject > depend.d
$(COQDEP) -f _CoqProject > depend.d
../coq2html/ocamldot/ocamldot depend.d > depend.dot
gsed -i 's/Classical/mathcomp\.classical/' depend.dot
gsed -i 's/Theories/mathcomp\.analysis/' depend.dot
Expand Down
2 changes: 1 addition & 1 deletion coq-mathcomp-classical.opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ build: [make "-C" "classical" "-j%{jobs}%"]
install: [make "-C" "classical" "install"]
depends: [
("coq" {>= "8.20" & < "8.21~"}
| "rocq-core" { (>= "9.0" & < "9.1~") | (= "dev") })
| "coq-core" { (>= "9.0" & < "9.1~") | (= "dev") })
"coq-mathcomp-ssreflect" { (>= "2.2.0" & < "2.5~") | (= "dev") }
"coq-mathcomp-fingroup"
"coq-mathcomp-algebra"
Expand Down
Loading