Updated Branches:
  refs/heads/master 88666ad43 -> b21deabaf

Make targets for creating releases+release candidates

What this does
==============

* remove the check for .svn: No longer necessary since we moved to git.

* for the `release` target we simply reuse asf-dist-sign, and
additionally create a signed tag of the same name.

* for the `rel-candidate` target, we add a variable `RC` to Makefile.am
with default value of 0. This can be overriden from outside by calling

    make release-candidate RC=14

NOTE: tags are created with `-f`. If a tag of the same name existed on
your system, it will be overwritten. This is considered a feature.

What this does *not* do
=======================

We are not pushing any tags upstream, or uploading any tarballs
anywhere. This is in the responsibility of the Release Manager.

Likewise, we do *not* bump the version in configure.ac


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

Branch: refs/heads/master
Commit: b21deabafe6b1eb539bcb530132b3fb0339ae563
Parents: 88666ad
Author: Igor Galić <[email protected]>
Authored: Thu Nov 14 08:28:15 2013 +0100
Committer: Igor Galić <[email protected]>
Committed: Thu Nov 14 09:42:08 2013 +0100

----------------------------------------------------------------------
 Makefile.am | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/b21deaba/Makefile.am
----------------------------------------------------------------------
diff --git a/Makefile.am b/Makefile.am
index 9312d4a..c92cdf7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -40,6 +40,9 @@ DISTCHECK_CONFIGURE_FLAGS=--with-user=${DIST_BUILD_USER} 
--with-group=${DIST_BUI
 
 EXTRA_DIST=CHANGES INSTALL STATUS NOTICE LAYOUT LICENSE example contrib 
README-EC2 REVIEWERS
 
+# Default value when creating release candidates
+RC = 0
+
 # igalic can't remember if this is make check or make test and neither should 
you.
 test: check
 
@@ -54,7 +57,7 @@ doxygen:
 
 asf-distdir:
        @$(am__remove_distdir)
-       test -d .git && git clone . $(distdir) || svn export . $(distdir)
+       test -d .git && git clone . $(distdir)
        cd $(distdir) && autoreconf -i
        rm -rf -- $(distdir)/autom4te.cache $(distdir)/.git 
$(distdir)/.gitignore $(distdir)/ci
 
@@ -67,6 +70,13 @@ asf-dist-sign: asf-dist
        sha1sum -b $(distdir).tar.bz2 >$(distdir).tar.bz2.sha1
        gpg --armor --output $(distdir).tar.bz2.asc  --detach-sig 
$(distdir).tar.bz2
 
+release: asf-dist-sign
+       git tag -fs -m "Release $(VERSION)" $(VERSION)
+
+rel-candidate:
+       $(MAKE) asf-dist-sign VERSION=$(VERSION)-rc$(RC)
+       git tag -fs -m "Release Candidate $(VERSION)-rc$(RC)" $(VERSION)-rc$(RC)
+
 examples: all
        @cd example && $(MAKE) $(AM_MAKEFLAGS)
 
@@ -88,6 +98,8 @@ help:
        echo 'examples         make examples' && \
        echo 'asf-dist         recreate source package' && \
        echo 'asf-dist-sign    recreate source package, with checksums and 
signature' && \
+       echo 'release          recreate a signed release source package and a 
signed git tag' && \
+       echo 'rel-candidate    recreate a signed relelease candidate source 
package and a signed git tag' && \
        echo 'distcheck        verify dist by performing VPATH build and then 
distclean' && \
        echo 'rat              produce a RAT licence compliance report of the 
source' && \
        echo 'doxygen          generate doxygen docs in doc/html dir' && \

Reply via email to