Hi Jim, On 22 Oct 2011, at 17:15, Jim Meyering wrote: > Gary V. Vaughan wrote: >> >> If you want to clean the cruft out of your working directories before >> starting the release process, you should do it before you change branches >> and merge changes from upstream, using the Makefile that you already have >> that is already in sync with the rest of your tree: >> >> make maintainer-clean >> git checkout master >> git pull origin master >> ./bootstrap >> ./configure > > Yes, running "make maintainer-clean" is a requirement. > A patch with that improvement would be welcome.
Okay to push? -- readme-release: several release instructions improvements. * README-release: Don't git pull all branches when only master is needed for the release process. Don't try to run ./configure right after git pull incase files that influence the bootstrap process have changed, move the ./configure step to after running ./bootstrap. Don't bootstrap "one last time"... it's the first time! --- diff --git a/ChangeLog b/ChangeLog index 25790a6..8b0f6a5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2011-10-22 Gary V. Vaughan <g...@gnu.org> + + readme-release: Don't git pull all branches when only master + is needed for the release process. + Run make maintainer-clean before changing trees and merging. + Don't try to run ./configure right after git pull incase files + that influence the bootstrap process have changed, move the + ./configure step to after running ./bootstrap. + Don't bootstrap "one last time"... it's the first time! + 2011-10-19 Gary V. Vaughan <g...@gnu.org> maint.mk: Respect $(build_aux) in web-manual rule. diff --git a/top/README-release b/top/README-release index 0e1694d..f43b7ad 100755 --- a/top/README-release +++ b/top/README-release @@ -2,9 +2,9 @@ * start from a clean, up-to-date git directory. - git checkout master; git pull - -* Run ./configure && make maintainer-clean + make maintainer-clean + git checkout master + git pull origin master * Ensure that the desired versions of autoconf, automake, etc. are in your PATH. See the buildreq list in bootstrap.conf for @@ -18,12 +18,10 @@ http://hydra.nixos.org/jobset/gnu/@PACKAGE@-master -* Run bootstrap one last time. This downloads any new translations: - - ./bootstrap +* Run "./bootstrap && ./configure". This downloads any new translations. * Pre-release testing: - Ensure that make check syntax-check succeeds. + Ensure that "make check syntax-check" succeeds. * Run "make distcheck" Cheers, -- Gary V. Vaughan (gary AT gnu DOT org)