X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=build-aux%2Fannounce-gen;h=e5e7491316903ec63d43ce00eb0aed81565d7760;hb=6fd2df816bfd58804024dbfd8fa0f22e60dbb140;hp=c642ef8e1f2ef79d9aaa81f41728c402cbd6ca92;hpb=5145cf1480e738a26de3b44c5679234d26cd6a14;p=gnulib.git

diff --git a/build-aux/announce-gen b/build-aux/announce-gen
index c642ef8e1..e5e749131 100755
--- a/build-aux/announce-gen
+++ b/build-aux/announce-gen
@@ -1,13 +1,13 @@
 #!/usr/bin/perl -w
 # Generate a release announcement message.
 
-my $VERSION = '2008-02-08 10:34'; # UTC
+my $VERSION = '2009-03-05 09:52'; # 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
 # do its job.  Otherwise, update this string manually.
 
-# Copyright (C) 2002-2008 Free Software Foundation, Inc.
+# Copyright (C) 2002-2009 Free Software Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -34,6 +34,7 @@ use POSIX qw(strftime);
 (my $ME = $0) =~ s|.*/||;
 
 my %valid_release_types = map {$_ => 1} qw (alpha beta major);
+my @archive_suffixes = ('tar.gz', 'tar.bz2', 'tar.lzma', 'tar.xz');
 
 END
 {
@@ -92,10 +93,12 @@ The following are optional:
    --news=NEWS_FILE
    --bootstrap-tools=TOOL_LIST  a comma-separated list of tools, e.g.,
                                 autoconf,automake,bison,gnulib
-   --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 is UTC.
+   --gnulib-version=VERSION     report VERSION as the gnulib version, where
+                                VERSION is the result of running git describe
+                                in the gnulib source directory.
+                                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
 
    --help             display this help and exit
    --version          output version information and exit
@@ -185,8 +188,7 @@ sub print_checksums (@)
 	  print "$dig  $f\n";
 	}
     }
-
-
+  print "\n";
 }
 
 =item C<print_news_deltas ($news_file, $prev_version, $curr_version)
@@ -207,7 +209,7 @@ sub print_news_deltas ($$$)
   # the first occurrence of $prev_version.
   my $in_items;
 
-  my $re_prefix = qr/\* (?:Noteworthy|Major) change/;
+  my $re_prefix = qr/(?:\* )?(?:Noteworthy c|Major c|C)(?i:hanges)/;
 
   open NEWS, '<', $news_file
     or die "$ME: $news_file: cannot open for reading: $!\n";
@@ -377,6 +379,7 @@ sub get_tool_versions ($$)
   my @news_file;
   my $bootstrap_tools;
   my $gnulib_version;
+  my $print_checksums_p = 1;
 
   GetOptions
     (
@@ -389,6 +392,8 @@ sub get_tool_versions ($$)
      'news=s'             => \@news_file,
      'bootstrap-tools=s'  => \$bootstrap_tools,
      'gnulib-version=s'   => \$gnulib_version,
+     'print-checksums!'   => \$print_checksums_p,
+     'archive-suffix=s'   => \@archive_suffixes,
 
      help => sub { usage 0 },
      version => sub { print "$ME version $VERSION\n"; exit },
@@ -426,12 +431,14 @@ sub get_tool_versions ($$)
     and usage 1;
 
   my $my_distdir = "$package_name-$curr_version";
-  my $tgz = "$my_distdir.tar.gz";
-  my $tbz = "$my_distdir.tar.bz2";
-  my $lzma = "$my_distdir.tar.lzma";
+
   my $xd = "$package_name-$prev_version-$curr_version.xdelta";
 
-  my @tarballs = grep {-f $_} ($tgz, $tbz, $lzma);
+  my @candidates = map { "$my_distdir.$_" } @archive_suffixes;
+  my @tarballs = grep {-f $_} @candidates;
+
+  @tarballs
+    or die "$ME: none of " . join(', ', @candidates) . " were found\n";
   my @sizable = @tarballs;
   -f $xd
     and push @sizable, $xd;
@@ -460,21 +467,21 @@ EOF
   print_locations ("GPG detached signatures[*]", @url_dir_list, %size,
 		   @sig_files);
 
-  print_checksums (@sizable);
+  $print_checksums_p
+    and print_checksums (@sizable);
 
   print <<EOF;
-
 [*] You can use either of the above signature files to verify that
 the corresponding file (without the .sig suffix) is intact.  First,
 be sure to download both the .sig file and the corresponding tarball.
 Then, run a command like this:
 
-  gpg --verify $tgz.sig
+  gpg --verify $tarballs[0].sig
 
 If that command fails because you don't have the required public key,
 then run this command to import it:
 
-  gpg --keyserver wwwkeys.pgp.net --recv-keys $gpg_key_id
+  gpg --keyserver keys.gnupg.net --recv-keys $gpg_key_id
 
 and rerun the \`gpg --verify' command.
 EOF