announcement: can be generated from development snapshots as well
authorStefano Lattarini <stefano.lattarini@gmail.com>
Thu, 30 May 2013 13:16:44 +0000 (15:16 +0200)
committerStefano Lattarini <stefano.lattarini@gmail.com>
Thu, 30 May 2013 13:16:44 +0000 (15:16 +0200)
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>
maint.mk

index cfbfb10..edf05bb 100644 (file)
--- 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 \