diff options
| author | Emilio Jesus Gallego Arias | 2018-10-04 19:05:44 +0200 |
|---|---|---|
| committer | Emilio Jesus Gallego Arias | 2018-10-05 14:22:02 +0200 |
| commit | edaf8d0a34993ac5fab373128a27417a620643d4 (patch) | |
| tree | c7ec1d231809eca0dee63e44c26e692626c09fd1 | |
| parent | 4108c982aa68e16e94896768358b83047977480d (diff) | |
[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.
| -rw-r--r-- | .gitlab-ci.yml | 2 | ||||
| -rw-r--r-- | coqide.opam (renamed from ide/coqide.opam) | 0 | ||||
| -rw-r--r-- | dune | 6 | ||||
| -rw-r--r-- | dune-workspace | 6 | ||||
| -rw-r--r-- | ide/dune-project | 3 | ||||
| -rw-r--r-- | ide/dune-workspace | 6 |
6 files changed, 7 insertions, 16 deletions
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/ide/coqide.opam b/coqide.opam index 897177b283..897177b283 100644 --- a/ide/coqide.opam +++ b/coqide.opam @@ -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/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))) |