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