couchdb commit: updated refs/heads/master to 9d579fa

[kx...@apache.org]

Repository: couchdb
Updated Branches:
  refs/heads/master e710130b3 -> 9d579fa5a


Replace git VSN on build release with commit hash

This is what rebar will try to do on make for generated tarball, but
it will because missed .git directories around.


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

Branch: refs/heads/master
Commit: 9d579fa5a0a6341a45647c4e5906a4760da6cce6
Parents: e710130
Author: Alexander Shorin <kx...@apache.org>
Authored: Wed Oct 7 18:47:16 2015 +0300
Committer: Alexander Shorin <kx...@apache.org>
Committed: Wed Oct 7 20:28:48 2015 +0300

----------------------------------------------------------------------
 build-aux/couchdb-build-release.sh | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb/blob/9d579fa5/build-aux/couchdb-build-release.sh
----------------------------------------------------------------------
diff --git a/build-aux/couchdb-build-release.sh b/build-aux/couchdb-build-release.sh
index 26c754b..5feeb1a 100755
--- a/build-aux/couchdb-build-release.sh
+++ b/build-aux/couchdb-build-release.sh
@@ -26,15 +26,14 @@ for repo in *; do
   mkdir ../../$RELDIR/src/$repo
   git_ish=`git rev-parse --short HEAD`
   git archive $git_ish | tar -xC ../../$RELDIR/src/$repo/
+  set +e
+  grep -rl '{vsn, git}' ../../$RELDIR/src/$repo/ | xargs sed -i "s/{vsn, git}/{vsn, \"`git describe --always --tags`\"}/" > /dev/null
+  set -e
   cd ..
 done
 
 cd ..
 
-# update version
-# actual version detection TBD
-perl -pi -e "s/\{vsn, git\}/\{vsn, \"$VERSION\"\}/" $RELDIR/src/*/src/*.app.src
-
 # create CONTRIBUTORS file
 if test -e .git; then
     OS=`uname -s`