Updated Branches: refs/heads/1994-merge-rcouch cee9e5b27 -> 78c1a3f9f
build rebar using the Makefile Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/439f54cd Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/439f54cd Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/439f54cd Branch: refs/heads/1994-merge-rcouch Commit: 439f54cd4c891d70c9c76622fb48840fe0b375a5 Parents: cee9e5b Author: Benoit Chesneau <[email protected]> Authored: Thu Jan 9 08:27:07 2014 +0100 Committer: Benoit Chesneau <[email protected]> Committed: Thu Jan 9 08:27:07 2014 +0100 ---------------------------------------------------------------------- Makefile | 20 +++++++++++++++++--- bootstrap | 14 -------------- pkg.vars.config | 2 +- 3 files changed, 18 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb/blob/439f54cd/Makefile ---------------------------------------------------------------------- diff --git a/Makefile b/Makefile index 01858cd..2bfc2ac 100644 --- a/Makefile +++ b/Makefile @@ -1,11 +1,14 @@ BASE_DIR = $(shell pwd) ERLANG_BIN = $(shell dirname $(shell which erl)) +ESCRIPT = $(shell which escript) GIT_BIN = $(shell dirname $(shell which git)) REBAR ?= $(BASE_DIR)/rebar OVERLAY_VARS ?= $(if $(ERLANG_BIN),,$(warning "Warning: No Erlang found in your path, this will probably not work")) +$(if $(ESCRIPT),,$(warning "Warning: No escript found in your path, this will probably not work")) + $(if $(GIT_BIN),,$(warning "Warning: No Git found in your path, this will probably not work")) @@ -23,7 +26,7 @@ ifeq ($(icu), static) endif export USE_STATIC_ICU -all: deps compile +all: rebar deps compile compile: @./rebar compile @@ -31,7 +34,7 @@ compile: deps: @./rebar get-deps -clean: +clean: rebarclean @./rebar clean distclean: clean relclean @@ -44,5 +47,16 @@ rel: deps compile generate relclean: @rm -rf rel/apache-couchdb -doc: +rebar: + @(test ! -e $(BASE_DIR)/src/support/rebar/rebar && \ + echo "==> build rebar" && \ + cd $(BASE_DIR)/src/support/rebar && \ + $(ESCRIPT) bootstrap) + + cp $(BASE_DIR)/src/support/rebar/rebar $(BASE_DIR)/rebar + +rebarclean: + @(cd $(BASE_DIR)/support/rebar/rebar && \ + rm -rf rebar ebin/*.beam inttest/rt.work rt.work .test) +.PHONY: rebar http://git-wip-us.apache.org/repos/asf/couchdb/blob/439f54cd/bootstrap ---------------------------------------------------------------------- diff --git a/bootstrap b/bootstrap index 38db553..0196715 100755 --- a/bootstrap +++ b/bootstrap @@ -64,20 +64,6 @@ if test -z "$REVISION"; then fi sed "s/%revision%/$REVISION/" < pkg.vars.config.in > pkg.vars.config -# build rebar -export SUPPORT_DIR=$CURRENT/src/support -ESCRIPT=`find_program escript` -ERLC=`find_program erlc` - -cd $SUPPORT_DIR/rebar && ${ESCRIPT} bootstrap 1>/dev/null || true - -if test ! -e $SUPPORT_DIR/rebar/rebar; then - echo "Error when building rebar" - exit 1 -fi - -cp $SUPPORT_DIR/rebar/rebar $CURRENT/rebar - cat << EOF You have bootstrapped Apache CouchDB, time to relax. http://git-wip-us.apache.org/repos/asf/couchdb/blob/439f54cd/pkg.vars.config ---------------------------------------------------------------------- diff --git a/pkg.vars.config b/pkg.vars.config index ad2c999..29b312f 100644 --- a/pkg.vars.config +++ b/pkg.vars.config @@ -48,5 +48,5 @@ {version_minor, 0}. {version_revision, 0}. {version_stage, "+build"}. -{version_release, ".e84d2b3"}. +{version_release, ".cee9e5b"}. {couchjs_name, "couchjs"}.
