matthieu
/
dune
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rename Lib_deps to Lib_file_deps 

Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
This commit is contained in:
Rudi Grinberg 2018-09-03 16:13:15 +04:00
parent 5bd510543d
commit baf8852e4c
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/compilation_context.ml
View File

@ -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 ~exts:[".cmi"]) (Lib_file_deps.L.file_deps sctx libs ~exts:[".cmi"])
] ]
in in
let cmx_includes = let cmx_includes =
@ -29,9 +29,9 @@ module Includes = struct
[".cmi"] [".cmi"]
else else
[".cmi"; ".cmx"])) [".cmi"; ".cmx"]))
|> Lib_deps.L.file_deps_with_exts sctx |> Lib_file_deps.L.file_deps_with_exts sctx
else else
Lib_deps.L.file_deps sctx libs ~exts:[".cmi"; ".cmx"] Lib_file_deps.L.file_deps sctx libs ~exts:[".cmi"; ".cmx"]
) )
] ]
in in

0
src/lib_deps.ml → src/lib_file_deps.ml
View File

0
src/lib_deps.mli → src/lib_file_deps.mli
View File

8
src/lib_rules.ml
View File

@ -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 ~exts:[".h"]) ; Hidden_deps (Lib_file_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 ~exts:[Cm_kind.ext cm_kind] Lib_file_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_file_deps.setup_file_deps_group_alias sctx ~dir lib ~exts:[".cmi"; ".cmx"];
Lib_deps.setup_file_deps_alias sctx ~dir lib ~exts:[".h"] Lib_file_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);