diff options
| -rw-r--r-- | Changes | 27 | ||||
| -rw-r--r-- | VERSION | 2 | ||||
| -rw-r--r-- | build-aux/ocaml_version.m4 | 6 | ||||
| -rwxr-xr-x | configure | 46 | ||||
| -rw-r--r-- | ocaml-variants.opam | 6 |
5 files changed, 56 insertions, 31 deletions
@@ -1,4 +1,29 @@ Working version +--------------- + +### Language features: + +### Runtime system: + +### Code generation and optimizations: + +### Standard library: + +### Other libraries: + +### Tools: + +### Manual and documentation: + +### Compiler user-interface and warnings: + +### Internal/compiler-libs changes: + +### Build system: + +### Bug fixes: + +OCaml 4.14.0 ---------------- ### Language features: @@ -116,7 +141,7 @@ Working version caml/winsupport.h to hold more common code between the runtime, lib-sys, and win32unix. (Antonin Décimo, review by David Allsopp and Xavier Leroy) - + - #10737: add new ephemeron API for forward compatibility with Multicore OCaml. (Damien Doligez, review by Stephen Dolan) @@ -1,4 +1,4 @@ -4.14.0+dev0-2021-06-03 +5.0.0+dev0-2021-10-05 # Starting with OCaml 4.14, although the version string that appears above is # still correct and this file can thus still be used to figure it out, diff --git a/build-aux/ocaml_version.m4 b/build-aux/ocaml_version.m4 index 7c5df90beb..9fc4a0c252 100644 --- a/build-aux/ocaml_version.m4 +++ b/build-aux/ocaml_version.m4 @@ -31,12 +31,12 @@ m4_define([OCAML__DEVELOPMENT_VERSION], [true]) # integers. They MUST NOT be left-padded with zeros and all of them, # including the patchlevel, are mandatory. -m4_define([OCAML__VERSION_MAJOR], [4]) -m4_define([OCAML__VERSION_MINOR], [14]) +m4_define([OCAML__VERSION_MAJOR], [5]) +m4_define([OCAML__VERSION_MINOR], [0]) m4_define([OCAML__VERSION_PATCHLEVEL], [0]) # Note that the OCAML__VERSION_EXTRA string defined below is always empty # for officially-released versions of OCaml. -m4_define([OCAML__VERSION_EXTRA], [dev0-2021-06-03]) +m4_define([OCAML__VERSION_EXTRA], [dev0-2021-10-05]) # The OCAML__VERSION_EXTRA_PREFIX macro defined below should be a # single character: @@ -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.14.0+dev0-2021-06-03. +# Generated by GNU Autoconf 2.69 for OCaml 5.0.0+dev0-2021-10-05. # # 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.14.0+dev0-2021-06-03' -PACKAGE_STRING='OCaml 4.14.0+dev0-2021-06-03' +PACKAGE_VERSION='5.0.0+dev0-2021-10-05' +PACKAGE_STRING='OCaml 5.0.0+dev0-2021-10-05' PACKAGE_BUGREPORT='caml-list@inria.fr' PACKAGE_URL='http://www.ocaml.org' @@ -1486,7 +1486,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.14.0+dev0-2021-06-03 to adapt to many kinds of systems. +\`configure' configures OCaml 5.0.0+dev0-2021-10-05 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1552,7 +1552,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of OCaml 4.14.0+dev0-2021-06-03:";; + short | recursive ) echo "Configuration of OCaml 5.0.0+dev0-2021-10-05:";; esac cat <<\_ACEOF @@ -1716,7 +1716,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -OCaml configure 4.14.0+dev0-2021-06-03 +OCaml configure 5.0.0+dev0-2021-10-05 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2425,7 +2425,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.14.0+dev0-2021-06-03, which was +It was created by OCaml $as_me 5.0.0+dev0-2021-10-05, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2774,8 +2774,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ $as_echo "$as_me:${as_lineno-$LINENO}: Configuring OCaml version 4.14.0+dev0-2021-06-03" >&5 -$as_echo "$as_me: Configuring OCaml version 4.14.0+dev0-2021-06-03" >&6;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: Configuring OCaml version 5.0.0+dev0-2021-10-05" >&5 +$as_echo "$as_me: Configuring OCaml version 5.0.0+dev0-2021-10-05" >&6;} # Configuration variables @@ -2852,21 +2852,21 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. -VERSION=4.14.0+dev0-2021-06-03 +VERSION=5.0.0+dev0-2021-10-05 OCAML_DEVELOPMENT_VERSION=true -OCAML_RELEASE_EXTRA='Some (Plus, "dev0-2021-06-03")' +OCAML_RELEASE_EXTRA='Some (Plus, "dev0-2021-10-05")' -OCAML_VERSION_MAJOR=4 +OCAML_VERSION_MAJOR=5 -OCAML_VERSION_MINOR=14 +OCAML_VERSION_MINOR=0 OCAML_VERSION_PATCHLEVEL=0 -OCAML_VERSION_EXTRA=dev0-2021-06-03 +OCAML_VERSION_EXTRA=dev0-2021-10-05 -OCAML_VERSION_SHORT=4.14 +OCAML_VERSION_SHORT=5.0 # Note: This is present for the flexdll bootstrap where it exposed as the old @@ -2982,19 +2982,19 @@ ac_config_headers="$ac_config_headers runtime/caml/version.h" # Definitions related to the version of OCaml -$as_echo "#define OCAML_VERSION_MAJOR 4" >>confdefs.h +$as_echo "#define OCAML_VERSION_MAJOR 5" >>confdefs.h -$as_echo "#define OCAML_VERSION_MINOR 14" >>confdefs.h +$as_echo "#define OCAML_VERSION_MINOR 0" >>confdefs.h $as_echo "#define OCAML_VERSION_PATCHLEVEL 0" >>confdefs.h -$as_echo "#define OCAML_VERSION_ADDITIONAL \"dev0-2021-06-03\"" >>confdefs.h +$as_echo "#define OCAML_VERSION_ADDITIONAL \"dev0-2021-10-05\"" >>confdefs.h - $as_echo "#define OCAML_VERSION_EXTRA \"dev0-2021-06-03\"" >>confdefs.h + $as_echo "#define OCAML_VERSION_EXTRA \"dev0-2021-10-05\"" >>confdefs.h -$as_echo "#define OCAML_VERSION 41400" >>confdefs.h +$as_echo "#define OCAML_VERSION 50000" >>confdefs.h -$as_echo "#define OCAML_VERSION_STRING \"4.14.0+dev0-2021-06-03\"" >>confdefs.h +$as_echo "#define OCAML_VERSION_STRING \"5.0.0+dev0-2021-10-05\"" >>confdefs.h # Checks for system types @@ -18419,7 +18419,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.14.0+dev0-2021-06-03, which was +This file was extended by OCaml $as_me 5.0.0+dev0-2021-10-05, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -18486,7 +18486,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.14.0+dev0-2021-06-03 +OCaml config.status 5.0.0+dev0-2021-10-05 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 b48ac53d3c..927b8e35af 100644 --- a/ocaml-variants.opam +++ b/ocaml-variants.opam @@ -23,15 +23,15 @@ *) opam-version: "2.0" -version: "4.14.0+domains" +version: "5.0.0+trunk" license: "LGPL-2.1-or-later WITH OCaml-LGPL-linking-exception" -synopsis: "OCaml 4.14.0, with support for multicore domains (dev branch)" +synopsis: "OCaml 5.0.0, with support for multicore domains (dev branch)" maintainer: "kc@kcsrk.info" authors: "Xavier Leroy and many contributors" homepage: "https://github.com/ocaml-multicore/ocaml-multicore" bug-reports: "https://github.com/ocaml-multicore/ocaml-multicore/issues" depends: [ - "ocaml" {= "4.14.0" & post} + "ocaml" {= "5.0.0" & post} "base-unix" {post} "base-bigarray" {post} "base-threads" {post} |