summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Angeletti <florian.angeletti@inria.fr>2020-02-21 14:50:54 +0100
committerFlorian Angeletti <florian.angeletti@inria.fr>2020-02-21 14:50:54 +0100
commit9d2a531ea9738f47d6fe71c6e0a0255dda613f4b (patch)
treecaf6f72135550715c527b614d53460893dc82240
parent787042b29cc9f2ab7b1182bc8cf54b004514bd41 (diff)
downloadocaml-9d2a531ea9738f47d6fe71c6e0a0255dda613f4b.tar.gz
release 4.10.04.10.0
-rw-r--r--VERSION2
-rwxr-xr-xboot/ocamlcbin2682156 -> 2682148 bytes
-rwxr-xr-xboot/ocamllexbin324541 -> 324537 bytes
-rwxr-xr-xconfigure26
-rw-r--r--ocaml-variants.opam2
5 files changed, 15 insertions, 15 deletions
diff --git a/VERSION b/VERSION
index 2f256b5e14..98eeedd784 100644
--- a/VERSION
+++ b/VERSION
@@ -1,4 +1,4 @@
-4.10.0+dev11-2020-02-21
+4.10.0
# The version string is the first line of this file.
# It must be in the format described in stdlib/sys.mli
diff --git a/boot/ocamlc b/boot/ocamlc
index b701900887..71fcc11fb7 100755
--- a/boot/ocamlc
+++ b/boot/ocamlc
Binary files differ
diff --git a/boot/ocamllex b/boot/ocamllex
index 2296aae1b6..fb586c1fed 100755
--- a/boot/ocamllex
+++ b/boot/ocamllex
Binary files differ
diff --git a/configure b/configure
index 11c90da50a..b8f74728f7 100755
--- a/configure
+++ b/configure
@@ -56,7 +56,7 @@ if test -e '.git' ; then :
fi
fi
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for OCaml 4.10.0+dev11-2020-02-21.
+# Generated by GNU Autoconf 2.69 for OCaml 4.10.0.
#
# Report bugs to <caml-list@inria.fr>.
#
@@ -646,8 +646,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='OCaml'
PACKAGE_TARNAME='ocaml'
-PACKAGE_VERSION='4.10.0+dev11-2020-02-21'
-PACKAGE_STRING='OCaml 4.10.0+dev11-2020-02-21'
+PACKAGE_VERSION='4.10.0'
+PACKAGE_STRING='OCaml 4.10.0'
PACKAGE_BUGREPORT='caml-list@inria.fr'
PACKAGE_URL='http://www.ocaml.org'
@@ -1480,7 +1480,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures OCaml 4.10.0+dev11-2020-02-21 to adapt to many kinds of systems.
+\`configure' configures OCaml 4.10.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1546,7 +1546,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of OCaml 4.10.0+dev11-2020-02-21:";;
+ short | recursive ) echo "Configuration of OCaml 4.10.0:";;
esac
cat <<\_ACEOF
@@ -1708,7 +1708,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-OCaml configure 4.10.0+dev11-2020-02-21
+OCaml configure 4.10.0
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2371,7 +2371,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by OCaml $as_me 4.10.0+dev11-2020-02-21, which was
+It was created by OCaml $as_me 4.10.0, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2720,8 +2720,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ $as_echo "$as_me:${as_lineno-$LINENO}: Configuring OCaml version 4.10.0+dev11-2020-02-21" >&5
-$as_echo "$as_me: Configuring OCaml version 4.10.0+dev11-2020-02-21" >&6;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: Configuring OCaml version 4.10.0" >&5
+$as_echo "$as_me: Configuring OCaml version 4.10.0" >&6;}
# Configuration variables
@@ -2797,7 +2797,7 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var.
-VERSION=4.10.0+dev11-2020-02-21
+VERSION=4.10.0
# Note: This is present for the flexdll bootstrap where it exposed as the old
@@ -12461,7 +12461,7 @@ case $ocaml_cv_cc_vendor in #(
msvc-*) :
outputobj=-Fo; gcc_warnings="" ;; #(
*) :
- outputobj='-o $(EMPTY)'; case 4.10.0+dev11-2020-02-21 in #(
+ outputobj='-o $(EMPTY)'; case 4.10.0 in #(
*+dev*) :
gcc_warnings="-Wall -Werror" ;; #(
*) :
@@ -17405,7 +17405,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by OCaml $as_me 4.10.0+dev11-2020-02-21, which was
+This file was extended by OCaml $as_me 4.10.0, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -17472,7 +17472,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-OCaml config.status 4.10.0+dev11-2020-02-21
+OCaml config.status 4.10.0
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff --git a/ocaml-variants.opam b/ocaml-variants.opam
index 9916c862de..2af999ea1a 100644
--- a/ocaml-variants.opam
+++ b/ocaml-variants.opam
@@ -1,5 +1,5 @@
opam-version: "2.0"
-version: "4.10.0+trunk"
+version: "4.10.0"
synopsis: "OCaml development version"
depends: [
"ocaml" {= "4.10.0" & post}