From: Jim Meyering <meyer...@redhat.com> * bootstrap.conf (gnulib_modules): Add readme-release. (bootstrap_epilogue): Add the recommended perl one-liner. * README-release: Remove file; it is now generated from gnulib. * .gitignore: Add it. --- .gitignore | 11 ++++--- README-release | 89 -------------------------------------------------------- bootstrap.conf | 6 ++++ 3 files changed, 12 insertions(+), 94 deletions(-) delete mode 100644 README-release
diff --git a/.gitignore b/.gitignore index 9972dba..69ae342 100644 --- a/.gitignore +++ b/.gitignore @@ -8,10 +8,9 @@ *~ .deps /GNUmakefile -/maint.mk +/GNUmakefile /INSTALL -Makefile -Makefile.in +/README-release /aclocal.m4 /build-aux /config.status @@ -24,6 +23,8 @@ Makefile.in /lib/c++defs.h /lib/warn-on-use.h /libver.a +/maint.mk +/maint.mk /version.[ch] /zcat /zcmp @@ -35,7 +36,7 @@ Makefile.in /zless /zmore /znew -/GNUmakefile -/maint.mk ChangeLog +Makefile +Makefile.in gzip.doc.gz diff --git a/README-release b/README-release deleted file mode 100644 index 8a27049..0000000 --- a/README-release +++ /dev/null @@ -1,89 +0,0 @@ -Here are most of the steps we (maintainers) follow when making a release. - -* start from a clean, up-to-date git directory. - - git checkout master; git pull - -* Run ./configure && make maintainer-clean - -* Ensure that the desired versions of autoconf, automake, etc. - are in your PATH. See the buildreq list in bootstrap.conf for - the complete list. - -* Ensure that you're on "master" with no uncommitted diffs. - This should produce no output: git checkout master; git diff - -* Ensure that you've pushed all changes that belong in the release - and that the NixOS/Hydra autobuilder is reporting all is well: - - http://hydra.nixos.org/jobset/gnu/gzip-master - -* Run bootstrap one last time. This downloads any new translations: - - ./bootstrap - -* Pre-release testing: - Ensure that make check syntax-check succeeds. - -* Run "make distcheck" - -* Set the date, version number, and release type [stable/alpha/beta] on - line 3 of NEWS, commit that, and tag the release by running e.g., - - build-aux/do-release-commit-and-tag X.Y stable - -* Run the following to create release tarballs. Your choice selects the - corresponding upload-to destination in the emitted gnupload command. - The different destinations are specified in cfg.mk. See the definitions - of gnu_ftp_host-{alpha,beta,stable}. - - # "TYPE" must be stable, beta or alpha - make TYPE - -* Test the tarball. copy it to a few odd-ball systems and ensure that - it builds and passes all tests. - -* While that's happening, write the release announcement that you will - soon post. Start with the template, $HOME/announce-gzip-X.Y - that was just created by that "make" command. - -Once all the builds and tests have passed, - -* Run the gnupload command that was suggested by your "make stable" run above. - -* Wait a few minutes (maybe up to 30?) and then use the release URLs to - download all tarball/signature pairs and use gpg --verify to ensure - that they're all valid. - -* Push the NEWS-updating changes and the new tag: - - v=$(cat .prev-version) - git push origin master tag v$v - -* Announce it on Savannah first, so you can include the preferable - savannah.org announcement link in the email message. - - From here: - https://savannah.gnu.org/projects/gzip/ - click on the "submit news", then write something like the following: - (If there is no such button, then enable "News" for the project via - the Main -> "Select Features" menu item, or via this link: - https://savannah.gnu.org/project/admin/editgroupfeatures.php?group=gzip) - - Subject: gzip-X.Y released [stable] - +verbatim+ - ...paste the announcement here... - -verbatim- - - Then go here to approve it: - https://savannah.gnu.org/news/approve.php?group=gzip - -* Send the announcement email message. - -* After each non-alpha release, update the on-line manual accessible via - - http://www.gnu.org/software/gzip/manual/ - - by running this: - - build-aux/gnu-web-doc-update diff --git a/bootstrap.conf b/bootstrap.conf index 2353208..ef10471 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -46,6 +46,7 @@ malloc manywarnings perror printf-posix +readme-release realloc stat-time sys_stat @@ -79,5 +80,10 @@ rsync - tar - " +bootstrap_epilogue() +{ + perl -pi -e "s/\@PACKAGE\@/$package/g" README-release +} + # Automake requires that ChangeLog exist. touch ChangeLog || exit 1 -- 1.7.5.1.398.g86d1d
