ajout option -version

git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@5063 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02

5 files changed, 20 insertions, 5 deletions

diff --git a/driver/main.ml b/driver/main.ml
index c7053a46b7..8e1f58fbe7 100644
--- a/driver/main.ml
+++ b/driver/main.ml
@@ -49,13 +49,16 @@ let process_file ppf name =
   else
     raise(Arg.Bad("don't know what to do with " ^ name))
 
-let print_version_number () =
+let print_version_and_library () =
   print_string "The Objective Caml compiler, version ";
   print_string Config.version; print_newline();
   print_string "Standard library directory: ";
   print_string Config.standard_library; print_newline();
   exit 0
 
+let print_version_string () =
+  print_string Config.version; print_newline(); exit 0
+
 let print_standard_library () =
   print_string Config.standard_library; print_newline(); exit 0
 
@@ -101,7 +104,8 @@ module Options = Main_args.Make_options (struct
   let _unsafe = set fast
   let _use_prims s = use_prims := s
   let _use_runtime s = use_runtime := s
-  let _v = print_version_number
+  let _v = print_version_and_library
+  let _version = print_version_string
   let _w = (Warnings.parse_options false)
   let _warn_error = (Warnings.parse_options true)
   let _where = print_standard_library
diff --git a/driver/main_args.ml b/driver/main_args.ml
index 0beea91e45..617c73caeb 100644
--- a/driver/main_args.ml
+++ b/driver/main_args.ml
@@ -46,6 +46,7 @@ module Make_options (F :
      val _use_prims : string -> unit
      val _use_runtime : string -> unit
      val _v : unit -> unit
+     val _version : unit -> unit
      val _verbose : unit -> unit
      val _w : string -> unit
      val _warn_error : string -> unit
@@ -112,7 +113,9 @@ struct
            "<file>  Generate bytecode for the given runtime system";
     "-use_runtime", Arg.String F._use_runtime,
            "<file>  (deprecated) same as -use-runtime";
-    "-v", Arg.Unit F._v, " Print compiler version number and exit";
+    "-v", Arg.Unit F._v,
+           " Print compiler version and location of standard library and exit";
+    "-version", Arg.Unit F._version, " Print compiler version and exit";
     "-verbose", Arg.Unit F._verbose, " Print calls to external commands";
     "-w", Arg.String F._w,
       "<flags>  Enable or disable warnings according to <flags>:\n\
diff --git a/driver/main_args.mli b/driver/main_args.mli
index 137ed6892d..aebe7e76b6 100644
--- a/driver/main_args.mli
+++ b/driver/main_args.mli
@@ -46,6 +46,7 @@ module Make_options (F :
       val _use_prims : string -> unit
       val _use_runtime : string -> unit
       val _v : unit -> unit
+      val _version : unit -> unit
       val _verbose : unit -> unit
       val _w : string -> unit
       val _warn_error : string -> unit
diff --git a/driver/optmain.ml b/driver/optmain.ml
index 6867a8b6f4..1f613445c3 100644
--- a/driver/optmain.ml
+++ b/driver/optmain.ml
@@ -44,13 +44,16 @@ let process_file ppf name =
   else
     raise(Arg.Bad("don't know what to do with " ^ name))
 
-let print_version_number () =
+let print_version_and_library () =
   print_string "The Objective Caml native-code compiler, version ";
   print_string Config.version; print_newline();
   print_string "Standard library directory: ";
   print_string Config.standard_library; print_newline();
   exit 0
 
+let print_version_string () =
+  print_string Config.version; print_newline(); exit 0
+
 let print_standard_library () =
   print_string Config.standard_library; print_newline(); exit 0
 
@@ -126,7 +129,10 @@ let main () =
        "-thread", Arg.Set thread_safe, " Use thread-safe standard library";
        "-unsafe", Arg.Set fast,
              " No bounds checking on array and string access";
-       "-v", Arg.Unit print_version_number, " Print compiler version number";
+       "-v", Arg.Unit print_version_and_library,
+             " Print compiler version and standard library location and exit";
+       "-version", Arg.Unit print_version_string,
+             " Print compiler version and exit";
        "-verbose", Arg.Set verbose, " Print calls to external commands";
        "-w", Arg.String (Warnings.parse_options false),
              "<flags>  Enable or disable warnings according to <flags>:\n\
diff --git a/tools/ocamlcp.ml b/tools/ocamlcp.ml
index baad2256f1..41d97e6e25 100644
--- a/tools/ocamlcp.ml
+++ b/tools/ocamlcp.ml
@@ -65,6 +65,7 @@ module Options = Main_args.Make_options (struct
   let _use_prims s = option_with_arg "-use-prims" s
   let _use_runtime s = option_with_arg "-use-runtime" s
   let _v = option "-v"
+  let _version = option "-version"
   let _verbose = option "-verbose"
   let _w = option_with_arg "-w"
   let _warn_error = option_with_arg "-warn-error"