Skip to content

Commit ae7b6ad

Browse files
authored
Merge pull request #831 from ocsigen/js_of_eliom-fix
Js_of_eliom: use ocamlfind to get the JavaScript runtime files
2 parents 9453024 + 519b0ca commit ae7b6ad

File tree

1 file changed

+12
-1
lines changed

1 file changed

+12
-1
lines changed

src/tools/utils.ml

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,18 @@ let get_client_lib ?kind:k () =
239239
with Not_found -> [])
240240
(get_client_package ?kind:k ()))
241241

242-
let get_client_js () = ["+eliom.client/eliom_client.js"]
242+
let get_client_js () =
243+
List.concat
244+
(List.map
245+
(fun p ->
246+
try
247+
let base = Findlib.package_directory p in
248+
List.map
249+
(fun r -> Findlib.resolve_path ~base r)
250+
(split ' '
251+
(Findlib.package_property (get_predicates ()) p "jsoo_runtime"))
252+
with Not_found -> [])
253+
(get_client_package ()))
243254

244255
(* Should be called only with -dump... *)
245256
let get_pp_dump pkg opt =

0 commit comments

Comments
 (0)