Improve dependency path printing
This commit is contained in:
parent
eb4c5a099f
commit
34a8951292
|
@ -142,18 +142,11 @@ module Build_error = struct
|
||||||
raise (E { backtrace; dep_path; exn })
|
raise (E { backtrace; dep_path; exn })
|
||||||
end
|
end
|
||||||
|
|
||||||
let describe_target fn =
|
|
||||||
match Path.extract_build_context fn with
|
|
||||||
| Some (".aliases", dir) ->
|
|
||||||
sprintf "alias %s" (Path.to_string dir)
|
|
||||||
| _ ->
|
|
||||||
Path.to_string fn
|
|
||||||
|
|
||||||
let wait_for_file t fn ~targeting =
|
let wait_for_file t fn ~targeting =
|
||||||
match Hashtbl.find t.files fn with
|
match Hashtbl.find t.files fn with
|
||||||
| None ->
|
| None ->
|
||||||
if Path.is_in_build_dir fn then
|
if Path.is_in_build_dir fn then
|
||||||
die "no rule found for %s" (describe_target fn)
|
die "no rule found for %s" (Utils.describe_target fn)
|
||||||
else if Path.exists fn then
|
else if Path.exists fn then
|
||||||
return ()
|
return ()
|
||||||
else
|
else
|
||||||
|
|
|
@ -124,7 +124,7 @@ let report_error ?map_fname ppf exn =
|
||||||
if !Clflags.debug_dep_path then
|
if !Clflags.debug_dep_path then
|
||||||
Format.fprintf ppf "Dependency path:\n %s\n"
|
Format.fprintf ppf "Dependency path:\n %s\n"
|
||||||
(String.concat ~sep:"\n--> "
|
(String.concat ~sep:"\n--> "
|
||||||
(List.map (E.dependency_path err) ~f:Path.to_string))
|
(List.map (E.dependency_path err) ~f:Utils.describe_target))
|
||||||
| exn ->
|
| exn ->
|
||||||
let backtrace = Printexc.get_raw_backtrace () in
|
let backtrace = Printexc.get_raw_backtrace () in
|
||||||
report_error ?map_fname ppf exn ~backtrace
|
report_error ?map_fname ppf exn ~backtrace
|
||||||
|
|
|
@ -66,3 +66,10 @@ let jbuild_name_in ~dir =
|
||||||
sprintf "%s (context %s)"
|
sprintf "%s (context %s)"
|
||||||
(Path.to_string (Path.relative dir "jbuild"))
|
(Path.to_string (Path.relative dir "jbuild"))
|
||||||
ctx_name
|
ctx_name
|
||||||
|
|
||||||
|
let describe_target fn =
|
||||||
|
match Path.extract_build_context fn with
|
||||||
|
| Some (".aliases", dir) ->
|
||||||
|
sprintf "alias %s" (Path.to_string dir)
|
||||||
|
| _ ->
|
||||||
|
Path.to_string fn
|
||||||
|
|
|
@ -11,3 +11,6 @@ val signal_name : int -> string
|
||||||
|
|
||||||
(** Return the path to the jbuild file in this directory as a string. *)
|
(** Return the path to the jbuild file in this directory as a string. *)
|
||||||
val jbuild_name_in : dir:Path.t -> string
|
val jbuild_name_in : dir:Path.t -> string
|
||||||
|
|
||||||
|
(** Nice description of a target *)
|
||||||
|
val describe_target : Path.t -> string
|
||||||
|
|
|
@ -23,4 +23,5 @@
|
||||||
(deps ((files_recursively_in workspaces/github24)))
|
(deps ((files_recursively_in workspaces/github24)))
|
||||||
(action
|
(action
|
||||||
(chdir workspaces/github24
|
(chdir workspaces/github24
|
||||||
(run ${exe:run.exe} ${bin:jbuilder} build @install --root .)))))
|
(run ${exe:run.exe} ${bin:jbuilder}
|
||||||
|
build @install --root . --debug-dependency-path)))))
|
||||||
|
|
Loading…
Reference in New Issue