Skip to content

Commit

Permalink
Display a warning the compiler descriptions have a wrong 'name' field
Browse files Browse the repository at this point in the history
  • Loading branch information
samoht committed Nov 15, 2012
1 parent bde42d8 commit 3f96721
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 7 deletions.
14 changes: 7 additions & 7 deletions src/core/opamCompiler.ml
Expand Up @@ -48,18 +48,18 @@ end

include OpamMisc.Base

let of_filename =
OpamFilename.chop_extension
|> OpamFilename.basename
|> OpamFilename.Base.to_string
|> of_string

let list t =
log "list dir=%s" (OpamFilename.Dir.to_string t);
if OpamFilename.exists_dir t then (
let files = OpamFilename.list_files t in
let files = List.filter (fun f -> OpamFilename.check_suffix f ".comp") files in
let l =
List.map
(OpamFilename.chop_extension
|> OpamFilename.basename
|> OpamFilename.Base.to_string
|> of_string)
files in
let l = List.map of_filename files in
Set.of_list l
) else
Set.empty
Expand Down
3 changes: 3 additions & 0 deletions src/core/opamCompiler.mli
Expand Up @@ -37,6 +37,9 @@ end
(** Compiler names *)
include OpamMisc.ABSTRACT

(** Convert a filename into a compiler name *)
val of_filename: OpamFilename.t -> t

(** List the compiler available in a directory *)
val list: OpamFilename.Dir.t -> Set.t

Expand Down
5 changes: 5 additions & 0 deletions src/core/opamFile.ml
Expand Up @@ -1192,6 +1192,11 @@ module Comp = struct
| Some (n,_) -> OpamCompiler.of_string base, OpamCompiler.Version.of_string n in
let name =
OpamFormat.assoc_default name_d s s_name (OpamFormat.parse_string |> OpamCompiler.of_string) in
if OpamCompiler.of_filename filename <> name then
OpamGlobals.warning "The file %s contains a bad 'name' field: %s instead of %s"
(OpamFilename.to_string filename)
(OpamCompiler.to_string name)
(OpamCompiler.to_string (OpamCompiler.of_filename filename));
let version =
OpamFormat.assoc_default version_d s s_version
(OpamFormat.parse_string |> OpamCompiler.Version.of_string) in
Expand Down

0 comments on commit 3f96721

Please sign in to comment.