diff --git a/Changes b/Changes index ad0a828761f9..6150965904c4 100644 --- a/Changes +++ b/Changes @@ -1,5 +1,5 @@ -OCaml 5.1.1 ------------ +OCaml 5.1.1 (8 December 2023) +---------------------------- ### Standard library: diff --git a/VERSION b/VERSION index 8a3b68d08668..e433f739d849 100644 --- a/VERSION +++ b/VERSION @@ -1,4 +1,4 @@ -5.1.1+dev3-2023-12-7 +5.1.1 # 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/boot/ocamlc b/boot/ocamlc index 4fa718de392c..3d7d823a9ed4 100755 Binary files a/boot/ocamlc and b/boot/ocamlc differ diff --git a/boot/ocamllex b/boot/ocamllex index 1bad9980af56..84021bf7c170 100755 Binary files a/boot/ocamllex and b/boot/ocamllex differ diff --git a/build-aux/ocaml_version.m4 b/build-aux/ocaml_version.m4 index 0570cbd02ee7..e05e875137be 100644 --- a/build-aux/ocaml_version.m4 +++ b/build-aux/ocaml_version.m4 @@ -25,7 +25,7 @@ # The following macro, OCAML__DEVELOPMENT_VERSION, should be either # [true] of [false]. -m4_define([OCAML__DEVELOPMENT_VERSION], [true]) +m4_define([OCAML__DEVELOPMENT_VERSION], [false]) # The three following components (major, minor and patch level) MUST be # integers. They MUST NOT be left-padded with zeros and all of them, @@ -36,7 +36,7 @@ m4_define([OCAML__VERSION_MINOR], [1]) m4_define([OCAML__VERSION_PATCHLEVEL], [1]) # Note that the OCAML__VERSION_EXTRA string defined below is always empty # for officially-released versions of OCaml. -m4_define([OCAML__VERSION_EXTRA], [dev3-2023-12-7]) +m4_define([OCAML__VERSION_EXTRA], []) # The OCAML__VERSION_EXTRA_PREFIX macro defined below should be a # single character: diff --git a/configure b/configure index 8d611ff82da0..ede0ff52de4e 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.71 for OCaml 5.1.1+dev3-2023-12-7. +# Generated by GNU Autoconf 2.71 for OCaml 5.1.1. # # Report bugs to . # @@ -677,8 +677,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='OCaml' PACKAGE_TARNAME='ocaml' -PACKAGE_VERSION='5.1.1+dev3-2023-12-7' -PACKAGE_STRING='OCaml 5.1.1+dev3-2023-12-7' +PACKAGE_VERSION='5.1.1' +PACKAGE_STRING='OCaml 5.1.1' PACKAGE_BUGREPORT='caml-list@inria.fr' PACKAGE_URL='http://www.ocaml.org' @@ -1557,7 +1557,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 5.1.1+dev3-2023-12-7 to adapt to many kinds of systems. +\`configure' configures OCaml 5.1.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1624,7 +1624,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of OCaml 5.1.1+dev3-2023-12-7:";; + short | recursive ) echo "Configuration of OCaml 5.1.1:";; esac cat <<\_ACEOF @@ -1786,7 +1786,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -OCaml configure 5.1.1+dev3-2023-12-7 +OCaml configure 5.1.1 generated by GNU Autoconf 2.71 Copyright (C) 2021 Free Software Foundation, Inc. @@ -2443,7 +2443,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 5.1.1+dev3-2023-12-7, which was +It was created by OCaml $as_me 5.1.1, which was generated by GNU Autoconf 2.71. Invocation command line was $ $0$ac_configure_args_raw @@ -3199,8 +3199,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: Configuring OCaml version 5.1.1+dev3-2023-12-7" >&5 -printf "%s\n" "$as_me: Configuring OCaml version 5.1.1+dev3-2023-12-7" >&6;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: Configuring OCaml version 5.1.1" >&5 +printf "%s\n" "$as_me: Configuring OCaml version 5.1.1" >&6;} # Configuration variables @@ -3266,11 +3266,11 @@ ocamltest_unix_include="" -VERSION=5.1.1+dev3-2023-12-7 +VERSION=5.1.1 -OCAML_DEVELOPMENT_VERSION=true +OCAML_DEVELOPMENT_VERSION=false -OCAML_RELEASE_EXTRA='Some (Plus, "dev3-2023-12-7")' +OCAML_RELEASE_EXTRA=None OCAML_VERSION_MAJOR=5 @@ -3278,7 +3278,7 @@ OCAML_VERSION_MINOR=1 OCAML_VERSION_PATCHLEVEL=1 -OCAML_VERSION_EXTRA=dev3-2023-12-7 +OCAML_VERSION_EXTRA= OCAML_VERSION_SHORT=5.1 @@ -3440,13 +3440,13 @@ printf "%s\n" "#define OCAML_VERSION_MINOR 1" >>confdefs.h printf "%s\n" "#define OCAML_VERSION_PATCHLEVEL 1" >>confdefs.h -printf "%s\n" "#define OCAML_VERSION_ADDITIONAL \"dev3-2023-12-7\"" >>confdefs.h +printf "%s\n" "#define OCAML_VERSION_ADDITIONAL \"\"" >>confdefs.h - printf "%s\n" "#define OCAML_VERSION_EXTRA \"dev3-2023-12-7\"" >>confdefs.h + printf "%s\n" "#define OCAML_VERSION_EXTRA \"\"" >>confdefs.h printf "%s\n" "#define OCAML_VERSION 50101" >>confdefs.h -printf "%s\n" "#define OCAML_VERSION_STRING \"5.1.1+dev3-2023-12-7\"" >>confdefs.h +printf "%s\n" "#define OCAML_VERSION_STRING \"5.1.1\"" >>confdefs.h # Works out how many "o"s are needed in quoted strings @@ -13679,7 +13679,7 @@ case $ocaml_cv_cc_vendor in #( -Wold-style-definition" ;; esac -case $enable_warn_error,true in #( +case $enable_warn_error,false in #( yes,*|,true) : cc_warnings="$cc_warnings $warn_error_flag" ;; #( *) : @@ -19478,7 +19478,7 @@ fi -case $enable_ocamltest,true in #( +case $enable_ocamltest,false in #( yes,*|,true) : ocamltest='ocamltest' ;; #( *) : @@ -20502,7 +20502,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 5.1.1+dev3-2023-12-7, which was +This file was extended by OCaml $as_me 5.1.1, which was generated by GNU Autoconf 2.71. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -20571,7 +20571,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config='$ac_cs_config_escaped' ac_cs_version="\\ -OCaml config.status 5.1.1+dev3-2023-12-7 +OCaml config.status 5.1.1 configured by $0, generated by GNU Autoconf 2.71, with options \\"\$ac_cs_config\\" diff --git a/ocaml-variants.opam b/ocaml-variants.opam index 02939d452e6f..7a65950c867d 100644 --- a/ocaml-variants.opam +++ b/ocaml-variants.opam @@ -1,7 +1,7 @@ opam-version: "2.0" -version: "5.1.1+trunk" +version: "5.1.1" license: "LGPL-2.1-or-later WITH OCaml-LGPL-linking-exception" -synopsis: "OCaml development version" +synopsis: "Official release of OCaml 5.1.1" depends: [ "ocaml" {= "5.1.1" & post} "base-unix" {post} diff --git a/runtime/intern.c b/runtime/intern.c index 1ee17c074849..6869fc83e733 100644 --- a/runtime/intern.c +++ b/runtime/intern.c @@ -794,11 +794,6 @@ size_t (*caml_intern_decompress_input)(unsigned char *, const unsigned char *, uintnat) = NULL; -CAMLprim value caml_compression_available(value vunit) -{ - return Val_bool(caml_intern_decompress_input != NULL); -} - static void intern_decompress_input(struct caml_intern_state * s, const char * fun_name, struct marshal_header * h)