From 14b7348eb99da67b40e95e6469f4375d7191e72a Mon Sep 17 00:00:00 2001 From: Florian Angeletti Date: Tue, 6 Dec 2022 14:05:25 +0100 Subject: [PATCH] release 5.0.0~rc1 --- VERSION | 2 +- build-aux/ocaml_version.m4 | 6 +++--- configure | 40 +++++++++++++++++++------------------- ocaml-variants.opam | 4 ++-- 4 files changed, 26 insertions(+), 26 deletions(-) diff --git a/VERSION b/VERSION index 0b17834fb6..70b3cdd254 100644 --- a/VERSION +++ b/VERSION @@ -1,4 +1,4 @@ -5.0.0+dev11-2022-12-6 +5.0.0~rc1 # 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 17bfe4b5ec..cbcc689fe5 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], [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], [dev11-2022-12-6]) +m4_define([OCAML__VERSION_EXTRA], [rc1]) # The OCAML__VERSION_EXTRA_PREFIX macro defined below should be a # single character: @@ -45,7 +45,7 @@ m4_define([OCAML__VERSION_EXTRA], [dev11-2022-12-6]) # and with an empty OCAML__VERSION_EXTRA string; # Or [+] to give more info about this specific version. # Development releases, for instance, should use a [+] prefix. -m4_define([OCAML__VERSION_EXTRA_PREFIX], [+]) +m4_define([OCAML__VERSION_EXTRA_PREFIX], [~]) m4_define([OCAML__VERSION_SHORT], [OCAML__VERSION_MAJOR.OCAML__VERSION_MINOR]) # The OCAML__VERSION below must be in the format specified in stdlib/sys.mli m4_define([OCAML__VERSION], diff --git a/configure b/configure index f7e8c3f955..8860070b70 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.0.0+dev11-2022-12-6. +# Generated by GNU Autoconf 2.71 for OCaml 5.0.0~rc1. # # Report bugs to . # @@ -677,8 +677,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='OCaml' PACKAGE_TARNAME='ocaml' -PACKAGE_VERSION='5.0.0+dev11-2022-12-6' -PACKAGE_STRING='OCaml 5.0.0+dev11-2022-12-6' +PACKAGE_VERSION='5.0.0~rc1' +PACKAGE_STRING='OCaml 5.0.0~rc1' PACKAGE_BUGREPORT='caml-list@inria.fr' PACKAGE_URL='http://www.ocaml.org' @@ -1528,7 +1528,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.0.0+dev11-2022-12-6 to adapt to many kinds of systems. +\`configure' configures OCaml 5.0.0~rc1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1595,7 +1595,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of OCaml 5.0.0+dev11-2022-12-6:";; + short | recursive ) echo "Configuration of OCaml 5.0.0~rc1:";; esac cat <<\_ACEOF @@ -1756,7 +1756,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -OCaml configure 5.0.0+dev11-2022-12-6 +OCaml configure 5.0.0~rc1 generated by GNU Autoconf 2.71 Copyright (C) 2021 Free Software Foundation, Inc. @@ -2413,7 +2413,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.0.0+dev11-2022-12-6, which was +It was created by OCaml $as_me 5.0.0~rc1, which was generated by GNU Autoconf 2.71. Invocation command line was $ $0$ac_configure_args_raw @@ -3169,8 +3169,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: Configuring OCaml version 5.0.0+dev11-2022-12-6" >&5 -printf "%s\n" "$as_me: Configuring OCaml version 5.0.0+dev11-2022-12-6" >&6;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: Configuring OCaml version 5.0.0~rc1" >&5 +printf "%s\n" "$as_me: Configuring OCaml version 5.0.0~rc1" >&6;} # Configuration variables @@ -3221,11 +3221,11 @@ bootstrapping_flexdll=false -VERSION=5.0.0+dev11-2022-12-6 +VERSION=5.0.0~rc1 -OCAML_DEVELOPMENT_VERSION=true +OCAML_DEVELOPMENT_VERSION=false -OCAML_RELEASE_EXTRA='Some (Plus, "dev11-2022-12-6")' +OCAML_RELEASE_EXTRA='Some (Tilde, "rc1")' OCAML_VERSION_MAJOR=5 @@ -3233,7 +3233,7 @@ OCAML_VERSION_MINOR=0 OCAML_VERSION_PATCHLEVEL=0 -OCAML_VERSION_EXTRA=dev11-2022-12-6 +OCAML_VERSION_EXTRA=rc1 OCAML_VERSION_SHORT=5.0 @@ -3365,13 +3365,13 @@ printf "%s\n" "#define OCAML_VERSION_MINOR 0" >>confdefs.h printf "%s\n" "#define OCAML_VERSION_PATCHLEVEL 0" >>confdefs.h -printf "%s\n" "#define OCAML_VERSION_ADDITIONAL \"dev11-2022-12-6\"" >>confdefs.h +printf "%s\n" "#define OCAML_VERSION_ADDITIONAL \"rc1\"" >>confdefs.h - printf "%s\n" "#define OCAML_VERSION_EXTRA \"dev11-2022-12-6\"" >>confdefs.h + printf "%s\n" "#define OCAML_VERSION_EXTRA \"rc1\"" >>confdefs.h printf "%s\n" "#define OCAML_VERSION 50000" >>confdefs.h -printf "%s\n" "#define OCAML_VERSION_STRING \"5.0.0+dev11-2022-12-6\"" >>confdefs.h +printf "%s\n" "#define OCAML_VERSION_STRING \"5.0.0~rc1\"" >>confdefs.h # Works out how many "o"s are needed in quoted strings @@ -13544,7 +13544,7 @@ case $ocaml_cv_cc_vendor in #( cc_warnings='-Wall' ;; esac -case $enable_warn_error,true in #( +case $enable_warn_error,false in #( yes,*|,true) : cc_warnings="$cc_warnings $warn_error_flag" ;; #( *) : @@ -19052,7 +19052,7 @@ fi -case $enable_ocamltest,true in #( +case $enable_ocamltest,false in #( yes,*|,true) : ocamltest='ocamltest' ;; #( *) : @@ -20085,7 +20085,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.0.0+dev11-2022-12-6, which was +This file was extended by OCaml $as_me 5.0.0~rc1, which was generated by GNU Autoconf 2.71. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -20154,7 +20154,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.0.0+dev11-2022-12-6 +OCaml config.status 5.0.0~rc1 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 1368100cbe..760837af4f 100644 --- a/ocaml-variants.opam +++ b/ocaml-variants.opam @@ -1,7 +1,7 @@ opam-version: "2.0" -version: "5.0.0+trunk" +version: "5.0.0~rc1" license: "LGPL-2.1-or-later WITH OCaml-LGPL-linking-exception" -synopsis: "OCaml development version" +synopsis: "First release candidate of OCaml 5.0.0" depends: [ "ocaml" {= "5.0.0" & post} "base-unix" {post}