From b452f8bc2f6ff6b587018593369d0371e6eec2ad Mon Sep 17 00:00:00 2001 From: Marek Kubica Date: Fri, 25 Feb 2022 17:39:44 +0100 Subject: [PATCH] Upgrade to use mdx 0.2 stanza --- book/classes/dune | 3 +-- book/command-line-parsing/dune | 3 +-- book/compiler-backend/dune | 3 +-- book/compiler-frontend/dune | 3 +-- book/concurrent-programming/dune | 3 +-- book/data-serialization/dune | 3 +-- book/error-handling/dune | 3 +-- book/files-modules-and-programs/dune | 5 ++--- book/first-class-modules/dune | 2 +- book/foreign-function-interface/dune | 4 ++-- book/functors/dune | 3 +-- book/gadts/dune | 2 +- book/garbage-collector/dune | 3 +-- book/guided-tour/dune | 3 +-- book/imperative-programming/dune | 3 +-- book/json/dune | 3 +-- book/lists-and-patterns/dune | 3 +-- book/maps-and-hashtables/dune | 3 +-- book/objects/dune | 3 +-- book/parsing-with-ocamllex-and-menhir/dune | 3 +-- book/platform/dune | 6 +----- book/prologue/dune | 3 +-- book/records/dune | 3 +-- book/runtime-memory-layout/dune | 4 +--- book/testing/dune | 3 +-- book/variables-and-functions/dune | 3 +-- book/variants/dune | 3 +-- dune-project | 2 +- 28 files changed, 30 insertions(+), 58 deletions(-) diff --git a/book/classes/dune b/book/classes/dune index 5cf1868bb..20e770f57 100644 --- a/book/classes/dune +++ b/book/classes/dune @@ -1,8 +1,7 @@ (mdx (files README.md) - (packages + (libraries core - mdx ppx_jane) (preludes prelude.ml)) diff --git a/book/command-line-parsing/dune b/book/command-line-parsing/dune index f8905ba47..2a3f5faf6 100644 --- a/book/command-line-parsing/dune +++ b/book/command-line-parsing/dune @@ -1,7 +1,6 @@ (mdx (files README.md) - (packages + (libraries core - mdx ppx_jane) (preludes prelude.ml)) diff --git a/book/compiler-backend/dune b/book/compiler-backend/dune index 5cf1868bb..20e770f57 100644 --- a/book/compiler-backend/dune +++ b/book/compiler-backend/dune @@ -1,8 +1,7 @@ (mdx (files README.md) - (packages + (libraries core - mdx ppx_jane) (preludes prelude.ml)) diff --git a/book/compiler-frontend/dune b/book/compiler-frontend/dune index 5cf1868bb..20e770f57 100644 --- a/book/compiler-frontend/dune +++ b/book/compiler-frontend/dune @@ -1,8 +1,7 @@ (mdx (files README.md) - (packages + (libraries core - mdx ppx_jane) (preludes prelude.ml)) diff --git a/book/concurrent-programming/dune b/book/concurrent-programming/dune index b0f4132f0..4dfaa8377 100644 --- a/book/concurrent-programming/dune +++ b/book/concurrent-programming/dune @@ -1,10 +1,9 @@ (mdx (files README.md) - (packages + (libraries async cohttp-async core - mdx ppx_jane textwrap yojson) diff --git a/book/data-serialization/dune b/book/data-serialization/dune index f8905ba47..2a3f5faf6 100644 --- a/book/data-serialization/dune +++ b/book/data-serialization/dune @@ -1,7 +1,6 @@ (mdx (files README.md) - (packages + (libraries core - mdx ppx_jane) (preludes prelude.ml)) diff --git a/book/error-handling/dune b/book/error-handling/dune index faec87999..b74c2706c 100644 --- a/book/error-handling/dune +++ b/book/error-handling/dune @@ -1,8 +1,7 @@ (mdx (files README.md) - (packages + (libraries base core - mdx ppx_jane) (preludes prelude.ml)) diff --git a/book/files-modules-and-programs/dune b/book/files-modules-and-programs/dune index 4651cd4a5..d4c4f11d8 100644 --- a/book/files-modules-and-programs/dune +++ b/book/files-modules-and-programs/dune @@ -1,8 +1,7 @@ (mdx (files README.md) - (packages + (deps (package ocamlfind)) + (libraries core - mdx - ocamlfind ppx_jane) (preludes prelude.ml)) diff --git a/book/first-class-modules/dune b/book/first-class-modules/dune index 663e54777..c091e63a9 100644 --- a/book/first-class-modules/dune +++ b/book/first-class-modules/dune @@ -1,4 +1,4 @@ (mdx (files README.md) - (packages core mdx ppx_jane) + (libraries core ppx_jane) (preludes prelude.ml)) diff --git a/book/foreign-function-interface/dune b/book/foreign-function-interface/dune index 95edb682c..3f7bf564a 100644 --- a/book/foreign-function-interface/dune +++ b/book/foreign-function-interface/dune @@ -1,11 +1,11 @@ (mdx (files README.md) - (packages + (deps (package ocaml-print-intf)) + (libraries core ctypes ctypes-foreign mdx - ocaml-print-intf ppx_jane) (preludes prelude.ml)) diff --git a/book/functors/dune b/book/functors/dune index 5cf1868bb..20e770f57 100644 --- a/book/functors/dune +++ b/book/functors/dune @@ -1,8 +1,7 @@ (mdx (files README.md) - (packages + (libraries core - mdx ppx_jane) (preludes prelude.ml)) diff --git a/book/gadts/dune b/book/gadts/dune index 95f99cadb..6ea5a614f 100644 --- a/book/gadts/dune +++ b/book/gadts/dune @@ -1,4 +1,4 @@ (mdx (files README.md) - (packages async base core mdx ppx_jane) + (libraries async base core ppx_jane) (preludes prelude.ml)) diff --git a/book/garbage-collector/dune b/book/garbage-collector/dune index 1775ea5ce..e04149665 100644 --- a/book/garbage-collector/dune +++ b/book/garbage-collector/dune @@ -1,10 +1,9 @@ (mdx (files README.md) - (packages + (libraries async core core_bench - mdx ppx_jane) (preludes prelude.ml)) diff --git a/book/guided-tour/dune b/book/guided-tour/dune index edf876b77..88551d8c0 100644 --- a/book/guided-tour/dune +++ b/book/guided-tour/dune @@ -1,7 +1,6 @@ (mdx (files README.md) - (packages + (libraries base - mdx ppx_jane) (preludes prelude.ml)) diff --git a/book/imperative-programming/dune b/book/imperative-programming/dune index f8905ba47..2a3f5faf6 100644 --- a/book/imperative-programming/dune +++ b/book/imperative-programming/dune @@ -1,7 +1,6 @@ (mdx (files README.md) - (packages + (libraries core - mdx ppx_jane) (preludes prelude.ml)) diff --git a/book/json/dune b/book/json/dune index 5e12ae4e1..f5d7c9b6c 100644 --- a/book/json/dune +++ b/book/json/dune @@ -1,8 +1,7 @@ (mdx (files README.md) - (packages + (libraries core - mdx ppx_jane yojson) (preludes prelude.ml)) diff --git a/book/lists-and-patterns/dune b/book/lists-and-patterns/dune index a2d11e9c5..d460b41cb 100644 --- a/book/lists-and-patterns/dune +++ b/book/lists-and-patterns/dune @@ -1,8 +1,7 @@ (mdx (files README.md) - (packages + (libraries core core_bench - mdx ppx_jane) (preludes prelude.ml)) diff --git a/book/maps-and-hashtables/dune b/book/maps-and-hashtables/dune index f8905ba47..2a3f5faf6 100644 --- a/book/maps-and-hashtables/dune +++ b/book/maps-and-hashtables/dune @@ -1,7 +1,6 @@ (mdx (files README.md) - (packages + (libraries core - mdx ppx_jane) (preludes prelude.ml)) diff --git a/book/objects/dune b/book/objects/dune index 8bd00edc7..360b4b184 100644 --- a/book/objects/dune +++ b/book/objects/dune @@ -1,8 +1,7 @@ (mdx (files README.md) - (packages + (libraries core - mdx ppx_jane) (preludes prelude.ml diff --git a/book/parsing-with-ocamllex-and-menhir/dune b/book/parsing-with-ocamllex-and-menhir/dune index f8905ba47..2a3f5faf6 100644 --- a/book/parsing-with-ocamllex-and-menhir/dune +++ b/book/parsing-with-ocamllex-and-menhir/dune @@ -1,7 +1,6 @@ (mdx (files README.md) - (packages + (libraries core - mdx ppx_jane) (preludes prelude.ml)) diff --git a/book/platform/dune b/book/platform/dune index fb82feb53..827a58fda 100644 --- a/book/platform/dune +++ b/book/platform/dune @@ -1,8 +1,4 @@ (mdx (files README.md) - (packages - base - mdx - ) + (libraries base) (preludes prelude.ml)) - diff --git a/book/prologue/dune b/book/prologue/dune index 0695f8ee5..acb270fb9 100644 --- a/book/prologue/dune +++ b/book/prologue/dune @@ -1,3 +1,2 @@ (mdx - (files README.md) - (packages mdx)) + (files README.md)) diff --git a/book/records/dune b/book/records/dune index 5ffd2d102..75b153d26 100644 --- a/book/records/dune +++ b/book/records/dune @@ -1,8 +1,7 @@ (mdx (files README.md) - (packages + (libraries core - mdx ppx_jane re) (preludes prelude.ml)) diff --git a/book/runtime-memory-layout/dune b/book/runtime-memory-layout/dune index c24dc99e4..759cfe42f 100644 --- a/book/runtime-memory-layout/dune +++ b/book/runtime-memory-layout/dune @@ -1,6 +1,4 @@ (mdx (files README.md) - (packages - mdx - ocaml-compiler-libs) + (deps (package ocaml-compiler-libs)) (preludes prelude.ml)) diff --git a/book/testing/dune b/book/testing/dune index 0992bf3d2..007768f33 100644 --- a/book/testing/dune +++ b/book/testing/dune @@ -1,11 +1,10 @@ (mdx (files README.md) - (packages + (libraries base base_quickcheck core lambdasoup - mdx patdiff ppx_jane uri) diff --git a/book/variables-and-functions/dune b/book/variables-and-functions/dune index f8905ba47..2a3f5faf6 100644 --- a/book/variables-and-functions/dune +++ b/book/variables-and-functions/dune @@ -1,7 +1,6 @@ (mdx (files README.md) - (packages + (libraries core - mdx ppx_jane) (preludes prelude.ml)) diff --git a/book/variants/dune b/book/variants/dune index 7c8995197..917cdb58b 100644 --- a/book/variants/dune +++ b/book/variants/dune @@ -1,7 +1,6 @@ (mdx (files README.md) - (packages + (libraries core - mdx ppx_jane) (preludes prelude.ml old_termcolor.ml)) diff --git a/dune-project b/dune-project index b5a239080..88da5d14b 100644 --- a/dune-project +++ b/dune-project @@ -1,7 +1,7 @@ (lang dune 3.0) (name rwo) -(using mdx 0.1) +(using mdx 0.2) (formatting disabled)