diff --git a/src/action.ml b/src/action.ml index 18fe861e..b2aa998b 100644 --- a/src/action.ml +++ b/src/action.ml @@ -647,7 +647,7 @@ module Promotion = struct Io.copy_file ~src ~dst end - let db_file = Path.relative_build_dir ".to-promote" + let db_file = Path.relative_to_build_dir ".to-promote" let dump_db db = if Path.build_dir_exists () then begin diff --git a/src/build_system.ml b/src/build_system.ml index e27fde86..f2603f32 100644 --- a/src/build_system.ml +++ b/src/build_system.ml @@ -14,7 +14,7 @@ let misc_dir = Path.(relative build_dir) ".misc" module Promoted_to_delete = struct let db = ref [] - let fn = Path.relative_build_dir ".to-delete-in-source-tree" + let fn = Path.relative_to_build_dir ".to-delete-in-source-tree" let add p = db := p :: !db @@ -1106,7 +1106,7 @@ let stamp_file_for_files_of t ~dir ~ext = module Trace = struct type t = (Path.t, Digest.t) Hashtbl.t - let file = Path.relative_build_dir ".db" + let file = Path.relative_to_build_dir ".db" let dump (trace : t) = let sexp = diff --git a/src/log.ml b/src/log.ml index 51a8b389..72290b45 100644 --- a/src/log.ml +++ b/src/log.ml @@ -13,7 +13,7 @@ let no_log = None let create ?(display=Config.default.display) () = Path.ensure_build_dir_exists (); - let oc = Io.open_out (Path.relative_build_dir "log") in + let oc = Io.open_out (Path.relative_to_build_dir "log") in Printf.fprintf oc "# %s\n# OCAMLPARAM: %s\n%!" (String.concat (List.map (Array.to_list Sys.argv) ~f:quote_for_shell) ~sep:" ") (match Env.get Env.initial "OCAMLPARAM" with diff --git a/src/stdune/path.ml b/src/stdune/path.ml index 8c592f04..4cdac5b9 100644 --- a/src/stdune/path.ml +++ b/src/stdune/path.ml @@ -457,7 +457,7 @@ let build_dir_exists () = is_directory build_dir let ensure_build_dir_exists () = Local.mkdir_p build_dir -let relative_build_dir = relative build_dir +let relative_to_build_dir = relative build_dir let extend_basename t ~suffix = t ^ suffix diff --git a/src/stdune/path.mli b/src/stdune/path.mli index ecaee546..a23c18d5 100644 --- a/src/stdune/path.mli +++ b/src/stdune/path.mli @@ -151,4 +151,4 @@ val build_dir_exists : unit -> bool val ensure_build_dir_exists : unit -> unit -val relative_build_dir : string -> t +val relative_to_build_dir : string -> t diff --git a/src/utils.ml b/src/utils.ml index 75a593a1..e8b28c59 100644 --- a/src/utils.ml +++ b/src/utils.ml @@ -183,7 +183,7 @@ module Cached_digest = struct let remove fn = Hashtbl.remove cache fn - let db_file = Path.relative_build_dir ".digest-db" + let db_file = Path.relative_to_build_dir ".digest-db" let dump () = let module Pmap = Path.Map in