From 83f4cd5d45139dfc484dc01d55dc3d742356a8c3 Mon Sep 17 00:00:00 2001 From: Ali Caglayan Date: Mon, 8 Apr 2024 03:01:19 +0100 Subject: [PATCH] bump to dune 3.13 Signed-off-by: Ali Caglayan --- contrib/dune | 2 -- coq-hott.opam | 2 +- dune | 22 ++++++++++++++++++++++ dune-project | 2 +- test/dune | 4 +--- theories/dune | 5 +---- 6 files changed, 26 insertions(+), 11 deletions(-) diff --git a/contrib/dune b/contrib/dune index 59cc4c1dbef..9e6b1888322 100644 --- a/contrib/dune +++ b/contrib/dune @@ -1,6 +1,4 @@ (coq.theory (name HoTT.Contrib) (package coq-hott) - (flags -noinit -indices-matter -color on) - (coqdoc_flags :standard --interpolate --utf8 --no-externals --parse-comments) (theories HoTT)) diff --git a/coq-hott.opam b/coq-hott.opam index 252b805032e..84e9b9a79e0 100644 --- a/coq-hott.opam +++ b/coq-hott.opam @@ -16,7 +16,7 @@ license: "BSD-2-Clause" homepage: "http://homotopytypetheory.org/" bug-reports: "https://github.com/HoTT/HoTT/issues" depends: [ - "dune" {>= "3.8"} + "dune" {>= "3.13"} "coq" {>= "8.18.0"} "odoc" {with-doc} ] diff --git a/dune b/dune index 78ade5d80b8..7b6c83f7805 100644 --- a/dune +++ b/dune @@ -63,6 +63,28 @@ (action (run etc/emacs/run-etags.sh %{vfile}))) +; Common flags for Coq + +(env + (dev + (coq + (coqdoc_flags + :standard + --interpolate + --utf8 + --no-externals + --parse-comments) + (flags -noinit -indices-matter -color on))) + (_ + (coq + (coqdoc_flags + :standard + --interpolate + --utf8 + --no-externals + --parse-comments) + (flags -noinit -indices-matter)))) + ; Bench ; The following rule allows you to bench the running time of a file using diff --git a/dune-project b/dune-project index f2d07eebaed..657b282783d 100644 --- a/dune-project +++ b/dune-project @@ -1,4 +1,4 @@ -(lang dune 3.8) +(lang dune 3.13) (using coq 0.8) diff --git a/test/dune b/test/dune index e3f943db450..08fb8df7c93 100644 --- a/test/dune +++ b/test/dune @@ -1,8 +1,6 @@ (coq.theory (name HoTT.Tests) - (theories HoTT) - (flags -noinit -indices-matter -color on) - (coqdoc_flags :standard --interpolate --utf8 --no-externals --parse-comments)) + (theories HoTT)) (include_subdirs qualified) diff --git a/theories/dune b/theories/dune index 154cd414ec1..7e307366606 100644 --- a/theories/dune +++ b/theories/dune @@ -6,7 +6,4 @@ (coq.theory (name HoTT) - (package coq-hott) - (modules :standard) - (flags -noinit -indices-matter -color on) - (coqdoc_flags :standard --interpolate --utf8 --no-externals --parse-comments)) + (package coq-hott))