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/07/22 07:29:18 UTC
[01/50] couchdb commit: updated refs/heads/developer-preview-2.0 to
2a31bca
Repository: couchdb
Updated Branches:
refs/heads/developer-preview-2.0 16ee3706a -> 2a31bca89
add test for _changes?feed=live
PRs for the change:
https://github.com/apache/couchdb/pull/307
https://github.com/apache/couchdb-couch/pull/40
https://github.com/apache/couchdb-chttpd/pull/28
COUCHDB-2237
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/6da3b560
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/6da3b560
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/6da3b560
Branch: refs/heads/developer-preview-2.0
Commit: 6da3b560cbb5ecba1cf1fb23c34914178abdfec3
Parents: 55daa5c
Author: Robert Kowalski <ro...@kowalski.gd>
Authored: Sun Mar 1 15:40:51 2015 +0100
Committer: Robert Kowalski <ro...@kowalski.gd>
Committed: Sun May 24 14:35:13 2015 +0200
----------------------------------------------------------------------
test/javascript/tests/changes.js | 203 ++++++++++++++++++----------------
1 file changed, 106 insertions(+), 97 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/6da3b560/test/javascript/tests/changes.js
----------------------------------------------------------------------
diff --git a/test/javascript/tests/changes.js b/test/javascript/tests/changes.js
index d5a4236..7877758 100644
--- a/test/javascript/tests/changes.js
+++ b/test/javascript/tests/changes.js
@@ -17,131 +17,140 @@ function jsonp(obj) {
}
couchTests.changes = function(debug) {
- var db = new CouchDB("test_suite_db", {"X-Couch-Full-Commit":"true"});
- db.deleteDb();
- db.createDb();
+ var db;
if (debug) debugger;
- var req = CouchDB.request("GET", "/test_suite_db/_changes");
- var resp = JSON.parse(req.responseText);
+ // poor man's browser detection
+ var is_safari = false;
+ if (typeof (navigator) == "undefined") {
+ is_safari = true; // For CouchHTTP based runners
+ } else if (navigator.userAgent.match(/AppleWebKit/)) {
+ is_safari = true;
+ }
- T(resp.results.length == 0 && resp.last_seq == 0, "empty db");
- var docFoo = {_id:"foo", bar:1};
- T(db.save(docFoo).ok);
- T(db.ensureFullCommit().ok);
- T(db.open(docFoo._id)._id == docFoo._id);
+ testChanges("live");
+ testChanges("continuous");
+ function testChanges(feed) {
+ db = new CouchDB("test_suite_db", {"X-Couch-Full-Commit":"true"});
+ db.deleteDb();
+ db.createDb();
- req = CouchDB.request("GET", "/test_suite_db/_changes");
- var resp = JSON.parse(req.responseText);
+ var req = CouchDB.request("GET", "/test_suite_db/_changes");
+ var resp = JSON.parse(req.responseText);
- T(resp.last_seq == 1);
- T(resp.results.length == 1, "one doc db");
- T(resp.results[0].changes[0].rev == docFoo._rev);
+ T(resp.results.length == 0 && resp.last_seq == 0, "empty db");
+ var docFoo = {_id:"foo", bar:1};
+ T(db.save(docFoo).ok);
+ T(db.ensureFullCommit().ok);
+ T(db.open(docFoo._id)._id == docFoo._id);
- // test with callback
+ req = CouchDB.request("GET", "/test_suite_db/_changes");
+ var resp = JSON.parse(req.responseText);
- run_on_modified_server(
- [{section: "httpd",
- key: "allow_jsonp",
- value: "true"}],
- function() {
- var xhr = CouchDB.request("GET", "/test_suite_db/_changes?callback=jsonp");
- T(xhr.status == 200);
- jsonp_flag = 0;
- eval(xhr.responseText);
- T(jsonp_flag == 1);
- });
+ T(resp.last_seq == 1);
+ T(resp.results.length == 1, "one doc db");
+ T(resp.results[0].changes[0].rev == docFoo._rev);
- req = CouchDB.request("GET", "/test_suite_db/_changes?feed=continuous&timeout=10");
- var lines = req.responseText.split("\n");
- T(JSON.parse(lines[0]).changes[0].rev == docFoo._rev);
- T(JSON.parse(lines[1]).last_seq == 1);
+ // test with callback
- var xhr;
+ run_on_modified_server(
+ [{section: "httpd",
+ key: "allow_jsonp",
+ value: "true"}],
+ function() {
+ var xhr = CouchDB.request("GET", "/test_suite_db/_changes?callback=jsonp");
+ T(xhr.status == 200);
+ jsonp_flag = 0;
+ eval(xhr.responseText);
+ T(jsonp_flag == 1);
+ });
- try {
- xhr = CouchDB.newXhr();
- } catch (err) {
- }
+ req = CouchDB.request("GET", "/test_suite_db/_changes?feed=" + feed + "&timeout=10");
+ var lines = req.responseText.split("\n");
+ T(JSON.parse(lines[0]).changes[0].rev == docFoo._rev);
+ T(JSON.parse(lines[1]).last_seq == 1);
- // poor man's browser detection
- var is_safari = false;
- if(typeof(navigator) == "undefined") {
- is_safari = true; // For CouchHTTP based runners
- } else if(navigator.userAgent.match(/AppleWebKit/)) {
- is_safari = true;
- };
- if (!is_safari && xhr) {
- // Only test the continuous stuff if we have a real XHR object
- // with real async support.
+ var xhr;
- // WebKit (last checked on nightly #47686) does fail on processing
- // the async-request properly while javascript is executed.
+ try {
+ xhr = CouchDB.newXhr();
+ } catch (err) {
+ }
- xhr.open("GET", CouchDB.proxyUrl("/test_suite_db/_changes?feed=continuous&timeout=500"), true);
- xhr.send("");
+ if (!is_safari && xhr) {
+ // Only test the continuous stuff if we have a real XHR object
+ // with real async support.
- var docBar = {_id:"bar", bar:1};
- db.save(docBar);
+ // WebKit (last checked on nightly #47686) does fail on processing
+ // the async-request properly while javascript is executed.
- var lines, change1, change2;
- waitForSuccess(function() {
- lines = xhr.responseText.split("\n");
- change1 = JSON.parse(lines[0]);
- change2 = JSON.parse(lines[1]);
- if (change2.seq != 2) {
- throw "bad seq, try again";
- }
- return true;
- }, "bar-only");
+ xhr.open("GET", CouchDB.proxyUrl("/test_suite_db/_changes?feed=" + feed + "&timeout=500"), true);
+ xhr.send("");
- T(change1.seq == 1);
- T(change1.id == "foo");
+ var docBar = {_id:"bar", bar:1};
+ db.save(docBar);
- T(change2.seq == 2);
- T(change2.id == "bar");
- T(change2.changes[0].rev == docBar._rev);
+ var lines, change1, change2;
+ waitForSuccess(function() {
+ lines = xhr.responseText.split("\n");
+ change1 = JSON.parse(lines[0]);
+ change2 = JSON.parse(lines[1]);
+ if (change2.seq != 2) {
+ throw "bad seq, try again";
+ }
+ return true;
+ }, "bar-only");
+ T(change1.seq == 1);
+ T(change1.id == "foo");
- var docBaz = {_id:"baz", baz:1};
- db.save(docBaz);
+ T(change2.seq == 2);
+ T(change2.id == "bar");
+ T(change2.changes[0].rev == docBar._rev);
- var change3;
- waitForSuccess(function() {
- lines = xhr.responseText.split("\n");
- change3 = JSON.parse(lines[2]);
- if (change3.seq != 3) {
- throw "bad seq, try again";
- }
- return true;
- });
- T(change3.seq == 3);
- T(change3.id == "baz");
- T(change3.changes[0].rev == docBaz._rev);
+ var docBaz = {_id:"baz", baz:1};
+ db.save(docBaz);
+
+ var change3;
+ waitForSuccess(function() {
+ lines = xhr.responseText.split("\n");
+ change3 = JSON.parse(lines[2]);
+ if (change3.seq != 3) {
+ throw "bad seq, try again";
+ }
+ return true;
+ });
+
+ T(change3.seq == 3);
+ T(change3.id == "baz");
+ T(change3.changes[0].rev == docBaz._rev);
- xhr = CouchDB.newXhr();
+ xhr = CouchDB.newXhr();
- //verify the heartbeat newlines are sent
- xhr.open("GET", CouchDB.proxyUrl("/test_suite_db/_changes?feed=continuous&heartbeat=10&timeout=500"), true);
- xhr.send("");
+ //verify the heartbeat newlines are sent
+ xhr.open("GET", CouchDB.proxyUrl("/test_suite_db/_changes?feed=" + feed + "&heartbeat=10&timeout=500"), true);
+ xhr.send("");
- var str;
- waitForSuccess(function() {
- str = xhr.responseText;
- if (str.charAt(str.length - 1) != "\n" || str.charAt(str.length - 2) != "\n") {
- throw("keep waiting");
- }
- return true;
- }, "heartbeat");
+ var str;
+ waitForSuccess(function() {
+ str = xhr.responseText;
+ if (str.charAt(str.length - 1) != "\n" || str.charAt(str.length - 2) != "\n") {
+ throw("keep waiting");
+ }
+ return true;
+ }, "heartbeat");
- T(str.charAt(str.length - 1) == "\n");
- T(str.charAt(str.length - 2) == "\n");
+ T(str.charAt(str.length - 1) == "\n");
+ T(str.charAt(str.length - 2) == "\n");
- // otherwise we'll continue to receive heartbeats forever
- xhr.abort();
+ // otherwise we'll continue to receive heartbeats forever
+ xhr.abort();
+ }
+ }
+ if (!is_safari && xhr) {
// test Server Sent Event (eventsource)
if (!!window.EventSource) {
var source = new EventSource(
[04/50] couchdb commit: updated refs/heads/developer-preview-2.0 to
2a31bca
Posted by kx...@apache.org.
re-enable doc, create tarball
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/cadd21ca
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/cadd21ca
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/cadd21ca
Branch: refs/heads/developer-preview-2.0
Commit: cadd21ca09dede1b07dcb80e01a1fb93c1be4145
Parents: 872b52f
Author: Jan Lehnardt <ja...@apache.org>
Authored: Fri Apr 3 17:55:54 2015 +0200
Committer: Jan Lehnardt <ja...@apache.org>
Committed: Wed Jun 24 23:06:45 2015 +0200
----------------------------------------------------------------------
Makefile | 18 +++++++++++++-----
1 file changed, 13 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/cadd21ca/Makefile
----------------------------------------------------------------------
diff --git a/Makefile b/Makefile
index 4dab51a..58aab42 100644
--- a/Makefile
+++ b/Makefile
@@ -41,6 +41,7 @@ dist: all
@rm -rf rel/couchdb
@rebar generate
@cp -r share/www rel/couchdb/share/www
+ @cp -r share/docs rel/couchdb/share/docs
# creates a source tarball
release:
@@ -49,11 +50,15 @@ release:
# build fauxton
$(MAKE) fauxton
cp -r share/www apache-couchdb/share/
- #
- # # build docs
- # cd src/docs; make
- # mkdir apache-couchdb/share/docs
- # cp -r src/docs/build/html apache-couchdb/share/docs/html
+
+ # build docs
+ cd src/docs; make
+ mkdir apache-couchdb/share/docs
+ cp -r src/docs/build/html apache-couchdb/share/docs/html
+
+ # Tar!
+ tar czf apache-couchdb.tar.gz apache-couchdb
+ echo "Done: apache-couchdb.tar.gz"
distclean: clean
@rm install.mk
@@ -81,6 +86,9 @@ install: dist
@touch $(prefix)/var/log/couchdb.log
@chown $(user) $(prefix)/var/log/couchdb.log
+uninstall:
+ @rm -rf $(prefix)
+
install.mk:
# ignore install.mk missing if we are running
# `make clean` without having run ./configure first
[28/50] couchdb commit: updated refs/heads/developer-preview-2.0 to
2a31bca
Posted by kx...@apache.org.
fix database dir and install dir
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/72da08b9
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/72da08b9
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/72da08b9
Branch: refs/heads/developer-preview-2.0
Commit: 72da08b958fc42f9ea1bafeba53174a73fb05383
Parents: 6525130
Author: Jan Lehnardt <ja...@apache.org>
Authored: Wed Jun 24 15:51:13 2015 +0200
Committer: Jan Lehnardt <ja...@apache.org>
Committed: Wed Jun 24 23:07:44 2015 +0200
----------------------------------------------------------------------
Makefile | 4 ++--
configure | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/72da08b9/Makefile
----------------------------------------------------------------------
diff --git a/Makefile b/Makefile
index 2b5e28b..23970f6 100644
--- a/Makefile
+++ b/Makefile
@@ -93,8 +93,8 @@ install: all
@mkdir -p $(DESTDIR)/$(install_dir)
@cp -R rel/couchdb/* $(DESTDIR)/$(install_dir)
- @mkdir -p $(DESTDIR)/$(data_dir)
- @chown $(user) $(DESTDIR)/$(data_dir)
+ @mkdir -p $(DESTDIR)/$(database_dir)
+ @chown $(user) $(DESTDIR)/$(database_dir)
@mkdir -p $(DESTDIR)/$(view_index_dir)
@chown $(user) $(DESTDIR)/$(view_index_dir)
http://git-wip-us.apache.org/repos/asf/couchdb/blob/72da08b9/configure
----------------------------------------------------------------------
diff --git a/configure b/configure
index c23ae1c..7a94641 100755
--- a/configure
+++ b/configure
@@ -467,7 +467,7 @@ cat > install.mk << EOF
# The contents of this file are auto-generated by configure
#
package_author_name = $PACKAGE_AUTHOR_NAME
-install_dir = $INSTALL_DIR
+install_dir = $INSTALLDIR
bin_dir = $BINDIR
libexec_dir = $LIBEXECDIR/couchdb
@@ -475,8 +475,8 @@ doc_dir = $DOCDIR/couchdb
sysconf_dir = $SYSCONFDIR/couchdb
data_dir = $DATADIR/couchdb
-database_dir = $DATABASE_DIR
-view_index_dir = $VIEW_DIR
+database_dir = $DATABASEDIR
+view_index_dir = $VIEWDIR
log_file = $LOG_FILE
user = $COUCHDB_USER
EOF
[31/50] couchdb commit: updated refs/heads/developer-preview-2.0 to
2a31bca
Posted by kx...@apache.org.
Add --infodir --mandir --docdir --htmldir --pdfdir.
Also copy docs into these dirs on make install.
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/c1e69c57
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/c1e69c57
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/c1e69c57
Branch: refs/heads/developer-preview-2.0
Commit: c1e69c5757aaa47ddb857e19a1bd68d974d77414
Parents: b335877
Author: Jan Lehnardt <ja...@apache.org>
Authored: Wed Jun 24 21:03:11 2015 +0200
Committer: Jan Lehnardt <ja...@apache.org>
Committed: Wed Jun 24 23:07:47 2015 +0200
----------------------------------------------------------------------
Makefile | 48 ++++++++-----
configure | 116 +++++++++++++++++++++++++++++---
test/build/test-configure.sh | 138 ++++++++++++++++++++++++++++++--------
3 files changed, 245 insertions(+), 57 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/c1e69c57/Makefile
----------------------------------------------------------------------
diff --git a/Makefile b/Makefile
index 23970f6..ecf8205 100644
--- a/Makefile
+++ b/Makefile
@@ -56,26 +56,33 @@ dist: all
release:
@./build-aux/couchdb-build-release.sh $(COUCHDB_VERSION)
- # build fauxton
- $(MAKE) fauxton
- cp -r share/www apache-couchdb-$(COUCHDB_VERSION)/share/
-
- # build docs
- cd src/docs; $(MAKE)
- mkdir apache-couchdb-$(COUCHDB_VERSION)/share/docs
- cp -r src/docs/build/html apache-couchdb-$(COUCHDB_VERSION)/share/docs/html
-
- # Tar!
- tar czf apache-couchdb-$(COUCHDB_VERSION).tar.gz apache-couchdb-$(COUCHDB_VERSION)
- echo "Done: apache-couchdb-$(COUCHDB_VERSION).tar.gz"
+# build fauxton
+ @$(MAKE) fauxton
+ @cp -r share/www apache-couchdb-$(COUCHDB_VERSION)/share/
+
+# build docs
+ @cd src/docs; $(MAKE)
+ @mkdir -p apache-couchdb-$(COUCHDB_VERSION)/share/docs/html
+ @cp -r src/docs/build/html apache-couchdb-$(COUCHDB_VERSION)/share/docs/html
+ @mkdir -p apache-couchdb-$(COUCHDB_VERSION)/share/docs/pdf
+ @cp src/docs/build/latex/CouchDB.pdf apache-couchdb-$(COUCHDB_VERSION)/share/docs/pdf/
+
+ @mkdir -p apache-couchdb-$(COUCHDB_VERSION)/share/docs/man
+ @cp src/docs/build/man/apachecouchdb.1 apache-couchdb-$(COUCHDB_VERSION)/share/docs/man/
+ @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
+# 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
@@ -117,10 +124,15 @@ install: all
@mkdir -p $(DESTDIR)/$(data_dir)
@cp -R share/server share/www $(DESTDIR)/$(data_dir)
- # TODO: copy over man, pdf, info etc. files
- # after including them in the release tarball in `make release`
- #@mkdir -p $(DESTDIR)/$(doc_dir)
- #@cp -R
+ @mkdir -p $(DESTDIR)/$(doc_dir)
+ @mkdir -p $(DESTDIR)/$(html_dir)
+ @mkdir -p $(DESTDIR)/$(pdf_dir)
+ @mkdir -p $(DESTDIR)/$(man_dir)
+ @mkdir -p $(DESTDIR)/$(info_dir)
+ @cp -R share/docs/html $(DESTDIR)/$(html_dir)/html
+ @cp share/docs/pdf/CouchDB.pdf $(DESTDIR)/$(pdf_dir)/CouchDB.pdf
+ @cp share/docs/info/CouchDB.info $(DESTDIR)/$(info_dir)/CouchDB.info
+ @cp share/docs/man/apachecouchdb.1 $(DESTDIR)/$(man_dir)/couchdb.1
@echo "...done"
http://git-wip-us.apache.org/repos/asf/couchdb/blob/c1e69c57/configure
----------------------------------------------------------------------
diff --git a/configure b/configure
index da198df..da71444 100755
--- a/configure
+++ b/configure
@@ -28,9 +28,15 @@ DATAROOTDIR=
DATADIR=
LOCALSTATEDIR=
RUNSTATEDIR=
-DOCDIR=
LIBDIR=
+INFODIR=
+MANDIR=
+DOCDIR=
+
+HTMLDIR=
+PDFDIR=
+
DATABASEDIR=
VIEWDIR=
LOGDIR=
@@ -67,13 +73,13 @@ Options:
--libdir=DIR object code libraries [EPREFIX/lib]
--datarootdir=DIR read-only arch.-independent data root [PREFIX/share]
--datadir=DIR read-only architecture-independent data [DATAROOTDIR]
- # --infodir=DIR info documentation [DATAROOTDIR/info]
- # --mandir=DIR man documentation [DATAROOTDIR/man]
- # --docdir=DIR documentation root [DATAROOTDIR/doc/apache-couchdb]
- # --htmldir=DIR html documentation [DOCDIR]
- # --dvidir=DIR dvi documentation [DOCDIR]
- # --pdfdir=DIR pdf documentation [DOCDIR]
- # --psdir=DIR ps documentation [DOCDIR]
+ --infodir=DIR info documentation [DATAROOTDIR/info]
+ --mandir=DIR man documentation [DATAROOTDIR/man]
+ --docdir=DIR documentation root [DATAROOTDIR/doc/apache-couchdb]
+ --htmldir=DIR html documentation [DOCDIR]
+ --dvidir=DIR dvi documentation [DOCDIR]
+ --pdfdir=DIR pdf documentation [DOCDIR]
+ --psdir=DIR ps documentation [DOCDIR]
EOF
}
@@ -295,6 +301,42 @@ parse_opts() {
exit 1
;;
+ --mandir)
+ if [ -n "$2" ]; then
+ eval MANDIR=$2
+ shift 2
+ continue
+ else
+ printf 'ERROR: "--mandir" requires a non-empty argument.\n' >&2
+ exit 1
+ fi
+ ;;
+ --mandir=?*)
+ eval MANDIR=${1#*=}
+ ;;
+ --mandir=)
+ printf 'ERROR: "--mandir" requires a non-empty argument.\n' >&2
+ exit 1
+ ;;
+
+ --infodir)
+ if [ -n "$2" ]; then
+ eval INFODIR=$2
+ shift 2
+ continue
+ else
+ printf 'ERROR: "--infodir" requires a non-empty argument.\n' >&2
+ exit 1
+ fi
+ ;;
+ --infodir=?*)
+ eval INFODIR=${1#*=}
+ ;;
+ --infodir=)
+ printf 'ERROR: "--infodir" requires a non-empty argument.\n' >&2
+ exit 1
+ ;;
+
--libdir)
if [ -n "$2" ]; then
eval LIBDIR=$2
@@ -367,6 +409,42 @@ parse_opts() {
exit 1
;;
+ --htmldir)
+ if [ -n "$2" ]; then
+ eval HTMLDIR=$2
+ shift 2
+ continue
+ else
+ printf 'ERROR: "--htmldir" requires a non-empty argument.\n' >&2
+ exit 1
+ fi
+ ;;
+ --htmldir=?*)
+ eval HTMLDIR=${1#*=}
+ ;;
+ --htmldir=)
+ printf 'ERROR: "--htmldir" requires a non-empty argument.\n' >&2
+ exit 1
+ ;;
+
+ --pdfdir)
+ if [ -n "$2" ]; then
+ eval PDFDIR=$2
+ shift 2
+ continue
+ else
+ printf 'ERROR: "--pdfdir" requires a non-empty argument.\n' >&2
+ exit 1
+ fi
+ ;;
+ --pdfdir=?*)
+ eval PDFDIR=${1#*=}
+ ;;
+ --pdfdir=)
+ printf 'ERROR: "--pdfdir" requires a non-empty argument.\n' >&2
+ exit 1
+ ;;
+
--) # End of options
shift
break
@@ -410,7 +488,13 @@ parse_opts() {
RUNSTATEDIR="$LOCALSTATEDIR/run";
fi
if test -z "$DOCDIR"; then
- DOCDIR="$DATAROOTDIR/doc";
+ DOCDIR="$DATAROOTDIR/doc/apache-couchdb";
+ fi
+ if test -z "$INFODIR"; then
+ INFODIR="$DATAROOTDIR/info";
+ fi
+ if test -z "$MANDIR"; then
+ MANDIR="$DATAROOTDIR/man";
fi
if test -z "$LIBDIR"; then
LIBDIR="$EXEC_PREFIX/lib";
@@ -424,6 +508,12 @@ parse_opts() {
if test -z "$LOGDIR"; then
LOGDIR="$LOCALSTATEDIR/log";
fi
+ if test -z "$HTMLDIR"; then
+ HTMLDIR="$DOCDIR/html";
+ fi
+ if test -z "$PDFDIR"; then
+ PDFDIR="$DOCDIR/pdf";
+ fi
}
parse_opts $@
@@ -433,7 +523,7 @@ parse_opts $@
if [ "$TEST" = "1" ]; then
echo $PREFIX $EXEC_PREFIX $BINDIR $LIBEXECDIR $SYSCONFDIR $DATAROOTDIR \
$DATADIR $LOCALSTATEDIR $RUNSTATEDIR $DOCDIR $LIBDIR $DATABASEDIR \
- $VIEWDIR $LOGDIR
+ $VIEWDIR $LOGDIR $MANDIR $INFODIR $HTMLDIR $PDFDIR
exit 0
fi
@@ -497,6 +587,12 @@ data_dir = $DATADIR/couchdb
database_dir = $DATABASEDIR
view_index_dir = $VIEWDIR
log_file = $LOG_FILE
+
+html_dir = $HTMLDIR
+pdf_dir = $PDFDIR
+man_dir = $MANDIR
+info_dir = $INFODIR
+
user = $COUCHDB_USER
EOF
http://git-wip-us.apache.org/repos/asf/couchdb/blob/c1e69c57/test/build/test-configure.sh
----------------------------------------------------------------------
diff --git a/test/build/test-configure.sh b/test/build/test-configure.sh
index 2be0953..b83f633 100755
--- a/test/build/test-configure.sh
+++ b/test/build/test-configure.sh
@@ -52,13 +52,13 @@ fi
CMD="./configure --test "
test_defaults() {
- EXPECT="/usr/local /usr/local /usr/local/bin /usr/local/libexec /usr/local/etc /usr/local/share /usr/local/share /usr/local/var /usr/local/var/run /usr/local/share/doc /usr/local/lib /usr/local/var/lib /usr/local/var/lib /usr/local/var/log"
+ EXPECT="/usr/local /usr/local /usr/local/bin /usr/local/libexec /usr/local/etc /usr/local/share /usr/local/share /usr/local/var /usr/local/var/run /usr/local/share/doc/apache-couchdb /usr/local/lib /usr/local/var/lib /usr/local/var/lib /usr/local/var/log /usr/local/share/man /usr/local/share/info /usr/local/share/doc/apache-couchdb/html /usr/local/share/doc/apache-couchdb/pdf"
RESULT=`$CMD`
assertEquals "test defaults" "$EXPECT" "$RESULT"
}
test_prefix() {
- EXPECT="/opt/local /opt/local /opt/local/bin /opt/local/libexec /opt/local/etc /opt/local/share /opt/local/share /opt/local/var /opt/local/var/run /opt/local/share/doc /opt/local/lib /opt/local/var/lib /opt/local/var/lib /opt/local/var/log"
+ EXPECT="/opt/local /opt/local /opt/local/bin /opt/local/libexec /opt/local/etc /opt/local/share /opt/local/share /opt/local/var /opt/local/var/run /opt/local/share/doc/apache-couchdb /opt/local/lib /opt/local/var/lib /opt/local/var/lib /opt/local/var/log /opt/local/share/man /opt/local/share/info /opt/local/share/doc/apache-couchdb/html /opt/local/share/doc/apache-couchdb/pdf"
RESULT=`$CMD --prefix=/opt/local`
assertEquals "test prefix" "$EXPECT" "$RESULT"
@@ -79,7 +79,7 @@ test_prefix_error() {
test_exec_prefix() {
- EXPECT="/usr/local /opt/local /opt/local/bin /opt/local/libexec /usr/local/etc /usr/local/share /usr/local/share /usr/local/var /usr/local/var/run /usr/local/share/doc /opt/local/lib /usr/local/var/lib /usr/local/var/lib /usr/local/var/log"
+ EXPECT="/usr/local /opt/local /opt/local/bin /opt/local/libexec /usr/local/etc /usr/local/share /usr/local/share /usr/local/var /usr/local/var/run /usr/local/share/doc/apache-couchdb /opt/local/lib /usr/local/var/lib /usr/local/var/lib /usr/local/var/log /usr/local/share/man /usr/local/share/info /usr/local/share/doc/apache-couchdb/html /usr/local/share/doc/apache-couchdb/pdf"
RESULT=`$CMD --exec-prefix=/opt/local`
assertEquals "test exec_prefix" "$EXPECT" "$RESULT"
@@ -89,7 +89,7 @@ test_exec_prefix() {
}
test_exec_prefix_eval() {
- EXPECT="/horse/local /horse/local /horse/local/bin /horse/local/libexec /horse/local/etc /horse/local/share /horse/local/share /horse/local/var /horse/local/var/run /horse/local/share/doc /horse/local/lib /horse/local/var/lib /horse/local/var/lib /horse/local/var/log"
+ EXPECT="/horse/local /horse/local /horse/local/bin /horse/local/libexec /horse/local/etc /horse/local/share /horse/local/share /horse/local/var /horse/local/var/run /horse/local/share/doc/apache-couchdb /horse/local/lib /horse/local/var/lib /horse/local/var/lib /horse/local/var/log /horse/local/share/man /horse/local/share/info /horse/local/share/doc/apache-couchdb/html /horse/local/share/doc/apache-couchdb/pdf"
RESULT=`$CMD --prefix=/horse/local --exec-prefix=\\${prefix}`
assertEquals "test exec_prefix" "$EXPECT" "$RESULT"
@@ -109,7 +109,7 @@ test_exec_prefix_error() {
}
test_bindir() {
- EXPECT="/usr/local /usr/local /my/funky/bindir /usr/local/libexec /usr/local/etc /usr/local/share /usr/local/share /usr/local/var /usr/local/var/run /usr/local/share/doc /usr/local/lib /usr/local/var/lib /usr/local/var/lib /usr/local/var/log"
+ EXPECT="/usr/local /usr/local /my/funky/bindir /usr/local/libexec /usr/local/etc /usr/local/share /usr/local/share /usr/local/var /usr/local/var/run /usr/local/share/doc/apache-couchdb /usr/local/lib /usr/local/var/lib /usr/local/var/lib /usr/local/var/log /usr/local/share/man /usr/local/share/info /usr/local/share/doc/apache-couchdb/html /usr/local/share/doc/apache-couchdb/pdf"
RESULT=`$CMD --bindir=/my/funky/bindir`
assertEquals "test bindir" "$EXPECT" "$RESULT"
@@ -129,7 +129,7 @@ test_bindir_error() {
}
test_libexecdir() {
- EXPECT="/usr/local /usr/local /usr/local/bin /opt/local/libexec /usr/local/etc /usr/local/share /usr/local/share /usr/local/var /usr/local/var/run /usr/local/share/doc /usr/local/lib /usr/local/var/lib /usr/local/var/lib /usr/local/var/log"
+ EXPECT="/usr/local /usr/local /usr/local/bin /opt/local/libexec /usr/local/etc /usr/local/share /usr/local/share /usr/local/var /usr/local/var/run /usr/local/share/doc/apache-couchdb /usr/local/lib /usr/local/var/lib /usr/local/var/lib /usr/local/var/log /usr/local/share/man /usr/local/share/info /usr/local/share/doc/apache-couchdb/html /usr/local/share/doc/apache-couchdb/pdf"
RESULT=`$CMD --libexecdir=/opt/local/libexec`
assertEquals "test libexecdir" "$EXPECT" "$RESULT"
@@ -149,7 +149,7 @@ test_libexecdir_error() {
}
test_sysconfdir() {
- EXPECT="/usr/local /usr/local /usr/local/bin /usr/local/libexec /opt/local/etc /usr/local/share /usr/local/share /usr/local/var /usr/local/var/run /usr/local/share/doc /usr/local/lib /usr/local/var/lib /usr/local/var/lib /usr/local/var/log"
+ EXPECT="/usr/local /usr/local /usr/local/bin /usr/local/libexec /opt/local/etc /usr/local/share /usr/local/share /usr/local/var /usr/local/var/run /usr/local/share/doc/apache-couchdb /usr/local/lib /usr/local/var/lib /usr/local/var/lib /usr/local/var/log /usr/local/share/man /usr/local/share/info /usr/local/share/doc/apache-couchdb/html /usr/local/share/doc/apache-couchdb/pdf"
RESULT=`$CMD --sysconfdir=/opt/local/etc`
assertEquals "test sysconfdir" "$EXPECT" "$RESULT"
@@ -169,7 +169,7 @@ test_sysconfdir_error() {
}
test_datarootdir() {
- EXPECT="/usr/local /usr/local /usr/local/bin /usr/local/libexec /usr/local/etc /opt/local/share /opt/local/share /usr/local/var /usr/local/var/run /opt/local/share/doc /usr/local/lib /usr/local/var/lib /usr/local/var/lib /usr/local/var/log"
+ EXPECT="/usr/local /usr/local /usr/local/bin /usr/local/libexec /usr/local/etc /opt/local/share /opt/local/share /usr/local/var /usr/local/var/run /opt/local/share/doc/apache-couchdb /usr/local/lib /usr/local/var/lib /usr/local/var/lib /usr/local/var/log /opt/local/share/man /opt/local/share/info /opt/local/share/doc/apache-couchdb/html /opt/local/share/doc/apache-couchdb/pdf"
RESULT=`$CMD --datarootdir=/opt/local/share`
assertEquals "test datarootdir" "$EXPECT" "$RESULT"
@@ -189,7 +189,7 @@ test_datarootdir_error() {
}
test_localstatedir() {
- EXPECT="/usr/local /usr/local /usr/local/bin /usr/local/libexec /usr/local/etc /usr/local/share /usr/local/share /horse/local/var /horse/local/var/run /usr/local/share/doc /usr/local/lib /horse/local/var/lib /horse/local/var/lib /horse/local/var/log"
+ EXPECT="/usr/local /usr/local /usr/local/bin /usr/local/libexec /usr/local/etc /usr/local/share /usr/local/share /horse/local/var /horse/local/var/run /usr/local/share/doc/apache-couchdb /usr/local/lib /horse/local/var/lib /horse/local/var/lib /horse/local/var/log /usr/local/share/man /usr/local/share/info /usr/local/share/doc/apache-couchdb/html /usr/local/share/doc/apache-couchdb/pdf"
RESULT=`$CMD --localstatedir=/horse/local/var`
assertEquals "test localstatedir" "$EXPECT" "$RESULT"
@@ -209,7 +209,7 @@ test_localstatedir_error() {
}
test_runstatedir() {
- EXPECT="/usr/local /usr/local /usr/local/bin /usr/local/libexec /usr/local/etc /usr/local/share /usr/local/share /usr/local/var /horse/local/var/run /usr/local/share/doc /usr/local/lib /usr/local/var/lib /usr/local/var/lib /usr/local/var/log"
+ EXPECT="/usr/local /usr/local /usr/local/bin /usr/local/libexec /usr/local/etc /usr/local/share /usr/local/share /usr/local/var /horse/local/var/run /usr/local/share/doc/apache-couchdb /usr/local/lib /usr/local/var/lib /usr/local/var/lib /usr/local/var/log /usr/local/share/man /usr/local/share/info /usr/local/share/doc/apache-couchdb/html /usr/local/share/doc/apache-couchdb/pdf"
RESULT=`$CMD --runstatedir=/horse/local/var/run`
assertEquals "test runstatedir" "$EXPECT" "$RESULT"
@@ -229,7 +229,7 @@ test_runstatedir_error() {
}
test_docdir() {
- EXPECT="/usr/local /usr/local /usr/local/bin /usr/local/libexec /usr/local/etc /usr/local/share /usr/local/share /usr/local/var /usr/local/var/run /horse/local/share/doc /usr/local/lib /usr/local/var/lib /usr/local/var/lib /usr/local/var/log"
+ EXPECT="/usr/local /usr/local /usr/local/bin /usr/local/libexec /usr/local/etc /usr/local/share /usr/local/share /usr/local/var /usr/local/var/run /horse/local/share/doc /usr/local/lib /usr/local/var/lib /usr/local/var/lib /usr/local/var/log /usr/local/share/man /usr/local/share/info /horse/local/share/doc/html /horse/local/share/doc/pdf"
RESULT=`$CMD --docdir=/horse/local/share/doc`
assertEquals "test docdir" "$EXPECT" "$RESULT"
@@ -249,7 +249,7 @@ test_docdir_error() {
}
test_libdir() {
- EXPECT="/usr/local /usr/local /usr/local/bin /usr/local/libexec /usr/local/etc /usr/local/share /usr/local/share /usr/local/var /usr/local/var/run /usr/local/share/doc /horse/local/lib /usr/local/var/lib /usr/local/var/lib /usr/local/var/log"
+ EXPECT="/usr/local /usr/local /usr/local/bin /usr/local/libexec /usr/local/etc /usr/local/share /usr/local/share /usr/local/var /usr/local/var/run /usr/local/share/doc/apache-couchdb /horse/local/lib /usr/local/var/lib /usr/local/var/lib /usr/local/var/log /usr/local/share/man /usr/local/share/info /usr/local/share/doc/apache-couchdb/html /usr/local/share/doc/apache-couchdb/pdf"
RESULT=`$CMD --libdir=/horse/local/lib`
assertEquals "test libdir" "$EXPECT" "$RESULT"
@@ -269,63 +269,143 @@ test_libdir_error() {
}
test_database_dir() {
- EXPECT="/usr/local /usr/local /usr/local/bin /usr/local/libexec /usr/local/etc /usr/local/share /usr/local/share /usr/local/var /usr/local/var/run /usr/local/share/doc /usr/local/lib /horse/local/var/lib /usr/local/var/lib /usr/local/var/log"
+ EXPECT="/usr/local /usr/local /usr/local/bin /usr/local/libexec /usr/local/etc /usr/local/share /usr/local/share /usr/local/var /usr/local/var/run /usr/local/share/doc/apache-couchdb /usr/local/lib /horse/local/var/lib /usr/local/var/lib /usr/local/var/log /usr/local/share/man /usr/local/share/info /usr/local/share/doc/apache-couchdb/html /usr/local/share/doc/apache-couchdb/pdf"
RESULT=`$CMD --databasedir=/horse/local/var/lib`
- assertEquals "test database_dir" "$EXPECT" "$RESULT"
+ assertEquals "test databasedir" "$EXPECT" "$RESULT"
RESULT=`$CMD --databasedir /horse/local/var/lib`
- assertEquals "test database_dir" "$EXPECT" "$RESULT"
+ assertEquals "test databasedir" "$EXPECT" "$RESULT"
}
test_database_dir_error() {
EXPECT='ERROR: "--databasedir" requires a non-empty argument.'
RESULT=`$CMD --databasedir= 2>&1`
- assertEquals "test database_dir error" "$EXPECT" "$RESULT"
+ assertEquals "test databasedir error" "$EXPECT" "$RESULT"
RESULT=`$CMD --databasedir 2>&1`
- assertEquals "test database_dir error" "$EXPECT" "$RESULT"
+ assertEquals "test databasedir error" "$EXPECT" "$RESULT"
}
test_view_dir() {
- EXPECT="/usr/local /usr/local /usr/local/bin /usr/local/libexec /usr/local/etc /usr/local/share /usr/local/share /usr/local/var /usr/local/var/run /usr/local/share/doc /usr/local/lib /usr/local/var/lib /horse/local/var/lib /usr/local/var/log"
+ EXPECT="/usr/local /usr/local /usr/local/bin /usr/local/libexec /usr/local/etc /usr/local/share /usr/local/share /usr/local/var /usr/local/var/run /usr/local/share/doc/apache-couchdb /usr/local/lib /usr/local/var/lib /horse/local/var/lib /usr/local/var/log /usr/local/share/man /usr/local/share/info /usr/local/share/doc/apache-couchdb/html /usr/local/share/doc/apache-couchdb/pdf"
RESULT=`$CMD --viewindexdir=/horse/local/var/lib`
- assertEquals "test view_dir" "$EXPECT" "$RESULT"
+ assertEquals "test viewindexdir" "$EXPECT" "$RESULT"
RESULT=`$CMD --viewindexdir /horse/local/var/lib`
- assertEquals "test view_dir" "$EXPECT" "$RESULT"
+ assertEquals "test viewindexdir" "$EXPECT" "$RESULT"
}
test_view_dir_error() {
EXPECT='ERROR: "--viewindexdir" requires a non-empty argument.'
RESULT=`$CMD --viewindexdir= 2>&1`
- assertEquals "test view_dir error" "$EXPECT" "$RESULT"
+ assertEquals "test viewindexdir error" "$EXPECT" "$RESULT"
RESULT=`$CMD --viewindexdir 2>&1`
- assertEquals "test view_dir error" "$EXPECT" "$RESULT"
+ assertEquals "test viewindexdir error" "$EXPECT" "$RESULT"
}
-test_log_dir() {
- EXPECT="/usr/local /usr/local /usr/local/bin /usr/local/libexec /usr/local/etc /usr/local/share /usr/local/share /usr/local/var /usr/local/var/run /usr/local/share/doc /usr/local/lib /usr/local/var/lib /usr/local/var/lib /horse/log"
+test_logdir() {
+ EXPECT="/usr/local /usr/local /usr/local/bin /usr/local/libexec /usr/local/etc /usr/local/share /usr/local/share /usr/local/var /usr/local/var/run /usr/local/share/doc/apache-couchdb /usr/local/lib /usr/local/var/lib /usr/local/var/lib /horse/log /usr/local/share/man /usr/local/share/info /usr/local/share/doc/apache-couchdb/html /usr/local/share/doc/apache-couchdb/pdf"
RESULT=`$CMD --logdir=/horse/log`
- assertEquals "test log_dir" "$EXPECT" "$RESULT"
+ assertEquals "test logdir" "$EXPECT" "$RESULT"
RESULT=`$CMD --logdir /horse/log`
- assertEquals "test log_dir" "$EXPECT" "$RESULT"
+ assertEquals "test logdir" "$EXPECT" "$RESULT"
}
-test_log_dir_error() {
+test_logdir_error() {
EXPECT='ERROR: "--logdir" requires a non-empty argument.'
RESULT=`$CMD --logdir= 2>&1`
- assertEquals "test log_dir error" "$EXPECT" "$RESULT"
+ assertEquals "test logdir error" "$EXPECT" "$RESULT"
RESULT=`$CMD --logdir 2>&1`
- assertEquals "test log_dir error" "$EXPECT" "$RESULT"
+ assertEquals "test logdir error" "$EXPECT" "$RESULT"
+}
+
+test_mandir() {
+ EXPECT="/usr/local /usr/local /usr/local/bin /usr/local/libexec /usr/local/etc /usr/local/share /usr/local/share /usr/local/var /usr/local/var/run /usr/local/share/doc/apache-couchdb /usr/local/lib /usr/local/var/lib /usr/local/var/lib /usr/local/var/log /horse/local/share/man /usr/local/share/info /usr/local/share/doc/apache-couchdb/html /usr/local/share/doc/apache-couchdb/pdf"
+
+ RESULT=`$CMD --mandir=/horse/local/share/man`
+ assertEquals "test mandir" "$EXPECT" "$RESULT"
+
+ RESULT=`$CMD --mandir /horse/local/share/man`
+ assertEquals "test mandir" "$EXPECT" "$RESULT"
+}
+
+test_mandir_error() {
+ EXPECT='ERROR: "--mandir" requires a non-empty argument.'
+
+ RESULT=`$CMD --mandir= 2>&1`
+ assertEquals "test mandir error" "$EXPECT" "$RESULT"
+
+ RESULT=`$CMD --mandir 2>&1`
+ assertEquals "test mandir error" "$EXPECT" "$RESULT"
+}
+
+test_infodir() {
+ EXPECT="/usr/local /usr/local /usr/local/bin /usr/local/libexec /usr/local/etc /usr/local/share /usr/local/share /usr/local/var /usr/local/var/run /usr/local/share/doc/apache-couchdb /usr/local/lib /usr/local/var/lib /usr/local/var/lib /usr/local/var/log /usr/local/share/man /horse/local/share/info /usr/local/share/doc/apache-couchdb/html /usr/local/share/doc/apache-couchdb/pdf"
+
+ RESULT=`$CMD --infodir=/horse/local/share/info`
+ assertEquals "test infodir" "$EXPECT" "$RESULT"
+
+ RESULT=`$CMD --infodir /horse/local/share/info`
+ assertEquals "test infodir" "$EXPECT" "$RESULT"
+}
+
+test_infodir_error() {
+ EXPECT='ERROR: "--infodir" requires a non-empty argument.'
+
+ RESULT=`$CMD --infodir= 2>&1`
+ assertEquals "test infodir error" "$EXPECT" "$RESULT"
+
+ RESULT=`$CMD --infodir 2>&1`
+ assertEquals "test infodir error" "$EXPECT" "$RESULT"
+}
+
+test_htmldir() {
+ EXPECT="/usr/local /usr/local /usr/local/bin /usr/local/libexec /usr/local/etc /usr/local/share /usr/local/share /usr/local/var /usr/local/var/run /usr/local/share/doc/apache-couchdb /usr/local/lib /usr/local/var/lib /usr/local/var/lib /usr/local/var/log /usr/local/share/man /usr/local/share/info /horse/local/share/doc/html /usr/local/share/doc/apache-couchdb/pdf"
+
+ RESULT=`$CMD --htmldir=/horse/local/share/doc/html`
+ assertEquals "test htmldir" "$EXPECT" "$RESULT"
+
+ RESULT=`$CMD --htmldir /horse/local/share/doc/html`
+ assertEquals "test htmldir" "$EXPECT" "$RESULT"
+}
+
+test_htmldir_error() {
+ EXPECT='ERROR: "--htmldir" requires a non-empty argument.'
+
+ RESULT=`$CMD --htmldir= 2>&1`
+ assertEquals "test htmldir error" "$EXPECT" "$RESULT"
+
+ RESULT=`$CMD --htmldir 2>&1`
+ assertEquals "test htmldir error" "$EXPECT" "$RESULT"
+}
+
+test_pdfdir() {
+ EXPECT="/usr/local /usr/local /usr/local/bin /usr/local/libexec /usr/local/etc /usr/local/share /usr/local/share /usr/local/var /usr/local/var/run /usr/local/share/doc/apache-couchdb /usr/local/lib /usr/local/var/lib /usr/local/var/lib /usr/local/var/log /usr/local/share/man /usr/local/share/info /usr/local/share/doc/apache-couchdb/html /horse/local/share/doc/pdf"
+
+ RESULT=`$CMD --pdfdir=/horse/local/share/doc/pdf`
+ assertEquals "test pdfdir" "$EXPECT" "$RESULT"
+
+ RESULT=`$CMD --pdfdir /horse/local/share/doc/pdf`
+ assertEquals "test pdfdir" "$EXPECT" "$RESULT"
+}
+
+test_pdfdir_error() {
+ EXPECT='ERROR: "--pdfdir" requires a non-empty argument.'
+
+ RESULT=`$CMD --pdfdir= 2>&1`
+ assertEquals "test pdfdir error" "$EXPECT" "$RESULT"
+
+ RESULT=`$CMD --pdfdir 2>&1`
+ assertEquals "test pdfdir error" "$EXPECT" "$RESULT"
}
# source the shunit2
[34/50] couchdb commit: updated refs/heads/developer-preview-2.0 to
2a31bca
Posted by kx...@apache.org.
update .gitignore to ignore release folder and files
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/4b3a549c
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/4b3a549c
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/4b3a549c
Branch: refs/heads/developer-preview-2.0
Commit: 4b3a549c706ab74721777b85de986192f9db048b
Parents: 9f03394
Author: Jan Lehnardt <ja...@apache.org>
Authored: Wed Jun 24 22:35:13 2015 +0200
Committer: Jan Lehnardt <ja...@apache.org>
Committed: Wed Jun 24 23:07:48 2015 +0200
----------------------------------------------------------------------
.gitignore | 2 +-
Makefile | 4 +++-
2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/4b3a549c/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 8519032..b92f076 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,4 +29,4 @@ src/couch/priv/couchjs
src/couch/priv/couchspawnkillable
bin/
-release/
+apache-couchdb-*/
http://git-wip-us.apache.org/repos/asf/couchdb/blob/4b3a549c/Makefile
----------------------------------------------------------------------
diff --git a/Makefile b/Makefile
index 5dea12c..52f4770 100644
--- a/Makefile
+++ b/Makefile
@@ -43,7 +43,7 @@ clean:
@rm -f src/couch/priv/couch_js/config.h
@rm -f dev/boot_node.beam dev/pbkdf2.pyc log/crash.log
-check: javascript eunit
+check: javascript eunit build-test
# creates a full erlang release
dist: all
@@ -170,6 +170,8 @@ javascript: all
@dev/run -q --with-admin-party-please test/javascript/run
@rm -rf share/www/script
+build-test:
+ @test/build/test-configure.sh
# build docs
docs: src/docs/build
[20/50] couchdb commit: updated refs/heads/developer-preview-2.0 to
2a31bca
Posted by kx...@apache.org.
check build scripts for bashisms
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/4fee5877
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/4fee5877
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/4fee5877
Branch: refs/heads/developer-preview-2.0
Commit: 4fee5877a474664a1bcceda05cc4cef1cbe88a9e
Parents: 4dc3eaf
Author: Jan Lehnardt <ja...@apache.org>
Authored: Mon Jun 22 22:01:50 2015 +0200
Committer: Jan Lehnardt <ja...@apache.org>
Committed: Wed Jun 24 23:06:59 2015 +0200
----------------------------------------------------------------------
test/build/test-configure.sh | 26 +++++++++++++++++++++++++-
1 file changed, 25 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/4fee5877/test/build/test-configure.sh
----------------------------------------------------------------------
diff --git a/test/build/test-configure.sh b/test/build/test-configure.sh
index ae7565c..4a20988 100755
--- a/test/build/test-configure.sh
+++ b/test/build/test-configure.sh
@@ -13,6 +13,8 @@
# requires shunit2 to be in $PATH
# http://shunit2.googlecode.com/
+# uses `checkbashisms` if in $PATH
+
SHUNIT2=`which shunit2`
@@ -25,7 +27,29 @@ if [ -z "$SHUNIT2" -o ! -x "$SHUNIT2" ]; then
exit 1
fi
-CMD="./configure2 --test "
+CHECKBASHISMS=`which checkbashisms`
+
+if [ -n "$CHECKBASHISMS" -a -x "$CHECKBASHISMS" ]; then
+ echo "Checking for bash-isms"
+
+ echo " in ./configure"
+ `$CHECKBASHISMS -npfx configure`
+ if [ $? -ne 0 ]; then
+ echo "./configure includes bashisms, do not release"
+ fi
+ echo " done"
+
+ echo " in ./build-aux/couchdb-build-release.sh"
+ `$CHECKBASHISMS -npfx ./build-aux/couchdb-build-release.sh`
+ if [ $? -ne 0 ]; then
+ echo "./build-aux/couchdb-build-release.sh includes bashisms, do not release"
+ fi
+ echo " done"
+fi
+
+
+# shunit2 tests
+CMD="./configure --test "
test_defaults() {
EXPECT="/usr/local /usr/local /usr/local/bin /usr/local/libexec /usr/local/etc /usr/local/share /usr/local/share /usr/local/var /usr/local/var/run /usr/local/share/doc /usr/local/lib /usr/local/var/lib /usr/local/var/lib /usr/local/var/log"
[46/50] couchdb commit: updated refs/heads/developer-preview-2.0 to
2a31bca
Posted by kx...@apache.org.
CouchDB 2.0 may return HTTP 202 on database creation request
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/51b98a4a
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/51b98a4a
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/51b98a4a
Branch: refs/heads/developer-preview-2.0
Commit: 51b98a4a0ce0ed4a362cd7d596589733c58c2a0e
Parents: 1961cab
Author: Alexander Shorin <kx...@apache.org>
Authored: Tue Jul 7 18:19:28 2015 +0300
Committer: Alexander Shorin <kx...@apache.org>
Committed: Tue Jul 7 18:19:28 2015 +0300
----------------------------------------------------------------------
dev/run | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/51b98a4a/dev/run
----------------------------------------------------------------------
diff --git a/dev/run b/dev/run
index b27352c..67334fe 100755
--- a/dev/run
+++ b/dev/run
@@ -438,7 +438,7 @@ def create_system_databases(host, port):
conn = httpclient.HTTPConnection(host, port)
conn.request('PUT', '/' + dbname)
resp = conn.getresponse()
- assert resp.status == 201, resp.read()
+ assert resp.status in (201, 202), resp.read()
@log('Developers cluster is set up at http://127.0.0.1:{lead_port}.\n'
[16/50] couchdb commit: updated refs/heads/developer-preview-2.0 to
2a31bca
Posted by kx...@apache.org.
re-introduce DESTDIR
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/3f30eeb9
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/3f30eeb9
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/3f30eeb9
Branch: refs/heads/developer-preview-2.0
Commit: 3f30eeb9af93c0eecc487799e89f502fa032efc1
Parents: 9b2dfb4
Author: Jan Lehnardt <ja...@apache.org>
Authored: Wed Jun 3 21:56:19 2015 +0200
Committer: Jan Lehnardt <ja...@apache.org>
Committed: Wed Jun 24 23:06:56 2015 +0200
----------------------------------------------------------------------
Makefile | 24 ++++++++++++++----------
1 file changed, 14 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/3f30eeb9/Makefile
----------------------------------------------------------------------
diff --git a/Makefile b/Makefile
index 47e73a0..8815140 100644
--- a/Makefile
+++ b/Makefile
@@ -16,6 +16,8 @@ IN_RELEASE = $(shell if [ ! -d .git ]; then echo true; fi)
COUCHDB_VERSION_SUFFIX = $(shell if [ -d .git ]; then echo '-`git rev-parse --short --verify HEAD`'; fi)
COUCHDB_VERSION = $(vsn_major).$(vsn_minor).$(vsn_patch)$(COUCHDB_VERSION_SUFFIX)
+DESTDIR=
+
all: couch fauxton
config.erl:
@@ -83,20 +85,22 @@ devclean:
-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
- @mkdir -p $(install_dir)
- @cp -R rel/couchdb/* $(install_dir)
- @mkdir -p $(data_dir)
- @chown $(user) $(data_dir)
- @mkdir -p $(view_index_dir)
- @chown $(user) $(view_index_dir)
- @mkdir -p `dirname $(log_file)`
- @touch $(log_file)
- @chown $(user) $(log_file)
+ @mkdir -p $(DESTDIR)/$(install_dir)
+ @cp -R rel/couchdb/* $(DESTDIR)/$(install_dir)
+ @mkdir -p $(DESTDIR)/$(data_dir)
+ @chown $(user) $(DESTDIR)/$(data_dir)
+ @mkdir -p $(DESTDIR)/$(view_index_dir)
+ @chown $(user) $(DESTDIR)/$(view_index_dir)
+ @mkdir -p $(DESTDIR)/`dirname $(log_file)`
+ @touch $(DESTDIR)/$(log_file)
+ @chown $(user) $(DESTDIR)/$(log_file)
+ @echo "...done"
uninstall:
- @rm -rf $(install_dir)
+ @rm -rf $(DESTDIR)/$(install_dir)
install.mk:
# ignore install.mk missing if we are running
[05/50] couchdb commit: updated refs/heads/developer-preview-2.0 to
2a31bca
Posted by kx...@apache.org.
add version file
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/cb53da85
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/cb53da85
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/cb53da85
Branch: refs/heads/developer-preview-2.0
Commit: cb53da859214d0a36395d6916b157ab8787e546c
Parents: cadd21c
Author: Jan Lehnardt <ja...@apache.org>
Authored: Sun Apr 5 10:17:04 2015 +0200
Committer: Jan Lehnardt <ja...@apache.org>
Committed: Wed Jun 24 23:06:46 2015 +0200
----------------------------------------------------------------------
Makefile | 4 +++-
build-aux/couchdb-build-release.sh | 11 ++++++++++-
version.mk | 3 +++
3 files changed, 16 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/cb53da85/Makefile
----------------------------------------------------------------------
diff --git a/Makefile b/Makefile
index 58aab42..41dd9a6 100644
--- a/Makefile
+++ b/Makefile
@@ -10,6 +10,8 @@
# License for the specific language governing permissions and limitations under
# the License.
+include version.mk
+
IN_RELEASE = $(shell if [ ! -d .git ]; then echo true; fi)
all: couch fauxton
@@ -45,7 +47,7 @@ dist: all
# creates a source tarball
release:
- ./build-aux/couchdb-build-release.sh
+ ./build-aux/couchdb-build-release.sh $(vsn_major).$(vsn_minor).$(vsn_patch)
# build fauxton
$(MAKE) fauxton
http://git-wip-us.apache.org/repos/asf/couchdb/blob/cb53da85/build-aux/couchdb-build-release.sh
----------------------------------------------------------------------
diff --git a/build-aux/couchdb-build-release.sh b/build-aux/couchdb-build-release.sh
index f2f7e1b..557c2b8 100755
--- a/build-aux/couchdb-build-release.sh
+++ b/build-aux/couchdb-build-release.sh
@@ -1,4 +1,13 @@
-#!/bin/sh -ex
+#!/bin/sh -e
+
+VERSION=$1
+
+if [ -z "$VERSION" ]; then
+ echo "NO VERSION"
+ exit 1
+fi
+
+echo "Building Apache CouchDB $VERSION"
RELDIR=apache-couchdb
# make release dir
http://git-wip-us.apache.org/repos/asf/couchdb/blob/cb53da85/version.mk
----------------------------------------------------------------------
diff --git a/version.mk b/version.mk
new file mode 100644
index 0000000..f263880
--- /dev/null
+++ b/version.mk
@@ -0,0 +1,3 @@
+vsn_major=2
+vsn_minor=0
+vsn_patch=0
[21/50] couchdb commit: updated refs/heads/developer-preview-2.0 to
2a31bca
Posted by kx...@apache.org.
fix variable name for $DEFAULT_PREFIX
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/7853cb64
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/7853cb64
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/7853cb64
Branch: refs/heads/developer-preview-2.0
Commit: 7853cb64fbbfce206ca839732e3f01fdf426e971
Parents: 7c406da
Author: Micah Anderson <mi...@riseup.net>
Authored: Tue Jun 23 12:38:19 2015 -0400
Committer: Jan Lehnardt <ja...@apache.org>
Committed: Wed Jun 24 23:07:00 2015 +0200
----------------------------------------------------------------------
configure | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/7853cb64/configure
----------------------------------------------------------------------
diff --git a/configure b/configure
index c286edc..c3f0f3c 100755
--- a/configure
+++ b/configure
@@ -46,7 +46,7 @@ Options:
-h | --help display a short help message and exit
# -u USER set the username to run as (defaults to $COUCHDB_USER)
- --prefix=DIRECTORY set the installation prefix (defaults to $DEFAIULT_PREFIX)
+ --prefix=DIRECTORY set the installation prefix (defaults to $DEFAULT_PREFIX)
--databasedir DIRECTORY specify the data directory (defaults to /var/lib/couchdb)
--viewindexdir DIRECTORY specify the view directory (defaults to /var/lib/couchdb)
--logdir DIRECTORY specify the log file (defaults to /var/log/couchdb.log)
[25/50] couchdb commit: updated refs/heads/developer-preview-2.0 to
2a31bca
Posted by kx...@apache.org.
fix distclean discrepancy when make check is run
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/f9000688
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/f9000688
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/f9000688
Branch: refs/heads/developer-preview-2.0
Commit: f900068890b1cb71847380b19d0b4a321c90a7dc
Parents: 1cf49ad
Author: Jan Lehnardt <ja...@apache.org>
Authored: Tue Jun 23 22:48:31 2015 +0200
Committer: Jan Lehnardt <ja...@apache.org>
Committed: Wed Jun 24 23:07:03 2015 +0200
----------------------------------------------------------------------
Makefile | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/f9000688/Makefile
----------------------------------------------------------------------
diff --git a/Makefile b/Makefile
index 8a17004..2b5e28b 100644
--- a/Makefile
+++ b/Makefile
@@ -154,9 +154,11 @@ eunit: couch
@rebar -r eunit skip_deps=meck,mochiweb,lager,snappy,couch_replicator,fabric,folsom
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
fauxton: share/www
[10/50] couchdb commit: updated refs/heads/developer-preview-2.0 to
2a31bca
Posted by kx...@apache.org.
fix reinstalls
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/6ad3e31e
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/6ad3e31e
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/6ad3e31e
Branch: refs/heads/developer-preview-2.0
Commit: 6ad3e31e6b4485ecca7feccd3a38cc2b05acf1e8
Parents: 7f10157
Author: Jan Lehnardt <ja...@apache.org>
Authored: Mon Apr 6 23:14:39 2015 +0200
Committer: Jan Lehnardt <ja...@apache.org>
Committed: Wed Jun 24 23:06:51 2015 +0200
----------------------------------------------------------------------
Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/6ad3e31e/Makefile
----------------------------------------------------------------------
diff --git a/Makefile b/Makefile
index 2a96c64..dc07056 100644
--- a/Makefile
+++ b/Makefile
@@ -89,7 +89,7 @@ install: all
@chown $(user) $(data_dir)
@mkdir -p $(view_index_dir)
@chown $(user) $(view_index_dir)
- @mkdir `dirname $(log_file)`
+ @mkdir -p `dirname $(log_file)`
@touch $(log_file)
@chown $(user) $(log_file)
[40/50] couchdb commit: updated refs/heads/developer-preview-2.0 to
2a31bca
Posted by kx...@apache.org.
Adding references for FreeBSD, Fauxton, minor cleanup
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/ce2c357f
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/ce2c357f
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/ce2c357f
Branch: refs/heads/developer-preview-2.0
Commit: ce2c357fbb3402b79c7a7c01dcc40b1f2ff55487
Parents: 1ef7182
Author: Joan Touzet <wo...@apache.org>
Authored: Fri Jun 26 17:58:59 2015 -0400
Committer: Joan Touzet <wo...@apache.org>
Committed: Fri Jun 26 17:58:59 2015 -0400
----------------------------------------------------------------------
INSTALL.Unix | 56 ++++++++++++++++++++-----------------------------------
README-DEV | 42 ++++++++++++++++++-----------------------
2 files changed, 38 insertions(+), 60 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/ce2c357f/INSTALL.Unix
----------------------------------------------------------------------
diff --git a/INSTALL.Unix b/INSTALL.Unix
index f662e63..8b4b53d 100644
--- a/INSTALL.Unix
+++ b/INSTALL.Unix
@@ -61,17 +61,10 @@ Debian-based Systems
You can install the dependencies by running:
- sudo apt-get install build-essential
- sudo apt-get install erlang-base-hipe
- sudo apt-get install erlang-dev
- sudo apt-get install erlang-manpages
- sudo apt-get install erlang-eunit
- sudo apt-get install erlang-nox
- sudo apt-get install libicu-dev
- sudo apt-get install libmozjs185-dev
- sudo apt-get install libcurl4-openssl-dev
- sudo apt-get install pkg-config
- sudo apt-get install rebar
+ sudo apt-get install build-essential erlang-base-hipe \
+ erlang-dev erlang-manpages erlang-eunit erlang-nox \
+ libicu-dev libmozjs185-dev libcurl4-openssl-dev \
+ pkg-config rebar
There are lots of Erlang packages. If there is a problem with your
install, try a different mix. There is more information on the
@@ -95,21 +88,10 @@ RedHat-based (Fedora, Centos, RHEL) Systems
You can install the dependencies by running:
- sudo yum install autoconf
- sudo yum install autoconf-archive
- sudo yum install automake
- sudo yum install curl-devel
- sudo yum install erlang-asn1
- sudo yum install erlang-erts
- sudo yum install erlang-eunit
- sudo yum install erlang-os_mon
- sudo yum install erlang-xmerl
- sudo yum install erlang-rebar
- sudo yum install help2man
- sudo yum install js-devel
- sudo yum install libicu-devel
- sudo yum install libtool
- sudo yum install perl-Test-Harness
+ sudo yum install autoconf autoconf-archive automake \
+ curl-devel erlang-asn1 erlang-erts erlang-eunit \
+ erlang-os_mon erlang-xmerl erlang-rebar help2man \
+ js-devel libicu-devel libtool perl-Test-Harness
While CouchDB builds against the default js-devel-1.7.0 included in
some distributions, it's recommended to use a more recent
@@ -125,16 +107,8 @@ the Command Line Tools:
You can then install the other dependencies by running:
- brew install autoconf
- brew install autoconf-archive
- brew install automake
- brew install libtool
- brew install erlang
- brew install icu4c
- brew install spidermonkey
- brew install curl
- brew install pkg-config
- brew install rebar
+ brew install autoconf autoconf-archive automake libtool \
+ erlang icu4c spidermonkey curl pkg-config rebar
You will need Homebrew installed to use the `brew` command.
@@ -148,6 +122,16 @@ a segmentation fault or a bus error, you will need to install your own
version of OpenSSL. See the troubleshooting guide, mentioned above,
for more information.
+FreeBSD
+-------
+
+FreeBSD requires the use of GNU Make. Where `make` is specified in this
+documentation, substitute `gmake`.
+
+You can install this by running:
+
+ pkg install gmake
+
Installing
----------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/ce2c357f/README-DEV
----------------------------------------------------------------------
diff --git a/README-DEV b/README-DEV
index 94bb683..997e3db 100644
--- a/README-DEV
+++ b/README-DEV
@@ -39,6 +39,11 @@ 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.
@@ -46,36 +51,21 @@ Installation will be easiest, when you install them all.
Debian-based (inc. Ubuntu) Systems
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- sudo apt-get install help2man
- sudo apt-get install python-sphinx
- sudo apt-get install texlive-latex-base
- sudo apt-get install texlive-latex-recommended
- sudo apt-get install texlive-latex-extra
- sudo apt-get install texlive-fonts-recommended
- sudo apt-get install texinfo
- sudo apt-get install gnupg
+ 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
- sudo emerge gnupg
- sudo emerge coreutils
- sudo emerge pkgconfig
- sudo emerge help2man
+ sudo emerge texinfo gnupg coreutils pkgconfig help2man
sudo USE=latex emerge sphinx
RedHat-based (Fedora, Centos, RHEL) Systems
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- sudo yum install help2man
- sudo yum install python-sphinx
- sudo yum install python-docutils
- sudo yum install python-pygments
- sudo yum install texlive-latex
- sudo yum install texlive-latex-fonts
- sudo yum install texinfo
- sudo yum install gnupg
+ sudo yum install help2man python-sphinx python-docutils \
+ python-pygments texlive-latex texlive-latex-fonts texinfo gnupg
Mac OS X
~~~~~~~~
@@ -88,9 +78,7 @@ Unless you want to install the optional dependencies, skip to the next section.
Install what else we can with Homebrew:
- brew install help2man
- brew install gnupg
- brew install md5sha1sum
+ brew install help2man gnupg md5sha1sum
If you don't already have pip installed, install it:
@@ -108,6 +96,12 @@ Download MaxTeX from here:
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
~~~~~~~
[11/50] couchdb commit: updated refs/heads/developer-preview-2.0 to
2a31bca
Posted by kx...@apache.org.
fix uninstall
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/a2277753
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/a2277753
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/a2277753
Branch: refs/heads/developer-preview-2.0
Commit: a2277753bbfe4fafee5809edd64f32273574d39c
Parents: 6ad3e31
Author: Jan Lehnardt <ja...@apache.org>
Authored: Mon Apr 6 23:15:01 2015 +0200
Committer: Jan Lehnardt <ja...@apache.org>
Committed: Wed Jun 24 23:06:52 2015 +0200
----------------------------------------------------------------------
Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/a2277753/Makefile
----------------------------------------------------------------------
diff --git a/Makefile b/Makefile
index dc07056..c541157 100644
--- a/Makefile
+++ b/Makefile
@@ -94,7 +94,7 @@ install: all
@chown $(user) $(log_file)
uninstall:
- @rm -rf $(installdir)
+ @rm -rf $(install_dir)
install.mk:
# ignore install.mk missing if we are running
[02/50] couchdb commit: updated refs/heads/developer-preview-2.0 to
2a31bca
Posted by kx...@apache.org.
Git ignore .pyc (compiled python) files
PR: #323
PR-URL: https://github.com/apache/couchdb/pull/323
Reviewed-By: Robert Kowalski <ro...@kowalski.gd>
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/0a6298f2
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/0a6298f2
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/0a6298f2
Branch: refs/heads/developer-preview-2.0
Commit: 0a6298f2dd9be175ce6998f56f799ad0c0feb79b
Parents: 6da3b56
Author: Jay Doane <ja...@gmail.com>
Authored: Mon May 25 17:14:56 2015 -0700
Committer: Robert Kowalski <ro...@kowalski.gd>
Committed: Tue May 26 04:07:33 2015 +0200
----------------------------------------------------------------------
.gitignore | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/0a6298f2/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index db1bc3e..0cdbaa7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,6 +11,7 @@ tmp/
*.o
*.so
+*.pyc
ebin/
erl_crash.dump
[12/50] couchdb commit: updated refs/heads/developer-preview-2.0 to
2a31bca
Posted by kx...@apache.org.
remove build leftovers on make clean
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/e2b26ead
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/e2b26ead
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/e2b26ead
Branch: refs/heads/developer-preview-2.0
Commit: e2b26eadb6f1c40b81fd0e100f6d0248982445d9
Parents: a227775
Author: Jan Lehnardt <ja...@apache.org>
Authored: Sat Apr 11 21:44:40 2015 +0200
Committer: Jan Lehnardt <ja...@apache.org>
Committed: Wed Jun 24 23:06:53 2015 +0200
----------------------------------------------------------------------
Makefile | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/e2b26ead/Makefile
----------------------------------------------------------------------
diff --git a/Makefile b/Makefile
index c541157..a2ce75a 100644
--- a/Makefile
+++ b/Makefile
@@ -37,6 +37,7 @@ clean:
@rm -rf share/server/main.js share/server/main-coffee.js
@rm -f src/couch/priv/couchspawnkillable
@rm -f src/couch/priv/couch_js/config.h
+ @rm -f tmp/ dev/boot_node.beam dev/data dev/lib dev/pbkdf2.pyc log/crash.log dev/logs
check: javascript eunit
[29/50] couchdb commit: updated refs/heads/developer-preview-2.0 to
2a31bca
Posted by kx...@apache.org.
./configure: re-add --user option
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/b6f22ab0
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/b6f22ab0
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/b6f22ab0
Branch: refs/heads/developer-preview-2.0
Commit: b6f22ab09a4d81d3e1f5e1e963d49bb8f0de6b08
Parents: 72da08b
Author: Jan Lehnardt <ja...@apache.org>
Authored: Wed Jun 24 16:06:26 2015 +0200
Committer: Jan Lehnardt <ja...@apache.org>
Committed: Wed Jun 24 23:07:45 2015 +0200
----------------------------------------------------------------------
configure | 21 ++++++++++++++++++++-
1 file changed, 20 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/b6f22ab0/configure
----------------------------------------------------------------------
diff --git a/configure b/configure
index 7a94641..da198df 100755
--- a/configure
+++ b/configure
@@ -34,6 +34,7 @@ LIBDIR=
DATABASEDIR=
VIEWDIR=
LOGDIR=
+COUCHDB_USER=`whoami`
display_help () {
cat << EOF
@@ -45,7 +46,7 @@ system for Apache CouchDB.
Options:
-h | --help display a short help message and exit
- # -u USER set the username to run as (defaults to $COUCHDB_USER)
+ -u | --user USER set the username to run as (defaults to $COUCHDB_USER)
--prefix=DIRECTORY set the installation prefix (defaults to $DEFAULT_PREFIX)
--databasedir DIRECTORY specify the data directory (defaults to /var/lib/couchdb)
--viewindexdir DIRECTORY specify the view directory (defaults to /var/lib/couchdb)
@@ -96,6 +97,24 @@ parse_opts() {
continue
;;
+ --user|-u)
+ if [ -n "$2" ]; then
+ eval COUCHDB_USER=$2
+ shift 2
+ continue
+ else
+ printf 'ERROR: "--user" requires a non-empty argument.\n' >&2
+ exit 1
+ fi
+ ;;
+ --user=?*)
+ eval COUCHDB_USER=${1#*=}
+ ;;
+ --user=)
+ printf 'ERROR: "--user" requires a non-empty argument.\n' >&2
+ exit 1
+ ;;
+
--prefix)
if [ -n "$2" ]; then
eval PREFIX=$2
[49/50] couchdb commit: updated refs/heads/developer-preview-2.0 to
2a31bca
Posted by kx...@apache.org.
add couch_epi to reltool.config
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/ccf95f1e
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/ccf95f1e
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/ccf95f1e
Branch: refs/heads/developer-preview-2.0
Commit: ccf95f1eba09024a9c4303f633de83dece85d2a5
Parents: 8059f09
Author: Robert Newson <rn...@apache.org>
Authored: Mon Jul 13 16:40:09 2015 +0100
Committer: Robert Newson <rn...@apache.org>
Committed: Mon Jul 13 16:40:09 2015 +0100
----------------------------------------------------------------------
rel/reltool.config | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/ccf95f1e/rel/reltool.config
----------------------------------------------------------------------
diff --git a/rel/reltool.config b/rel/reltool.config
index 0929109..f246da9 100644
--- a/rel/reltool.config
+++ b/rel/reltool.config
@@ -33,6 +33,7 @@
chttpd,
config,
couch,
+ couch_epi,
couch_index,
couch_log,
couch_mrview,
@@ -87,6 +88,7 @@
{app, chttpd, [{incl_cond, include}]},
{app, config, [{incl_cond, include}]},
{app, couch, [{incl_cond, include}]},
+ {app, couch_epi, [{incl_cond, include}]},
{app, couch_index, [{incl_cond, include}]},
{app, couch_log, [{incl_cond, include}]},
{app, couch_mrview, [{incl_cond, include}]},
[18/50] couchdb commit: updated refs/heads/developer-preview-2.0 to
2a31bca
Posted by kx...@apache.org.
New ./configure script!
This work will handle GNU ./configure style configuration of target
directories for installation of the various bits of CouchDB.
Includes a test script(!) for ./configure
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/4dc3eafe
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/4dc3eafe
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/4dc3eafe
Branch: refs/heads/developer-preview-2.0
Commit: 4dc3eafed5bcfa7cce91283e83d458ccfd7c1e8a
Parents: f29c023
Author: Jan Lehnardt <ja...@apache.org>
Authored: Fri Jun 19 18:05:32 2015 +0200
Committer: Jan Lehnardt <ja...@apache.org>
Committed: Wed Jun 24 23:06:58 2015 +0200
----------------------------------------------------------------------
Makefile | 28 +++
configure | 439 +++++++++++++++++++++++++++++++++-----
test/build/test-configure.sh | 298 ++++++++++++++++++++++++++
3 files changed, 715 insertions(+), 50 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/4dc3eafe/Makefile
----------------------------------------------------------------------
diff --git a/Makefile b/Makefile
index 326403c..0e4bd2c 100644
--- a/Makefile
+++ b/Makefile
@@ -88,19 +88,47 @@ install: all
@echo "Installing CouchDB into $(DESTDIR)/$(install_dir)..." | sed -e 's,///,/,'
@rm -rf rel/couchdb
@rebar generate # make full erlang release
+
@mkdir -p $(DESTDIR)/$(install_dir)
@cp -R rel/couchdb/* $(DESTDIR)/$(install_dir)
+
@mkdir -p $(DESTDIR)/$(data_dir)
@chown $(user) $(DESTDIR)/$(data_dir)
+
@mkdir -p $(DESTDIR)/$(view_index_dir)
@chown $(user) $(DESTDIR)/$(view_index_dir)
+
@mkdir -p $(DESTDIR)/`dirname $(log_file)`
@touch $(DESTDIR)/$(log_file)
@chown $(user) $(DESTDIR)/$(log_file)
+
+ @mkdir -p $(DESTDIR)/$(bin_dir)
+ @cp rel/couchdb/bin/couchdb $(DESTDIR)/$(bin_dir)
+
+ @mkdir -p $(DESTDIR)/$(libexec_dir)
+ @cp rel/couchdb/bin/couchjs $(DESTDIR)/$(libexec_dir)
+
+ @mkdir -p $(DESTDIR)/$(sysconf_dir)
+ @mkdir -p $(DESTDIR)/$(sysconf_dir)/default.d
+ @mkdir -p $(DESTDIR)/$(sysconf_dir)/local.d
+ @cp rel/overlay/etc/default.ini rel/overlay/etc/local.ini $(DESTDIR)/$(sysconf_dir)
+
+ @mkdir -p $(DESTDIR)/$(data_dir)
+ @cp -R share/server share/www $(DESTDIR)/$(data_dir)
+
+ # TODO: copy over man, pdf, info etc. files
+ # after including them in the release tarball in `make release`
+ #@mkdir -p $(DESTDIR)/$(doc_dir)
+ #@cp -R
+
@echo "...done"
uninstall:
@rm -rf $(DESTDIR)/$(install_dir)
+ @rm -f $(DESTDIR)/$(bin_dir)/couchdb
+ @rm -f $(DESTDIR)/$(libexec_dir)
+ @rm -rf $(DESTDIR)/$(sysconf_dir)
+ @rm -rf $(DESTDIR)/$(data_dir)
install.mk:
# ignore install.mk missing if we are running
http://git-wip-us.apache.org/repos/asf/couchdb/blob/4dc3eafe/configure
----------------------------------------------------------------------
diff --git a/configure b/configure
index c122bf3..43d2e9d 100755
--- a/configure
+++ b/configure
@@ -11,15 +11,29 @@
# License for the specific language governing permissions and limitations under
# the License.
-PREFIX="/usr/local"
-PACKAGE_AUTHOR_NAME="The Apache Software Foundation"
-COUCHDB_USER=`whoami`
-WITH_CURL="false"
-
# cd into this script’s directory
rootdir="$(cd "${0%/*}" 2>/dev/null; echo "$PWD")"
basename=`basename $0`
+TEST=0
+WITH_CURL="false"
+
+PREFIX=
+DEFAULT_PREFIX=/usr/local
+EXEC_PREFIX=
+BINDIR=
+LIBEXECDIR=
+SYSCONFDIR=
+DATAROOTDIR=
+DATADIR=
+LOCALSTATEDIR=
+RUNSTATEDIR=
+DOCDIR=
+LIBDIR=
+
+DATABASEDIR=
+VIEWDIR=
+LOGDIR=
display_help () {
cat << EOF
@@ -30,66 +44,383 @@ system for Apache CouchDB.
Options:
- -h display a short help message and exit
- -u USER set the username to run as (defaults to $COUCHDB_USER)
- -p DIRECTORY set the prefix for installation (defaults to $PREFIX)
- -d DIRECTORY specify the data directory (defaults to /var/lib/couchdb)
- -v DIRECTORY specify the view directory (defaults to /var/lib/couchdb)
- -l FILE specify the log file (defaults to /var/log/couchdb.log)
- -c request that couchjs is linked to cURL (default false)
+ -h | --help display a short help message and exit
+ # -u USER set the username to run as (defaults to $COUCHDB_USER)
+ --prefix=DIRECTORY set the installation prefix (defaults to $DEFAIULT_PREFIX)
+ --databasedir DIRECTORY specify the data directory (defaults to /var/lib/couchdb)
+ --viewindexdir DIRECTORY specify the view directory (defaults to /var/lib/couchdb)
+ --logdir DIRECTORY specify the log file (defaults to /var/log/couchdb.log)
+ -c | --with-curl request that couchjs is linked to cURL (default false)
+
+ Installation directories:
+ --prefix=PREFIX install architecture-independent files in PREFIX
+ [/usr/local]
+ --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX
+ [PREFIX]
+ Fine tuning of the installation directories:
+ --bindir=DIR user executables [EPREFIX/bin]
+ --libexecdir=DIR program executables [EPREFIX/libexec]
+ --sysconfdir=DIR read-only single-machine data [PREFIX/etc]
+ --localstatedir=DIR modifiable single-machine data [PREFIX/var]
+ --libdir=DIR object code libraries [EPREFIX/lib]
+ --datarootdir=DIR read-only arch.-independent data root [PREFIX/share]
+ --datadir=DIR read-only architecture-independent data [DATAROOTDIR]
+ # --infodir=DIR info documentation [DATAROOTDIR/info]
+ # --mandir=DIR man documentation [DATAROOTDIR/man]
+ # --docdir=DIR documentation root [DATAROOTDIR/doc/apache-couchdb]
+ # --htmldir=DIR html documentation [DOCDIR]
+ # --dvidir=DIR dvi documentation [DOCDIR]
+ # --pdfdir=DIR pdf documentation [DOCDIR]
+ # --psdir=DIR ps documentation [DOCDIR]
EOF
}
+parse_opts() {
+ while :; do
+ case $1 in
+ -h|--help)
+ display_help
+ exit
+ ;;
-display_error () {
- if test -n "$1"; then
- echo $1 >&2
- fi
- echo >&2
- echo "Try \"$basename -h\" for more information." >&2
- false
-}
+ --test)
+ TEST=1
+ shift 1
+ continue
+ ;;
+ --with-curl|-c)
+ WITH_CURL="true"
+ shift 1
+ continue
+ ;;
-parse_opts () {
- set +e
- options=`getopt hu:p:d:v:l:c $@`
- if test ! $? -eq 0; then
- display_error
- fi
- set -e
- eval set -- $options
- while [ $# -gt 0 ]; do
- case "$1" in
- -h) shift; display_help; exit;;
- -u) shift; COUCHDB_USER=$1; shift;;
- -p) shift; PREFIX=$1; shift;;
- -d) shift; DATA_DIR=$1; shift;;
- -v) shift; VIEW_DIR=$1; shift;;
- -l) shift; LOG_FILE=$1; shift;;
- -c) shift; WITH_CURL="true";;
- --) shift; break;;
- *) display_error "Unknown option: $1" >&2;;
+ --prefix)
+ if [ -n "$2" ]; then
+ PREFIX=$2
+ shift 2
+ continue
+ else
+ printf 'ERROR: "--prefix" requires a non-empty argument.\n' >&2
+ exit 1
+ fi
+ ;;
+ --prefix=?*)
+ PREFIX=${1#*=}
+ ;;
+ --prefix=)
+ printf 'ERROR: "--prefix" requires a non-empty argument.\n' >&2
+ exit 1
+ ;;
+
+ --exec-prefix)
+ if [ -n "$2" ]; then
+ EXEC_PREFIX=$2
+ shift 2
+ continue
+ else
+ printf 'ERROR: "--exec-prefix" requires a non-empty argument.\n' >&2
+ exit 1
+ fi
+ ;;
+ --exec-prefix=?*)
+ EXEC_PREFIX=${1#*=}
+ ;;
+ --exec-prefix=)
+ printf 'ERROR: "--exec-prefix" requires a non-empty argument.\n' >&2
+ exit 1
+ ;;
+
+ --bindir)
+ if [ -n "$2" ]; then
+ BINDIR=$2
+ shift 2
+ continue
+ else
+ printf 'ERROR: "--bindir" requires a non-empty argument.\n' >&2
+ exit 1
+ fi
+ ;;
+ --bindir=?*)
+ BINDIR=${1#*=}
+ ;;
+ --bindir=)
+ printf 'ERROR: "--bindir" requires a non-empty argument.\n' >&2
+ exit 1
+ ;;
+
+ --libexecdir)
+ if [ -n "$2" ]; then
+ LIBEXECDIR=$2
+ shift 2
+ continue
+ else
+ printf 'ERROR: "--libexecdir" requires a non-empty argument.\n' >&2
+ exit 1
+ fi
+ ;;
+ --libexecdir=?*)
+ LIBEXECDIR=${1#*=}
+ ;;
+ --libexecdir=)
+ printf 'ERROR: "--libexecdir" requires a non-empty argument.\n' >&2
+ exit 1
+ ;;
+
+ --sysconfdir)
+ if [ -n "$2" ]; then
+ SYSCONFDIR=$2
+ shift 2
+ continue
+ else
+ printf 'ERROR: "--sysconfdir" requires a non-empty argument.\n' >&2
+ exit 1
+ fi
+ ;;
+ --sysconfdir=?*)
+ SYSCONFDIR=${1#*=}
+ ;;
+ --sysconfdir=)
+ printf 'ERROR: "--sysconfdir" requires a non-empty argument.\n' >&2
+ exit 1
+ ;;
+
+ --datarootdir)
+ if [ -n "$2" ]; then
+ DATAROOTDIR=$2
+ shift 2
+ continue
+ else
+ printf 'ERROR: "--datarootdir" requires a non-empty argument.\n' >&2
+ exit 1
+ fi
+ ;;
+ --datarootdir=?*)
+ DATAROOTDIR=${1#*=}
+ ;;
+ --datarootdir=)
+ printf 'ERROR: "--datarootdir" requires a non-empty argument.\n' >&2
+ exit 1
+ ;;
+
+ --datadir)
+ if [ -n "$2" ]; then
+ DATADIR=$2
+ shift 2
+ continue
+ else
+ printf 'ERROR: "--datadir" requires a non-empty argument.\n' >&2
+ exit 1
+ fi
+ ;;
+ --datadir=?*)
+ DATADIR=${1#*=}
+ ;;
+ --datadir=)
+ printf 'ERROR: "--datadir" requires a non-empty argument.\n' >&2
+ exit 1
+ ;;
+
+ --localstatedir)
+ if [ -n "$2" ]; then
+ LOCALSTATEDIR=$2
+ shift 2
+ continue
+ else
+ printf 'ERROR: "--localstatedir" requires a non-empty argument.\n' >&2
+ exit 1
+ fi
+ ;;
+ --localstatedir=?*)
+ LOCALSTATEDIR=${1#*=}
+ ;;
+ --localstatedir=)
+ printf 'ERROR: "--localstatedir" requires a non-empty argument.\n' >&2
+ exit 1
+ ;;
+
+ --runstatedir)
+ if [ -n "$2" ]; then
+ RUNSTATEDIR=$2
+ shift 2
+ continue
+ else
+ printf 'ERROR: "--runstatedir" requires a non-empty argument.\n' >&2
+ exit 1
+ fi
+ ;;
+ --runstatedir=?*)
+ RUNSTATEDIR=${1#*=}
+ ;;
+ --runstatedir=)
+ printf 'ERROR: "--runstatedir" requires a non-empty argument.\n' >&2
+ exit 1
+ ;;
+
+ --docdir)
+ if [ -n "$2" ]; then
+ DOCDIR=$2
+ shift 2
+ continue
+ else
+ printf 'ERROR: "--docdir" requires a non-empty argument.\n' >&2
+ exit 1
+ fi
+ ;;
+ --docdir=?*)
+ DOCDIR=${1#*=}
+ ;;
+ --docdir=)
+ printf 'ERROR: "--docdir" requires a non-empty argument.\n' >&2
+ exit 1
+ ;;
+
+ --libdir)
+ if [ -n "$2" ]; then
+ LIBDIR=$2
+ shift 2
+ continue
+ else
+ printf 'ERROR: "--libdir" requires a non-empty argument.\n' >&2
+ exit 1
+ fi
+ ;;
+ --libdir=?*)
+ LIBDIR=${1#*=}
+ ;;
+ --libdir=)
+ printf 'ERROR: "--libdir" requires a non-empty argument.\n' >&2
+ exit 1
+ ;;
+
+ --databasedir)
+ if [ -n "$2" ]; then
+ DATABASEDIR=$2
+ shift 2
+ continue
+ else
+ printf 'ERROR: "--databasedir" requires a non-empty argument.\n' >&2
+ exit 1
+ fi
+ ;;
+ --databasedir=?*)
+ DATABASEDIR=${1#*=}
+ ;;
+ --databasedir=)
+ printf 'ERROR: "--databasedir" requires a non-empty argument.\n' >&2
+ exit 1
+ ;;
+
+ --viewindexdir)
+ if [ -n "$2" ]; then
+ VIEWDIR=$2
+ shift 2
+ continue
+ else
+ printf 'ERROR: "--viewindexdir" requires a non-empty argument.\n' >&2
+ exit 1
+ fi
+ ;;
+ --viewindexdir=?*)
+ VIEWDIR=${1#*=}
+ ;;
+ --viewindexdir=)
+ printf 'ERROR: "--viewindexdir" requires a non-empty argument.\n' >&2
+ exit 1
+ ;;
+
+ --logdir)
+ if [ -n "$2" ]; then
+ LOGDIR=$2
+ shift 2
+ continue
+ else
+ printf 'ERROR: "--logdir" requires a non-empty argument.\n' >&2
+ exit 1
+ fi
+ ;;
+ --logdir=?*)
+ LOGDIR=${1#*=}
+ ;;
+ --logdir=)
+ printf 'ERROR: "--logdir" requires a non-empty argument.\n' >&2
+ exit 1
+ ;;
+
+ --) # End of options
+ shift
+ break
+ ;;
+ *) # Done
+ break
esac
+ shift
done
# defaults
- if test -z "$DATA_DIR"; then
- DATA_DIR="/var/lib/couchdb";
+ if test -z "$PREFIX"; then
+ PREFIX="$DEFAULT_PREFIX";
+ fi
+ if test -z "$EXEC_PREFIX"; then
+ EXEC_PREFIX="$PREFIX";
+ fi
+ if test -z "$BINDIR"; then
+ BINDIR="$EXEC_PREFIX/bin";
+ fi
+ if test -z "$LIBEXECDIR"; then
+ LIBEXECDIR="$EXEC_PREFIX/libexec";
+ fi
+ if test -z "$SYSCONFDIR"; then
+ SYSCONFDIR="$PREFIX/etc";
+ fi
+ if test -z "$DATAROOTDIR"; then
+ DATAROOTDIR="$PREFIX/share";
+ fi
+ if test -z "$DATADIR"; then
+ DATADIR="$DATAROOTDIR";
+ fi
+ if test -z "$LOCALSTATEDIR"; then
+ LOCALSTATEDIR="$PREFIX/var";
+ fi
+ if test -z "$RUNSTATEDIR"; then
+ RUNSTATEDIR="$LOCALSTATEDIR/run";
+ fi
+ if test -z "$DOCDIR"; then
+ DOCDIR="$DATAROOTDIR/doc";
fi
- if test -z "$VIEW_DIR"; then
- VIEW_DIR="/var/lib/couchdb";
+ if test -z "$LIBDIR"; then
+ LIBDIR="$EXEC_PREFIX/lib";
fi
- if test -z "$LOG_FILE"; then
- LOG_FILE="/var/log/couchdb.log";
+ if test -z "$DATABASEDIR"; then
+ DATABASEDIR="$LOCALSTATEDIR/lib";
+ fi
+ if test -z "$VIEWDIR"; then
+ VIEWDIR="$LOCALSTATEDIR/lib";
+ fi
+ if test -z "$LOGDIR"; then
+ LOGDIR="$LOCALSTATEDIR/log";
fi
}
-
parse_opts $@
-INSTALL_DIR="$PREFIX/couchdb"
+# We use this for testing this script
+# The test script lives in test/build/test-configure.sh
+if [ "$TEST" = "1" ]; then
+ echo $PREFIX $EXEC_PREFIX $BINDIR $LIBEXECDIR $SYSCONFDIR $DATAROOTDIR \
+ $DATADIR $LOCALSTATEDIR $RUNSTATEDIR $DOCDIR $LIBDIR $DATABASEDIR \
+ $VIEWDIR $LOGDIR
+ exit 0
+fi
+
+# Translate ./configure variables to CouchDB variables
+
+INSTALL_DIR=$LIBDIR/couchdb
+LOG_FILE=$LOGDIR/couch.log
+
+DATBASE_DIR=$DATABASE_DIR/couchdb
+VIEW_DIR=$VIEW_DIR/couchdb
echo "==> configuring couchdb in rel/couchdb.config"
@@ -109,8 +440,8 @@ cat > rel/couchdb.config << EOF
% The contents of this file are auto-generated by configure
%
{package_author_name, "$PACKAGE_AUTHOR_NAME"}.
-{prefix, "INSTALLDIR"}.
-{data_dir, "$DATA_DIR"}.
+{prefix, "$INSTALL_DIR"}.
+{data_dir, "$DATABASE_DIR"}.
{view_index_dir, "$VIEW_DIR"}.
{log_file, "$LOG_FILE"}.
{user, "$COUCHDB_USER"}.
@@ -136,7 +467,14 @@ cat > install.mk << EOF
#
package_author_name = $PACKAGE_AUTHOR_NAME
install_dir = $INSTALL_DIR
-data_dir = $DATA_DIR
+
+bin_dir = $BINDIR
+libexec_dir = $LIBEXECDIR/couchdb
+doc_dir = $DOCDIR/couchdb
+sysconf_dir = $SYSCONFDIR/couchdb
+data_dir = $DATADIR/couchdb
+
+database_dir = $DATABASE_DIR
view_index_dir = $VIEW_DIR
log_file = $LOG_FILE
user = $COUCHDB_USER
@@ -146,6 +484,7 @@ cat > $rootdir/config.erl << EOF
{with_curl, $WITH_CURL}.
EOF
+
# only update dependencies, when we are not in a release tarball
if [ -d .git ]; then
echo "==> updating dependencies"
http://git-wip-us.apache.org/repos/asf/couchdb/blob/4dc3eafe/test/build/test-configure.sh
----------------------------------------------------------------------
diff --git a/test/build/test-configure.sh b/test/build/test-configure.sh
new file mode 100755
index 0000000..ae7565c
--- /dev/null
+++ b/test/build/test-configure.sh
@@ -0,0 +1,298 @@
+#!/bin/sh
+# Licensed under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License. You may obtain a copy of
+# the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations under
+# the License.
+
+# requires shunit2 to be in $PATH
+# http://shunit2.googlecode.com/
+
+SHUNIT2=`which shunit2`
+
+if [ -z "$SHUNIT2" -o ! -x "$SHUNIT2" ]; then
+ echo
+ echo "Error: This test script requires the shunit2 script to be in \$PATH".
+ echo "You can download shunit2 from http://shunit2.googlecode.com or via"
+ echo "your preferred package manager."
+ echo
+ exit 1
+fi
+
+CMD="./configure2 --test "
+
+test_defaults() {
+ EXPECT="/usr/local /usr/local /usr/local/bin /usr/local/libexec /usr/local/etc /usr/local/share /usr/local/share /usr/local/var /usr/local/var/run /usr/local/share/doc /usr/local/lib /usr/local/var/lib /usr/local/var/lib /usr/local/var/log"
+ RESULT=`$CMD`
+ assertEquals "test defaults" "$EXPECT" "$RESULT"
+}
+
+test_prefix() {
+ EXPECT="/opt/local /opt/local /opt/local/bin /opt/local/libexec /opt/local/etc /opt/local/share /opt/local/share /opt/local/var /opt/local/var/run /opt/local/share/doc /opt/local/lib /opt/local/var/lib /opt/local/var/lib /opt/local/var/log"
+
+ RESULT=`$CMD --prefix=/opt/local`
+ assertEquals "test prefix" "$EXPECT" "$RESULT"
+
+ RESULT=`$CMD --prefix /opt/local`
+ assertEquals "test prefix" "$EXPECT" "$RESULT"
+}
+
+test_prefix_error() {
+ EXPECT='ERROR: "--prefix" requires a non-empty argument.'
+
+ RESULT=`$CMD --prefix= 2>&1`
+ assertEquals "test prefix error" "$EXPECT" "$RESULT"
+
+ RESULT=`$CMD --prefix 2>&1`
+ assertEquals "test prefix error" "$EXPECT" "$RESULT"
+}
+
+
+test_exec_prefix() {
+ EXPECT="/usr/local /opt/local /opt/local/bin /opt/local/libexec /usr/local/etc /usr/local/share /usr/local/share /usr/local/var /usr/local/var/run /usr/local/share/doc /opt/local/lib /usr/local/var/lib /usr/local/var/lib /usr/local/var/log"
+
+ RESULT=`$CMD --exec-prefix=/opt/local`
+ assertEquals "test exec_prefix" "$EXPECT" "$RESULT"
+
+ RESULT=`$CMD --exec-prefix /opt/local`
+ assertEquals "test exec_prefix" "$EXPECT" "$RESULT"
+}
+
+test_exec_prefix_error() {
+ EXPECT='ERROR: "--exec-prefix" requires a non-empty argument.'
+
+ RESULT=`$CMD --exec-prefix= 2>&1`
+ assertEquals "test exec_prefix error" "$EXPECT" "$RESULT"
+
+ RESULT=`$CMD --exec-prefix 2>&1`
+ assertEquals "test exec_prefix error" "$EXPECT" "$RESULT"
+}
+
+test_bindir() {
+ EXPECT="/usr/local /usr/local /my/funky/bindir /usr/local/libexec /usr/local/etc /usr/local/share /usr/local/share /usr/local/var /usr/local/var/run /usr/local/share/doc /usr/local/lib /usr/local/var/lib /usr/local/var/lib /usr/local/var/log"
+
+ RESULT=`$CMD --bindir=/my/funky/bindir`
+ assertEquals "test bindir" "$EXPECT" "$RESULT"
+
+ RESULT=`$CMD --bindir /my/funky/bindir`
+ assertEquals "test bindir" "$EXPECT" "$RESULT"
+}
+
+test_bindir_error() {
+ EXPECT='ERROR: "--bindir" requires a non-empty argument.'
+
+ RESULT=`$CMD --bindir= 2>&1`
+ assertEquals "test bindir error" "$EXPECT" "$RESULT"
+
+ RESULT=`$CMD --bindir 2>&1`
+ assertEquals "test bindir error" "$EXPECT" "$RESULT"
+}
+
+test_libexecdir() {
+ EXPECT="/usr/local /usr/local /usr/local/bin /opt/local/libexec /usr/local/etc /usr/local/share /usr/local/share /usr/local/var /usr/local/var/run /usr/local/share/doc /usr/local/lib /usr/local/var/lib /usr/local/var/lib /usr/local/var/log"
+
+ RESULT=`$CMD --libexecdir=/opt/local/libexec`
+ assertEquals "test libexecdir" "$EXPECT" "$RESULT"
+
+ RESULT=`$CMD --libexecdir /opt/local/libexec`
+ assertEquals "test libexecdir" "$EXPECT" "$RESULT"
+}
+
+test_libexecdir_error() {
+ EXPECT='ERROR: "--libexecdir" requires a non-empty argument.'
+
+ RESULT=`$CMD --libexecdir= 2>&1`
+ assertEquals "test libexecdir error" "$EXPECT" "$RESULT"
+
+ RESULT=`$CMD --libexecdir 2>&1`
+ assertEquals "test libexecdir error" "$EXPECT" "$RESULT"
+}
+
+test_sysconfdir() {
+ EXPECT="/usr/local /usr/local /usr/local/bin /usr/local/libexec /opt/local/etc /usr/local/share /usr/local/share /usr/local/var /usr/local/var/run /usr/local/share/doc /usr/local/lib /usr/local/var/lib /usr/local/var/lib /usr/local/var/log"
+
+ RESULT=`$CMD --sysconfdir=/opt/local/etc`
+ assertEquals "test sysconfdir" "$EXPECT" "$RESULT"
+
+ RESULT=`$CMD --sysconfdir /opt/local/etc`
+ assertEquals "test sysconfdir" "$EXPECT" "$RESULT"
+}
+
+test_sysconfdir_error() {
+ EXPECT='ERROR: "--sysconfdir" requires a non-empty argument.'
+
+ RESULT=`$CMD --sysconfdir= 2>&1`
+ assertEquals "test sysconfdir error" "$EXPECT" "$RESULT"
+
+ RESULT=`$CMD --sysconfdir 2>&1`
+ assertEquals "test sysconfdir error" "$EXPECT" "$RESULT"
+}
+
+test_datarootdir() {
+ EXPECT="/usr/local /usr/local /usr/local/bin /usr/local/libexec /usr/local/etc /opt/local/share /opt/local/share /usr/local/var /usr/local/var/run /opt/local/share/doc /usr/local/lib /usr/local/var/lib /usr/local/var/lib /usr/local/var/log"
+
+ RESULT=`$CMD --datarootdir=/opt/local/share`
+ assertEquals "test datarootdir" "$EXPECT" "$RESULT"
+
+ RESULT=`$CMD --datarootdir /opt/local/share`
+ assertEquals "test datarootdir" "$EXPECT" "$RESULT"
+}
+
+test_datarootdir_error() {
+ EXPECT='ERROR: "--datarootdir" requires a non-empty argument.'
+
+ RESULT=`$CMD --datarootdir= 2>&1`
+ assertEquals "test datarootdir error" "$EXPECT" "$RESULT"
+
+ RESULT=`$CMD --datarootdir 2>&1`
+ assertEquals "test datarootdir error" "$EXPECT" "$RESULT"
+}
+
+test_localstatedir() {
+ EXPECT="/usr/local /usr/local /usr/local/bin /usr/local/libexec /usr/local/etc /usr/local/share /usr/local/share /horse/local/var /horse/local/var/run /usr/local/share/doc /usr/local/lib /horse/local/var/lib /horse/local/var/lib /horse/local/var/log"
+
+ RESULT=`$CMD --localstatedir=/horse/local/var`
+ assertEquals "test localstatedir" "$EXPECT" "$RESULT"
+
+ RESULT=`$CMD --localstatedir /horse/local/var`
+ assertEquals "test localstatedir" "$EXPECT" "$RESULT"
+}
+
+test_localstatedir_error() {
+ EXPECT='ERROR: "--localstatedir" requires a non-empty argument.'
+
+ RESULT=`$CMD --localstatedir= 2>&1`
+ assertEquals "test localstatedir error" "$EXPECT" "$RESULT"
+
+ RESULT=`$CMD --localstatedir 2>&1`
+ assertEquals "test localstatedir error" "$EXPECT" "$RESULT"
+}
+
+test_runstatedir() {
+ EXPECT="/usr/local /usr/local /usr/local/bin /usr/local/libexec /usr/local/etc /usr/local/share /usr/local/share /usr/local/var /horse/local/var/run /usr/local/share/doc /usr/local/lib /usr/local/var/lib /usr/local/var/lib /usr/local/var/log"
+
+ RESULT=`$CMD --runstatedir=/horse/local/var/run`
+ assertEquals "test runstatedir" "$EXPECT" "$RESULT"
+
+ RESULT=`$CMD --runstatedir /horse/local/var/run`
+ assertEquals "test runstatedir" "$EXPECT" "$RESULT"
+}
+
+test_runstatedir_error() {
+ EXPECT='ERROR: "--runstatedir" requires a non-empty argument.'
+
+ RESULT=`$CMD --runstatedir= 2>&1`
+ assertEquals "test runstatedir error" "$EXPECT" "$RESULT"
+
+ RESULT=`$CMD --runstatedir 2>&1`
+ assertEquals "test runstatedir error" "$EXPECT" "$RESULT"
+}
+
+test_docdir() {
+ EXPECT="/usr/local /usr/local /usr/local/bin /usr/local/libexec /usr/local/etc /usr/local/share /usr/local/share /usr/local/var /usr/local/var/run /horse/local/share/doc /usr/local/lib /usr/local/var/lib /usr/local/var/lib /usr/local/var/log"
+
+ RESULT=`$CMD --docdir=/horse/local/share/doc`
+ assertEquals "test docdir" "$EXPECT" "$RESULT"
+
+ RESULT=`$CMD --docdir /horse/local/share/doc`
+ assertEquals "test docdir" "$EXPECT" "$RESULT"
+}
+
+test_docdir_error() {
+ EXPECT='ERROR: "--docdir" requires a non-empty argument.'
+
+ RESULT=`$CMD --docdir= 2>&1`
+ assertEquals "test docdir error" "$EXPECT" "$RESULT"
+
+ RESULT=`$CMD --docdir 2>&1`
+ assertEquals "test docdir error" "$EXPECT" "$RESULT"
+}
+
+test_libdir() {
+ EXPECT="/usr/local /usr/local /usr/local/bin /usr/local/libexec /usr/local/etc /usr/local/share /usr/local/share /usr/local/var /usr/local/var/run /usr/local/share/doc /horse/local/lib /usr/local/var/lib /usr/local/var/lib /usr/local/var/log"
+
+ RESULT=`$CMD --libdir=/horse/local/lib`
+ assertEquals "test libdir" "$EXPECT" "$RESULT"
+
+ RESULT=`$CMD --libdir /horse/local/lib`
+ assertEquals "test libdir" "$EXPECT" "$RESULT"
+}
+
+test_libdir_error() {
+ EXPECT='ERROR: "--libdir" requires a non-empty argument.'
+
+ RESULT=`$CMD --libdir= 2>&1`
+ assertEquals "test libdir error" "$EXPECT" "$RESULT"
+
+ RESULT=`$CMD --libdir 2>&1`
+ assertEquals "test libdir error" "$EXPECT" "$RESULT"
+}
+
+test_database_dir() {
+ EXPECT="/usr/local /usr/local /usr/local/bin /usr/local/libexec /usr/local/etc /usr/local/share /usr/local/share /usr/local/var /usr/local/var/run /usr/local/share/doc /usr/local/lib /horse/local/var/lib /usr/local/var/lib /usr/local/var/log"
+
+ RESULT=`$CMD --databasedir=/horse/local/var/lib`
+ assertEquals "test database_dir" "$EXPECT" "$RESULT"
+
+ RESULT=`$CMD --databasedir /horse/local/var/lib`
+ assertEquals "test database_dir" "$EXPECT" "$RESULT"
+}
+
+test_database_dir_error() {
+ EXPECT='ERROR: "--databasedir" requires a non-empty argument.'
+
+ RESULT=`$CMD --databasedir= 2>&1`
+ assertEquals "test database_dir error" "$EXPECT" "$RESULT"
+
+ RESULT=`$CMD --databasedir 2>&1`
+ assertEquals "test database_dir error" "$EXPECT" "$RESULT"
+}
+
+test_view_dir() {
+ EXPECT="/usr/local /usr/local /usr/local/bin /usr/local/libexec /usr/local/etc /usr/local/share /usr/local/share /usr/local/var /usr/local/var/run /usr/local/share/doc /usr/local/lib /usr/local/var/lib /horse/local/var/lib /usr/local/var/log"
+
+ RESULT=`$CMD --viewindexdir=/horse/local/var/lib`
+ assertEquals "test view_dir" "$EXPECT" "$RESULT"
+
+ RESULT=`$CMD --viewindexdir /horse/local/var/lib`
+ assertEquals "test view_dir" "$EXPECT" "$RESULT"
+}
+
+test_view_dir_error() {
+ EXPECT='ERROR: "--viewindexdir" requires a non-empty argument.'
+
+ RESULT=`$CMD --viewindexdir= 2>&1`
+ assertEquals "test view_dir error" "$EXPECT" "$RESULT"
+
+ RESULT=`$CMD --viewindexdir 2>&1`
+ assertEquals "test view_dir error" "$EXPECT" "$RESULT"
+}
+
+test_log_dir() {
+ EXPECT="/usr/local /usr/local /usr/local/bin /usr/local/libexec /usr/local/etc /usr/local/share /usr/local/share /usr/local/var /usr/local/var/run /usr/local/share/doc /usr/local/lib /usr/local/var/lib /usr/local/var/lib /horse/log"
+
+ RESULT=`$CMD --logdir=/horse/log`
+ assertEquals "test log_dir" "$EXPECT" "$RESULT"
+
+ RESULT=`$CMD --logdir /horse/log`
+ assertEquals "test log_dir" "$EXPECT" "$RESULT"
+}
+
+test_log_dir_error() {
+ EXPECT='ERROR: "--logdir" requires a non-empty argument.'
+
+ RESULT=`$CMD --logdir= 2>&1`
+ assertEquals "test log_dir error" "$EXPECT" "$RESULT"
+
+ RESULT=`$CMD --logdir 2>&1`
+ assertEquals "test log_dir error" "$EXPECT" "$RESULT"
+}
+
+# source the shunit2
+. $SHUNIT2
[43/50] couchdb commit: updated refs/heads/developer-preview-2.0 to
2a31bca
Posted by kx...@apache.org.
configure: remove leftover config options, thanks @Wohali
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/8aac04cd
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/8aac04cd
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/8aac04cd
Branch: refs/heads/developer-preview-2.0
Commit: 8aac04cd0621d5ea63c9bf119d4ede4168b1c796
Parents: a666762
Author: Jan Lehnardt <ja...@apache.org>
Authored: Mon Jun 29 22:20:19 2015 +0200
Committer: Jan Lehnardt <ja...@apache.org>
Committed: Mon Jun 29 22:20:19 2015 +0200
----------------------------------------------------------------------
configure | 2 --
1 file changed, 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/8aac04cd/configure
----------------------------------------------------------------------
diff --git a/configure b/configure
index b5d56e9..1c2c30d 100755
--- a/configure
+++ b/configure
@@ -86,9 +86,7 @@ Options:
--mandir=DIR man documentation [DATAROOTDIR/man]
--docdir=DIR documentation root [DATAROOTDIR/doc/apache-couchdb]
--htmldir=DIR html documentation [DOCDIR]
- --dvidir=DIR dvi documentation [DOCDIR]
--pdfdir=DIR pdf documentation [DOCDIR]
- --psdir=DIR ps documentation [DOCDIR]
EOF
}
[44/50] couchdb commit: updated refs/heads/developer-preview-2.0 to
2a31bca
Posted by kx...@apache.org.
Add couch_epi
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/bab44b83
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/bab44b83
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/bab44b83
Branch: refs/heads/developer-preview-2.0
Commit: bab44b836549a9c6c23e056b12b0ab86962b1c27
Parents: 8aac04c
Author: Robert Newson <rn...@apache.org>
Authored: Thu Jun 25 10:40:30 2015 +0100
Committer: Robert Newson <rn...@apache.org>
Committed: Tue Jun 30 10:30:19 2015 +0100
----------------------------------------------------------------------
rebar.config.script | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/bab44b83/rebar.config.script
----------------------------------------------------------------------
diff --git a/rebar.config.script b/rebar.config.script
index fd2f55b..9e451e2 100644
--- a/rebar.config.script
+++ b/rebar.config.script
@@ -23,6 +23,7 @@ DepDescs = [
{config, "config", {branch, "master"}},
{chttpd, "chttpd", {branch, "master"}},
{couch, "couch", {branch, "master"}},
+ {couch_epi, "couch-epi", {branch, "master"}},
{couch_index, "couch-index", {branch, "master"}},
{couch_mrview, "couch-mrview", {branch, "master"}},
{couch_replicator, "couch-replicator", {branch, "master"}},
[42/50] couchdb commit: updated refs/heads/developer-preview-2.0 to
2a31bca
Posted by kx...@apache.org.
fix fauxton in dev mode
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/a666762c
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/a666762c
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/a666762c
Branch: refs/heads/developer-preview-2.0
Commit: a666762c1f85dd3fabed88c871bbde160fbbb7f2
Parents: a1ecde1
Author: Jan Lehnardt <ja...@apache.org>
Authored: Thu Jun 25 13:38:24 2015 +0200
Committer: Jan Lehnardt <ja...@apache.org>
Committed: Mon Jun 29 22:19:42 2015 +0200
----------------------------------------------------------------------
dev/run | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/a666762c/dev/run
----------------------------------------------------------------------
diff --git a/dev/run b/dev/run
index bd15472..b27352c 100755
--- a/dev/run
+++ b/dev/run
@@ -158,7 +158,8 @@ def setup_configs(ctx):
"lib", node, "data"),
"node_name": "-name %s@127.0.0.1" % node,
"cluster_port": cluster_port,
- "backend_port": backend_port
+ "backend_port": backend_port,
+ "fauxton_root": "src/fauxton/dist/release"
}
write_config(ctx, node, env)
[35/50] couchdb commit: updated refs/heads/developer-preview-2.0 to
2a31bca
Posted by kx...@apache.org.
fix fauxton root
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/d71b881e
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/d71b881e
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/d71b881e
Branch: refs/heads/developer-preview-2.0
Commit: d71b881e21ca00e7ec58e286924f374b103ff86a
Parents: 4479b72
Author: Jan Lehnardt <ja...@apache.org>
Authored: Wed Jun 24 22:05:25 2015 +0200
Committer: Jan Lehnardt <ja...@apache.org>
Committed: Wed Jun 24 23:07:48 2015 +0200
----------------------------------------------------------------------
configure | 1 +
rel/overlay/etc/default.ini | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/d71b881e/configure
----------------------------------------------------------------------
diff --git a/configure b/configure
index da71444..167a75e 100755
--- a/configure
+++ b/configure
@@ -554,6 +554,7 @@ cat > rel/couchdb.config << EOF
{data_dir, "$DATABASEDIR"}.
{view_index_dir, "$VIEWDIR"}.
{log_file, "$LOG_FILE"}.
+{fauxton_root, "$DATAROOTDIR/couchdb/www"}.
{user, "$COUCHDB_USER"}.
{node_name, "-name couchdb"}.
{cluster_port, 5984}.
http://git-wip-us.apache.org/repos/asf/couchdb/blob/d71b881e/rel/overlay/etc/default.ini
----------------------------------------------------------------------
diff --git a/rel/overlay/etc/default.ini b/rel/overlay/etc/default.ini
index 274638d..9e18a32 100644
--- a/rel/overlay/etc/default.ini
+++ b/rel/overlay/etc/default.ini
@@ -33,7 +33,7 @@ n=3
[chttpd]
port = {{cluster_port}}
backlog = 512
-docroot = {{prefix}}/share/www
+docroot = {{fauxton_root}}
socket_options = [{recbuf, 262144}, {sndbuf, 262144}, {nodelay, true}]
[database_compaction]
[17/50] couchdb commit: updated refs/heads/developer-preview-2.0 to
2a31bca
Posted by kx...@apache.org.
future proof `make clean`, thanks @rnewson
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/f29c0234
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/f29c0234
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/f29c0234
Branch: refs/heads/developer-preview-2.0
Commit: f29c023472c9cff352e867422ada487adaf314f2
Parents: 3f30eeb
Author: Jan Lehnardt <ja...@apache.org>
Authored: Thu Jun 18 17:23:57 2015 +0200
Committer: Jan Lehnardt <ja...@apache.org>
Committed: Wed Jun 24 23:06:57 2015 +0200
----------------------------------------------------------------------
Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/f29c0234/Makefile
----------------------------------------------------------------------
diff --git a/Makefile b/Makefile
index 8815140..326403c 100644
--- a/Makefile
+++ b/Makefile
@@ -35,7 +35,7 @@ clean:
@rm -f bin/couchjs
@rm -rf src/*/ebin
@rm -rf src/*/.rebar
- @rm -rf src/{jiffy,khash,snappy,b64url}/priv
+ @rm -rf src/*/priv
@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
[39/50] couchdb commit: updated refs/heads/developer-preview-2.0 to
2a31bca
Posted by kx...@apache.org.
add option to skip upadting erlang deps on ./configure
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/1ef7182a
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/1ef7182a
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/1ef7182a
Branch: refs/heads/developer-preview-2.0
Commit: 1ef7182ac10fc35bcdd17b437cf2544eb0b4e83c
Parents: f9a0db4
Author: Jan Lehnardt <ja...@apache.org>
Authored: Wed Jun 24 22:42:47 2015 +0200
Committer: Jan Lehnardt <ja...@apache.org>
Committed: Wed Jun 24 23:07:49 2015 +0200
----------------------------------------------------------------------
configure | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/1ef7182a/configure
----------------------------------------------------------------------
diff --git a/configure b/configure
index cbf55c8..b5d56e9 100755
--- a/configure
+++ b/configure
@@ -21,6 +21,7 @@ TEST=0
WITH_CURL="false"
WITH_FAUXTON=1
WITH_DOCS=1
+SKIP_DEPS=0
PREFIX=
DEFAULT_PREFIX=/usr/local
@@ -64,6 +65,7 @@ Options:
-c | --with-curl request that couchjs is linked to cURL (default false)
--disable-fauxton do not build Fauxton
--disable-docs do not build any documentation or manpages
+ --skip-deps do not update erlang dependencies
Installation directories:
@@ -122,6 +124,12 @@ parse_opts() {
continue
;;
+ --skip-deps)
+ SKIP_DEPS=1
+ shift
+ continue
+ ;;
+
--user|-u)
if [ -n "$2" ]; then
eval COUCHDB_USER=$2
@@ -625,7 +633,7 @@ EOF
# only update dependencies, when we are not in a release tarball
-if [ -d .git ]; then
+if [ -d .git -a $SKIP_DEPS -ne 1 ]; then
echo "==> updating dependencies"
rebar get-deps update-deps
fi
[26/50] couchdb commit: updated refs/heads/developer-preview-2.0 to
2a31bca
Posted by kx...@apache.org.
allow dynamic variable substitution
E.g. GNU build tools call configure with these parameters:
> ./configure --prefix=/foo --libexecdir=\${prefix}/libexec
Expecting the final value of libexecdir to be /foo/libexec.
This commit makes our ./configure behave like a GNU configure.
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/b644cfb1
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/b644cfb1
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/b644cfb1
Branch: refs/heads/developer-preview-2.0
Commit: b644cfb1a95509a0d4fed46df18c9627dc053100
Parents: c7077e9
Author: Jan Lehnardt <ja...@apache.org>
Authored: Wed Jun 24 15:31:28 2015 +0200
Committer: Jan Lehnardt <ja...@apache.org>
Committed: Wed Jun 24 23:07:04 2015 +0200
----------------------------------------------------------------------
configure | 56 +++++++++++++++++++--------------------
test/build/test-configure.sh | 10 +++++++
2 files changed, 38 insertions(+), 28 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/b644cfb1/configure
----------------------------------------------------------------------
diff --git a/configure b/configure
index bd3d0f2..c23ae1c 100755
--- a/configure
+++ b/configure
@@ -98,7 +98,7 @@ parse_opts() {
--prefix)
if [ -n "$2" ]; then
- PREFIX=$2
+ eval PREFIX=$2
shift 2
continue
else
@@ -107,7 +107,7 @@ parse_opts() {
fi
;;
--prefix=?*)
- PREFIX=${1#*=}
+ eval PREFIX=${1#*=}
;;
--prefix=)
printf 'ERROR: "--prefix" requires a non-empty argument.\n' >&2
@@ -116,7 +116,7 @@ parse_opts() {
--exec-prefix)
if [ -n "$2" ]; then
- EXEC_PREFIX=$2
+ eval EXEC_PREFIX=$2
shift 2
continue
else
@@ -125,7 +125,7 @@ parse_opts() {
fi
;;
--exec-prefix=?*)
- EXEC_PREFIX=${1#*=}
+ eval EXEC_PREFIX=${1#*=}
;;
--exec-prefix=)
printf 'ERROR: "--exec-prefix" requires a non-empty argument.\n' >&2
@@ -134,7 +134,7 @@ parse_opts() {
--bindir)
if [ -n "$2" ]; then
- BINDIR=$2
+ eval BINDIR=$2
shift 2
continue
else
@@ -143,7 +143,7 @@ parse_opts() {
fi
;;
--bindir=?*)
- BINDIR=${1#*=}
+ eval BINDIR=${1#*=}
;;
--bindir=)
printf 'ERROR: "--bindir" requires a non-empty argument.\n' >&2
@@ -152,7 +152,7 @@ parse_opts() {
--libexecdir)
if [ -n "$2" ]; then
- LIBEXECDIR=$2
+ eval LIBEXECDIR=$2
shift 2
continue
else
@@ -161,7 +161,7 @@ parse_opts() {
fi
;;
--libexecdir=?*)
- LIBEXECDIR=${1#*=}
+ eval LIBEXECDIR=${1#*=}
;;
--libexecdir=)
printf 'ERROR: "--libexecdir" requires a non-empty argument.\n' >&2
@@ -170,7 +170,7 @@ parse_opts() {
--sysconfdir)
if [ -n "$2" ]; then
- SYSCONFDIR=$2
+ eval SYSCONFDIR=$2
shift 2
continue
else
@@ -179,7 +179,7 @@ parse_opts() {
fi
;;
--sysconfdir=?*)
- SYSCONFDIR=${1#*=}
+ eval SYSCONFDIR=${1#*=}
;;
--sysconfdir=)
printf 'ERROR: "--sysconfdir" requires a non-empty argument.\n' >&2
@@ -188,7 +188,7 @@ parse_opts() {
--datarootdir)
if [ -n "$2" ]; then
- DATAROOTDIR=$2
+ eval DATAROOTDIR=$2
shift 2
continue
else
@@ -197,7 +197,7 @@ parse_opts() {
fi
;;
--datarootdir=?*)
- DATAROOTDIR=${1#*=}
+ eval DATAROOTDIR=${1#*=}
;;
--datarootdir=)
printf 'ERROR: "--datarootdir" requires a non-empty argument.\n' >&2
@@ -206,7 +206,7 @@ parse_opts() {
--datadir)
if [ -n "$2" ]; then
- DATADIR=$2
+ eval DATADIR=$2
shift 2
continue
else
@@ -215,7 +215,7 @@ parse_opts() {
fi
;;
--datadir=?*)
- DATADIR=${1#*=}
+ eval DATADIR=${1#*=}
;;
--datadir=)
printf 'ERROR: "--datadir" requires a non-empty argument.\n' >&2
@@ -224,7 +224,7 @@ parse_opts() {
--localstatedir)
if [ -n "$2" ]; then
- LOCALSTATEDIR=$2
+ eval LOCALSTATEDIR=$2
shift 2
continue
else
@@ -233,7 +233,7 @@ parse_opts() {
fi
;;
--localstatedir=?*)
- LOCALSTATEDIR=${1#*=}
+ eval LOCALSTATEDIR=${1#*=}
;;
--localstatedir=)
printf 'ERROR: "--localstatedir" requires a non-empty argument.\n' >&2
@@ -242,7 +242,7 @@ parse_opts() {
--runstatedir)
if [ -n "$2" ]; then
- RUNSTATEDIR=$2
+ eval RUNSTATEDIR=$2
shift 2
continue
else
@@ -251,7 +251,7 @@ parse_opts() {
fi
;;
--runstatedir=?*)
- RUNSTATEDIR=${1#*=}
+ eval RUNSTATEDIR=${1#*=}
;;
--runstatedir=)
printf 'ERROR: "--runstatedir" requires a non-empty argument.\n' >&2
@@ -260,7 +260,7 @@ parse_opts() {
--docdir)
if [ -n "$2" ]; then
- DOCDIR=$2
+ eval DOCDIR=$2
shift 2
continue
else
@@ -269,7 +269,7 @@ parse_opts() {
fi
;;
--docdir=?*)
- DOCDIR=${1#*=}
+ eval DOCDIR=${1#*=}
;;
--docdir=)
printf 'ERROR: "--docdir" requires a non-empty argument.\n' >&2
@@ -278,7 +278,7 @@ parse_opts() {
--libdir)
if [ -n "$2" ]; then
- LIBDIR=$2
+ eval LIBDIR=$2
shift 2
continue
else
@@ -287,7 +287,7 @@ parse_opts() {
fi
;;
--libdir=?*)
- LIBDIR=${1#*=}
+ eval LIBDIR=${1#*=}
;;
--libdir=)
printf 'ERROR: "--libdir" requires a non-empty argument.\n' >&2
@@ -296,7 +296,7 @@ parse_opts() {
--databasedir)
if [ -n "$2" ]; then
- DATABASEDIR=$2
+ eval DATABASEDIR=$2
shift 2
continue
else
@@ -305,7 +305,7 @@ parse_opts() {
fi
;;
--databasedir=?*)
- DATABASEDIR=${1#*=}
+ eval DATABASEDIR=${1#*=}
;;
--databasedir=)
printf 'ERROR: "--databasedir" requires a non-empty argument.\n' >&2
@@ -314,7 +314,7 @@ parse_opts() {
--viewindexdir)
if [ -n "$2" ]; then
- VIEWDIR=$2
+ eval VIEWDIR=$2
shift 2
continue
else
@@ -323,7 +323,7 @@ parse_opts() {
fi
;;
--viewindexdir=?*)
- VIEWDIR=${1#*=}
+ eval VIEWDIR=${1#*=}
;;
--viewindexdir=)
printf 'ERROR: "--viewindexdir" requires a non-empty argument.\n' >&2
@@ -332,7 +332,7 @@ parse_opts() {
--logdir)
if [ -n "$2" ]; then
- LOGDIR=$2
+ eval LOGDIR=$2
shift 2
continue
else
@@ -341,7 +341,7 @@ parse_opts() {
fi
;;
--logdir=?*)
- LOGDIR=${1#*=}
+ eval LOGDIR=${1#*=}
;;
--logdir=)
printf 'ERROR: "--logdir" requires a non-empty argument.\n' >&2
http://git-wip-us.apache.org/repos/asf/couchdb/blob/b644cfb1/test/build/test-configure.sh
----------------------------------------------------------------------
diff --git a/test/build/test-configure.sh b/test/build/test-configure.sh
index 4a20988..2be0953 100755
--- a/test/build/test-configure.sh
+++ b/test/build/test-configure.sh
@@ -88,6 +88,16 @@ test_exec_prefix() {
assertEquals "test exec_prefix" "$EXPECT" "$RESULT"
}
+test_exec_prefix_eval() {
+ EXPECT="/horse/local /horse/local /horse/local/bin /horse/local/libexec /horse/local/etc /horse/local/share /horse/local/share /horse/local/var /horse/local/var/run /horse/local/share/doc /horse/local/lib /horse/local/var/lib /horse/local/var/lib /horse/local/var/log"
+
+ RESULT=`$CMD --prefix=/horse/local --exec-prefix=\\${prefix}`
+ assertEquals "test exec_prefix" "$EXPECT" "$RESULT"
+
+ RESULT=`$CMD --prefix /horse/local --exec-prefix \\${prefix}`
+ assertEquals "test exec_prefix" "$EXPECT" "$RESULT"
+}
+
test_exec_prefix_error() {
EXPECT='ERROR: "--exec-prefix" requires a non-empty argument.'
[08/50] couchdb commit: updated refs/heads/developer-preview-2.0 to
2a31bca
Posted by kx...@apache.org.
fix `make release`
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/41e31ef9
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/41e31ef9
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/41e31ef9
Branch: refs/heads/developer-preview-2.0
Commit: 41e31ef96fa70fbb3dbe64d161a8828a8eb219dc
Parents: 53bfa44
Author: Jan Lehnardt <ja...@apache.org>
Authored: Mon Apr 6 23:11:46 2015 +0200
Committer: Jan Lehnardt <ja...@apache.org>
Committed: Wed Jun 24 23:06:49 2015 +0200
----------------------------------------------------------------------
Makefile | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/41e31ef9/Makefile
----------------------------------------------------------------------
diff --git a/Makefile b/Makefile
index 3eb7c44..2a96c64 100644
--- a/Makefile
+++ b/Makefile
@@ -53,15 +53,15 @@ release:
# build fauxton
$(MAKE) fauxton
- cp -r share/www apache-couchdb/share/
+ cp -r share/www apache-couchdb-$(COUCHDB_VERSION)/share/
# build docs
cd src/docs; $(MAKE)
- mkdir apache-couchdb/share/docs
- cp -r src/docs/build/html apache-couchdb/share/docs/html
+ mkdir apache-couchdb-$(COUCHDB_VERSION)/share/docs
+ cp -r src/docs/build/html apache-couchdb-$(COUCHDB_VERSION)/share/docs/html
# Tar!
- tar czf apache-couchdb-$(COUCHDB_VERSION).tar.gz apache-couchdb
+ tar czf apache-couchdb-$(COUCHDB_VERSION).tar.gz apache-couchdb-$(COUCHDB_VERSION)
echo "Done: apache-couchdb-$(COUCHDB_VERSION).tar.gz"
distclean: clean
@@ -80,7 +80,7 @@ devclean:
@rm -rf dev/lib/*/data
-include install.mk
-install:
+install: all
@rm -rf rel/couchdb
@rebar generate # make full erlang release
@mkdir -p $(install_dir)
[27/50] couchdb commit: updated refs/heads/developer-preview-2.0 to
2a31bca
Posted by kx...@apache.org.
fix git HEAD parsing, thanks @robertkowalski
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/65251306
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/65251306
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/65251306
Branch: refs/heads/developer-preview-2.0
Commit: 652513066b9d88295f9786bb2f0fd315463590f4
Parents: b644cfb
Author: Jan Lehnardt <ja...@apache.org>
Authored: Wed Jun 24 15:37:43 2015 +0200
Committer: Jan Lehnardt <ja...@apache.org>
Committed: Wed Jun 24 23:07:39 2015 +0200
----------------------------------------------------------------------
build-aux/couchdb-build-release.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/65251306/build-aux/couchdb-build-release.sh
----------------------------------------------------------------------
diff --git a/build-aux/couchdb-build-release.sh b/build-aux/couchdb-build-release.sh
index b914e45..215c8d9 100755
--- a/build-aux/couchdb-build-release.sh
+++ b/build-aux/couchdb-build-release.sh
@@ -24,8 +24,8 @@ cd src/
for repo in *; do
cd $repo
mkdir ../../$RELDIR/src/$repo
- # todo, make work for tags
- git archive `git rev-parse --abbrev-ref HEAD` | tar -xC ../../$RELDIR/src/$repo/
+ git_ish=`git symbolic-ref -q --short HEAD || git describe --tags --exact-match`
+ git archive $git_ish | tar -xC ../../$RELDIR/src/$repo/
cd ..
done
[32/50] couchdb commit: updated refs/heads/developer-preview-2.0 to
2a31bca
Posted by kx...@apache.org.
use generate etc files
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/4479b720
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/4479b720
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/4479b720
Branch: refs/heads/developer-preview-2.0
Commit: 4479b7204bf97c48064b563f1061112d4afe9338
Parents: c1e69c5
Author: Jan Lehnardt <ja...@apache.org>
Authored: Wed Jun 24 21:57:02 2015 +0200
Committer: Jan Lehnardt <ja...@apache.org>
Committed: Wed Jun 24 23:07:47 2015 +0200
----------------------------------------------------------------------
Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/4479b720/Makefile
----------------------------------------------------------------------
diff --git a/Makefile b/Makefile
index ecf8205..42f3e3b 100644
--- a/Makefile
+++ b/Makefile
@@ -119,7 +119,7 @@ install: all
@mkdir -p $(DESTDIR)/$(sysconf_dir)
@mkdir -p $(DESTDIR)/$(sysconf_dir)/default.d
@mkdir -p $(DESTDIR)/$(sysconf_dir)/local.d
- @cp rel/overlay/etc/default.ini rel/overlay/etc/local.ini $(DESTDIR)/$(sysconf_dir)
+ @cp rel/couchdb/etc/default.ini rel/couchdb/etc/local.ini $(DESTDIR)/$(sysconf_dir)
@mkdir -p $(DESTDIR)/$(data_dir)
@cp -R share/server share/www $(DESTDIR)/$(data_dir)
[45/50] couchdb commit: updated refs/heads/developer-preview-2.0 to
2a31bca
Posted by kx...@apache.org.
allow erlang 18 builds also
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/1961cabf
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/1961cabf
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/1961cabf
Branch: refs/heads/developer-preview-2.0
Commit: 1961cabff76ad34563d8219fe83b1d6f7dbc6b98
Parents: bab44b8
Author: Robert Newson <rn...@apache.org>
Authored: Thu Jul 2 21:39:00 2015 +0100
Committer: Robert Newson <rn...@apache.org>
Committed: Thu Jul 2 21:39:00 2015 +0100
----------------------------------------------------------------------
rebar.config.script | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/1961cabf/rebar.config.script
----------------------------------------------------------------------
diff --git a/rebar.config.script b/rebar.config.script
index 9e451e2..374425c 100644
--- a/rebar.config.script
+++ b/rebar.config.script
@@ -68,7 +68,7 @@ MakeDep = fun
end,
AddConfig = [
- {require_otp_vsn, "R14B01|R14B03|R14B04|R16B02|R16B03-1|17"},
+ {require_otp_vsn, "R14B01|R14B03|R14B04|R16B02|R16B03-1|17|18"},
{deps_dir, "src"},
{deps, lists:map(MakeDep, DepDescs)},
{sub_dirs, ["rel"]},
[19/50] couchdb commit: updated refs/heads/developer-preview-2.0 to
2a31bca
Posted by kx...@apache.org.
formatting fix
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/7c406da4
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/7c406da4
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/7c406da4
Branch: refs/heads/developer-preview-2.0
Commit: 7c406da4f05b4a4d9dea0e709bcae3aab87215ef
Parents: 4fee587
Author: Micah Anderson <mi...@riseup.net>
Authored: Tue Jun 23 12:37:46 2015 -0400
Committer: Jan Lehnardt <ja...@apache.org>
Committed: Wed Jun 24 23:06:59 2015 +0200
----------------------------------------------------------------------
configure | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/7c406da4/configure
----------------------------------------------------------------------
diff --git a/configure b/configure
index 43d2e9d..c286edc 100755
--- a/configure
+++ b/configure
@@ -48,7 +48,7 @@ Options:
# -u USER set the username to run as (defaults to $COUCHDB_USER)
--prefix=DIRECTORY set the installation prefix (defaults to $DEFAIULT_PREFIX)
--databasedir DIRECTORY specify the data directory (defaults to /var/lib/couchdb)
- --viewindexdir DIRECTORY specify the view directory (defaults to /var/lib/couchdb)
+ --viewindexdir DIRECTORY specify the view directory (defaults to /var/lib/couchdb)
--logdir DIRECTORY specify the log file (defaults to /var/log/couchdb.log)
-c | --with-curl request that couchjs is linked to cURL (default false)
[09/50] couchdb commit: updated refs/heads/developer-preview-2.0 to
2a31bca
Posted by kx...@apache.org.
inse correct version
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/7f101574
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/7f101574
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/7f101574
Branch: refs/heads/developer-preview-2.0
Commit: 7f101574c39b450f976f87898259cf87274fac66
Parents: 41e31ef
Author: Jan Lehnardt <ja...@apache.org>
Authored: Mon Apr 6 23:12:04 2015 +0200
Committer: Jan Lehnardt <ja...@apache.org>
Committed: Wed Jun 24 23:06:50 2015 +0200
----------------------------------------------------------------------
build-aux/couchdb-build-release.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/7f101574/build-aux/couchdb-build-release.sh
----------------------------------------------------------------------
diff --git a/build-aux/couchdb-build-release.sh b/build-aux/couchdb-build-release.sh
index a0cae08..b914e45 100755
--- a/build-aux/couchdb-build-release.sh
+++ b/build-aux/couchdb-build-release.sh
@@ -33,7 +33,7 @@ cd ..
# update version
# actual version detection TBD
-perl -pi -e 's/\{vsn, git\}/\{vsn, "version"\}/' $RELDIR/src/*/src/*.app.src
+perl -pi -e "s/\{vsn, git\}/\{vsn, \"$VERSION\"\}/" $RELDIR/src/*/src/*.app.src
# create THANKS file
if test -e .git; then
[37/50] couchdb commit: updated refs/heads/developer-preview-2.0 to
2a31bca
Posted by kx...@apache.org.
update make uninstall
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/fcf233d0
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/fcf233d0
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/fcf233d0
Branch: refs/heads/developer-preview-2.0
Commit: fcf233d085db6204835a1f083e02788f6d93230b
Parents: 4b3a549
Author: Jan Lehnardt <ja...@apache.org>
Authored: Wed Jun 24 22:36:37 2015 +0200
Committer: Jan Lehnardt <ja...@apache.org>
Committed: Wed Jun 24 23:07:48 2015 +0200
----------------------------------------------------------------------
Makefile | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/fcf233d0/Makefile
----------------------------------------------------------------------
diff --git a/Makefile b/Makefile
index 52f4770..52559dc 100644
--- a/Makefile
+++ b/Makefile
@@ -140,6 +140,11 @@ uninstall:
@rm -f $(DESTDIR)/$(libexec_dir)
@rm -rf $(DESTDIR)/$(sysconf_dir)
@rm -rf $(DESTDIR)/$(data_dir)
+ @rm -rf $(DESTDIR)/$(doc_dir)
+ @rm -rf $(DESTDIR)/$(html_dir)
+ @rm -rf $(DESTDIR)/$(pdf_dir)
+ @rm -rf $(DESTDIR)/$(man_dir)
+ @rm -rf $(DESTDIR)/$(info_dir)
install.mk:
# ignore install.mk missing if we are running
[23/50] couchdb commit: updated refs/heads/developer-preview-2.0 to
2a31bca
Posted by kx...@apache.org.
fix --databasedir and --viewdir
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/1cf49ade
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/1cf49ade
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/1cf49ade
Branch: refs/heads/developer-preview-2.0
Commit: 1cf49ade9c03cc93ece9eeb9e7979e9d2603012b
Parents: dfa358a
Author: Jan Lehnardt <ja...@apache.org>
Authored: Tue Jun 23 22:41:24 2015 +0200
Committer: Jan Lehnardt <ja...@apache.org>
Committed: Wed Jun 24 23:07:02 2015 +0200
----------------------------------------------------------------------
configure | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/1cf49ade/configure
----------------------------------------------------------------------
diff --git a/configure b/configure
index c3f0f3c..fe8e925 100755
--- a/configure
+++ b/configure
@@ -416,12 +416,9 @@ fi
# Translate ./configure variables to CouchDB variables
-INSTALL_DIR=$LIBDIR/couchdb
+INSTALLDIR=$LIBDIR/couchdb
LOG_FILE=$LOGDIR/couch.log
-DATBASE_DIR=$DATABASE_DIR/couchdb
-VIEW_DIR=$VIEW_DIR/couchdb
-
echo "==> configuring couchdb in rel/couchdb.config"
cat > rel/couchdb.config << EOF
@@ -440,9 +437,9 @@ cat > rel/couchdb.config << EOF
% The contents of this file are auto-generated by configure
%
{package_author_name, "$PACKAGE_AUTHOR_NAME"}.
-{prefix, "$INSTALL_DIR"}.
-{data_dir, "$DATABASE_DIR"}.
-{view_index_dir, "$VIEW_DIR"}.
+{prefix, "$INSTALLDIR"}.
+{data_dir, "$DATABASEDIR"}.
+{view_index_dir, "$VIEWDIR"}.
{log_file, "$LOG_FILE"}.
{user, "$COUCHDB_USER"}.
{node_name, "-name couchdb"}.
[33/50] couchdb commit: updated refs/heads/developer-preview-2.0 to
2a31bca
Posted by kx...@apache.org.
fix paths in couchdb start script
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/b335877b
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/b335877b
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/b335877b
Branch: refs/heads/developer-preview-2.0
Commit: b335877b7289d7e0c50066c35ea9be42a4c37270
Parents: 8a2bf4f
Author: Jan Lehnardt <ja...@apache.org>
Authored: Wed Jun 24 16:25:32 2015 +0200
Committer: Jan Lehnardt <ja...@apache.org>
Committed: Wed Jun 24 23:07:47 2015 +0200
----------------------------------------------------------------------
rel/overlay/bin/couchdb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/b335877b/rel/overlay/bin/couchdb
----------------------------------------------------------------------
diff --git a/rel/overlay/bin/couchdb b/rel/overlay/bin/couchdb
index a98aa86..6b234e0 100755
--- a/rel/overlay/bin/couchdb
+++ b/rel/overlay/bin/couchdb
@@ -12,7 +12,7 @@
# License for the specific language governing permissions and limitations under
# the License.
-$COUCHDB_BIN_DIR=$(cd ${0%/*} && pwd)
+COUCHDB_BIN_DIR=$(cd ${0%/*} && pwd)
ERTS_BIN_DIR=$COUCHDB_BIN_DIR/../lib/couchdb/
export ROOTDIR=${ERTS_BIN_DIR%/*}
[22/50] couchdb commit: updated refs/heads/developer-preview-2.0 to
2a31bca
Posted by kx...@apache.org.
fix too aggressive `make clean`
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/dfa358a9
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/dfa358a9
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/dfa358a9
Branch: refs/heads/developer-preview-2.0
Commit: dfa358a9faef75aa5a5834268573ef74d01b15c1
Parents: 7853cb6
Author: Jan Lehnardt <ja...@apache.org>
Authored: Tue Jun 23 21:12:19 2015 +0200
Committer: Jan Lehnardt <ja...@apache.org>
Committed: Wed Jun 24 23:07:01 2015 +0200
----------------------------------------------------------------------
Makefile | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/dfa358a9/Makefile
----------------------------------------------------------------------
diff --git a/Makefile b/Makefile
index 0e4bd2c..8a17004 100644
--- a/Makefile
+++ b/Makefile
@@ -35,7 +35,8 @@ clean:
@rm -f bin/couchjs
@rm -rf src/*/ebin
@rm -rf src/*/.rebar
- @rm -rf src/*/priv
+ @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
[41/50] couchdb commit: updated refs/heads/developer-preview-2.0 to
2a31bca
Posted by kx...@apache.org.
Add Markdown extension to relevant root-directory files
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/a1ecde1e
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/a1ecde1e
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/a1ecde1e
Branch: refs/heads/developer-preview-2.0
Commit: a1ecde1ebe1a4c5bda0dedc28b905546bea4ea3a
Parents: ce2c357
Author: Joan Touzet <wo...@apache.org>
Authored: Fri Jun 26 18:06:44 2015 -0400
Committer: Joan Touzet <wo...@apache.org>
Committed: Fri Jun 26 18:06:44 2015 -0400
----------------------------------------------------------------------
BUGS | 8 --
BUGS.md | 8 ++
COMMITTERS | 50 --------
COMMITTERS.md | 50 ++++++++
INSTALL.Unix | 322 ------------------------------------------------
INSTALL.Unix.md | 322 ++++++++++++++++++++++++++++++++++++++++++++++++
INSTALL.Windows | 204 ------------------------------
INSTALL.Windows.md | 204 ++++++++++++++++++++++++++++++
README-DEV | 194 -----------------------------
README-DEV.md | 194 +++++++++++++++++++++++++++++
license.skip | 15 ++-
11 files changed, 787 insertions(+), 784 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/a1ecde1e/BUGS
----------------------------------------------------------------------
diff --git a/BUGS b/BUGS
deleted file mode 100644
index 1bdc478..0000000
--- a/BUGS
+++ /dev/null
@@ -1,8 +0,0 @@
-Apache CouchDB BUGS
-===================
-
-Visit our issue tracker:
-
- https://issues.apache.org/jira/browse/CouchDB
-
-You can use this to report bugs, request features, or suggest enhancements.
http://git-wip-us.apache.org/repos/asf/couchdb/blob/a1ecde1e/BUGS.md
----------------------------------------------------------------------
diff --git a/BUGS.md b/BUGS.md
new file mode 100644
index 0000000..1bdc478
--- /dev/null
+++ b/BUGS.md
@@ -0,0 +1,8 @@
+Apache CouchDB BUGS
+===================
+
+Visit our issue tracker:
+
+ https://issues.apache.org/jira/browse/CouchDB
+
+You can use this to report bugs, request features, or suggest enhancements.
http://git-wip-us.apache.org/repos/asf/couchdb/blob/a1ecde1e/COMMITTERS
----------------------------------------------------------------------
diff --git a/COMMITTERS b/COMMITTERS
deleted file mode 100644
index 6030e5b..0000000
--- a/COMMITTERS
+++ /dev/null
@@ -1,50 +0,0 @@
-Apache CouchDB COMMITTERS
-=========================
-
-Committers are given a binding vote in certain project decsions, as well as
-write access to public project infrastructure. The following people were
-elected as a committer in recognition of their commitment to the project. We
-mean this in the sense of being loyal to the project and its interests.
-
- * Damien Katz <da...@apache.org>
- * Jan Lehnardt <ja...@apache.org>
- * Noah Slater <ns...@apache.org>
- * Christopher Lenz <cm...@apache.org>
- * J. Chris Anderson <jc...@apache.org>
- * Paul Joseph Davis <da...@apache.org>
- * Adam Kocoloski <ko...@apache.org>
- * Jason Davies <ja...@apache.org>
- * Mark Hammond <mh...@apache.org>
- * Benoît Chesneau <be...@apache.org>
- * Filipe Manana <fd...@apache.org>
- * Robert Newson <rn...@apache.org>
- * Randall Leeds <ra...@apache.org>
- * Bob Dionne <bi...@apache.org>
- * Dave Cottlehuber <dc...@apache.org>
- * Jason Smith <jh...@apache.org>
- * Joan Touzet <wo...@apache.org>
- * Dale Harvey <da...@apache.org>
- * Dirkjan Ochtman <dj...@apache.org>
- * Alexander Shorin <kx...@apache.org>
- * Garren Smith <ga...@apache.org>
- * Sue Lockwood <de...@apache.org>
- * Andy Wenk <an...@apache.org>
- * Klaus Trainer <kl...@apache.org>
- * Benjamin Young <bi...@apache.org>
- * Robert Kowalski <ro...@apache.org>
- * Max Thayer <ga...@apache.org>
- * Gianugo Rabellino <gi...@apache.org>
- * Jenn Schiffer <je...@apache.org>
- * Lena Reinhard <le...@apache.org>
- * Simon Metson <me...@apache.org>
- * Mike Wallace <mi...@apache.org>
- * Nick North <ni...@apache.org>
- * Ryan Ramage <ry...@apache.org>
- * Sebastian Rothbucher <se...@apache.org>
- * Ted Leung <tw...@apache.org>
- * Wendall Cada <we...@apache.org>
- * Benjamin Bastian <bb...@apache.org>
- * Ben Keen <be...@apache.org>
- * Maria Andersson <mi...@apache.org>
-
-For a list of other credits see the `THANKS` file.
http://git-wip-us.apache.org/repos/asf/couchdb/blob/a1ecde1e/COMMITTERS.md
----------------------------------------------------------------------
diff --git a/COMMITTERS.md b/COMMITTERS.md
new file mode 100644
index 0000000..6030e5b
--- /dev/null
+++ b/COMMITTERS.md
@@ -0,0 +1,50 @@
+Apache CouchDB COMMITTERS
+=========================
+
+Committers are given a binding vote in certain project decsions, as well as
+write access to public project infrastructure. The following people were
+elected as a committer in recognition of their commitment to the project. We
+mean this in the sense of being loyal to the project and its interests.
+
+ * Damien Katz <da...@apache.org>
+ * Jan Lehnardt <ja...@apache.org>
+ * Noah Slater <ns...@apache.org>
+ * Christopher Lenz <cm...@apache.org>
+ * J. Chris Anderson <jc...@apache.org>
+ * Paul Joseph Davis <da...@apache.org>
+ * Adam Kocoloski <ko...@apache.org>
+ * Jason Davies <ja...@apache.org>
+ * Mark Hammond <mh...@apache.org>
+ * Benoît Chesneau <be...@apache.org>
+ * Filipe Manana <fd...@apache.org>
+ * Robert Newson <rn...@apache.org>
+ * Randall Leeds <ra...@apache.org>
+ * Bob Dionne <bi...@apache.org>
+ * Dave Cottlehuber <dc...@apache.org>
+ * Jason Smith <jh...@apache.org>
+ * Joan Touzet <wo...@apache.org>
+ * Dale Harvey <da...@apache.org>
+ * Dirkjan Ochtman <dj...@apache.org>
+ * Alexander Shorin <kx...@apache.org>
+ * Garren Smith <ga...@apache.org>
+ * Sue Lockwood <de...@apache.org>
+ * Andy Wenk <an...@apache.org>
+ * Klaus Trainer <kl...@apache.org>
+ * Benjamin Young <bi...@apache.org>
+ * Robert Kowalski <ro...@apache.org>
+ * Max Thayer <ga...@apache.org>
+ * Gianugo Rabellino <gi...@apache.org>
+ * Jenn Schiffer <je...@apache.org>
+ * Lena Reinhard <le...@apache.org>
+ * Simon Metson <me...@apache.org>
+ * Mike Wallace <mi...@apache.org>
+ * Nick North <ni...@apache.org>
+ * Ryan Ramage <ry...@apache.org>
+ * Sebastian Rothbucher <se...@apache.org>
+ * Ted Leung <tw...@apache.org>
+ * Wendall Cada <we...@apache.org>
+ * Benjamin Bastian <bb...@apache.org>
+ * Ben Keen <be...@apache.org>
+ * Maria Andersson <mi...@apache.org>
+
+For a list of other credits see the `THANKS` file.
http://git-wip-us.apache.org/repos/asf/couchdb/blob/a1ecde1e/INSTALL.Unix
----------------------------------------------------------------------
diff --git a/INSTALL.Unix b/INSTALL.Unix
deleted file mode 100644
index 8b4b53d..0000000
--- a/INSTALL.Unix
+++ /dev/null
@@ -1,322 +0,0 @@
-Apache CouchDB INSTALL.Unix
-==========================
-
-A high-level guide to Unix-like systems, inc. Mac OS X and Ubuntu.
-
-Community installation guides are available on the wiki:
-
- http://wiki.apache.org/couchdb/Installation
-
-If you are trying to build CouchDB from a git checkout rather than
-a .tar.gz, see the `DEVELOPERS` file.
-
-This document is the canonical source of installation
-information. However, many systems have gotchas that you need to be
-aware of. In addition, dependencies frequently change as distributions
-update their archives. If you're running into trouble, be sure to
-check out the wiki. If you have any tips to share, please also update
-the wiki so that others can benefit from your experience.
-
-Troubleshooting
----------------
-
-There is a troubleshooting guide:
-
- http://wiki.apache.org/couchdb/Troubleshooting
-
-There is a wiki for general documentation:
-
- http://wiki.apache.org/couchdb/
-
-There are collection of friendly mailing lists:
-
- http://couchdb.apache.org/community/lists.html
-
-Please work through these in order if you experience any problems.
-
-Dependencies
-------------
-
-You should have the following installed:
-
- * Erlang OTP (>=R14B01, =<R17) (http://erlang.org/)
- * ICU (http://icu-project.org/)
- * OpenSSL (http://www.openssl.org/)
- * Mozilla SpiderMonkey (1.8.5) (http://www.mozilla.org/js/spidermonkey/)
- * GNU Make (http://www.gnu.org/software/make/)
- * GNU Compiler Collection (http://gcc.gnu.org/)
- * libcurl (http://curl.haxx.se/libcurl/)
- * help2man (http://www.gnu.org/s/help2man/)
- * 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
-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
-for building the online documentation.
-
-Debian-based Systems
-~~~~~~~~~~~~~~~~~~~~
-
-You can install the dependencies by running:
-
- sudo apt-get install build-essential erlang-base-hipe \
- erlang-dev erlang-manpages erlang-eunit erlang-nox \
- libicu-dev libmozjs185-dev libcurl4-openssl-dev \
- pkg-config rebar
-
-There are lots of Erlang packages. If there is a problem with your
-install, try a different mix. There is more information on the
-wiki. Additionally, you might want to install some of the optional
-Erlang tools which may also be useful.
-
-Be sure to update the version numbers to match your system's available
-packages.
-
-For up to date instructions, please see:
-
- http://wiki.apache.org/couchdb/Installing_on_Debian
-
- http://wiki.apache.org/couchdb/Installing_on_Ubuntu
-
-Unfortunately, it seems that installing dependencies on Ubuntu is
-troublesome.
-
-RedHat-based (Fedora, Centos, RHEL) Systems
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-You can install the dependencies by running:
-
- sudo yum install autoconf autoconf-archive automake \
- curl-devel erlang-asn1 erlang-erts erlang-eunit \
- erlang-os_mon erlang-xmerl erlang-rebar help2man \
- js-devel libicu-devel libtool perl-Test-Harness
-
-While CouchDB builds against the default js-devel-1.7.0 included in
-some distributions, it's recommended to use a more recent
-js-devel-1.8.5.
-
-Mac OS X
-~~~~~~~~
-
-To build CouchDB from source on Mac OS X, you will need to install
-the Command Line Tools:
-
- xcode-select --install
-
-You can then install the other dependencies by running:
-
- brew install autoconf autoconf-archive automake libtool \
- erlang icu4c spidermonkey curl pkg-config rebar
-
-You will need Homebrew installed to use the `brew` command.
-
-Learn more about Homebrew at:
-
- http://mxcl.github.com/homebrew/
-
-Some versions of Mac OS X ship a problematic OpenSSL library. If
-you're experiencing troubles with CouchDB crashing intermittently with
-a segmentation fault or a bus error, you will need to install your own
-version of OpenSSL. See the troubleshooting guide, mentioned above,
-for more information.
-
-FreeBSD
--------
-
-FreeBSD requires the use of GNU Make. Where `make` is specified in this
-documentation, substitute `gmake`.
-
-You can install this by running:
-
- pkg install gmake
-
-Installing
-----------
-
-Once you have satisfied the dependencies you should run:
-
- ./configure
-
-This script will configure CouchDB to be installed into `/usr/local`
-by default.
-
-If you wish to customize the installation, pass `--help` to this
-script.
-
-If everything was successful you should see the following message:
-
- You have configured Apache CouchDB, time to relax.
-
-Relax.
-
-To install CouchDB you should run:
-
- make && sudo make install
-
-You only need to use `sudo` if you're installing into a system directory.
-
-Try `gmake` if `make` is giving you any problems.
-
-If everything was successful you should see the following message:
-
- You have installed Apache CouchDB, time to relax.
-
-Relax.
-
-User Registration
------------------
-
-You should create a special `couchdb` user for CouchDB.
-
-On many Unix-like systems you can run:
-
- adduser --system \
- --home /usr/local/var/lib/couchdb \
- --no-create-home \
- --shell /bin/bash \
- --group --gecos \
- "CouchDB Administrator" couchdb
-
-On Mac OS X you can use the Workgroup Manager to create users:
-
- http://www.apple.com/support/downloads/serveradmintools1047.html
-
-You must make sure that:
-
- * The user has a working POSIX shell
-
- * The user's home directory is `/usr/local/var/lib/couchdb`
-
-You can test this by:
-
- * Trying to log in as the `couchdb` user
-
- * Running `pwd` and checking the present working directory
-
-Change the ownership of the CouchDB directories by running:
-
- chown -R couchdb:couchdb /usr/local/etc/couchdb
- chown -R couchdb:couchdb /usr/local/var/lib/couchdb
- chown -R couchdb:couchdb /usr/local/var/log/couchdb
- chown -R couchdb:couchdb /usr/local/var/run/couchdb
-
-Change the permission of the CouchDB directories by running:
-
- chmod 0770 /usr/local/etc/couchdb
- chmod 0770 /usr/local/var/lib/couchdb
- chmod 0770 /usr/local/var/log/couchdb
- chmod 0770 /usr/local/var/run/couchdb
-
-Update the permissions for your `default.ini` file:
-
- chmod 0644 /usr/local/etc/couchdb/default.ini
-
-First Run
----------
-
-You can start the CouchDB server by running:
-
- sudo -i -u couchdb couchdb
-
-This uses the `sudo` command to run the `couchdb` command as the
-`couchdb` user.
-
-When CouchDB starts it should eventually display the following
-message:
-
- Apache CouchDB has started, time to relax.
-
-Relax.
-
-To check that everything has worked, point your web browser to:
-
- http://127.0.0.1:5984/_utils/index.html
-
-From here you should run the test suite in Firefox.
-
-Running as a Daemon
--------------------
-
-SysV/BSD-style Systems
-~~~~~~~~~~~~~~~~~~~~~~
-
-You can use the `couchdb` init script to control the CouchDB daemon.
-
-On SysV-style systems, the init script will be installed into:
-
- /usr/local/etc/init.d
-
-On BSD-style systems, the init script will be installed into:
-
- /usr/local/etc/rc.d
-
-We use the `[init.d|rc.d]` notation to refer to both of these
-directories.
-
-You can control the CouchDB daemon by running:
-
- /usr/local/etc/[init.d|rc.d]/couchdb [start|stop|restart|status]
-
-If you wish to configure how the init script works, you can edit:
-
- /usr/local/etc/default/couchdb
-
-Comment out the `COUCHDB_USER` setting if you're running as a
-non-superuser.
-
-To start the daemon on boot, copy the init script to:
-
- /etc/[init.d|rc.d]
-
-You should then configure your system to run the init script
-automatically.
-
-You may be able to run:
-
- sudo update-rc.d couchdb defaults
-
-If this fails, consult your system documentation for more information.
-
-A `logrotate` configuration is installed into:
-
- /usr/local/etc/logrotate.d/couchdb
-
-Consult your `logrotate` documentation for more information.
-
-It is critical that the CouchDB logs are rotated so as not to fill
-your disk.
-
-Mac OS X
-~~~~~~~~
-
-You can use the `launchctl` command to control the CouchDB daemon.
-
-You can load the configuration by running:
-
- sudo launchctl load \
- /usr/local/Library/LaunchDaemons/org.apache.couchdb.plist
-
-You can stop the CouchDB daemon by running:
-
- sudo launchctl unload \
- /usr/local/Library/LaunchDaemons/org.apache.couchdb.plist
-
-You can start CouchDB by running:
-
- sudo launchctl start org.apache.couchdb
-
-You can restart CouchDB by running:
-
- sudo launchctl stop org.apache.couchdb
-
-You can edit the launchd configuration by running:
-
- open /usr/local/Library/LaunchDaemons/org.apache.couchdb.plist
-
-To start the daemon on boot, copy the configuration file to:
-
- /Library/LaunchDaemons
-
-Consult your system documentation for more information.
http://git-wip-us.apache.org/repos/asf/couchdb/blob/a1ecde1e/INSTALL.Unix.md
----------------------------------------------------------------------
diff --git a/INSTALL.Unix.md b/INSTALL.Unix.md
new file mode 100644
index 0000000..8b4b53d
--- /dev/null
+++ b/INSTALL.Unix.md
@@ -0,0 +1,322 @@
+Apache CouchDB INSTALL.Unix
+==========================
+
+A high-level guide to Unix-like systems, inc. Mac OS X and Ubuntu.
+
+Community installation guides are available on the wiki:
+
+ http://wiki.apache.org/couchdb/Installation
+
+If you are trying to build CouchDB from a git checkout rather than
+a .tar.gz, see the `DEVELOPERS` file.
+
+This document is the canonical source of installation
+information. However, many systems have gotchas that you need to be
+aware of. In addition, dependencies frequently change as distributions
+update their archives. If you're running into trouble, be sure to
+check out the wiki. If you have any tips to share, please also update
+the wiki so that others can benefit from your experience.
+
+Troubleshooting
+---------------
+
+There is a troubleshooting guide:
+
+ http://wiki.apache.org/couchdb/Troubleshooting
+
+There is a wiki for general documentation:
+
+ http://wiki.apache.org/couchdb/
+
+There are collection of friendly mailing lists:
+
+ http://couchdb.apache.org/community/lists.html
+
+Please work through these in order if you experience any problems.
+
+Dependencies
+------------
+
+You should have the following installed:
+
+ * Erlang OTP (>=R14B01, =<R17) (http://erlang.org/)
+ * ICU (http://icu-project.org/)
+ * OpenSSL (http://www.openssl.org/)
+ * Mozilla SpiderMonkey (1.8.5) (http://www.mozilla.org/js/spidermonkey/)
+ * GNU Make (http://www.gnu.org/software/make/)
+ * GNU Compiler Collection (http://gcc.gnu.org/)
+ * libcurl (http://curl.haxx.se/libcurl/)
+ * help2man (http://www.gnu.org/s/help2man/)
+ * 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
+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
+for building the online documentation.
+
+Debian-based Systems
+~~~~~~~~~~~~~~~~~~~~
+
+You can install the dependencies by running:
+
+ sudo apt-get install build-essential erlang-base-hipe \
+ erlang-dev erlang-manpages erlang-eunit erlang-nox \
+ libicu-dev libmozjs185-dev libcurl4-openssl-dev \
+ pkg-config rebar
+
+There are lots of Erlang packages. If there is a problem with your
+install, try a different mix. There is more information on the
+wiki. Additionally, you might want to install some of the optional
+Erlang tools which may also be useful.
+
+Be sure to update the version numbers to match your system's available
+packages.
+
+For up to date instructions, please see:
+
+ http://wiki.apache.org/couchdb/Installing_on_Debian
+
+ http://wiki.apache.org/couchdb/Installing_on_Ubuntu
+
+Unfortunately, it seems that installing dependencies on Ubuntu is
+troublesome.
+
+RedHat-based (Fedora, Centos, RHEL) Systems
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+You can install the dependencies by running:
+
+ sudo yum install autoconf autoconf-archive automake \
+ curl-devel erlang-asn1 erlang-erts erlang-eunit \
+ erlang-os_mon erlang-xmerl erlang-rebar help2man \
+ js-devel libicu-devel libtool perl-Test-Harness
+
+While CouchDB builds against the default js-devel-1.7.0 included in
+some distributions, it's recommended to use a more recent
+js-devel-1.8.5.
+
+Mac OS X
+~~~~~~~~
+
+To build CouchDB from source on Mac OS X, you will need to install
+the Command Line Tools:
+
+ xcode-select --install
+
+You can then install the other dependencies by running:
+
+ brew install autoconf autoconf-archive automake libtool \
+ erlang icu4c spidermonkey curl pkg-config rebar
+
+You will need Homebrew installed to use the `brew` command.
+
+Learn more about Homebrew at:
+
+ http://mxcl.github.com/homebrew/
+
+Some versions of Mac OS X ship a problematic OpenSSL library. If
+you're experiencing troubles with CouchDB crashing intermittently with
+a segmentation fault or a bus error, you will need to install your own
+version of OpenSSL. See the troubleshooting guide, mentioned above,
+for more information.
+
+FreeBSD
+-------
+
+FreeBSD requires the use of GNU Make. Where `make` is specified in this
+documentation, substitute `gmake`.
+
+You can install this by running:
+
+ pkg install gmake
+
+Installing
+----------
+
+Once you have satisfied the dependencies you should run:
+
+ ./configure
+
+This script will configure CouchDB to be installed into `/usr/local`
+by default.
+
+If you wish to customize the installation, pass `--help` to this
+script.
+
+If everything was successful you should see the following message:
+
+ You have configured Apache CouchDB, time to relax.
+
+Relax.
+
+To install CouchDB you should run:
+
+ make && sudo make install
+
+You only need to use `sudo` if you're installing into a system directory.
+
+Try `gmake` if `make` is giving you any problems.
+
+If everything was successful you should see the following message:
+
+ You have installed Apache CouchDB, time to relax.
+
+Relax.
+
+User Registration
+-----------------
+
+You should create a special `couchdb` user for CouchDB.
+
+On many Unix-like systems you can run:
+
+ adduser --system \
+ --home /usr/local/var/lib/couchdb \
+ --no-create-home \
+ --shell /bin/bash \
+ --group --gecos \
+ "CouchDB Administrator" couchdb
+
+On Mac OS X you can use the Workgroup Manager to create users:
+
+ http://www.apple.com/support/downloads/serveradmintools1047.html
+
+You must make sure that:
+
+ * The user has a working POSIX shell
+
+ * The user's home directory is `/usr/local/var/lib/couchdb`
+
+You can test this by:
+
+ * Trying to log in as the `couchdb` user
+
+ * Running `pwd` and checking the present working directory
+
+Change the ownership of the CouchDB directories by running:
+
+ chown -R couchdb:couchdb /usr/local/etc/couchdb
+ chown -R couchdb:couchdb /usr/local/var/lib/couchdb
+ chown -R couchdb:couchdb /usr/local/var/log/couchdb
+ chown -R couchdb:couchdb /usr/local/var/run/couchdb
+
+Change the permission of the CouchDB directories by running:
+
+ chmod 0770 /usr/local/etc/couchdb
+ chmod 0770 /usr/local/var/lib/couchdb
+ chmod 0770 /usr/local/var/log/couchdb
+ chmod 0770 /usr/local/var/run/couchdb
+
+Update the permissions for your `default.ini` file:
+
+ chmod 0644 /usr/local/etc/couchdb/default.ini
+
+First Run
+---------
+
+You can start the CouchDB server by running:
+
+ sudo -i -u couchdb couchdb
+
+This uses the `sudo` command to run the `couchdb` command as the
+`couchdb` user.
+
+When CouchDB starts it should eventually display the following
+message:
+
+ Apache CouchDB has started, time to relax.
+
+Relax.
+
+To check that everything has worked, point your web browser to:
+
+ http://127.0.0.1:5984/_utils/index.html
+
+From here you should run the test suite in Firefox.
+
+Running as a Daemon
+-------------------
+
+SysV/BSD-style Systems
+~~~~~~~~~~~~~~~~~~~~~~
+
+You can use the `couchdb` init script to control the CouchDB daemon.
+
+On SysV-style systems, the init script will be installed into:
+
+ /usr/local/etc/init.d
+
+On BSD-style systems, the init script will be installed into:
+
+ /usr/local/etc/rc.d
+
+We use the `[init.d|rc.d]` notation to refer to both of these
+directories.
+
+You can control the CouchDB daemon by running:
+
+ /usr/local/etc/[init.d|rc.d]/couchdb [start|stop|restart|status]
+
+If you wish to configure how the init script works, you can edit:
+
+ /usr/local/etc/default/couchdb
+
+Comment out the `COUCHDB_USER` setting if you're running as a
+non-superuser.
+
+To start the daemon on boot, copy the init script to:
+
+ /etc/[init.d|rc.d]
+
+You should then configure your system to run the init script
+automatically.
+
+You may be able to run:
+
+ sudo update-rc.d couchdb defaults
+
+If this fails, consult your system documentation for more information.
+
+A `logrotate` configuration is installed into:
+
+ /usr/local/etc/logrotate.d/couchdb
+
+Consult your `logrotate` documentation for more information.
+
+It is critical that the CouchDB logs are rotated so as not to fill
+your disk.
+
+Mac OS X
+~~~~~~~~
+
+You can use the `launchctl` command to control the CouchDB daemon.
+
+You can load the configuration by running:
+
+ sudo launchctl load \
+ /usr/local/Library/LaunchDaemons/org.apache.couchdb.plist
+
+You can stop the CouchDB daemon by running:
+
+ sudo launchctl unload \
+ /usr/local/Library/LaunchDaemons/org.apache.couchdb.plist
+
+You can start CouchDB by running:
+
+ sudo launchctl start org.apache.couchdb
+
+You can restart CouchDB by running:
+
+ sudo launchctl stop org.apache.couchdb
+
+You can edit the launchd configuration by running:
+
+ open /usr/local/Library/LaunchDaemons/org.apache.couchdb.plist
+
+To start the daemon on boot, copy the configuration file to:
+
+ /Library/LaunchDaemons
+
+Consult your system documentation for more information.
http://git-wip-us.apache.org/repos/asf/couchdb/blob/a1ecde1e/INSTALL.Windows
----------------------------------------------------------------------
diff --git a/INSTALL.Windows b/INSTALL.Windows
deleted file mode 100644
index 29c69b0..0000000
--- a/INSTALL.Windows
+++ /dev/null
@@ -1,204 +0,0 @@
-Apache CouchDB INSTALL.Windows
-==============================
-
-For a high-level guide to Microsoft Windows.
-
-Troubleshooting
----------------
-
-There is a troubleshooting guide:
-
- http://wiki.apache.org/couchdb/Troubleshooting
-
-There is a wiki for general documentation:
-
- http://wiki.apache.org/couchdb/
-
-And some Windows-specific tips:
-
- http://wiki.apache.org/couchdb/Quirks_on_Windows
-
-There are collection of friendly mailing lists:
-
- http://couchdb.apache.org/community/lists.html
-
-Please work through these in order if you experience any problems.
-
-Dependencies
-------------
-
-You will need the following installed:
-
- * Erlang OTP (>=14B01, <R17) (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/)
- * libcurl (>=7.20) (http://curl.haxx.se/libcurl/)
- * Cygwin (http://www.cygwin.com/)
- * Microsoft SDK 7.0 or 7.1 (http://www.microsoft.com/en-us/download/details.aspx?id=8279)
- * Python (>= 2.68) for docs (http://python.org/)
- * Python Sphinx (>=1.1.3) (http://pypi.python.org/pypi/Sphinx)
-
-General Notes
--------------
-
- * When installing Cygwin, be sure to select all the `development` tools.
-
- * When installing Erlang, you must build it from source.
-
- * The CouchDB build requires a number of the Erlang build scripts.
-
- * All dependent libraries should be built with the same version of
- microsoft SDK.
-
- * Do not try to link against libraries built with, or included in,
- Cygwin or MingW. They are not compatible with the Erlang/OTP or CouchDB
- build scripts.
-
- * ICU version 4.6 and later will build cleanly using MSBuild.
-
- * Python and Sphinx are optional for building the online documentation.
- Use cygwin-provided Python and install Sphinx via easy_install or pip.
- Further information is here http://pypi.python.org/pypi/setuptools#id4
-
-Setting Up Cygwin
------------------
-
-Before starting any Cygwin terminals, run:
-
- set CYGWIN=nontsec
-
-To set up your environment, run:
-
- [VS_BIN]/vcvars32.bat
-
-Replace [VS_BIN] with the path to your Visual Studio `bin` directory.
-
-You must check that:
-
- * The `which link` command points to the Microsoft linker.
-
- * The `which cl` command points to the Microsoft compiler.
-
- * The `which mc` command points to the Microsoft message compiler.
-
- * The `which mt` command points to the Microsoft manifest tool.
-
- * The `which nmake` command points to the Microsoft make tool.
-
-If you do not do this, the build may fail due to Cygwin ones found in `/usr/bin`
-being used instead.
-
-Building Erlang
----------------
-
-You must include Win32 OpenSSL, built statically from source. Use
-exactly the same version as required by the Erlang/OTP build process.
-
-However, you can skip the GUI tools by running:
-
- echo "skipping gs" > lib/gs/SKIP
-
- echo "skipping ic" > lib/ic/SKIP
-
- echo "skipping jinterface" > lib/jinterface/SKIP
-
-Follow the rest of the Erlang instructions as described.
-
-After running:
-
- ./otp_build release -a
-
-You should run:
-
- ./release/win32/Install.exe -s
-
-This will set up the release/win32/bin directory correctly. The CouchDB
-installation scripts currently write their data directly into this
-location.
-
-To set up your environment for building CouchDB, run:
-
- eval `./otp_build env_win32`
-
-To set up the `ERL_TOP` environment variable, run:
-
- export ERL_TOP=[ERL_TOP]
-
-Replace `[ERL_TOP]` with the Erlang source directory name.
-
-Remember to use `/cygdrive/c/` instead of `c:/` as the directory prefix.
-
-To set up your path, run:
-
- export PATH=$ERL_TOP/release/win32/erts-5.8.5/bin:$PATH
-
-If everything was successful, you should be ready to build CouchDB.
-
-Relax.
-
-Building CouchDB
-----------------
-
-Note that `win32-curl` is only required if you wish to run the developer
-tests.
-
-The documentation step may be skipped using `--disable-docs` if you wish.
-
-Once you have satisfied the dependencies you should run:
-
- ./configure \
- --with-js-include=/cygdrive/c/path_to_spidermonkey_include \
- --with-js-lib=/cygdrive/c/path_to_spidermonkey_lib \
- --with-win32-icu-binaries=/cygdrive/c/path_to_icu_binaries_root \
- --with-erlang=$ERL_TOP/release/win32/usr/include \
- --with-win32-curl=/cygdrive/c/path/to/curl/root/directory \
- --with-openssl-bin-dir=/cygdrive/c/openssl/bin \
- --with-msvc-redist-dir=/cygdrive/c/dir/with/vcredist_platform_executable \
- --disable-init \
- --disable-launchd \
- --prefix=$ERL_TOP/release/win32
-
-This command could take a while to complete.
-
-If everything was successful you should see the following message:
-
- You have configured Apache CouchDB, time to relax.
-
-Relax.
-
-To install CouchDB you should run:
-
- make install
-
-If everything was successful you should see the following message:
-
- You have installed Apache CouchDB, time to relax.
-
-Relax.
-
-To build the .exe installer package, you should run:
-
- make dist
-
-Alternatively, you may run CouchDB directly from the build tree, but
-to avoid any contamination do not run `make dist` after this.
-
-First Run
----------
-
-You can start the CouchDB server by running:
-
- $ERL_TOP/release/win32/bin/couchdb.bat
-
-When CouchDB starts it should eventually display the following message:
-
- Apache CouchDB has started, time to relax.
-
-Relax.
-
-To check that everything has worked, point your web browser to:
-
- http://127.0.0.1:5984/_utils/index.html
-
-From here you should run the verification tests in Firefox.
http://git-wip-us.apache.org/repos/asf/couchdb/blob/a1ecde1e/INSTALL.Windows.md
----------------------------------------------------------------------
diff --git a/INSTALL.Windows.md b/INSTALL.Windows.md
new file mode 100644
index 0000000..29c69b0
--- /dev/null
+++ b/INSTALL.Windows.md
@@ -0,0 +1,204 @@
+Apache CouchDB INSTALL.Windows
+==============================
+
+For a high-level guide to Microsoft Windows.
+
+Troubleshooting
+---------------
+
+There is a troubleshooting guide:
+
+ http://wiki.apache.org/couchdb/Troubleshooting
+
+There is a wiki for general documentation:
+
+ http://wiki.apache.org/couchdb/
+
+And some Windows-specific tips:
+
+ http://wiki.apache.org/couchdb/Quirks_on_Windows
+
+There are collection of friendly mailing lists:
+
+ http://couchdb.apache.org/community/lists.html
+
+Please work through these in order if you experience any problems.
+
+Dependencies
+------------
+
+You will need the following installed:
+
+ * Erlang OTP (>=14B01, <R17) (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/)
+ * libcurl (>=7.20) (http://curl.haxx.se/libcurl/)
+ * Cygwin (http://www.cygwin.com/)
+ * Microsoft SDK 7.0 or 7.1 (http://www.microsoft.com/en-us/download/details.aspx?id=8279)
+ * Python (>= 2.68) for docs (http://python.org/)
+ * Python Sphinx (>=1.1.3) (http://pypi.python.org/pypi/Sphinx)
+
+General Notes
+-------------
+
+ * When installing Cygwin, be sure to select all the `development` tools.
+
+ * When installing Erlang, you must build it from source.
+
+ * The CouchDB build requires a number of the Erlang build scripts.
+
+ * All dependent libraries should be built with the same version of
+ microsoft SDK.
+
+ * Do not try to link against libraries built with, or included in,
+ Cygwin or MingW. They are not compatible with the Erlang/OTP or CouchDB
+ build scripts.
+
+ * ICU version 4.6 and later will build cleanly using MSBuild.
+
+ * Python and Sphinx are optional for building the online documentation.
+ Use cygwin-provided Python and install Sphinx via easy_install or pip.
+ Further information is here http://pypi.python.org/pypi/setuptools#id4
+
+Setting Up Cygwin
+-----------------
+
+Before starting any Cygwin terminals, run:
+
+ set CYGWIN=nontsec
+
+To set up your environment, run:
+
+ [VS_BIN]/vcvars32.bat
+
+Replace [VS_BIN] with the path to your Visual Studio `bin` directory.
+
+You must check that:
+
+ * The `which link` command points to the Microsoft linker.
+
+ * The `which cl` command points to the Microsoft compiler.
+
+ * The `which mc` command points to the Microsoft message compiler.
+
+ * The `which mt` command points to the Microsoft manifest tool.
+
+ * The `which nmake` command points to the Microsoft make tool.
+
+If you do not do this, the build may fail due to Cygwin ones found in `/usr/bin`
+being used instead.
+
+Building Erlang
+---------------
+
+You must include Win32 OpenSSL, built statically from source. Use
+exactly the same version as required by the Erlang/OTP build process.
+
+However, you can skip the GUI tools by running:
+
+ echo "skipping gs" > lib/gs/SKIP
+
+ echo "skipping ic" > lib/ic/SKIP
+
+ echo "skipping jinterface" > lib/jinterface/SKIP
+
+Follow the rest of the Erlang instructions as described.
+
+After running:
+
+ ./otp_build release -a
+
+You should run:
+
+ ./release/win32/Install.exe -s
+
+This will set up the release/win32/bin directory correctly. The CouchDB
+installation scripts currently write their data directly into this
+location.
+
+To set up your environment for building CouchDB, run:
+
+ eval `./otp_build env_win32`
+
+To set up the `ERL_TOP` environment variable, run:
+
+ export ERL_TOP=[ERL_TOP]
+
+Replace `[ERL_TOP]` with the Erlang source directory name.
+
+Remember to use `/cygdrive/c/` instead of `c:/` as the directory prefix.
+
+To set up your path, run:
+
+ export PATH=$ERL_TOP/release/win32/erts-5.8.5/bin:$PATH
+
+If everything was successful, you should be ready to build CouchDB.
+
+Relax.
+
+Building CouchDB
+----------------
+
+Note that `win32-curl` is only required if you wish to run the developer
+tests.
+
+The documentation step may be skipped using `--disable-docs` if you wish.
+
+Once you have satisfied the dependencies you should run:
+
+ ./configure \
+ --with-js-include=/cygdrive/c/path_to_spidermonkey_include \
+ --with-js-lib=/cygdrive/c/path_to_spidermonkey_lib \
+ --with-win32-icu-binaries=/cygdrive/c/path_to_icu_binaries_root \
+ --with-erlang=$ERL_TOP/release/win32/usr/include \
+ --with-win32-curl=/cygdrive/c/path/to/curl/root/directory \
+ --with-openssl-bin-dir=/cygdrive/c/openssl/bin \
+ --with-msvc-redist-dir=/cygdrive/c/dir/with/vcredist_platform_executable \
+ --disable-init \
+ --disable-launchd \
+ --prefix=$ERL_TOP/release/win32
+
+This command could take a while to complete.
+
+If everything was successful you should see the following message:
+
+ You have configured Apache CouchDB, time to relax.
+
+Relax.
+
+To install CouchDB you should run:
+
+ make install
+
+If everything was successful you should see the following message:
+
+ You have installed Apache CouchDB, time to relax.
+
+Relax.
+
+To build the .exe installer package, you should run:
+
+ make dist
+
+Alternatively, you may run CouchDB directly from the build tree, but
+to avoid any contamination do not run `make dist` after this.
+
+First Run
+---------
+
+You can start the CouchDB server by running:
+
+ $ERL_TOP/release/win32/bin/couchdb.bat
+
+When CouchDB starts it should eventually display the following message:
+
+ Apache CouchDB has started, time to relax.
+
+Relax.
+
+To check that everything has worked, point your web browser to:
+
+ http://127.0.0.1:5984/_utils/index.html
+
+From here you should run the verification tests in Firefox.
http://git-wip-us.apache.org/repos/asf/couchdb/blob/a1ecde1e/README-DEV
----------------------------------------------------------------------
diff --git a/README-DEV b/README-DEV
deleted file mode 100644
index 997e3db..0000000
--- a/README-DEV
+++ /dev/null
@@ -1,194 +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 will need the following installed:
-
- * Rebar (>=2.5.0) (https://github.com/rebar/rebar)
-
-You may also 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>
-
-Testing
--------
-
-Check the test suite by running:
-
- make check
-
-Generate a coverage report by running:
-
- make cover
-
-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/a1ecde1e/README-DEV.md
----------------------------------------------------------------------
diff --git a/README-DEV.md b/README-DEV.md
new file mode 100644
index 0000000..997e3db
--- /dev/null
+++ b/README-DEV.md
@@ -0,0 +1,194 @@
+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 will need the following installed:
+
+ * Rebar (>=2.5.0) (https://github.com/rebar/rebar)
+
+You may also 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>
+
+Testing
+-------
+
+Check the test suite by running:
+
+ make check
+
+Generate a coverage report by running:
+
+ make cover
+
+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/a1ecde1e/license.skip
----------------------------------------------------------------------
diff --git a/license.skip b/license.skip
index 55adcd8..c1bd0e9 100644
--- a/license.skip
+++ b/license.skip
@@ -3,15 +3,16 @@
^.*.DS_Store
^.*.beam
^AUTHORS
-^BUGS
+^BUGS.md
+^COMMITTERS.md
^CHANGES
^DEVELOPERS
^DEVELOPERS.gz
-^INSTALL
-^INSTALL.Unix
-^INSTALL.Unix.gz
-^INSTALL.Windows
-^INSTALL.Windows.gz
+^INSTALL.md
+^INSTALL.Unix.md
+^INSTALL.Unix.md.gz
+^INSTALL.Windows.md
+^INSTALL.Windows.md.gz
^INSTALL.gz
^LICENSE.gz
^Makefile
@@ -19,6 +20,8 @@
^NEWS
^NOTICE
^README
+^README.rst
+^README-DEV.md
^THANKS
^aclocal.m4
^apache-couchdb-.*
[15/50] couchdb commit: updated refs/heads/developer-preview-2.0 to
2a31bca
Posted by kx...@apache.org.
fix distclean
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/9b2dfb48
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/9b2dfb48
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/9b2dfb48
Branch: refs/heads/developer-preview-2.0
Commit: 9b2dfb48c6b64b0bb881e4f7baf29d2c7e048f64
Parents: 1d70bd8
Author: Jan Lehnardt <ja...@apache.org>
Authored: Sat May 30 15:16:21 2015 +0200
Committer: Jan Lehnardt <ja...@apache.org>
Committed: Wed Jun 24 23:06:55 2015 +0200
----------------------------------------------------------------------
Makefile | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/9b2dfb48/Makefile
----------------------------------------------------------------------
diff --git a/Makefile b/Makefile
index f734e3e..47e73a0 100644
--- a/Makefile
+++ b/Makefile
@@ -67,9 +67,9 @@ release:
echo "Done: apache-couchdb-$(COUCHDB_VERSION).tar.gz"
distclean: clean
- @rm install.mk
- @rm config.erl
- @rm rel/couchdb.config
+ @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
[07/50] couchdb commit: updated refs/heads/developer-preview-2.0 to
2a31bca
Posted by kx...@apache.org.
add log file option to ./configure, unify naming of configure vars
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/53bfa44f
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/53bfa44f
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/53bfa44f
Branch: refs/heads/developer-preview-2.0
Commit: 53bfa44f2c0749389e299edddb6a2ab4033fdca8
Parents: f803174
Author: Jan Lehnardt <ja...@apache.org>
Authored: Mon Apr 6 22:20:32 2015 +0200
Committer: Jan Lehnardt <ja...@apache.org>
Committed: Wed Jun 24 23:06:48 2015 +0200
----------------------------------------------------------------------
Makefile | 17 ++++++++++-------
configure | 44 ++++++++++++++++++++++++++++----------------
2 files changed, 38 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/53bfa44f/Makefile
----------------------------------------------------------------------
diff --git a/Makefile b/Makefile
index cf048f1..3eb7c44 100644
--- a/Makefile
+++ b/Makefile
@@ -40,7 +40,7 @@ clean:
check: javascript eunit
-# creates a a full erlang release
+# creates a full erlang release
dist: all
@rm -rf rel/couchdb
@rebar generate
@@ -80,18 +80,21 @@ devclean:
@rm -rf dev/lib/*/data
-include install.mk
-install: dist
- @mkdir -p $(prefix)
- @cp -R rel/couchdb/* $(prefix)
+install:
+ @rm -rf rel/couchdb
+ @rebar generate # make full erlang release
+ @mkdir -p $(install_dir)
+ @cp -R rel/couchdb/* $(install_dir)
@mkdir -p $(data_dir)
@chown $(user) $(data_dir)
@mkdir -p $(view_index_dir)
@chown $(user) $(view_index_dir)
- @touch $(prefix)/var/log/couchdb.log
- @chown $(user) $(prefix)/var/log/couchdb.log
+ @mkdir `dirname $(log_file)`
+ @touch $(log_file)
+ @chown $(user) $(log_file)
uninstall:
- @rm -rf $(prefix)
+ @rm -rf $(installdir)
install.mk:
# ignore install.mk missing if we are running
http://git-wip-us.apache.org/repos/asf/couchdb/blob/53bfa44f/configure
----------------------------------------------------------------------
diff --git a/configure b/configure
index d76eb8a..c122bf3 100755
--- a/configure
+++ b/configure
@@ -11,11 +11,12 @@
# License for the specific language governing permissions and limitations under
# the License.
-PREFIX="/opt/couchdb"
+PREFIX="/usr/local"
PACKAGE_AUTHOR_NAME="The Apache Software Foundation"
COUCHDB_USER=`whoami`
WITH_CURL="false"
+# cd into this script’s directory
rootdir="$(cd "${0%/*}" 2>/dev/null; echo "$PWD")"
basename=`basename $0`
@@ -32,8 +33,9 @@ Options:
-h display a short help message and exit
-u USER set the username to run as (defaults to $COUCHDB_USER)
-p DIRECTORY set the prefix for installation (defaults to $PREFIX)
- -d DIRECTORY specify the data directory (defaults to $PREFIX/var/lib)
- -v DIRECTORY specify the view directory (defaults to $PREFIX/var/lib)
+ -d DIRECTORY specify the data directory (defaults to /var/lib/couchdb)
+ -v DIRECTORY specify the view directory (defaults to /var/lib/couchdb)
+ -l FILE specify the log file (defaults to /var/log/couchdb.log)
-c request that couchjs is linked to cURL (default false)
EOF
@@ -52,7 +54,7 @@ display_error () {
parse_opts () {
set +e
- options=`getopt hu:p:d:v:c $@`
+ options=`getopt hu:p:d:v:l:c $@`
if test ! $? -eq 0; then
display_error
fi
@@ -63,24 +65,32 @@ parse_opts () {
-h) shift; display_help; exit;;
-u) shift; COUCHDB_USER=$1; shift;;
-p) shift; PREFIX=$1; shift;;
- -d) shift; DATA=$1; shift;;
- -v) shift; VIEW=$1; shift;;
+ -d) shift; DATA_DIR=$1; shift;;
+ -v) shift; VIEW_DIR=$1; shift;;
+ -l) shift; LOG_FILE=$1; shift;;
-c) shift; WITH_CURL="true";;
--) shift; break;;
*) display_error "Unknown option: $1" >&2;;
esac
done
- if test ! -n "$DATA"; then
- DATA="$PREFIX/var/lib";
+
+ # defaults
+ if test -z "$DATA_DIR"; then
+ DATA_DIR="/var/lib/couchdb";
+ fi
+ if test -z "$VIEW_DIR"; then
+ VIEW_DIR="/var/lib/couchdb";
fi
- if test ! -n "$VIEW"; then
- VIEW="$PREFIX/var/lib";
+ if test -z "$LOG_FILE"; then
+ LOG_FILE="/var/log/couchdb.log";
fi
}
parse_opts $@
+INSTALL_DIR="$PREFIX/couchdb"
+
echo "==> configuring couchdb in rel/couchdb.config"
cat > rel/couchdb.config << EOF
@@ -99,9 +109,10 @@ cat > rel/couchdb.config << EOF
% The contents of this file are auto-generated by configure
%
{package_author_name, "$PACKAGE_AUTHOR_NAME"}.
-{prefix, "$PREFIX"}.
-{data_dir, "$DATA"}.
-{view_index_dir, "$VIEW"}.
+{prefix, "INSTALLDIR"}.
+{data_dir, "$DATA_DIR"}.
+{view_index_dir, "$VIEW_DIR"}.
+{log_file, "$LOG_FILE"}.
{user, "$COUCHDB_USER"}.
{node_name, "-name couchdb"}.
{cluster_port, 5984}.
@@ -124,9 +135,10 @@ cat > install.mk << EOF
# The contents of this file are auto-generated by configure
#
package_author_name = $PACKAGE_AUTHOR_NAME
-prefix = $PREFIX
-data_dir = $DATA
-view_index_dir = $VIEW
+install_dir = $INSTALL_DIR
+data_dir = $DATA_DIR
+view_index_dir = $VIEW_DIR
+log_file = $LOG_FILE
user = $COUCHDB_USER
EOF
[14/50] couchdb commit: updated refs/heads/developer-preview-2.0 to
2a31bca
Posted by kx...@apache.org.
silence make release output
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/9cb9d7eb
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/9cb9d7eb
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/9cb9d7eb
Branch: refs/heads/developer-preview-2.0
Commit: 9cb9d7eb1f356d886def58332dd1461a894a8ba3
Parents: e2b26ea
Author: Jan Lehnardt <ja...@apache.org>
Authored: Sat Apr 11 21:53:38 2015 +0200
Committer: Jan Lehnardt <ja...@apache.org>
Committed: Wed Jun 24 23:06:54 2015 +0200
----------------------------------------------------------------------
Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/9cb9d7eb/Makefile
----------------------------------------------------------------------
diff --git a/Makefile b/Makefile
index a2ce75a..66dd0a8 100644
--- a/Makefile
+++ b/Makefile
@@ -50,7 +50,7 @@ dist: all
# creates a source tarball
release:
- ./build-aux/couchdb-build-release.sh $(COUCHDB_VERSION)
+ @./build-aux/couchdb-build-release.sh $(COUCHDB_VERSION)
# build fauxton
$(MAKE) fauxton
[38/50] couchdb commit: updated refs/heads/developer-preview-2.0 to
2a31bca
Posted by kx...@apache.org.
re-add vendor default
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/f9a0db42
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/f9a0db42
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/f9a0db42
Branch: refs/heads/developer-preview-2.0
Commit: f9a0db420fecc85e38b61f9fd8a48f4848e86da8
Parents: fcf233d
Author: Jan Lehnardt <ja...@apache.org>
Authored: Wed Jun 24 22:39:22 2015 +0200
Committer: Jan Lehnardt <ja...@apache.org>
Committed: Wed Jun 24 23:07:49 2015 +0200
----------------------------------------------------------------------
Makefile | 10 ----------
configure | 2 ++
2 files changed, 2 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/f9a0db42/Makefile
----------------------------------------------------------------------
diff --git a/Makefile b/Makefile
index 52559dc..5c96cf8 100644
--- a/Makefile
+++ b/Makefile
@@ -47,19 +47,9 @@ check: javascript eunit build-test
# creates a full erlang release
dist: all
- @rm -rf rel/couchdb
- @rebar generate
- @cp -r share/www rel/couchdb/share/www
- @cp -r share/docs rel/couchdb/share/docs
-
-# creates a source tarball
-release:
@./build-aux/couchdb-build-release.sh $(COUCHDB_VERSION)
-# build fauxton
- @$(MAKE) fauxton
@cp -r share/www apache-couchdb-$(COUCHDB_VERSION)/share/
-
@mkdir -p apache-couchdb-$(COUCHDB_VERSION)/share/docs/html
@cp -r src/docs/build/html apache-couchdb-$(COUCHDB_VERSION)/share/docs/html
@mkdir -p apache-couchdb-$(COUCHDB_VERSION)/share/docs/pdf
http://git-wip-us.apache.org/repos/asf/couchdb/blob/f9a0db42/configure
----------------------------------------------------------------------
diff --git a/configure b/configure
index 3e1847a..cbf55c8 100755
--- a/configure
+++ b/configure
@@ -15,6 +15,8 @@
rootdir="$(cd "${0%/*}" 2>/dev/null; echo "$PWD")"
basename=`basename $0`
+PACKAGE_AUTHOR_NAME="The Apache Software Foundation"
+
TEST=0
WITH_CURL="false"
WITH_FAUXTON=1
[03/50] couchdb commit: updated refs/heads/developer-preview-2.0 to
2a31bca
Posted by kx...@apache.org.
Add first stab at a release build script.
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/872b52f9
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/872b52f9
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/872b52f9
Branch: refs/heads/developer-preview-2.0
Commit: 872b52f9c6aa70952f3db308a0c780cd89ceef24
Parents: 0a6298f
Author: Jan Lehnardt <ja...@apache.org>
Authored: Wed Feb 11 22:24:58 2015 +0100
Committer: Jan Lehnardt <ja...@apache.org>
Committed: Wed Jun 24 23:06:44 2015 +0200
----------------------------------------------------------------------
.gitignore | 1 +
Makefile | 38 +++++++++++-
THANKS.in | 96 +++++++++++++++++++++++++++++
build-aux/couchdb-build-release.sh | 48 +++++++++++++++
configure | 7 ++-
test/build/test-configure-distclean.sh | 15 +++++
test/build/test-make-clean.sh | 20 ++++++
7 files changed, 221 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/872b52f9/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 0cdbaa7..8519032 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,3 +29,4 @@ src/couch/priv/couchjs
src/couch/priv/couchspawnkillable
bin/
+release/
http://git-wip-us.apache.org/repos/asf/couchdb/blob/872b52f9/Makefile
----------------------------------------------------------------------
diff --git a/Makefile b/Makefile
index 2f49a6e..4dab51a 100644
--- a/Makefile
+++ b/Makefile
@@ -10,6 +10,8 @@
# License for the specific language governing permissions and limitations under
# the License.
+IN_RELEASE = $(shell if [ ! -d .git ]; then echo true; fi)
+
all: couch fauxton
config.erl:
@@ -24,23 +26,51 @@ couch: config.erl
clean:
@rebar -r clean
+ @rm -f bin/couchjs
+ @rm -rf src/*/ebin
+ @rm -rf src/*/.rebar
+ @rm -rf src/{jiffy,khash,snappy,b64url}/priv
+ @rm -rf share/server/main.js share/server/main-coffee.js
+ @rm -f src/couch/priv/couchspawnkillable
+ @rm -f src/couch/priv/couch_js/config.h
check: javascript eunit
-
+# creates a a full erlang release
dist: all
@rm -rf rel/couchdb
@rebar generate
@cp -r share/www rel/couchdb/share/www
+# creates a source tarball
+release:
+ ./build-aux/couchdb-build-release.sh
+
+ # build fauxton
+ $(MAKE) fauxton
+ cp -r share/www apache-couchdb/share/
+ #
+ # # build docs
+ # cd src/docs; make
+ # mkdir apache-couchdb/share/docs
+ # cp -r src/docs/build/html apache-couchdb/share/docs/html
+
distclean: clean
+ @rm install.mk
+ @rm config.erl
+ @rm 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
+-include install.mk
install: dist
@mkdir -p $(prefix)
@cp -R rel/couchdb/* $(prefix)
@@ -52,8 +82,12 @@ install: dist
@chown $(user) $(prefix)/var/log/couchdb.log
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 .
http://git-wip-us.apache.org/repos/asf/couchdb/blob/872b52f9/THANKS.in
----------------------------------------------------------------------
diff --git a/THANKS.in b/THANKS.in
new file mode 100644
index 0000000..8b2a34f
--- /dev/null
+++ b/THANKS.in
@@ -0,0 +1,96 @@
+Apache CouchDB THANKS
+=====================
+
+A number of people have contributed to Apache CouchDB by reporting problems,
+suggesting improvements or submitting changes. Some of these people are:
+
+ * William Beh <wi...@gmail.com>
+ * Dirk Schalge <di...@epd-me.net>
+ * Roger Leigh <rl...@debian.org>
+ * Sam Ruby <ru...@intertwingly.net>
+ * Carlos Valiente <su...@gmail.com>
+ * Till Klampaeckel <ti...@klampaeckel.de>
+ * Jim Lindley <we...@jimlindley.com>
+ * Yoan Blanc <yo...@gmail.com>
+ * Michael Gottesman <go...@reed.edu>
+ * Mark Baran <me...@gmail.com>
+ * Michael Hendricks <mi...@ndrix.org>
+ * Antony Blakey <an...@gmail.com>
+ * Paul Carey <pa...@gmail.com>
+ * Hunter Morris <hu...@gmail.com>
+ * Brian Palmer <ji...@brian.codekitchen.net>
+ * Maximillian Dornseif <md...@hudora.de>
+ * Eric Casteleijn <er...@canonical.com>
+ * Maarten Thibaut <mt...@cisco.com>
+ * Florian Ebeling <fl...@gmail.com>
+ * Volker Mische <vo...@gmail.com>
+ * Brian Candler <B....@pobox.com>
+ * Brad Anderson <br...@sankatygroup.com>
+ * Nick Gerakines <ni...@gerakines.net>
+ * Kevin Ilchmann Jørgensen <ki...@gmail.com>
+ * Sebastian Cohnen <se...@gmx.net>
+ * Sven Helmberger <sv...@gmx.de>
+ * Dan Walters <da...@danwalters.net>
+ * Curt Arnold <ca...@apache.org>
+ * Gustavo Niemeyer
+ * Joshua Bronson <ja...@gmail.com>
+ * Kostis Sagonas <ko...@cs.ntua.gr>
+ * Matthew Hooker <mw...@gmail.com>
+ * Ilia Cheishvili <il...@gmail.com>
+ * Lena Herrmann <le...@zeromail.org>
+ * Jack Moffit <me...@gmail.com>
+ * Damjan Georgievski <gd...@gmail.com>
+ * Jan Kassens <ja...@kassens.net>
+ * James Marca <jm...@translab.its.uci.edu>
+ * Matt Goodall <ma...@gmail.com>
+ * Joel Clark <un...@yahoo.com>
+ * Matt Lyon <ma...@flowerpowered.com>
+ * mikeal <mi...@gmail.com>
+ * Joscha Feth <jo...@feth.com>
+ * Jarrod Roberson <ja...@vertigrated.com>
+ * Jae Kwon <jk...@gmail.com>
+ * Gavin Sherry <sw...@alcove.com.au>
+ * Timothy Smith <ti...@couch.io>
+ * Martin Haaß <Ma...@gmx.net>
+ * Hans Ulrich Niedermann <hu...@n-dimensional.de>
+ * Dmitry Unkovsky <oi...@gmail.com>
+ * Zachary Zolton <za...@gmail.com>
+ * Brian Jenkins <bo...@bonkydog.com>
+ * Paul Bonser <pi...@paulbonser.com>
+ * Caleb Land <ca...@gmail.com>
+ * Juhani Ränkimies <ju...@juranki.com>
+ * Kev Jackson <fo...@gmail.com>
+ * Jonathan D. Knezek <jd...@gmail.com>
+ * David Rose <do...@gmail.com>
+ * Lim Yue Chuan <sh...@gmail.com>
+ * David Davis <xa...@xantus.org>
+ * Juuso Väänänen <ju...@vaananen.org>
+ * Jeff Zellner <je...@gmail.com>
+ * Gabriel Farrell <gs...@gmail.com>
+ * Mike Leddy <mi...@loop.com.br>
+ * Wayne Conrad <wa...@databill.com>
+ * Thomas Vander Stichele <th...@apestaart.org>
+ * Felix Hummel <ap...@felixhummel.de>
+ * Tim Smith <ti...@couchbase.com>
+ * Dipesh Patel <di...@googlemail.com>
+ * Sam Bisbee <sa...@sbisbee.com>
+ * Nathan Vander Wilt <na...@yahoo.com>
+ * Caolan McMahon <ca...@googlemail.com>
+ * Andrey Somov <tr...@gmail.com>
+ * Chris Coulson <chrisccoulson.googlemail.com>
+ * Trond Norbye <tr...@gmail.com>
+ * Christopher Bonhage <qu...@me.com>
+ * Christian Carter <cd...@gmail.com>
+ * Lukasz Mielicki <mi...@gmail.com>
+ * Omar Yasin <omarkj@gmail.com
+ * Matt Cooley <ma...@mattcooley.net>
+ * Simon Leblanc <si...@gmail.com>
+ * Rogutės Sparnuotos <ro...@googlemail.com>
+ * Gavin McDonald <gm...@apache.org>
+ * Fedor Indutny <fe...@indutny.com>
+ * Tim Blair
+ * Tady Walsh <he...@tady.me>
+ * Sam Rijs <re...@awesam.de>
+# Authors from commit 6c976bd and onwards are auto-inserted. If you are merging
+# a commit from a non-committer, you should not add an entry to this file. When
+# `bootstrap` is run, the actual THANKS file will be generated.
http://git-wip-us.apache.org/repos/asf/couchdb/blob/872b52f9/build-aux/couchdb-build-release.sh
----------------------------------------------------------------------
diff --git a/build-aux/couchdb-build-release.sh b/build-aux/couchdb-build-release.sh
new file mode 100755
index 0000000..f2f7e1b
--- /dev/null
+++ b/build-aux/couchdb-build-release.sh
@@ -0,0 +1,48 @@
+#!/bin/sh -ex
+
+RELDIR=apache-couchdb
+# make release dir
+rm -rf $RELDIR
+mkdir $RELDIR
+
+CURRENT_BRANCH=`git rev-parse --abbrev-ref HEAD`
+
+# copy sources over
+git archive $CURRENT_BRANCH | tar -xC $RELDIR/
+mkdir $RELDIR/src
+cd src/
+
+for repo in *; do
+ cd $repo
+ mkdir ../../$RELDIR/src/$repo
+ # todo, make work for tags
+ git archive `git rev-parse --abbrev-ref HEAD` | tar -xC ../../$RELDIR/src/$repo/
+ cd ..
+done
+
+cd ..
+
+# update version
+# actual version detection TBD
+perl -pi -e 's/\{vsn, git\}/\{vsn, "version"\}/' $RELDIR/src/*/src/*.app.src
+
+# create THANKS file
+if test -e .git; then
+ OS=`uname -s`
+ case "$OS" in
+ Linux|CYGWIN*) # GNU sed
+ SED_ERE_FLAG=-r
+ ;;
+ *) # BSD sed
+ SED_ERE_FLAG=-E
+ ;;
+ esac
+
+ sed -e "/^#.*/d" THANKS.in > $RELDIR/THANKS
+ CONTRIB_EMAIL_SED_COMMAND="s/^[[:blank:]]{5}[[:digit:]]+[[:blank:]]/ * /"
+ git shortlog -se 6c976bd..HEAD \
+ | grep -v @apache.org \
+ | sed $SED_ERE_FLAG -e "$CONTRIB_EMAIL_SED_COMMAND" >> $RELDIR/THANKS
+ echo "" >> $RELDIR/THANKS # simplest portable newline
+ echo "For a list of authors see the \`AUTHORS\` file." >> $RELDIR/THANKS
+fi
http://git-wip-us.apache.org/repos/asf/couchdb/blob/872b52f9/configure
----------------------------------------------------------------------
diff --git a/configure b/configure
index 1f7a261..d76eb8a 100755
--- a/configure
+++ b/configure
@@ -134,5 +134,8 @@ cat > $rootdir/config.erl << EOF
{with_curl, $WITH_CURL}.
EOF
-echo "==> updating dependencies"
-rebar get-deps update-deps
+# only update dependencies, when we are not in a release tarball
+if [ -d .git ]; then
+ echo "==> updating dependencies"
+ rebar get-deps update-deps
+fi
http://git-wip-us.apache.org/repos/asf/couchdb/blob/872b52f9/test/build/test-configure-distclean.sh
----------------------------------------------------------------------
diff --git a/test/build/test-configure-distclean.sh b/test/build/test-configure-distclean.sh
new file mode 100755
index 0000000..ed01faa
--- /dev/null
+++ b/test/build/test-configure-distclean.sh
@@ -0,0 +1,15 @@
+#!/bin/sh
+rm -rf apache-couchdb apache-couchdb-pristine
+./configure
+make release
+cp -r apache-couchdb apache-couchdb-pristine
+cd apache-couchdb
+ ./configure
+ make distclean
+cd ..
+
+echo "********************************************"
+echo "If you see anything here"
+diff -r apache-couchdb apache-couchdb-pristine
+echo "and here, something is wrong"
+echo "********************************************"
http://git-wip-us.apache.org/repos/asf/couchdb/blob/872b52f9/test/build/test-make-clean.sh
----------------------------------------------------------------------
diff --git a/test/build/test-make-clean.sh b/test/build/test-make-clean.sh
new file mode 100755
index 0000000..ce6366f
--- /dev/null
+++ b/test/build/test-make-clean.sh
@@ -0,0 +1,20 @@
+#!/bin/sh
+rm -rf apache-couchdb*
+./configure
+make release
+cd apache-couchdb
+ ./configure
+cd ..
+
+cp -r apache-couchdb apache-couchdb-pristine
+
+cd apache-couchdb
+ make
+ make clean
+cd ..
+
+echo "********************************************"
+echo "If you see anything here"
+diff -r apache-couchdb apache-couchdb-pristine
+echo "and here, something is wrong"
+echo "********************************************"
[24/50] couchdb commit: updated refs/heads/developer-preview-2.0 to
2a31bca
Posted by kx...@apache.org.
ignore unused params and make them not stop parsing
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/c7077e9e
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/c7077e9e
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/c7077e9e
Branch: refs/heads/developer-preview-2.0
Commit: c7077e9ea5120bf526be465c471e4e301920406a
Parents: f900068
Author: Jan Lehnardt <ja...@apache.org>
Authored: Wed Jun 24 12:44:22 2015 +0200
Committer: Jan Lehnardt <ja...@apache.org>
Committed: Wed Jun 24 23:07:03 2015 +0200
----------------------------------------------------------------------
configure | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/c7077e9e/configure
----------------------------------------------------------------------
diff --git a/configure b/configure
index fe8e925..bd3d0f2 100755
--- a/configure
+++ b/configure
@@ -86,13 +86,13 @@ parse_opts() {
--test)
TEST=1
- shift 1
+ shift
continue
;;
--with-curl|-c)
WITH_CURL="true"
- shift 1
+ shift
continue
;;
@@ -352,6 +352,10 @@ parse_opts() {
shift
break
;;
+ -?*)
+ echo "WARNING: Unkonwn option '$1', ignoring" >&2
+ shift
+ ;;
*) # Done
break
esac
[47/50] couchdb commit: updated refs/heads/developer-preview-2.0 to
2a31bca
Posted by kx...@apache.org.
First version of Windows configure script
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/a0c771cc
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/a0c771cc
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/a0c771cc
Branch: refs/heads/developer-preview-2.0
Commit: a0c771cc41157004d7516f0b5495436c238106ef
Parents: bab44b8
Author: Joan Touzet <wo...@apache.org>
Authored: Sat Jul 11 19:33:57 2015 -0400
Committer: Joan Touzet <wo...@apache.org>
Committed: Sat Jul 11 19:33:57 2015 -0400
----------------------------------------------------------------------
configure.ps1 | 201 +++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 201 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/a0c771cc/configure.ps1
----------------------------------------------------------------------
diff --git a/configure.ps1 b/configure.ps1
new file mode 100644
index 0000000..75a6d17
--- /dev/null
+++ b/configure.ps1
@@ -0,0 +1,201 @@
+<#
+.SYNOPSIS
+ Configures CouchDB for building.
+.DESCRIPTION
+ This command is responsible for generating the build
+ system for Apache CouchDB.
+
+ -WithCurl request that couchjs is linked to cURL (default false)
+ -DisableFauxton request build process skip building Fauxton (default false)
+ -DisableDocs request build process skip building documentation (default false)
+ -SkipDeps do not update Erlang dependencies (default false)
+ -CouchDBUser USER set the username to run as (defaults to current user)
+
+ Installation directories:
+ -Prefix PREFIX install architecture-independent files in PREFIX
+ [C:\Program Files\Apache\CouchDB]
+ -ExecPrefix EPREFIX install architecture-dependent files in EPREFIX
+ [same as PREFIX]
+
+ Fine tuning of the installation directories:
+ -BinDir DIR user executables [EPREFIX\bin]
+ -LibexecDir DIR program executables [EPREFIX\libexec]
+ -LibDir DIR object code libraries [EPREFIX\lib]
+ -SysconfDir DIR read-only single-machine data [PREFIX\etc]
+ -DataRootDir DIR read-only arch.-independent data root [PREFIX\share]
+ -LocalStateDir DIR modifiable single-machine data [PREFIX\var]
+ -RunStateDir DIR modifiable single-machine runstate data [LOCALSTATEDIR\run]
+ -DatabaseDir DIR specify the data directory [LOCALSTATEDIR\lib]
+ -ViewindexDir DIR specify the view directory [LOCALSTATEDIR\lib]
+ -LogDir DIR specify the log directory [LOCALSTATEDIR\log]
+ -DataDir DIR read-only architecture-independent data [DATAROOTDIR]
+ -InfoDir DIR info documentation [DATAROOTDIR\info]
+ -ManDir DIR man documentation [DATAROOTDIR\man]
+ -DocDir DIR documentation root [DATAROOTDIR\doc\apache-couchdb]
+ -HTMLDir DIR html documentation [DOCDIR\html]
+ -PDFDir DIR pdf documentation [DOCDIR\pdf]
+.LINK
+ http://couchdb.apache.org/
+#>
+
+#REQUIRES -Version 2.0
+[cmdletbinding()]
+
+Param(
+ [switch]$Test = $false,
+ [switch]$WithCurl = $false, # request that couchjs is linked to cURL (default false)
+ [switch]$DisableFauxton = $false, # do not build Fauxton
+ [switch]$DisableDocs = $false, # do not build any documentation or manpages
+ [switch]$SkipDeps = $false, # do not update erlang dependencies
+
+ [ValidateNotNullOrEmpty()]
+ [string]$CouchDBUser = [Environment]::UserName, # set the username to run as (defaults to current user)
+ [ValidateNotNullOrEmpty()]
+ [string]$Prefix = "C:\Program Files\Apache\CouchDB", # install architecture-independent file location (default C:\Program Files\Apache\CouchDB)
+ [ValidateNotNullOrEmpty()]
+ [string]$ExecPrefix = $Prefix, # install architecture-dependent file location (default C:\Program Files\Apache\CouchDB)
+ [ValidateNotNullOrEmpty()]
+ [string]$BinDir = "$ExecPrefix\bin", # user executable file location (default $ExecPrefix\bin)
+ [ValidateNotNullOrEmpty()]
+ [string]$LibExecDir = "$ExecPrefix\libexec", # user executable file location (default $ExecPrefix\libexec)
+ [ValidateNotNullOrEmpty()]
+ [string]$LibDir = "$ExecPrefix\lib", # object code libraries (default $ExecPrefix\lib)
+ [ValidateNotNullOrEmpty()]
+
+ [Alias("EtcDir")]
+ [string]$SysConfDir = "$Prefix\etc", # read-only single-machine data (default $Prefix\etc)
+ [ValidateNotNullOrEmpty()]
+ [string]$DataRootDir = "$Prefix\share", # read-only arch.-independent data root (default $Prefix\share)
+
+ [ValidateNotNullOrEmpty()]
+ [string]$LocalStateDir = "$Prefix\var", # modifiable single-machine data (default $Prefix\var)
+ [ValidateNotNullOrEmpty()]
+ [string]$RunStateDir = "$LocalStateDir\run", # modifiable single-machine run state (default $LocalStateDir\run)
+ [ValidateNotNullOrEmpty()]
+ [string]$DatabaseDir = "$LocalStateDir\lib", # database directory (default $LocalStateDir\lib)
+ [ValidateNotNullOrEmpty()]
+ [string]$ViewIndexDir = "$LocalStateDir\lib", # database view index directory (default $LocalStateDir\lib)
+ [ValidateNotNullOrEmpty()]
+ [string]$LogDir = "$LocalStateDir\log", # logging directory (default $LocalStateDir\log)
+
+ [ValidateNotNullOrEmpty()]
+ [string]$DataDir = "$DataRootDir", # read-only arch.-independent data (default $DataRootDir)
+ [ValidateNotNullOrEmpty()]
+ [string]$InfoDir = "$DataRootDir\info", # info documentation (default $DataRootDir\info)
+ [ValidateNotNullOrEmpty()]
+ [string]$ManDir = "$DataRootDir\man", # man documentation (default $DataRootDir\man)
+ [ValidateNotNullOrEmpty()]
+
+ [string]$DocDir = "$DataRootDir\doc\apache-couchdb", # man documentation (default $DataRootDir\doc\apache-couchdb)
+ [ValidateNotNullOrEmpty()]
+ [string]$HTMLDir = "$DocDir\html", # html documentation (default $DocDir\html)
+ [ValidateNotNullOrEmpty()]
+ [string]$PDFDir = "$DocDir\pdf" # pdf documentation (default $DocDir\pdf)
+)
+
+
+# determine this script’s directory and change to it
+$rootdir = split-path -parent $MyInvocation.MyCommand.Definition
+Push-Location $rootdir
+[Environment]::CurrentDirectory = $PWD
+
+# We use this for testing this script
+# The test script lives in test/build/test-configure.sh
+If ($Test) {
+ Write-Output @"
+"$Prefix" "$ExecPrefix" "$BinDir" "$LibExecDir" "$SysConfDir" "$DataRootDir" "$DataDir" "$LocalStateDir" "$RunStateDir" "$DocDir" "$LibDir" "$DatabaseDir" "$ViewIndexDir" "$LogDir" "$ManDir" "$InfoDir" "$HTMLDir" "$PDFDir"
+"@
+ exit 0
+}
+
+# Translate ./configure variables to CouchDB variables
+$PackageAuthorName="The Apache Software Foundation"
+$InstallDir="$LibDir\couchdb"
+$LogFile="$LogDir\couch.log"
+$BuildFauxton = [int](-not $DisableFauxton)
+$BuildDocs = [int](-not $DisableDocs)
+
+Write-Verbose "==> configuring couchdb in rel\couchdb.config"
+$CouchDBConfig = @"
+% Licensed under the Apache License, Version 2.0 (the "License"); you may not
+% use this file except in compliance with the License. You may obtain a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+% WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+% License for the specific language governing permissions and limitations under
+% the License.
+%
+% The contents of this file are auto-generated by configure
+%
+{package_author_name, "$PackageAuthorName"}.
+{prefix, "$InstallDir"}.
+{data_dir, "$DatabaseDir"}.
+{view_index_dir, "$ViewDir"}.
+{log_file, "$LogFile"}.
+{fauxton_root, "$DataRootDir/couchdb/www"}.
+{user, "$CouchDBUser"}.
+{node_name, "-name couchdb"}.
+{cluster_port, 5984}.
+{backend_port, 5986}.
+"@
+$CouchDBConfig | Out-File "$rootdir\rel\couchdb.config" -encoding ascii
+
+#TODO: Output MS NMake file format? Stick with GNU Make?
+$InstallMk = @"
+# Licensed under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License. You may obtain a copy of
+# the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations under
+# the License.
+#
+# The contents of this file are auto-generated by configure
+#
+package_author_name = $PackageAuthorName
+install_dir = $InstallDir
+
+bin_dir = $BinDir
+libexec_dir = $LibExecDir\couchdb
+doc_dir = $DocDir\couchdb
+sysconf_dir = $SysConfDir\couchdb
+data_dir = $DataDir\couchdb
+
+database_dir = $DatabaseDir
+view_index_dir = $ViewIndexDir
+log_file = $LogFile
+
+html_dir = $HTMLDir
+pdf_dir = $PDFDir
+man_dir = $ManDir
+info_dir = $InfoDir
+
+with_fauxton = $BuildFauxton
+with_docs = $BuildDocs
+
+user = $CouchDBUser
+"@
+$InstallMk | Out-File "$rootdir\install.mk" -encoding ascii
+
+$lowercurl = "$WithCurl".ToLower()
+$ConfigERL = @"
+{with_curl, $lowercurl}.
+"@
+$ConfigERL | Out-File "$rootdir\config.erl" -encoding ascii
+
+# only update dependencies, when we are not in a release tarball
+if ( (Test-Path .git -PathType Container) -and (-not $SkipDeps) ) {
+ Write-Verbose "==> updating dependencies"
+ rebar get-deps update-deps
+}
+
+Pop-Location
+[Environment]::CurrentDirectory = $PWD
[48/50] couchdb commit: updated refs/heads/developer-preview-2.0 to
2a31bca
Posted by kx...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/couchdb
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/8059f09d
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/8059f09d
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/8059f09d
Branch: refs/heads/developer-preview-2.0
Commit: 8059f09dc0fedfdd0821b860448b52cb23038e29
Parents: a0c771c 51b98a4
Author: Joan Touzet <wo...@apache.org>
Authored: Sat Jul 11 19:34:19 2015 -0400
Committer: Joan Touzet <wo...@apache.org>
Committed: Sat Jul 11 19:34:19 2015 -0400
----------------------------------------------------------------------
dev/run | 2 +-
rebar.config.script | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
[50/50] couchdb commit: updated refs/heads/developer-preview-2.0 to
2a31bca
Posted by kx...@apache.org.
Make sure we start `setup` application
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/2a31bca8
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/2a31bca8
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/2a31bca8
Branch: refs/heads/developer-preview-2.0
Commit: 2a31bca8980419fa9ffc936409e84097c268da08
Parents: ccf95f1
Author: ILYA Khlopotov <ii...@ca.ibm.com>
Authored: Fri Jul 17 10:04:12 2015 -0700
Committer: ILYA Khlopotov <ii...@ca.ibm.com>
Committed: Fri Jul 17 10:04:12 2015 -0700
----------------------------------------------------------------------
rel/reltool.config | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/2a31bca8/rel/reltool.config
----------------------------------------------------------------------
diff --git a/rel/reltool.config b/rel/reltool.config
index f246da9..a52d037 100644
--- a/rel/reltool.config
+++ b/rel/reltool.config
@@ -57,6 +57,7 @@
mochiweb,
oauth,
rexi,
+ setup,
snappy
]},
{rel, "start_clean", "", [kernel, stdlib]},
@@ -112,6 +113,7 @@
{app, mochiweb, [{incl_cond, include}]},
{app, oauth, [{incl_cond, include}]},
{app, rexi, [{incl_cond, include}]},
+ {app, setup, [{incl_cond, include}]},
{app, snappy, [{incl_cond, include}]}
]}.
[30/50] couchdb commit: updated refs/heads/developer-preview-2.0 to
2a31bca
Posted by kx...@apache.org.
fix paths in couchdb start script
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/8a2bf4ff
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/8a2bf4ff
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/8a2bf4ff
Branch: refs/heads/developer-preview-2.0
Commit: 8a2bf4ffdb0d8e4f13513394df55e527d2c8e44a
Parents: b6f22ab
Author: Jan Lehnardt <ja...@apache.org>
Authored: Wed Jun 24 16:25:32 2015 +0200
Committer: Jan Lehnardt <ja...@apache.org>
Committed: Wed Jun 24 23:07:46 2015 +0200
----------------------------------------------------------------------
rel/overlay/bin/couchdb | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/8a2bf4ff/rel/overlay/bin/couchdb
----------------------------------------------------------------------
diff --git a/rel/overlay/bin/couchdb b/rel/overlay/bin/couchdb
index b2dc76b..a98aa86 100755
--- a/rel/overlay/bin/couchdb
+++ b/rel/overlay/bin/couchdb
@@ -12,7 +12,8 @@
# License for the specific language governing permissions and limitations under
# the License.
-ERTS_BIN_DIR=$(cd ${0%/*} && pwd)
+$COUCHDB_BIN_DIR=$(cd ${0%/*} && pwd)
+ERTS_BIN_DIR=$COUCHDB_BIN_DIR/../lib/couchdb/
export ROOTDIR=${ERTS_BIN_DIR%/*}
[13/50] couchdb commit: updated refs/heads/developer-preview-2.0 to
2a31bca
Posted by kx...@apache.org.
fix `make clean`
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/1d70bd8d
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/1d70bd8d
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/1d70bd8d
Branch: refs/heads/developer-preview-2.0
Commit: 1d70bd8d45b008e4a4d68f8288aca953ba9bee92
Parents: 9cb9d7e
Author: Jan Lehnardt <ja...@apache.org>
Authored: Thu May 21 22:30:28 2015 +0200
Committer: Jan Lehnardt <ja...@apache.org>
Committed: Wed Jun 24 23:06:54 2015 +0200
----------------------------------------------------------------------
Makefile | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/1d70bd8d/Makefile
----------------------------------------------------------------------
diff --git a/Makefile b/Makefile
index 66dd0a8..f734e3e 100644
--- a/Makefile
+++ b/Makefile
@@ -35,9 +35,10 @@ clean:
@rm -rf src/*/.rebar
@rm -rf src/{jiffy,khash,snappy,b64url}/priv
@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 tmp/ dev/boot_node.beam dev/data dev/lib dev/pbkdf2.pyc log/crash.log dev/logs
+ @rm -f dev/boot_node.beam dev/pbkdf2.pyc log/crash.log
check: javascript eunit
[36/50] couchdb commit: updated refs/heads/developer-preview-2.0 to
2a31bca
Posted by kx...@apache.org.
make fauxton and docs build optional with --disable-docs and --disable-fauxton
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/9f033945
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/9f033945
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/9f033945
Branch: refs/heads/developer-preview-2.0
Commit: 9f033945cf37d56dab36092201f315d184489e44
Parents: d71b881
Author: Jan Lehnardt <ja...@apache.org>
Authored: Wed Jun 24 22:30:00 2015 +0200
Committer: Jan Lehnardt <ja...@apache.org>
Committed: Wed Jun 24 23:07:48 2015 +0200
----------------------------------------------------------------------
Makefile | 16 +++++++++++++---
configure | 20 ++++++++++++++++++++
2 files changed, 33 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/9f033945/Makefile
----------------------------------------------------------------------
diff --git a/Makefile b/Makefile
index 42f3e3b..5dea12c 100644
--- a/Makefile
+++ b/Makefile
@@ -18,7 +18,7 @@ COUCHDB_VERSION = $(vsn_major).$(vsn_minor).$(vsn_patch)$(COUCHDB_VERSION_SUFFIX
DESTDIR=
-all: couch fauxton
+all: couch fauxton docs
config.erl:
@echo "Apache CouchDB has not been configured."
@@ -60,8 +60,6 @@ release:
@$(MAKE) fauxton
@cp -r share/www apache-couchdb-$(COUCHDB_VERSION)/share/
-# build docs
- @cd src/docs; $(MAKE)
@mkdir -p apache-couchdb-$(COUCHDB_VERSION)/share/docs/html
@cp -r src/docs/build/html apache-couchdb-$(COUCHDB_VERSION)/share/docs/html
@mkdir -p apache-couchdb-$(COUCHDB_VERSION)/share/docs/pdf
@@ -172,8 +170,20 @@ javascript: all
@dev/run -q --with-admin-party-please test/javascript/run
@rm -rf share/www/script
+
+# 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
http://git-wip-us.apache.org/repos/asf/couchdb/blob/9f033945/configure
----------------------------------------------------------------------
diff --git a/configure b/configure
index 167a75e..3e1847a 100755
--- a/configure
+++ b/configure
@@ -17,6 +17,8 @@ basename=`basename $0`
TEST=0
WITH_CURL="false"
+WITH_FAUXTON=1
+WITH_DOCS=1
PREFIX=
DEFAULT_PREFIX=/usr/local
@@ -58,6 +60,9 @@ Options:
--viewindexdir DIRECTORY specify the view directory (defaults to /var/lib/couchdb)
--logdir DIRECTORY specify the log file (defaults to /var/log/couchdb.log)
-c | --with-curl request that couchjs is linked to cURL (default false)
+ --disable-fauxton do not build Fauxton
+ --disable-docs do not build any documentation or manpages
+
Installation directories:
--prefix=PREFIX install architecture-independent files in PREFIX
@@ -103,6 +108,18 @@ parse_opts() {
continue
;;
+ --disable-fauxton)
+ WITH_FAUXTON=0
+ shift
+ continue
+ ;;
+
+ --disable-docs)
+ WITH_DOCS=0
+ shift
+ continue
+ ;;
+
--user|-u)
if [ -n "$2" ]; then
eval COUCHDB_USER=$2
@@ -594,6 +611,9 @@ pdf_dir = $PDFDIR
man_dir = $MANDIR
info_dir = $INFODIR
+with_fauxton = $WITH_FAUXTON
+with_docs = $WITH_DOCS
+
user = $COUCHDB_USER
EOF
[06/50] couchdb commit: updated refs/heads/developer-preview-2.0 to
2a31bca
Posted by kx...@apache.org.
add patch version if we build from git
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/f8031748
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/f8031748
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/f8031748
Branch: refs/heads/developer-preview-2.0
Commit: f80317483b27fcdacc6a022d228b309ee1781b5e
Parents: cb53da8
Author: Jan Lehnardt <ja...@apache.org>
Authored: Sun Apr 5 10:38:58 2015 +0200
Committer: Jan Lehnardt <ja...@apache.org>
Committed: Wed Jun 24 23:06:47 2015 +0200
----------------------------------------------------------------------
Makefile | 10 ++++++----
build-aux/couchdb-build-release.sh | 2 +-
2 files changed, 7 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/f8031748/Makefile
----------------------------------------------------------------------
diff --git a/Makefile b/Makefile
index 41dd9a6..cf048f1 100644
--- a/Makefile
+++ b/Makefile
@@ -13,6 +13,8 @@
include version.mk
IN_RELEASE = $(shell if [ ! -d .git ]; then echo true; fi)
+COUCHDB_VERSION_SUFFIX = $(shell if [ -d .git ]; then echo '-`git rev-parse --short --verify HEAD`'; fi)
+COUCHDB_VERSION = $(vsn_major).$(vsn_minor).$(vsn_patch)$(COUCHDB_VERSION_SUFFIX)
all: couch fauxton
@@ -47,20 +49,20 @@ dist: all
# creates a source tarball
release:
- ./build-aux/couchdb-build-release.sh $(vsn_major).$(vsn_minor).$(vsn_patch)
+ ./build-aux/couchdb-build-release.sh $(COUCHDB_VERSION)
# build fauxton
$(MAKE) fauxton
cp -r share/www apache-couchdb/share/
# build docs
- cd src/docs; make
+ cd src/docs; $(MAKE)
mkdir apache-couchdb/share/docs
cp -r src/docs/build/html apache-couchdb/share/docs/html
# Tar!
- tar czf apache-couchdb.tar.gz apache-couchdb
- echo "Done: apache-couchdb.tar.gz"
+ tar czf apache-couchdb-$(COUCHDB_VERSION).tar.gz apache-couchdb
+ echo "Done: apache-couchdb-$(COUCHDB_VERSION).tar.gz"
distclean: clean
@rm install.mk
http://git-wip-us.apache.org/repos/asf/couchdb/blob/f8031748/build-aux/couchdb-build-release.sh
----------------------------------------------------------------------
diff --git a/build-aux/couchdb-build-release.sh b/build-aux/couchdb-build-release.sh
index 557c2b8..a0cae08 100755
--- a/build-aux/couchdb-build-release.sh
+++ b/build-aux/couchdb-build-release.sh
@@ -9,7 +9,7 @@ fi
echo "Building Apache CouchDB $VERSION"
-RELDIR=apache-couchdb
+RELDIR=apache-couchdb-$VERSION
# make release dir
rm -rf $RELDIR
mkdir $RELDIR