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:53 UTC
[36/50] couchdb commit: updated refs/heads/developer-preview-2.0 to
2a31bca
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