Merge pull request #361 from gasche/unshadow_run_and_read

Unshadow run_and_read

Author: gasche

.github/workflows/build.yml

@@ -81,3 +81,7 @@ jobs:
         if: runner.os != 'Windows'
       - run: opam exec -- opam install -v shcaml.0.2.1 # this tests the cppo plugin
         if: ${{ ! startsWith(steps.conf.outputs.ocamlversion, '5.') && runner.os != 'Windows' && runner.os != 'macOS'}}
+      - run: opam exec -- opam install -v tgls.0.8.6
+        # this caught an ocamlbuild regression in https://github.com/ocaml/opam-repository/pull/27442
+        # (incompatible with OCaml >=5.2 and with Windows)
+        if: ${{ ! startsWith(steps.conf.outputs.ocamlversion, '5.') && runner.os != 'Windows'}}

.travis.yml

@@ -291,7 +291,7 @@ let execute ?quiet ?pretend cmd =
   | Some(_, exn) -> raise exn
   | _ -> ()
 
-let run_and_read ?(quiet=false) cmd =
+let run_spec_and_read ?(quiet=false) cmd =
   let kont = string_print_of_command_spec cmd quiet false in
   My_unix.run_and_read (kont ())
 

src/command.ml

@@ -26,9 +26,9 @@ open Command;;
 module S = Set.Make(String)
 
 let stdlib_dir = lazy begin
-  let ocamlc_where = !Options.build_dir / (Pathname.mk "ocamlc.where") in
-  let () = Command.execute ~quiet:true (Cmd(S[!Options.ocamlc; A"-where"; Sh">"; P ocamlc_where])) in
-  String.chomp (read_file ocamlc_where)
+  String.chomp
+    (Command.run_spec_and_read ~quiet:true
+       (S[!Options.ocamlc; A"-where"]))
 end
 
 let flag_and_dep = Flags.flag_and_dep

src/ocaml_utils.ml

@@ -401,8 +401,8 @@ let init () =
   ignore_list := List.map String.capitalize_ascii !ignore_list;
 
   let raw_ocamlc_config =
-    try Command.run_and_read (S [!ocamlc; A "-config"])
-    with Failure _ -> Command.run_and_read (S [!ocamlopt; A "-config"])
+    try Command.run_spec_and_read (S [!ocamlc; A "-config"])
+    with Failure _ -> Command.run_spec_and_read (S [!ocamlopt; A "-config"])
   in
   let ocamlc_config_lines = String.split_on_char '\n' raw_ocamlc_config in
   let ocamlc_configs =

src/options.ml

@@ -220,7 +220,7 @@ module type COMMAND = sig
   val atomize_paths : string list -> spec
 
   (** Run the command specification and returns its output *)
-  val run_and_read : ?quiet:bool -> spec -> string
+  val run_spec_and_read : ?quiet:bool -> spec -> string
 
   (** Run the command. *)
   val execute : ?quiet:bool -> ?pretend:bool -> t -> unit