Change compilation layout

 - all the cmx are all at the same place
 - all the cmi and cmo are in another directory
 - the public directory contains the public cmi

Signed-off-by: François Bobot <[email protected]>

Author: bobot

CHANGES.md

@@ -1,6 +1,8 @@
 unreleased
 ----------
 
+- Change the layout of build artifacts inside _build (#1676 @bobot)
+
 - Fix merlin handling of private module visibility (#1653 @bobot)
 
 - unstable-fmt: use boxes to wrap some lists (#1608, fix #1153, @emillon,

example/sample-projects/hello_world/run.t

@@ -1,16 +1,16 @@
   $ dune build @install @runtest --display short
       ocamldep bin/.main.eobjs/main.ml.d
       ocamldep lib/.hello_world.objs/hello_world.ml.d
-        ocamlc lib/.hello_world.objs/hello_world.{cmi,cmo,cmt}
+        ocamlc lib/.hello_world.objs/.byte_objs/hello_world.{cmi,cmo,cmt}
         ocamlc lib/hello_world.cma
       ocamldep test/.test.eobjs/test.ml.d
-      ocamlopt lib/.hello_world.objs/hello_world.{cmx,o}
+      ocamlopt lib/.hello_world.objs/.native_objs/hello_world.{cmx,o}
       ocamlopt lib/hello_world.{a,cmxa}
-        ocamlc test/.test.eobjs/test.{cmi,cmo,cmt}
-      ocamlopt test/.test.eobjs/test.{cmx,o}
+        ocamlc test/.test.eobjs/.byte_objs/test.{cmi,cmo,cmt}
+      ocamlopt test/.test.eobjs/.native_objs/test.{cmx,o}
       ocamlopt test/test.exe
           test test/test.output
       ocamlopt lib/hello_world.cmxs
-        ocamlc bin/.main.eobjs/main.{cmi,cmo,cmt}
-      ocamlopt bin/.main.eobjs/main.{cmx,o}
+        ocamlc bin/.main.eobjs/.byte_objs/main.{cmi,cmo,cmt}
+      ocamlopt bin/.main.eobjs/.native_objs/main.{cmx,o}
       ocamlopt bin/main.exe

example/sample-projects/with-configure-step/run.t

@@ -2,8 +2,8 @@
          ocaml config.full
       ocamldep src/.plop.eobjs/config.ml.d
       ocamldep src/.plop.eobjs/plop.ml.d
-        ocamlc src/.plop.eobjs/config.{cmi,cmo,cmt}
-        ocamlc src/.plop.eobjs/plop.{cmi,cmo,cmt}
-      ocamlopt src/.plop.eobjs/plop.{cmx,o}
-      ocamlopt src/.plop.eobjs/config.{cmx,o}
+        ocamlc src/.plop.eobjs/.byte_objs/config.{cmi,cmo,cmt}
+        ocamlc src/.plop.eobjs/.byte_objs/plop.{cmi,cmo,cmt}
+      ocamlopt src/.plop.eobjs/.native_objs/plop.{cmx,o}
+      ocamlopt src/.plop.eobjs/.native_objs/config.{cmx,o}
       ocamlopt src/plop.exe

src/check_rules.ml

@@ -16,4 +16,4 @@ let add_obj_dir sctx ~obj_dir =
         ~dyn_deps:(Build.paths_matching ~loc:Loc.none ~dir dev_files)
         Path.Set.empty
     in
-    List.iter ~f (Obj_dir.all_objs_dir obj_dir)
+    List.iter ~f [obj_dir.byte_dir]

src/cm_kind.ml

@@ -11,6 +11,8 @@ let choose cmi cmo cmx = function
 
 let ext = choose ".cmi" ".cmo" ".cmx"
 
+let pp fmt p = Format.pp_print_string fmt (ext p)
+
 let source = choose Ml_kind.Intf Impl Impl
 
 module Dict = struct

src/cm_kind.mli

@@ -3,7 +3,7 @@ open Stdune
 type t = Cmi | Cmo | Cmx
 
 val all : t list
-
+val pp : t Fmt.t
 val ext : t -> string
 val source : t -> Ml_kind.t
 

src/exe.ml

@@ -129,14 +129,15 @@ let link_exe
   let mode = linkage.mode in
   let exe = Path.relative dir (name ^ linkage.ext) in
   let compiler = Option.value_exn (Context.compiler ctx mode) in
+  let kind = Mode.cm_kind mode in
   let artifacts ~ext modules =
-    List.map modules ~f:(Module.obj_file ~ext)
+    List.map modules ~f:(Module.obj_file ~mode ~ext)
   in
   let modules_and_cm_files =
     Build.memoize "cm files"
       (top_sorted_modules >>^ fun modules ->
        (modules,
-        artifacts modules ~ext:(Cm_kind.ext (Mode.cm_kind mode))))
+        artifacts modules ~ext:(Cm_kind.ext kind)))
   in
   let register_native_objs_deps build =
     match mode with

src/exe_rules.ml

@@ -107,7 +107,7 @@ let executables_rules ~sctx ~dir ~dir_kind ~expander
      ~flags:(Ocaml_flags.common flags)
      ~preprocess:(Dune_file.Buildable.single_preprocess exes.buildable)
      (* only public_dir? *)
-     ~objs_dirs:(Path.Set.singleton obj_dir.Obj_dir.public_dir))
+     ~objs_dirs:(Path.Set.singleton (Obj_dir.public_cmi_dir obj_dir)))
 
 let rules ~sctx ~dir ~dir_contents ~scope ~expander ~dir_kind
       (exes : Dune_file.Executables.t) =

src/install_rules.ml

@@ -226,13 +226,13 @@ module Gen(P : Params) = struct
       List.concat_map installable_modules ~f:(fun m ->
         List.concat
           [ if_ (Module.is_public m)
-              [ Module.cm_file_unsafe m Cmi ]
+              [ Module.cm_public_file_unsafe m Cmi ]
           ; if_ (native && Module.has_impl m)
               [ Module.cm_file_unsafe m Cmx ]
           ; if_ (byte && Module.has_impl m && virtual_library)
               [ Module.cm_file_unsafe m Cmo ]
           ; if_ (native && Module.has_impl m && virtual_library)
-              [ Module.obj_file m ~ext:ctx.ext_obj ]
+              [ Module.obj_file m ~mode:Native ~ext:ctx.ext_obj ]
           ; List.filter_map Ml_kind.all ~f:(Module.cmt_file m)
           ])
     in

src/lib.ml

@@ -190,7 +190,12 @@ let virtual_     t = t.info.virtual_
 let src_dir t = t.info.src_dir
 let obj_dir t = t.info.obj_dir
 
-let is_local t = Path.is_managed t.info.obj_dir.public_dir
+let is_local t = Path.is_managed t.info.obj_dir.byte_dir
+
+let public_cmi_dir t = Obj_dir.public_cmi_dir t.info.obj_dir
+
+
+let native_dir t = t.info.obj_dir.native_dir
 
 let status t = t.info.status
 
@@ -253,7 +258,8 @@ module L = struct
   let include_paths ts ~stdlib_dir =
     let dirs =
       List.fold_left ts ~init:Path.Set.empty ~f:(fun acc t ->
-        Path.Set.add acc (obj_dir t).public_dir)
+        List.fold_left ~f:Path.Set.add ~init:acc
+          [public_cmi_dir t ; native_dir t])
     in
     Path.Set.remove dirs stdlib_dir