feature(cinaps): runtime dependencies

CHANGES.md

@@ -1,6 +1,9 @@
 3.5.0 (unreleased)
 ------------------
 
+- Add a `runtime_deps` field in the `cinaps` stanza to specify runtime
+  dependencies for running the cinaps preprocessing action (#6175, @rgrinberg)
+
 - Shadow alias module `Foo__` when building a library `Foo` (#6126, @rgrinberg)
 
 - Allow dune describe workspace to accept directories as arguments.

src/dune_rules/cinaps.ml

@@ -6,6 +6,7 @@ type t =
   ; libraries : Lib_dep.t list
   ; preprocess : Preprocess.Without_instrumentation.t Preprocess.Per_module.t
   ; preprocessor_deps : Dep_conf.t list
+  ; runtime_deps : Dep_conf.t list
   }
 
 let name = "cinaps"
@@ -14,7 +15,7 @@ type Stanza.t += T of t
 
 let syntax =
   Dune_lang.Syntax.create ~name ~desc:"the cinaps extension"
-    [ ((1, 0), `Since (1, 11)) ]
+    [ ((1, 0), `Since (1, 11)); ((1, 1), `Since (3, 5)) ]
 
 let alias = Alias.make (Alias.Name.of_string name)
 
@@ -27,9 +28,12 @@ let decode =
      and+ preprocess, preprocessor_deps = Dune_file.preprocess_fields
      and+ libraries =
        field "libraries" (Dune_file.Lib_deps.decode Executable) ~default:[]
+     and+ runtime_deps =
+       field ~default:[] "runtime_deps"
+         (Dune_lang.Syntax.since syntax (1, 1) >>> repeat Dep_conf.decode)
      (* TODO use this field? *)
      and+ _flags = Ocaml_flags.Spec.decode in
-     { loc; files; libraries; preprocess; preprocessor_deps })
+     { loc; files; libraries; preprocess; preprocessor_deps; runtime_deps })
 
 let () =
   let open Dune_lang.Decoder in
@@ -130,8 +134,12 @@ let gen_rules sctx t ~dir ~scope =
     let open Action_builder.O in
     let module A = Action in
     let cinaps_exe = Path.build cinaps_exe in
+    let runtime_deps, sandbox =
+      Dep_conf_eval.unnamed ~expander t.runtime_deps
+    in
+    let* () = runtime_deps in
     let+ () = Action_builder.path cinaps_exe in
-    Action.Full.make
+    Action.Full.make ~sandbox
     @@ A.chdir (Path.build dir)
          (A.progn
             (A.run (Ok cinaps_exe) [ "-diff-cmd"; "-" ]

test/blackbox-tests/test-cases/cinaps/runtime-deps.t

@@ -0,0 +1,30 @@
+Runtime dependencies for running cinaps
+
+  $ cat > dune-project <<EOF
+  > (lang dune 3.5)
+  > (using cinaps 1.1)
+  > EOF
+
+  $ cat > foo <<EOF
+  > hello world
+  > EOF
+
+  $ cat > dune <<EOF
+  > (cinaps
+  >  (files *.ml)
+  >  (runtime_deps foo))
+  > EOF
+
+  $ cat > test.ml <<EOF
+  > (*$ let f = open_in "foo" in print_endline (input_line f); close_in f *)
+  > (*$*)
+  > EOF
+
+  $ dune build @cinaps --auto-promote
+  File "test.ml", line 1, characters 0-0:
+  Error: Files _build/default/test.ml and
+  _build/default/test.ml.cinaps-corrected differ.
+  Promoting _build/default/test.ml.cinaps-corrected to test.ml.
+  [1]
+  $ cat test.ml
+  (*$ let f = open_in "foo" in print_endline (input_line f); close_in f *)hello world