You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by dc...@apache.org on 2016/07/11 20:44:35 UTC
[1/2] couchdb commit: updated refs/heads/1.6.x to 41304b8
Repository: couchdb
Updated Branches:
refs/heads/1.6.x a7ff2973d -> 41304b839
revert build & docs patches in favour of PR#431
- revert a7ff2973de4cd39638f8639ad1336cc2e6282de2
- revert 8137c2c503712b8af84c7a8c22f7179bd5437506
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/b3186cdb
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/b3186cdb
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/b3186cdb
Branch: refs/heads/1.6.x
Commit: b3186cdb5f6e867487c5559a20c0082816a15a5d
Parents: a7ff297
Author: Dave Cottlehuber <dc...@apache.org>
Authored: Mon Jul 11 22:31:02 2016 +0200
Committer: Dave Cottlehuber <dc...@apache.org>
Committed: Mon Jul 11 22:31:02 2016 +0200
----------------------------------------------------------------------
INSTALL.Unix | 2 +-
INSTALL.Windows | 2 +-
configure.ac | 14 +++++++-------
share/doc/src/install/unix.rst | 2 +-
share/doc/src/install/windows.rst | 2 +-
5 files changed, 11 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/b3186cdb/INSTALL.Unix
----------------------------------------------------------------------
diff --git a/INSTALL.Unix b/INSTALL.Unix
index 435881b..4c63bc8 100644
--- a/INSTALL.Unix
+++ b/INSTALL.Unix
@@ -39,7 +39,7 @@ Dependencies
You should have the following installed:
- * Erlang OTP (>=R14B01, =<R19) (http://erlang.org/)
+ * Erlang OTP (>=R14B01, =<R18) (http://erlang.org/)
* ICU (http://icu-project.org/)
* OpenSSL (http://www.openssl.org/)
* Mozilla SpiderMonkey (1.8.5) (http://www.mozilla.org/js/spidermonkey/)
http://git-wip-us.apache.org/repos/asf/couchdb/blob/b3186cdb/INSTALL.Windows
----------------------------------------------------------------------
diff --git a/INSTALL.Windows b/INSTALL.Windows
index 41fdcef..1ca04fd 100644
--- a/INSTALL.Windows
+++ b/INSTALL.Windows
@@ -29,7 +29,7 @@ Dependencies
You will need the following installed:
- * Erlang OTP (>=14B01, <R19) (http://erlang.org/)
+ * Erlang OTP (>=14B01, <R18) (http://erlang.org/)
* ICU (>=4.*) (http://icu-project.org/)
* OpenSSL (>=0.9.8r) (http://www.openssl.org/)
* Mozilla SpiderMonkey (=1.8.5) (http://www.mozilla.org/js/spidermonkey/)
http://git-wip-us.apache.org/repos/asf/couchdb/blob/b3186cdb/configure.ac
----------------------------------------------------------------------
diff --git a/configure.ac b/configure.ac
index 939b0a2..bf9ffc4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -411,7 +411,7 @@ esac
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Erlang version compatibility" >&5
$as_echo_n "checking Erlang version compatibility... " >&6; }
-erlang_version_error="The installed Erlang version must be >= R14B (erts-5.8.1) and =< 19 (erts-8.0)"
+erlang_version_error="The installed Erlang version must be >= R14B (erts-5.8.1) and =< 18 (erts-7.0)"
version="`${ERL} -version 2>&1 | ${SED} 's/[[^0-9]]/ /g'` 0 0 0"
major_version=`echo $version | ${AWK} "{print \\$1}"`
@@ -419,7 +419,7 @@ minor_version=`echo $version | ${AWK} "{print \\$2}"`
patch_version=`echo $version | ${AWK} "{print \\$3}"`
echo -n "detected Erlang version: $major_version.$minor_version.$patch_version..."
-if test $major_version -lt 5 -o $major_version -gt 8; then
+if test $major_version -lt 5 -o $major_version -gt 7; then
as_fn_error $? "$erlang_version_error major_version does not match" "$LINENO" 5
fi
@@ -449,7 +449,7 @@ has_crypto=`\
if test -n "$has_crypto"; then
AC_MSG_ERROR([Could not find the Erlang crypto library.
-
+
Has Erlang been compiled with OpenSSL support?])
fi
@@ -457,7 +457,7 @@ AC_PATH_PROG([ERLC], [erlc])
if test x${ERLC} = x; then
AC_MSG_ERROR([Could not find the `erlc' executable.
-
+
Is Erlang installed?])
fi
@@ -570,7 +570,7 @@ AC_CHECK_PROG([HAS_PDFLATEX], [pdflatex], [yes])
if test x${HAS_PDFLATEX} = x; then
if test x${strictness_enabled} = xyes; then
AC_MSG_ERROR([Could not find the `pdflatex' executable.
-
+
Is LaTeX installed?])
else
AC_MSG_WARN([You will be unable to regenerate PDF documentation.])
@@ -582,7 +582,7 @@ AC_CHECK_PROG([HAS_MAKEINFO], [makeinfo], [yes])
if test x${HAS_MAKEINFO} = x; then
if test x${strictness_enabled} = xyes; then
AC_MSG_ERROR([Could not find the `makeinfo' executable.
-
+
Is GNU Texinfo installed?])
else
AC_MSG_WARN([You will be unable to regenerate info documentation.])
@@ -594,7 +594,7 @@ AC_CHECK_PROG([HAS_INSTALLINFO], [install-info], [yes])
if test x${HAS_INSTALLINFO} = x; then
if test x${strictness_enabled} = xyes; then
AC_MSG_ERROR([Could not find the `install-info' executable.
-
+
Is GNU Texinfo installed?])
else
AC_MSG_WARN([You will be unable to install info documentation.])
http://git-wip-us.apache.org/repos/asf/couchdb/blob/b3186cdb/share/doc/src/install/unix.rst
----------------------------------------------------------------------
diff --git a/share/doc/src/install/unix.rst b/share/doc/src/install/unix.rst
index b4684fa..904c128 100644
--- a/share/doc/src/install/unix.rst
+++ b/share/doc/src/install/unix.rst
@@ -52,7 +52,7 @@ Dependencies
You should have the following installed:
-* `Erlang OTP (>=R14B01, =<R19) <http://erlang.org/>`_
+* `Erlang OTP (>=R14B01, =<R18) <http://erlang.org/>`_
* `ICU <http://icu-project.org/>`_
* `OpenSSL <http://www.openssl.org/>`_
* `Mozilla SpiderMonkey (1.8.5) <http://www.mozilla.org/js/spidermonkey/>`_
http://git-wip-us.apache.org/repos/asf/couchdb/blob/b3186cdb/share/doc/src/install/windows.rst
----------------------------------------------------------------------
diff --git a/share/doc/src/install/windows.rst b/share/doc/src/install/windows.rst
index 0228550..494ef65 100644
--- a/share/doc/src/install/windows.rst
+++ b/share/doc/src/install/windows.rst
@@ -90,7 +90,7 @@ Dependencies
You should have the following installed:
-* `Erlang OTP (>=14B01, <R19) <http://erlang.org/>`_
+* `Erlang OTP (>=14B01, <R18) <http://erlang.org/>`_
* `ICU (>=4.*) <http://icu-project.org/>`_
* `OpenSSL (>0.9.8r) <http://www.openssl.org/>`_
* `Mozilla SpiderMonkey (=1.8.5) <http://www.mozilla.org/js/spidermonkey/>`_
[2/2] couchdb commit: updated refs/heads/1.6.x to 41304b8
Posted by dc...@apache.org.
build: support OTP-19.0
- add travis support for newer OTP releases
- update docs
- update configure.ac
closes #431
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/41304b83
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/41304b83
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/41304b83
Branch: refs/heads/1.6.x
Commit: 41304b83946f029f9712714cc89e9f630442d668
Parents: b3186cd
Author: Eugene Pirogov <ia...@gmail.com>
Authored: Mon Jul 11 00:38:11 2016 +0300
Committer: Dave Cottlehuber <dc...@apache.org>
Committed: Mon Jul 11 22:42:20 2016 +0200
----------------------------------------------------------------------
.travis.yml | 3 +++
INSTALL.Unix | 2 +-
INSTALL.Windows | 2 +-
configure.ac | 8 ++++----
share/doc/src/install/unix.rst | 2 +-
share/doc/src/install/windows.rst | 2 +-
6 files changed, 11 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/41304b83/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index 1bddb6a..ef19231 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,12 +7,15 @@ before_install:
- sudo apt-get -y install python-pygments python-docutils python-sphinx
before_script: ./bootstrap && ./configure
script:
+ - rm -f erlang-*.tar.bz2
- make distcheck
- cd src/fauxton
- npm install
- grunt test
language: erlang
otp_release:
+ - 19.0
+ - 18.3
- 17.0
- R16B03-1
- R15B03
http://git-wip-us.apache.org/repos/asf/couchdb/blob/41304b83/INSTALL.Unix
----------------------------------------------------------------------
diff --git a/INSTALL.Unix b/INSTALL.Unix
index 4c63bc8..435881b 100644
--- a/INSTALL.Unix
+++ b/INSTALL.Unix
@@ -39,7 +39,7 @@ Dependencies
You should have the following installed:
- * Erlang OTP (>=R14B01, =<R18) (http://erlang.org/)
+ * Erlang OTP (>=R14B01, =<R19) (http://erlang.org/)
* ICU (http://icu-project.org/)
* OpenSSL (http://www.openssl.org/)
* Mozilla SpiderMonkey (1.8.5) (http://www.mozilla.org/js/spidermonkey/)
http://git-wip-us.apache.org/repos/asf/couchdb/blob/41304b83/INSTALL.Windows
----------------------------------------------------------------------
diff --git a/INSTALL.Windows b/INSTALL.Windows
index 1ca04fd..41fdcef 100644
--- a/INSTALL.Windows
+++ b/INSTALL.Windows
@@ -29,7 +29,7 @@ Dependencies
You will need the following installed:
- * Erlang OTP (>=14B01, <R18) (http://erlang.org/)
+ * Erlang OTP (>=14B01, <R19) (http://erlang.org/)
* ICU (>=4.*) (http://icu-project.org/)
* OpenSSL (>=0.9.8r) (http://www.openssl.org/)
* Mozilla SpiderMonkey (=1.8.5) (http://www.mozilla.org/js/spidermonkey/)
http://git-wip-us.apache.org/repos/asf/couchdb/blob/41304b83/configure.ac
----------------------------------------------------------------------
diff --git a/configure.ac b/configure.ac
index bf9ffc4..a6a667a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -411,7 +411,7 @@ esac
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Erlang version compatibility" >&5
$as_echo_n "checking Erlang version compatibility... " >&6; }
-erlang_version_error="The installed Erlang version must be >= R14B (erts-5.8.1) and =< 18 (erts-7.0)"
+erlang_version_error="The installed Erlang version must be >= R14B (erts-5.8.1) and =< 19 (erts-8.0)"
version="`${ERL} -version 2>&1 | ${SED} 's/[[^0-9]]/ /g'` 0 0 0"
major_version=`echo $version | ${AWK} "{print \\$1}"`
@@ -419,7 +419,7 @@ minor_version=`echo $version | ${AWK} "{print \\$2}"`
patch_version=`echo $version | ${AWK} "{print \\$3}"`
echo -n "detected Erlang version: $major_version.$minor_version.$patch_version..."
-if test $major_version -lt 5 -o $major_version -gt 7; then
+if test $major_version -lt 5 -o $major_version -gt 8; then
as_fn_error $? "$erlang_version_error major_version does not match" "$LINENO" 5
fi
@@ -438,9 +438,9 @@ otp_release="`\
AC_SUBST(otp_release)
AM_CONDITIONAL([USE_OTP_NIFS],
- [can_use_nifs=$(echo $otp_release | grep -E "^(R14B|R15|R16|17|18)")])
+ [can_use_nifs=$(echo $otp_release | grep -E "^(R14B|R15|R16|17|18|19)")])
AM_CONDITIONAL([USE_EJSON_COMPARE_NIF],
- [can_use_ejson=$(echo $otp_release | grep -E "^(R14B03|R15|R16|17|18)")])
+ [can_use_ejson=$(echo $otp_release | grep -E "^(R14B03|R15|R16|17|18|19)")])
has_crypto=`\
${ERL} -eval "\
http://git-wip-us.apache.org/repos/asf/couchdb/blob/41304b83/share/doc/src/install/unix.rst
----------------------------------------------------------------------
diff --git a/share/doc/src/install/unix.rst b/share/doc/src/install/unix.rst
index 904c128..b4684fa 100644
--- a/share/doc/src/install/unix.rst
+++ b/share/doc/src/install/unix.rst
@@ -52,7 +52,7 @@ Dependencies
You should have the following installed:
-* `Erlang OTP (>=R14B01, =<R18) <http://erlang.org/>`_
+* `Erlang OTP (>=R14B01, =<R19) <http://erlang.org/>`_
* `ICU <http://icu-project.org/>`_
* `OpenSSL <http://www.openssl.org/>`_
* `Mozilla SpiderMonkey (1.8.5) <http://www.mozilla.org/js/spidermonkey/>`_
http://git-wip-us.apache.org/repos/asf/couchdb/blob/41304b83/share/doc/src/install/windows.rst
----------------------------------------------------------------------
diff --git a/share/doc/src/install/windows.rst b/share/doc/src/install/windows.rst
index 494ef65..0228550 100644
--- a/share/doc/src/install/windows.rst
+++ b/share/doc/src/install/windows.rst
@@ -90,7 +90,7 @@ Dependencies
You should have the following installed:
-* `Erlang OTP (>=14B01, <R18) <http://erlang.org/>`_
+* `Erlang OTP (>=14B01, <R19) <http://erlang.org/>`_
* `ICU (>=4.*) <http://icu-project.org/>`_
* `OpenSSL (>0.9.8r) <http://www.openssl.org/>`_
* `Mozilla SpiderMonkey (=1.8.5) <http://www.mozilla.org/js/spidermonkey/>`_