Updated Branches: refs/heads/master b8f0e8bd7 -> c0e771683
Switch to proper SemVer for builds, add acinclude checks, and remove distsign target Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/c0e77168 Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/c0e77168 Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/c0e77168 Branch: refs/heads/master Commit: c0e77168380fa4c46cdbbb1df87b22924d972bb1 Parents: b8f0e8b Author: Noah Slater <[email protected]> Authored: Sun Mar 3 20:40:43 2013 +0000 Committer: Noah Slater <[email protected]> Committed: Sun Mar 3 20:40:43 2013 +0000 ---------------------------------------------------------------------- Makefile.am | 17 +++++------------ acinclude.m4.in | 4 ++-- bootstrap | 8 ++++---- 3 files changed, 11 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb/blob/c0e77168/Makefile.am ---------------------------------------------------------------------- diff --git a/Makefile.am b/Makefile.am index 81e10ee..3beca4c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -158,16 +158,9 @@ distcheck-hook: $(MAKE) -C bin distcheck-hook $(MAKE) -C src/couchdb/priv distcheck-hook $(MAKE) -C share/doc/build distcheck-hook + grep "not released" NEWS CHANGES; test "$$?" -eq 1 + grep "build" acinclude.m4.in; test "$$?" -eq 1 + grep "%revision%" acinclude.m4.in; test "$$?" -eq 1 grep -rL 'http://www.apache.org/licenses/LICENSE-2.0' * \ - | grep --include= -vEf license.skip; \ - test "$$?" -eq 1 - -.PHONY: distsign -distsign: distcheck check - gpg --armor --detach-sig $(GPG_ARGS) \ - < $(top_srcdir)/$(distdir).tar.gz \ - > $(top_srcdir)/$(distdir).tar.gz.asc - md5sum $(top_srcdir)/$(distdir).tar.gz \ - > $(top_srcdir)/$(distdir).tar.gz.md5 - sha1sum $(top_srcdir)/$(distdir).tar.gz \ - > $(top_srcdir)/$(distdir).tar.gz.sha + | grep --include= -vEf license.skip; \ + test "$$?" -eq 1 http://git-wip-us.apache.org/repos/asf/couchdb/blob/c0e77168/acinclude.m4.in ---------------------------------------------------------------------- diff --git a/acinclude.m4.in b/acinclude.m4.in index ffdce68..6423cfc 100644 --- a/acinclude.m4.in +++ b/acinclude.m4.in @@ -19,8 +19,8 @@ m4_define([LOCAL_BUG_URI], [https://issues.apache.org/jira/browse/COUCHDB]) m4_define([LOCAL_VERSION_MAJOR], [1]) m4_define([LOCAL_VERSION_MINOR], [4]) m4_define([LOCAL_VERSION_REVISION], [0]) -m4_define([LOCAL_VERSION_STAGE], [a]) -m4_define([LOCAL_VERSION_RELEASE], [-%release%]) +m4_define([LOCAL_VERSION_STAGE], [+build]) +m4_define([LOCAL_VERSION_RELEASE], [.%revision%]) m4_define([LOCAL_VERSION_PRIMARY], [LOCAL_VERSION_MAJOR.LOCAL_VERSION_MINOR.LOCAL_VERSION_REVISION]) m4_define([LOCAL_VERSION_SECONDARY], http://git-wip-us.apache.org/repos/asf/couchdb/blob/c0e77168/bootstrap ---------------------------------------------------------------------- diff --git a/bootstrap b/bootstrap index 021275b..f388dda 100755 --- a/bootstrap +++ b/bootstrap @@ -33,14 +33,14 @@ get () { if test -z "$REVISION"; then if test -e .git; then - REVISION=`git describe --always`-git + REVISION=`git describe --always` fi fi if test -z "`get LOCAL_VERSION_STAGE`" -o -z "$REVISION"; then - sed "s/%release%//" < acinclude.m4.in > acinclude.m4 + sed "s/%revision%//" < acinclude.m4.in > acinclude.m4 else - sed "s/%release%/$REVISION/" < acinclude.m4.in > acinclude.m4 + sed "s/%revision%/$REVISION/" < acinclude.m4.in > acinclude.m4 fi if test -e .git; then @@ -148,4 +148,4 @@ cat << EOF You have bootstrapped Apache CouchDB, time to relax. Run \`./configure' to configure the source before you install. -EOF \ No newline at end of file +EOF
