refactor: move ocaml commands to own folder (ocaml#6833)

Signed-off-by: Rudi Grinberg <me@rgrinberg.com>
emillon · Jan 6, 2023 · 1c84d1b · 1c84d1b
1 parent f2c1062
commit 1c84d1b
Show file tree

Hide file tree

Showing 10 changed files with 3 additions and 1 deletion.
diff --git a/bin/dune b/bin/dune
@@ -1,3 +1,5 @@
+(include_subdirs unqualified)
+
 (executable
  (name main)
  (public_name dune)

diff --git a/bin/ocaml_cmd.ml → bin/ocaml/ocaml_cmd.ml b/bin/ocaml_cmd.ml → bin/ocaml/ocaml_cmd.ml
diff --git a/bin/ocaml_cmd.mli → bin/ocaml/ocaml_cmd.mli b/bin/ocaml_cmd.mli → bin/ocaml/ocaml_cmd.mli
diff --git a/bin/ocaml_merlin.ml → bin/ocaml/ocaml_merlin.ml b/bin/ocaml_merlin.ml → bin/ocaml/ocaml_merlin.ml
diff --git a/bin/ocaml_merlin.mli → bin/ocaml/ocaml_merlin.mli b/bin/ocaml_merlin.mli → bin/ocaml/ocaml_merlin.mli
diff --git a/bin/top.ml → bin/ocaml/top.ml b/bin/top.ml → bin/ocaml/top.ml
diff --git a/bin/top.mli → bin/ocaml/top.mli b/bin/top.mli → bin/ocaml/top.mli
diff --git a/bin/utop.ml → bin/ocaml/utop.ml b/bin/utop.ml → bin/ocaml/utop.ml
diff --git a/bin/utop.mli → bin/ocaml/utop.mli b/bin/utop.mli → bin/ocaml/utop.mli
diff --git a/boot/duneboot.ml b/boot/duneboot.ml
@@ -947,7 +947,7 @@ let assemble_libraries { local_libraries; target = _, main; _ } =
         String.capitalize_ascii
           (Filename.chop_extension (Filename.basename main))
       in
-      (dir, Some namespace, false, None)
+      (dir, Some namespace, true (* enable (include_subdirs unqualified *), None)
     in
     local_libraries @ [ task_lib ]
   in