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.
---
 user-contrib/Ltac2/dune             | 8 ++++----
 user-contrib/Ltac2/plugin_base.dune | 6 ------
 2 files changed, 4 insertions(+), 10 deletions(-)
 delete mode 100644 user-contrib/Ltac2/plugin_base.dune

(limited to 'user-contrib')

diff --git a/user-contrib/Ltac2/dune b/user-contrib/Ltac2/dune
index 90869a46a0..b90bae10a3 100644
--- a/user-contrib/Ltac2/dune
+++ b/user-contrib/Ltac2/dune
@@ -1,14 +1,14 @@
 (coq.theory
  (name Ltac2)
- (package coq)
+ (package coq-stdlib)
  (synopsis "Ltac2 tactic language")
- (libraries coq.plugins.ltac2))
+ (libraries coq-core.plugins.ltac2))
 
 (library
  (name ltac2_plugin)
- (public_name coq.plugins.ltac2)
+ (public_name coq-core.plugins.ltac2)
  (synopsis "Ltac2 plugin")
  (modules_without_implementation tac2expr tac2qexpr tac2types)
- (libraries coq.plugins.ltac))
+ (libraries coq-core.plugins.ltac))
 
 (coq.pp (modules g_ltac2))
diff --git a/user-contrib/Ltac2/plugin_base.dune b/user-contrib/Ltac2/plugin_base.dune
deleted file mode 100644
index 711e9b95d3..0000000000
--- a/user-contrib/Ltac2/plugin_base.dune
+++ /dev/null
@@ -1,6 +0,0 @@
-(library
- (name ltac2_plugin)
- (public_name coq.plugins.ltac2)
- (synopsis "Coq's Ltac2 plugin")
- (modules_without_implementation tac2expr tac2qexpr tac2types)
- (libraries coq.plugins.ltac))
-- 
cgit v1.2.3