aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmilio Jesus Gallego Arias2019-08-24 03:02:19 +0200
committerEmilio Jesus Gallego Arias2019-08-24 03:15:23 +0200
commita5b7ca5eadc5cf1c2e431ea8b540006ff063e5b8 (patch)
treef763366888c754728dada610d482e417cffdfb6f
parentadcbcbe743e0508a1fc3cd3eb18f73b00db1d55e (diff)
[dune] Migrate static Dune files to Dune 1.10
This improves error reporting. Addendum to #10515
-rw-r--r--doc/plugin_tutorial/tuto0/src/dune5
-rw-r--r--doc/plugin_tutorial/tuto1/src/dune5
-rw-r--r--doc/plugin_tutorial/tuto2/src/dune5
-rw-r--r--doc/plugin_tutorial/tuto3/src/dune5
-rw-r--r--doc/sphinx/practical-tools/utilities.rst5
-rw-r--r--parsing/dune10
-rw-r--r--toplevel/dune5
-rw-r--r--vernac/dune10
8 files changed, 8 insertions, 42 deletions
diff --git a/doc/plugin_tutorial/tuto0/src/dune b/doc/plugin_tutorial/tuto0/src/dune
index 79d561061d..ab9b4dd531 100644
--- a/doc/plugin_tutorial/tuto0/src/dune
+++ b/doc/plugin_tutorial/tuto0/src/dune
@@ -3,7 +3,4 @@
(public_name coq.plugins.tutorial.p0)
(libraries coq.plugins.ltac))
-(rule
- (targets g_tuto0.ml)
- (deps (:pp-file g_tuto0.mlg) )
- (action (run coqpp %{pp-file})))
+(coq.pp (modules g_tuto0))
diff --git a/doc/plugin_tutorial/tuto1/src/dune b/doc/plugin_tutorial/tuto1/src/dune
index cf9c674b14..054d5ecd26 100644
--- a/doc/plugin_tutorial/tuto1/src/dune
+++ b/doc/plugin_tutorial/tuto1/src/dune
@@ -3,7 +3,4 @@
(public_name coq.plugins.tutorial.p1)
(libraries coq.plugins.ltac))
-(rule
- (targets g_tuto1.ml)
- (deps (:pp-file g_tuto1.mlg) )
- (action (run coqpp %{pp-file})))
+(coq.pp (modules g_tuto1))
diff --git a/doc/plugin_tutorial/tuto2/src/dune b/doc/plugin_tutorial/tuto2/src/dune
index 68ddd13947..8c4b04b1ae 100644
--- a/doc/plugin_tutorial/tuto2/src/dune
+++ b/doc/plugin_tutorial/tuto2/src/dune
@@ -3,7 +3,4 @@
(public_name coq.plugins.tutorial.p2)
(libraries coq.plugins.ltac))
-(rule
- (targets g_tuto2.ml)
- (deps (:pp-file g_tuto2.mlg) )
- (action (run coqpp %{pp-file})))
+(coq.pp (modules g_tuto2))
diff --git a/doc/plugin_tutorial/tuto3/src/dune b/doc/plugin_tutorial/tuto3/src/dune
index ba6d8b288f..678dd71328 100644
--- a/doc/plugin_tutorial/tuto3/src/dune
+++ b/doc/plugin_tutorial/tuto3/src/dune
@@ -4,7 +4,4 @@
(flags :standard -warn-error -3)
(libraries coq.plugins.ltac))
-(rule
- (targets g_tuto3.ml)
- (deps (:pp-file g_tuto3.mlg))
- (action (run coqpp %{pp-file})))
+(coq.pp (modules g_tuto3))
diff --git a/doc/sphinx/practical-tools/utilities.rst b/doc/sphinx/practical-tools/utilities.rst
index 554f6bf230..47ecfb9db0 100644
--- a/doc/sphinx/practical-tools/utilities.rst
+++ b/doc/sphinx/practical-tools/utilities.rst
@@ -522,10 +522,7 @@ of your project.
(flags :standard -warn-error -3-9-27-32-33-50)
(libraries coq.plugins.cc coq.plugins.extraction))
- (rule
- (targets g_equations.ml)
- (deps (:pp-file g_equations.mlg))
- (action (run coqpp %{pp-file})))
+ (coq.pp (modules g_equations))
And a Coq-specific part that depends on it via the ``libraries`` field:
diff --git a/parsing/dune b/parsing/dune
index 2bb8611e09..8a31434101 100644
--- a/parsing/dune
+++ b/parsing/dune
@@ -4,12 +4,4 @@
(wrapped false)
(libraries coq.gramlib interp))
-(rule
- (targets g_prim.ml)
- (deps (:mlg-file g_prim.mlg))
- (action (run coqpp %{mlg-file})))
-
-(rule
- (targets g_constr.ml)
- (deps (:mlg-file g_constr.mlg))
- (action (run coqpp %{mlg-file})))
+(coq.pp (modules g_prim g_constr))
diff --git a/toplevel/dune b/toplevel/dune
index f51e50aaa3..2d64ae303c 100644
--- a/toplevel/dune
+++ b/toplevel/dune
@@ -7,7 +7,4 @@
; Coqlevel provides the `Num` library to plugins, we could also use
; -linkall in the plugins file, to be discussed.
-(rule
- (targets g_toplevel.ml)
- (deps (:mlg-file g_toplevel.mlg))
- (action (run coqpp %{mlg-file})))
+(coq.pp (modules g_toplevel))
diff --git a/vernac/dune b/vernac/dune
index 45b567d631..ba361b1377 100644
--- a/vernac/dune
+++ b/vernac/dune
@@ -5,12 +5,4 @@
(wrapped false)
(libraries tactics parsing))
-(rule
- (targets g_proofs.ml)
- (deps (:mlg-file g_proofs.mlg))
- (action (run coqpp %{mlg-file})))
-
-(rule
- (targets g_vernac.ml)
- (deps (:mlg-file g_vernac.mlg))
- (action (run coqpp %{mlg-file})))
+(coq.pp (modules g_proofs g_vernac))