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/12/28 21:16:59 UTC
[1/3] couchdb commit: updated refs/heads/master to 3de6a3f
Repository: couchdb
Updated Branches:
refs/heads/master b1309602f -> 3de6a3f1a
Fix {vsn, git} replace on BSD systems during make dist
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/3de6a3f1
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/3de6a3f1
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/3de6a3f1
Branch: refs/heads/master
Commit: 3de6a3f1aeefccd7135966206b4666cdcdce053d
Parents: 961b5f7
Author: Alexander Shorin <kx...@apache.org>
Authored: Mon Dec 28 23:09:36 2015 +0300
Committer: Alexander Shorin <kx...@apache.org>
Committed: Mon Dec 28 23:16:39 2015 +0300
----------------------------------------------------------------------
build-aux/couchdb-build-release.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/3de6a3f1/build-aux/couchdb-build-release.sh
----------------------------------------------------------------------
diff --git a/build-aux/couchdb-build-release.sh b/build-aux/couchdb-build-release.sh
index d169d2e..14c0d9a 100755
--- a/build-aux/couchdb-build-release.sh
+++ b/build-aux/couchdb-build-release.sh
@@ -27,7 +27,7 @@ for repo in *; do
git_ish=`git rev-parse --short HEAD`
git archive $git_ish | tar -xC ../../$RELDIR/src/$repo/ -f -
set +e
- grep -rl '{vsn, git}' ../../$RELDIR/src/$repo/ | xargs sed -i "s/{vsn, git}/{vsn, \"`git describe --always --tags`\"}/" 2> /dev/null
+ grep -rl '{vsn, git}' ../../$RELDIR/src/$repo/ | xargs sed -ie "s/{vsn, git}/{vsn, \"`git describe --always --tags`\"}/" 2> /dev/null
set -e
cd ..
done
[2/3] couchdb commit: updated refs/heads/master to 3de6a3f
Posted by kx...@apache.org.
Fix tar'ing on FreeBSD
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/961b5f79
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/961b5f79
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/961b5f79
Branch: refs/heads/master
Commit: 961b5f796437324a90f041a463950242d531e79c
Parents: e40083e
Author: Alexander Shorin <kx...@apache.org>
Authored: Mon Dec 28 23:07:23 2015 +0300
Committer: Alexander Shorin <kx...@apache.org>
Committed: Mon Dec 28 23:16:39 2015 +0300
----------------------------------------------------------------------
build-aux/couchdb-build-release.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/961b5f79/build-aux/couchdb-build-release.sh
----------------------------------------------------------------------
diff --git a/build-aux/couchdb-build-release.sh b/build-aux/couchdb-build-release.sh
index 47c3926..d169d2e 100755
--- a/build-aux/couchdb-build-release.sh
+++ b/build-aux/couchdb-build-release.sh
@@ -17,7 +17,7 @@ mkdir $RELDIR
CURRENT_BRANCH=`git rev-parse --abbrev-ref HEAD`
# copy sources over
-git archive $CURRENT_BRANCH | tar -xC $RELDIR/
+git archive $CURRENT_BRANCH | tar -xC $RELDIR/ -f -
mkdir $RELDIR/src
cd src/
@@ -25,7 +25,7 @@ for repo in *; do
cd $repo
mkdir ../../$RELDIR/src/$repo
git_ish=`git rev-parse --short HEAD`
- git archive $git_ish | tar -xC ../../$RELDIR/src/$repo/
+ git archive $git_ish | tar -xC ../../$RELDIR/src/$repo/ -f -
set +e
grep -rl '{vsn, git}' ../../$RELDIR/src/$repo/ | xargs sed -i "s/{vsn, git}/{vsn, \"`git describe --always --tags`\"}/" 2> /dev/null
set -e
[3/3] couchdb commit: updated refs/heads/master to 3de6a3f
Posted by kx...@apache.org.
Revert "fix: allow builds from release tarballs. rebar is being naughty"
This reverts commit 1c1cc8f20988a275d25b9a0232fefcdd3268f84f.
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/e40083ef
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/e40083ef
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/e40083ef
Branch: refs/heads/master
Commit: e40083ef3ddae156d90718cfc59bb608728d4c72
Parents: b130960
Author: Alexander Shorin <kx...@apache.org>
Authored: Mon Dec 28 23:02:39 2015 +0300
Committer: Alexander Shorin <kx...@apache.org>
Committed: Mon Dec 28 23:16:39 2015 +0300
----------------------------------------------------------------------
configure | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/e40083ef/configure
----------------------------------------------------------------------
diff --git a/configure b/configure
index 47dcdb4..2e246b0 100755
--- a/configure
+++ b/configure
@@ -652,7 +652,7 @@ EOF
install_local_rebar() {
if [ ! -x "${rootdir}/bin/rebar" ]; then
if [ ! -d "${rootdir}/src/rebar" ]; then
- git clone --depth 1 --branch hack/2.0 https://git-wip-us.apache.org/repos/asf/couchdb-rebar.git ${rootdir}/src/rebar
+ git clone --depth 1 --branch 2.6.0 https://git-wip-us.apache.org/repos/asf/couchdb-rebar.git ${rootdir}/src/rebar
fi
make -C ${rootdir}/src/rebar
mv ${rootdir}/src/rebar/rebar ${rootdir}/bin/rebar