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.
---
 ide/coqide/dune          | 4 ++--
 ide/coqide/protocol/dune | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'ide')

diff --git a/ide/coqide/dune b/ide/coqide/dune
index 12bad7ebc4..4bb4672cd4 100644
--- a/ide/coqide/dune
+++ b/ide/coqide/dune
@@ -6,7 +6,7 @@
  (public_name coqide-server.core)
  (wrapped false)
  (modules document)
- (libraries coq.lib))
+ (libraries coq-core.lib))
 
 (executable
  (name fake_ide)
@@ -20,7 +20,7 @@
  (public_name coqidetop.opt)
  (package coqide-server)
  (modules idetop)
- (libraries coq.toplevel coqide-server.protocol)
+ (libraries coq-core.toplevel coqide-server.protocol)
  (modes native byte)
  (link_flags -linkall))
 
diff --git a/ide/coqide/protocol/dune b/ide/coqide/protocol/dune
index 801ceb20ec..f48c7de0c4 100644
--- a/ide/coqide/protocol/dune
+++ b/ide/coqide/protocol/dune
@@ -2,6 +2,6 @@
  (name protocol)
  (public_name coqide-server.protocol)
  (wrapped false)
- (libraries coq.lib))
+ (libraries coq-core.lib))
 
 (ocamllex xml_lexer)
-- 
cgit v1.2.3