Skip to content

Patch myocamlbuild.ml to not use internal ocamlbuild function. #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jyc wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Patch myocamlbuild.ml to not use internal ocamlbuild function. #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ff30789
Patch myocamlbuild.ml to not use internal ocamlbuild function.
jyc Dec 21, 2015
369be3c
Revert unintentional change to ocamlbuild.
jyc Dec 22, 2015
a1858ca
Install .cmx files as well. See warning 58.
jyc Jul 16, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 15 additions & 6 deletions samples/myocamlbuild.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,24 @@ open Ocamlbuild_plugin

(* ocamlfind integration following http://www.nabble.com/forum/ViewPost.jtp?post=15979274 *)

(* these functions are not really officially exported *)
let run_and_read = Ocamlbuild_pack.My_unix.run_and_read
let blank_sep_strings = Ocamlbuild_pack.Lexers.blank_sep_strings
let run_command cmd =
let chan = Unix.open_process_in cmd in
let out =
let rec loop xs =
match input_line chan with
| x -> loop (x :: xs)
| exception End_of_file -> List.rev xs
in loop []
in
match Unix.close_process_in chan with
| Unix.WEXITED 0 -> `Ok out
| x -> `Error x

(* this lists all supported packages *)
let find_packages () =
blank_sep_strings &
Lexing.from_string &
run_and_read "ocamlfind list | cut -d' ' -f1"
match run_command "ocamlfind list | cut -d' ' -f1" with
| `Ok xs -> xs
| `Error _ -> failwith "Failed to find packages."

(* this lists all supported packages *)
let find_syntaxes () = ["camlp4o"]
Expand Down
3 changes: 2 additions & 1 deletion src/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,9 @@ MLI = \
client.mli

CMAS = $(NAME).cma
CMXS = $(NAME).cmx
CMXAS = $(NAME).cmxa
LIBS = $(CMAS) $(CMXAS)
LIBS = $(CMAS) $(CMXS) $(CMXAS)
BUILD = \
$(addprefix _build/,$(LIBS)) \
$(addprefix _build/,$(MLI)) \
Expand Down
21 changes: 15 additions & 6 deletions src/myocamlbuild.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,24 @@ open Ocamlbuild_plugin

(* ocamlfind integration following http://www.nabble.com/forum/ViewPost.jtp?post=15979274 *)

(* these functions are not really officially exported *)
let run_and_read = Ocamlbuild_pack.My_unix.run_and_read
let blank_sep_strings = Ocamlbuild_pack.Lexers.blank_sep_strings
let run_command cmd =
let chan = Unix.open_process_in cmd in
let out =
let rec loop xs =
match input_line chan with
| x -> loop (x :: xs)
| exception End_of_file -> List.rev xs
in loop []
in
match Unix.close_process_in chan with
| Unix.WEXITED 0 -> `Ok out
| x -> `Error x

(* this lists all supported packages *)
let find_packages () =
blank_sep_strings &
Lexing.from_string &
run_and_read "ocamlfind list | cut -d' ' -f1"
match run_command "ocamlfind list | cut -d' ' -f1" with
| `Ok xs -> xs
| `Error _ -> failwith "Failed to find packages."

(* this lists all supported packages *)
let find_syntaxes () = ["camlp4o"]
Expand Down
21 changes: 15 additions & 6 deletions test/myocamlbuild.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,24 @@ open Ocamlbuild_plugin

(* ocamlfind integration following http://www.nabble.com/forum/ViewPost.jtp?post=15979274 *)

(* these functions are not really officially exported *)
let run_and_read = Ocamlbuild_pack.My_unix.run_and_read
let blank_sep_strings = Ocamlbuild_pack.Lexers.blank_sep_strings
let run_command cmd =
let chan = Unix.open_process_in cmd in
let out =
let rec loop xs =
match input_line chan with
| x -> loop (x :: xs)
| exception End_of_file -> List.rev xs
in loop []
in
match Unix.close_process_in chan with
| Unix.WEXITED 0 -> `Ok out
| x -> `Error x

(* this lists all supported packages *)
let find_packages () =
blank_sep_strings &
Lexing.from_string &
run_and_read "ocamlfind list | cut -d' ' -f1"
match run_command "ocamlfind list | cut -d' ' -f1" with
| `Ok xs -> xs
| `Error _ -> failwith "Failed to find packages."

(* this lists all supported packages *)
let find_syntaxes () = ["camlp4o"]
Expand Down