jon.recoil.org
forked from
anil.recoil.org/monopam-myspace
My aggregated monorepo of OCaml code, automaintained
fix post-rebase: update stale Js_top_worker_rpc refs, cppo-gate ppx_template_generated
- findlibish.mli: use Js_top_worker.Impl.dynamic_cmis (RPC module removed)
- worker.ml: use Impl.dcs_url instead of Toplevel_api_gen.dcs_url
- x-ocaml/src/jtw_client: convert to cppo for OxCaml-only
ppx_template_generated field in Query_protocol.Compl
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
+2
-2
js_top_worker/lib/findlibish.mli
+2
-2
js_top_worker/lib/findlibish.mli
···
17
17
val fetch_dynamic_cmis :
18
18
(string -> string option) ->
19
19
string ->
20
-
(Js_top_worker_rpc.Toplevel_api_gen.dynamic_cmis, [ `Msg of string ]) result
20
+
(Js_top_worker.Impl.dynamic_cmis, [ `Msg of string ]) result
21
21
22
22
(** Load the named packages and their transitive dependencies.
23
23
Returns the dynamic CMI descriptors for all newly loaded packages. *)
···
27
27
bool ->
28
28
t ->
29
29
string list ->
30
-
Js_top_worker_rpc.Toplevel_api_gen.dynamic_cmis list
30
+
Js_top_worker.Impl.dynamic_cmis list
31
31
32
32
(** Find the dynamic_cmis.json URL for a named package.
33
33
Returns [None] if the package is not in the library list. *)
+2
-2
js_top_worker/lib/worker.ml
+2
-2
js_top_worker/lib/worker.ml
···
76
76
| Some i -> String.sub url 0 (i + 1)
77
77
| None -> url
78
78
in
79
-
Jslib.log "Rewriting dcs_url from %s to %s" dcs.Js_top_worker_rpc.Toplevel_api_gen.dcs_url abs_dcs_url;
80
-
[{ dcs with Js_top_worker_rpc.Toplevel_api_gen.dcs_url = abs_dcs_url }]
79
+
Jslib.log "Rewriting dcs_url from %s to %s" dcs.Impl.dcs_url abs_dcs_url;
80
+
[{ dcs with Impl.dcs_url = abs_dcs_url }]
81
81
| Error _ -> [])
82
82
| None ->
83
83
Jslib.log "stdlib not found in findlib (tried 'stdlib' and 'ocaml')";
+14
x-ocaml/src/dune
+14
x-ocaml/src/dune
···
1
+
; Generate jtw_client.ml from cppo source with conditional OXCAML flag
2
+
3
+
(rule
4
+
(targets jtw_client.ml)
5
+
(deps (:x jtw_client.cppo.ml))
6
+
(enabled_if (not %{ocaml-config:ox}))
7
+
(action (run %{bin:cppo} -V OCAML:%{ocaml_version} %{x} -o %{targets})))
8
+
9
+
(rule
10
+
(targets jtw_client.ml)
11
+
(deps (:x jtw_client.cppo.ml))
12
+
(enabled_if %{ocaml-config:ox})
13
+
(action (run %{bin:cppo} -V OCAML:%{ocaml_version} -D OXCAML %{x} -o %{targets})))
14
+
1
15
(executable
2
16
(name x_ocaml)
3
17
(libraries
+5
-1
x-ocaml/src/jtw_client.ml
x-ocaml/src/jtw_client.cppo.ml
+5
-1
x-ocaml/src/jtw_client.ml
x-ocaml/src/jtw_client.cppo.ml