Mercurial > hg > octave-lojdl > gnulib-hg
changeset 12329:1d8d8b72ddd8
build: mention ftp redirector in release announcements
Now that http://ftpmirror.gnu.org/PACKAGE/ redirects to a nearby
mirror, we should promote its use in release announcements.
Meanwhile, mention the mirror list.
* top/maint.mk (gnu_rel_host, url_dir_list): Provide defaults for
values that used to come from cfg.mk; mention FTP redirect URL.
* build-aux/announce-gen: Mention the mirror list.
Suggested by Karl Berry.
Signed-off-by: Eric Blake <ebb9@byu.net>
| author | Eric Blake <ebb9@byu.net> |
|---|---|
| date | Fri, 20 Nov 2009 06:23:42 -0700 |
| parents | bf3fd58aaf19 |
| children | de232f8c8d7f |
| files | ChangeLog build-aux/announce-gen top/maint.mk |
| diffstat | 3 files changed, 26 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2009-11-20 Eric Blake <ebb9@byu.net> + build: mention ftp redirector in release announcements + * top/maint.mk (gnu_rel_host, url_dir_list): Provide defaults for + values that used to come from cfg.mk; mention FTP redirect URL. + * build-aux/announce-gen: Mention the mirror list. + Suggested by Karl Berry. + nanosleep: improve port to mingw * lib/nanosleep.c (rpl_nanosleep): Reject invalid arguments. * m4/nanosleep.m4 (gl_FUNC_NANOSLEEP): Incorporate LIBSOCKET into
--- a/build-aux/announce-gen +++ b/build-aux/announce-gen @@ -3,7 +3,7 @@ if 0; # Generate a release announcement message. -my $VERSION = '2009-10-30 15:59'; # 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 @@ -442,6 +442,11 @@ 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_p and print_checksums (@sizable);
--- a/top/maint.mk +++ b/top/maint.mk @@ -63,6 +63,20 @@ # Old releases are stored here. release_archive_dir ?= ../release +# Override gnu_rel_host and url_dir_list in cfg.mk if these are not right. +# Use alpha.gnu.org for alpha and beta releases. +# Use ftp.gnu.org for stable releases. +gnu_ftp_host-alpha = alpha.gnu.org +gnu_ftp_host-beta = alpha.gnu.org +gnu_ftp_host-stable = ftp.gnu.org +gnu_rel_host ?= $(gnu_ftp_host-$(RELEASE_TYPE)) + +ifeq ($(gnu_rel_host),ftp.gnu.org) +url_dir_list ?= http://ftpmirror.gnu.org/$(PACKAGE) +else +url_dir_list ?= ftp://$(gnu_rel_host)/gnu/$(PACKAGE) +endif + # Prevent programs like 'sort' from considering distinct strings to be equal. # Doing it here saves us from having to set LC_ALL elsewhere in this file. export LC_ALL = C