From 299cbc41f74aa4dd8ddfd14ca9da3a92cff34474 Mon Sep 17 00:00:00 2001 From: Hugo Herbelin Date: Sat, 13 May 2017 22:37:27 +0200 Subject: Fixing an inconsistency between configure and configure.ml. The shell script configure was assuming the existence of option -camldir which was removed in 333d41a9. --- configure.ml | 2 ++ 1 file changed, 2 insertions(+) (limited to 'configure.ml') diff --git a/configure.ml b/configure.ml index 04b04979d..6a78337d4 100644 --- a/configure.ml +++ b/configure.ml @@ -349,6 +349,8 @@ let args_options = Arg.align [ " URL of the coq website"; "-force-caml-version", Arg.Set Prefs.force_caml_version, " Force OCaml version"; + "-camldir", Arg.String (fun _ -> ()), + " Specifies path to ocaml for running configure script"; ] let parse_args () = -- cgit v1.2.3 From 6050b44172660a3285a337896baea35b32e58d47 Mon Sep 17 00:00:00 2001 From: Hugo Herbelin Date: Sun, 14 May 2017 12:21:31 +0200 Subject: Ensure that warnings new from ocaml > 4.01 remains silent. Indeed, 8.6 is announced to be compilable with 4.01.0 and it is convenient not seeing warnings about which nothing can be done. Remove deprecation warnings new from ocaml 4.03, as well as warning 52. This is a partial cherry-pick of a77734ad6. --- configure.ml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'configure.ml') diff --git a/configure.ml b/configure.ml index 04b04979d..caef75271 100644 --- a/configure.ml +++ b/configure.ml @@ -510,6 +510,8 @@ let camltag = match caml_version_list with | x::y::_ -> "OCAML"^x^y | _ -> assert false +let coq_warn_flag = + if caml_version_nums > [4;2;3] then "-w -3-52-56" else "" (** * CamlpX configuration *) @@ -1128,7 +1130,7 @@ let write_makefile f = pr "CAMLHLIB=%S\n\n" camllib; pr "# Caml link command and Caml make top command\n"; pr "# Caml flags\n"; - pr "CAMLFLAGS=-rectypes %s\n" coq_annotate_flag; + pr "CAMLFLAGS=-rectypes %s %s\n" coq_annotate_flag coq_warn_flag; pr "# User compilation flag\n"; pr "USERFLAGS=\n\n"; pr "# Flags for GCC\n"; -- cgit v1.2.3 From 7d5fe4d17b4497c8c986475980bba822c5380acf Mon Sep 17 00:00:00 2001 From: Maxime Dénès Date: Fri, 23 Jun 2017 10:47:56 +0200 Subject: ocaml -> OCaml in configure.ml. --- configure.ml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configure.ml') diff --git a/configure.ml b/configure.ml index 560577f47..fe87d5f09 100644 --- a/configure.ml +++ b/configure.ml @@ -350,7 +350,7 @@ let args_options = Arg.align [ "-force-caml-version", Arg.Set Prefs.force_caml_version, " Force OCaml version"; "-camldir", Arg.String (fun _ -> ()), - " Specifies path to ocaml for running configure script"; + " Specifies path to OCaml for running configure script"; ] let parse_args () = -- cgit v1.2.3 From 4a4a11ef8eec3adf11a474579ca5ab54eb22af93 Mon Sep 17 00:00:00 2001 From: Maxime Dénès Date: Fri, 23 Jun 2017 11:19:40 +0200 Subject: [configure] 'ocaml' is more precise than OCaml as we mean the binary. Fix suggested by Hugo. --- configure.ml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configure.ml') diff --git a/configure.ml b/configure.ml index fe87d5f09..f92aa1cdb 100644 --- a/configure.ml +++ b/configure.ml @@ -350,7 +350,7 @@ let args_options = Arg.align [ "-force-caml-version", Arg.Set Prefs.force_caml_version, " Force OCaml version"; "-camldir", Arg.String (fun _ -> ()), - " Specifies path to OCaml for running configure script"; + " Specifies path to 'ocaml' for running configure script"; ] let parse_args () = -- cgit v1.2.3 From a7163004b16d15950c5053491b4d8ad8dd9c8a33 Mon Sep 17 00:00:00 2001 From: Maxime Dénès Date: Mon, 26 Jun 2017 08:07:20 +0200 Subject: Bump version number to 8.6.1. --- configure.ml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'configure.ml') diff --git a/configure.ml b/configure.ml index f92aa1cdb..bd6cb4805 100644 --- a/configure.ml +++ b/configure.ml @@ -11,8 +11,8 @@ #load "str.cma" open Printf -let coq_version = "8.6" -let coq_macos_version = "8.6.00" (** "[...] should be a string comprised of +let coq_version = "8.6.1" +let coq_macos_version = "8.6.1" (** "[...] should be a string comprised of three non-negative, period-separated integers [...]" *) let vo_magic = 8600 let state_magic = 58600 -- cgit v1.2.3