From ec1e83e85543a793dc248e9d2f47dd146f9a913d Mon Sep 17 00:00:00 2001
From: Emilio Jesus Gallego Arias
Date: Thu, 27 Sep 2018 02:25:16 +0200
Subject: [envars] Defer CAMLP5 location to configure.

These functions are unused, and configure should suffice for this
purpose.
---
 lib/envars.ml | 40 ++--------------------------------------
 1 file changed, 2 insertions(+), 38 deletions(-)

(limited to 'lib/envars.ml')

diff --git a/lib/envars.ml b/lib/envars.ml
index 3ee0c7106b..dbd381bb2a 100644
--- a/lib/envars.ml
+++ b/lib/envars.ml
@@ -36,21 +36,6 @@ let path_to_list p =
   let sep = if String.equal Sys.os_type "Win32" then ';' else ':' in
     String.split sep p
 
-let user_path () =
-  path_to_list (Sys.getenv "PATH") (* may raise Not_found *)
-
-(* Finding a name in path using the equality provided by the file system *)
-(* whether it is case-sensitive or case-insensitive *)
-let rec which l f =
-  match l with
-    | [] ->
-      raise Not_found
-    | p :: tl ->
-      if Sys.file_exists (p / f) then
-	p
-      else
-	which tl f
-
 let expand_path_macros ~warn s =
   let rec expand_atom s i =
     let l = String.length s in
@@ -155,29 +140,8 @@ let coqpath =
 
 (** {2 Caml paths} *)
 
-let exe s = s ^ Coq_config.exec_extension
-
 let ocamlfind () = Coq_config.ocamlfind
 
-(** {2 Camlp5 paths} *)
-
-let guess_camlp5bin () = which (user_path ()) (exe "camlp5")
-
-let camlp5bin () =
-  if !Flags.boot then Coq_config.camlp5bin else
-    try guess_camlp5bin ()
-    with Not_found ->
-      Coq_config.camlp5bin
-
-let camlp5lib () =
-  if !Flags.boot then
-    Coq_config.camlp5lib
-  else
-    let ex, res = CUnix.run_command (ocamlfind () ^ " query camlp5") in
-    match ex with
-      | Unix.WEXITED 0 -> String.strip res
-      | _ -> "/dev/null"
-
 (** {1 XDG utilities} *)
 
 let xdg_data_home warn =
@@ -209,8 +173,8 @@ let print_config ?(prefix_var_name="") f coq_src_subdirs =
   fprintf f "%sDOCDIR=%s/\n" prefix_var_name (docdir ());
   fprintf f "%sOCAMLFIND=%s\n" prefix_var_name (ocamlfind ());
   fprintf f "%sCAMLP5O=%s\n" prefix_var_name Coq_config.camlp5o;
-  fprintf f "%sCAMLP5BIN=%s/\n" prefix_var_name (camlp5bin ());
-  fprintf f "%sCAMLP5LIB=%s\n" prefix_var_name (camlp5lib ());
+  fprintf f "%sCAMLP5BIN=%s/\n" prefix_var_name Coq_config.camlp5bin;
+  fprintf f "%sCAMLP5LIB=%s\n" prefix_var_name Coq_config.camlp5lib;
   fprintf f "%sCAMLP5OPTIONS=%s\n" prefix_var_name Coq_config.camlp5compat;
   fprintf f "%sCAMLFLAGS=%s\n" prefix_var_name Coq_config.caml_flags;
   fprintf f "%sHASNATDYNLINK=%s\n" prefix_var_name
-- 
cgit v1.2.3


From 9d3a2d042500094befe4b88f3aa73693bc287ed9 Mon Sep 17 00:00:00 2001
From: Emilio Jesus Gallego Arias
Date: Thu, 27 Sep 2018 02:33:10 +0200
Subject: [lib] [flags] Move coqlib handling out of `Flags`

The relevant logic is already in `Envars`, so it makes sense to make
it private and don't expose the low-level implementation of the logic.
---
 lib/envars.ml | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

(limited to 'lib/envars.ml')

diff --git a/lib/envars.ml b/lib/envars.ml
index dbd381bb2a..12cc9edfe4 100644
--- a/lib/envars.ml
+++ b/lib/envars.ml
@@ -107,12 +107,20 @@ let guess_coqlib fail =
 
 (** coqlib is now computed once during coqtop initialization *)
 
+(* Options for changing coqlib *)
+let coqlib_spec = ref false
+let coqlib = ref "(not initialized yet)"
+
+let set_user_coqlib path =
+  coqlib_spec := true;
+  coqlib := path
+
 let set_coqlib ~fail =
-  if not !Flags.coqlib_spec then
+  if not !coqlib_spec then
     let lib = if !Flags.boot then coqroot else guess_coqlib fail in
-    Flags.coqlib := lib
+    coqlib := lib
 
-let coqlib () = !Flags.coqlib
+let coqlib () = !coqlib
 
 let docdir () =
   (* This assumes implicitly that the suffix is non-trivial *)
-- 
cgit v1.2.3


From 24086d1000db370fcf74077841506f02849d0c44 Mon Sep 17 00:00:00 2001
From: Emilio Jesus Gallego Arias
Date: Thu, 27 Sep 2018 02:41:18 +0200
Subject: [envars] Small implementation cleanup for coqlib internals.

---
 lib/envars.ml | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

(limited to 'lib/envars.ml')

diff --git a/lib/envars.ml b/lib/envars.ml
index 12cc9edfe4..cf76b6ebc8 100644
--- a/lib/envars.ml
+++ b/lib/envars.ml
@@ -105,22 +105,19 @@ let guess_coqlib fail =
         fail "cannot guess a path for Coq libraries; please use -coqlib option")
   )
 
-(** coqlib is now computed once during coqtop initialization *)
-
-(* Options for changing coqlib *)
-let coqlib_spec = ref false
-let coqlib = ref "(not initialized yet)"
+let coqlib : string option ref = ref None
+let set_user_coqlib path = coqlib := Some path
 
-let set_user_coqlib path =
-  coqlib_spec := true;
-  coqlib := path
+(** coqlib is now computed once during coqtop initialization *)
 
 let set_coqlib ~fail =
-  if not !coqlib_spec then
+  match !coqlib with
+  | Some _ -> ()
+  | None ->
     let lib = if !Flags.boot then coqroot else guess_coqlib fail in
-    coqlib := lib
+    coqlib := Some lib
 
-let coqlib () = !coqlib
+let coqlib () = Option.default "" !coqlib
 
 let docdir () =
   (* This assumes implicitly that the suffix is non-trivial *)
-- 
cgit v1.2.3