You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by kx...@apache.org on 2015/11/12 00:07:13 UTC
[01/50] couchdb commit: updated refs/heads/2876-js-tests to bd19653
Repository: couchdb
Updated Branches:
refs/heads/2876-js-tests 805a427b0 -> bd19653c6
Test against Erlang 18.1 on Travis
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/ae954416
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/ae954416
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/ae954416
Branch: refs/heads/2876-js-tests
Commit: ae9544168538fd872955d77f94fd9cad571e5aec
Parents: c6b9e74
Author: Alexander Shorin <kx...@apache.org>
Authored: Wed Oct 14 19:58:48 2015 +0300
Committer: Alexander Shorin <kx...@apache.org>
Committed: Wed Oct 14 19:58:48 2015 +0300
----------------------------------------------------------------------
.travis.yml | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/ae954416/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index 9e0f818..920a8ee 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,6 +8,7 @@ script:
- ./run-tests.sh
language: erlang
otp_release:
+ - 18.1
- 18.0
- 17.5
- R16B03-1
[08/50] couchdb commit: updated refs/heads/2876-js-tests to bd19653
Posted by kx...@apache.org.
Fix multipart stream refactor
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/af6fb4f6
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/af6fb4f6
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/af6fb4f6
Branch: refs/heads/2876-js-tests
Commit: af6fb4f6b1be2b8203f124ca0596dbbc8515cef8
Parents: 633b851
Author: Alexander Shorin <kx...@apache.org>
Authored: Thu Oct 15 22:50:27 2015 +0300
Committer: Alexander Shorin <kx...@apache.org>
Committed: Thu Oct 15 22:50:27 2015 +0300
----------------------------------------------------------------------
rebar.config.script | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/af6fb4f6/rebar.config.script
----------------------------------------------------------------------
diff --git a/rebar.config.script b/rebar.config.script
index 29a15e9..69e5105 100644
--- a/rebar.config.script
+++ b/rebar.config.script
@@ -34,7 +34,7 @@ DepDescs = [
{couch, "couch", "b5e7e54faba5bc06ebd76cd64b0dd5e2c1d06f0c"},
{couch_index, "couch-index", "14f579dcd142ee90300244c854b301bbd5c863ee"},
{couch_mrview, "couch-mrview", "f089832ea7f759b4e655051025cc48522fee9e1b"},
-{couch_replicator, "couch-replicator", "36e5beccd661158260c3985ae0b5f439022ab15b"},
+{couch_replicator, "couch-replicator", "219f5d181a4effbd82c2c38ca3244a214d5552d5"},
{couch_plugins, "couch-plugins", "3e73b723cb126cfc471b560d17c24a8b5c540085"},
{couch_event, "couch-event", "835a41885d1e276d207758954f8238aa7bba0ae8"},
{couch_stats, "couch-stats", "7895d4d3f509ed24f09b6d1a0bd0e06af34551dc"},
[09/50] couchdb commit: updated refs/heads/2876-js-tests to bd19653
Posted by kx...@apache.org.
Fix multipart stream refactor
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/da7176b3
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/da7176b3
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/da7176b3
Branch: refs/heads/2876-js-tests
Commit: da7176b302bb55c8b94648f80eeb0293d3d76a76
Parents: af6fb4f
Author: Alexander Shorin <kx...@apache.org>
Authored: Thu Oct 15 22:54:06 2015 +0300
Committer: Alexander Shorin <kx...@apache.org>
Committed: Thu Oct 15 22:54:06 2015 +0300
----------------------------------------------------------------------
rebar.config.script | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/da7176b3/rebar.config.script
----------------------------------------------------------------------
diff --git a/rebar.config.script b/rebar.config.script
index 69e5105..c0f228a 100644
--- a/rebar.config.script
+++ b/rebar.config.script
@@ -30,7 +30,7 @@ DepDescs = [
{couch_log, "couch-log", "fb4157370403c4c97f19d958a51c889950a66a94"},
{couch_log_lager, "couch-log-lager", "b2a0471a87765de50c5eb05c65c121f68a9ae9fa"},
{config, "config", "b2ecd0d47a776256956ce045123423494ff85e8e"},
-{chttpd, "chttpd", "465f29c45aeb6dc4aff27a6e711bfc5bff9d2f3e"},
+{chttpd, "chttpd", "c3fcf881fbb48c4633bcdcc38596a9963f519ceb"},
{couch, "couch", "b5e7e54faba5bc06ebd76cd64b0dd5e2c1d06f0c"},
{couch_index, "couch-index", "14f579dcd142ee90300244c854b301bbd5c863ee"},
{couch_mrview, "couch-mrview", "f089832ea7f759b4e655051025cc48522fee9e1b"},
[14/50] couchdb commit: updated refs/heads/2876-js-tests to bd19653
Posted by kx...@apache.org.
Increase eunit test timeout for couch_replication compaction tests
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/7bb2573b
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/7bb2573b
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/7bb2573b
Branch: refs/heads/2876-js-tests
Commit: 7bb2573b630af1aa2fc71c11b9d9b538ae1c5b67
Parents: 9c48e43
Author: Alexander Shorin <kx...@apache.org>
Authored: Fri Oct 16 23:50:39 2015 +0300
Committer: Alexander Shorin <kx...@apache.org>
Committed: Fri Oct 16 23:50:39 2015 +0300
----------------------------------------------------------------------
rebar.config.script | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/7bb2573b/rebar.config.script
----------------------------------------------------------------------
diff --git a/rebar.config.script b/rebar.config.script
index 61e5e63..b3eb401 100644
--- a/rebar.config.script
+++ b/rebar.config.script
@@ -34,7 +34,7 @@ DepDescs = [
{couch, "couch", "79b5243aef9fc722c86fb1d7988a401babd9540c"},
{couch_index, "couch-index", "14f579dcd142ee90300244c854b301bbd5c863ee"},
{couch_mrview, "couch-mrview", "f089832ea7f759b4e655051025cc48522fee9e1b"},
-{couch_replicator, "couch-replicator", "f02919206e97f9adc7d6379accd0c406dccf2118"},
+{couch_replicator, "couch-replicator", "56422436762c8fa3cc4081311f9a10ea06826443"},
{couch_plugins, "couch-plugins", "3e73b723cb126cfc471b560d17c24a8b5c540085"},
{couch_event, "couch-event", "835a41885d1e276d207758954f8238aa7bba0ae8"},
{couch_stats, "couch-stats", "7895d4d3f509ed24f09b6d1a0bd0e06af34551dc"},
[39/50] couchdb commit: updated refs/heads/2876-js-tests to bd19653
Posted by kx...@apache.org.
Add couch_epi:decide/5 and use it for authenticate/authorize
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/bd07317a
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/bd07317a
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/bd07317a
Branch: refs/heads/2876-js-tests
Commit: bd07317af994394a355293590f11763e99246258
Parents: 33cebff
Author: Alexander Shorin <kx...@apache.org>
Authored: Tue Oct 27 22:37:28 2015 +0300
Committer: Alexander Shorin <kx...@apache.org>
Committed: Tue Oct 27 22:39:22 2015 +0300
----------------------------------------------------------------------
rebar.config.script | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/bd07317a/rebar.config.script
----------------------------------------------------------------------
diff --git a/rebar.config.script b/rebar.config.script
index 4efd614..c565e88 100644
--- a/rebar.config.script
+++ b/rebar.config.script
@@ -23,14 +23,14 @@ os:putenv("COUCHDB_APPS_CONFIG_DIR", filename:join([COUCHDB_ROOT, "rel/apps"])).
DepDescs = [
%% must be compiled first as it has a custom behavior
-{couch_epi, "couch-epi", "77dfaf413be31b98de59ef3fe995cc3da5d338d2"},
+{couch_epi, "couch-epi", "807aa3f58e39f1273e732020c80d630d9177790c"},
%% keep these sorted
{b64url, "b64url", "319fc604235ab1fde37047b38a432450161db750"},
{cassim, "cassim", "1ae21f7c415acf3d1aba8b4924ca3093014b86b1"},
{couch_log, "couch-log", "fb4157370403c4c97f19d958a51c889950a66a94"},
{couch_log_lager, "couch-log-lager", "b2a0471a87765de50c5eb05c65c121f68a9ae9fa"},
{config, "config", "b2ecd0d47a776256956ce045123423494ff85e8e"},
-{chttpd, "chttpd", "038a933a09ad90c814e39b0327463aca1b194982"},
+{chttpd, "chttpd", "06880c35d7812bcfae0861e3f9e08366d550e1cb"},
{couch, "couch", "acfd7cb0c709345f396cbcb696b6305091dfac12"},
{couch_index, "couch-index", "14f579dcd142ee90300244c854b301bbd5c863ee"},
{couch_mrview, "couch-mrview", "2ec52eb3d8e187f5e9dfcaf8ab0dff55e40cd647"},
[07/50] couchdb commit: updated refs/heads/2876-js-tests to bd19653
Posted by kx...@apache.org.
Fix references for "Refactor multipart stream" commit
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/633b8516
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/633b8516
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/633b8516
Branch: refs/heads/2876-js-tests
Commit: 633b85169b9294d89bf24f06eefa19f2c8d3296a
Parents: 03b12f9
Author: Alexander Shorin <kx...@apache.org>
Authored: Thu Oct 15 20:01:28 2015 +0300
Committer: Alexander Shorin <kx...@apache.org>
Committed: Thu Oct 15 20:01:28 2015 +0300
----------------------------------------------------------------------
rebar.config.script | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/633b8516/rebar.config.script
----------------------------------------------------------------------
diff --git a/rebar.config.script b/rebar.config.script
index 25265ff..29a15e9 100644
--- a/rebar.config.script
+++ b/rebar.config.script
@@ -30,11 +30,11 @@ DepDescs = [
{couch_log, "couch-log", "fb4157370403c4c97f19d958a51c889950a66a94"},
{couch_log_lager, "couch-log-lager", "b2a0471a87765de50c5eb05c65c121f68a9ae9fa"},
{config, "config", "b2ecd0d47a776256956ce045123423494ff85e8e"},
-{chttpd, "chttpd", "f8f5d7fcd506b53be170c587ee3bd38f7433bc2f"},
+{chttpd, "chttpd", "465f29c45aeb6dc4aff27a6e711bfc5bff9d2f3e"},
{couch, "couch", "b5e7e54faba5bc06ebd76cd64b0dd5e2c1d06f0c"},
{couch_index, "couch-index", "14f579dcd142ee90300244c854b301bbd5c863ee"},
{couch_mrview, "couch-mrview", "f089832ea7f759b4e655051025cc48522fee9e1b"},
-{couch_replicator, "couch-replicator", "b88601bf974b9537d8fc0e94e86cc072d9a5f449"},
+{couch_replicator, "couch-replicator", "36e5beccd661158260c3985ae0b5f439022ab15b"},
{couch_plugins, "couch-plugins", "3e73b723cb126cfc471b560d17c24a8b5c540085"},
{couch_event, "couch-event", "835a41885d1e276d207758954f8238aa7bba0ae8"},
{couch_stats, "couch-stats", "7895d4d3f509ed24f09b6d1a0bd0e06af34551dc"},
[05/50] couchdb commit: updated refs/heads/2876-js-tests to bd19653
Posted by kx...@apache.org.
Refactor multipart stream
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/5174b86a
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/5174b86a
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/5174b86a
Branch: refs/heads/2876-js-tests
Commit: 5174b86ae46119e6249330ed080eb9307ff6d217
Parents: 972014b
Author: Alexander Shorin <kx...@apache.org>
Authored: Thu Oct 15 19:38:38 2015 +0300
Committer: Alexander Shorin <kx...@apache.org>
Committed: Thu Oct 15 19:38:38 2015 +0300
----------------------------------------------------------------------
rebar.config.script | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/5174b86a/rebar.config.script
----------------------------------------------------------------------
diff --git a/rebar.config.script b/rebar.config.script
index 1d687e9..63e73b0 100644
--- a/rebar.config.script
+++ b/rebar.config.script
@@ -30,11 +30,11 @@ DepDescs = [
{couch_log, "couch-log", "fb4157370403c4c97f19d958a51c889950a66a94"},
{couch_log_lager, "couch-log-lager", "b2a0471a87765de50c5eb05c65c121f68a9ae9fa"},
{config, "config", "b2ecd0d47a776256956ce045123423494ff85e8e"},
-{chttpd, "chttpd", "76831000a6ea31313ea634d6b4ac2142e5f4a8e5"},
-{couch, "couch", "1aec9a4a906798005582987ac1963aebf0f5955f"},
+{chttpd, "chttpd", "f8f5d7fcd506b53be170c587ee3bd38f7433bc2f"},
+{couch, "couch", "92598cd33abca43e9d1d2e30057b47e207313ad3"},
{couch_index, "couch-index", "14f579dcd142ee90300244c854b301bbd5c863ee"},
{couch_mrview, "couch-mrview", "f089832ea7f759b4e655051025cc48522fee9e1b"},
-{couch_replicator, "couch-replicator", "85d62d1e2b72250c329b4b10db4df1231e647933"},
+{couch_replicator, "couch-replicator", "b88601bf974b9537d8fc0e94e86cc072d9a5f449"},
{couch_plugins, "couch-plugins", "3e73b723cb126cfc471b560d17c24a8b5c540085"},
{couch_event, "couch-event", "835a41885d1e276d207758954f8238aa7bba0ae8"},
{couch_stats, "couch-stats", "7895d4d3f509ed24f09b6d1a0bd0e06af34551dc"},
[50/50] couchdb commit: updated refs/heads/2876-js-tests to bd19653
Posted by kx...@apache.org.
Merge branch 'master' into 2876-js-tests
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/bd19653c
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/bd19653c
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/bd19653c
Branch: refs/heads/2876-js-tests
Commit: bd19653c6e588ccb647f955d52524bda90d61efb
Parents: 805a427 486181f
Author: Alexander Shorin <kx...@apache.org>
Authored: Thu Nov 12 02:03:42 2015 +0300
Committer: Alexander Shorin <kx...@apache.org>
Committed: Thu Nov 12 02:03:42 2015 +0300
----------------------------------------------------------------------
.gitignore | 1 +
.travis.yml | 11 +-
INSTALL.Unix.md | 4 +-
INSTALL.Windows.md | 2 +-
LICENSE | 24 +++
Makefile | 308 ++++++++++++++++++++++++--------
NOTICE | 6 +-
README-DEV.md | 190 --------------------
README-DEV.rst | 247 +++++++++++++++++++++++++
build-aux/couchdb-build-release.sh | 9 +-
configure | 18 +-
dev/run | 21 ++-
rebar.config.script | 39 ++--
rel/files/eunit.config | 32 ++++
rel/files/sys.config | 2 +-
rel/overlay/etc/default.ini | 5 +
run-tests.sh | 9 -
17 files changed, 608 insertions(+), 320 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/bd19653c/Makefile
----------------------------------------------------------------------
diff --cc Makefile
index 79b717a,3387232..614280c
--- a/Makefile
+++ b/Makefile
@@@ -19,34 -19,178 +19,188 @@@ COUCHDB_VERSION = $(vsn_major).$(vsn_mi
DESTDIR=
+ # Rebar options
+ apps=
+ skip_deps=folsom,lager,meck,mochiweb,proper,snappy
+ suites=
+ tests=
+
+ EUNIT_OPTS=$(shell echo "\
+ apps=$(apps) \
+ skip_deps=$(skip_deps) \
+ suites=$(suites) \
+ tests=$(tests) \
+ " | sed -e 's/[a-z]\+= / /g')
+ DIALYZE_OPTS=$(shell echo "\
+ apps=$(apps) \
+ skip_deps=$(skip_deps) \
+ " | sed -e 's/[a-z]\+= / /g')
+
+
+ ################################################################################
+ # Main commands
+ ################################################################################
+
+
+ .PHONY: all
+ # target: all - Build everything
all: couch fauxton docs
- config.erl:
- @echo "Apache CouchDB has not been configured."
- @echo "Try \"./configure -h\" for help."
- @echo
- @false
+ .PHONY: help
+ # target: help - Print this help
+ help:
+ @egrep "^# target: " Makefile \
+ | sed -e 's/^# target: //g' \
+ | sort \
+ | awk '{printf(" %-20s", $$1); $$1=$$2=""; print "-" $$0}'
+
+
+ ################################################################################
+ # Building
+ ################################################################################
+
+
+ .PHONY: couch
+ # target: couch - Build CouchDB core
couch: config.erl
- @${REBAR} compile
+ @$(REBAR) compile
@cp src/couch/priv/couchjs bin/
- clean:
- @${REBAR} -r clean
- @rm -f bin/couchjs
- @rm -rf src/*/ebin
- @rm -rf src/*/.rebar
- @rm -rf src/*/priv/*.so
- @rm -rf src/couch/priv/{couchspawnkillable,couchjs}
- @rm -rf share/server/main.js share/server/main-coffee.js
- @rm -rf tmp dev/data dev/lib dev/logs
- @rm -f src/couch/priv/couchspawnkillable
- @rm -f src/couch/priv/couch_js/config.h
- @rm -f dev/boot_node.beam dev/pbkdf2.pyc log/crash.log
- check: javascript eunit build-test
+ .PHONY: docs
+ # target: docs - Build documentation
+ docs: src/docs/build
+
+
+ .PHONY: fauxton
+ # target: fauxton - Build Fauxton web UI
+ fauxton: share/www
+
+
+ ################################################################################
+ # Testing
+ ################################################################################
+
+
+ .PHONY: check
+ # target: check - Test everything
+ check:
+ @$(MAKE) eunit
+ @$(MAKE) javascript
+ @$(MAKE) build-test
+
+
+ .PHONY: eunit
+ # target: eunit - Run EUnit tests, use EUNIT_OPTS to provide custom options
+ eunit: export BUILDDIR = $(shell pwd)
+ eunit: export ERL_AFLAGS = -config $(shell pwd)/rel/files/eunit.config
+ eunit: couch
+ @$(REBAR) setup_eunit 2> /dev/null
+ @$(REBAR) -r eunit $(EUNIT_OPTS)
+
+
+ .PHONY: javascript
+ # target: javascript - Run JavaScript test suites or specific ones defined by suites option
-javascript: all share/www/script/test
- @dev/run -q --with-admin-party-please test/javascript/run $(suites)
++javascript: all
++ @mkdir -p share/www/test
++ifeq ($(IN_RELEASE), true)
++ @cp test/javascript/tests/lorem*.txt share/www/test/
++else
++ # FIXME: strange path ahead!
++ @mkdir -p src/fauxton/dist/release/test
++ @cp test/javascript/tests/lorem*.txt src/fauxton/dist/release/test/
++endif
++ # 2 remedy problems w/ "internal server error" remove dev/lib
++ @dev/run -q --with-admin-party-please test/javascript/run
++ @rm -rf share/www/script
+
+
+ .PHONY: list-eunit-apps
+ # target: list-eunit-apps - List EUnit target apps
+ list-eunit-apps:
+ @find ./src/ -type f -name *_test.erl -o -name *_tests.erl \
+ | cut -d '/' -f 3 \
+ | sort -u
+
+
+ .PHONY: list-eunit-suites
+ # target: list-eunit-suites - List EUnit target test suites
+ list-eunit-suites:
+ @find ./src/ -type f -name *_test.erl -o -name *_tests.erl -printf "%f\n" \
+ | cut -d '.' -f -1 \
+ | sort
+
+
+ .PHONY: list-js-suites
+ # target: list-js-suites - List JavaScript test suites
+ list-js-suites:
+ @find ./test/javascript/tests/ -type f -name *.js -printf "%f\n" \
+ | cut -d '.' -f -1 \
+ | sort
+
+
+ .PHONY: build-test
+ # target: build-test - Test build script
+ build-test:
+ @test/build/test-configure.sh
+
+
+ ################################################################################
+ # Developing
+ ################################################################################
+
+
+ .PHONY: build-plt
+ # target: build-plt - Build project-specific PLT
+ build-plt:
+ @$(REBAR) -r build-plt $(DIALYZE_OPTS)
+
+
+ .PHONY: check-plt
+ # target: check-plt - Check the PLT for consistency and rebuild it if it is not up-to-date
+ check-plt:
+ @$(REBAR) -r check-plt $(DIALYZE_OPTS)
+
+
+ .PHONY: dialyze
+ # target: dialyze - Analyze the code for discrepancies
+ dialyze: .rebar
+ @$(REBAR) -r dialyze $(DIALYZE_OPTS)
+
+
+ .PHONY: docker-image
+ # target: docker-image - Build Docker image
+ docker-image:
+ @docker build --rm -t couchdb/dev-cluster .
+
+
+ .PHONY: docker-start
+ # target: docker-start - Start CouchDB in Docker container
+ docker-start:
+ @docker run -d -P -t couchdb/dev-cluster > .docker-id
+
+
+ .PHONY: docker-stop
+ # target: docker-stop - Stop Docker container
+ docker-stop:
+ @docker stop `cat .docker-id`
+
+
+ .PHONY: introspect
+ # target: introspect - Check for commits difference between rebar.config and repository
+ introspect:
+ @$(REBAR) -r update-deps
+ @./introspect
+
+
+ ################################################################################
+ # Distributing
+ ################################################################################
- # creates a full erlang release
+
+ .PHONY: dist
+ # target: dist - Make release tarball
dist: all
@./build-aux/couchdb-build-release.sh $(COUCHDB_VERSION)
@@@ -190,8 -341,9 +351,3 @@@ ifeq ($(with_fauxton), 1
@echo "Building Fauxton"
@cd src/fauxton && npm install && ./node_modules/grunt-cli/bin/grunt couchdb
endif
--
- .PHONY: introspect
- introspect:
- ${REBAR} -r update-deps
- ./introspect
-
-share/www/script/test:
- @# TODO: Fix tests to look for these files in their new path
- @mkdir -p $@
- @cp test/javascript/tests/lorem*.txt share/www/script/test/
[36/50] couchdb commit: updated refs/heads/2876-js-tests to bd19653
Posted by kx...@apache.org.
Fix replication when source/target are URLs
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/35d8b83f
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/35d8b83f
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/35d8b83f
Branch: refs/heads/2876-js-tests
Commit: 35d8b83f15de0316305f3e8628c9af5efed50392
Parents: 45a6c5d
Author: Alexander Shorin <kx...@apache.org>
Authored: Tue Oct 27 16:28:29 2015 +0300
Committer: Alexander Shorin <kx...@apache.org>
Committed: Tue Oct 27 16:29:04 2015 +0300
----------------------------------------------------------------------
rebar.config.script | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/35d8b83f/rebar.config.script
----------------------------------------------------------------------
diff --git a/rebar.config.script b/rebar.config.script
index 81eb943..65d99c5 100644
--- a/rebar.config.script
+++ b/rebar.config.script
@@ -30,7 +30,7 @@ DepDescs = [
{couch_log, "couch-log", "fb4157370403c4c97f19d958a51c889950a66a94"},
{couch_log_lager, "couch-log-lager", "b2a0471a87765de50c5eb05c65c121f68a9ae9fa"},
{config, "config", "b2ecd0d47a776256956ce045123423494ff85e8e"},
-{chttpd, "chttpd", "7a2bd8f31d4801d86cef0243d91d20a4c9ccbc22"},
+{chttpd, "chttpd", "038a933a09ad90c814e39b0327463aca1b194982"},
{couch, "couch", "acfd7cb0c709345f396cbcb696b6305091dfac12"},
{couch_index, "couch-index", "14f579dcd142ee90300244c854b301bbd5c863ee"},
{couch_mrview, "couch-mrview", "2ec52eb3d8e187f5e9dfcaf8ab0dff55e40cd647"},
[11/50] couchdb commit: updated refs/heads/2876-js-tests to bd19653
Posted by kx...@apache.org.
Update couch and chttpd for multipart stream fixes
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/047a50bc
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/047a50bc
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/047a50bc
Branch: refs/heads/2876-js-tests
Commit: 047a50bcb1c0559e9be24c9fca40b857c9ecacda
Parents: 580b0e9
Author: Alexander Shorin <kx...@apache.org>
Authored: Fri Oct 16 14:28:33 2015 +0300
Committer: Alexander Shorin <kx...@apache.org>
Committed: Fri Oct 16 14:28:33 2015 +0300
----------------------------------------------------------------------
rebar.config.script | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/047a50bc/rebar.config.script
----------------------------------------------------------------------
diff --git a/rebar.config.script b/rebar.config.script
index 139ec20..d3f5377 100644
--- a/rebar.config.script
+++ b/rebar.config.script
@@ -30,8 +30,8 @@ DepDescs = [
{couch_log, "couch-log", "fb4157370403c4c97f19d958a51c889950a66a94"},
{couch_log_lager, "couch-log-lager", "b2a0471a87765de50c5eb05c65c121f68a9ae9fa"},
{config, "config", "b2ecd0d47a776256956ce045123423494ff85e8e"},
-{chttpd, "chttpd", "c3fcf881fbb48c4633bcdcc38596a9963f519ceb"},
-{couch, "couch", "b5e7e54faba5bc06ebd76cd64b0dd5e2c1d06f0c"},
+{chttpd, "chttpd", "5482209016f4016cb0a8f204088acf85f1057812"},
+{couch, "couch", "de590ccdc83028394a935829d04aaee9da6f18d2"},
{couch_index, "couch-index", "14f579dcd142ee90300244c854b301bbd5c863ee"},
{couch_mrview, "couch-mrview", "f089832ea7f759b4e655051025cc48522fee9e1b"},
{couch_replicator, "couch-replicator", "e2ecd854eabe8202b2d413b612125c3dcf9176e0"},
[44/50] couchdb commit: updated refs/heads/2876-js-tests to bd19653
Posted by kx...@apache.org.
Return HTTP 403 for auth'ed users on request to private databases
COUCHDB-2534
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/3f2cf84f
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/3f2cf84f
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/3f2cf84f
Branch: refs/heads/2876-js-tests
Commit: 3f2cf84f9efe3114a7e82273be493ddf04e805f8
Parents: fca5de4
Author: Alexander Shorin <kx...@apache.org>
Authored: Tue Nov 10 02:21:27 2015 +0300
Committer: Alexander Shorin <kx...@apache.org>
Committed: Tue Nov 10 02:21:27 2015 +0300
----------------------------------------------------------------------
rebar.config.script | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/3f2cf84f/rebar.config.script
----------------------------------------------------------------------
diff --git a/rebar.config.script b/rebar.config.script
index 129049b..1031e96 100644
--- a/rebar.config.script
+++ b/rebar.config.script
@@ -26,12 +26,12 @@ DepDescs = [
{couch_epi, "couch-epi", "807aa3f58e39f1273e732020c80d630d9177790c"},
%% keep these sorted
{b64url, "b64url", "319fc604235ab1fde37047b38a432450161db750"},
-{cassim, "cassim", "1ae21f7c415acf3d1aba8b4924ca3093014b86b1"},
+{cassim, "cassim", "350e4e60171bf1ccf90ebc5126304bc9870a1b03"},
{couch_log, "couch-log", "fb4157370403c4c97f19d958a51c889950a66a94"},
{couch_log_lager, "couch-log-lager", "b2a0471a87765de50c5eb05c65c121f68a9ae9fa"},
{config, "config", "b2ecd0d47a776256956ce045123423494ff85e8e"},
{chttpd, "chttpd", "a57e86994f6f5610edc3dca31ca373db92306d8b"},
-{couch, "couch", "acfd7cb0c709345f396cbcb696b6305091dfac12"},
+{couch, "couch", "a5aa4e17c3593a484ee8665d8b4272be05bedfe9"},
{couch_index, "couch-index", "14f579dcd142ee90300244c854b301bbd5c863ee"},
{couch_mrview, "couch-mrview", "1c8a3026b2b695755a1fd39530276d4f90235ab2"},
{couch_replicator, "couch-replicator", "3ce785710e28222064bfcfd68d7fd0af96b72add"},
[17/50] couchdb commit: updated refs/heads/2876-js-tests to bd19653
Posted by kx...@apache.org.
Update fabric with eunit test fix
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/56f845a6
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/56f845a6
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/56f845a6
Branch: refs/heads/2876-js-tests
Commit: 56f845a6626ff0f761e38adcffae875ce2871342
Parents: 7bb2573
Author: Alexander Shorin <kx...@apache.org>
Authored: Sun Oct 18 00:43:57 2015 +0300
Committer: Alexander Shorin <kx...@apache.org>
Committed: Sun Oct 18 00:43:57 2015 +0300
----------------------------------------------------------------------
rebar.config.script | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/56f845a6/rebar.config.script
----------------------------------------------------------------------
diff --git a/rebar.config.script b/rebar.config.script
index b3eb401..ddf872f 100644
--- a/rebar.config.script
+++ b/rebar.config.script
@@ -42,7 +42,7 @@ DepDescs = [
{docs, "documentation", "8f9f149925e3d42bebd7ffa944982c0c9af4c675", [raw]},
{ddoc_cache, "ddoc-cache", "c762e90a33ce3cda19ef142dd1120f1087ecd876"},
{ets_lru, "ets-lru", "c05488c8b1d7ec1c3554a828e0c9bf2888932ed6"},
-{fabric, "fabric", "17f0377807804b7b55db6c6b378d9e266ea52236"},
+{fabric, "fabric", "a6d07a1cbf9e7ea07f171f223710891ac7c627b4"},
{fauxton, "fauxton", "ebd9ced89d27de297526acf74ebad88f1c6a6711", [raw]},
{folsom, "folsom", "fbb7bc83806520ffef84107c85f53c1f7113c20d"},
{global_changes, "global-changes", "e55de37ece29b6cbc0af540370d2425159338bf9"},
[38/50] couchdb commit: updated refs/heads/2876-js-tests to bd19653
Posted by kx...@apache.org.
Ensure calling order of plugins during dispatch
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/33cebff0
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/33cebff0
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/33cebff0
Branch: refs/heads/2876-js-tests
Commit: 33cebff06c72f266e6f4801a927363134b141730
Parents: 9923887
Author: Alexander Shorin <kx...@apache.org>
Authored: Tue Oct 27 22:36:50 2015 +0300
Committer: Alexander Shorin <kx...@apache.org>
Committed: Tue Oct 27 22:36:50 2015 +0300
----------------------------------------------------------------------
rebar.config.script | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/33cebff0/rebar.config.script
----------------------------------------------------------------------
diff --git a/rebar.config.script b/rebar.config.script
index 0590081..4efd614 100644
--- a/rebar.config.script
+++ b/rebar.config.script
@@ -23,7 +23,7 @@ os:putenv("COUCHDB_APPS_CONFIG_DIR", filename:join([COUCHDB_ROOT, "rel/apps"])).
DepDescs = [
%% must be compiled first as it has a custom behavior
-{couch_epi, "couch-epi", "c359a6900c193211a77004df9a31c2ad4bcddf9d"},
+{couch_epi, "couch-epi", "77dfaf413be31b98de59ef3fe995cc3da5d338d2"},
%% keep these sorted
{b64url, "b64url", "319fc604235ab1fde37047b38a432450161db750"},
{cassim, "cassim", "1ae21f7c415acf3d1aba8b4924ca3093014b86b1"},
[30/50] couchdb commit: updated refs/heads/2876-js-tests to bd19653
Posted by kx...@apache.org.
Reorganize javascript target
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/9eabbc63
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/9eabbc63
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/9eabbc63
Branch: refs/heads/2876-js-tests
Commit: 9eabbc63620a0279cbc5ef06db814f38405e2cdc
Parents: e767957
Author: Alexander Shorin <kx...@apache.org>
Authored: Sat Oct 17 19:16:25 2015 +0300
Committer: Alexander Shorin <kx...@apache.org>
Committed: Mon Oct 19 14:02:14 2015 +0300
----------------------------------------------------------------------
Makefile | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/9eabbc63/Makefile
----------------------------------------------------------------------
diff --git a/Makefile b/Makefile
index 5d3716f..bb0114c 100644
--- a/Makefile
+++ b/Makefile
@@ -97,13 +97,9 @@ eunit: couch
.PHONY: javascript
-# target: javascript - Run JavaScript tests suite
-javascript: all
- # TODO: Fix tests to look for these files in their new path
- @mkdir -p share/www/script/test
- @cp test/javascript/tests/lorem*.txt share/www/script/test/
- @dev/run -q --with-admin-party-please test/javascript/run $(tests)
- @rm -rf share/www/script
+# target: javascript - Run JavaScript test suites or specific ones defined by suites option
+javascript: all share/www/script/test
+ @dev/run -q --with-admin-party-please test/javascript/run $(suites)
.PHONY: build-test
@@ -295,3 +291,9 @@ ifeq ($(with_fauxton), 1)
@echo "Building Fauxton"
@cd src/fauxton && npm install && ./node_modules/grunt-cli/bin/grunt couchdb
endif
+
+
+share/www/script/test:
+ @# TODO: Fix tests to look for these files in their new path
+ @mkdir -p $@
+ @cp test/javascript/tests/lorem*.txt share/www/script/test/
[29/50] couchdb commit: updated refs/heads/2876-js-tests to bd19653
Posted by kx...@apache.org.
Allow to run specific javascript test suite via make
Example for single test suite:
make javascript suites=basics
Multiple suites:
make javascript suites="basics design_options"
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/e767957a
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/e767957a
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/e767957a
Branch: refs/heads/2876-js-tests
Commit: e767957ac55227d2741a4988551fe7ff95cc220f
Parents: af1c88b
Author: Alexander Shorin <kx...@apache.org>
Authored: Sat Oct 17 19:13:21 2015 +0300
Committer: Alexander Shorin <kx...@apache.org>
Committed: Mon Oct 19 14:01:46 2015 +0300
----------------------------------------------------------------------
Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/e767957a/Makefile
----------------------------------------------------------------------
diff --git a/Makefile b/Makefile
index 3f41e20..5d3716f 100644
--- a/Makefile
+++ b/Makefile
@@ -102,7 +102,7 @@ javascript: all
# TODO: Fix tests to look for these files in their new path
@mkdir -p share/www/script/test
@cp test/javascript/tests/lorem*.txt share/www/script/test/
- @dev/run -q --with-admin-party-please test/javascript/run
+ @dev/run -q --with-admin-party-please test/javascript/run $(tests)
@rm -rf share/www/script
[31/50] couchdb commit: updated refs/heads/2876-js-tests to bd19653
Posted by kx...@apache.org.
Add targets for code analyze
Supports build-plt, check-plt and dialyze. You can run
them against some specific apps by using `apps` options,
and ignore apps with `skip_deps`:
make dialyze apps=couch_epi,couch
If you eventually need more, use DIALYZE_OPTS to specify
own options set:
make dialyze DIALYZE_OPTS="..."
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/de72658a
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/de72658a
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/de72658a
Branch: refs/heads/2876-js-tests
Commit: de72658a747c0b1704a969cdadb11b2c5ad78f19
Parents: 9eabbc6
Author: Alexander Shorin <kx...@apache.org>
Authored: Sat Oct 17 19:56:12 2015 +0300
Committer: Alexander Shorin <kx...@apache.org>
Committed: Mon Oct 19 14:02:14 2015 +0300
----------------------------------------------------------------------
.gitignore | 1 +
Makefile | 26 ++++++++++++++++++++++++++
rebar.config.script | 7 +++++++
3 files changed, 34 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/de72658a/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index b92f076..77ae520 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,5 +28,6 @@ src/couch/priv/couch_js/config.h
src/couch/priv/couchjs
src/couch/priv/couchspawnkillable
+.rebar
bin/
apache-couchdb-*/
http://git-wip-us.apache.org/repos/asf/couchdb/blob/de72658a/Makefile
----------------------------------------------------------------------
diff --git a/Makefile b/Makefile
index bb0114c..bf24ed4 100644
--- a/Makefile
+++ b/Makefile
@@ -31,6 +31,10 @@ EUNIT_OPTS=$(shell echo "\
suites=$(suites) \
tests=$(tests) \
" | sed -e 's/[a-z]\+= / /g')
+DIALYZE_OPTS=$(shell echo "\
+ apps=$(apps) \
+ skip_deps=$(skip_deps) \
+ " | sed -e 's/[a-z]\+= / /g')
################################################################################
@@ -113,6 +117,24 @@ build-test:
################################################################################
+.PHONY: build-plt
+# target: build-plt - Build project-specific PLT
+build-plt:
+ @$(REBAR) -r build-plt $(DIALYZE_OPTS)
+
+
+.PHONY: check-plt
+# target: check-plt - Check the PLT for consistency and rebuild it if it is not up-to-date
+check-plt:
+ @$(REBAR) -r check-plt $(DIALYZE_OPTS)
+
+
+.PHONY: dialyze
+# target: dialyze - Analyze the code for discrepancies
+dialyze: .rebar
+ @$(REBAR) -r dialyze $(DIALYZE_OPTS)
+
+
.PHONY: docker-image
# target: docker-image - Build Docker image
docker-image:
@@ -220,6 +242,7 @@ install: all
# target: clean - Remove build artifacts
clean:
@$(REBAR) -r clean
+ @rm -rf .rebar/
@rm -f bin/couchjs
@rm -rf src/*/ebin
@rm -rf src/*/.rebar
@@ -273,6 +296,9 @@ uninstall:
################################################################################
+.rebar: build-plt
+
+
config.erl:
@echo "Apache CouchDB has not been configured."
@echo "Try \"./configure -h\" for help."
http://git-wip-us.apache.org/repos/asf/couchdb/blob/de72658a/rebar.config.script
----------------------------------------------------------------------
diff --git a/rebar.config.script b/rebar.config.script
index 8e9dbbb..8f3b63a 100644
--- a/rebar.config.script
+++ b/rebar.config.script
@@ -85,6 +85,13 @@ AddConfig = [
{erl_opts, [debug_info]},
{eunit_opts, [verbose]},
{plugins, [eunit_plugin]},
+ {dialyzer, [
+ {plt_location, local},
+ {plt_location, COUCHDB_ROOT},
+ {plt_extra_apps, [
+ asn1, compiler, crypto, inets, kernel, os_mon, runtime_tools,
+ sasl, ssl, stdlib, syntax_tools, xmerl]},
+ {warnings, [unmatched_returns, error_handling, race_conditions]}]},
{post_hooks, [{compile, "escript support/build_js.escript"}]}
],
[37/50] couchdb commit: updated refs/heads/2876-js-tests to bd19653
Posted by kx...@apache.org.
FFix incorrect size values for view index information
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/99238874
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/99238874
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/99238874
Branch: refs/heads/2876-js-tests
Commit: 992388743ee89320cbe8774cb04a25657f8fb85f
Parents: 35d8b83
Author: Alexander Shorin <kx...@apache.org>
Authored: Tue Oct 27 21:54:24 2015 +0300
Committer: Alexander Shorin <kx...@apache.org>
Committed: Tue Oct 27 21:54:24 2015 +0300
----------------------------------------------------------------------
rebar.config.script | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/99238874/rebar.config.script
----------------------------------------------------------------------
diff --git a/rebar.config.script b/rebar.config.script
index 65d99c5..0590081 100644
--- a/rebar.config.script
+++ b/rebar.config.script
@@ -42,7 +42,7 @@ DepDescs = [
{docs, "documentation", "8f9f149925e3d42bebd7ffa944982c0c9af4c675", [raw]},
{ddoc_cache, "ddoc-cache", "c762e90a33ce3cda19ef142dd1120f1087ecd876"},
{ets_lru, "ets-lru", "c05488c8b1d7ec1c3554a828e0c9bf2888932ed6"},
-{fabric, "fabric", "a6d07a1cbf9e7ea07f171f223710891ac7c627b4"},
+{fabric, "fabric", "4c94f3095595a50a71860a75cc8866adb9a28ce3"},
{fauxton, "fauxton", "ebd9ced89d27de297526acf74ebad88f1c6a6711", [raw]},
{folsom, "folsom", "fbb7bc83806520ffef84107c85f53c1f7113c20d"},
{global_changes, "global-changes", "e55de37ece29b6cbc0af540370d2425159338bf9"},
[47/50] couchdb commit: updated refs/heads/2876-js-tests to bd19653
Posted by kx...@apache.org.
COUCHDB-1447
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/e796a95e
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/e796a95e
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/e796a95e
Branch: refs/heads/2876-js-tests
Commit: e796a95ea6a4af615054bf476d902b86b7b6c4f2
Parents: 93ea32f
Author: Alexander Shorin <kx...@apache.org>
Authored: Tue Nov 10 02:40:17 2015 +0300
Committer: Alexander Shorin <kx...@apache.org>
Committed: Tue Nov 10 02:40:17 2015 +0300
----------------------------------------------------------------------
rebar.config.script | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/e796a95e/rebar.config.script
----------------------------------------------------------------------
diff --git a/rebar.config.script b/rebar.config.script
index 957dc41..6a57fe5 100644
--- a/rebar.config.script
+++ b/rebar.config.script
@@ -33,7 +33,7 @@ DepDescs = [
{chttpd, "chttpd", "a57e86994f6f5610edc3dca31ca373db92306d8b"},
{couch, "couch", "a5aa4e17c3593a484ee8665d8b4272be05bedfe9"},
{couch_index, "couch-index", "14f579dcd142ee90300244c854b301bbd5c863ee"},
-{couch_mrview, "couch-mrview", "1c8a3026b2b695755a1fd39530276d4f90235ab2"},
+{couch_mrview, "couch-mrview", "c3bed460ee844175b8ce11081386be27f686d8ff"},
{couch_replicator, "couch-replicator", "3ce785710e28222064bfcfd68d7fd0af96b72add"},
{couch_plugins, "couch-plugins", "3e73b723cb126cfc471b560d17c24a8b5c540085"},
{couch_event, "couch-event", "835a41885d1e276d207758954f8238aa7bba0ae8"},
[10/50] couchdb commit: updated refs/heads/2876-js-tests to bd19653
Posted by kx...@apache.org.
Bump deps
couch_replicator
5 commits behind origin/master
e2ecd854eabe8202b2d413b612125c3dcf9176e0 Merge remote-tracking branch 'cloudant/2833-fix-race-condition-during-worker-termination'
219f5d181a4effbd82c2c38ca3244a214d5552d5 Fix new couch_httpd_multipart:abort_multipart_stream API call
307ae6d92fd300d31d6eb96bd5aca5b9a558a66d Fix race condition in worker release on connection_closing state.
36e5beccd661158260c3985ae0b5f439022ab15b Merge remote-tracking branch 'github/pr/4'
b88601bf974b9537d8fc0e94e86cc072d9a5f449 Use couch_httpd_multipart:abort_multipart_stream
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/580b0e9f
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/580b0e9f
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/580b0e9f
Branch: refs/heads/2876-js-tests
Commit: 580b0e9f0443f71be2265079bbbc9e9f99ca8c12
Parents: da7176b
Author: Robert Newson <rn...@apache.org>
Authored: Fri Oct 16 10:51:46 2015 +0100
Committer: Robert Newson <rn...@apache.org>
Committed: Fri Oct 16 10:52:48 2015 +0100
----------------------------------------------------------------------
rebar.config.script | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/580b0e9f/rebar.config.script
----------------------------------------------------------------------
diff --git a/rebar.config.script b/rebar.config.script
index c0f228a..139ec20 100644
--- a/rebar.config.script
+++ b/rebar.config.script
@@ -34,7 +34,7 @@ DepDescs = [
{couch, "couch", "b5e7e54faba5bc06ebd76cd64b0dd5e2c1d06f0c"},
{couch_index, "couch-index", "14f579dcd142ee90300244c854b301bbd5c863ee"},
{couch_mrview, "couch-mrview", "f089832ea7f759b4e655051025cc48522fee9e1b"},
-{couch_replicator, "couch-replicator", "219f5d181a4effbd82c2c38ca3244a214d5552d5"},
+{couch_replicator, "couch-replicator", "e2ecd854eabe8202b2d413b612125c3dcf9176e0"},
{couch_plugins, "couch-plugins", "3e73b723cb126cfc471b560d17c24a8b5c540085"},
{couch_event, "couch-event", "835a41885d1e276d207758954f8238aa7bba0ae8"},
{couch_stats, "couch-stats", "7895d4d3f509ed24f09b6d1a0bd0e06af34551dc"},
[26/50] couchdb commit: updated refs/heads/2876-js-tests to bd19653
Posted by kx...@apache.org.
Make help
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/366c8562
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/366c8562
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/366c8562
Branch: refs/heads/2876-js-tests
Commit: 366c8562467864880c6be7b83e7d30bdb1827a7a
Parents: 9acb174
Author: Alexander Shorin <kx...@apache.org>
Authored: Sat Oct 17 00:52:37 2015 +0300
Committer: Alexander Shorin <kx...@apache.org>
Committed: Mon Oct 19 13:47:39 2015 +0300
----------------------------------------------------------------------
Makefile | 46 +++++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 45 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/366c8562/Makefile
----------------------------------------------------------------------
diff --git a/Makefile b/Makefile
index 11dd5e3..f613c75 100644
--- a/Makefile
+++ b/Makefile
@@ -25,22 +25,39 @@ DESTDIR=
################################################################################
+.PHONY: all
+# target: all - Build everything
all: couch fauxton docs
+.PHONY: help
+# target: help - Print this help
+help:
+ @egrep "^# target: " Makefile \
+ | sed -e 's/^# target: //g' \
+ | sort \
+ | awk '{printf(" %-15s", $$1); $$1=$$2=""; print "-" $$0}'
+
+
################################################################################
# Building
################################################################################
+.PHONY: couch
+# target: couch - Build CouchDB core
couch: config.erl
@$(REBAR) compile
@cp src/couch/priv/couchjs bin/
+.PHONY: docs
+# target: docs - Build documentation
docs: src/docs/build
+.PHONY: fauxton
+# target: fauxton - Build Fauxton web UI
fauxton: share/www
@@ -49,9 +66,13 @@ fauxton: share/www
################################################################################
+.PHONY: check
+# target: check - Test everything
check: javascript eunit build-test
+.PHONY: eunit
+# target: eunit - Run EUnit tests, use $(EUNIT_OPTS) for custom rebar eunit params
eunit: export BUILDDIR = $(shell pwd)
eunit: export ERL_AFLAGS = -config $(shell pwd)/rel/files/eunit.config
eunit: couch
@@ -59,6 +80,8 @@ eunit: couch
@$(REBAR) -r eunit skip_deps=meck,mochiweb,lager,snappy,folsom,proper $(EUNIT_OPTS)
+.PHONY: javascript
+# target: javascript - Run JavaScript tests suite
javascript: all
# TODO: Fix tests to look for these files in their new path
@mkdir -p share/www/script/test
@@ -67,6 +90,8 @@ javascript: all
@rm -rf share/www/script
+.PHONY: build-test
+# target: build-test - Test build script
build-test:
@test/build/test-configure.sh
@@ -76,18 +101,26 @@ build-test:
################################################################################
+.PHONY: docker-image
+# target: docker-image - Build Docker image
docker-image:
@docker build --rm -t couchdb/dev-cluster .
+.PHONY: docker-start
+# target: docker-start - Start CouchDB in Docker container
docker-start:
@docker run -d -P -t couchdb/dev-cluster > .docker-id
+.PHONY: docker-stop
+# target: docker-stop - Stop Docker container
docker-stop:
@docker stop `cat .docker-id`
+.PHONY: introspect
+# target: introspect - Check for commits difference between rebar.config and repository
introspect:
@$(REBAR) -r update-deps
@./introspect
@@ -98,6 +131,8 @@ introspect:
################################################################################
+.PHONY: dist
+# target: dist - Make release tarball
dist: all
@./build-aux/couchdb-build-release.sh $(COUCHDB_VERSION)
@@ -116,6 +151,8 @@ dist: all
@echo "Done: apache-couchdb-$(COUCHDB_VERSION).tar.gz"
+.PHONY: install
+# target: install - Install CouchDB :-)
-include install.mk
install: all
@echo "Installing CouchDB into $(DESTDIR)/$(install_dir)..." | sed -e 's,///,/,'
@@ -167,6 +204,8 @@ install: all
################################################################################
+.PHONY: clean
+# target: clean - Remove build artifacts
clean:
@$(REBAR) -r clean
@rm -f bin/couchjs
@@ -181,7 +220,8 @@ clean:
@rm -f dev/boot_node.beam dev/pbkdf2.pyc log/crash.log
-
+.PHONY: distclean
+# target: distclean - Remove build and release artifacts
distclean: clean
@rm -f install.mk
@rm -f config.erl
@@ -195,10 +235,14 @@ ifneq ($(IN_RELEASE), true)
endif
+.PHONY: devclean
+# target: devclean - Remove dev cluster artifacts
devclean:
@rm -rf dev/lib/*/data
+.PHONY: uninstall
+# target: uninstall - Uninstall CouchDB :-(
uninstall:
@rm -rf $(DESTDIR)/$(install_dir)
@rm -f $(DESTDIR)/$(bin_dir)/couchdb
[28/50] couchdb commit: updated refs/heads/2876-js-tests to bd19653
Posted by kx...@apache.org.
Simplify eunit target options
Now it mirrors rebar eunit options and you can preserve old habits
to specify app, suite or test to run test against:
make eunit apps=couch suites=couch_btree
Supported options are: apps, skip_deps, suites, tests. If you need
something more specific you can use EUNIT_OPTS to specify rebar eunit
options as-is:
make eunit EUNIT_OPTS="apps=couch suites=couch_btree"
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/af1c88b8
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/af1c88b8
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/af1c88b8
Branch: refs/heads/2876-js-tests
Commit: af1c88b84af1cbe28722e523dc99c43778b3ef06
Parents: e5a1c9b
Author: Alexander Shorin <kx...@apache.org>
Authored: Sat Oct 17 18:53:59 2015 +0300
Committer: Alexander Shorin <kx...@apache.org>
Committed: Mon Oct 19 13:47:39 2015 +0300
----------------------------------------------------------------------
Makefile | 17 +++++++++++++++--
1 file changed, 15 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/af1c88b8/Makefile
----------------------------------------------------------------------
diff --git a/Makefile b/Makefile
index ee202bf..3f41e20 100644
--- a/Makefile
+++ b/Makefile
@@ -19,6 +19,19 @@ COUCHDB_VERSION = $(vsn_major).$(vsn_minor).$(vsn_patch)$(COUCHDB_VERSION_SUFFIX
DESTDIR=
+# Rebar options
+apps=
+skip_deps=folsom,lager,meck,mochiweb,proper,snappy
+suites=
+tests=
+
+EUNIT_OPTS=$(shell echo "\
+ apps=$(apps) \
+ skip_deps=$(skip_deps) \
+ suites=$(suites) \
+ tests=$(tests) \
+ " | sed -e 's/[a-z]\+= / /g')
+
################################################################################
# Main commands
@@ -75,12 +88,12 @@ check:
.PHONY: eunit
-# target: eunit - Run EUnit tests, use $(EUNIT_OPTS) for custom rebar eunit params
+# target: eunit - Run EUnit tests, use EUNIT_OPTS to provide custom options
eunit: export BUILDDIR = $(shell pwd)
eunit: export ERL_AFLAGS = -config $(shell pwd)/rel/files/eunit.config
eunit: couch
@$(REBAR) setup_eunit 2> /dev/null
- @$(REBAR) -r eunit skip_deps=meck,mochiweb,lager,snappy,folsom,proper $(EUNIT_OPTS)
+ @$(REBAR) -r eunit $(EUNIT_OPTS)
.PHONY: javascript
[33/50] couchdb commit: updated refs/heads/2876-js-tests to bd19653
Posted by kx...@apache.org.
Fix typo
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/4cc1ad60
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/4cc1ad60
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/4cc1ad60
Branch: refs/heads/2876-js-tests
Commit: 4cc1ad60eb4e13aa4a61fad92376c6079703ff4c
Parents: 9ba1af5
Author: Alexander Shorin <kx...@apache.org>
Authored: Mon Oct 19 22:28:13 2015 +0300
Committer: Alexander Shorin <kx...@apache.org>
Committed: Mon Oct 19 22:28:13 2015 +0300
----------------------------------------------------------------------
README-DEV.rst | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/4cc1ad60/README-DEV.rst
----------------------------------------------------------------------
diff --git a/README-DEV.rst b/README-DEV.rst
index 99a8e11..1235689 100644
--- a/README-DEV.rst
+++ b/README-DEV.rst
@@ -223,25 +223,25 @@ The release procedure is documented here::
Unix-like Systems
~~~~~~~~~~~~~~~~~
-Prepare the release artefacts by running::
+Prepare the release artifacts by running::
make distcheck
-You can prepare signed release artefacts by running::
+You can prepare signed release artifacts by running::
make distsign
-The release artefacts can be found in the root source directory.
+The release artifacts can be found in the root source directory.
Microsoft Windows
~~~~~~~~~~~~~~~~~
-Prepare the release artefacts by running::
+Prepare the release artifacts by running::
make dist
-The release artefacts can be found in the `etc/windows` directory.
+The release artifacts can be found in the `etc/windows` directory.
Until the build system has been improved, you must make sure that you run this
command from a clean source checkout. If you do not, your test database and log
-files will be bundled up in the release artefact.
+files will be bundled up in the release artifacts.
[27/50] couchdb commit: updated refs/heads/2876-js-tests to bd19653
Posted by kx...@apache.org.
Simplify exit on first test suite failure
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/e5a1c9b8
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/e5a1c9b8
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/e5a1c9b8
Branch: refs/heads/2876-js-tests
Commit: e5a1c9b8fa27e10216bb109ea8f2acf4611035f9
Parents: 366c856
Author: Alexander Shorin <kx...@apache.org>
Authored: Sat Oct 17 03:31:03 2015 +0300
Committer: Alexander Shorin <kx...@apache.org>
Committed: Mon Oct 19 13:47:39 2015 +0300
----------------------------------------------------------------------
.travis.yml | 2 +-
Makefile | 5 ++++-
run-tests.sh | 4 ----
3 files changed, 5 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/e5a1c9b8/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index 920a8ee..f0f7126 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,7 +5,7 @@ before_install:
- sudo apt-get -y install shunit2
before_script: ./configure -c --disable-docs --disable-fauxton
script:
- - ./run-tests.sh
+ - make check
language: erlang
otp_release:
- 18.1
http://git-wip-us.apache.org/repos/asf/couchdb/blob/e5a1c9b8/Makefile
----------------------------------------------------------------------
diff --git a/Makefile b/Makefile
index f613c75..ee202bf 100644
--- a/Makefile
+++ b/Makefile
@@ -68,7 +68,10 @@ fauxton: share/www
.PHONY: check
# target: check - Test everything
-check: javascript eunit build-test
+check:
+ @$(MAKE) eunit
+ @$(MAKE) javascript
+ @$(MAKE) build-test
.PHONY: eunit
http://git-wip-us.apache.org/repos/asf/couchdb/blob/e5a1c9b8/run-tests.sh
----------------------------------------------------------------------
diff --git a/run-tests.sh b/run-tests.sh
deleted file mode 100755
index f8ab486..0000000
--- a/run-tests.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh -ev
-
-# Eunit/Javascript tests
-make check
[45/50] couchdb commit: updated refs/heads/2876-js-tests to bd19653
Posted by kx...@apache.org.
Update mango
Includes the fix user defined index selection (COUCHDB-2835) and
provides ability to disable the indexing of array lengths.
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/da7f03b4
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/da7f03b4
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/da7f03b4
Branch: refs/heads/2876-js-tests
Commit: da7f03b42da0be8793ee8cc41b0a5eba32d20bcc
Parents: 3f2cf84
Author: Alexander Shorin <kx...@apache.org>
Authored: Tue Nov 10 02:24:58 2015 +0300
Committer: Alexander Shorin <kx...@apache.org>
Committed: Tue Nov 10 02:24:58 2015 +0300
----------------------------------------------------------------------
rebar.config.script | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/da7f03b4/rebar.config.script
----------------------------------------------------------------------
diff --git a/rebar.config.script b/rebar.config.script
index 1031e96..5417d20 100644
--- a/rebar.config.script
+++ b/rebar.config.script
@@ -51,7 +51,7 @@ DepDescs = [
{ioq, "ioq", "c7c75ebeaf41599e3a3e211097d864f0e7785829"},
{jiffy, "jiffy", "ea19c417f9fd52fa3f7ef2d378735e5532c59b29"},
{khash, "khash", "7c6a9cd9776b5c6f063ccafedfa984b00877b019"},
-{mango, "mango", "a297e2e9e2c006381f982e73a08fff29c4f8db8f"},
+{mango, "mango", "a02f6106af37dd6900ceed5288e692661c369ef1"},
{mem3, "mem3", "80fd81b3350dc96918b460b3bfb646fddade80f2"},
{mochiweb, "mochiweb", "bd6ae7cbb371666a1f68115056f7b30d13765782"},
{oauth, "oauth", "099057a98e41f3aff91e77e3cf496d6c6fd901df"},
[46/50] couchdb commit: updated refs/heads/2876-js-tests to bd19653
Posted by kx...@apache.org.
Fix warnings about unknown cassim metrics
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/93ea32f3
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/93ea32f3
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/93ea32f3
Branch: refs/heads/2876-js-tests
Commit: 93ea32f3992dd7134ec4fc6b0c3b90f2c7b105e8
Parents: da7f03b
Author: Alexander Shorin <kx...@apache.org>
Authored: Tue Nov 10 02:33:07 2015 +0300
Committer: Alexander Shorin <kx...@apache.org>
Committed: Tue Nov 10 02:33:07 2015 +0300
----------------------------------------------------------------------
rebar.config.script | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/93ea32f3/rebar.config.script
----------------------------------------------------------------------
diff --git a/rebar.config.script b/rebar.config.script
index 5417d20..957dc41 100644
--- a/rebar.config.script
+++ b/rebar.config.script
@@ -26,7 +26,7 @@ DepDescs = [
{couch_epi, "couch-epi", "807aa3f58e39f1273e732020c80d630d9177790c"},
%% keep these sorted
{b64url, "b64url", "319fc604235ab1fde37047b38a432450161db750"},
-{cassim, "cassim", "350e4e60171bf1ccf90ebc5126304bc9870a1b03"},
+{cassim, "cassim", "9bbfe82125284fa7cb3317079e8bc1dc876a07bf"},
{couch_log, "couch-log", "fb4157370403c4c97f19d958a51c889950a66a94"},
{couch_log_lager, "couch-log-lager", "b2a0471a87765de50c5eb05c65c121f68a9ae9fa"},
{config, "config", "b2ecd0d47a776256956ce045123423494ff85e8e"},
[06/50] couchdb commit: updated refs/heads/2876-js-tests to bd19653
Posted by kx...@apache.org.
Add IS_OLD_RECORD macro
COUCHDB-2511
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/03b12f96
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/03b12f96
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/03b12f96
Branch: refs/heads/2876-js-tests
Commit: 03b12f9649407169febb25a3129a066da9d6d13f
Parents: 5174b86
Author: Alexander Shorin <kx...@apache.org>
Authored: Thu Oct 15 19:45:35 2015 +0300
Committer: Alexander Shorin <kx...@apache.org>
Committed: Thu Oct 15 19:45:35 2015 +0300
----------------------------------------------------------------------
rebar.config.script | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/03b12f96/rebar.config.script
----------------------------------------------------------------------
diff --git a/rebar.config.script b/rebar.config.script
index 63e73b0..25265ff 100644
--- a/rebar.config.script
+++ b/rebar.config.script
@@ -31,7 +31,7 @@ DepDescs = [
{couch_log_lager, "couch-log-lager", "b2a0471a87765de50c5eb05c65c121f68a9ae9fa"},
{config, "config", "b2ecd0d47a776256956ce045123423494ff85e8e"},
{chttpd, "chttpd", "f8f5d7fcd506b53be170c587ee3bd38f7433bc2f"},
-{couch, "couch", "92598cd33abca43e9d1d2e30057b47e207313ad3"},
+{couch, "couch", "b5e7e54faba5bc06ebd76cd64b0dd5e2c1d06f0c"},
{couch_index, "couch-index", "14f579dcd142ee90300244c854b301bbd5c863ee"},
{couch_mrview, "couch-mrview", "f089832ea7f759b4e655051025cc48522fee9e1b"},
{couch_replicator, "couch-replicator", "b88601bf974b9537d8fc0e94e86cc072d9a5f449"},
[43/50] couchdb commit: updated refs/heads/2876-js-tests to bd19653
Posted by kx...@apache.org.
Don't send random Etag header for views
COUCHDB-2859
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/fca5de45
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/fca5de45
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/fca5de45
Branch: refs/heads/2876-js-tests
Commit: fca5de450d0d10411bb4caa5b2abf500fee38827
Parents: d964211
Author: Alexander Shorin <kx...@apache.org>
Authored: Tue Nov 10 02:17:31 2015 +0300
Committer: Alexander Shorin <kx...@apache.org>
Committed: Tue Nov 10 02:17:31 2015 +0300
----------------------------------------------------------------------
rebar.config.script | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/fca5de45/rebar.config.script
----------------------------------------------------------------------
diff --git a/rebar.config.script b/rebar.config.script
index facf6e0..129049b 100644
--- a/rebar.config.script
+++ b/rebar.config.script
@@ -30,10 +30,10 @@ DepDescs = [
{couch_log, "couch-log", "fb4157370403c4c97f19d958a51c889950a66a94"},
{couch_log_lager, "couch-log-lager", "b2a0471a87765de50c5eb05c65c121f68a9ae9fa"},
{config, "config", "b2ecd0d47a776256956ce045123423494ff85e8e"},
-{chttpd, "chttpd", "2147dba9c87ae0ae39206009bdb2784108507a16"},
+{chttpd, "chttpd", "a57e86994f6f5610edc3dca31ca373db92306d8b"},
{couch, "couch", "acfd7cb0c709345f396cbcb696b6305091dfac12"},
{couch_index, "couch-index", "14f579dcd142ee90300244c854b301bbd5c863ee"},
-{couch_mrview, "couch-mrview", "2ec52eb3d8e187f5e9dfcaf8ab0dff55e40cd647"},
+{couch_mrview, "couch-mrview", "1c8a3026b2b695755a1fd39530276d4f90235ab2"},
{couch_replicator, "couch-replicator", "3ce785710e28222064bfcfd68d7fd0af96b72add"},
{couch_plugins, "couch-plugins", "3e73b723cb126cfc471b560d17c24a8b5c540085"},
{couch_event, "couch-event", "835a41885d1e276d207758954f8238aa7bba0ae8"},
[03/50] couchdb commit: updated refs/heads/2876-js-tests to bd19653
Posted by kx...@apache.org.
Don't confuse people with errors during rebar setup_eunit
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/eb9918d8
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/eb9918d8
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/eb9918d8
Branch: refs/heads/2876-js-tests
Commit: eb9918d8f5eaa7aa1dc8ae29b13e01e24679985b
Parents: 6624b68
Author: Alexander Shorin <kx...@apache.org>
Authored: Wed Oct 14 20:18:15 2015 +0300
Committer: Alexander Shorin <kx...@apache.org>
Committed: Wed Oct 14 20:18:15 2015 +0300
----------------------------------------------------------------------
Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/eb9918d8/Makefile
----------------------------------------------------------------------
diff --git a/Makefile b/Makefile
index 2b6d31f..178233b 100644
--- a/Makefile
+++ b/Makefile
@@ -157,7 +157,7 @@ docker-stop:
eunit: export BUILDDIR = $(shell pwd)
eunit: export ERL_AFLAGS = -config $(shell pwd)/rel/files/eunit.config
eunit: couch
- @${REBAR} setup_eunit
+ @${REBAR} setup_eunit 2> /dev/null
@${REBAR} -r eunit skip_deps=meck,mochiweb,lager,snappy,folsom,proper $(EUNIT_OPTS)
javascript: all
[24/50] couchdb commit: updated refs/heads/2876-js-tests to bd19653
Posted by kx...@apache.org.
Revert rfc1123_date fix
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/d6f19371
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/d6f19371
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/d6f19371
Branch: refs/heads/2876-js-tests
Commit: d6f193710807cabd32ebc308c4ef2ae61d4174c0
Parents: 734a120
Author: Alexander Shorin <kx...@apache.org>
Authored: Mon Oct 19 11:18:03 2015 +0300
Committer: Alexander Shorin <kx...@apache.org>
Committed: Mon Oct 19 11:18:03 2015 +0300
----------------------------------------------------------------------
rebar.config.script | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/d6f19371/rebar.config.script
----------------------------------------------------------------------
diff --git a/rebar.config.script b/rebar.config.script
index 8abfaff..8e9dbbb 100644
--- a/rebar.config.script
+++ b/rebar.config.script
@@ -34,7 +34,7 @@ DepDescs = [
{couch, "couch", "acfd7cb0c709345f396cbcb696b6305091dfac12"},
{couch_index, "couch-index", "14f579dcd142ee90300244c854b301bbd5c863ee"},
{couch_mrview, "couch-mrview", "2ec52eb3d8e187f5e9dfcaf8ab0dff55e40cd647"},
-{couch_replicator, "couch-replicator", "e58f535ca611acb40bb620ee2f6a3da4c187bcf7"},
+{couch_replicator, "couch-replicator", "3ce785710e28222064bfcfd68d7fd0af96b72add"},
{couch_plugins, "couch-plugins", "3e73b723cb126cfc471b560d17c24a8b5c540085"},
{couch_event, "couch-event", "835a41885d1e276d207758954f8238aa7bba0ae8"},
{couch_stats, "couch-stats", "7895d4d3f509ed24f09b6d1a0bd0e06af34551dc"},
[32/50] couchdb commit: updated refs/heads/2876-js-tests to bd19653
Posted by kx...@apache.org.
Convert README-DEV to reST
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/9ba1af50
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/9ba1af50
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/9ba1af50
Branch: refs/heads/2876-js-tests
Commit: 9ba1af50a7b65c09ab63b4e909d1509bb236e9b3
Parents: c071df9
Author: Alexander Shorin <kx...@apache.org>
Authored: Mon Oct 19 22:01:13 2015 +0300
Committer: Alexander Shorin <kx...@apache.org>
Committed: Mon Oct 19 22:10:28 2015 +0300
----------------------------------------------------------------------
README-DEV.md | 243 ---------------------------------------------------
README-DEV.rst | 247 ++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 247 insertions(+), 243 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/9ba1af50/README-DEV.md
----------------------------------------------------------------------
diff --git a/README-DEV.md b/README-DEV.md
deleted file mode 100644
index 66e30c3..0000000
--- a/README-DEV.md
+++ /dev/null
@@ -1,243 +0,0 @@
-Apache CouchDB DEVELOPERS
-=========================
-
-Before you start here, read `INSTALL.Unix` (or `INSTALL.Windows`) and
-follow the setup instructions including the installation of all the
-listed dependencies for your system.
-
-Only follow these instructions if you are building from a source checkout.
-
-If you're unsure what this means, ignore this document.
-
-Dependencies
-------------
-
-You may need:
-
- * Sphinx (http://sphinx.pocoo.org/)
- * LaTex (http://www.latex-project.org/)
- * GNU Texinfo (http://www.gnu.org/software/texinfo/)
- * GNU help2man (http://www.gnu.org/software/help2man/)
- * GnuPG (http://www.gnupg.org/)
- * md5sum (http://www.microbrew.org/tools/md5sha1sum/)
- * sha1sum (http://www.microbrew.org/tools/md5sha1sum/)
-
-The first of these optional dependencies are required for building the
-documentation. The last three are needed to build releases.
-
-You will need these optional dependencies installed if:
-
- * You are working on the documentation, or
- * You are preparing a distribution archive
-
-However, you do not need them if:
-
- * You are building from a distribution archive, or
- * You don't care about building the documentation
-
-If you intend to build Fauxton, you will also need to install its
-dependencies. After running ./configure to download all of the
-dependent repositories, you can read about required dependencies in
-`src/fauxton/readme.md`. Typically, installing npm and node.js are
-sufficient to enable a Fauxton build.
-
-Here is a list of *optional* dependencies for various operating systems.
-Installation will be easiest, when you install them all.
-
-Debian-based (inc. Ubuntu) Systems
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
- sudo apt-get install help2man python-sphinx \
- texlive-latex-base texlive-latex-recommended \
- texlive-latex-extra texlive-fonts-recommended texinfo gnupg
-
-Gentoo-based Systems
-~~~~~~~~~~~~~~~~~~~~
-
- sudo emerge texinfo gnupg coreutils pkgconfig help2man
- sudo USE=latex emerge sphinx
-
-RedHat-based (Fedora, Centos, RHEL) Systems
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
- sudo yum install help2man python-sphinx python-docutils \
- python-pygments texlive-latex texlive-latex-fonts texinfo gnupg
-
-Mac OS X
-~~~~~~~~
-
-Install Homebrew, if you do not have it already:
-
- https://github.com/mxcl/homebrew
-
-Unless you want to install the optional dependencies, skip to the next section.
-
-Install what else we can with Homebrew:
-
- brew install help2man gnupg md5sha1sum
-
-If you don't already have pip installed, install it:
-
- sudo easy_install pip
-
-Now, install the required Python packages:
-
- sudo pip install sphinx
- sudo pip install docutils
- sudo pip install pygments
-
-Download MaxTeX from here:
-
- http://www.tug.org/mactex/
-
-Follow the instructions to get a working LaTeX install on your system.
-
-FreeBSD
--------
-
-
- pkg install help2man texinfo gnupg py27-sphinx texlive-full tex-formats
-
-Windows
-~~~~~~~
-
-Follow the instructions in INSTALL.Windows and build all components from
-source, using the same Visual C++ compiler and runtime.
-
-Configuring
------------
-
-Configure the source by running:
-
- ./configure
-
-If you intend to run the test suites:
-
- ./configure -c
-
-If you want to build it into different destination than `/usr/local`.
-
- ./configure --prefix=/<your directory path>
-
-If you don't want to build Fauxton or documentation specify `--disable-fauxton`
-and/or `--disable-docs` arguments for `configure` to ignore their build and
-avoid any issues with their dependencies.
-
-See `./configure --help` for more information.
-
-Testing
--------
-
-To run all the tests use run:
-
- make check
-
-You can also run each test suite individually via `eunit` and `javascript`
-targets:
-
- make eunit
- make javascript
-
-If you need to run specific Erlang tests, you can pass special "options"
-to make targets:
-
- # Run tests only for couch and chttpd apps
- make eunit apps=couch,chttpd
-
- # Run only tests from couch_btree_tests suite
- make eunit suites=couch_btree_tests
-
- # Run only only specific tests
- make eunit tests=btree_open_test,reductions_test
-
- # Ignore tests for specified apps
- make eunit skip_deps=couch_log,couch_epi
-
-The `apps`, `suites`, `tests` and `skip_deps` could be combined in any way.
-These are mimics to `rebar eunit` arguments. If you're not satisfied by these,
-you can use EUNIT_OPT environment variable to specify exact `rebar eunit`
-options:
-
- make eunit EUNIT_OPTS="apps=couch,chttpd"
-
-JavaScript tests accepts only `suites` option, but in the same way
-
- # Run all JavaScript tests
- make javascript
-
- # Run only basic and design_options tests
- make javascript suites="basic design_options"
-
-Note that tests are delimited here by whitespace, not by comma. You can get list
-of all possible test targets with the following command:
-
- make list-js-suites
-
-Code analyzer could be run by:
-
- make dialyze
-
-If you need to analyze only specific apps, you can specify them in familiar way:
-
- make dialyze apps=couch,couch_epi
-
-See `make help` for more info and useful commands.
-
-Please report any problems to the developer's mailing list.
-
-Testing a cluster
------------------
-
-We use Docker (https://docker.io) to safely run a local three node
-cluster all inside a single docker container.
-
-Assuming you have Docker installed and running:
-
- make docker-image
-
-This will create a docker image (tagged 'couchdb/dev-cluster') capable
-of running a joined three node cluster.
-
-To start it up:
-
- make docker-start
-
-A three node cluster should now be running (you can now use `docker ps`
-to find the exposed ports of the nodes).
-
-To stop it:
-
- make docker-stop
-
-Releasing
----------
-
-The release procedure is documented here:
-
- https://wiki.apache.org/couchdb/Release_Procedure
-
-Unix-like Systems
-~~~~~~~~~~~~~~~~~
-
-Prepare the release artefacts by running:
-
- make distcheck
-
-You can prepare signed release artefacts by running:
-
- make distsign
-
-The release artefacts can be found in the root source directory.
-
-Microsoft Windows
-~~~~~~~~~~~~~~~~~
-
-Prepare the release artefacts by running:
-
- make dist
-
-The release artefacts can be found in the `etc/windows` directory.
-
-Until the build system has been improved, you must make sure that you run this
-command from a clean source checkout. If you do not, your test database and log
-files will be bundled up in the release artefact.
http://git-wip-us.apache.org/repos/asf/couchdb/blob/9ba1af50/README-DEV.rst
----------------------------------------------------------------------
diff --git a/README-DEV.rst b/README-DEV.rst
new file mode 100644
index 0000000..99a8e11
--- /dev/null
+++ b/README-DEV.rst
@@ -0,0 +1,247 @@
+Apache CouchDB DEVELOPERS
+=========================
+
+Before you start here, read `INSTALL.Unix` (or `INSTALL.Windows`) and
+follow the setup instructions including the installation of all the
+listed dependencies for your system.
+
+Only follow these instructions if you are building from a source checkout.
+
+If you're unsure what this means, ignore this document.
+
+Dependencies
+------------
+
+You may need:
+
+* `Sphinx <http://sphinx.pocoo.org/>`_
+* `LaTex <http://www.latex-project.org/>`_
+* `GNU Texinfo <http://www.gnu.org/software/texinfo/>`_
+* `GNU help2man <http://www.gnu.org/software/help2man/>`_
+* `GnuPG <http://www.gnupg.org/>`_
+* `md5sum <http://www.microbrew.org/tools/md5sha1sum/>`_
+* `sha1sum <http://www.microbrew.org/tools/md5sha1sum/>`_
+
+The first of these optional dependencies are required for building the
+documentation. The last three are needed to build releases.
+
+You will need these optional dependencies installed if:
+
+* You are working on the documentation, or
+* You are preparing a distribution archive
+
+However, you do not need them if:
+
+* You are building from a distribution archive, or
+* You don't care about building the documentation
+
+If you intend to build Fauxton, you will also need to install its
+dependencies. After running ./configure to download all of the
+dependent repositories, you can read about required dependencies in
+`src/fauxton/readme.md`. Typically, installing npm and node.js are
+sufficient to enable a Fauxton build.
+
+Here is a list of *optional* dependencies for various operating systems.
+Installation will be easiest, when you install them all.
+
+Debian-based (inc. Ubuntu) Systems
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+::
+
+ sudo apt-get install help2man python-sphinx \
+ texlive-latex-base texlive-latex-recommended \
+ texlive-latex-extra texlive-fonts-recommended texinfo gnupg
+
+Gentoo-based Systems
+~~~~~~~~~~~~~~~~~~~~
+
+::
+
+ sudo emerge texinfo gnupg coreutils pkgconfig help2man
+ sudo USE=latex emerge sphinx
+
+RedHat-based (Fedora, Centos, RHEL) Systems
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+::
+
+ sudo yum install help2man python-sphinx python-docutils \
+ python-pygments texlive-latex texlive-latex-fonts texinfo gnupg
+
+Mac OS X
+~~~~~~~~
+
+Install `Homebrew <https://github.com/mxcl/homebrew>`_, if you do not have
+it already.
+
+Unless you want to install the optional dependencies, skip to the next section.
+
+Install what else we can with Homebrew::
+
+ brew install help2man gnupg md5sha1sum
+
+If you don't already have pip installed, install it::
+
+ sudo easy_install pip
+
+Now, install the required Python packages::
+
+ sudo pip install sphinx
+ sudo pip install docutils
+ sudo pip install pygments
+
+Download `MacTeX <http://www.tug.org/mactex/>`_ and follow the instructions
+to get a working LaTeX install on your system.
+
+FreeBSD
+~~~~~~~
+
+::
+
+ pkg install help2man texinfo gnupg py27-sphinx texlive-full tex-formats
+
+Windows
+~~~~~~~
+
+Follow the instructions in `INSTALL.Windows` and build all components from
+source, using the same Visual C++ compiler and runtime.
+
+Configuring
+-----------
+
+Configure the source by running::
+
+ ./configure
+
+If you intend to run the test suites::
+
+ ./configure -c
+
+If you want to build it into different destination than `/usr/local`.:
+
+ ./configure --prefix=/<your directory path>
+
+If you don't want to build Fauxton or documentation specify ``--disable-fauxton``
+and/or ``--disable-docs`` arguments for `configure` to ignore their build and
+avoid any issues with their dependencies.
+
+See ``./configure --help`` for more information.
+
+Testing
+-------
+
+To run all the tests use run::
+
+ make check
+
+You can also run each test suite individually via ``eunit`` and ``javascript``
+targets::
+
+ make eunit
+ make javascript
+
+If you need to run specific Erlang tests, you can pass special "options"
+to make targets::
+
+ # Run tests only for couch and chttpd apps
+ make eunit apps=couch,chttpd
+
+ # Run only tests from couch_btree_tests suite
+ make eunit suites=couch_btree_tests
+
+ # Run only only specific tests
+ make eunit tests=btree_open_test,reductions_test
+
+ # Ignore tests for specified apps
+ make eunit skip_deps=couch_log,couch_epi
+
+The ``apps``, ``suites``, ``tests`` and ``skip_deps`` could be combined in any
+way. These are mimics to ``rebar eunit`` arguments. If you're not satisfied by
+these, you can use EUNIT_OPT environment variable to specify exact `rebar eunit`
+options::
+
+ make eunit EUNIT_OPTS="apps=couch,chttpd"
+
+JavaScript tests accepts only `suites` option, but in the same way::
+
+ # Run all JavaScript tests
+ make javascript
+
+ # Run only basic and design_options tests
+ make javascript suites="basic design_options"
+
+Note that tests are delimited here by whitespace, not by comma. You can get list
+of all possible test targets with the following command::
+
+ make list-js-suites
+
+Code analyzer could be run by::
+
+ make dialyze
+
+If you need to analyze only specific apps, you can specify them in familiar way
+::
+
+ make dialyze apps=couch,couch_epi
+
+See ``make help`` for more info and useful commands.
+
+Please report any problems to the developer's mailing list.
+
+Testing a cluster
+-----------------
+
+We use `Docker <https://docker.io>`_ to safely run a local three node
+cluster all inside a single docker container.
+
+Assuming you have Docker installed and running::
+
+ make docker-image
+
+This will create a docker image (tagged 'couchdb/dev-cluster') capable
+of running a joined three node cluster.
+
+To start it up::
+
+ make docker-start
+
+A three node cluster should now be running (you can now use ``docker ps``
+to find the exposed ports of the nodes).
+
+To stop it::
+
+ make docker-stop
+
+Releasing
+---------
+
+The release procedure is documented here::
+
+ https://wiki.apache.org/couchdb/Release_Procedure
+
+Unix-like Systems
+~~~~~~~~~~~~~~~~~
+
+Prepare the release artefacts by running::
+
+ make distcheck
+
+You can prepare signed release artefacts by running::
+
+ make distsign
+
+The release artefacts can be found in the root source directory.
+
+Microsoft Windows
+~~~~~~~~~~~~~~~~~
+
+Prepare the release artefacts by running::
+
+ make dist
+
+The release artefacts can be found in the `etc/windows` directory.
+
+Until the build system has been improved, you must make sure that you run this
+command from a clean source checkout. If you do not, your test database and log
+files will be bundled up in the release artefact.
[25/50] couchdb commit: updated refs/heads/2876-js-tests to bd19653
Posted by kx...@apache.org.
Reorganize Makefile commands
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/9acb1740
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/9acb1740
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/9acb1740
Branch: refs/heads/2876-js-tests
Commit: 9acb174022dceec5dc0e6b906da8365dbe04ccc7
Parents: d6f1937
Author: Alexander Shorin <kx...@apache.org>
Authored: Sat Oct 17 00:51:27 2015 +0300
Committer: Alexander Shorin <kx...@apache.org>
Committed: Mon Oct 19 13:47:39 2015 +0300
----------------------------------------------------------------------
Makefile | 190 ++++++++++++++++++++++++++++++++++++----------------------
1 file changed, 117 insertions(+), 73 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/9acb1740/Makefile
----------------------------------------------------------------------
diff --git a/Makefile b/Makefile
index 178233b..11dd5e3 100644
--- a/Makefile
+++ b/Makefile
@@ -19,34 +19,85 @@ COUCHDB_VERSION = $(vsn_major).$(vsn_minor).$(vsn_patch)$(COUCHDB_VERSION_SUFFIX
DESTDIR=
+
+################################################################################
+# Main commands
+################################################################################
+
+
all: couch fauxton docs
-config.erl:
- @echo "Apache CouchDB has not been configured."
- @echo "Try \"./configure -h\" for help."
- @echo
- @false
+
+################################################################################
+# Building
+################################################################################
+
couch: config.erl
- @${REBAR} compile
+ @$(REBAR) compile
@cp src/couch/priv/couchjs bin/
-clean:
- @${REBAR} -r clean
- @rm -f bin/couchjs
- @rm -rf src/*/ebin
- @rm -rf src/*/.rebar
- @rm -rf src/*/priv/*.so
- @rm -rf src/couch/priv/{couchspawnkillable,couchjs}
- @rm -rf share/server/main.js share/server/main-coffee.js
- @rm -rf tmp dev/data dev/lib dev/logs
- @rm -f src/couch/priv/couchspawnkillable
- @rm -f src/couch/priv/couch_js/config.h
- @rm -f dev/boot_node.beam dev/pbkdf2.pyc log/crash.log
+
+docs: src/docs/build
+
+
+fauxton: share/www
+
+
+################################################################################
+# Testing
+################################################################################
+
check: javascript eunit build-test
-# creates a full erlang release
+
+eunit: export BUILDDIR = $(shell pwd)
+eunit: export ERL_AFLAGS = -config $(shell pwd)/rel/files/eunit.config
+eunit: couch
+ @$(REBAR) setup_eunit 2> /dev/null
+ @$(REBAR) -r eunit skip_deps=meck,mochiweb,lager,snappy,folsom,proper $(EUNIT_OPTS)
+
+
+javascript: all
+ # TODO: Fix tests to look for these files in their new path
+ @mkdir -p share/www/script/test
+ @cp test/javascript/tests/lorem*.txt share/www/script/test/
+ @dev/run -q --with-admin-party-please test/javascript/run
+ @rm -rf share/www/script
+
+
+build-test:
+ @test/build/test-configure.sh
+
+
+################################################################################
+# Developing
+################################################################################
+
+
+docker-image:
+ @docker build --rm -t couchdb/dev-cluster .
+
+
+docker-start:
+ @docker run -d -P -t couchdb/dev-cluster > .docker-id
+
+
+docker-stop:
+ @docker stop `cat .docker-id`
+
+
+introspect:
+ @$(REBAR) -r update-deps
+ @./introspect
+
+
+################################################################################
+# Distributing
+################################################################################
+
+
dist: all
@./build-aux/couchdb-build-release.sh $(COUCHDB_VERSION)
@@ -61,30 +112,15 @@ dist: all
@mkdir -p apache-couchdb-$(COUCHDB_VERSION)/share/docs/info
@cp src/docs/build/texinfo/CouchDB.info apache-couchdb-$(COUCHDB_VERSION)/share/docs/info/
-# Tar!
@tar czf apache-couchdb-$(COUCHDB_VERSION).tar.gz apache-couchdb-$(COUCHDB_VERSION)
@echo "Done: apache-couchdb-$(COUCHDB_VERSION).tar.gz"
-distclean: clean
- @rm -f install.mk
- @rm -f config.erl
- @rm -f rel/couchdb.config
-ifneq ($(IN_RELEASE), true)
-# when we are in a release, don’t delete the
-# copied sources, generated docs, or fauxton
- @rm -rf rel/couchdb
- @rm -rf share/www
- @rm -rf src/docs
-endif
-
-devclean:
- @rm -rf dev/lib/*/data
-include install.mk
install: all
@echo "Installing CouchDB into $(DESTDIR)/$(install_dir)..." | sed -e 's,///,/,'
@rm -rf rel/couchdb
- @${REBAR} generate # make full erlang release
+ @$(REBAR) generate # make full erlang release
@mkdir -p $(DESTDIR)/$(install_dir)
@cp -R rel/couchdb/* $(DESTDIR)/$(install_dir)
@@ -125,6 +161,44 @@ install: all
@echo "...done"
+
+################################################################################
+# Cleaning
+################################################################################
+
+
+clean:
+ @$(REBAR) -r clean
+ @rm -f bin/couchjs
+ @rm -rf src/*/ebin
+ @rm -rf src/*/.rebar
+ @rm -rf src/*/priv/*.so
+ @rm -rf src/couch/priv/{couchspawnkillable,couchjs}
+ @rm -rf share/server/main.js share/server/main-coffee.js
+ @rm -rf tmp dev/data dev/lib dev/logs
+ @rm -f src/couch/priv/couchspawnkillable
+ @rm -f src/couch/priv/couch_js/config.h
+ @rm -f dev/boot_node.beam dev/pbkdf2.pyc log/crash.log
+
+
+
+distclean: clean
+ @rm -f install.mk
+ @rm -f config.erl
+ @rm -f rel/couchdb.config
+ifneq ($(IN_RELEASE), true)
+# when we are in a release, don’t delete the
+# copied sources, generated docs, or fauxton
+ @rm -rf rel/couchdb
+ @rm -rf share/www
+ @rm -rf src/docs
+endif
+
+
+devclean:
+ @rm -rf dev/lib/*/data
+
+
uninstall:
@rm -rf $(DESTDIR)/$(install_dir)
@rm -f $(DESTDIR)/$(bin_dir)/couchdb
@@ -137,57 +211,27 @@ uninstall:
@rm -rf $(DESTDIR)/$(man_dir)
@rm -rf $(DESTDIR)/$(info_dir)
-install.mk:
-# ignore install.mk missing if we are running
-# `make clean` without having run ./configure first
-ifneq ($(MAKECMDGOALS), clean)
- @echo "No install.mk found. Run ./configure"
- @exit 1
-endif
-
-docker-image:
- @docker build --rm -t couchdb/dev-cluster .
-
-docker-start:
- @docker run -d -P -t couchdb/dev-cluster > .docker-id
-docker-stop:
- @docker stop `cat .docker-id`
-
-eunit: export BUILDDIR = $(shell pwd)
-eunit: export ERL_AFLAGS = -config $(shell pwd)/rel/files/eunit.config
-eunit: couch
- @${REBAR} setup_eunit 2> /dev/null
- @${REBAR} -r eunit skip_deps=meck,mochiweb,lager,snappy,folsom,proper $(EUNIT_OPTS)
+################################################################################
+# Misc
+################################################################################
-javascript: all
- # TODO: Fix tests to look for these files in their new path
- @mkdir -p share/www/script/test
- @cp test/javascript/tests/lorem*.txt share/www/script/test/
- @dev/run -q --with-admin-party-please test/javascript/run
- @rm -rf share/www/script
-build-test:
- @test/build/test-configure.sh
+config.erl:
+ @echo "Apache CouchDB has not been configured."
+ @echo "Try \"./configure -h\" for help."
+ @echo
+ @false
-# build docs
-docs: src/docs/build
src/docs/build:
ifeq ($(with_docs), 1)
@cd src/docs; $(MAKE)
endif
-# build fauxton
-fauxton: share/www
share/www:
ifeq ($(with_fauxton), 1)
@echo "Building Fauxton"
@cd src/fauxton && npm install && ./node_modules/grunt-cli/bin/grunt couchdb
endif
-
-.PHONY: introspect
-introspect:
- ${REBAR} -r update-deps
- ./introspect
[21/50] couchdb commit: updated refs/heads/2876-js-tests to bd19653
Posted by kx...@apache.org.
Test filtered replication
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/22f7d0c8
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/22f7d0c8
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/22f7d0c8
Branch: refs/heads/2876-js-tests
Commit: 22f7d0c86302c1d2bcc68b4a9f4cb38532424167
Parents: 5fb8346
Author: Alexander Shorin <kx...@apache.org>
Authored: Sun Oct 18 03:07:20 2015 +0300
Committer: Alexander Shorin <kx...@apache.org>
Committed: Sun Oct 18 03:07:20 2015 +0300
----------------------------------------------------------------------
rebar.config.script | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/22f7d0c8/rebar.config.script
----------------------------------------------------------------------
diff --git a/rebar.config.script b/rebar.config.script
index c6f6a45..a0ba193 100644
--- a/rebar.config.script
+++ b/rebar.config.script
@@ -34,7 +34,7 @@ DepDescs = [
{couch, "couch", "79b5243aef9fc722c86fb1d7988a401babd9540c"},
{couch_index, "couch-index", "14f579dcd142ee90300244c854b301bbd5c863ee"},
{couch_mrview, "couch-mrview", "f089832ea7f759b4e655051025cc48522fee9e1b"},
-{couch_replicator, "couch-replicator", "56422436762c8fa3cc4081311f9a10ea06826443"},
+{couch_replicator, "couch-replicator", "e58f535ca611acb40bb620ee2f6a3da4c187bcf7"},
{couch_plugins, "couch-plugins", "3e73b723cb126cfc471b560d17c24a8b5c540085"},
{couch_event, "couch-event", "835a41885d1e276d207758954f8238aa7bba0ae8"},
{couch_stats, "couch-stats", "7895d4d3f509ed24f09b6d1a0bd0e06af34551dc"},
[13/50] couchdb commit: updated refs/heads/2876-js-tests to bd19653
Posted by kx...@apache.org.
Handle race condition in couch_replicator compaction tests
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/9c48e43a
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/9c48e43a
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/9c48e43a
Branch: refs/heads/2876-js-tests
Commit: 9c48e43a55cbc7bd51aa7c93aa146bc573ceda26
Parents: a4059af
Author: Alexander Shorin <kx...@apache.org>
Authored: Fri Oct 16 22:08:21 2015 +0300
Committer: Alexander Shorin <kx...@apache.org>
Committed: Fri Oct 16 22:08:21 2015 +0300
----------------------------------------------------------------------
rebar.config.script | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/9c48e43a/rebar.config.script
----------------------------------------------------------------------
diff --git a/rebar.config.script b/rebar.config.script
index 728e1bc..61e5e63 100644
--- a/rebar.config.script
+++ b/rebar.config.script
@@ -34,7 +34,7 @@ DepDescs = [
{couch, "couch", "79b5243aef9fc722c86fb1d7988a401babd9540c"},
{couch_index, "couch-index", "14f579dcd142ee90300244c854b301bbd5c863ee"},
{couch_mrview, "couch-mrview", "f089832ea7f759b4e655051025cc48522fee9e1b"},
-{couch_replicator, "couch-replicator", "e2ecd854eabe8202b2d413b612125c3dcf9176e0"},
+{couch_replicator, "couch-replicator", "f02919206e97f9adc7d6379accd0c406dccf2118"},
{couch_plugins, "couch-plugins", "3e73b723cb126cfc471b560d17c24a8b5c540085"},
{couch_event, "couch-event", "835a41885d1e276d207758954f8238aa7bba0ae8"},
{couch_stats, "couch-stats", "7895d4d3f509ed24f09b6d1a0bd0e06af34551dc"},
[34/50] couchdb commit: updated refs/heads/2876-js-tests to bd19653
Posted by kx...@apache.org.
Escape database name on POST /_replicate
COUCHDB-2666
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/63e88590
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/63e88590
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/63e88590
Branch: refs/heads/2876-js-tests
Commit: 63e885908b0e9cf87b4fbba6664a129e73edb1d0
Parents: 4cc1ad6
Author: Alexander Shorin <kx...@apache.org>
Authored: Thu Oct 22 21:54:03 2015 +0300
Committer: Alexander Shorin <kx...@apache.org>
Committed: Thu Oct 22 21:54:03 2015 +0300
----------------------------------------------------------------------
rebar.config.script | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/63e88590/rebar.config.script
----------------------------------------------------------------------
diff --git a/rebar.config.script b/rebar.config.script
index 8f3b63a..81eb943 100644
--- a/rebar.config.script
+++ b/rebar.config.script
@@ -30,7 +30,7 @@ DepDescs = [
{couch_log, "couch-log", "fb4157370403c4c97f19d958a51c889950a66a94"},
{couch_log_lager, "couch-log-lager", "b2a0471a87765de50c5eb05c65c121f68a9ae9fa"},
{config, "config", "b2ecd0d47a776256956ce045123423494ff85e8e"},
-{chttpd, "chttpd", "5482209016f4016cb0a8f204088acf85f1057812"},
+{chttpd, "chttpd", "7a2bd8f31d4801d86cef0243d91d20a4c9ccbc22"},
{couch, "couch", "acfd7cb0c709345f396cbcb696b6305091dfac12"},
{couch_index, "couch-index", "14f579dcd142ee90300244c854b301bbd5c863ee"},
{couch_mrview, "couch-mrview", "2ec52eb3d8e187f5e9dfcaf8ab0dff55e40cd647"},
[12/50] couchdb commit: updated refs/heads/2876-js-tests to bd19653
Posted by kx...@apache.org.
Fix flaky couch_os_daemon tests
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/a4059af3
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/a4059af3
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/a4059af3
Branch: refs/heads/2876-js-tests
Commit: a4059af333b07211693d4db37f57293bf0cec8bc
Parents: 047a50b
Author: Alexander Shorin <kx...@apache.org>
Authored: Fri Oct 16 18:59:23 2015 +0300
Committer: Alexander Shorin <kx...@apache.org>
Committed: Fri Oct 16 18:59:23 2015 +0300
----------------------------------------------------------------------
rebar.config.script | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/a4059af3/rebar.config.script
----------------------------------------------------------------------
diff --git a/rebar.config.script b/rebar.config.script
index d3f5377..728e1bc 100644
--- a/rebar.config.script
+++ b/rebar.config.script
@@ -31,7 +31,7 @@ DepDescs = [
{couch_log_lager, "couch-log-lager", "b2a0471a87765de50c5eb05c65c121f68a9ae9fa"},
{config, "config", "b2ecd0d47a776256956ce045123423494ff85e8e"},
{chttpd, "chttpd", "5482209016f4016cb0a8f204088acf85f1057812"},
-{couch, "couch", "de590ccdc83028394a935829d04aaee9da6f18d2"},
+{couch, "couch", "79b5243aef9fc722c86fb1d7988a401babd9540c"},
{couch_index, "couch-index", "14f579dcd142ee90300244c854b301bbd5c863ee"},
{couch_mrview, "couch-mrview", "f089832ea7f759b4e655051025cc48522fee9e1b"},
{couch_replicator, "couch-replicator", "e2ecd854eabe8202b2d413b612125c3dcf9176e0"},
[48/50] couchdb commit: updated refs/heads/2876-js-tests to bd19653
Posted by kx...@apache.org.
Fix Fauxton tag name
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/3b82cbcb
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/3b82cbcb
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/3b82cbcb
Branch: refs/heads/2876-js-tests
Commit: 3b82cbcb5e286921f6f60a2aaf21b101e618e8b6
Parents: e796a95
Author: Alexander Shorin <kx...@apache.org>
Authored: Tue Nov 10 02:51:20 2015 +0300
Committer: Alexander Shorin <kx...@apache.org>
Committed: Tue Nov 10 02:52:41 2015 +0300
----------------------------------------------------------------------
rebar.config.script | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/3b82cbcb/rebar.config.script
----------------------------------------------------------------------
diff --git a/rebar.config.script b/rebar.config.script
index 6a57fe5..21b0b34 100644
--- a/rebar.config.script
+++ b/rebar.config.script
@@ -43,7 +43,7 @@ DepDescs = [
{ddoc_cache, "ddoc-cache", "c762e90a33ce3cda19ef142dd1120f1087ecd876"},
{ets_lru, "ets-lru", "c05488c8b1d7ec1c3554a828e0c9bf2888932ed6"},
{fabric, "fabric", "4c94f3095595a50a71860a75cc8866adb9a28ce3"},
-{fauxton, "fauxton", {tag, "1.0.6"}, [raw]},
+{fauxton, "fauxton", {tag, "v1.0.6"}, [raw]},
{folsom, "folsom", "a5c95dec18227c977029fbd3b638966d98f17003"},
{global_changes, "global-changes", "e55de37ece29b6cbc0af540370d2425159338bf9"},
{goldrush, "goldrush", {tag, "0.1.6"}},
[02/50] couchdb commit: updated refs/heads/2876-js-tests to bd19653
Posted by kx...@apache.org.
Add EUNIT_OPTS variable for to pass options to eunit tests
make eunit EUNIT_OPTS='apps=couch_replicator'
Signed-off-by: Alexander Shorin <kx...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/6624b688
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/6624b688
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/6624b688
Branch: refs/heads/2876-js-tests
Commit: 6624b688e05207fb9a6d5d7294ccd6bcfab59556
Parents: ae95441
Author: Nick Vatamaniuc <va...@gmail.com>
Authored: Wed Oct 14 13:02:45 2015 -0400
Committer: Alexander Shorin <kx...@apache.org>
Committed: Wed Oct 14 20:14:15 2015 +0300
----------------------------------------------------------------------
Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/6624b688/Makefile
----------------------------------------------------------------------
diff --git a/Makefile b/Makefile
index f7b14e7..2b6d31f 100644
--- a/Makefile
+++ b/Makefile
@@ -158,7 +158,7 @@ eunit: export BUILDDIR = $(shell pwd)
eunit: export ERL_AFLAGS = -config $(shell pwd)/rel/files/eunit.config
eunit: couch
@${REBAR} setup_eunit
- @${REBAR} -r eunit skip_deps=meck,mochiweb,lager,snappy,folsom,proper
+ @${REBAR} -r eunit skip_deps=meck,mochiweb,lager,snappy,folsom,proper $(EUNIT_OPTS)
javascript: all
# TODO: Fix tests to look for these files in their new path
[04/50] couchdb commit: updated refs/heads/2876-js-tests to bd19653
Posted by kx...@apache.org.
Update Erlang requirements
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/972014bd
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/972014bd
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/972014bd
Branch: refs/heads/2876-js-tests
Commit: 972014bdfb74a2cb1a03146d8d408370b4da0869
Parents: eb9918d
Author: Alexander Shorin <kx...@apache.org>
Authored: Thu Oct 15 17:50:14 2015 +0300
Committer: Alexander Shorin <kx...@apache.org>
Committed: Thu Oct 15 17:53:58 2015 +0300
----------------------------------------------------------------------
INSTALL.Unix.md | 4 ++--
INSTALL.Windows.md | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/972014bd/INSTALL.Unix.md
----------------------------------------------------------------------
diff --git a/INSTALL.Unix.md b/INSTALL.Unix.md
index aa38174..c6de87a 100644
--- a/INSTALL.Unix.md
+++ b/INSTALL.Unix.md
@@ -39,7 +39,7 @@ Dependencies
You should have the following installed:
- * Erlang OTP (>=R14B01, =<R17) (http://erlang.org/)
+ * Erlang OTP (>=R16B03-1, =<18.1) (http://erlang.org/)
* ICU (http://icu-project.org/)
* OpenSSL (http://www.openssl.org/)
* Mozilla SpiderMonkey (1.8.5) (http://www.mozilla.org/js/spidermonkey/)
@@ -50,7 +50,7 @@ You should have the following installed:
* Python (>=2.7) for docs (http://python.org/)
* Python Sphinx (>=1.1.3) (http://pypi.python.org/pypi/Sphinx)
-It is recommended that you install Erlang OTP R13B-4 or above where
+It is recommended that you install Erlang OTP R16B03-1 or above where
possible. You will only need libcurl if you plan to run the
JavaScript test suite. And help2man is only need if you plan on
installing the CouchDB man pages. Python and Sphinx are only required
http://git-wip-us.apache.org/repos/asf/couchdb/blob/972014bd/INSTALL.Windows.md
----------------------------------------------------------------------
diff --git a/INSTALL.Windows.md b/INSTALL.Windows.md
index 29c69b0..7622eac 100644
--- a/INSTALL.Windows.md
+++ b/INSTALL.Windows.md
@@ -29,7 +29,7 @@ Dependencies
You will need the following installed:
- * Erlang OTP (>=14B01, <R17) (http://erlang.org/)
+ * Erlang OTP (>=R16B03-1, =<18.1) (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/)
[15/50] couchdb commit: updated refs/heads/2876-js-tests to bd19653
Posted by kx...@apache.org.
Add targets to list possible tests candidates
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/d4ac4c42
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/d4ac4c42
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/d4ac4c42
Branch: refs/heads/2876-js-tests
Commit: d4ac4c42efcf225dfd6686954e9973d6f6072f30
Parents: de72658
Author: Alexander Shorin <kx...@apache.org>
Authored: Sat Oct 17 20:50:44 2015 +0300
Committer: Alexander Shorin <kx...@apache.org>
Committed: Sat Oct 17 20:50:44 2015 +0300
----------------------------------------------------------------------
Makefile | 26 +++++++++++++++++++++++++-
1 file changed, 25 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/d4ac4c42/Makefile
----------------------------------------------------------------------
diff --git a/Makefile b/Makefile
index bf24ed4..3387232 100644
--- a/Makefile
+++ b/Makefile
@@ -53,7 +53,7 @@ help:
@egrep "^# target: " Makefile \
| sed -e 's/^# target: //g' \
| sort \
- | awk '{printf(" %-15s", $$1); $$1=$$2=""; print "-" $$0}'
+ | awk '{printf(" %-20s", $$1); $$1=$$2=""; print "-" $$0}'
################################################################################
@@ -106,6 +106,30 @@ javascript: all share/www/script/test
@dev/run -q --with-admin-party-please test/javascript/run $(suites)
+.PHONY: list-eunit-apps
+# target: list-eunit-apps - List EUnit target apps
+list-eunit-apps:
+ @find ./src/ -type f -name *_test.erl -o -name *_tests.erl \
+ | cut -d '/' -f 3 \
+ | sort -u
+
+
+.PHONY: list-eunit-suites
+# target: list-eunit-suites - List EUnit target test suites
+list-eunit-suites:
+ @find ./src/ -type f -name *_test.erl -o -name *_tests.erl -printf "%f\n" \
+ | cut -d '.' -f -1 \
+ | sort
+
+
+.PHONY: list-js-suites
+# target: list-js-suites - List JavaScript test suites
+list-js-suites:
+ @find ./test/javascript/tests/ -type f -name *.js -printf "%f\n" \
+ | cut -d '.' -f -1 \
+ | sort
+
+
.PHONY: build-test
# target: build-test - Test build script
build-test:
[42/50] couchdb commit: updated refs/heads/2876-js-tests to bd19653
Posted by kx...@apache.org.
Update Fauxton to 1.0.6 release
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/d9642114
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/d9642114
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/d9642114
Branch: refs/heads/2876-js-tests
Commit: d9642114dd38af1e332f5614e5f8312470d6753c
Parents: a8146e0
Author: Alexander Shorin <kx...@apache.org>
Authored: Tue Nov 10 02:15:27 2015 +0300
Committer: Alexander Shorin <kx...@apache.org>
Committed: Tue Nov 10 02:15:27 2015 +0300
----------------------------------------------------------------------
rebar.config.script | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/d9642114/rebar.config.script
----------------------------------------------------------------------
diff --git a/rebar.config.script b/rebar.config.script
index 153735f..facf6e0 100644
--- a/rebar.config.script
+++ b/rebar.config.script
@@ -43,7 +43,7 @@ DepDescs = [
{ddoc_cache, "ddoc-cache", "c762e90a33ce3cda19ef142dd1120f1087ecd876"},
{ets_lru, "ets-lru", "c05488c8b1d7ec1c3554a828e0c9bf2888932ed6"},
{fabric, "fabric", "4c94f3095595a50a71860a75cc8866adb9a28ce3"},
-{fauxton, "fauxton", "ebd9ced89d27de297526acf74ebad88f1c6a6711", [raw]},
+{fauxton, "fauxton", {tag, "1.0.6"}, [raw]},
{folsom, "folsom", "a5c95dec18227c977029fbd3b638966d98f17003"},
{global_changes, "global-changes", "e55de37ece29b6cbc0af540370d2425159338bf9"},
{goldrush, "goldrush", {tag, "0.1.6"}},
[22/50] couchdb commit: updated refs/heads/2876-js-tests to bd19653
Posted by kx...@apache.org.
Add CSRF protection for mrview endpoints
COUCHDB-2775
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/d83cb4c5
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/d83cb4c5
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/d83cb4c5
Branch: refs/heads/2876-js-tests
Commit: d83cb4c50c4c655829b315f483a97c4ad625404f
Parents: 22f7d0c
Author: Alexander Shorin <kx...@apache.org>
Authored: Sun Oct 18 03:18:40 2015 +0300
Committer: Alexander Shorin <kx...@apache.org>
Committed: Sun Oct 18 03:18:40 2015 +0300
----------------------------------------------------------------------
rebar.config.script | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/d83cb4c5/rebar.config.script
----------------------------------------------------------------------
diff --git a/rebar.config.script b/rebar.config.script
index a0ba193..a9d5655 100644
--- a/rebar.config.script
+++ b/rebar.config.script
@@ -33,7 +33,7 @@ DepDescs = [
{chttpd, "chttpd", "5482209016f4016cb0a8f204088acf85f1057812"},
{couch, "couch", "79b5243aef9fc722c86fb1d7988a401babd9540c"},
{couch_index, "couch-index", "14f579dcd142ee90300244c854b301bbd5c863ee"},
-{couch_mrview, "couch-mrview", "f089832ea7f759b4e655051025cc48522fee9e1b"},
+{couch_mrview, "couch-mrview", "2ec52eb3d8e187f5e9dfcaf8ab0dff55e40cd647"},
{couch_replicator, "couch-replicator", "e58f535ca611acb40bb620ee2f6a3da4c187bcf7"},
{couch_plugins, "couch-plugins", "3e73b723cb126cfc471b560d17c24a8b5c540085"},
{couch_event, "couch-event", "835a41885d1e276d207758954f8238aa7bba0ae8"},
[19/50] couchdb commit: updated refs/heads/2876-js-tests to bd19653
Posted by kx...@apache.org.
Return HTTP 405 for unknown/unsupported request method
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/70377d5b
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/70377d5b
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/70377d5b
Branch: refs/heads/2876-js-tests
Commit: 70377d5b7870cba8a86a4e2f0561d3473d1bffa7
Parents: 9c910db
Author: Alexander Shorin <kx...@apache.org>
Authored: Sun Oct 18 00:49:48 2015 +0300
Committer: Alexander Shorin <kx...@apache.org>
Committed: Sun Oct 18 00:49:48 2015 +0300
----------------------------------------------------------------------
rebar.config.script | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/70377d5b/rebar.config.script
----------------------------------------------------------------------
diff --git a/rebar.config.script b/rebar.config.script
index 07f57c4..568a274 100644
--- a/rebar.config.script
+++ b/rebar.config.script
@@ -51,13 +51,13 @@ DepDescs = [
{ioq, "ioq", "c7c75ebeaf41599e3a3e211097d864f0e7785829"},
{jiffy, "jiffy", "ea19c417f9fd52fa3f7ef2d378735e5532c59b29"},
{khash, "khash", "7c6a9cd9776b5c6f063ccafedfa984b00877b019"},
-{mango, "mango", "0cc0fb8d2c2e04a4df5a1e7deb198abc78266a97"},
-{mem3, "mem3", "de5f32815d3a3136e43924e4723d7e3e0eb02c6e"},
+{mango, "mango", "a297e2e9e2c006381f982e73a08fff29c4f8db8f"},
+{mem3, "mem3", "80fd81b3350dc96918b460b3bfb646fddade80f2"},
{mochiweb, "mochiweb", "bd6ae7cbb371666a1f68115056f7b30d13765782"},
{oauth, "oauth", "099057a98e41f3aff91e77e3cf496d6c6fd901df"},
{rexi, "rexi", "a327b7dbeb2b0050f7ca9072047bf8ef2d282833"},
{snappy, "snappy", "0ab2796f82789895a2a86d403e63f3823d3c5a1d"},
-{setup, "setup", "d0a9b722485639fc43ccbfc4267f3a2dd9aa9d5a"},
+{setup, "setup", "b9e1f3b5d5a78a706abb358e17130fb7344567d2"},
{meck, "meck", {tag, "0.8.2"}}
],
[16/50] couchdb commit: updated refs/heads/2876-js-tests to bd19653
Posted by kx...@apache.org.
Improve testing instructions
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/c071df98
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/c071df98
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/c071df98
Branch: refs/heads/2876-js-tests
Commit: c071df98e64cd38ca1d4255f64b618906beb1e8e
Parents: d4ac4c4
Author: Alexander Shorin <kx...@apache.org>
Authored: Sun Oct 18 00:36:02 2015 +0300
Committer: Alexander Shorin <kx...@apache.org>
Committed: Sun Oct 18 00:36:02 2015 +0300
----------------------------------------------------------------------
README-DEV.md | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++---
1 file changed, 56 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/c071df98/README-DEV.md
----------------------------------------------------------------------
diff --git a/README-DEV.md b/README-DEV.md
index 81cfc4a..66e30c3 100644
--- a/README-DEV.md
+++ b/README-DEV.md
@@ -119,16 +119,69 @@ If you want to build it into different destination than `/usr/local`.
./configure --prefix=/<your directory path>
+If you don't want to build Fauxton or documentation specify `--disable-fauxton`
+and/or `--disable-docs` arguments for `configure` to ignore their build and
+avoid any issues with their dependencies.
+
+See `./configure --help` for more information.
+
Testing
-------
-Check the test suite by running:
+To run all the tests use run:
make check
-Generate a coverage report by running:
+You can also run each test suite individually via `eunit` and `javascript`
+targets:
+
+ make eunit
+ make javascript
+
+If you need to run specific Erlang tests, you can pass special "options"
+to make targets:
+
+ # Run tests only for couch and chttpd apps
+ make eunit apps=couch,chttpd
+
+ # Run only tests from couch_btree_tests suite
+ make eunit suites=couch_btree_tests
+
+ # Run only only specific tests
+ make eunit tests=btree_open_test,reductions_test
+
+ # Ignore tests for specified apps
+ make eunit skip_deps=couch_log,couch_epi
+
+The `apps`, `suites`, `tests` and `skip_deps` could be combined in any way.
+These are mimics to `rebar eunit` arguments. If you're not satisfied by these,
+you can use EUNIT_OPT environment variable to specify exact `rebar eunit`
+options:
+
+ make eunit EUNIT_OPTS="apps=couch,chttpd"
+
+JavaScript tests accepts only `suites` option, but in the same way
+
+ # Run all JavaScript tests
+ make javascript
+
+ # Run only basic and design_options tests
+ make javascript suites="basic design_options"
+
+Note that tests are delimited here by whitespace, not by comma. You can get list
+of all possible test targets with the following command:
+
+ make list-js-suites
+
+Code analyzer could be run by:
+
+ make dialyze
+
+If you need to analyze only specific apps, you can specify them in familiar way:
+
+ make dialyze apps=couch,couch_epi
- make cover
+See `make help` for more info and useful commands.
Please report any problems to the developer's mailing list.
[49/50] couchdb commit: updated refs/heads/2876-js-tests to bd19653
Posted by kx...@apache.org.
Update snappy to 1.1.3 and fix compilation warnings
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/486181f8
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/486181f8
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/486181f8
Branch: refs/heads/2876-js-tests
Commit: 486181f87b4150c3cf2c31dd5045d4f1010ec643
Parents: 3b82cbc
Author: Alexander Shorin <kx...@apache.org>
Authored: Tue Nov 10 03:01:51 2015 +0300
Committer: Alexander Shorin <kx...@apache.org>
Committed: Tue Nov 10 03:01:51 2015 +0300
----------------------------------------------------------------------
rebar.config.script | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/486181f8/rebar.config.script
----------------------------------------------------------------------
diff --git a/rebar.config.script b/rebar.config.script
index 21b0b34..b5df6db 100644
--- a/rebar.config.script
+++ b/rebar.config.script
@@ -56,7 +56,7 @@ DepDescs = [
{mochiweb, "mochiweb", "bd6ae7cbb371666a1f68115056f7b30d13765782"},
{oauth, "oauth", "099057a98e41f3aff91e77e3cf496d6c6fd901df"},
{rexi, "rexi", "a327b7dbeb2b0050f7ca9072047bf8ef2d282833"},
-{snappy, "snappy", "0ab2796f82789895a2a86d403e63f3823d3c5a1d"},
+{snappy, "snappy", "ce24944752ff3a60ad2710f61d4cf709a1b31863"},
{setup, "setup", "b9e1f3b5d5a78a706abb358e17130fb7344567d2"},
{meck, "meck", {tag, "0.8.2"}}
],
[18/50] couchdb commit: updated refs/heads/2876-js-tests to bd19653
Posted by kx...@apache.org.
Add CSRF protection for mango endpoints
COUCHDB-2775
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/9c910db6
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/9c910db6
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/9c910db6
Branch: refs/heads/2876-js-tests
Commit: 9c910db69f088dfff180e10cc93624a0db7439b3
Parents: 56f845a
Author: Alexander Shorin <kx...@apache.org>
Authored: Sun Oct 18 00:46:02 2015 +0300
Committer: Alexander Shorin <kx...@apache.org>
Committed: Sun Oct 18 00:46:02 2015 +0300
----------------------------------------------------------------------
rebar.config.script | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/9c910db6/rebar.config.script
----------------------------------------------------------------------
diff --git a/rebar.config.script b/rebar.config.script
index ddf872f..07f57c4 100644
--- a/rebar.config.script
+++ b/rebar.config.script
@@ -51,7 +51,7 @@ DepDescs = [
{ioq, "ioq", "c7c75ebeaf41599e3a3e211097d864f0e7785829"},
{jiffy, "jiffy", "ea19c417f9fd52fa3f7ef2d378735e5532c59b29"},
{khash, "khash", "7c6a9cd9776b5c6f063ccafedfa984b00877b019"},
-{mango, "mango", "0dd2000f666e49204b0429a81f660de237aaeccf"},
+{mango, "mango", "0cc0fb8d2c2e04a4df5a1e7deb198abc78266a97"},
{mem3, "mem3", "de5f32815d3a3136e43924e4723d7e3e0eb02c6e"},
{mochiweb, "mochiweb", "bd6ae7cbb371666a1f68115056f7b30d13765782"},
{oauth, "oauth", "099057a98e41f3aff91e77e3cf496d6c6fd901df"},
[20/50] couchdb commit: updated refs/heads/2876-js-tests to bd19653
Posted by kx...@apache.org.
Fix dialyzer warnings
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/5fb8346f
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/5fb8346f
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/5fb8346f
Branch: refs/heads/2876-js-tests
Commit: 5fb8346f0910fd9c4ca3b5eb7946e2c09d948e16
Parents: 70377d5
Author: Alexander Shorin <kx...@apache.org>
Authored: Sun Oct 18 01:16:28 2015 +0300
Committer: Alexander Shorin <kx...@apache.org>
Committed: Sun Oct 18 01:16:28 2015 +0300
----------------------------------------------------------------------
rebar.config.script | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/5fb8346f/rebar.config.script
----------------------------------------------------------------------
diff --git a/rebar.config.script b/rebar.config.script
index 568a274..c6f6a45 100644
--- a/rebar.config.script
+++ b/rebar.config.script
@@ -23,7 +23,7 @@ os:putenv("COUCHDB_APPS_CONFIG_DIR", filename:join([COUCHDB_ROOT, "rel/apps"])).
DepDescs = [
%% must be compiled first as it has a custom behavior
-{couch_epi, "couch-epi", "be34447c5ba0e474d851858b5346b33f864788e6"},
+{couch_epi, "couch-epi", "c359a6900c193211a77004df9a31c2ad4bcddf9d"},
%% keep these sorted
{b64url, "b64url", "319fc604235ab1fde37047b38a432450161db750"},
{cassim, "cassim", "1ae21f7c415acf3d1aba8b4924ca3093014b86b1"},
[23/50] couchdb commit: updated refs/heads/2876-js-tests to bd19653
Posted by kx...@apache.org.
Fix race condition in couch_work_queue tests suite
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/734a1207
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/734a1207
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/734a1207
Branch: refs/heads/2876-js-tests
Commit: 734a12072e90529c43da1307ba9b769039759327
Parents: d83cb4c
Author: Alexander Shorin <kx...@apache.org>
Authored: Mon Oct 19 11:09:01 2015 +0300
Committer: Alexander Shorin <kx...@apache.org>
Committed: Mon Oct 19 11:09:01 2015 +0300
----------------------------------------------------------------------
rebar.config.script | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/734a1207/rebar.config.script
----------------------------------------------------------------------
diff --git a/rebar.config.script b/rebar.config.script
index a9d5655..8abfaff 100644
--- a/rebar.config.script
+++ b/rebar.config.script
@@ -31,7 +31,7 @@ DepDescs = [
{couch_log_lager, "couch-log-lager", "b2a0471a87765de50c5eb05c65c121f68a9ae9fa"},
{config, "config", "b2ecd0d47a776256956ce045123423494ff85e8e"},
{chttpd, "chttpd", "5482209016f4016cb0a8f204088acf85f1057812"},
-{couch, "couch", "79b5243aef9fc722c86fb1d7988a401babd9540c"},
+{couch, "couch", "acfd7cb0c709345f396cbcb696b6305091dfac12"},
{couch_index, "couch-index", "14f579dcd142ee90300244c854b301bbd5c863ee"},
{couch_mrview, "couch-mrview", "2ec52eb3d8e187f5e9dfcaf8ab0dff55e40cd647"},
{couch_replicator, "couch-replicator", "e58f535ca611acb40bb620ee2f6a3da4c187bcf7"},
[40/50] couchdb commit: updated refs/heads/2876-js-tests to bd19653
Posted by kx...@apache.org.
Fix build when HiPE is enabled
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/5d13771e
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/5d13771e
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/5d13771e
Branch: refs/heads/2876-js-tests
Commit: 5d13771e25ff415e63636fa805055bb5ef96d6ef
Parents: bd07317
Author: Alexander Shorin <kx...@apache.org>
Authored: Thu Oct 29 00:20:31 2015 +0300
Committer: Alexander Shorin <kx...@apache.org>
Committed: Thu Oct 29 00:20:31 2015 +0300
----------------------------------------------------------------------
rebar.config.script | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/5d13771e/rebar.config.script
----------------------------------------------------------------------
diff --git a/rebar.config.script b/rebar.config.script
index c565e88..e678519 100644
--- a/rebar.config.script
+++ b/rebar.config.script
@@ -44,7 +44,7 @@ DepDescs = [
{ets_lru, "ets-lru", "c05488c8b1d7ec1c3554a828e0c9bf2888932ed6"},
{fabric, "fabric", "4c94f3095595a50a71860a75cc8866adb9a28ce3"},
{fauxton, "fauxton", "ebd9ced89d27de297526acf74ebad88f1c6a6711", [raw]},
-{folsom, "folsom", "fbb7bc83806520ffef84107c85f53c1f7113c20d"},
+{folsom, "folsom", "a5c95dec18227c977029fbd3b638966d98f17003"},
{global_changes, "global-changes", "e55de37ece29b6cbc0af540370d2425159338bf9"},
{goldrush, "goldrush", {tag, "0.1.6"}},
{ibrowse, "ibrowse", "4af2d408607874d124414ac45df1edbe3961d1cd"},
[41/50] couchdb commit: updated refs/heads/2876-js-tests to bd19653
Posted by kx...@apache.org.
Update chttpd
Fixes:
COUCHDB-2409
COUCHDB-2674
COUCHDB-2850
COUCHDB-2858
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/a8146e09
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/a8146e09
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/a8146e09
Branch: refs/heads/2876-js-tests
Commit: a8146e097350ce909589b25a71819984a94d1672
Parents: 5d13771
Author: Alexander Shorin <kx...@apache.org>
Authored: Thu Oct 29 17:29:56 2015 +0300
Committer: Alexander Shorin <kx...@apache.org>
Committed: Thu Oct 29 17:29:56 2015 +0300
----------------------------------------------------------------------
rebar.config.script | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/a8146e09/rebar.config.script
----------------------------------------------------------------------
diff --git a/rebar.config.script b/rebar.config.script
index e678519..153735f 100644
--- a/rebar.config.script
+++ b/rebar.config.script
@@ -30,7 +30,7 @@ DepDescs = [
{couch_log, "couch-log", "fb4157370403c4c97f19d958a51c889950a66a94"},
{couch_log_lager, "couch-log-lager", "b2a0471a87765de50c5eb05c65c121f68a9ae9fa"},
{config, "config", "b2ecd0d47a776256956ce045123423494ff85e8e"},
-{chttpd, "chttpd", "06880c35d7812bcfae0861e3f9e08366d550e1cb"},
+{chttpd, "chttpd", "2147dba9c87ae0ae39206009bdb2784108507a16"},
{couch, "couch", "acfd7cb0c709345f396cbcb696b6305091dfac12"},
{couch_index, "couch-index", "14f579dcd142ee90300244c854b301bbd5c863ee"},
{couch_mrview, "couch-mrview", "2ec52eb3d8e187f5e9dfcaf8ab0dff55e40cd647"},
[35/50] couchdb commit: updated refs/heads/2876-js-tests to bd19653
Posted by kx...@apache.org.
add react-bootstrap license
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/45a6c5dd
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/45a6c5dd
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/45a6c5dd
Branch: refs/heads/2876-js-tests
Commit: 45a6c5dd716a4811a07e8d8f0df42bcce48f7777
Parents: 63e8859
Author: Robert Kowalski <ro...@kowalski.gd>
Authored: Sat Oct 24 16:40:41 2015 +0200
Committer: Robert Kowalski <ro...@kowalski.gd>
Committed: Sat Oct 24 16:40:41 2015 +0200
----------------------------------------------------------------------
LICENSE | 24 ++++++++++++++++++++++++
NOTICE | 6 +++++-
2 files changed, 29 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/45a6c5dd/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index 2deab42..6ad7e26 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1408,3 +1408,27 @@ for src/fauxton/assets/js/libs/papaparse.js
COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+for src/fauxton/assets/js/libs/react-bootstrap.js
+
+ The MIT License (MIT)
+
+ Copyright (c) 2014 Stephen J. Collings, Matthew Honnibal, Pieter Vanderwerff
+
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ THE SOFTWARE.
http://git-wip-us.apache.org/repos/asf/couchdb/blob/45a6c5dd/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
index ea5eb56..978ee6e 100644
--- a/NOTICE
+++ b/NOTICE
@@ -190,6 +190,10 @@ This product also includes the following third-party components:
Copyright Mathias Bynens
-* Papaparse.js
+* Papaparse.js
Copyright (c) 2015 Matthew Holt
+
+* react-bootstrap.js
+
+ Copyright (c) 2014 Stephen J. Collings, Matthew Honnibal, Pieter Vanderwerff