aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitlab-ci.yml2
-rw-r--r--coqide.opam (renamed from ide/coqide.opam)0
-rw-r--r--dune6
-rw-r--r--dune-workspace6
-rw-r--r--ide/dune-project3
-rw-r--r--ide/dune-workspace6
6 files changed, 7 insertions, 16 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 118482273d..18f515da24 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
diff --git a/dune b/dune
index 27c5e972fe..0a0ff213ed 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/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)))