From d53ba17d1761261593c598b6a88cfd6ce0eb3514 Mon Sep 17 00:00:00 2001
From: Hugo Herbelin
Date: Sat, 12 Nov 2016 03:08:56 +0100
Subject: Using Coq_config.local rather than None to tell that
 Coq_config.coqlib is local.

This goes towards an approach where a local layout can be seen as an
installed layout.
---
 tools/coq_makefile.ml     |  8 +-------
 tools/coqdoc/cdglobals.ml | 26 +++++++++++++-------------
 2 files changed, 14 insertions(+), 20 deletions(-)

(limited to 'tools')

diff --git a/tools/coq_makefile.ml b/tools/coq_makefile.ml
index 78c92e68b5..8e2f75fc9c 100644
--- a/tools/coq_makefile.ml
+++ b/tools/coq_makefile.ml
@@ -119,14 +119,8 @@ let read_whole_file s =
     Buffer.contents b
 
 let makefile_template =
-  let open Filename in
   let template = "/tools/CoqMakefile.in" in
-  if Coq_config.local then
-    let coqbin = CUnix.canonical_path_name (dirname Sys.executable_name) in
-    dirname coqbin ^ template
-  else match Coq_config.coqlib with
-    | None -> assert false
-    | Some dir -> dir ^ template
+  Coq_config.coqlib ^ template
 
 let quote s = if String.contains s ' ' then "\"" ^ s ^ "\"" else s
 
diff --git a/tools/coqdoc/cdglobals.ml b/tools/coqdoc/cdglobals.ml
index 5d48473d8c..4b5c5d2e53 100644
--- a/tools/coqdoc/cdglobals.ml
+++ b/tools/coqdoc/cdglobals.ml
@@ -74,19 +74,19 @@ let normalize_filename f =
 
 let guess_coqlib () =
   let file = "theories/Init/Prelude.vo" in
-  match Coq_config.coqlib with
-    | Some coqlib when Sys.file_exists (coqlib / file) -> coqlib
-    | Some _ | None ->
-      let coqbin = normalize_path (Filename.dirname Sys.executable_name) in
-      let prefix = Filename.dirname coqbin in
-      let rpath =
-        if Coq_config.local then []
-        else if Coq_config.arch_is_win32 then ["lib"]
-        else ["lib/coq"]
-      in
-      let coqlib = List.fold_left (/) prefix rpath in
-      if Sys.file_exists (coqlib / file) then coqlib
-      else prefix
+  if not Coq_config.local && Sys.file_exists (Coq_config.coqlib / file)
+  then Coq_config.coqlib
+  else
+    let coqbin = normalize_path (Filename.dirname Sys.executable_name) in
+    let prefix = Filename.dirname coqbin in
+    let rpath =
+      if Coq_config.local then []
+      else if Coq_config.arch_is_win32 then ["lib"]
+      else ["lib/coq"]
+    in
+    let coqlib = List.fold_left (/) prefix rpath in
+    if Sys.file_exists (coqlib / file) then coqlib
+    else prefix
 
 let header_trailer = ref true
 let header_file = ref ""
-- 
cgit v1.2.3


From 58935ddbaf6f0e2470716d30f70ea18a9f8151c4 Mon Sep 17 00:00:00 2001
From: Hugo Herbelin
Date: Sat, 12 Nov 2016 03:08:34 +0100
Subject: Exporting the suffixes needed to build coqlib, docdir, etc.

This allows to centralize in the configuration file the description of
the 3 possible installation layouts (dispatched over directories
shared by multiple application as in unix, self-contained style like
in windows, local non-installation as with option -local).

Also supporting relocalisation when -prefix or -libdir and co is given.
---
 tools/coqdoc/cdglobals.ml | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

(limited to 'tools')

diff --git a/tools/coqdoc/cdglobals.ml b/tools/coqdoc/cdglobals.ml
index 4b5c5d2e53..a1987387f3 100644
--- a/tools/coqdoc/cdglobals.ml
+++ b/tools/coqdoc/cdglobals.ml
@@ -79,12 +79,7 @@ let guess_coqlib () =
   else
     let coqbin = normalize_path (Filename.dirname Sys.executable_name) in
     let prefix = Filename.dirname coqbin in
-    let rpath =
-      if Coq_config.local then []
-      else if Coq_config.arch_is_win32 then ["lib"]
-      else ["lib/coq"]
-    in
-    let coqlib = List.fold_left (/) prefix rpath in
+    let coqlib = prefix / Coq_config.coqlibsuffix in
     if Sys.file_exists (coqlib / file) then coqlib
     else prefix
 
-- 
cgit v1.2.3


From 886c222fabd6658d0ef1fe0ed18ff9d5fba9982a Mon Sep 17 00:00:00 2001
From: Hugo Herbelin
Date: Sat, 12 Nov 2016 11:37:17 +0100
Subject: Using the same strategy in coqdoc than in coqtop to guess the coqlib.

---
 tools/coqdoc/cdglobals.ml | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

(limited to 'tools')

diff --git a/tools/coqdoc/cdglobals.ml b/tools/coqdoc/cdglobals.ml
index a1987387f3..ef203960b5 100644
--- a/tools/coqdoc/cdglobals.ml
+++ b/tools/coqdoc/cdglobals.ml
@@ -70,18 +70,21 @@ let normalize_filename f =
   let dirname = Filename.dirname f in
   normalize_path dirname, basename
 
+(** Add a local installation suffix (unless the suffix is itself
+    absolute in which case the prefix does not matter) *)
+let use_suffix prefix suffix =
+  if String.length suffix > 0 && suffix.[0] = '/' then suffix else prefix / suffix
+
 (** A weaker analog of the function in Envars *)
 
 let guess_coqlib () =
   let file = "theories/Init/Prelude.vo" in
+  let coqbin = normalize_path (Filename.dirname Sys.executable_name) in
+  let prefix = Filename.dirname coqbin in
+  let coqlib = use_suffix prefix Coq_config.coqlibsuffix in
+  if Sys.file_exists (coqlib / file) then coqlib else
   if not Coq_config.local && Sys.file_exists (Coq_config.coqlib / file)
-  then Coq_config.coqlib
-  else
-    let coqbin = normalize_path (Filename.dirname Sys.executable_name) in
-    let prefix = Filename.dirname coqbin in
-    let coqlib = prefix / Coq_config.coqlibsuffix in
-    if Sys.file_exists (coqlib / file) then coqlib
-    else prefix
+  then Coq_config.coqlib else prefix
 
 let header_trailer = ref true
 let header_file = ref ""
-- 
cgit v1.2.3