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.
---
 theories/dune | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

(limited to 'theories')

diff --git a/theories/dune b/theories/dune
index 90e9522b7b..1cd3d8c119 100644
--- a/theories/dune
+++ b/theories/dune
@@ -1,6 +1,6 @@
 (coq.theory
  (name Coq)
- (package coq)
+ (package coq-stdlib)
  (synopsis "Coq's Standard Library")
  (flags -q)
  ; (mode native)
@@ -8,29 +8,29 @@
  ; (per_file
  ;  (Init/*.v -> -boot))
  (libraries
-   coq.plugins.ltac
-   coq.plugins.tauto
+   coq-core.plugins.ltac
+   coq-core.plugins.tauto
 
-   coq.plugins.cc
-   coq.plugins.firstorder
+   coq-core.plugins.cc
+   coq-core.plugins.firstorder
 
-   coq.plugins.number_string_notation
-   coq.plugins.float_syntax
+   coq-core.plugins.number_string_notation
+   coq-core.plugins.float_syntax
 
-   coq.plugins.btauto
-   coq.plugins.rtauto
+   coq-core.plugins.btauto
+   coq-core.plugins.rtauto
 
-   coq.plugins.ring
-   coq.plugins.nsatz
-   coq.plugins.omega
+   coq-core.plugins.ring
+   coq-core.plugins.nsatz
+   coq-core.plugins.omega
 
-   coq.plugins.zify
-   coq.plugins.micromega
+   coq-core.plugins.zify
+   coq-core.plugins.micromega
 
-   coq.plugins.funind
+   coq-core.plugins.funind
 
-   coq.plugins.ssreflect
-   coq.plugins.ssrsearch
-   coq.plugins.derive))
+   coq-core.plugins.ssreflect
+   coq-core.plugins.ssrsearch
+   coq-core.plugins.derive))
 
 (include_subdirs qualified)
-- 
cgit v1.2.3