From: Karl Berry Date: Mon, 26 May 2025 16:10:25 +0000 (-0700) Subject: maint: prepare for 1.18 release. X-Git-Tag: v1.18~3 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=971aae268406538e8a79627a4ab6180f8e8286b5;p=thirdparty%2Fautomake.git maint: prepare for 1.18 release. * configure.ac (AC_INIT): 1.18 (APIVERSION): also 1.18. * m4/amversion.m4: likewise (auto-updated). * doc/automake.texi: missing comma in make xref. * HACKING: tweak release info some more. * NEWS: likewise. * INSTALL: missed top-level update from make fetch. --- diff --git a/HACKING b/HACKING index 5873da007..05eab8a82 100644 --- a/HACKING +++ b/HACKING @@ -533,8 +533,10 @@ * Ensure that the copyright notices of the distributed files are up to date. The maintainer-only target "update-copyright" can help with this. -* Check NEWS; in particular, ensure that all the relevant differences - from the last release are included. +* Check NEWS; specifically, ensure that all the substantive differences + from the last release are included. Include bug numbers or mailing + list references wherever relevant. Update the version number and + include the release date. * Update the AC_INIT version number in configure.ac. Leading up to a minor release (x.y), say 1.17, pretests should be numbered from @@ -552,18 +554,17 @@ checks valid and invalid version strings. * If making a minor or major release (1.x), also update APIVERSION in - configure.ac. But not micro. Don't change APIVERSION for pretests, - e.g., APIVERSION=1.17 for the pretest 1.17.90, even though it's - leading up to 1.18. + configure.ac. But don't change APIVERSION for micro releases (1.x.y) + or pretests. E.g., APIVERSION=1.17 for the pretest 1.17.90, even + though it's leading up to 1.18. * grep $newversion NEWS # ensure that the NEWS file has the new version. -* Create an announcement message with "make announcement". Edit the - generated 'announcement' file appropriately, in particularly filling - in by hand any "TODO" left in there. In particular, thank people who - should be thanked (read through the ChangeLog). It's useful to do - this early, because carefully writing the announcement can easily - bring to light things that still need to be worked on. +* Create an announcement message with "make announcement". It's useful + to do this early, because carefully reading the list of NEWS can + easily bring to light things that still need to be worked on. But + don't worry about every detail, because the below invocation of + announce-gen will create another announcement to be merged with this. * Run these commands, in this order (as mentioned, adjust -j as desired): make bootstrap @@ -579,19 +580,23 @@ because that command will remove *all* the files that are not tracked by git! Run git status first to ensure all removals are ok. +* git push all changed files. + * Run "make git-tag-release". This will run the maintainer checks, verify that the local git repository and working tree are clean and up-to-date, and create - a proper signed git tag for the release (based on the contents - of $(VERSION)). + a proper signed git tag for the release, based on the contents + of $(VERSION). It's highly undesirable (at least) to change anything + after the tag is made, so don't run this until everything is committed + and pushed and you're ready to release. For stable releases, check * Create additional info for the announcement with the announce-gen script that is part of gnulib. It requires the new release tarball, - and the repository to be tagged + and the already-tagged repository. pkg=automake - prever=1.16.92 - newver=1.16.94 - reltype=alpha # or beta or stable + prever=1.16 # 1.17 + newver=1.16.94 # 1.18 + reltype=alpha # stable (possibly also beta) host=`if test $reltype = stable; then echo ftp; else echo alpha; fi` gpgkey=0x... # gpg --fingerprint $gnulib/build-aux/announce-gen \ @@ -611,10 +616,11 @@ and that the local git repository and working tree are clean and up-to-date, and will then run "make dist" to create the tarballs, and invoke the 'gnupload' script sign and upload them to the correct - locations. If you need to sign with a non-default key, you can - use "make GNUPLOADFLAGS='--user KEY' git-upload-release". - There can be a delay of up to several minutes before the new files - appear on the server. + locations. + + If you need to sign with a non-default key, you can use "make + GNUPLOADFLAGS='--user KEY' git-upload-release". There can be a delay + of up to several minutes before the new files appear on the server. * For stable releases you also need to update the manuals on www.gnu.org. @@ -640,10 +646,7 @@ make web-manual-update CVS_USER=slattarini * Update version number in configure.ac to next alpha number. - Rerun ./bootstrap and commit. - -* Don't forget to "git push" your changes so they appear in the public - git tree. + Rerun ./bootstrap and commit and push. * Send the announcement generated in the earlier steps at least to and . If the release diff --git a/INSTALL b/INSTALL index c032ea507..d43221a2c 100644 --- a/INSTALL +++ b/INSTALL @@ -104,6 +104,18 @@ editing ‘configure’ directly. 9. If the package follows the GNU Coding Standards, you can type ‘make uninstall’ to remove the installed files. +Installation Prerequisites +========================== + + Installation requires a POSIX-like environment with a shell and at +least the following standard utilities: + + awk cat cp diff echo expr false ls mkdir mv printf pwd rm rmdir sed + sort test tr + +This package’s installation may need other standard utilities such as +‘grep’, ‘make’, ‘sleep’ and ‘touch’, along with compilers like ‘gcc’. + Compilers and Options ===================== diff --git a/NEWS b/NEWS index fdff666cb..02581e1d9 100644 --- a/NEWS +++ b/NEWS @@ -2,7 +2,7 @@ For planned incompatibilities in a possible future Automake 2.0 release, please see NEWS-future and start following the advice there now. ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -New in 1.17.92: +New in 1.18 (2025-05-25): * New features added @@ -10,8 +10,8 @@ New in 1.17.92: the tar-v7 and other explicit options to force a particular tar format are unchanged and still override the default. (bug#74847) - - mdate-sh uses SOURCE_DATE_EPOCH, if set, instead of a file's mtime. - (bug#77805) + - The mdate-sh auxiliary script generally used with Texinfo now uses + SOURCE_DATE_EPOCH, if set, instead of the source file's mtime. (bug#77805) - New option dist-bzip3 for bzip3 compression of distributions. (bug#73795) @@ -61,6 +61,7 @@ New in 1.17.92: - Only require the presence of an ABOUT-NLS file at the 'gnits' strictness level. + (https://lists.gnu.org/archive/html/automake/2024-10/msg00006.html) ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/configure.ac b/configure.ac index e2422639b..f6acfad75 100644 --- a/configure.ac +++ b/configure.ac @@ -16,7 +16,7 @@ # along with this program. If not, see . AC_PREREQ([2.69]) -AC_INIT([GNU Automake], [1.17.93], [bug-automake@gnu.org]) +AC_INIT([GNU Automake], [1.18], [bug-automake@gnu.org]) AC_CONFIG_SRCDIR([bin/automake.in]) AC_CONFIG_AUX_DIR([lib]) @@ -49,7 +49,7 @@ AC_SUBST([RELEASE_YEAR]) # The API version is the base version. We must guarantee # compatibility for all releases with the same API version. -APIVERSION=1.17 +APIVERSION=1.18 AC_SUBST([APIVERSION]) AC_SUBST([pkgvdatadir], ["\${datadir}/$PACKAGE-$APIVERSION"]) diff --git a/doc/automake.texi b/doc/automake.texi index 042ef6599..2f7d4a3b7 100644 --- a/doc/automake.texi +++ b/doc/automake.texi @@ -11310,7 +11310,7 @@ this directory. @opindex posix Generate the special target @code{.POSIX} as the first non-comment line in the @file{Makefile.in} files. This alters the behavior of the -@code{make} program. @xref{Special targets,, make, The GNU Make +@code{make} program. @xref{Special targets,,, make, The GNU Make Manual}. @item @option{serial-tests} diff --git a/m4/amversion.m4 b/m4/amversion.m4 index 0685c01ee..ddee6d621 100644 --- a/m4/amversion.m4 +++ b/m4/amversion.m4 @@ -12,10 +12,10 @@ # generated from the m4 files accompanying Automake X.Y. # (This private macro should not be called outside this file.) AC_DEFUN([AM_AUTOMAKE_VERSION], -[am__api_version='1.17' +[am__api_version='1.18' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.17.93], [], +m4_if([$1], [1.18], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -31,7 +31,7 @@ m4_define([_AM_AUTOCONF_VERSION], []) # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.17.93])dnl +[AM_AUTOMAKE_VERSION([1.18])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])