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.
---
 topbin/dune | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'topbin')

diff --git a/topbin/dune b/topbin/dune
index 46052c81e5..5fcb3415f0 100644
--- a/topbin/dune
+++ b/topbin/dune
@@ -1,31 +1,31 @@
 (install
  (section bin)
- (package coq)
+ (package coq-core)
  (files (coqtop_bin.exe as coqtop)))
 
 (executable
  (name coqtop_bin)
  (public_name coqtop.opt)
- (package coq)
+ (package coq-core)
  (modules coqtop_bin)
- (libraries coq.toplevel)
+ (libraries coq-core.toplevel)
  (link_flags -linkall))
 
 (executable
  (name coqtop_byte_bin)
  (public_name coqtop.byte)
- (package coq)
+ (package coq-core)
  (modules coqtop_byte_bin)
- (libraries compiler-libs.toplevel coq.toplevel)
+ (libraries compiler-libs.toplevel coq-core.toplevel)
  (modes byte)
  (link_flags -linkall))
 
 (executable
  (name coqc_bin)
  (public_name coqc)
- (package coq)
+ (package coq-core)
  (modules coqc_bin)
- (libraries coq.toplevel)
+ (libraries coq-core.toplevel)
  (modes native byte)
  ; Adding -ccopt -flto to links options could be interesting, however,
  ; it doesn't work on Windows
@@ -33,16 +33,16 @@
 
 (install
  (section bin)
- (package coq)
+ (package coq-core)
  (files (coqc_bin.bc as coqc.byte)))
 
 ; Workers
 (executables
  (names coqqueryworker_bin coqtacticworker_bin coqproofworker_bin)
  (public_names coqqueryworker.opt coqtacticworker.opt coqproofworker.opt)
- (package coq)
+ (package coq-core)
  (modules :standard \ coqtop_byte_bin coqtop_bin coqc_bin)
- (libraries coq.toplevel)
+ (libraries coq-core.toplevel)
  (link_flags -linkall))
 
 ; Workers installed targets
-- 
cgit v1.2.3