[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH] maint.mk, announce-gen: allow project-specific announcement mail
From: |
Jim Meyering |
Subject: |
[PATCH] maint.mk, announce-gen: allow project-specific announcement mail headers |
Date: |
Mon, 03 May 2010 22:00:10 +0200 |
FYI,
This helps factor some bits out of README-release,
and thus helps reduce the number of manual steps required
to make a release.
I'm about to commit a related patch for coreutils.
>From 8c2ede4827e6294ed53a4017d5e8fb5d853ac1b3 Mon Sep 17 00:00:00 2001
From: Jim Meyering <address@hidden>
Date: Mon, 3 May 2010 21:58:13 +0200
Subject: [PATCH] maint.mk, announce-gen: allow project-specific announcement
mail headers
* top/maint.mk (translation_project_): Define default.
(announcement_Cc_, announcement_mail_headers_): Likewise.
(announcement): Invoke announce-gen with new --mail-headers option.
* build-aux/announce-gen: New option: --mail-headers=HEADERS.
---
ChangeLog | 6 ++++++
build-aux/announce-gen | 15 +++++++++++++--
top/maint.mk | 8 ++++++++
3 files changed, 27 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 0ec11b9..31df129 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2010-05-03 Jim Meyering <address@hidden>
+ maint.mk, announce-gen: allow project-specific announcement mail headers
+ * top/maint.mk (translation_project_): Define default.
+ (announcement_Cc_, announcement_mail_headers_): Likewise.
+ (announcement): Invoke announce-gen with new --mail-headers option.
+ * build-aux/announce-gen: New option: --mail-headers=HEADERS.
+
test-xalloc-die: avoid unwarranted test failure on OpenSolaris 5.11
* tests/test-xalloc-die.sh: Redirect stdout before stderr, (i.e.,
"> out 2> err", rather than "2> err > out"). Otherwise, with /bin/sh
diff --git a/build-aux/announce-gen b/build-aux/announce-gen
index 7d70fd4..bca1407 100755
--- a/build-aux/announce-gen
+++ b/build-aux/announce-gen
@@ -3,7 +3,7 @@ eval '(exit $?0)' && eval 'exec perl -wS "$0" ${1+"$@"}'
if 0;
# Generate a release announcement message.
-my $VERSION = '2009-11-20 13:36'; # UTC
+my $VERSION = '2010-05-03 19:35'; # UTC
# The definition above must lie within the first 8 lines in order
# for the Emacs time-stamp write hook (at end) to update it.
# If you change this file with Emacs, please let the write hook
@@ -75,6 +75,8 @@ The following are optional:
required if gnulib is in TOOL_LIST.
--no-print-checksums do not emit MD5 or SHA1 checksums
--archive-suffix=SUF add SUF to the list of archive suffixes
+ --mail-headers=HEADERS a space-separated list of mail headers, e.g.,
+ To: address@hidden Cc: address@hidden,...
--help display this help and exit
--version output version information and exit
@@ -346,6 +348,7 @@ sub get_tool_versions ($$)
# issue "1,2" instead of "1.2", what confuses our regexps.
$ENV{LC_ALL} = "C";
+ my $mail_headers;
my $release_type;
my $package_name;
my $prev_version;
@@ -359,6 +362,7 @@ sub get_tool_versions ($$)
GetOptions
(
+ 'mail-headers=s' => \$mail_headers,
'release-type=s' => \$release_type,
'package-name=s' => \$package_name,
'previous-version=s' => \$prev_version,
@@ -422,11 +426,18 @@ sub get_tool_versions ($$)
%size
or exit 1;
+ my $headers = '';
+ if (defined $mail_headers)
+ {
+ ($headers = $mail_headers) =~ s/\s+(\S+:)/\n$1/g;
+ $headers .= "\n";
+ }
+
# The markup is escaped as <\# so that when this script is sent by
# mail (or part of a diff), Gnus is not triggered.
print <<EOF;
-Subject: $my_distdir released [$release_type]
+${headers}Subject: $my_distdir released [$release_type]
<\#secure method=pgpmime mode=sign>
diff --git a/top/maint.mk b/top/maint.mk
index 9bca202..d105e95 100644
--- a/top/maint.mk
+++ b/top/maint.mk
@@ -992,8 +992,16 @@ gpg_key_ID ?= \
&& gpgv .ann-sig - < /dev/null 2>&1 \
| sed -n '/.*key ID \([0-9A-F]*\)/s//\1/p'; rm -f .ann-sig)
+translation_project_ ?= address@hidden
+announcement_Cc_ ?= $(translation_project_), $(PACKAGE_BUGREPORT)
+announcement_mail_headers_ ?= \
+To: address@hidden \
+Cc: $(announcement_Cc_)
\
+Mail-Followup-To: $(PACKAGE_BUGREPORT)
+
announcement: NEWS ChangeLog $(rel-files)
@$(build_aux)/announce-gen \
+ --mail-headers='$(announcement_mail_headers_)' \
--release-type=$(RELEASE_TYPE) \
--package=$(PACKAGE) \
--prev=$(PREV_VERSION) \
--
1.7.1.335.g6845a
- [PATCH] maint.mk, announce-gen: allow project-specific announcement mail headers,
Jim Meyering <=