X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=inline;f=build-aux%2Fannounce-gen;h=7d70fd4b59bac87362cc92a27f2b15187721340a;hb=5c92acef552620a440dc134faf6d1f7fd14f825f;hp=5eccbacaa0b1e5b4ff5c84541186cf85193186f7;hpb=33a0e9b6c7712c6806edd94056611c480aad2a4b;p=gnulib.git
diff --git a/build-aux/announce-gen b/build-aux/announce-gen
index 5eccbacaa..7d70fd4b5 100755
--- a/build-aux/announce-gen
+++ b/build-aux/announce-gen
@@ -1,18 +1,20 @@
-#!/usr/bin/perl -w
+eval '(exit $?0)' && eval 'exec perl -wS "$0" ${1+"$@"}'
+ & eval 'exec perl -wS "$0" $argv:q'
+ if 0;
# Generate a release announcement message.
-my $VERSION = '2007-02-25 16:41'; # UTC
+my $VERSION = '2009-11-20 13:36'; # 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-2007 Free Software Foundation, Inc.
+# Copyright (C) 2002-2010 Free Software Foundation, Inc.
-# This program is free software; you can redistribute it and/or modify
+# 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
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -20,8 +22,7 @@ my $VERSION = '2007-02-25 16:41'; # UTC
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# along with this program. If not, see .
# Written by Jim Meyering
@@ -34,32 +35,8 @@ use POSIX qw(strftime);
(my $ME = $0) =~ s|.*/||;
-my %valid_release_types = map {$_ => 1} qw (alpha beta major);
-
-END
-{
- # Nobody ever checks the status of print()s. That's okay, because
- # if any do fail, we're guaranteed to get an indicator when we close()
- # the filehandle.
- #
- # Close stdout now, and if there were no errors, return happy status.
- # If stdout has already been closed by the script, though, do nothing.
- defined fileno STDOUT
- or return;
- close STDOUT
- and return;
-
- # Errors closing stdout. Indicate that, and hope stderr is OK.
- warn "$ME: closing standard output: $!\n";
-
- # Don't be so arrogant as to assume that we're the first END handler
- # defined, and thus the last one invoked. There may be others yet
- # to come. $? will be passed on to them, and to the final _exit().
- #
- # If it isn't already an error, make it one (and if it _is_ an error,
- # preserve the value: it might be important).
- $? ||= 1;
-}
+my %valid_release_types = map {$_ => 1} qw (alpha beta stable);
+my @archive_suffixes = ('tar.gz', 'tar.bz2', 'tar.lzma', 'tar.xz');
sub usage ($)
{
@@ -74,11 +51,10 @@ sub usage ($)
my @types = sort keys %valid_release_types;
print $STREAM < \@url_dir_list,
'news=s' => \@news_file,
'bootstrap-tools=s' => \$bootstrap_tools,
- 'gnulib-snapshot-time-stamp=s' => \$gnulib_snapshot_timestamp,
+ '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 },
@@ -415,6 +390,13 @@ sub get_tool_versions ($$)
@url_dir_list
or (warn "$ME: URL directory name(s) not specified\n"), $fail = 1;
+ my @tool_list = split ',', $bootstrap_tools;
+
+ grep (/^gnulib$/, @tool_list) ^ defined $gnulib_version
+ and (warn "$ME: when specifying gnulib as a tool, you must also specify\n"
+ . "--gnulib-version=V, where V is the result of running git describe\n"
+ . "in the gnulib source directory.\n"), $fail = 1;
+
exists $valid_release_types{$release_type}
or (warn "$ME: `$release_type': invalid release type\n"), $fail = 1;
@@ -425,11 +407,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 $xd = "$package_name-$prev_version-$curr_version.xdelta";
- my @tarballs = grep {-f $_} ($tgz, $tbz);
+ 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;
@@ -441,7 +426,7 @@ sub get_tool_versions ($$)
# mail (or part of a diff), Gnus is not triggered.
print <
@@ -451,32 +436,38 @@ EOF
print_locations ("compressed sources", @url_dir_list, %size, @tarballs);
-f $xd
- and print_locations ("xdelta-style diffs", @url_dir_list, %size, $xd);
+ and print_locations ("xdelta diffs (useful? if so, "
+ . "please tell bug-gnulib\@gnu.org)",
+ @url_dir_list, %size, $xd);
my @sig_files = map { "$_.sig" } @tarballs;
print_locations ("GPG detached signatures[*]", @url_dir_list, %size,
@sig_files);
+ if ($url_dir_list[0] =~ "gnu\.org")
+ {
+ print "To reduce load on the main server, use a mirror listed at:\n";
+ print " http://www.gnu.org/order/ftp.html\n\n";
+ }
- print_checksums (@sizable);
+ $print_checksums_p
+ and print_checksums (@sizable);
print <