diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-08-07 17:10:28 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-09-10 12:27:52 +0100 |
| commit | 0ac48f0ae588dd508ba60c01430a44124ce4dc6c (patch) | |
| tree | 82ffd2401cb82d4be07aaa169bda59953a98e857 | |
| parent | 47ec8244fcf304d961e065d534f4c0fd8fb48db2 (diff) | |
Update telepathy.am from Gabble 0.18.1 to fix out-of-tree and parallel releases
I left out the bit that checked that gtk-doc was enabled, because we
don't have gtk-doc in Rakia.
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=67872
Reviewed-by: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
[commit message amended to what I said on the bug -smcv]
Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
| -rw-r--r-- | tools/telepathy.am | 25 |
1 files changed, 20 insertions, 5 deletions
diff --git a/tools/telepathy.am b/tools/telepathy.am index 45baa77..2b6c430 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,17 +26,30 @@ _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 + @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 %.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 check 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 @@ -56,7 +69,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" |