forked from
anil.recoil.org/monopam
Monorepo management for opam overlays
Rename ocaml-meta -> ocaml-ocamlfind, nox-meta -> nox-ocamlfind
The library now lives under [Ocamlfind.Meta] to leave room for other
findlib metadata files (META is just one of them). The bytesrw
sub-library moves from [Meta_bytesrw] to [Ocamlfind_bytesrw] and is
exposed as [nox-ocamlfind.bytesrw].
monopam, the only in-tree consumer, switches over.
+23
-16
+1
-1
dune-project
+1
-1
dune-project
+2
-2
lib/dune
+2
-2
lib/dune
+19
-12
lib/lint.ml
+19
-12
lib/lint.ml
···
47
47
try
48
48
Eio.Path.with_open_in eio_path (fun flow ->
49
49
let r = Bytesrw_eio.bytes_reader_of_flow flow in
50
-
try Ok (Meta_bytesrw.of_reader r)
51
-
with Meta.Error e -> Error (Meta.Error.to_string e))
50
+
try Ok (Ocamlfind_bytesrw.of_reader r)
51
+
with Ocamlfind.Meta.Error e ->
52
+
Error (Ocamlfind.Meta.Error.to_string e))
52
53
with Eio.Io _ -> Error "I/O error"
53
54
54
55
(** Split a META value string into words on whitespace and commas — matches
···
76
77
let rec collect_field field items =
77
78
List.concat_map
78
79
(function
79
-
| Meta.Value.Variable v when v.Meta.Value.name = field -> in_words v.value
80
-
| Meta.Value.Subpackage sub -> collect_field field sub.items
80
+
| Ocamlfind.Meta.Value.Variable v when v.Ocamlfind.Meta.Value.name = field
81
+
->
82
+
in_words v.value
83
+
| Ocamlfind.Meta.Value.Subpackage sub -> collect_field field sub.items
81
84
| _ -> [])
82
85
items
83
86
84
-
let collect_requires (f : Meta.Value.file) = collect_field "requires" f.items
85
-
let collect_exports (f : Meta.Value.file) = collect_field "exports" f.items
87
+
let collect_requires (f : Ocamlfind.Meta.Value.file) =
88
+
collect_field "requires" f.items
89
+
90
+
let collect_exports (f : Ocamlfind.Meta.Value.file) =
91
+
collect_field "exports" f.items
86
92
87
93
(** Index all library names reachable from a META into [lib_name -> opam_pkg].
88
94
*)
···
90
96
Hashtbl.replace index prefix opam_pkg;
91
97
List.iter
92
98
(function
93
-
| Meta.Value.Subpackage sub ->
99
+
| Ocamlfind.Meta.Value.Subpackage sub ->
94
100
index_items ~opam_pkg
95
-
~prefix:(prefix ^ "." ^ sub.Meta.Value.name)
101
+
~prefix:(prefix ^ "." ^ sub.Ocamlfind.Meta.Value.name)
96
102
sub.items index
97
103
| _ -> ())
98
104
items
99
105
100
-
let index_meta ~opam_pkg ~prefix (f : Meta.Value.file) index =
106
+
let index_meta ~opam_pkg ~prefix (f : Ocamlfind.Meta.Value.file) index =
101
107
index_items ~opam_pkg ~prefix f.items index
102
108
103
109
(* ---- Library index ---- *)
···
115
121
try
116
122
Eio.Path.with_open_in meta (fun flow ->
117
123
let r = Bytesrw_eio.bytes_reader_of_flow flow in
118
-
match Meta_bytesrw.of_reader r with
124
+
match Ocamlfind_bytesrw.of_reader r with
119
125
| expr -> index_meta ~opam_pkg:pkg ~prefix:pkg expr index
120
-
| exception Meta.Error e ->
126
+
| exception Ocamlfind.Meta.Error e ->
121
127
Log.debug (fun m ->
122
-
m "Failed to parse %s/META: %s" pkg (Meta.Error.to_string e)))
128
+
m "Failed to parse %s/META: %s" pkg
129
+
(Ocamlfind.Meta.Error.to_string e)))
123
130
with Eio.Io _ -> ())
124
131
entries
125
132