Copy cmis from OCaml install when building. · jon.recoil.org/merlin-js@99102d6

+11 -1

example/stdlib/dune

··· 1 1 (copy_files 2 2 (alias all-js) 3 3 (mode (promote (until-clean))) 4 - (files ../../src/worker/static/stdlib/*)) 4 + (files %{ocaml-config:standard_library}/*.cmi)) 5 + 6 + (copy_files 7 + (alias all-js) 8 + (mode (promote (until-clean))) 9 + (files %{ocaml-config:standard_library}/unix/*.cmi)) 10 + 11 + (copy_files 12 + (alias all-js) 13 + (mode (promote (until-clean))) 14 + (files %{ocaml-config:standard_library}/str/*.cmi))

+6 -2

src/worker/static/dune

··· 11 11 12 12 (rule 13 13 (target static_files.ml) 14 - (deps (glob_files stdlib/*.cmi)) 15 - (action (run ocaml %{dep:gen_static.ml}))) 14 + (deps 15 + (glob_files %{ocaml-config:standard_library}/*.cmi) 16 + (glob_files %{ocaml-config:standard_library}/unix/*.cmi) 17 + (glob_files %{ocaml-config:standard_library}/str/*.cmi)) 18 + (action (run ocaml %{dep:gen_static.ml} %{deps}))) 19 +

+10 -17

src/worker/static/gen_static.ml

··· 1 1 #use "topfind" ;; 2 2 #require "unix";; 3 3 4 - 5 - let rec iter_cmi ~f dir_handle = 6 - match Unix.readdir dir_handle with 7 - | exception End_of_file -> () 8 - | file -> 9 - if Filename.extension file = ".cmi" then 10 - f file; 11 - iter_cmi ~f dir_handle 12 - 13 4 let () = 14 - let cwd = Unix.getcwd () in 15 - let stdlib = Filename.concat cwd "stdlib" in 16 5 let out = open_out "static_files.ml" in 17 6 18 7 Printf.fprintf out "open Protocol\nlet stdlib_cmis = ["; 19 - let dir = Unix.opendir stdlib in 20 - iter_cmi ~f:(fun file -> 21 - let fullpath = Filename.concat stdlib file in 22 - let module_name = Filename.basename file |> String.capitalize_ascii |> Filename.remove_extension in 23 - Printf.fprintf out "{sc_name=%S; sc_content=[%%blob %S]};" module_name fullpath) dir; 24 - Printf.fprintf out "]\n"; 8 + for i = 1 to Array.length Sys.argv - 1 do 9 + let fullpath = Sys.argv.(i) in 10 + let module_name = 11 + Filename.basename fullpath 12 + |> String.capitalize_ascii 13 + |> Filename.remove_extension 14 + in 15 + Printf.fprintf out "{sc_name=%S; sc_content=[%%blob %S]};" module_name fullpath 16 + done; 17 + Printf.fprintf out "]\n"; 25 18 26 19 close_out out

src/worker/static/stdlib/arith_status.cmi