diff options
author | Florian Angeletti <florian.angeletti@inria.fr> | 2022-03-15 10:16:48 +0100 |
---|---|---|
committer | Florian Angeletti <florian.angeletti@inria.fr> | 2022-03-15 10:16:48 +0100 |
commit | cfee1a6f611650b956b6cdc7dcead99647f04de9 (patch) | |
tree | 9d2af0638999537f5904f93c564a8010584395a4 | |
parent | 466023cefb3c66dfb3794e855e549b520d6a9522 (diff) | |
download | ocaml-cfee1a6f611650b956b6cdc7dcead99647f04de9.tar.gz |
increment version number after tagging 4.14.0~rc2
-rw-r--r-- | VERSION | 2 | ||||
-rw-r--r-- | build-aux/ocaml_version.m4 | 4 | ||||
-rwxr-xr-x | configure | 34 | ||||
-rw-r--r-- | ocaml-variants.opam | 4 |
4 files changed, 22 insertions, 22 deletions
@@ -1,4 +1,4 @@ -4.14.0~rc2 +4.14.0+dev12-2022-03-15 # 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 8dd6857347..f24a6e4194 100644 --- a/build-aux/ocaml_version.m4 +++ b/build-aux/ocaml_version.m4 @@ -36,7 +36,7 @@ m4_define([OCAML__VERSION_MINOR], [14]) 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], [rc2]) +m4_define([OCAML__VERSION_EXTRA], [dev12-2022-03-15]) # The OCAML__VERSION_EXTRA_PREFIX macro defined below should be a # single character: @@ -45,7 +45,7 @@ m4_define([OCAML__VERSION_EXTRA], [rc2]) # 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], @@ -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~rc2. +# Generated by GNU Autoconf 2.69 for OCaml 4.14.0+dev12-2022-03-15. # # 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~rc2' -PACKAGE_STRING='OCaml 4.14.0~rc2' +PACKAGE_VERSION='4.14.0+dev12-2022-03-15' +PACKAGE_STRING='OCaml 4.14.0+dev12-2022-03-15' 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~rc2 to adapt to many kinds of systems. +\`configure' configures OCaml 4.14.0+dev12-2022-03-15 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~rc2:";; + short | recursive ) echo "Configuration of OCaml 4.14.0+dev12-2022-03-15:";; esac cat <<\_ACEOF @@ -1718,7 +1718,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -OCaml configure 4.14.0~rc2 +OCaml configure 4.14.0+dev12-2022-03-15 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2427,7 +2427,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~rc2, which was +It was created by OCaml $as_me 4.14.0+dev12-2022-03-15, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2776,8 +2776,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ $as_echo "$as_me:${as_lineno-$LINENO}: Configuring OCaml version 4.14.0~rc2" >&5 -$as_echo "$as_me: Configuring OCaml version 4.14.0~rc2" >&6;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: Configuring OCaml version 4.14.0+dev12-2022-03-15" >&5 +$as_echo "$as_me: Configuring OCaml version 4.14.0+dev12-2022-03-15" >&6;} # Configuration variables @@ -2853,11 +2853,11 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. -VERSION=4.14.0~rc2 +VERSION=4.14.0+dev12-2022-03-15 OCAML_DEVELOPMENT_VERSION=true -OCAML_RELEASE_EXTRA='Some (Tilde, "rc2")' +OCAML_RELEASE_EXTRA='Some (Plus, "dev12-2022-03-15")' OCAML_VERSION_MAJOR=4 @@ -2865,7 +2865,7 @@ OCAML_VERSION_MINOR=14 OCAML_VERSION_PATCHLEVEL=0 -OCAML_VERSION_EXTRA=rc2 +OCAML_VERSION_EXTRA=dev12-2022-03-15 OCAML_VERSION_SHORT=4.14 @@ -2989,13 +2989,13 @@ $as_echo "#define OCAML_VERSION_MINOR 14" >>confdefs.h $as_echo "#define OCAML_VERSION_PATCHLEVEL 0" >>confdefs.h -$as_echo "#define OCAML_VERSION_ADDITIONAL \"rc2\"" >>confdefs.h +$as_echo "#define OCAML_VERSION_ADDITIONAL \"dev12-2022-03-15\"" >>confdefs.h - $as_echo "#define OCAML_VERSION_EXTRA \"rc2\"" >>confdefs.h + $as_echo "#define OCAML_VERSION_EXTRA \"dev12-2022-03-15\"" >>confdefs.h $as_echo "#define OCAML_VERSION 41400" >>confdefs.h -$as_echo "#define OCAML_VERSION_STRING \"4.14.0~rc2\"" >>confdefs.h +$as_echo "#define OCAML_VERSION_STRING \"4.14.0+dev12-2022-03-15\"" >>confdefs.h # Checks for system types @@ -18425,7 +18425,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~rc2, which was +This file was extended by OCaml $as_me 4.14.0+dev12-2022-03-15, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -18492,7 +18492,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~rc2 +OCaml config.status 4.14.0+dev12-2022-03-15 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 75d8e2ab8e..226d5fa1cc 100644 --- a/ocaml-variants.opam +++ b/ocaml-variants.opam @@ -1,7 +1,7 @@ opam-version: "2.0" -version: "4.14.0~rc2" +version: "4.14.0+trunk" license: "LGPL-2.1-or-later WITH OCaml-LGPL-linking-exception" -synopsis: "Second release candidate of OCaml 4.14.0" +synopsis: "OCaml development version" depends: [ "ocaml" {= "4.14.0" & post} "base-unix" {post} |