diff options
| author | letouzey | 2011-03-25 17:35:47 +0000 |
|---|---|---|
| committer | letouzey | 2011-03-25 17:35:47 +0000 |
| commit | 27e9777aaadca805dd331bc5f4f6ce40d41fbd70 (patch) | |
| tree | cd546e38133d1c32d97c0da314a5bdbafdc5322e /myocamlbuild.ml | |
| parent | bac77d6d0e58c74e2ad8ca439c48b86df5587206 (diff) | |
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
Diffstat (limited to 'myocamlbuild.ml')
| -rw-r--r-- | myocamlbuild.ml | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/myocamlbuild.ml b/myocamlbuild.ml index 6a7d18ebf7..8565c1482b 100644 --- a/myocamlbuild.ml +++ b/myocamlbuild.ml @@ -112,10 +112,6 @@ let core_cma = List.map (fun s -> s^".cma") core_libs let core_cmxa = List.map (fun s -> s^".cmxa") core_libs let core_mllib = List.map (fun s -> s^".mllib") core_libs -let ide_cma = "ide/ide.cma" -let ide_cmxa = "ide/ide.cmxa" -let ide_mllib = "ide/ide.mllib" - let tolink = "scripts/tolink.ml" let c_headers_base = @@ -371,16 +367,14 @@ let extra_rules () = begin (** Generation of tolink.ml *) - rule tolink ~deps:(ide_mllib::core_mllib) ~prod:tolink + rule tolink ~deps:core_mllib ~prod:tolink (fun _ _ -> let cat s = String.concat " " (string_list_of_file s) in let core_mods = String.concat " " (List.map cat core_mllib) in - let ide_mods = cat ide_mllib in let core_cmas = String.concat " " core_cma in Echo (["let copts = \"-cclib -lcoqrun\"\n"; "let core_libs = \"coq_config.cmo "^core_cmas^"\"\n"; - "let core_objs = \"Coq_config "^core_mods^"\"\n"; - "let ide = \""^ide_mods^"\"\n"], + "let core_objs = \"Coq_config "^core_mods^"\"\n"], tolink)); (** Coqtop *) |