+1 -1

example/example.ml

reviewed

··· 16 16 cmas = []; 17 17 cmis = { dynamic_cmis = []; static_cmis = [] }; 18 18 stdlib_dcs = "/lib/ocaml/dynamic_cmis.json"; 19 19 - findlib_metas = ["/lib/astring/META"]; 19 19 + findlib_index = "/lib/findlib_index"; 20 20 findlib_requires = ["astring"]; 21 21 } 22 22 in

+1 -1

example/example2.ml

reviewed

··· 20 20 cmas = []; 21 21 cmis = { dynamic_cmis = [dcs]; static_cmis = [] }; 22 22 stdlib_dcs = "/lib/ocaml/dynamic_cmis.json"; 23 23 - findlib_metas = []; 23 23 + findlib_index = "/lib/findlib_index"; 24 24 findlib_requires = []; 25 25 } 26 26 in

+2

example/mklib.sh

reviewed

··· 24 24 } 25 25 EOF 26 26 27 27 + find lib -name "META" > lib/findlib_index 28 28 +

+1 -1

idl/toplevel_api.ml

reviewed

··· 179 179 } 180 180 [@@deriving rpcty] 181 181 182 182 - type init_libs = { path : string; cmis : cmis; cmas : cma list; findlib_metas : string list; findlib_requires : string list; stdlib_dcs : string } [@@deriving rpcty] 182 182 + type init_libs = { path : string; cmis : cmis; cmas : cma list; findlib_index : string; findlib_requires : string list; stdlib_dcs : string } [@@deriving rpcty] 183 183 type err = InternalError of string [@@deriving rpcty] 184 184 185 185 type opt_id = string option [@@deriving rpcty]

+13 -15

idl/toplevel_api_gen.ml

reviewed

··· 1953 1953 path: string ; 1954 1954 cmis: cmis ; 1955 1955 cmas: cma list ; 1956 1956 - findlib_metas: string list ; 1956 1956 + findlib_index: string ; 1957 1957 findlib_requires: string list ; 1958 1958 stdlib_dcs: string }[@@deriving rpcty] 1959 1959 include ··· 1989 1989 Rpc.Types.fget = (fun _r -> _r.cmas); 1990 1990 Rpc.Types.fset = (fun v -> fun _s -> { _s with cmas = v }) 1991 1991 } 1992 1992 - and init_libs_findlib_metas : (_, init_libs) Rpc.Types.field = 1992 1992 + and init_libs_findlib_index : (_, init_libs) Rpc.Types.field = 1993 1993 { 1994 1994 - Rpc.Types.fname = "findlib_metas"; 1995 1995 - Rpc.Types.field = 1996 1996 - (Rpc.Types.List (let open Rpc.Types in Basic String)); 1994 1994 + Rpc.Types.fname = "findlib_index"; 1995 1995 + Rpc.Types.field = (let open Rpc.Types in Basic String); 1997 1996 Rpc.Types.fdefault = None; 1998 1997 Rpc.Types.fdescription = []; 1999 1998 Rpc.Types.fversion = None; 2000 2000 - Rpc.Types.fget = (fun _r -> _r.findlib_metas); 2001 2001 - Rpc.Types.fset = (fun v -> fun _s -> { _s with findlib_metas = v }) 1999 1999 + Rpc.Types.fget = (fun _r -> _r.findlib_index); 2000 2000 + Rpc.Types.fset = (fun v -> fun _s -> { _s with findlib_index = v }) 2002 2001 } 2003 2002 and init_libs_findlib_requires : (_, init_libs) Rpc.Types.field = 2004 2003 { ··· 2029 2028 [Rpc.Types.BoxedField init_libs_path; 2030 2029 Rpc.Types.BoxedField init_libs_cmis; 2031 2030 Rpc.Types.BoxedField init_libs_cmas; 2032 2032 - Rpc.Types.BoxedField init_libs_findlib_metas; 2031 2031 + Rpc.Types.BoxedField init_libs_findlib_index; 2033 2032 Rpc.Types.BoxedField init_libs_findlib_requires; 2034 2033 Rpc.Types.BoxedField init_libs_stdlib_dcs]; 2035 2034 Rpc.Types.sname = "init_libs"; ··· 2046 2045 (let open Rpc.Types in Basic String))) 2047 2046 >>= 2048 2047 (fun init_libs_findlib_requires -> 2049 2049 - (getter.Rpc.Types.field_get "findlib_metas" 2050 2050 - (Rpc.Types.List 2051 2051 - (let open Rpc.Types in Basic String))) 2048 2048 + (getter.Rpc.Types.field_get "findlib_index" 2049 2049 + (let open Rpc.Types in Basic String)) 2052 2050 >>= 2053 2053 - (fun init_libs_findlib_metas -> 2051 2051 + (fun init_libs_findlib_index -> 2054 2052 (getter.Rpc.Types.field_get "cmas" 2055 2053 (Rpc.Types.List typ_of_cma)) 2056 2054 >>= ··· 2069 2067 path = init_libs_path; 2070 2068 cmis = init_libs_cmis; 2071 2069 cmas = init_libs_cmas; 2072 2072 - findlib_metas = 2073 2073 - init_libs_findlib_metas; 2070 2070 + findlib_index = 2071 2071 + init_libs_findlib_index; 2074 2072 findlib_requires = 2075 2073 init_libs_findlib_requires; 2076 2074 stdlib_dcs = ··· 2086 2084 let _ = init_libs_path 2087 2085 and _ = init_libs_cmis 2088 2086 and _ = init_libs_cmas 2089 2089 - and _ = init_libs_findlib_metas 2087 2087 + and _ = init_libs_findlib_index 2090 2088 and _ = init_libs_findlib_requires 2091 2089 and _ = init_libs_stdlib_dcs 2092 2090 and _ = typ_of_init_libs

+7 -1

lib/findlibish.ml

reviewed

··· 45 45 let rpc = Jsonrpc.of_string json in 46 46 Rpcmarshal.unmarshal Js_top_worker_rpc.Toplevel_api_gen.typ_of_dynamic_cmis rpc 47 47 48 48 - let init findlib_metas : t = 48 48 + let init findlib_index : t = 49 49 + let findlib_metas = 50 50 + match Jslib.sync_get findlib_index with 51 51 + | None -> [] 52 52 + | Some txt -> 53 53 + Astring.String.fields ~empty:false txt 54 54 + in 49 55 let metas = List.filter_map (fun x -> 50 56 match Jslib.sync_get x with 51 57 | Some meta -> Some (x, meta)

+2 -2

lib/impl.ml

reviewed

··· 44 44 45 45 val get_stdlib_dcs : string -> Toplevel_api_gen.dynamic_cmis list 46 46 47 47 - val findlib_init : string list -> findlib_t 47 47 + val findlib_init : string -> findlib_t 48 48 49 49 val require : findlib_t -> string list -> Toplevel_api_gen.dynamic_cmis list 50 50 end ··· 287 287 Logs.info (fun m -> m "init()"); 288 288 path := Some init_libs.path; 289 289 290 290 - findlib_v := Some (S.findlib_init init_libs.findlib_metas); 290 290 + findlib_v := Some (S.findlib_init init_libs.findlib_index); 291 291 292 292 (match S.get_stdlib_dcs init_libs.stdlib_dcs with 293 293 |[dcs] -> add_dynamic_cmis dcs