From edaf8d0a34993ac5fab373128a27417a620643d4 Mon Sep 17 00:00:00 2001
From: Emilio Jesus Gallego Arias
Date: Thu, 4 Oct 2018 19:05:44 +0200
Subject: [dune] Refactor files following advice from upstream.

After some discussion upstream, I think that for the current a
multi-package setup in a single repository this setup saves a bit
work.

The most problematic bit is the `-rectypes` flag; its status is not
saved per-library so we must either duplicate the flags in the coqide
scope (scope == dune-project file), or unify its scope with Coq. We do
this last option as this seems like the easiest thing for now.

Changes:

- Move coqide.opam file to the root, use a single scope/`dune-project` file.
- Remove `dune-workspace`, this should be owned by the developer / user.
---
 .gitlab-ci.yml     |  2 +-
 coqide.opam        | 21 +++++++++++++++++++++
 dune               |  6 ++++++
 dune-workspace     |  6 ------
 ide/coqide.opam    | 21 ---------------------
 ide/dune-project   |  3 ---
 ide/dune-workspace |  6 ------
 7 files changed, 28 insertions(+), 37 deletions(-)
 create mode 100644 coqide.opam
 delete mode 100644 dune-workspace
 delete mode 100644 ide/coqide.opam
 delete mode 100644 ide/dune-project
 delete mode 100644 ide/dune-workspace

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index da90ebaa98..6f968eed5a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -241,7 +241,7 @@ pkg:opam:
   script:
     - set -e
     - opam pin add coq .
-    - opam pin add coqide ide
+    - opam pin add coqide .
     - set +e
   variables:
     OPAM_SWITCH: edge
diff --git a/coqide.opam b/coqide.opam
new file mode 100644
index 0000000000..897177b283
--- /dev/null
+++ b/coqide.opam
@@ -0,0 +1,21 @@
+opam-version: "1.2"
+maintainer: "The Coq development team <coqdev@inria.fr>"
+authors: "The Coq development team, INRIA, CNRS, and contributors."
+homepage: "https://coq.inria.fr/"
+bug-reports: "https://github.com/coq/coq/issues"
+dev-repo: "https://github.com/coq/coq.git"
+license: "LGPL-2.1"
+
+available: [ocaml-version >= "4.05.0"]
+
+depends: [
+  "dune"               { build & >= "1.2.0" }
+  "coq"
+  "conf-gtksourceview"
+  "lablgtk"            {         >= "2.18.5" }
+]
+
+build-env: [
+  [ COQ_CONFIGURE_PREFIX = "%{prefix}" ]
+]
+build: [ [ "dune" "build" "-p" name "-j" jobs ] ]
diff --git a/dune b/dune
index b758fc7b56..f867126f9e 100644
--- a/dune
+++ b/dune
@@ -1,3 +1,9 @@
+; Default flags for all Coq libraries.
+(env
+ (dev     (flags :standard -rectypes -w -9-27-50+60))
+ (release (flags :standard -rectypes)))
+
+; Rules for coq_dune
 (rule
  (targets .vfiles.d)
  (deps
diff --git a/dune-workspace b/dune-workspace
deleted file mode 100644
index 38875eac2c..0000000000
--- a/dune-workspace
+++ /dev/null
@@ -1,6 +0,0 @@
-(lang dune 1.2)
-
-; Add custom flags here. Default developer profile is `dev`
-(env
- (dev     (flags :standard -rectypes -w -9-27-50+60))
- (release (flags :standard -rectypes)))
diff --git a/ide/coqide.opam b/ide/coqide.opam
deleted file mode 100644
index 897177b283..0000000000
--- a/ide/coqide.opam
+++ /dev/null
@@ -1,21 +0,0 @@
-opam-version: "1.2"
-maintainer: "The Coq development team <coqdev@inria.fr>"
-authors: "The Coq development team, INRIA, CNRS, and contributors."
-homepage: "https://coq.inria.fr/"
-bug-reports: "https://github.com/coq/coq/issues"
-dev-repo: "https://github.com/coq/coq.git"
-license: "LGPL-2.1"
-
-available: [ocaml-version >= "4.05.0"]
-
-depends: [
-  "dune"               { build & >= "1.2.0" }
-  "coq"
-  "conf-gtksourceview"
-  "lablgtk"            {         >= "2.18.5" }
-]
-
-build-env: [
-  [ COQ_CONFIGURE_PREFIX = "%{prefix}" ]
-]
-build: [ [ "dune" "build" "-p" name "-j" jobs ] ]
diff --git a/ide/dune-project b/ide/dune-project
deleted file mode 100644
index 948dc59000..0000000000
--- a/ide/dune-project
+++ /dev/null
@@ -1,3 +0,0 @@
-(lang dune 1.0)
-
-(name coqide-devel)
diff --git a/ide/dune-workspace b/ide/dune-workspace
deleted file mode 100644
index 38875eac2c..0000000000
--- a/ide/dune-workspace
+++ /dev/null
@@ -1,6 +0,0 @@
-(lang dune 1.2)
-
-; Add custom flags here. Default developer profile is `dev`
-(env
- (dev     (flags :standard -rectypes -w -9-27-50+60))
- (release (flags :standard -rectypes)))
-- 
cgit v1.2.3