From 99cb5d93fc30f1a6f3e69f5aa5d2063994d33a93 Mon Sep 17 00:00:00 2001 From: Florian Angeletti Date: Mon, 19 Dec 2022 16:20:13 +0100 Subject: release 4.14.1 --- Changes | 2 +- VERSION | 2 +- boot/ocamlc | Bin 2999142 -> 2999149 bytes boot/ocamllex | Bin 369653 -> 369687 bytes build-aux/ocaml_version.m4 | 4 ++-- configure | 40 ++++++++++++++++++++-------------------- ocaml-variants.opam | 4 ++-- 7 files changed, 26 insertions(+), 26 deletions(-) diff --git a/Changes b/Changes index 7f9d3ffd93..a91fe1ecdb 100644 --- a/Changes +++ b/Changes @@ -1,4 +1,4 @@ -OCaml 4.14 maintenance branch +OCaml 4.14.1 (20 December 2022) ------------------------------ ### Bug fixes: diff --git a/VERSION b/VERSION index e7525fe38e..4d777f2297 100644 --- a/VERSION +++ b/VERSION @@ -1,4 +1,4 @@ -4.14.1+dev3-2022-12-19 +4.14.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 c8ea2f9994..1f7167c520 100755 Binary files a/boot/ocamlc and b/boot/ocamlc differ diff --git a/boot/ocamllex b/boot/ocamllex index 27825a613d..ab79e035ee 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 bcc224eaf6..8c69847c71 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], [14]) 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-2022-12-19]) +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 4a63377c66..2c956effa2 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.14.1+dev3-2022-12-19. +# Generated by GNU Autoconf 2.69 for OCaml 4.14.1. # # Report bugs to . # @@ -646,8 +646,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='OCaml' PACKAGE_TARNAME='ocaml' -PACKAGE_VERSION='4.14.1+dev3-2022-12-19' -PACKAGE_STRING='OCaml 4.14.1+dev3-2022-12-19' +PACKAGE_VERSION='4.14.1' +PACKAGE_STRING='OCaml 4.14.1' PACKAGE_BUGREPORT='caml-list@inria.fr' PACKAGE_URL='http://www.ocaml.org' @@ -1485,7 +1485,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.1+dev3-2022-12-19 to adapt to many kinds of systems. +\`configure' configures OCaml 4.14.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1551,7 +1551,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of OCaml 4.14.1+dev3-2022-12-19:";; + short | recursive ) echo "Configuration of OCaml 4.14.1:";; esac cat <<\_ACEOF @@ -1717,7 +1717,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -OCaml configure 4.14.1+dev3-2022-12-19 +OCaml configure 4.14.1 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2426,7 +2426,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.1+dev3-2022-12-19, which was +It was created by OCaml $as_me 4.14.1, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2775,8 +2775,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ $as_echo "$as_me:${as_lineno-$LINENO}: Configuring OCaml version 4.14.1+dev3-2022-12-19" >&5 -$as_echo "$as_me: Configuring OCaml version 4.14.1+dev3-2022-12-19" >&6;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: Configuring OCaml version 4.14.1" >&5 +$as_echo "$as_me: Configuring OCaml version 4.14.1" >&6;} # Configuration variables @@ -2852,11 +2852,11 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. -VERSION=4.14.1+dev3-2022-12-19 +VERSION=4.14.1 -OCAML_DEVELOPMENT_VERSION=true +OCAML_DEVELOPMENT_VERSION=false -OCAML_RELEASE_EXTRA='Some (Plus, "dev3-2022-12-19")' +OCAML_RELEASE_EXTRA=None OCAML_VERSION_MAJOR=4 @@ -2864,7 +2864,7 @@ OCAML_VERSION_MINOR=14 OCAML_VERSION_PATCHLEVEL=1 -OCAML_VERSION_EXTRA=dev3-2022-12-19 +OCAML_VERSION_EXTRA= OCAML_VERSION_SHORT=4.14 @@ -2986,13 +2986,13 @@ $as_echo "#define OCAML_VERSION_MINOR 14" >>confdefs.h $as_echo "#define OCAML_VERSION_PATCHLEVEL 1" >>confdefs.h -$as_echo "#define OCAML_VERSION_ADDITIONAL \"dev3-2022-12-19\"" >>confdefs.h +$as_echo "#define OCAML_VERSION_ADDITIONAL \"\"" >>confdefs.h - $as_echo "#define OCAML_VERSION_EXTRA \"dev3-2022-12-19\"" >>confdefs.h + $as_echo "#define OCAML_VERSION_EXTRA \"\"" >>confdefs.h $as_echo "#define OCAML_VERSION 41401" >>confdefs.h -$as_echo "#define OCAML_VERSION_STRING \"4.14.1+dev3-2022-12-19\"" >>confdefs.h +$as_echo "#define OCAML_VERSION_STRING \"4.14.1\"" >>confdefs.h # Checks for system types @@ -12760,7 +12760,7 @@ case $ocaml_cv_cc_vendor in #( cc_warnings='-Wall -Wdeclaration-after-statement' ;; esac -case $enable_warn_error,true in #( +case $enable_warn_error,false in #( yes,*|,true) : cc_warnings="$cc_warnings $warn_error_flag" ;; #( *) : @@ -17695,7 +17695,7 @@ fi -case $enable_ocamltest,true in #( +case $enable_ocamltest,false in #( yes,*|,true) : ocamltest='ocamltest' ;; #( *) : @@ -18415,7 +18415,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.1+dev3-2022-12-19, which was +This file was extended by OCaml $as_me 4.14.1, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -18482,7 +18482,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.1+dev3-2022-12-19 +OCaml config.status 4.14.1 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 10b1d06494..e64286c063 100644 --- a/ocaml-variants.opam +++ b/ocaml-variants.opam @@ -1,7 +1,7 @@ opam-version: "2.0" -version: "4.14.1+trunk" +version: "4.14.1" license: "LGPL-2.1-or-later WITH OCaml-LGPL-linking-exception" -synopsis: "OCaml development version" +synopsis: "Official release of OCaml 4.14.1" depends: [ "ocaml" {= "4.14.1" & post} "base-unix" {post} -- cgit v1.2.1