- Suppression date dans configure du trunk

- Utilisation de get_version_date pour l'option -v (plutôt que la date
  non à jour du configure)



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

5 files changed, 22 insertions, 20 deletions

diff --git a/configure b/configure
index 72c1ba8be..dd37b2d36 100755
--- a/configure
+++ b/configure
@@ -9,7 +9,7 @@
 VERSION=trunk
 VOMAGIC=08193 
 STATEMAGIC=19764
-DATE="Jun. 2008"
+DATE="date unspecified"
 
 # Create the bin/ directory if non-existent
 test -d bin || mkdir bin
diff --git a/scripts/coqc.ml b/scripts/coqc.ml
index f2cf2025d..2d3fea3fd 100644
--- a/scripts/coqc.ml
+++ b/scripts/coqc.ml
@@ -139,12 +139,11 @@ let parse_args () =
 
     | ("-notactics"|"-debug"|"-nolib"
       |"-debugVM"|"-alltransp"|"-VMno"
-      |"-batch"|"-nois" | "-noglob" | "-no-glob"
+      |"-batch"|"-nois"|"-noglob"|"-no-glob"
       |"-q"|"-full"|"-profile"|"-just-parsing"|"-echo" |"-unsafe"|"-quiet"
       |"-silent"|"-m"|"-xml"|"-v7"|"-v8"|"-beautify"|"-strict-implicit"
       |"-dont-load-proofs"|"-impredicative-set"|"-vm" 
-      |"-unboxed-values"|"-unboxed-definitions"|"-draw-vm-instr"
-      |"-no-glob"|"-noglob" as o) :: rem ->
+      |"-unboxed-values"|"-unboxed-definitions"|"-draw-vm-instr" as o) :: rem ->
 	parse (cfiles,o::args) rem
 	    
     | ("-where") :: _ -> 
diff --git a/toplevel/coqtop.ml b/toplevel/coqtop.ml
index 9ada5bff2..b4e23a874 100644
--- a/toplevel/coqtop.ml
+++ b/toplevel/coqtop.ml
@@ -19,19 +19,6 @@ open States
 open Toplevel
 open Coqinit
 
-let get_version_date () =
-  try
-    let ch = open_in (Coq_config.coqsrc^"/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
@@ -337,7 +324,7 @@ let init is_ide =
     try
       parse_args is_ide;
       re_exec is_ide;
-      if_verbose print_header ();
+      if_verbose Usage.print_header ();
       init_load_path ();
       inputstate ();
       set_vm_opt ();
diff --git a/toplevel/usage.ml b/toplevel/usage.ml
index cdb3b6f02..b411a4f96 100644
--- a/toplevel/usage.ml
+++ b/toplevel/usage.ml
@@ -8,9 +8,22 @@
 
 (* $Id$ *)
 
+let get_version_date () =
+  try
+    let ch = open_in (Coq_config.coqsrc^"/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 version () =
-  Printf.printf "The Coq Proof Assistant, version %s (%s)\n"
-    Coq_config.version Coq_config.date;
+  let (ver,rev) = (get_version_date ()) in
+  Printf.printf "The Coq Proof Assistant, version %s (%s)\n" ver rev;
   Printf.printf "compiled on %s\n" Coq_config.compile_date;
   exit 0
 
diff --git a/toplevel/usage.mli b/toplevel/usage.mli
index fb973e3ba..37d96cfa8 100644
--- a/toplevel/usage.mli
+++ b/toplevel/usage.mli
@@ -21,3 +21,6 @@ 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