first commit after branching 4.12

master
Florian Angeletti 2020-10-19 16:16:48 +02:00
parent 24dbb0976a
commit 21c33a53cd
4 changed files with 42 additions and 17 deletions

25
Changes
View File

@ -1,3 +1,28 @@
Working version
----------------
### Language features:
### Runtime system:
### Code generation and optimizations:
### Standard library:
### Other libraries:
### Tools:
### Manual and documentation:
### Compiler user-interface and warnings:
### Internal/compiler-libs changes:
### Build system:
### Bug fixes:
OCaml 4.12.0
------------

View File

@ -1,4 +1,4 @@
4.12.0+dev1-2020-10-19
4.13.0+dev0-2020-10-19
# The version string is the first line of this file.
# It must be in the format described in stdlib/sys.mli

28
configure generated vendored
View File

@ -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.12.0+dev1-2020-10-19.
# Generated by GNU Autoconf 2.69 for OCaml 4.13.0+dev0-2020-10-19.
#
# 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.12.0+dev1-2020-10-19'
PACKAGE_STRING='OCaml 4.12.0+dev1-2020-10-19'
PACKAGE_VERSION='4.13.0+dev0-2020-10-19'
PACKAGE_STRING='OCaml 4.13.0+dev0-2020-10-19'
PACKAGE_BUGREPORT='caml-list@inria.fr'
PACKAGE_URL='http://www.ocaml.org'
@ -1470,7 +1470,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.12.0+dev1-2020-10-19 to adapt to many kinds of systems.
\`configure' configures OCaml 4.13.0+dev0-2020-10-19 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@ -1536,7 +1536,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of OCaml 4.12.0+dev1-2020-10-19:";;
short | recursive ) echo "Configuration of OCaml 4.13.0+dev0-2020-10-19:";;
esac
cat <<\_ACEOF
@ -1692,7 +1692,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
OCaml configure 4.12.0+dev1-2020-10-19
OCaml configure 4.13.0+dev0-2020-10-19
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@ -2401,7 +2401,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.12.0+dev1-2020-10-19, which was
It was created by OCaml $as_me 4.13.0+dev0-2020-10-19, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@ -2750,8 +2750,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
{ $as_echo "$as_me:${as_lineno-$LINENO}: Configuring OCaml version 4.12.0+dev1-2020-10-19" >&5
$as_echo "$as_me: Configuring OCaml version 4.12.0+dev1-2020-10-19" >&6;}
{ $as_echo "$as_me:${as_lineno-$LINENO}: Configuring OCaml version 4.13.0+dev0-2020-10-19" >&5
$as_echo "$as_me: Configuring OCaml version 4.13.0+dev0-2020-10-19" >&6;}
# Configuration variables
@ -2831,7 +2831,7 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var.
VERSION=4.12.0+dev1-2020-10-19
VERSION=4.13.0+dev0-2020-10-19
# Note: This is present for the flexdll bootstrap where it exposed as the old
@ -12624,7 +12624,7 @@ case $ocaml_cv_cc_vendor in #(
cc_warnings='-Wall -Wdeclaration-after-statement' ;;
esac
case $enable_warn_error,4.12.0+dev1-2020-10-19 in #(
case $enable_warn_error,4.13.0+dev0-2020-10-19 in #(
yes,*|,*+dev*) :
cc_warnings="$cc_warnings $warn_error_flag" ;; #(
*) :
@ -16729,7 +16729,7 @@ else
ocamldoc=ocamldoc
fi
case $enable_ocamltest,4.12.0+dev1-2020-10-19 in #(
case $enable_ocamltest,4.13.0+dev0-2020-10-19 in #(
yes,*|,*+dev*) :
ocamltest='ocamltest' ;; #(
*) :
@ -17446,7 +17446,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.12.0+dev1-2020-10-19, which was
This file was extended by OCaml $as_me 4.13.0+dev0-2020-10-19, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@ -17513,7 +17513,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.12.0+dev1-2020-10-19
OCaml config.status 4.13.0+dev0-2020-10-19
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"

View File

@ -1,8 +1,8 @@
opam-version: "2.0"
version: "4.12.0+trunk"
version: "4.13.0+trunk"
synopsis: "OCaml development version"
depends: [
"ocaml" {= "4.12.0" & post}
"ocaml" {= "4.13.0" & post}
"base-unix" {post}
"base-bigarray" {post}
"base-threads" {post}