diff options
| author | monate | 2003-03-05 12:17:18 +0000 |
|---|---|---|
| committer | monate | 2003-03-05 12:17:18 +0000 |
| commit | bd6e68f4ef7bac1e9729b875f944048b394e71af (patch) | |
| tree | 251aaa850893ef32dc8a5583bdfaeefdc6fa5533 | |
| parent | e6c6fd55e777ea7a9c7c85399138deab40284f28 (diff) | |
CoqIde: Install.ide Revert bugfix.
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@3741 85f007b7-540e-0410-9357-904b9bb8a0f7
| -rw-r--r-- | INSTALL.ide | 55 | ||||
| -rw-r--r-- | ide/coq.ml | 2 | ||||
| -rw-r--r-- | ide/coqide.ml | 6 | ||||
| -rw-r--r-- | ide/ideutils.ml | 4 | ||||
| -rw-r--r-- | ide/utils/configwin_ihm.ml | 2 |
5 files changed, 65 insertions, 4 deletions
diff --git a/INSTALL.ide b/INSTALL.ide new file mode 100644 index 0000000000..d6a91f3d8e --- /dev/null +++ b/INSTALL.ide @@ -0,0 +1,55 @@ + CoqIde Installation procedure. + +CoqIde is a graphical interface to perform interactive proofs. +You should be able to do everything you do in coqtop inside CoqIde +excepted dropping to the ml toplevel. + +DISCLAIMER: CoqIde is ongoing work. Eventhough it should never let you + loose a proof, you may encounter unexpected bugs. + Do not hesitate to send suggestions/bug reports. + +REQUIREMENT: + - make world must succeed. + - The graphical toolkit Gtk 2.x. See http://www.gtk.org. + The official supported version is at least 2.2.x. + You may still compile CoqIde with older 2.0.x versions and + use all features. + Run + "pkg-config --modversion gtk+-2.0" + to check your version. + All recent distributions have precompiled packages. + Do not forget to install the developement headers packages. + As for Debian/woody, + apt-get install libgtk2.0-dev + should be enough. + +INSTALLATION + 1) You need to install the OCaml stub library lablgtk2. See + http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/lablgtk.html + The official snapshot are not yet ready for CoqIde. + Use this one : + http://www.lix.polytechnique.fr/~monate/download/lablgtk2.tgz + If you are in a hurry just run : + + cd /tmp && \ + wget http://www.lix.polytechnique.fr/~monate/download/lablgtk2.tgz && \ + tar zxvf lablgtk2.tgz && \ + cd lablgtk2 && \ + make configure && \ + make all opt && \ + make install + + You must have write access to the OCaml standard library path. + If this fails read lablgtk2/README. + +2) Go into your Coq source directory and then : + + make ide + +3) You may now run bin/coqide.opt or bin/coqide.byte. + +NOTES +Font configuration is not saved. +If you want to change the defaults fonts, just copy the +.coqiderc file located in the ide subdir of the Coq library to +your home directory and edit it by hand. diff --git a/ide/coq.ml b/ide/coq.ml index d4e33b6458..04f45c24d9 100644 --- a/ide/coq.ml +++ b/ide/coq.ml @@ -93,7 +93,7 @@ let print_toplevel_error exc = let process_exn e = let s,loc=print_toplevel_error e in (msgnl s,loc) let interp_last last = - prerr_string "*"; flush stderr; + prerr_string "*"; try vernac_com (States.with_heavy_rollback Vernacentries.interp) last with e -> diff --git a/ide/coqide.ml b/ide/coqide.ml index af9bfefbf9..250a521b72 100644 --- a/ide/coqide.ml +++ b/ide/coqide.ml @@ -95,7 +95,7 @@ module Vector = struct let exists f t = let l = Array.length !t in let rec test i = - i < l && (!t.(i) = None || f (out_some !t.(i)) || test (i+1)) + i < l && ((!t.(i) <> None && f (out_some !t.(i))) || test (i+1)) in test 0 end @@ -1199,7 +1199,9 @@ let main files = in let has_something_to_save () = Vector.exists - (fun {view=view} -> view#buffer#modified) + (function + | {view=view} -> view#buffer#modified + ) input_views in ignore (saveall_m#connect#activate saveall_f); diff --git a/ide/ideutils.ml b/ide/ideutils.ml index 59970a622a..784c4a4d4b 100644 --- a/ide/ideutils.ml +++ b/ide/ideutils.ml @@ -27,7 +27,9 @@ let process_pending () = let debug = Options.debug let prerr_endline s = - if !debug then (prerr_endline s;flush stderr) else () + if !debug then (prerr_endline s;flush stderr) +let prerr_string s = + if !debug then (prerr_string s;flush stderr) let print_id id = prerr_endline ("GOT sig id :"^(string_of_int (Obj.magic id))) diff --git a/ide/utils/configwin_ihm.ml b/ide/utils/configwin_ihm.ml index 3b26312658..f6c4e6daad 100644 --- a/ide/utils/configwin_ihm.ml +++ b/ide/utils/configwin_ihm.ml @@ -15,6 +15,7 @@ open Configwin_types module O = Uoptions + (** The file where the html config is. *) let file_html_config = Filename.concat Configwin_messages.home ".configwin_html" @@ -37,6 +38,7 @@ let html_config_file_and_option () = O.load ini ; (ini, bindings) + (** This variable contains the last directory where the user selected a file.*) let last_dir = ref "";; |
