From 7037e2972828f395962284848ce167545253d910 Mon Sep 17 00:00:00 2001 From: Maxime Dénès Date: Wed, 7 Dec 2016 14:59:14 +0100 Subject: Set version number to 8.6rc1. --- configure.ml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'configure.ml') diff --git a/configure.ml b/configure.ml index b97bf9a71..f1397e676 100644 --- a/configure.ml +++ b/configure.ml @@ -12,10 +12,10 @@ open Printf let coq_version = "8.6beta1" -let coq_macos_version = "8.5.90" (** "[...] should be a string comprised of +let coq_macos_version = "8.6.00" (** "[...] should be a string comprised of three non-negative, period-separated integers [...]" *) -let vo_magic = 8591 -let state_magic = 58591 +let vo_magic = 8600 +let state_magic = 58600 let distributed_exec = ["coqtop";"coqc";"coqchk";"coqdoc";"coqmktop";"coqworkmgr"; "coqdoc";"coq_makefile";"coq-tex";"gallina";"coqwc";"csdpcert";"coqdep"] -- cgit v1.2.3 From d24aaa4d0e45dc3ec31c5f576516b01ded403dd8 Mon Sep 17 00:00:00 2001 From: Maxime Dénès Date: Wed, 7 Dec 2016 16:04:21 +0100 Subject: Commit bumping the version number was partial... The sad part of the story is that the script testing this version number is run after tagging by the coq-dev-tools Makefile... will fix that. --- configure.ml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configure.ml') diff --git a/configure.ml b/configure.ml index f1397e676..f4b18d9f7 100644 --- a/configure.ml +++ b/configure.ml @@ -11,7 +11,7 @@ #load "str.cma" open Printf -let coq_version = "8.6beta1" +let coq_version = "8.6rc1" let coq_macos_version = "8.6.00" (** "[...] should be a string comprised of three non-negative, period-separated integers [...]" *) let vo_magic = 8600 -- cgit v1.2.3 From 0d1438851ba3a0b9f76847abc42f3bf8ad26c4cb Mon Sep 17 00:00:00 2001 From: Maxime Dénès Date: Thu, 8 Dec 2016 15:58:33 +0100 Subject: Set version to 8.6 in configure. --- configure.ml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configure.ml') diff --git a/configure.ml b/configure.ml index f4b18d9f7..99f5ae542 100644 --- a/configure.ml +++ b/configure.ml @@ -11,7 +11,7 @@ #load "str.cma" open Printf -let coq_version = "8.6rc1" +let coq_version = "8.6" let coq_macos_version = "8.6.00" (** "[...] should be a string comprised of three non-negative, period-separated integers [...]" *) let vo_magic = 8600 -- cgit v1.2.3 From 11bdfe88061c5bda160baec625b862a146809024 Mon Sep 17 00:00:00 2001 From: Hugo Herbelin Date: Wed, 4 Jan 2017 19:15:26 +0100 Subject: Fixing another inconsistency when looking for camlp5o when camlp5dir is given. This was not fixed by b9a15a390f yet. --- configure.ml | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) (limited to 'configure.ml') diff --git a/configure.ml b/configure.ml index 99f5ae542..42c2e2785 100644 --- a/configure.ml +++ b/configure.ml @@ -514,6 +514,20 @@ let camltag = match caml_version_list with (** * CamlpX configuration *) (* Convention: we use camldir as a prioritary location for camlpX, if given *) +(* i.e., in the case of camlp5, we search for a copy of camlp5o which *) +(* answers the right camlp5 lib dir *) + +let strip_slash dir = + let n = String.length dir in + if n>0 && dir.[n - 1] = '/' then String.sub dir 0 (n-1) else dir + +let which_camlp5o_for camlp5lib = + let camlp5o = Filename.concat camlbin "camlp5o" in + let camlp5lib = strip_slash camlp5lib in + if fst (tryrun camlp5o ["-where"]) = camlp5lib then camlp5o else + let camlp5o = which "camlp5o" in + if fst (tryrun camlp5o ["-where"]) = camlp5lib then camlp5o else + die ("Error: cannot find Camlp5 binaries corresponding to Camlp5 library " ^ camlp5lib) let which_camlpX base = let file = Filename.concat camlbin base in @@ -528,7 +542,7 @@ let check_camlp5 testcma = match !Prefs.camlp5dir with | Some dir -> if Sys.file_exists (dir/testcma) then let camlp5o = - try which_camlpX "camlp5o" + try which_camlp5o_for dir with Not_found -> die "Error: cannot find Camlp5 binaries in path.\n" in dir, camlp5o else -- cgit v1.2.3 From 5391d15256af65a0ba0ead4ee6d1ec16f7e362cc Mon Sep 17 00:00:00 2001 From: Guillaume Melquiond Date: Thu, 12 Jan 2017 14:03:47 +0100 Subject: Fix configure crash on some version strings of camlp5, e.g. "6.18-exp" (bug #5307). --- configure.ml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configure.ml') diff --git a/configure.ml b/configure.ml index 42c2e2785..04b04979d 100644 --- a/configure.ml +++ b/configure.ml @@ -563,7 +563,7 @@ let check_camlp5 testcma = match !Prefs.camlp5dir with let check_camlp5_version camlp5o = let version_line, _ = run ~err:StdOut camlp5o ["-v"] in let version = List.nth (string_split ' ' version_line) 2 in - match string_split '.' version with + match numeric_prefix_list version with | major::minor::_ when s2i major > 6 || (s2i major, s2i minor) >= (6,6) -> printf "You have Camlp5 %s. Good!\n" version; version | _ -> die "Error: unsupported Camlp5 (version < 6.06 or unrecognized).\n" -- cgit v1.2.3