Add support for foreign libraries

Signed-off-by: Andrey Mokhov <amokhov@janestreet.com>
ocaml · Oct 9, 2019 · 94ca484 · 94ca484
1 parent 3111f74
commit 94ca484
Show file tree

Hide file tree

Showing 64 changed files with 1,718 additions and 786 deletions.
diff --git a/bin/arg.ml b/bin/arg.ml
@@ -23,7 +23,7 @@ let profile =
     , fun fmt t -> Format.pp_print_string fmt (Profile.to_string t) )
 
 module Dep = struct
-  module Dep_conf = Dune_file.Dep_conf
+  module Dep_conf = Dep_conf
 
   type t = Dep_conf.t
 

diff --git a/bin/arg.mli b/bin/arg.mli
@@ -14,7 +14,7 @@ module Path : sig
 end
 
 module Dep : sig
-  type t = Dune_file.Dep_conf.t
+  type t = Dep_conf.t
 
   val file : string -> t
 

diff --git a/bin/target.ml b/bin/target.ml
@@ -132,7 +132,7 @@ let resolve_alias common ~recursive sv ~(setup : Dune.Main.build_system) =
   | None -> Error [ Pp.text "alias cannot contain variables" ]
 
 let resolve_target common ~setup = function
-  | Dune.Dune_file.Dep_conf.Alias sv as dep ->
+  | Dune.Dep_conf.Alias sv as dep ->
     Result.map_error
       ~f:(fun hints -> (dep, hints))
       (resolve_alias common ~recursive:false sv ~setup)

diff --git a/otherlibs/build-info/test/run.t b/otherlibs/build-info/test/run.t
@@ -100,10 +100,10 @@ Once installed, we have the version information:
   lib dune-build-info: XXX
 
   $ grep version _install/lib/a/dune-package
-  (version 1.0+a)
+  [1]
 
   $ grep version _install/lib/a/META
-  version = "1.0+a"
+  [1]
 
 Check what the generated build info module looks like:
 

diff --git a/src/dune/c.ml b/src/dune/c.ml
diff --git a/src/dune/c.mli b/src/dune/c.mli
diff --git a/src/dune/c_sources.ml b/src/dune/c_sources.ml