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

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/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

@@ -130,14 +130,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 ~obj_dir ~ext)
+    List.map modules ~f:(Module.obj_file ~mode ~obj_dir ~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

@@ -11,7 +11,7 @@ let executables_rules ~sctx ~dir ~dir_kind ~expander
   let obj_dir =
     Utils.executable_object_directory ~dir (List.hd exes.names |> snd)
   in
-  Check_rules.add_obj_dir sctx ~dir ~obj_dir;
+  Check_rules.add_obj_dir sctx ~dir ~obj_dir:(Utils.library_byte_dir ~obj_dir);
   let requires = Lib.Compile.requires compile_info in
   let modules =
     Dir_contents.modules_of_executables dir_contents

src/install_rules.ml

@@ -228,11 +228,11 @@ 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 ~obj_dir Cmi ]
+              [ Module.cm_public_file_unsafe m ~obj_dir Cmi ]
           ; if_ (native && Module.has_impl m)
               [ Module.cm_file_unsafe m ~obj_dir Cmx ]
           ; if_ (native && Module.has_impl m && virtual_library)
-              [ Module.obj_file m ~obj_dir ~ext:ctx.ext_obj ]
+              [ Module.obj_file m ~obj_dir ~mode:Native ~ext:ctx.ext_obj ]
           ; List.filter_map Ml_kind.all ~f:(Module.cmt_file m ~obj_dir)
           ])
     in

src/lib.ml

@@ -188,10 +188,18 @@ let virtual_     t = t.info.virtual_
 
 let src_dir t = t.info.src_dir
 let obj_dir t = t.info.obj_dir
-let private_obj_dir t = t.info.private_obj_dir
-
 let is_local t = Path.is_managed t.info.obj_dir
 
+let public_cmi_dir t =
+  if is_local t then
+    Utils.library_public_cmi_dir ~obj_dir:t.info.obj_dir
+  else obj_dir t
+
+let native_dir t =
+  if is_local t then
+    Utils.library_native_dir ~obj_dir:t.info.obj_dir
+  else obj_dir t
+
 let status t = t.info.status
 
 let foreign_objects t = t.info.foreign_objects
@@ -242,7 +250,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))
+        List.fold_left ~f:Path.Set.add ~init:acc
+          [public_cmi_dir t; native_dir t])
     in
     Path.Set.remove dirs stdlib_dir
 

src/lib.mli

@@ -18,7 +18,7 @@ val src_dir : t -> Path.t
 (** Directory where the object files for the library are located. *)
 val obj_dir : t -> Path.t
 
-val private_obj_dir : t -> Path.t option
+val public_cmi_dir : t -> Path.t
 
 (** Same as [Path.is_managed (obj_dir t)] *)
 val is_local : t -> bool

src/lib_info.ml

@@ -54,7 +54,6 @@ type t =
   ; status           : Status.t
   ; src_dir          : Path.t
   ; obj_dir          : Path.t
-  ; private_obj_dir  : Path.t option
   ; version          : string option
   ; synopsis         : string option
   ; archives         : Path.t list Mode.Dict.t
@@ -101,10 +100,6 @@ let of_library_stanza ~dir ~has_native ~ext_lib ~ext_obj
     | Some p -> Public p.package
   in
   let virtual_library = Dune_file.Library.is_virtual conf in
-  let private_obj_dir =
-    Option.map conf.private_modules ~f:(fun _ ->
-      Utils.library_private_obj_dir ~obj_dir)
-  in
   let (foreign_archives, foreign_objects) =
     let stubs =
       if Dune_file.Library.has_stubs conf then
@@ -176,7 +171,6 @@ let of_library_stanza ~dir ~has_native ~ext_lib ~ext_obj
   ; virtual_
   ; implements = conf.implements
   ; main_module_name
-  ; private_obj_dir
   ; modes
   }
 
@@ -192,7 +186,6 @@ let of_dune_lib dp =
   { loc = Lib.loc dp
   ; name = Lib.name dp
   ; kind = Lib.kind dp
-  ; private_obj_dir = None
   ; status = Installed
   ; src_dir
   ; obj_dir = src_dir