summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefano Lattarini <stefano.lattarini@gmail.com>2013-05-30 15:16:44 +0200
committerStefano Lattarini <stefano.lattarini@gmail.com>2013-05-30 15:16:44 +0200
commit8d579d6a852e177e1e8d11c7c0935307c25de7d9 (patch)
tree5cba95a7b45f924cdc94dd2f1f11cc7c55092551
parent765f951dac933a5e190c9e1ed5bd4e99f1936360 (diff)
downloadautomake-8d579d6a852e177e1e8d11c7c0935307c25de7d9.tar.gz
announcement: can be generated from development snapshots as well
And not only from checkouts corresponding exactly from a beta or stable release. That was only getting in the way of proper testing for the 'announcement' recipe. * maint.mk (determine_release_type): If the make variable DEVEL_SNAPSHOT is set, do not error out if the current version denotes a development snapshot (e.g., "1.13.2c" or "1.99a"). (announcement): Relax, by also accepting to run from development snapshots, not only stable or beta releases. Do so by defining the target-specific variable DEVEL_SNAPSHOT to "yes". Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
-rw-r--r--maint.mk10
1 files changed, 9 insertions, 1 deletions
diff --git a/maint.mk b/maint.mk
index cfbfb10f4..edf05bb9d 100644
--- a/maint.mk
+++ b/maint.mk
@@ -139,7 +139,14 @@ determine_release_type = \
dest=alpha; \
else \
echo "$@: invalid version '$(VERSION)' for a release" >&2; \
- exit 1; \
+ if test -n '$(strip $(DEVEL_SNAPSHOT))'; then \
+ echo "$@: continuing anyway since DEVEL_SNAPSHOT is set" >&2; \
+ release_type='Development snapshot'; \
+ announcement_type='development snapshot'; \
+ dest=alpha; \
+ else \
+ exit 1; \
+ fi; \
fi
# Help the debugging of $(determine_release_type) and related code.
@@ -262,6 +269,7 @@ compare-autodiffs: autodiffs
PACKAGE_MAILINGLIST = automake@gnu.org
+announcement: DEVEL_SNAPSHOT = yes
announcement: NEWS
$(AM_V_GEN): \
&& rm -f $@ $@-t \