diff --git a/VERSION b/VERSION index f4fd7dfd7e..e4f27f17f5 100644 --- a/VERSION +++ b/VERSION @@ -1,4 +1,4 @@ -5.2.0+dev11-2024-05-13 +5.2.0 # 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 ce823d03e0..ee406942e0 100755 Binary files a/boot/ocamlc and b/boot/ocamlc differ diff --git a/boot/ocamllex b/boot/ocamllex index 6961e54081..c102ed86f3 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 10e8864a80..5d12d19033 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], [2]) 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], [dev11-2024-05-13]) +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 6ecd3b1190..6dc7cc7517 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.2.0+dev11-2024-05-13. +# Generated by GNU Autoconf 2.71 for OCaml 5.2.0. # # Report bugs to . # @@ -677,8 +677,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='OCaml' PACKAGE_TARNAME='ocaml' -PACKAGE_VERSION='5.2.0+dev11-2024-05-13' -PACKAGE_STRING='OCaml 5.2.0+dev11-2024-05-13' +PACKAGE_VERSION='5.2.0' +PACKAGE_STRING='OCaml 5.2.0' PACKAGE_BUGREPORT='caml-list@inria.fr' PACKAGE_URL='http://www.ocaml.org' @@ -1586,7 +1586,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.2.0+dev11-2024-05-13 to adapt to many kinds of systems. +\`configure' configures OCaml 5.2.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1653,7 +1653,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of OCaml 5.2.0+dev11-2024-05-13:";; + short | recursive ) echo "Configuration of OCaml 5.2.0:";; esac cat <<\_ACEOF @@ -1824,7 +1824,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -OCaml configure 5.2.0+dev11-2024-05-13 +OCaml configure 5.2.0 generated by GNU Autoconf 2.71 Copyright (C) 2021 Free Software Foundation, Inc. @@ -2481,7 +2481,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.2.0+dev11-2024-05-13, which was +It was created by OCaml $as_me 5.2.0, which was generated by GNU Autoconf 2.71. Invocation command line was $ $0$ac_configure_args_raw @@ -3237,8 +3237,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: Configuring OCaml version 5.2.0+dev11-2024-05-13" >&5 -printf "%s\n" "$as_me: Configuring OCaml version 5.2.0+dev11-2024-05-13" >&6;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: Configuring OCaml version 5.2.0" >&5 +printf "%s\n" "$as_me: Configuring OCaml version 5.2.0" >&6;} # Configuration variables @@ -3312,11 +3312,11 @@ unix_directory="" -VERSION=5.2.0+dev11-2024-05-13 +VERSION=5.2.0 -OCAML_DEVELOPMENT_VERSION=true +OCAML_DEVELOPMENT_VERSION=false -OCAML_RELEASE_EXTRA='Some (Plus, "dev11-2024-05-13")' +OCAML_RELEASE_EXTRA=None OCAML_VERSION_MAJOR=5 @@ -3324,7 +3324,7 @@ OCAML_VERSION_MINOR=2 OCAML_VERSION_PATCHLEVEL=0 -OCAML_VERSION_EXTRA=dev11-2024-05-13 +OCAML_VERSION_EXTRA= OCAML_VERSION_SHORT=5.2 @@ -3529,13 +3529,13 @@ printf "%s\n" "#define OCAML_VERSION_MINOR 2" >>confdefs.h printf "%s\n" "#define OCAML_VERSION_PATCHLEVEL 0" >>confdefs.h -printf "%s\n" "#define OCAML_VERSION_ADDITIONAL \"dev11-2024-05-13\"" >>confdefs.h +printf "%s\n" "#define OCAML_VERSION_ADDITIONAL \"\"" >>confdefs.h - printf "%s\n" "#define OCAML_VERSION_EXTRA \"dev11-2024-05-13\"" >>confdefs.h + printf "%s\n" "#define OCAML_VERSION_EXTRA \"\"" >>confdefs.h printf "%s\n" "#define OCAML_VERSION 50200" >>confdefs.h -printf "%s\n" "#define OCAML_VERSION_STRING \"5.2.0+dev11-2024-05-13\"" >>confdefs.h +printf "%s\n" "#define OCAML_VERSION_STRING \"5.2.0\"" >>confdefs.h # Works out how many "o"s are needed in quoted strings @@ -13948,7 +13948,7 @@ else $as_nop fi -case $enable_warn_error,true in #( +case $enable_warn_error,false in #( yes,*|,true) : cc_warnings="$cc_warnings $warn_error_flag" ;; #( *) : @@ -20073,7 +20073,7 @@ fi -case $enable_ocamltest,true in #( +case $enable_ocamltest,false in #( yes,*|,true) : build_ocamltest=true ocamltest_target=ocamltest @@ -21115,7 +21115,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.2.0+dev11-2024-05-13, which was +This file was extended by OCaml $as_me 5.2.0, which was generated by GNU Autoconf 2.71. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -21188,7 +21188,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.2.0+dev11-2024-05-13 +OCaml config.status 5.2.0 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 5014b7f643..aef6c0909b 100644 --- a/ocaml-variants.opam +++ b/ocaml-variants.opam @@ -1,7 +1,7 @@ opam-version: "2.0" -version: "5.2.0+trunk" +version: "5.2.0" license: "LGPL-2.1-or-later WITH OCaml-LGPL-linking-exception" -synopsis: "OCaml 5.2 development version" +synopsis: "Official release of OCaml 5.2.0" maintainer: "caml-list@inria.fr" authors: [ "Xavier Leroy"