Ide: more reorganisation and cleanup

 - Avoid using Util which depends on Compat and hence Camlp4
 - Instead, a small Minilib module specific to coqide, which
   duplicate 5 functions from Util (50 lines)
 - some dead code removal
 - the coqlib variable is asked to coqtop
 - remove obsolete Util.check_for_interrupt

 This way, coqide only depends on 3 files outside ide/ :
 Coq_config, Flags, Ide_intf. Makefile and ocamlbuild are adapted
 accordingly.

TODO: how should we signal coqide error, warnings, etc ?
 For the moment, some Printf.eprintf, some failwith.
 To uniformize later...

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@13930 85f007b7-540e-0410-9357-904b9bb8a0f7

1 files changed, 3 insertions, 2 deletions

diff --git a/ide/coqide_main.ml4 b/ide/coqide_main.ml4
index 4bb80f4a7..4db3ba143 100644
--- a/ide/coqide_main.ml4
+++ b/ide/coqide_main.ml4
@@ -16,10 +16,11 @@ let () =
   let args = List.filter (fun x -> not (List.mem x files)) (List.tl argl) in
   Coqide.sup_args := List.map Filename.quote args;
   Coq.check_connection !Coqide.sup_args;
+  Minilib.coqlib := Coq.coqlib ();
   Coqide.ignore_break ();
     GtkMain.Rc.add_default_file (Ideutils.lib_ide_file ".coqide-gtk2rc");
     (try
-	 GtkMain.Rc.add_default_file (Filename.concat System.home ".coqide-gtk2rc");
+	 GtkMain.Rc.add_default_file (Filename.concat Minilib.home ".coqide-gtk2rc");
      with Not_found -> ());
     ignore (GtkMain.Main.init ());
     initmac () ;
@@ -30,7 +31,7 @@ let () =
 								 `WARNING;`CRITICAL]
 	       (fun ~level msg ->
 		  if level land Glib.Message.log_level `WARNING <> 0
-		  then Pp.warning msg
+		  then Printf.eprintf "Warning: %s\n" msg
 		  else failwith ("Coqide internal error: " ^ msg)));
     Coqide.main files;
     if !Coq_config.with_geoproof then ignore (Thread.create Coqide.check_for_geoproof_input ());