couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kxe...@apache.org
Subject [22/46] couchdb commit: updated refs/heads/master to 6f41698
Date Wed, 28 Jan 2015 15:52:09 GMT
Add Fauxton build process to Makefile

`make` alone now builds Fauxton along with the rest.

`make fauxton` to only do the fauxton build.

`make distclean` cleans the Fauxton build.

Fauxton is deployed into share/www. `make distclean` simply removes
share/www.

If share/www exists, `make [fauxton]` skips building Fauxton.

Includes a letter for Noah ;)


Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/8e2a6b42
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/8e2a6b42
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/8e2a6b42

Branch: refs/heads/master
Commit: 8e2a6b42661f473674f7ed731868d109f4d0495a
Parents: 4b24def
Author: Jan Lehnardt <jan@apache.org>
Authored: Fri Oct 10 21:08:11 2014 +0200
Committer: Jan Lehnardt <jan@apache.org>
Committed: Fri Nov 14 18:22:31 2014 +0100

----------------------------------------------------------------------
 Makefile | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb/blob/8e2a6b42/Makefile
----------------------------------------------------------------------
diff --git a/Makefile b/Makefile
index e881f61..83cad0b 100644
--- a/Makefile
+++ b/Makefile
@@ -18,7 +18,7 @@ config.erl:
 	@echo
 	@false
 
-compile: config.erl
+compile: config.erl fauxton
 	@rebar compile
 	@cp src/couch/priv/couchjs bin/
 
@@ -34,6 +34,7 @@ dist: compile
 
 distclean: clean
 	@rm -rf rel/couchdb
+	@rm -rf share/www
 
 devclean:
 	@rm -rf dev/lib/*/data
@@ -69,3 +70,7 @@ eunit: compile
 
 javascript: compile
 	@dev/run test/javascript/run
+
+fauxton:
+# This next line so Noah throws his arms up in dispair and teaches me proper Make again --
Love, Jan
+	@if [ ! -d share/www ]; then echo "Building Fauxton" &&  cd src/fauxton &&
npm install && grunt couchdb; fi


Mime
View raw message