My announcements for Bison referred to ../../NEWS :)
The interface is "backward-compatible", so you should
pass
--srcdir=. --news=./NEWS
(i.e., the call to --news remains the same). But _if_
breaking backward compatibility, under the assumption that
no one calls announcement-gen by hand, by only via the
Makefile target, then I would prefer
--srcdir=. --news=NEWS
(and, gosh, I hate ChangeLogs)
From edc63474c0851715f866cf14f275903529d19ec7 Mon Sep 17 00:00:00 2001
From: Akim Demaille <a...@lrde.epita.fr>
Date: Thu, 7 Jun 2012 17:15:59 +0200
Subject: [PATCH] announce-gen: VPATH issues
* build-aux/announce-gen (--srcdir): New option, used to trim the
$srcdir part of the path from $builddir to NEWS.
* top/maint.mk (announcement): Adjust.
---
ChangeLog | 7 +++++++
build-aux/announce-gen | 11 +++++++----
top/maint.mk | 1 +
3 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index a47282e..6c6c565 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
2012-06-07 Akim Demaille <a...@lrde.epita.fr>
+ announce-gen: VPATH issues
+ * build-aux/announce-gen (--srcdir): New option, used to trim the
+ $srcdir part of the path from $builddir to NEWS.
+ * top/maint.mk (announcement): Adjust.
+
+2012-06-07 Akim Demaille <a...@lrde.epita.fr>
+
gnu-web-doc-update: VPATH builds
* build-aux/gnu-web-doc-update (--builddir): New option.
Revamp the handling of options.
diff --git a/build-aux/announce-gen b/build-aux/announce-gen
index ff581fa..07f7ee4 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 = '2012-05-23 08:55'; # UTC
+my $VERSION = '2012-06-07 15:17'; # 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
@@ -38,6 +38,7 @@ use POSIX qw(strftime);
my %valid_release_types = map {$_ => 1} qw (alpha beta stable);
my @archive_suffixes = ('tar.gz', 'tar.bz2', 'tar.lzma', 'tar.xz');
+my $srcdir = '.';
sub usage ($)
{
@@ -52,7 +53,7 @@ sub usage ($)
my @types = sort keys %valid_release_types;
print $STREAM <<EOF;
Usage: $ME [OPTIONS]
-Generate an announcement message.
+Generate an announcement message. Run this from builddir.
OPTIONS:
@@ -67,7 +68,8 @@ These options must be specified:
The following are optional:
- --news=NEWS_FILE
+ --news=NEWS_FILE accumulates
+ --srcdir=DIR where to find the NEWS_FILEs (default: $srcdir)
--bootstrap-tools=TOOL_LIST a comma-separated list of tools, e.g.,
autoconf,automake,bison,gnulib
--gnulib-version=VERSION report VERSION as the gnulib version, where
@@ -182,7 +184,7 @@ sub print_news_deltas ($$$)
my ($news_file, $prev_version, $curr_version) = @_;
my $news_name = $news_file;
- $news_name =~ s|^\./||;
+ $news_name =~ s|^\Q$srcdir\E/||;
print "\n$news_name\n\n";
@@ -388,6 +390,7 @@ sub get_tool_versions ($$)
'gpg-key-id=s' => \$gpg_key_id,
'url-directory=s' => \@url_dir_list,
'news=s' => \@news_file,
+ 'srcdir=s' => \$srcdir,
'bootstrap-tools=s' => \$bootstrap_tools,
'gnulib-version=s' => \$gnulib_version,
'print-checksums!' => \$print_checksums_p,
diff --git a/top/maint.mk b/top/maint.mk
index f0b889b..7cd24b8 100644
--- a/top/maint.mk
+++ b/top/maint.mk
@@ -1268,6 +1268,7 @@ announcement: NEWS ChangeLog $(rel-files)
--prev=$(PREV_VERSION) \
--curr=$(VERSION) \
--gpg-key-id=$(gpg_key_ID) \
+ --srcdir=$(srcdir) \
--news=$(srcdir)/NEWS \
--bootstrap-tools=$(bootstrap-tools) \
$$(case ,$(bootstrap-tools), in (*,gnulib,*) \
--
1.7.10.4
