From 9ccd1899dba51e24216d0de8865eecf029f44cef Mon Sep 17 00:00:00 2001
From: letouzey
Date: Thu, 21 Apr 2011 16:12:34 +0000
Subject: Win32: remove the need for Coq.bat and Coqide.bat

  This is an adaptation of commit r13750 of branch 8.3

  - coqlib is currently computed relatively of Sys.executable_name,
    hence no need to set it manually

  - in Win32, better detection of user home dir : in System.ml,
    if HOME isn't set, we look now for HOMEDRIVE\HOMEPATH, and then
    for USERPROFILE

  - concerning PATH, in Win32 we now add coqbin (or the location of
    coqide) to PATH during the initialization.

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@14041 85f007b7-540e-0410-9357-904b9bb8a0f7
---
 lib/envars.ml |  7 +++++++
 lib/system.ml | 13 +++++++++++--
 2 files changed, 18 insertions(+), 2 deletions(-)

(limited to 'lib')

diff --git a/lib/envars.ml b/lib/envars.ml
index a05029c95b..f19834527d 100644
--- a/lib/envars.ml
+++ b/lib/envars.ml
@@ -14,6 +14,13 @@ let coqbin () =
   then Filename.concat Coq_config.coqsrc "bin"
   else System.canonical_path_name (Filename.dirname Sys.executable_name)
 
+(* On win32, we add coqbin to the PATH at launch-time (this used to be
+   done in a .bat script). *)
+
+let _ =
+  if Coq_config.arch = "win32" then
+    Unix.putenv "PATH" (coqbin() ^ ";" ^ System.getenv_else "PATH" "")
+
 let guess_coqlib () =
   let file = "states/initial.coq" in
     if Sys.file_exists (Filename.concat Coq_config.coqlib file)
diff --git a/lib/system.ml b/lib/system.ml
index 23c6081bbd..f5c96256ff 100644
--- a/lib/system.ml
+++ b/lib/system.ml
@@ -19,12 +19,21 @@ let safe_getenv_def var def =
     Sys.getenv var
   with Not_found ->
     warning ("Environment variable "^var^" not found: using '"^def^"' .");
-    flush Pervasives.stdout;
+    flush_all ();
     def
 
 let getenv_else s dft = try Sys.getenv s with Not_found -> dft
 
-let home = (safe_getenv_def "HOME" ".")
+(* On win32, the home directory is probably not in $HOME, but in
+   some other environment variable *)
+
+let home =
+  try Sys.getenv "HOME" with Not_found ->
+    try (Sys.getenv "HOMEDRIVE")^(Sys.getenv "HOMEPATH") with Not_found ->
+      try Sys.getenv "USERPROFILE" with Not_found ->
+	warning ("Cannot determine user home directory, using '.' .");
+	flush_all ();
+	"."
 
 let safe_getenv n = safe_getenv_def n ("$"^n)
 
-- 
cgit v1.2.3