Encapsulate the -and- separator in lib_deps
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
This commit is contained in:
parent
0ebad2d50f
commit
5bd510543d
|
@ -16,7 +16,7 @@ module Includes = struct
|
||||||
let cmi_includes =
|
let cmi_includes =
|
||||||
Arg_spec.S [ iflags
|
Arg_spec.S [ iflags
|
||||||
; Hidden_deps
|
; Hidden_deps
|
||||||
(Lib_deps.L.file_deps sctx libs ~ext:".cmi")
|
(Lib_deps.L.file_deps sctx libs ~exts:[".cmi"])
|
||||||
]
|
]
|
||||||
in
|
in
|
||||||
let cmx_includes =
|
let cmx_includes =
|
||||||
|
@ -26,12 +26,12 @@ module Includes = struct
|
||||||
( if opaque then
|
( if opaque then
|
||||||
List.map libs ~f:(fun lib ->
|
List.map libs ~f:(fun lib ->
|
||||||
(lib, if Lib.is_local lib then
|
(lib, if Lib.is_local lib then
|
||||||
".cmi"
|
[".cmi"]
|
||||||
else
|
else
|
||||||
".cmi-and-.cmx"))
|
[".cmi"; ".cmx"]))
|
||||||
|> Lib_deps.L.file_deps_with_exts sctx
|
|> Lib_deps.L.file_deps_with_exts sctx
|
||||||
else
|
else
|
||||||
Lib_deps.L.file_deps sctx libs ~ext:".cmi-and-.cmx"
|
Lib_deps.L.file_deps sctx libs ~exts:[".cmi"; ".cmx"]
|
||||||
)
|
)
|
||||||
]
|
]
|
||||||
in
|
in
|
||||||
|
|
|
@ -2,33 +2,35 @@ open Stdune
|
||||||
open Dune_file
|
open Dune_file
|
||||||
open Build_system
|
open Build_system
|
||||||
|
|
||||||
let lib_files_alias ~dir ~name ~ext =
|
let string_of_exts = String.concat ~sep:"-and-"
|
||||||
Alias.make (sprintf "lib-%s%s-all" (Lib_name.to_string name) ext) ~dir
|
|
||||||
|
|
||||||
let setup_file_deps_alias t ~dir ~ext lib files =
|
let lib_files_alias ~dir ~name ~exts =
|
||||||
|
Alias.make (sprintf "lib-%s%s-all"
|
||||||
|
(Lib_name.to_string name) (string_of_exts exts)) ~dir
|
||||||
|
|
||||||
|
let setup_file_deps_alias t ~dir ~exts lib files =
|
||||||
Super_context.add_alias_deps t
|
Super_context.add_alias_deps t
|
||||||
(lib_files_alias ~dir ~name:(Library.best_name lib) ~ext) files
|
(lib_files_alias ~dir ~name:(Library.best_name lib) ~exts) files
|
||||||
|
|
||||||
let setup_file_deps_group_alias t ~dir ~exts lib =
|
let setup_file_deps_group_alias t ~dir ~exts lib =
|
||||||
setup_file_deps_alias t lib ~dir
|
setup_file_deps_alias t lib ~dir ~exts
|
||||||
~ext:(String.concat exts ~sep:"-and-")
|
|
||||||
(List.map exts ~f:(fun ext ->
|
(List.map exts ~f:(fun ext ->
|
||||||
Alias.stamp_file
|
Alias.stamp_file
|
||||||
(lib_files_alias ~dir ~name:(Library.best_name lib) ~ext))
|
(lib_files_alias ~dir ~name:(Library.best_name lib) ~exts:[ext]))
|
||||||
|> Path.Set.of_list)
|
|> Path.Set.of_list)
|
||||||
|
|
||||||
module L = struct
|
module L = struct
|
||||||
let file_deps_of_lib t (lib : Lib.t) ~ext =
|
let file_deps_of_lib t (lib : Lib.t) ~exts =
|
||||||
if Lib.is_local lib then
|
if Lib.is_local lib then
|
||||||
Alias.stamp_file
|
Alias.stamp_file
|
||||||
(lib_files_alias ~dir:(Lib.src_dir lib) ~name:(Lib.name lib) ~ext)
|
(lib_files_alias ~dir:(Lib.src_dir lib) ~name:(Lib.name lib) ~exts)
|
||||||
else
|
else
|
||||||
Build_system.stamp_file_for_files_of (Super_context.build_system t)
|
Build_system.stamp_file_for_files_of (Super_context.build_system t)
|
||||||
~dir:(Lib.obj_dir lib) ~ext
|
~dir:(Lib.obj_dir lib) ~ext:(string_of_exts exts)
|
||||||
|
|
||||||
let file_deps_with_exts t lib_exts =
|
let file_deps_with_exts t lib_exts =
|
||||||
List.rev_map lib_exts ~f:(fun (lib, ext) -> file_deps_of_lib t lib ~ext)
|
List.rev_map lib_exts ~f:(fun (lib, exts) -> file_deps_of_lib t lib ~exts)
|
||||||
|
|
||||||
let file_deps t libs ~ext =
|
let file_deps t libs ~exts =
|
||||||
List.rev_map libs ~f:(file_deps_of_lib t ~ext)
|
List.rev_map libs ~f:(file_deps_of_lib t ~exts)
|
||||||
end
|
end
|
||||||
|
|
|
@ -4,26 +4,25 @@ module L : sig
|
||||||
|
|
||||||
(** [file_deps t libs ~ext] returns a list of path dependencies for all the
|
(** [file_deps t libs ~ext] returns a list of path dependencies for all the
|
||||||
files with extension [ext] of libraries [libs]. *)
|
files with extension [ext] of libraries [libs]. *)
|
||||||
val file_deps : Super_context.t -> Lib.L.t -> ext:string -> Path.t list
|
val file_deps : Super_context.t -> Lib.L.t -> exts:string list -> Path.t list
|
||||||
|
|
||||||
val file_deps_with_exts
|
val file_deps_with_exts
|
||||||
: Super_context.t
|
: Super_context.t
|
||||||
-> (Lib.t * string) list
|
-> (Lib.t * string list) list
|
||||||
-> Path.t list
|
-> Path.t list
|
||||||
end
|
end
|
||||||
|
|
||||||
(** Setup the alias that depends on all files with a given extension
|
(** Setup the alias that depends on all files with a given extension for a
|
||||||
for a library *)
|
library *)
|
||||||
val setup_file_deps_alias
|
val setup_file_deps_alias
|
||||||
: Super_context.t
|
: Super_context.t
|
||||||
-> dir:Path.t
|
-> dir:Path.t
|
||||||
-> ext:string
|
-> exts:string list
|
||||||
-> Dune_file.Library.t
|
-> Dune_file.Library.t
|
||||||
-> Path.Set.t
|
-> Path.Set.t
|
||||||
-> unit
|
-> unit
|
||||||
|
|
||||||
(** Setup an alias that depend on all files with the given extensions. To depend
|
(** Setup an alias that depend on all files with the given extensions.*)
|
||||||
on this alias, use [~ext:"ext1-and-ext2-...-extn"] *)
|
|
||||||
val setup_file_deps_group_alias
|
val setup_file_deps_group_alias
|
||||||
: Super_context.t
|
: Super_context.t
|
||||||
-> dir:Path.t
|
-> dir:Path.t
|
||||||
|
|
|
@ -273,7 +273,7 @@ module Gen (P : Install_rules.Params) = struct
|
||||||
[ Hidden_deps h_files
|
[ Hidden_deps h_files
|
||||||
; Arg_spec.of_result_map requires ~f:(fun libs ->
|
; Arg_spec.of_result_map requires ~f:(fun libs ->
|
||||||
S [ Lib.L.c_include_flags libs ~stdlib_dir:ctx.stdlib_dir
|
S [ Lib.L.c_include_flags libs ~stdlib_dir:ctx.stdlib_dir
|
||||||
; Hidden_deps (Lib_deps.L.file_deps sctx libs ~ext:".h")
|
; Hidden_deps (Lib_deps.L.file_deps sctx libs ~exts:[".h"])
|
||||||
])
|
])
|
||||||
]
|
]
|
||||||
in
|
in
|
||||||
|
@ -407,11 +407,11 @@ module Gen (P : Install_rules.Params) = struct
|
||||||
List.iter Cm_kind.all ~f:(fun cm_kind ->
|
List.iter Cm_kind.all ~f:(fun cm_kind ->
|
||||||
let files = add_cms ~cm_kind ~init:Path.Set.empty modules in
|
let files = add_cms ~cm_kind ~init:Path.Set.empty modules in
|
||||||
let files = add_cms ~cm_kind ~init:files wrapped_compat in
|
let files = add_cms ~cm_kind ~init:files wrapped_compat in
|
||||||
Lib_deps.setup_file_deps_alias sctx ~dir lib ~ext:(Cm_kind.ext cm_kind)
|
Lib_deps.setup_file_deps_alias sctx ~dir lib ~exts:[Cm_kind.ext cm_kind]
|
||||||
files);
|
files);
|
||||||
|
|
||||||
Lib_deps.setup_file_deps_group_alias sctx ~dir lib ~exts:[".cmi"; ".cmx"];
|
Lib_deps.setup_file_deps_group_alias sctx ~dir lib ~exts:[".cmi"; ".cmx"];
|
||||||
Lib_deps.setup_file_deps_alias sctx ~dir lib ~ext:".h"
|
Lib_deps.setup_file_deps_alias sctx ~dir lib ~exts:[".h"]
|
||||||
(List.map lib.install_c_headers ~f:(fun header ->
|
(List.map lib.install_c_headers ~f:(fun header ->
|
||||||
Path.relative dir (header ^ ".h"))
|
Path.relative dir (header ^ ".h"))
|
||||||
|> Path.Set.of_list);
|
|> Path.Set.of_list);
|
||||||
|
|
Loading…
Reference in New Issue