From: Jim Meyering <jim@meyering.net>
Date: Thu, 28 Dec 2006 19:28:49 +0000 (+0000)
Subject: * build-aux/announce-gen: Do not assume that the package
X-Git-Tag: cvs-readonly~1457
X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=84f654a6aae16248e0ffdfb5516a854ab375ed85;p=gnulib.git

* build-aux/announce-gen: Do not assume that the package
builds any of tar.gz, tar.bz2, and .xdelta files.
Suggestion from Simon Josefsson.
---

diff --git a/ChangeLog b/ChangeLog
index a77ff522e..a572a9882 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-12-28  Jim Meyering  <jim@meyering.net>
+
+	* build-aux/announce-gen: Do not assume that the package
+	builds any of tar.gz, tar.bz2, and .xdelta files.
+	Suggestion from Simon Josefsson.
+
 2006-12-28  Simon Josefsson  <simon@josefsson.org>
 
 	* modules/announce-gen: New file.
diff --git a/build-aux/announce-gen b/build-aux/announce-gen
index 1f87bc26b..f13b6d585 100755
--- a/build-aux/announce-gen
+++ b/build-aux/announce-gen
@@ -1,7 +1,7 @@
 #!/usr/bin/perl -w
 # Generate a release announcement message.
 
-my $VERSION = '2006-12-08 17:35'; # UTC
+my $VERSION = '2006-12-28 19:19'; # 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
@@ -96,7 +96,7 @@ The following are optional:
    --gnulib-snapshot-date=DATE  if gnulib is in the bootstrap tool list,
                                 then report this as the snapshot date.
                                 If not specified, use the current date/time.
-                                If you specify a date here, be sure it's UTC.
+                                If you specify a date here, be sure it is UTC.
 
    --help             display this help and exit
    --version          output version information and exit
@@ -428,7 +428,11 @@ sub get_tool_versions ($$)
   my $tbz = "$my_distdir.tar.bz2";
   my $xd = "$package_name-$prev_version-$curr_version.xdelta";
 
-  my %size = sizes ($tgz, $tbz, $xd);
+  my @tarballs = grep {-f $_} ($tgz, $tbz);
+  my @sizable = @tarballs;
+  -f $xd
+    and push @sizable, $xd;
+  my %size = sizes (@sizable);
   %size
     or exit 1;
 
@@ -444,14 +448,14 @@ FIXME: put comments here
 
 EOF
 
-  print_locations ("compressed sources", @url_dir_list, %size,
-		   $tgz, $tbz);
-  print_locations ("xdelta-style diffs", @url_dir_list, %size,
-		   $xd);
+  print_locations ("compressed sources", @url_dir_list, %size, @tarballs);
+  -f $xd
+    and print_locations ("xdelta-style diffs", @url_dir_list, %size, $xd);
+  my @sig_files = map { "$_.sig" } @tarballs;
   print_locations ("GPG detached signatures[*]", @url_dir_list, %size,
-		   "$tgz.sig", "$tbz.sig");
+		   @sig_files);
 
-  print_checksums ($tgz, $tbz, $xd);
+  print_checksums (@sizable);
 
   print <<EOF;