diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-01-04 11:19:03 +0000 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-01-04 12:15:20 +0000 |
| commit | a1461906f40342ff7c908db50cc06956d621213c (patch) | |
| tree | 30acdf43ad22e0fb3c26cdd29a603271bfbbdcd1 | |
| parent | c66a97155085dfd6229452daf1cf0609d929e6ad (diff) | |
tools/telepathy.am: update from telepathy-glib master
This adds support for out-of-tree releases, and parallel-built releases.
| -rw-r--r-- | tools/telepathy.am | 23 |
1 files changed, 17 insertions, 6 deletions
diff --git a/tools/telepathy.am b/tools/telepathy.am index d080afe7..20ff0be1 100644 --- a/tools/telepathy.am +++ b/tools/telepathy.am @@ -3,7 +3,7 @@ dist-hook: chmod u+w ${distdir}/ChangeLog if test -d ${top_srcdir}/.git; then \ - git log --date=iso $(CHANGELOG_RANGE) > ${distdir}/ChangeLog; \ + ( cd ${top_srcdir} && git log --date=iso $(CHANGELOG_RANGE) ) > ${distdir}/ChangeLog; \ fi distcheck-hook: @@ -26,11 +26,13 @@ _is-release-check: exit 2; \ ;; \ esac - @if ! git diff --no-ext-diff --quiet --exit-code; then \ + @cd ${top_srcdir} && \ + if ! git diff --no-ext-diff --quiet --exit-code; then \ echo "Hey! Your tree is dirty! No release for you." >&2; \ exit 2; \ fi - @if ! git diff --cached --no-ext-diff --quiet --exit-code; then \ + @cd ${top_srcdir} && \ + if ! git diff --cached --no-ext-diff --quiet --exit-code; then \ echo "Hey! You have changes staged! No release for you." >&2; \ exit 2; \ fi @@ -43,9 +45,16 @@ endif %.tar.gz.asc: %.tar.gz $(AM_V_GEN)gpg --detach-sign --armor $@ -@PACKAGE@-@VERSION@.tar.gz: _is-release-check check distcheck +@PACKAGE@-@VERSION@.tar.gz: + $(MAKE) _is-release-check + $(MAKE) check + $(MAKE) distcheck -maintainer-prepare-release: _is-release-check all distcheck release-mail +maintainer-prepare-release: + $(MAKE) _is-release-check + $(MAKE) all + $(MAKE) distcheck + $(MAKE) release-mail git tag -s @PACKAGE@-@VERSION@ -m @PACKAGE@' '@VERSION@ gpg --detach-sign --armor @PACKAGE@-@VERSION@.tar.gz @@ -65,7 +74,9 @@ _maintainer-upload-release: _maintainer-upload-release-check rsync -vzP @PACKAGE@-@VERSION@.tar.gz telepathy.freedesktop.org:/srv/telepathy.freedesktop.org/www/releases/@PACKAGE@/@PACKAGE@-@VERSION@.tar.gz rsync -vzP @PACKAGE@-@VERSION@.tar.gz.asc telepathy.freedesktop.org:/srv/telepathy.freedesktop.org/www/releases/@PACKAGE@/@PACKAGE@-@VERSION@.tar.gz.asc -maintainer-make-release: maintainer-prepare-release maintainer-upload-release +maintainer-make-release: + $(MAKE) maintainer-prepare-release + $(MAKE) maintainer-upload-release @echo "Now:" @echo " • bump the nano-version;" @echo " • push the branch and tags upstream; and" |