From baf8852e4cbc833a36ca1d1b919dd08944e2d4d6 Mon Sep 17 00:00:00 2001 From: Rudi Grinberg Date: Mon, 3 Sep 2018 16:13:15 +0400 Subject: [PATCH] Rename Lib_deps to Lib_file_deps Signed-off-by: Rudi Grinberg --- src/compilation_context.ml | 6 +++--- src/{lib_deps.ml => lib_file_deps.ml} | 0 src/{lib_deps.mli => lib_file_deps.mli} | 0 src/lib_rules.ml | 8 ++++---- 4 files changed, 7 insertions(+), 7 deletions(-) rename src/{lib_deps.ml => lib_file_deps.ml} (100%) rename src/{lib_deps.mli => lib_file_deps.mli} (100%) diff --git a/src/compilation_context.ml b/src/compilation_context.ml index d7e40988..501ac2ca 100644 --- a/src/compilation_context.ml +++ b/src/compilation_context.ml @@ -16,7 +16,7 @@ module Includes = struct let cmi_includes = Arg_spec.S [ iflags ; Hidden_deps - (Lib_deps.L.file_deps sctx libs ~exts:[".cmi"]) + (Lib_file_deps.L.file_deps sctx libs ~exts:[".cmi"]) ] in let cmx_includes = @@ -29,9 +29,9 @@ module Includes = struct [".cmi"] else [".cmi"; ".cmx"])) - |> Lib_deps.L.file_deps_with_exts sctx + |> Lib_file_deps.L.file_deps_with_exts sctx else - Lib_deps.L.file_deps sctx libs ~exts:[".cmi"; ".cmx"] + Lib_file_deps.L.file_deps sctx libs ~exts:[".cmi"; ".cmx"] ) ] in diff --git a/src/lib_deps.ml b/src/lib_file_deps.ml similarity index 100% rename from src/lib_deps.ml rename to src/lib_file_deps.ml diff --git a/src/lib_deps.mli b/src/lib_file_deps.mli similarity index 100% rename from src/lib_deps.mli rename to src/lib_file_deps.mli diff --git a/src/lib_rules.ml b/src/lib_rules.ml index 47222e8b..4e37eae8 100644 --- a/src/lib_rules.ml +++ b/src/lib_rules.ml @@ -273,7 +273,7 @@ module Gen (P : Install_rules.Params) = struct [ Hidden_deps h_files ; Arg_spec.of_result_map requires ~f:(fun libs -> 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 @@ -407,11 +407,11 @@ module Gen (P : Install_rules.Params) = struct 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: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); - Lib_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_group_alias sctx ~dir lib ~exts:[".cmi"; ".cmx"]; + Lib_file_deps.setup_file_deps_alias sctx ~dir lib ~exts:[".h"] (List.map lib.install_c_headers ~f:(fun header -> Path.relative dir (header ^ ".h")) |> Path.Set.of_list);