Use dune 3.6 language + mdx 0.3 stanza

bin/bin/app.ml

@@ -1,7 +1,6 @@
 open Core
 open Async
 open Rwo
-let (/) = Filename.concat
 
 module Params = struct
   open Command.Param
@@ -11,19 +10,6 @@ module Params = struct
     let doc = sprintf "dir Root of repository. Default: \"%s\"." default in
     flag "-repo-root" (optional_with_default default string) ~doc
 
-  let production =
-    let default = false in
-    let doc = sprintf
-        " Set to true to generate file for publication. Default \
-         is %b, which generates dev version of file."
-        default
-    in
-    flag "-production" (optional_with_default default bool) ~doc
-
-  let chapter =
-    let doc = "N Build HTML version of chapter N." in
-    flag "-chapter" (required int) ~doc
-
   let out_dir =
     let default = "_build" in
     let doc = sprintf "DIR Output directory. Default: \"%s\"" default in
@@ -37,12 +23,6 @@ module Params = struct
 
   let file =
     anon ("file" %: string)
-
-  let run_nondeterministic =
-    flag "-run-nondeterministic" no_arg
-      ~doc:" In .mlt files, run code marked [%%expect.nondeterministic ...]. \
-            By default, they are skipped."
-
 end
 
 

bin/bin/convert_md.ml

@@ -138,9 +138,6 @@ let pp_block_md ppf (b:Mdx.Block.t) =
 let pp_text_html ppf l =
   List.iter (Fmt.pf ppf "%s\n") (List.rev l)
 
-let pp_text_md ppf l =
-  List.iter (Fmt.pf ppf "%s\n") (List.rev l)
-
 open Astring
 
 let pp_text_latex ppf l =

bin/examples-rules/examples_rules.ml

@@ -42,6 +42,7 @@ let print_rule ~dir_name ~path (config : Config.t) =
  (alias %s)
  (deps
   (source_tree %s)%s)
+ (locks /recursive-dune-run)
  (action
   (system "dune build @all @runtest --root %s")))
 

book/classes/dune

@@ -1,7 +1,6 @@
 (mdx
  (files README.md)
- (packages
+ (libraries
   core
-  mdx
   ppx_jane)
  (preludes prelude.ml))

book/classes/examples/dune.inc

@@ -7,6 +7,7 @@
   (package async)
   (package async_kernel)
   (package async_graphics))
+ (locks /recursive-dune-run)
  (action
   (system "dune build @all @runtest --root ./correct/shapes")))
 

book/command-line-parsing/dune

@@ -1,7 +1,6 @@
 (mdx
  (files README.md)
- (packages
+ (libraries
   core
-  mdx
   ppx_jane)
  (preludes prelude.ml))

book/command-line-parsing/examples/dune.inc

@@ -4,6 +4,7 @@
  (deps
   (source_tree ./correct/cal_add_days)
   (package core))
+ (locks /recursive-dune-run)
  (action
   (system "dune build @all @runtest --root ./correct/cal_add_days")))
 
@@ -17,6 +18,7 @@
   (source_tree ./correct/cal_add_interactive)
   (package core)
   (package ppx_jane))
+ (locks /recursive-dune-run)
  (action
   (system "dune build @all @runtest --root ./correct/cal_add_interactive")))
 
@@ -29,6 +31,7 @@
  (deps
   (source_tree ./correct/cal_add_interactive2)
   (package core))
+ (locks /recursive-dune-run)
  (action
   (system "dune build @all @runtest --root ./correct/cal_add_interactive2")))
 
@@ -41,6 +44,7 @@
  (deps
   (source_tree ./correct/cal_add_sub_days)
   (package core))
+ (locks /recursive-dune-run)
  (action
   (system "dune build @all @runtest --root ./correct/cal_add_sub_days")))
 
@@ -53,6 +57,7 @@
  (deps
   (source_tree ./correct/md5)
   (package core))
+ (locks /recursive-dune-run)
  (action
   (system "dune build @all @runtest --root ./correct/md5")))
 
@@ -65,6 +70,7 @@
  (deps
   (source_tree ./correct/md5_as_filename)
   (package core))
+ (locks /recursive-dune-run)
  (action
   (system "dune build @all @runtest --root ./correct/md5_as_filename")))
 
@@ -77,6 +83,7 @@
  (deps
   (source_tree ./correct/md5_let_syntax)
   (package core))
+ (locks /recursive-dune-run)
  (action
   (system "dune build @all @runtest --root ./correct/md5_let_syntax")))
 
@@ -89,6 +96,7 @@
  (deps
   (source_tree ./correct/md5_let_syntax2)
   (package core))
+ (locks /recursive-dune-run)
  (action
   (system "dune build @all @runtest --root ./correct/md5_let_syntax2")))
 
@@ -101,6 +109,7 @@
  (deps
   (source_tree ./correct/md5_multiarg)
   (package core))
+ (locks /recursive-dune-run)
  (action
   (system "dune build @all @runtest --root ./correct/md5_multiarg")))
 
@@ -113,6 +122,7 @@
  (deps
   (source_tree ./correct/md5_sequence)
   (package core))
+ (locks /recursive-dune-run)
  (action
   (system "dune build @all @runtest --root ./correct/md5_sequence")))
 
@@ -125,6 +135,7 @@
  (deps
   (source_tree ./correct/md5_succinct)
   (package core))
+ (locks /recursive-dune-run)
  (action
   (system "dune build @all @runtest --root ./correct/md5_succinct")))
 
@@ -137,6 +148,7 @@
  (deps
   (source_tree ./correct/md5_with_custom_arg)
   (package core))
+ (locks /recursive-dune-run)
  (action
   (system "dune build @all @runtest --root ./correct/md5_with_custom_arg")))
 
@@ -149,6 +161,7 @@
  (deps
   (source_tree ./correct/md5_with_default_file)
   (package core))
+ (locks /recursive-dune-run)
  (action
   (system "dune build @all @runtest --root ./correct/md5_with_default_file")))
 
@@ -161,6 +174,7 @@
  (deps
   (source_tree ./correct/md5_with_flags)
   (package core))
+ (locks /recursive-dune-run)
  (action
   (system "dune build @all @runtest --root ./correct/md5_with_flags")))
 
@@ -173,6 +187,7 @@
  (deps
   (source_tree ./correct/md5_with_optional_file)
   (package core))
+ (locks /recursive-dune-run)
  (action
   (system "dune build @all @runtest --root ./correct/md5_with_optional_file")))
 

book/compiler-backend/dune

@@ -1,8 +1,7 @@
 (mdx
  (files README.md)
- (packages
+ (libraries
   core
-  mdx
   ppx_jane)
  (preludes prelude.ml))
 

book/compiler-frontend/dune

@@ -1,8 +1,7 @@
 (mdx
  (files README.md)
- (packages
+ (libraries
   core
-  mdx
   ppx_jane)
  (preludes prelude.ml))
 

book/concurrent-programming/dune

@@ -1,10 +1,11 @@
 (mdx
  (files README.md)
- (packages
+ (libraries
   async
+  async_kernel
+  async_unix
   cohttp-async
   core
-  mdx
   ppx_jane
   textwrap
   yojson)

book/concurrent-programming/examples/dune.inc

@@ -5,6 +5,7 @@
   (source_tree ./correct/better_echo)
   (package core)
   (package async))
+ (locks /recursive-dune-run)
  (action
   (system "dune build @all @runtest --root ./correct/better_echo")))
 
@@ -18,6 +19,7 @@
   (source_tree ./correct/echo)
   (package core)
   (package async))
+ (locks /recursive-dune-run)
  (action
   (system "dune build @all @runtest --root ./correct/echo")))
 
@@ -31,6 +33,7 @@
   (source_tree ./correct/native_code_log_delays)
   (package core)
   (package async))
+ (locks /recursive-dune-run)
  (action
   (system "dune build @all @runtest --root ./correct/native_code_log_delays")))
 
@@ -47,6 +50,7 @@
   (package cohttp-async)
   (package yojson)
   (package textwrap))
+ (locks /recursive-dune-run)
  (action
   (system "dune build @all @runtest --root ./correct/search")))
 
@@ -63,6 +67,7 @@
   (package cohttp-async)
   (package yojson)
   (package textwrap))
+ (locks /recursive-dune-run)
  (action
   (system "dune build @all @runtest --root ./correct/search_out_of_order")))
 
@@ -77,6 +82,7 @@
   (package cohttp-async)
   (package yojson)
   (package textwrap))
+ (locks /recursive-dune-run)
  (action
   (system "dune build @all @runtest --root ./correct/search_with_configurable_server")))
 
@@ -91,6 +97,7 @@
   (package cohttp-async)
   (package yojson)
   (package textwrap))
+ (locks /recursive-dune-run)
  (action
   (system "dune build @all @runtest --root ./correct/search_with_error_handling")))
 
@@ -107,6 +114,7 @@
   (package cohttp-async)
   (package yojson)
   (package textwrap))
+ (locks /recursive-dune-run)
  (action
   (system "dune build @all @runtest --root ./correct/search_with_timeout")))
 
@@ -121,6 +129,7 @@
   (package cohttp-async)
   (package yojson)
   (package textwrap))
+ (locks /recursive-dune-run)
  (action
   (system "dune build @all @runtest --root ./correct/search_with_timeout_no_leak")))
 
@@ -135,6 +144,7 @@
   (package cohttp-async)
   (package yojson)
   (package textwrap))
+ (locks /recursive-dune-run)
  (action
   (system "dune build @all @runtest --root ./correct/search_with_timeout_no_leak_simple")))
 

book/data-serialization/dune

@@ -1,7 +1,6 @@
 (mdx
  (files README.md)
- (packages
+ (libraries
   core
-  mdx
   ppx_jane)
  (preludes prelude.ml))

book/data-serialization/examples/dune.inc

@@ -5,6 +5,7 @@
   (source_tree ./correct/read_foo)
   (package core)
   (package sexplib))
+ (locks /recursive-dune-run)
  (action
   (system "dune build @all @runtest --root ./correct/read_foo")))
 
@@ -18,6 +19,7 @@
   (source_tree ./correct/read_foo_better_errors)
   (package core)
   (package sexplib))
+ (locks /recursive-dune-run)
  (action
   (system "dune build @all @runtest --root ./correct/read_foo_better_errors")))
 
@@ -30,6 +32,7 @@
  (deps
   (source_tree ./correct/sexp)
   (package base))
+ (locks /recursive-dune-run)
  (action
   (system "dune build @all @runtest --root ./correct/sexp")))
 
@@ -43,6 +46,7 @@
   (source_tree ./correct/test_interval)
   (package core)
   (package sexplib))
+ (locks /recursive-dune-run)
  (action
   (system "dune build @all @runtest --root ./correct/test_interval")))
 
@@ -56,6 +60,7 @@
   (source_tree ./correct/test_interval_override_of_sexp)
   (package core)
   (package sexplib))
+ (locks /recursive-dune-run)
  (action
   (system "dune build @all @runtest --root ./correct/test_interval_override_of_sexp")))
 

book/error-handling/dune

@@ -1,8 +1,7 @@
 (mdx
  (files README.md)
- (packages
+ (libraries
   base
   core
-  mdx
   ppx_jane)
  (preludes prelude.ml))

book/error-handling/examples/dune.inc

@@ -5,6 +5,7 @@
   (source_tree ./correct/blow_up)
   (package base)
   (package stdio))
+ (locks /recursive-dune-run)
  (action
   (system "dune build @all @runtest --root ./correct/blow_up")))
 
@@ -18,6 +19,7 @@
   (source_tree ./correct/exn_cost)
   (package core)
   (package core_bench))
+ (locks /recursive-dune-run)
  (action
   (system "dune build @all @runtest --root ./correct/exn_cost")))