From: Eric Blake Date: Sat, 21 Nov 2009 13:17:49 +0000 (-0700) Subject: Prepare for release. X-Git-Tag: v2.65~1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1d1145256aa2a7b9478ab0a43aac4d10bfbf7c6b;p=thirdparty%2Fautoconf.git Prepare for release. * build-aux/announce-gen: Sync from upstream. * build-aux/config.guess: Likewise. * build-aux/config.sub: Likewise. * cfg.mk (gnu_rel_host, url_dir_list): Move... * maint.mk: ...here, copying ideas from gnulib. (major): Rename... (stable): ...to this, copying gnulib. * HACKING (release): Document changes in process. Signed-off-by: Eric Blake --- diff --git a/ChangeLog b/ChangeLog index ae4d7c05..801684c2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,15 @@ 2009-11-21 Eric Blake + Prepare for release. + * build-aux/announce-gen: Sync from upstream. + * build-aux/config.guess: Likewise. + * build-aux/config.sub: Likewise. + * cfg.mk (gnu_rel_host, url_dir_list): Move... + * maint.mk: ...here, copying ideas from gnulib. + (major): Rename... + (stable): ...to this, copying gnulib. + * HACKING (release): Document changes in process. + Avoid spurious newline in traced macros. * bin/autoreconf.in (tracing): Drop newline before parsing traced arguments; regression from 2009-11-14. diff --git a/HACKING b/HACKING index 6c0bfa1e..563dec26 100644 --- a/HACKING +++ b/HACKING @@ -108,10 +108,11 @@ should check the results before committing them in git. ** Set the version number Update the version number in NEWS (with version, date, and release type) and ChangeLog, and mention in README whether the release is -stable. `make news-date-check' and `make changelog-check' will -validate that the information is formatted correctly. Make sure all -changes are committed, then run `git tag -s -m -u -v'. Do not push anything upstream at this point. +stable. Make sure all changes are committed, then run `git tag -s -m + -u v'. Do not push anything upstream at +this point. At this point, running `make _version', followed by `make +news-date-check changelog-check' will validate that the information is +formatted correctly. ** Update configure As much as possible, make sure to release an Autoconf that uses @@ -127,7 +128,7 @@ can run `make dist-xz'; run this prior to the release target so that the release announcement will include the .tar.xz file. ** Make the release -Run `make {alpha,beta,major}' depending on which type of release this +Run `make {alpha,beta,stable}' depending on which type of release this is. This runs the various checks, creates delta files, creates a preliminary announcement in /tmp/announce-autoconf-, prints out the command to upload the files, and updates the previous version @@ -147,11 +148,11 @@ Run `git push origin refs/tags/v' to push the release tag. ** Announce Complete/fix the announcement file, and email it at least to -autoconf@gnu.org and autotools-announce@gnu.org. If this is a major +autoconf@gnu.org and autotools-announce@gnu.org. If this is a stable release, also mail to info-gnu@gnu.org. ** Other web updates -For alpha and beta releases, the process is complete. For major +For alpha and beta releases, the process is complete. For stable releases, there are several other web pages that need updates. Update the online manual: Run `make web-manual', then copy the diff --git a/build-aux/announce-gen b/build-aux/announce-gen index e6be9f81..5fbb9cd7 100755 --- a/build-aux/announce-gen +++ b/build-aux/announce-gen @@ -3,7 +3,7 @@ eval '(exit $?0)' && eval 'exec perl -wS "$0" ${1+"$@"}' 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 @@ EOF 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); diff --git a/build-aux/config.guess b/build-aux/config.guess index e792aac6..d53e309f 100755 --- a/build-aux/config.guess +++ b/build-aux/config.guess @@ -4,7 +4,7 @@ # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 # Free Software Foundation, Inc. -timestamp='2009-09-18' +timestamp='2009-11-19' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -807,12 +807,12 @@ EOF i*:PW*:*) echo ${UNAME_MACHINE}-pc-pw32 exit ;; - *:Interix*:[3456]*) + *:Interix*:*) case ${UNAME_MACHINE} in x86) echo i586-pc-interix${UNAME_RELEASE} exit ;; - EM64T | authenticamd | genuineintel) + authenticamd | genuineintel | EM64T) echo x86_64-unknown-interix${UNAME_RELEASE} exit ;; IA64) @@ -891,7 +891,15 @@ EOF echo frv-unknown-linux-gnu exit ;; i*86:Linux:*:*) - echo ${UNAME_MACHINE}-pc-linux-gnu + LIBC=gnu + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #ifdef __dietlibc__ + LIBC=dietlibc + #endif +EOF + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` + echo "${UNAME_MACHINE}-pc-linux-${LIBC}" exit ;; ia64:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu @@ -918,11 +926,7 @@ EOF #endif #endif EOF - eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' - /^CPU/{ - s: ::g - p - }'`" + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } ;; or32:Linux:*:*) diff --git a/build-aux/config.sub b/build-aux/config.sub index 5ecc18b6..17c91458 100755 --- a/build-aux/config.sub +++ b/build-aux/config.sub @@ -4,7 +4,7 @@ # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 # Free Software Foundation, Inc. -timestamp='2009-10-07' +timestamp='2009-11-07' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -295,6 +295,7 @@ case $basic_machine in | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ | spu | strongarm \ | tahoe | thumb | tic4x | tic80 | tron \ + | ubicom32 \ | v850 | v850e \ | we32k \ | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ @@ -381,6 +382,7 @@ case $basic_machine in | tahoe-* | thumb-* \ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \ | tron-* \ + | ubicom32-* \ | v850-* | v850e-* | vax-* \ | we32k-* \ | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ diff --git a/cfg.mk b/cfg.mk index c6152b84..cd63547a 100644 --- a/cfg.mk +++ b/cfg.mk @@ -26,19 +26,9 @@ _autoreconf = autoreconf -i -v && rm -f INSTALL # Version management. announce_gen = $(srcdir)/build-aux/announce-gen -# Use alpha.gnu.org for alpha and beta releases. -# Use ftp.gnu.org for major releases. -gnu_ftp_host-alpha = alpha.gnu.org -gnu_ftp_host-beta = alpha.gnu.org -gnu_ftp_host-major = ftp.gnu.org -gnu_rel_host = $(gnu_ftp_host-$(RELEASE_TYPE)) - # Used in maint.mk's web-manual rule manual_title = Creating Automatic Configuration Scripts -url_dir_list = \ - ftp://$(gnu_rel_host)/gnu/autoconf - # The GnuPG ID of the key used to sign the tarballs. gpg_key_ID = F4850180 diff --git a/maint.mk b/maint.mk index bd74dfc9..09d1de35 100644 --- a/maint.mk +++ b/maint.mk @@ -59,6 +59,20 @@ my_distdir = $(PACKAGE)-$(VERSION) # Used for diffs. 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 @@ -563,9 +577,9 @@ emit_upload_commands: @echo ===================================== @echo ===================================== -.PHONY: alpha beta major -alpha beta major: news-date-check changelog-check $(local-check) - test $@ = major \ +.PHONY: alpha beta stable +alpha beta stable: news-date-check changelog-check $(local-check) + test $@ = stable \ && { echo $(VERSION) | grep -E '^[0-9]+(\.[0-9]+)+$$' \ || { echo "invalid version string: $(VERSION)" 1>&2; exit 1;};}\ || :