From 27e9777aaadca805dd331bc5f4f6ce40d41fbd70 Mon Sep 17 00:00:00 2001 From: letouzey Date: Fri, 25 Mar 2011 17:35:47 +0000 Subject: 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 --- ide/ideutils.ml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'ide/ideutils.ml') diff --git a/ide/ideutils.ml b/ide/ideutils.ml index 319cf4e4d2..a4126ae33d 100644 --- a/ide/ideutils.ml +++ b/ide/ideutils.ml @@ -37,8 +37,7 @@ let prerr_string s = if !debug then (prerr_string s;flush stderr) let lib_ide_file f = - let coqlib = Envars.coqlib () in - Filename.concat (Filename.concat coqlib "ide") f + Filename.concat (Filename.concat !Minilib.coqlib "ide") f let get_insert input_buffer = input_buffer#get_iter_at_mark `INSERT @@ -284,7 +283,7 @@ let run_command f c = (Unix.close_process_full (cin,cout,cerr), Buffer.contents result) let browse f url = - let com = Flags.subst_command_placeholder !current.cmd_browse url in + let com = Minilib.subst_command_placeholder !current.cmd_browse url in let s = Sys.command com in if s = 127 then f ("Could not execute\n\""^com^ -- cgit v1.2.3