142 lines
4.7 KiB
Diff
142 lines
4.7 KiB
Diff
From 92c1042e5ba899fca8eed351a7bc210879cdc9d7 Mon Sep 17 00:00:00 2001
|
|
From: Florian Angeletti <florian.angeletti@inria.fr>
|
|
Date: Wed, 24 Jul 2019 14:25:14 +0200
|
|
Subject: [PATCH 1/9] increment version number after tagging 4.08.1+rc2
|
|
|
|
---
|
|
VERSION | 2 +-
|
|
configure | 26 +++++++++++++-------------
|
|
ocaml-variants.opam | 2 +-
|
|
3 files changed, 15 insertions(+), 15 deletions(-)
|
|
|
|
diff --git a/VERSION b/VERSION
|
|
index 9bbc45c85..6be2f109a 100644
|
|
--- a/VERSION
|
|
+++ b/VERSION
|
|
@@ -1,4 +1,4 @@
|
|
-4.08.1+rc2
|
|
+4.08.1+dev4-2019-07-24
|
|
|
|
# The version string is the first line of this file.
|
|
# It must be in the format described in stdlib/sys.mli
|
|
diff --git a/configure b/configure
|
|
index 450374d2d..0de9771d3 100755
|
|
--- a/configure
|
|
+++ b/configure
|
|
@@ -1,6 +1,6 @@
|
|
#! /bin/sh
|
|
# Guess values for system-dependent variables and create Makefiles.
|
|
-# Generated by GNU Autoconf 2.69 for OCaml 4.08.1+rc2.
|
|
+# Generated by GNU Autoconf 2.69 for OCaml 4.08.1+dev4-2019-07-24.
|
|
#
|
|
# Report bugs to <caml-list@inria.fr>.
|
|
#
|
|
@@ -590,8 +590,8 @@ MAKEFLAGS=
|
|
# Identity of this package.
|
|
PACKAGE_NAME='OCaml'
|
|
PACKAGE_TARNAME='ocaml'
|
|
-PACKAGE_VERSION='4.08.1+rc2'
|
|
-PACKAGE_STRING='OCaml 4.08.1+rc2'
|
|
+PACKAGE_VERSION='4.08.1+dev4-2019-07-24'
|
|
+PACKAGE_STRING='OCaml 4.08.1+dev4-2019-07-24'
|
|
PACKAGE_BUGREPORT='caml-list@inria.fr'
|
|
PACKAGE_URL='http://www.ocaml.org'
|
|
|
|
@@ -1430,7 +1430,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.08.1+rc2 to adapt to many kinds of systems.
|
|
+\`configure' configures OCaml 4.08.1+dev4-2019-07-24 to adapt to many kinds of systems.
|
|
|
|
Usage: $0 [OPTION]... [VAR=VALUE]...
|
|
|
|
@@ -1501,7 +1501,7 @@ fi
|
|
|
|
if test -n "$ac_init_help"; then
|
|
case $ac_init_help in
|
|
- short | recursive ) echo "Configuration of OCaml 4.08.1+rc2:";;
|
|
+ short | recursive ) echo "Configuration of OCaml 4.08.1+dev4-2019-07-24:";;
|
|
esac
|
|
cat <<\_ACEOF
|
|
|
|
@@ -1657,7 +1657,7 @@ fi
|
|
test -n "$ac_init_help" && exit $ac_status
|
|
if $ac_init_version; then
|
|
cat <<\_ACEOF
|
|
-OCaml configure 4.08.1+rc2
|
|
+OCaml configure 4.08.1+dev4-2019-07-24
|
|
generated by GNU Autoconf 2.69
|
|
|
|
Copyright (C) 2012 Free Software Foundation, Inc.
|
|
@@ -2320,7 +2320,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.08.1+rc2, which was
|
|
+It was created by OCaml $as_me 4.08.1+dev4-2019-07-24, which was
|
|
generated by GNU Autoconf 2.69. Invocation command line was
|
|
|
|
$ $0 $@
|
|
@@ -2669,8 +2669,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
|
|
|
|
|
|
|
|
-{ $as_echo "$as_me:${as_lineno-$LINENO}: Configuring OCaml version 4.08.1+rc2" >&5
|
|
-$as_echo "$as_me: Configuring OCaml version 4.08.1+rc2" >&6;}
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: Configuring OCaml version 4.08.1+dev4-2019-07-24" >&5
|
|
+$as_echo "$as_me: Configuring OCaml version 4.08.1+dev4-2019-07-24" >&6;}
|
|
|
|
# Configuration variables
|
|
|
|
@@ -2745,7 +2745,7 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var.
|
|
## Output variables
|
|
|
|
|
|
-VERSION=4.08.1+rc2
|
|
+VERSION=4.08.1+dev4-2019-07-24
|
|
|
|
|
|
# Note: This is present for the flexdll bootstrap where it exposed as the old
|
|
@@ -12365,7 +12365,7 @@ case $ocaml_cv_cc_vendor in #(
|
|
msvc-*) :
|
|
outputobj=-Fo; CPP="cl -nologo -EP"; gcc_warnings="" ;; #(
|
|
*) :
|
|
- outputobj='-o $(EMPTY)'; case 4.08.1+rc2 in #(
|
|
+ outputobj='-o $(EMPTY)'; case 4.08.1+dev4-2019-07-24 in #(
|
|
*+dev*) :
|
|
gcc_warnings="-Wall -Werror" ;; #(
|
|
*) :
|
|
@@ -17560,7 +17560,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.08.1+rc2, which was
|
|
+This file was extended by OCaml $as_me 4.08.1+dev4-2019-07-24, which was
|
|
generated by GNU Autoconf 2.69. Invocation command line was
|
|
|
|
CONFIG_FILES = $CONFIG_FILES
|
|
@@ -17627,7 +17627,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.08.1+rc2
|
|
+OCaml config.status 4.08.1+dev4-2019-07-24
|
|
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 dcadf49f8..69b727f5c 100644
|
|
--- a/ocaml-variants.opam
|
|
+++ b/ocaml-variants.opam
|
|
@@ -1,5 +1,5 @@
|
|
opam-version: "2.0"
|
|
-version: "4.08.1+rc2"
|
|
+version: "4.08.1+trunk"
|
|
synopsis: "OCaml development version"
|
|
depends: [
|
|
"ocaml" {= "4.08.1" & post}
|
|
--
|
|
2.22.0.rc3
|
|
|