summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEugene Pirogov <iamexile@gmail.com>2016-07-11 00:38:11 +0300
committerDave Cottlehuber <dch@apache.org>2016-07-11 22:42:20 +0200
commit41304b83946f029f9712714cc89e9f630442d668 (patch)
treed8f03bd563ebb4e8228a97b649c3b69dd0dbcaf5
parentb3186cdb5f6e867487c5559a20c0082816a15a5d (diff)
downloadcouchdb-41304b83946f029f9712714cc89e9f630442d668.tar.gz
build: support OTP-19.0
- add travis support for newer OTP releases - update docs - update configure.ac closes #431
-rw-r--r--.travis.yml3
-rw-r--r--INSTALL.Unix2
-rw-r--r--INSTALL.Windows2
-rw-r--r--configure.ac8
-rw-r--r--share/doc/src/install/unix.rst2
-rw-r--r--share/doc/src/install/windows.rst2
6 files changed, 11 insertions, 8 deletions
diff --git a/.travis.yml b/.travis.yml
index 1bddb6a99..ef1923190 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
diff --git a/INSTALL.Unix b/INSTALL.Unix
index 4c63bc8e3..435881baa 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/)
diff --git a/INSTALL.Windows b/INSTALL.Windows
index 1ca04fd1e..41fdcef95 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/)
diff --git a/configure.ac b/configure.ac
index bf9ffc444..a6a667a8b 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 "\
diff --git a/share/doc/src/install/unix.rst b/share/doc/src/install/unix.rst
index 904c128f5..b4684fa2e 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/>`_
diff --git a/share/doc/src/install/windows.rst b/share/doc/src/install/windows.rst
index 494ef6517..02285505e 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/>`_