Mercurial > hg > octave-kai > gnulib-hg
changeset 13306:3b72fc82a799
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.
author | Jim Meyering <meyering@redhat.com> |
---|---|
date | Mon, 03 May 2010 21:58:13 +0200 |
parents | 534ed67c4f08 |
children | 67bccb71cc24 |
files | ChangeLog build-aux/announce-gen top/maint.mk |
diffstat | 3 files changed, 27 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2010-05-03 Jim Meyering <meyering@redhat.com> + 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
--- a/build-aux/announce-gen +++ b/build-aux/announce-gen @@ -3,7 +3,7 @@ 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 @@ 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: x@example.com Cc: y-announce@example.com,... --help display this help and exit --version output version information and exit @@ -346,6 +348,7 @@ # 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 @@ 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 @@ %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>
--- a/top/maint.mk +++ b/top/maint.mk @@ -992,8 +992,16 @@ && gpgv .ann-sig - < /dev/null 2>&1 \ | sed -n '/.*key ID \([0-9A-F]*\)/s//\1/p'; rm -f .ann-sig) +translation_project_ ?= coordinator@translationproject.org +announcement_Cc_ ?= $(translation_project_), $(PACKAGE_BUGREPORT) +announcement_mail_headers_ ?= \ +To: info-gnu@gnu.org \ +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) \