move whyml to the Why3 library

+ do not build src/programs/ + build the library in lib/why3/ + fix use_api.ml for the case when Alt-Ergo is not present + distribute lib/coq/BuiltIn.v + rename src/config to src/why3config + rename src/bench to src/why3bench + move src/config.ml to src/util/

move whyml to the Why3 library
+ do not build src/programs/ + build the library in lib/why3/ + fix use_api.ml for the case when Alt-Ergo is not present + distribute lib/coq/BuiltIn.v + rename src/config to src/why3config + rename src/bench to src/why3bench + move src/config.ml to src/util/
4599fe6b · Andrei Paskevich · 169c7ec1 · 4599fe6b · 4599fe6b · 4599fe6b
Commit 4599fe6b authored Oct 17, 2012 by Andrei Paskevich
42 changed files
--- a/.gitignore
+++ b/.gitignore
@@ -30,12 +30,11 @@ why3.conf
 /why3regtests.err
 /why3regtests.out

-# /lib-ocaml/why3/
-/lib-ocaml/why3/META
-/lib-ocaml/why3/why3.cm*
-/lib-ocaml/why3/why3.a
-/lib-ocaml/why3/why3ml.cm*
-/lib-ocaml/why3/why3ml.a
+# /lib/why3/
+/lib/why3/META
+/lib/why3/why3.cm*
+/lib/why3/why3.a
+/lib/why3/why3.o

 # /bench/
 /bench/programs/good/booleans/
@@ -119,11 +118,6 @@ why3.conf

 # /src/
 /src/config.sh
-/src/config.ml
-/src/coq_config.ml
-/src/*.cma
-/src/*.cmxa
-/src/*.a

 # Coq tactic
 /src/coq-tactic/coqCompat.ml
@@ -153,6 +147,7 @@ pvsbin/
 /src/why3doc/doc_lexer.ml

 # /src/util/
+/src/util/config.ml
 /src/util/rc.ml

 # /src/session

--- a/Makefile.in
+++ b/Makefile.in
--- a/configure.in
+++ b/configure.in
@@ -616,10 +616,10 @@ dnl AC_SUBST(PDFVIEWER)
 # Finally create the Makefile from Makefile.in
 dnl AC_OUTPUT(Makefile)
 AC_CONFIG_FILES(Makefile src/config.sh doc/version.tex)
-AC_CONFIG_FILES(share/provers-detection-data.conf lib-ocaml/why3/META)
+AC_CONFIG_FILES(share/provers-detection-data.conf lib/why3/META)
 AC_CONFIG_COMMANDS([chmod],
 chmod a-w Makefile src/config.sh doc/version.tex;
-chmod a-w share/provers-detection-data.conf lib-ocaml/why3/META;
+chmod a-w share/provers-detection-data.conf lib/why3/META;
 chmod u+x src/config.sh)

 AC_OUTPUT

--- a/examples/runstrat/Makefile
+++ b/examples/runstrat/Makefile
@@ -28,7 +28,7 @@ makejob: makejob.opt
 	@rm -f makejob
 	ln -s makejob.opt makejob

-runstrat.opt runstrat.byte: PACKAGES += why3 why3.ml
+runstrat.opt runstrat.byte: PACKAGES += why3
 runstrat.opt: makeproto.cmx runstrat.ml
 runstrat.byte: makeproto.cmo runstrat.ml


--- a/examples/use_api.ml
+++ b/examples/use_api.ml
@@ -78,27 +78,14 @@ let provers : Whyconf.config_prover Whyconf.Mprover.t =

 (* One prover named Alt-Ergo in the config file *)
 let alt_ergo : Whyconf.config_prover =
-  try
-    let fp = Whyconf.parse_filter_prover "Alt-Ergo" in
-    (** all the prover that have the name "Alt-Ergo" *)
-    let provers = Whyconf.filter_provers config fp in
-    snd (Whyconf.Mprover.choose provers)
-  with Whyconf.ProverNotFound _ ->
+  let fp = Whyconf.parse_filter_prover "Alt-Ergo" in
+  (** all provers that have the name "Alt-Ergo" *)
+  let provers = Whyconf.filter_provers config fp in
+  if Whyconf.Mprover.is_empty provers then begin
    eprintf "Prover Alt-Ergo not installed or not configured@.";
    exit 0
-
-(*
-(* the [prover alt-ergo] section of the config file *)
-let alt_ergo : Whyconf.config_prover =
-  try
-    let prover = {Whyconf.prover_name = "Alt-Ergo";
-                  prover_version = "0.92.3";
-                  prover_altern = ""} in
-    Whyconf.Mprover.find prover provers
-  with Not_found ->
-    eprintf "Prover alt-ergo not installed or not configured@.";
-    exit 0
-*)
+  end else
+    snd (Whyconf.Mprover.choose provers)

 (* builds the environment from the [loadpath] *)
 let env : Env.env = Env.create_env (Whyconf.loadpath main)

--- a/lib-ocaml/why3/META.in
+++ b/lib-ocaml/why3/META.in
-description = "The Why3 Ocaml library"
+description = "Why3 library"
 version = "@VERSION@"
 archive(byte) = "why3.cma"
 archive(native) = "why3.cmxa"
 requires = "str unix num dynlink"
-
-package "ml" (
-  description = "The Why3ML Ocaml library"
-  version = "@VERSION@"
-  archive(byte) = "why3ml.cma"
-  archive(native) = "why3ml.cmxa"
-  requires = "str unix num dynlink why3"
-)
\ No newline at end of file
--- a/lib/why3/why3.ml
+++ b/lib/why3/why3.ml
+(* This file is a stub for ocamldep. Do not delete it. *)
--- a/src/config.sh.in
+++ b/src/config.sh.in
 #!/bin/sh

-config=src/config.ml
+config=src/util/config.ml

 libdir="\"$LIBDIR/why3\""
 datadir="\"$DATADIR/why3\""

--- a/src/bench/bench.ml
+++ b/src/bench/bench.ml
--- a/src/bench/bench.mli
+++ b/src/bench/bench.mli
--- a/src/bench/benchdb.ml
+++ b/src/bench/benchdb.ml
--- a/src/bench/benchdb.mli
+++ b/src/bench/benchdb.mli
--- a/src/bench/benchrc.ml
+++ b/src/bench/benchrc.ml
--- a/src/bench/benchrc.mli
+++ b/src/bench/benchrc.mli
--- a/src/bench/db.ml
+++ b/src/bench/db.ml
--- a/src/bench/db.mli
+++ b/src/bench/db.mli
--- a/src/bench/whybench.ml
+++ b/src/bench/whybench.ml
--- a/src/bench/worker.ml
+++ b/src/bench/worker.ml
--- a/src/config/whyconfig.ml
+++ b/src/config/whyconfig.ml
--- a/src/whyml/mlw_decl.ml
+++ b/src/whyml/mlw_decl.ml
@@ -18,7 +18,6 @@
 (*                                                                        *)
 (**************************************************************************)

-open Why3
 open Util
 open Ident
 open Ty

--- a/src/whyml/mlw_decl.mli
+++ b/src/whyml/mlw_decl.mli
@@ -18,7 +18,6 @@
 (*                                                                        *)
 (**************************************************************************)

-open Why3
 open Ident
 open Ty
 open Term

--- a/src/whyml/mlw_driver.ml
+++ b/src/whyml/mlw_driver.ml
@@ -18,7 +18,6 @@
 (*                                                                        *)
 (**************************************************************************)

-open Why3
 open Util
 open Ident
 open Ty

--- a/src/whyml/mlw_driver.mli
+++ b/src/whyml/mlw_driver.mli
@@ -18,8 +18,6 @@
 (*                                                                        *)
 (**************************************************************************)

-open Why3
-
 type driver = private {
  drv_lib         : Mlw_typing.mlw_library;
  drv_printer     : string option;

--- a/src/whyml/mlw_dtree.ml
+++ b/src/whyml/mlw_dtree.ml
@@ -18,7 +18,6 @@
 (*                                                                        *)
 (**************************************************************************)

-open Why3
 open Mlw_ty
 open Mlw_expr
 open Mlw_dty

--- a/src/whyml/mlw_dty.ml
+++ b/src/whyml/mlw_dty.ml
@@ -20,7 +20,6 @@

 (* destructive types for program type inference *)

-open Why3
 open Ident
 open Ty
 open Term

--- a/src/whyml/mlw_dty.mli
+++ b/src/whyml/mlw_dty.mli
@@ -20,7 +20,6 @@

 (* destructive types for program type inference *)

-open Why3
 open Ident
 open Ty
 open Term

--- a/src/whyml/mlw_expr.ml
+++ b/src/whyml/mlw_expr.ml
@@ -18,7 +18,6 @@
 (*                                                                        *)
 (**************************************************************************)

-open Why3
 open Util
 open Ident
 open Ty

--- a/src/whyml/mlw_expr.mli
+++ b/src/whyml/mlw_expr.mli
@@ -18,7 +18,6 @@
 (*                                                                        *)
 (**************************************************************************)

-open Why3
 open Stdlib
 open Util
 open Ident

--- a/src/whyml/mlw_main.ml
+++ b/src/whyml/mlw_main.ml
@@ -18,7 +18,6 @@
 (*                                                                        *)
 (**************************************************************************)

-open Why3
 open Util
 open Mlw_module


--- a/src/why3.ml
+++ b/src/why3.ml
@@ -18,4 +18,6 @@
 (*                                                                        *)
 (**************************************************************************)

-(* This file is a stub for ocamldep. Do not delete it. *)
+val read_channel : Mlw_module.modul Util.Mstr.t Env.read_format
+
+val library_of_env : Env.env -> Mlw_module.modul Util.Mstr.t Env.library
--- a/src/whyml/mlw_module.ml
+++ b/src/whyml/mlw_module.ml
@@ -18,7 +18,6 @@
 (*                                                                        *)
 (**************************************************************************)

-open Why3
 open Util
 open Ident
 open Ty

--- a/src/whyml/mlw_module.mli
+++ b/src/whyml/mlw_module.mli
@@ -18,7 +18,6 @@
 (*                                                                        *)
 (**************************************************************************)

-open Why3
 open Util
 open Ident
 open Ty

--- a/src/whyml/mlw_ocaml.ml
+++ b/src/whyml/mlw_ocaml.ml
@@ -19,8 +19,8 @@
 (**************************************************************************)

 open Format
-open Why3
 open Pp
+
 open Util
 open Ident
 open Ty

--- a/src/whyml/mlw_ocaml.mli
+++ b/src/whyml/mlw_ocaml.mli
@@ -20,8 +20,6 @@

 (* OCaml program extraction *)

-open Why3
-
 val debug: Debug.flag

 val extract_filename: ?fname:string -> Theory.theory -> string

--- a/src/whyml/mlw_pretty.ml
+++ b/src/whyml/mlw_pretty.ml
@@ -19,8 +19,8 @@
 (**************************************************************************)

 open Format
-open Why3
 open Pp
+
 open Ident
 open Ty
 open Term

--- a/src/whyml/mlw_pretty.mli
+++ b/src/whyml/mlw_pretty.mli
@@ -19,7 +19,7 @@
 (**************************************************************************)

 open Format
-open Why3
+
 open Mlw_ty
 open Mlw_ty.T
 open Mlw_expr

--- a/src/whyml/mlw_ty.ml
+++ b/src/whyml/mlw_ty.ml
@@ -18,7 +18,6 @@
 (*                                                                        *)
 (**************************************************************************)

-open Why3
 open Stdlib
 open Util
 open Ident

--- a/src/whyml/mlw_ty.mli
+++ b/src/whyml/mlw_ty.mli
@@ -18,7 +18,6 @@
 (*                                                                        *)
 (**************************************************************************)

-open Why3
 open Stdlib
 open Ident
 open Ty

--- a/src/whyml/mlw_typing.ml
+++ b/src/whyml/mlw_typing.ml
@@ -18,7 +18,6 @@
 (*                                                                        *)
 (**************************************************************************)

-open Why3
 open Util
 open Ident
 open Ty

--- a/src/whyml/mlw_typing.mli
+++ b/src/whyml/mlw_typing.mli
@@ -18,7 +18,6 @@
 (*                                                                        *)
 (**************************************************************************)

-open Why3
 open Util
 open Theory
 open Env

--- a/src/whyml/mlw_wp.ml
+++ b/src/whyml/mlw_wp.ml
@@ -18,7 +18,6 @@
 (*                                                                        *)
 (**************************************************************************)

-open Why3
 open Util
 open Ident
 open Ty

--- a/src/whyml/mlw_wp.mli
+++ b/src/whyml/mlw_wp.mli
@@ -18,7 +18,6 @@
 (*                                                                        *)
 (**************************************************************************)

-open Why3
 open Theory
 open Mlw_ty
 open Mlw_ty.T