Merge branch 'master' into explicitly-pass-installed-binaries

src/dune_project.ml

@@ -830,6 +830,16 @@ let parse ~dir ~lang ~packages ~file =
      in
      let allow_approx_merlin =
        Option.value ~default:false allow_approx_merlin in
+     let packages =
+       match version with
+       | None -> packages
+       | Some version ->
+         let version = Some (version, Package.Version_source.Project) in
+         Package.Name.Map.map packages ~f:(fun p ->
+           match p.version with
+           | Some _ -> p
+           | None -> { p with version })
+     in
      { name
      ; root = dir
      ; version
@@ -894,7 +904,7 @@ let load ~dir ~files =
     String.Set.fold files ~init:[] ~f:(fun fn acc ->
       match Filename.split_extension fn with
       | (pkg, ".opam") when pkg <> "" ->
-        let version_from_opam_file =
+        let version =
           let open Option.O in
           let* opam =
             let opam_file = Path.Source.relative dir fn in
@@ -909,15 +919,15 @@ let load ~dir ~files =
           in
           let* version = Opam_file.get_field opam "version" in
           match version with
-          | String (_, s) -> Some s
+          | String (_, s) -> Some (s, Package.Version_source.Package)
           | _ -> None
         in
         let name = Package.Name.of_string pkg in
         (name,
          { Package.
            name
          ; path = dir
-         ; version_from_opam_file
+         ; version
          }) :: acc
       | _ -> acc)
     |> Package.Name.Map.of_list_exn

src/install_rules.ml

@@ -58,42 +58,35 @@ let gen_dune_package sctx ~version ~(pkg : Local_package.t) =
   Build.write_file_dyn dune_package_file
   |> Super_context.add_rule sctx ~dir:ctx.build_dir
 
-let version_from_dune_project sctx ~(pkg : Package.t) =
-  let dir = Path.append_source (Super_context.build_dir sctx) pkg.path in
-  let project = Scope.project (Super_context.find_scope_by_dir sctx dir) in
-  Dune_project.version project
-
 type version_method =
   | File of string
-  | From_dune_project
+  | From_metadata of Package.Version_source.t
 
-let pkg_version sctx ~path ~(pkg : Package.t) =
-  match pkg.version_from_opam_file with
-  | Some s -> Build.return (Some s)
-  | None ->
-    let rec loop = function
-      | [] -> Build.return None
-      | candidate :: rest ->
-        match candidate with
-        | File fn ->
-          let p = Path.relative path fn in
-          Build.if_file_exists p
-            ~then_:(Build.lines_of p
-                    >>^ function
-                    | ver :: _ -> Some ver
-                    | _ -> Some "")
-            ~else_:(loop rest)
-        | From_dune_project ->
-          match version_from_dune_project sctx ~pkg with
-          | None -> loop rest
-          | Some _ as x -> Build.return x
-    in
-    loop
-      [ File (Package.Name.version_fn pkg.name)
-      ; From_dune_project
-      ; File "version"
-      ; File "VERSION"
-      ]
+let pkg_version ~path ~(pkg : Package.t) =
+  let rec loop = function
+    | [] -> Build.return None
+    | candidate :: rest ->
+      match candidate with
+      | File fn ->
+        let p = Path.relative path fn in
+        Build.if_file_exists p
+          ~then_:(Build.lines_of p
+                  >>^ function
+                  | ver :: _ -> Some ver
+                  | _ -> Some "")
+          ~else_:(loop rest)
+      | From_metadata source ->
+        match pkg.version with
+        | Some (v, source') when source = source' -> Build.return (Some v)
+        | _ -> loop rest
+  in
+  loop
+    [ From_metadata Package
+    ; File (Package.Name.version_fn pkg.name)
+    ; From_metadata Project
+    ; File "version"
+    ; File "VERSION"
+    ]
 
 let init_meta sctx ~dir =
   Local_package.defined_in sctx ~dir
@@ -105,7 +98,7 @@ let init_meta sctx ~dir =
     let meta_template = Local_package.meta_template pkg in
     let version =
       let pkg = Local_package.package pkg in
-      let get = pkg_version sctx ~pkg ~path in
+      let get = pkg_version ~pkg ~path in
       Super_context.Pkg_version.set sctx pkg get
     in
 

src/odoc.ml

@@ -251,10 +251,10 @@ let setup_toplevel_index_rule sctx =
       let name = Package.Name.to_string name in
       let link = sp {|<a href="%s/index.html">%s</a>|} name name in
       let version_suffix =
-        match pkg.Package.version_from_opam_file with
+        match pkg.Package.version with
         | None ->
           ""
-        | Some v ->
+        | Some (v, _) ->
           sp {| <span class="version">%s</span>|} v
       in
       Some (sp "<li>%s%s</li>" link version_suffix))

src/package.ml

@@ -26,27 +26,40 @@ module Name = struct
   module Infix = Comparable.Operators(T)
 end
 
+module Version_source = struct
+  type t =
+    | Package
+    | Project
+
+  let to_dyn t =
+    Dyn.Variant
+      ((match t with
+         | Package -> "Package"
+         | Project -> "Project"),
+       [])
+end
 
 type t =
-  { name                   : Name.t
-  ; path                   : Path.Source.t
-  ; version_from_opam_file : string option
+  { name    : Name.t
+  ; path    : Path.Source.t
+  ; version : (string * Version_source.t) option
   }
 
-let hash { name; path; version_from_opam_file } =
+let hash { name; path; version } =
   Hashtbl.hash
     ( Name.hash name
     , Path.Source.hash path
-    , Option.hash String.hash version_from_opam_file
+    , Hashtbl.hash version
     )
 
-let to_dyn { name; path; version_from_opam_file } =
+let to_dyn { name; path; version } =
   let open Dyn in
   Record
     [ "name", Name.to_dyn name
     ; "path", Path.Source.to_dyn path
-    ; "version_from_opam_file"
-    , Option (Option.map ~f:(fun s -> String s) version_from_opam_file)
+    ; "version",
+      Option (Option.map ~f:(fun (v, s) ->
+        Tuple [String v; Version_source.to_dyn s]) version)
     ]
 
 let pp fmt t = Dyn.pp fmt (to_dyn t)

src/package.mli

@@ -18,10 +18,18 @@ module Name : sig
   module Infix : Comparable.OPS with type t = t
 end
 
+module Version_source : sig
+  (** Wether this version comes from the project wide version or the
+      package particular version *)
+  type t =
+    | Package
+    | Project
+end
+
 type t =
-  { name                   : Name.t
-  ; path                   : Path.Source.t
-  ; version_from_opam_file : string option
+  { name    : Name.t
+  ; path    : Path.Source.t
+  ; version : (string * Version_source.t) option
   }
 
 val pp : Format.formatter -> t -> unit

test/blackbox-tests/dune.inc

@@ -769,6 +769,14 @@
    test-cases/include-loop
    (progn (run %{exe:cram.exe} -test run.t) (diff? run.t run.t.corrected)))))
 
+(alias
+ (name include-qualified)
+ (deps (package dune) (source_tree test-cases/include-qualified))
+ (action
+  (chdir
+   test-cases/include-qualified
+   (progn (run %{exe:cram.exe} -test run.t) (diff? run.t run.t.corrected)))))
+
 (alias
  (name inline_tests)
  (deps (package dune) (source_tree test-cases/inline_tests))
@@ -1506,6 +1514,7 @@
   (alias glob-deps)
   (alias ignored_subdirs)
   (alias include-loop)
+  (alias include-qualified)
   (alias inline_tests)
   (alias install-dry-run)
   (alias install-libdir)
@@ -1672,6 +1681,7 @@
   (alias glob-deps)
   (alias ignored_subdirs)
   (alias include-loop)
+  (alias include-qualified)
   (alias inline_tests)
   (alias install-rule-order)
   (alias install-with-var)

test/blackbox-tests/test-cases/coq/run.t

@@ -46,9 +46,9 @@
   $ dune build --root base --display short --debug-dependency-path @default
   Entering directory 'base'
   lib: [
-    "_build/install/default/lib/base/META" {"META"}
-    "_build/install/default/lib/base/dune-package" {"dune-package"}
-    "_build/install/default/lib/base/opam" {"opam"}
+    "_build/install/default/lib/base/META"
+    "_build/install/default/lib/base/dune-package"
+    "_build/install/default/lib/base/opam"
   ]
   lib_root: [
     "_build/install/default/lib/coq/user-contrib/basic/bar.vo" {"coq/user-contrib/basic/bar.vo"}
@@ -58,9 +58,9 @@
   $ dune build --root rec_module --display short --debug-dependency-path @default
   Entering directory 'rec_module'
   lib: [
-    "_build/install/default/lib/rec/META" {"META"}
-    "_build/install/default/lib/rec/dune-package" {"dune-package"}
-    "_build/install/default/lib/rec/opam" {"opam"}
+    "_build/install/default/lib/rec/META"
+    "_build/install/default/lib/rec/dune-package"
+    "_build/install/default/lib/rec/opam"
   ]
   lib_root: [
     "_build/install/default/lib/coq/user-contrib/rec_module/a/bar.vo" {"coq/user-contrib/rec_module/a/bar.vo"}

test/blackbox-tests/test-cases/include-qualified/basic/dune

@@ -0,0 +1,3 @@
+(alias
+ (name default)
+ (action (run ./exe/test.exe)))

test/blackbox-tests/test-cases/include-qualified/basic/dune-project

@@ -0,0 +1 @@
+(lang dune 1.9)

test/blackbox-tests/test-cases/include-qualified/basic/exe/dune

@@ -0,0 +1 @@
+(executable (name test))

test/blackbox-tests/test-cases/include-qualified/basic/exe/test.ml

@@ -0,0 +1,3 @@
+let () =
+  Foolib.Foo.Bar.run ();
+  Foolib.Foo.A.B.run ()

test/blackbox-tests/test-cases/include-qualified/basic/lib/dune

@@ -0,0 +1,3 @@
+(include_subdirs qualified)
+
+(library (name foolib))

test/blackbox-tests/test-cases/include-qualified/basic/lib/foo/a/b.ml

@@ -0,0 +1 @@
+let run () = print_endline "hello from nested module B"

test/blackbox-tests/test-cases/include-qualified/basic/lib/foo/bar.ml

@@ -0,0 +1 @@
+let run () = print_endline "hello from nested module bar"

test/blackbox-tests/test-cases/include-qualified/nested-lib-interface/dune

@@ -0,0 +1,3 @@
+(alias
+ (name default)
+ (action (run ./exe/test.exe)))

test/blackbox-tests/test-cases/include-qualified/nested-lib-interface/dune-project

@@ -0,0 +1 @@
+(lang dune 1.9)

test/blackbox-tests/test-cases/include-qualified/nested-lib-interface/exe/test.ml

@@ -0,0 +1,3 @@
+let () =
+  Foolib.Bar.Fake.run ();
+  Foolib.Bar.Baz.run ()

test/blackbox-tests/test-cases/include-qualified/nested-lib-interface/lib/bar/bar.ml

@@ -0,0 +1,5 @@
+module Fake = struct
+  let run () =
+    print_endline "defined in lib interface file"
+end
+module Baz = Baz

test/blackbox-tests/test-cases/include-qualified/nested-lib-interface/lib/bar/baz.ml

@@ -0,0 +1 @@
+let run () = print_endline "hello from baz"

test/blackbox-tests/test-cases/include-qualified/nested-lib-interface/lib/dune

@@ -0,0 +1,4 @@
+(include_subdirs qualified)
+
+(library
+ (name foolib))

test/blackbox-tests/test-cases/include-qualified/nested-lib-interface/lib/foolib.ml

@@ -0,0 +1 @@
+module Bar = Bar

test/blackbox-tests/test-cases/include-qualified/nested-virtual/dune-project

@@ -0,0 +1 @@
+(lang dune 1.9)

test/blackbox-tests/test-cases/include-qualified/nested-virtual/impl/bar/virt.ml

@@ -0,0 +1 @@
+let run = print_endline

test/blackbox-tests/test-cases/include-qualified/nested-virtual/impl/dune

@@ -0,0 +1,5 @@
+(include_subdirs qualified)
+
+(library
+ (name impl)
+ (implements vlib))

test/blackbox-tests/test-cases/include-qualified/nested-virtual/vlib/bar/virt.mli

@@ -0,0 +1 @@
+val run : string -> unit

test/blackbox-tests/test-cases/include-qualified/nested-virtual/vlib/dune

@@ -0,0 +1,5 @@
+(include_subdirs qualified)
+
+(library
+ (name vlib)
+ (virtual_modules bar/virt))

test/blackbox-tests/test-cases/include-qualified/pp/bar/ppme.ml

@@ -0,0 +1 @@
+let x = 42

test/blackbox-tests/test-cases/include-qualified/pp/dune

@@ -0,0 +1,8 @@
+(include_subdirs qualified)
+
+(library
+ (name foolib)
+ (preprocess
+  (per_module
+   ((action
+     (run cat %{input-file})) bar/ppme))))

test/blackbox-tests/test-cases/include-qualified/pp/dune-project

@@ -0,0 +1 @@
+(lang dune 1.9)

test/blackbox-tests/test-cases/include-qualified/pp/foolib.ml

@@ -0,0 +1 @@
+module Bar = Bar.Ppme

test/blackbox-tests/test-cases/include-qualified/run.t

@@ -0,0 +1,39 @@
+Basic test showcasing the feature. Every directory creates a new level of aliasing.
+  $ dune build --root basic
+  Entering directory 'basic'
+  File "lib/dune", line 1, characters 17-26:
+  1 | (include_subdirs qualified)
+                       ^^^^^^^^^
+  Error: Unknown value qualified
+  Hint: did you mean unqualified?
+  [1]
+
+We are also allowed to write lib interface files at each level.
+  $ dune build --root nested-lib-interface
+  Entering directory 'nested-lib-interface'
+  File "lib/dune", line 1, characters 17-26:
+  1 | (include_subdirs qualified)
+                       ^^^^^^^^^
+  Error: Unknown value qualified
+  Hint: did you mean unqualified?
+  [1]
+
+We can nested modules virtual
+  $ dune build @all --root nested-virtual
+  Entering directory 'nested-virtual'
+  File "impl/dune", line 1, characters 17-26:
+  1 | (include_subdirs qualified)
+                       ^^^^^^^^^
+  Error: Unknown value qualified
+  Hint: did you mean unqualified?
+  [1]
+
+We can set preprocessing options for nested modules
+  $ dune build @all --root pp
+  Entering directory 'pp'
+  File "dune", line 1, characters 17-26:
+  1 | (include_subdirs qualified)
+                       ^^^^^^^^^
+  Error: Unknown value qualified
+  Hint: did you mean unqualified?
+  [1]