Jbuilder: fix rule runtest_indent

Makefile

@@ -25,6 +25,9 @@ build-test:
 test:
 	@jbuilder runtest ${DEV}
 
+test-indent:
+	@jbuilder build @runtest_indent ${DEV}
+
 build-deps:
 	@./scripts/install_build_deps.sh
 

src/bin_client/jbuild

@@ -22,4 +22,4 @@
 (alias
  ((name runtest_indent)
   (deps ((glob_files *.ml) (glob_files *.mli)))
-  (action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${<}))))
+  (action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${^}))))

src/bin_node/jbuild

@@ -31,4 +31,4 @@
 (alias
  ((name runtest_indent)
   (deps ((glob_files *.ml) (glob_files *.mli)))
-  (action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${<}))))
+  (action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${^}))))

src/lib_base/jbuild

@@ -23,4 +23,4 @@
 (alias
  ((name runtest_indent)
   (deps ((glob_files *.ml) (glob_files *.mli)))
-  (action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${<}))))
+  (action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${^}))))

src/lib_client_base/jbuild

@@ -22,4 +22,4 @@
 (alias
  ((name runtest_indent)
   (deps ((glob_files *.ml) (glob_files *.mli)))
-  (action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${<}))))
+  (action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${^}))))

src/lib_crypto/jbuild

@@ -21,4 +21,4 @@
 (alias
  ((name runtest_indent)
   (deps ((glob_files *.ml) (glob_files *.mli)))
-  (action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${<}))))
+  (action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${^}))))

src/lib_data_encoding/jbuild

@@ -11,4 +11,4 @@
 (alias
  ((name runtest_indent)
   (deps ((glob_files *.ml) (glob_files *.mli)))
-  (action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${<}))))
+  (action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${^}))))

src/lib_embedded_client_alpha/jbuild

@@ -21,4 +21,4 @@
 (alias
  ((name runtest_indent)
   (deps ((glob_files *.ml) (glob_files *.mli)))
-  (action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${<}))))
+  (action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${^}))))

src/lib_embedded_client_genesis/jbuild

@@ -22,4 +22,4 @@
 (alias
  ((name runtest_indent)
   (deps ((glob_files *.ml) (glob_files *.mli)))
-  (action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${<}))))
+  (action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${^}))))

src/lib_error_monad/jbuild

@@ -13,4 +13,4 @@
 (alias
  ((name runtest_indent)
   (deps ((glob_files *.ml) (glob_files *.mli)))
-  (action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${<}))))
+  (action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${^}))))

src/lib_micheline/jbuild

@@ -17,4 +17,4 @@
 (alias
  ((name runtest_indent)
   (deps ((glob_files *.ml) (glob_files *.mli)))
-  (action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${<}))))
+  (action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${^}))))

src/lib_node_p2p/jbuild

@@ -13,4 +13,4 @@
 (alias
  ((name runtest_indent)
   (deps ((glob_files *.ml) (glob_files *.mli)))
-  (action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${<}))))
+  (action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${^}))))

src/lib_node_p2p_base/jbuild

@@ -9,4 +9,4 @@
 (alias
  ((name runtest_indent)
   (deps ((glob_files *.ml) (glob_files *.mli)))
-  (action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${<}))))
+  (action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${^}))))

src/lib_node_services/jbuild

@@ -13,4 +13,4 @@
 (alias
  ((name runtest_indent)
   (deps ((glob_files *.ml) (glob_files *.mli)))
-  (action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${<}))))
+  (action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${^}))))

src/lib_node_shell/jbuild

@@ -23,4 +23,4 @@
 (alias
  ((name runtest_indent)
   (deps ((glob_files *.ml) (glob_files *.mli)))
-  (action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${<}))))
+  (action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${^}))))

src/lib_node_updater/jbuild

@@ -24,4 +24,4 @@
 (alias
  ((name runtest_indent)
   (deps ((glob_files *.ml) (glob_files *.mli)))
-  (action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${<}))))
+  (action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${^}))))

src/lib_protocol_compiler/jbuild

@@ -50,5 +50,17 @@
 
 (alias
  ((name runtest_indent)
-  (deps ((glob_files *.ml) (glob_files *.mli)))
+  ;; we would like (deps ((glob_files *.ml \ embedded_cmis.ml)))
-  (action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${<}))))
+  ;; meanwhile, we hardcode the module list
+  (deps ("embedded_cmis.mli"
+         "main_embedded_packer.ml"
+         "main_embedded_packer.mli"
+         "main.ml"
+         "native.ml"
+         "native.mli"
+         "packer.ml"
+         "packer.mli"
+         "registerer.ml"
+         "registerer.mli"
+         ))
+  (action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${^}))))

src/lib_protocol_compiler/jbuild_protocol_template

@@ -9,6 +9,8 @@
    A trick is to provide the `.cmx` through the `(library_flags)` and
    to generate a empty `.ml` to correctly handle the dependencies... *)
 
+#require "unix"
+
 let prefix = "lib_embedded_protocol_"
 let dirname = Filename.basename @@ Sys.getcwd ()
 
@@ -29,6 +31,26 @@ let path =
   | None -> "src/lib_embedded_protocol_" ^ version
   | Some _ -> "."
 
+let sources =
+  let d = Unix.opendir "src" in
+  let rec loop acc =
+    match Unix.readdir d with
+    | exception End_of_file ->
+        Unix.closedir d ;
+        acc
+    | file ->
+        let acc =
+          if Filename.check_suffix file ".mli"
+          || Filename.check_suffix file ".ml" then
+            ("src/" ^ file) :: acc
+          else
+            acc
+        in
+        loop acc in
+  loop []
+
+module M = Unix
+
 let () = Format.kasprintf Jbuild_plugin.V1.send {|
 
 (jbuild_version 1)
@@ -60,10 +82,12 @@ let () = Format.kasprintf Jbuild_plugin.V1.send {|
 
 (alias
  ((name runtest_indent)
-  (deps ((glob_files src/*.ml) (glob_files src/*.mli)))
+  (deps (@[<v>%a@]))
-  (action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${<}))))
+  (action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${^}))))
 
 |}
     version version version version version version version version
     path
     version version version
+    Format.(pp_print_list (fun ppf -> Format.fprintf ppf "%S"))
+    sources

src/lib_protocol_environment_sigs/sigs_packer/jbuild

@@ -7,4 +7,4 @@
 (alias
  ((name runtest_indent)
   (deps ((glob_files *.ml) (glob_files *.mli)))
-  (action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${<}))))
+  (action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${^}))))

src/lib_rpc_base/jbuild

@@ -12,4 +12,4 @@
 (alias
  ((name runtest_indent)
   (deps ((glob_files *.ml) (glob_files *.mli)))
-  (action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${<}))))
+  (action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${^}))))

src/lib_rpc_http/jbuild

@@ -16,4 +16,4 @@
 (alias
  ((name runtest_indent)
   (deps ((glob_files *.ml) (glob_files *.mli)))
-  (action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${<}))))
+  (action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${^}))))

src/lib_stdlib/jbuild

@@ -9,7 +9,7 @@
 (alias
  ((name runtest_indent)
   (deps ((glob_files *.ml) (glob_files *.mli)))
-  (action (run bash ${path:test-ocp-indent.sh} ${<}))))
+  (action (run bash ${path:test-ocp-indent.sh} ${^}))))
 
 (install
  ((section libexec)

src/lib_stdlib_lwt/jbuild

@@ -17,4 +17,4 @@
 (alias
  ((name runtest_indent)
   (deps ((glob_files *.ml) (glob_files *.mli)))
-  (action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${<}))))
+  (action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${^}))))

src/lib_storage/jbuild

@@ -13,4 +13,4 @@
 (alias
  ((name runtest_indent)
   (deps ((glob_files *.ml) (glob_files *.mli)))
-  (action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${<}))))
+  (action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${^}))))

test/lib/jbuild

@@ -10,4 +10,4 @@
 (alias
  ((name runtest_indent)
   (deps ((glob_files *.ml) (glob_files *.mli)))
-  (action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${<}))))
+  (action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${^}))))

test/p2p/jbuild

@@ -47,4 +47,4 @@
 (alias
  ((name runtest_indent)
   (deps ((glob_files *.ml) (glob_files *.mli)))
-  (action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${<}))))
+  (action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${^}))))

test/proto_alpha/jbuild

@@ -69,4 +69,4 @@
 (alias
  ((name runtest_indent)
   (deps ((glob_files *.ml) (glob_files *.mli)))
-  (action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${<}))))
+  (action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${^}))))

test/shell/jbuild

@@ -44,4 +44,4 @@
 (alias
  ((name runtest_indent)
   (deps ((glob_files *.ml) (glob_files *.mli)))
-  (action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${<}))))
+  (action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${^}))))

test/utils/jbuild

@@ -58,4 +58,4 @@
 (alias
  ((name runtest_indent)
   (deps ((glob_files *.ml) (glob_files *.mli)))
-  (action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${<}))))
+  (action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${^}))))