diff options
| author | notin | 2009-02-11 14:39:08 +0000 |
|---|---|---|
| committer | notin | 2009-02-11 14:39:08 +0000 |
| commit | f930602d29ee71144b620629b3f7148e22e309c1 (patch) | |
| tree | 4baacee4b4b3d3d01d55d8820e46b353a05ffcc2 /toplevel | |
| parent | f4c9a46f34ff775f6e19a1f93e2a8d408cf9f3ad (diff) | |
Report des revisions #11826, #11828 et #11829 de v8.2 vers trunk
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@11915 85f007b7-540e-0410-9357-904b9bb8a0f7
Diffstat (limited to 'toplevel')
| -rw-r--r-- | toplevel/coqtop.ml | 16 | ||||
| -rw-r--r-- | toplevel/usage.ml | 10 | ||||
| -rw-r--r-- | toplevel/usage.mli | 3 |
3 files changed, 18 insertions, 11 deletions
diff --git a/toplevel/coqtop.ml b/toplevel/coqtop.ml index b4e23a874e..b75ef535f4 100644 --- a/toplevel/coqtop.ml +++ b/toplevel/coqtop.ml @@ -19,6 +19,20 @@ open States open Toplevel open Coqinit +let get_version_date () = + try + let coqlib = Envars.coqlib () in + let ch = open_in (Filename.concat coqlib "revision") in + let ver = input_line ch in + let rev = input_line ch in + (ver,rev) + with _ -> (Coq_config.version,Coq_config.date) + +let print_header () = + let (ver,rev) = (get_version_date ()) in + Printf.printf "Welcome to Coq %s (%s)\n" ver rev; + flush stdout + let output_context = ref false let memory_stat = ref false @@ -324,7 +338,7 @@ let init is_ide = try parse_args is_ide; re_exec is_ide; - if_verbose Usage.print_header (); + if_verbose print_header (); init_load_path (); inputstate (); set_vm_opt (); diff --git a/toplevel/usage.ml b/toplevel/usage.ml index fb26f50397..4494a01e93 100644 --- a/toplevel/usage.ml +++ b/toplevel/usage.ml @@ -8,13 +8,10 @@ (* $Id$ *) -let print_header () = - Printf.printf "Welcome to Coq %s (%s)\n" Revision.version Revision.revision; - flush stdout - let version () = - Printf.printf "The Coq Proof Assistant, version %s (%s)\n" Revision.version Revision.revision; - Printf.printf "compiled on %s\n" Revision.date; + Printf.printf "The Coq Proof Assistant, version %s (%s)\n" + Coq_config.version Coq_config.date; + Printf.printf "compiled on %s\n" Coq_config.compile_date; exit 0 (* print the usage of coqtop (or coqc) on channel co *) @@ -101,4 +98,3 @@ let print_config () = Printf.printf "CAMLP4LIB=%s\n" Coq_config.camlp4lib - diff --git a/toplevel/usage.mli b/toplevel/usage.mli index 37d96cfa82..fb973e3baf 100644 --- a/toplevel/usage.mli +++ b/toplevel/usage.mli @@ -21,6 +21,3 @@ val print_usage_coqc : unit -> unit (*s Prints the configuration information *) val print_config : unit -> unit - -(*s Prints the header *) -val print_header : unit -> unit |