From ab98d847d237af3cd0e46edef42218be65cfc98f Mon Sep 17 00:00:00 2001
From: Emilio Jesus Gallego Arias
Date: Mon, 22 Jun 2020 17:52:18 +0200
Subject: [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.
---
 kernel/byterun/dune | 2 +-
 kernel/dune         | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'kernel')

diff --git a/kernel/byterun/dune b/kernel/byterun/dune
index a2484f79a7..b14ad5c558 100644
--- a/kernel/byterun/dune
+++ b/kernel/byterun/dune
@@ -1,7 +1,7 @@
 (library
  (name byterun)
  (synopsis "Coq's Kernel Abstract Reduction Machine [C implementation]")
- (public_name coq.vm)
+ (public_name coq-core.vm)
  (foreign_stubs
   (language c)
   (names coq_fix_code coq_float64 coq_memory coq_values coq_interp)
diff --git a/kernel/dune b/kernel/dune
index bd663974da..0bf51f80ec 100644
--- a/kernel/dune
+++ b/kernel/dune
@@ -1,7 +1,7 @@
 (library
  (name kernel)
  (synopsis "The Coq Kernel")
- (public_name coq.kernel)
+ (public_name coq-core.kernel)
  (wrapped false)
  (modules (:standard \ genOpcodeFiles uint63_31 uint63_63 float64_31 float64_63))
  (libraries lib byterun dynlink))
@@ -25,7 +25,7 @@
  (action (copy# %{gen-file} %{targets})))
 
 (documentation
- (package coq))
+ (package coq-core))
 
 ; In dev profile, we check the kernel against a more strict set of
 ; warnings.
-- 
cgit v1.2.3