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

Improve error messages about invalid/missing pkg.opam files

This commit is contained in:
Jeremie Dimino 2017-03-17 10:51:22 +00:00
parent 878c6b5272
commit 48ac99797e
1 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/jbuild_types.ml
View File

@ -766,19 +766,32 @@ module Stanzas = struct
(Path.to_string (Path.relative pkg.path (pkg.name ^ ".opam"))))) (Path.to_string (Path.relative pkg.path (pkg.name ^ ".opam")))))
in in
let check pkg = let check pkg =
if not (String_map.mem pkg visible_packages) then if not (String_map.mem pkg visible_packages) then (
error "package %S is not visible here.\n\ if String_map.is_empty visible_packages then
The only packages I know of in %S are:\n\ error "package %S is not visible here.\n\
%s%s" In fact I know of no packages here, \
pkg in order for me to know that package\n\
(Path.to_string dir) %S exist, you need to add a %S file at the root of your project."
(package_listing (String_map.values visible_packages)) pkg pkg (pkg ^ ".opam")
(hint pkg (String_map.keys visible_packages)) else
error "package %S is not visible here.\n\
The only packages I know of in %S are:\n\
%s%s"
pkg
(Path.to_string dir)
(package_listing (String_map.values visible_packages))
(hint pkg (String_map.keys visible_packages))
)
in in
let default () = let default () =
match closest_packages with match closest_packages with
| [pkg] -> pkg | [pkg] -> pkg
| [] -> error "no packages are defined here" | [] ->
error "no packages are defined here.\n\
What do you want me to do with this (install ...) stanzas?.\n\
You need to add a <package>.opam file at the root \
of your project so that\n\
I know that you want to install things as part of pacakge <package>."
| _ :: _ :: _ -> | _ :: _ :: _ ->
error "I can't determine automatically which package your (install ...) \ error "I can't determine automatically which package your (install ...) \
stanzas are for in this directory. I have the choice between these ones:\n\ stanzas are for in this directory. I have the choice between these ones:\n\