X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=build-aux%2Fannounce-gen;h=385ce8c3c0c3d03be48b9029e91ab06e930b402f;hb=3f5a64015c34e525c73ccda17d5e300c58ee7505;hp=039edaf3bb2dc1895066d16343421379aa7681f4;hpb=7ae3600e5e7c01051de428fb0164081de1b64b55;p=gnulib.git diff --git a/build-aux/announce-gen b/build-aux/announce-gen index 039edaf3b..385ce8c3c 100755 --- a/build-aux/announce-gen +++ b/build-aux/announce-gen @@ -1,12 +1,18 @@ #!/usr/bin/perl -w # Generate a release announcement message. -# Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +my $VERSION = '2008-06-02 08:18'; # 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. -# This program is free software; you can redistribute it and/or modify +# Copyright (C) 2002-2008 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 -# 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 @@ -14,8 +20,7 @@ # 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 @@ -24,8 +29,8 @@ use strict; use Getopt::Long; use Digest::MD5; use Digest::SHA1; +use POSIX qw(strftime); -(my $VERSION = '$Revision: 1.1 $ ') =~ tr/[0-9].//cd; (my $ME = $0) =~ s|.*/||; my %valid_release_types = map {$_ => 1} qw (alpha beta major); @@ -73,7 +78,7 @@ OPTIONS: Generate an announcement message. - FIXME: describe the following +These options must be specified: --release-type=TYPE TYPE must be one of @types --package-name=PACKAGE_NAME @@ -81,7 +86,16 @@ OPTIONS: --current-version=VER --gpg-key-id=ID The GnuPG ID of the key used to sign the tarballs --url-directory=URL_DIR - --news=NEWS_FILE optional + +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. --help display this help and exit --version output version information and exit @@ -311,6 +325,44 @@ sub print_changelog_deltas ($$) or warn "$ME: warning: `cmd' had unexpected exit code or signal ($?)\n"; } +sub get_tool_versions ($$) +{ + my ($tool_list, $gnulib_version) = @_; + @$tool_list + or return (); + + my $fail; + my @tool_version_pair; + foreach my $t (@$tool_list) + { + if ($t eq 'gnulib') + { + push @tool_version_pair, ucfirst $t . ' ' . $gnulib_version; + next; + } + # Assume that the last "word" on the first line of + # `tool --version` output is the version string. + my ($first_line, undef) = split ("\n", `$t --version`); + if ($first_line =~ /.* (\d[\w.-]+)$/) + { + $t = ucfirst $t; + push @tool_version_pair, "$t $1"; + } + else + { + defined $first_line + and $first_line = ''; + warn "$ME: $t: unexpected --version output\n:$first_line"; + $fail = 1; + } + } + + $fail + and exit 1; + + return @tool_version_pair; +} + { # Neutralize the locale, so that, for instance, "du" does not # issue "1,2" instead of "1.2", what confuses our regexps. @@ -323,6 +375,8 @@ sub print_changelog_deltas ($$) my $gpg_key_id; my @url_dir_list; my @news_file; + my $bootstrap_tools; + my $gnulib_version; GetOptions ( @@ -333,6 +387,8 @@ sub print_changelog_deltas ($$) 'gpg-key-id=s' => \$gpg_key_id, 'url-directory=s' => \@url_dir_list, 'news=s' => \@news_file, + 'bootstrap-tools=s' => \$bootstrap_tools, + 'gnulib-version=s' => \$gnulib_version, help => sub { usage 0 }, version => sub { print "$ME version $VERSION\n"; exit }, @@ -353,20 +409,33 @@ sub print_changelog_deltas ($$) @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; @ARGV - and (warn "$ME: too many arguments\n"), $fail = 1; + and (warn "$ME: too many arguments:\n", join ("\n", @ARGV), "\n"), + $fail = 1; $fail 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 %size = sizes ($tgz, $tbz, $xd); + my @tarballs = grep {-f $_} ($tgz, $tbz, $lzma); + my @sizable = @tarballs; + -f $xd + and push @sizable, $xd; + my %size = sizes (@sizable); %size or exit 1; @@ -382,14 +451,16 @@ 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 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, - "$tgz.sig", "$tbz.sig"); + @sig_files); - print_checksums ($tgz, $tbz, $xd); + print_checksums (@sizable); print <