aboutsummaryrefslogtreecommitdiff
path: root/tools/dune
diff options
context:
space:
mode:
authorEmilio Jesus Gallego Arias2020-06-22 17:52:18 +0200
committerEmilio Jesus Gallego Arias2021-03-03 16:06:14 +0100
commitab98d847d237af3cd0e46edef42218be65cfc98f (patch)
tree91d26077257724e2eeefe1bf39e24f24d34070be /tools/dune
parentef22a5aaf1728d840341d31befd67dd90c5b2e0e (diff)
[build] Split stdlib to it's own opam package.
We introduce a new package structure for Coq: - `coq-core`: Coq's OCaml tools code and plugins - `coq-stdlib`: Coq's stdlib [.vo files] - `coq`: meta-package that pulls `coq-{core,stdlib}` This has several advantages, in particular it allows to install Coq without the stdlib which is useful in several scenarios, it also open the door towards a versioning of the stdlib at the package level. The main user-visible change is that Coq's ML development files now live in `$lib/coq-core`, for compatibility in the regular build we install a symlink and support both setups for a while. Note that plugin developers and even `coq_makefile` should actually rely on `ocamlfind` to locate Coq's OCaml libs as to be more robust. There is a transient state where we actually look for both `$coqlib/plugins` and `$coqlib/../coq-core/plugins` as to support the non-ocamlfind plus custom variables. This will be much improved once #13617 is merged (which requires this PR first), then, we will introduce a `coq.boot` library so finally `coqdep`, `coqchk`, etc... can share the same path setup code. IMHO the plan should work fine.
Diffstat (limited to 'tools/dune')
-rw-r--r--tools/dune20
1 files changed, 10 insertions, 10 deletions
diff --git a/tools/dune b/tools/dune
index d591bb0c37..703342b15c 100644
--- a/tools/dune
+++ b/tools/dune
@@ -1,6 +1,6 @@
(install
(section lib)
- (package coq)
+ (package coq-core)
(files
(CoqMakefile.in as tools/CoqMakefile.in)
(TimeFileMaker.py as tools/TimeFileMaker.py)
@@ -11,30 +11,30 @@
(executable
(name coq_makefile)
(public_name coq_makefile)
- (package coq)
+ (package coq-core)
(modules coq_makefile)
- (libraries coq.lib))
+ (libraries coq-core.lib))
(executable
(name coqworkmgr)
(public_name coqworkmgr)
- (package coq)
+ (package coq-core)
(modules coqworkmgr)
- (libraries coq.stm))
+ (libraries coq-core.stm))
(executable
(name coqdep)
(public_name coqdep)
- (package coq)
+ (package coq-core)
(modules coqdep_lexer coqdep_common coqdep)
- (libraries coq.lib))
+ (libraries coq-core.lib))
; Bare-bones mllib/mlpack parser
(executable
(name ocamllibdep)
(public_name ocamllibdep)
(modules ocamllibdep)
- (package coq)
+ (package coq-core)
(libraries unix))
(ocamllex coqdep_lexer ocamllibdep)
@@ -42,7 +42,7 @@
(executable
(name coqwc)
(public_name coqwc)
- (package coq)
+ (package coq-core)
(modules coqwc)
(libraries))
@@ -51,6 +51,6 @@
(executables
(names coq_tex)
(public_names coq-tex)
- (package coq)
+ (package coq-core)
(modules coq_tex)
(libraries str))