aboutsummaryrefslogtreecommitdiffhomepage
path: root/ide
diff options
context:
space:
mode:
authorGravatar letouzey <letouzey@85f007b7-540e-0410-9357-904b9bb8a0f7>2011-04-21 16:12:34 +0000
committerGravatar letouzey <letouzey@85f007b7-540e-0410-9357-904b9bb8a0f7>2011-04-21 16:12:34 +0000
commit9ccd1899dba51e24216d0de8865eecf029f44cef (patch)
tree0b25a558459b4d8f789e87162646587488f31ae9 /ide
parent08642139dc3edf2caf94e7f246c15644daca16ad (diff)
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
Diffstat (limited to 'ide')
-rw-r--r--ide/coqide_main.ml49
-rw-r--r--ide/minilib.ml8
-rw-r--r--ide/utils/configwin_messages.ml4
3 files changed, 17 insertions, 4 deletions
diff --git a/ide/coqide_main.ml4 b/ide/coqide_main.ml4
index 9fc0f72b7..7c0f23170 100644
--- a/ide/coqide_main.ml4
+++ b/ide/coqide_main.ml4
@@ -18,7 +18,16 @@ let initmac () = IFDEF MacInt THEN gtk_mac_init Coqide.do_load Coqide.forbid_qui
let macready () = IFDEF MacInt THEN gtk_mac_ready () ELSE () END
+(* On win32, we add the directory of coqide to the PATH at launch-time
+ (this used to be done in a .bat script). *)
+
+let winpath () =
+ if Coq_config.arch = "win32" then
+ Unix.putenv "PATH" (Filename.dirname Sys.executable_name ^ ";" ^
+ (try Sys.getenv "PATH" with _ -> ""))
+
let () =
+ winpath ();
let argl = Array.to_list Sys.argv in
let argl = Coqide.set_coqtop_path argl in
let files = Coqide.process_argv argl in
diff --git a/ide/minilib.ml b/ide/minilib.ml
index 9833fbd6b..f072ff9fa 100644
--- a/ide/minilib.ml
+++ b/ide/minilib.ml
@@ -58,7 +58,13 @@ let list_filter_i p =
let subst_command_placeholder s t =
Str.global_replace (Str.regexp_string "%s") s t
-let home = try Sys.getenv "HOME" with Not_found -> "."
+(* 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 -> "."
let coqlib = ref ""
let coqtop_path = ref ""
diff --git a/ide/utils/configwin_messages.ml b/ide/utils/configwin_messages.ml
index f89844627..de2924318 100644
--- a/ide/utils/configwin_messages.ml
+++ b/ide/utils/configwin_messages.ml
@@ -30,9 +30,7 @@ let version = "1.2";;
let html_config = "Configwin bindings configurator for html parameters"
-let home =
- try Sys.getenv "HOME"
- with Not_found -> ""
+let home = Minilib.home
let mCapture = "Capture";;
let mType_key = "Type key" ;;