[Automake-commit] [SCM] GNU Automake branch, maint, updated. v1.11-556-g9508ef3

[Stefano Lattarini]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Automake".

http://git.sv.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=9508ef35139a066171cb6aedfa63000482477495

The branch, maint has been updated
       via  9508ef35139a066171cb6aedfa63000482477495 (commit)
       via  6416c6b854a6a24070d93c426f0f668657558af8 (commit)
       via  f2d8555cadc9969195a3b715d5f01cb24705d8c7 (commit)
       via  b2b292816d660a844e249225b9fd9bbacc6f718a (commit)
       via  38087e06a5a13bb1bcc89bb773da3cf48aafcc8b (commit)
       via  beff03e0d0754e8ad8dadc5e2ece853bcba2689f (commit)
       via  c3d589126cded2a41c3782e49b209f6d18e5a4e6 (commit)
      from  c8e01d581a7e7c2445a139def46939a547951746 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 9508ef35139a066171cb6aedfa63000482477495
Author: Stefano Lattarini <address@hidden>
Date:   Sat Dec 10 18:26:52 2011 +0100

    release: don't run "make distcheck" automatically
    
    * Makefile.am (git-dist): The developers should test extensively
    before finally creating the release tarball; so don't run "make
    distcheck" on their behalf here; instead ...
    * HACKING (Release procedure): ... state here that "make check"
    and "make distcheck" should be run before calling "make git-dist".

commit 6416c6b854a6a24070d93c426f0f668657558af8
Author: Stefano Lattarini <address@hidden>
Date:   Mon Dec 5 20:18:00 2011 +0100

    hacking: update on-line documentation for stable releases only
    
    * HACKING (Release procedure): On-line documentation at www.gnu.org
    should be updated for stable releases only.

commit f2d8555cadc9969195a3b715d5f01cb24705d8c7
Author: Stefano Lattarini <address@hidden>
Date:   Mon Dec 5 20:15:46 2011 +0100

    hacking: described release procedure applies to beta releases too
    
    * HACKING (Release procedure): Explicitly state that the described
    procedure is valid for alpha/beta versions as well.

commit b2b292816d660a844e249225b9fd9bbacc6f718a
Author: Stefano Lattarini <address@hidden>
Date:   Mon Dec 5 20:10:18 2011 +0100

    readme: the documentation is production quality now
    
    * README-alpha: The documentation is now quite mature, no need
    to decry it.

commit 38087e06a5a13bb1bcc89bb773da3cf48aafcc8b
Author: Stefano Lattarini <address@hidden>
Date:   Mon Dec 5 19:57:07 2011 +0100

    hacking: tell about platform-testers mailing list
    
    * HACKING (Release procedure): Announces for alpha and beta releases
    should be sent to the address@hidden' mailing list.  Some
    related rewording.

commit beff03e0d0754e8ad8dadc5e2ece853bcba2689f
Author: Stefano Lattarini <address@hidden>
Date:   Mon Dec 5 19:48:34 2011 +0100

    hacking: we don't use sources.redhat.com anymore
    
    * HACKING (Release procedure): Don't explain how to upload the
     web pages at sources.redhat.com; we don't use that anymore.

commit c3d589126cded2a41c3782e49b209f6d18e5a4e6
Author: Stefano Lattarini <address@hidden>
Date:   Mon Dec 5 19:41:19 2011 +0100

    hacking: miscellaneous minor fixes
    
    * HACKING (Administrivia): If a commit fixes a bug registered at GNU
    debbugs, its bug number be reported in the ChangeLog entry.  Re-order
    the entries to give more visibility to the advice on how to verify
    that a commit really fixes a bug.
    (Working with git): Improve advice about which pre-existing branch
    a topic branch should be based on.

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog    |    9 +++++++++
 HACKING      |   44 +++++++++++++++++++++-----------------------
 Makefile.am  |    6 ++++--
 Makefile.in  |    2 +-
 README-alpha |    3 ---
 5 files changed, 35 insertions(+), 29 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 618ab02..826a4f7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2011-12-10  Stefano Lattarini  <address@hidden>
+
+       release: don't run "make distcheck" automatically
+       * Makefile.am (git-dist): The developers should test extensively
+       before finally creating the release tarball; so don't run "make
+       distcheck" on their behalf here; instead ...
+       * HACKING (Release procedure): ... state here that "make check"
+       and "make distcheck" should be run before calling "make git-dist".
+
 2011-12-09  Jim Meyering  <address@hidden>
            Stefano Lattarini  <address@hidden>
 
diff --git a/HACKING b/HACKING
index 873243c..755bffd 100644
--- a/HACKING
+++ b/HACKING
@@ -10,12 +10,18 @@
 ================================================================
 = Administrivia
 
+* The correct response to most actual bugs is to write a new test case
+  which demonstrates the bug.  Then fix the bug, re-run the test suite,
+  and check everything in.
+
 * If you incorporate a change from somebody on the net:
   First, if it is a large change, you must make sure they have signed the
   appropriate paperwork.
   Second, be sure to add their name and email address to THANKS
 
 * If a change fixes a test, mention the test in the ChangeLog entry.
+  If a change fixes a bug registered in the Automake debbugs tracker,
+  mention the bug number in the ChangeLog entry.
 
 * If somebody reports a new bug, mention his name in the ChangeLog entry
   and in the test case you write.  Put him into THANKS.
@@ -24,10 +30,6 @@
   sure to add a test case for it, and to reference such test case from
   a proper Texinfo comment.
 
-* The correct response to most actual bugs is to write a new test case
-  which demonstrates the bug.  Then fix the bug, re-run the test suite,
-  and check everything in.
-
 * Some files in the automake package are not owned by automake.  These
   files should never be edited here.  These files are
       COPYING (from FSF),
@@ -151,9 +153,9 @@
 
 * There may be a number of longer-lived feature branches for new developments.
   They should be based off of a common ancestor of all active branches to
-  which the feature should be merged later.  The next branch may serve as
-  common ground for feature merging and testing, should they not be ready
-  for master yet.
+  which the feature should or might be merged later.  The next branch may
+  serve as common ground for feature merging and testing, should they not
+  be ready for master yet.
 
 * For merges from branches other than maint, prefer 'git merge --log' over
   plain 'git merge', so that a later 'git log' gives an indication of which
@@ -184,6 +186,10 @@
 ================================================================
 = Release procedure
 
+* The steps outlined here are meant to be followed for alpha and stable
+  releases as well.  Where differences are expected, they will be
+  explicitly described.
+
 * Fetch new versions of the files that are maintained by the FSF.
   Commit.  Unfortunately you need an FSF account to do this.
   (You can also use `make fetch', but that is still woefully incomplete.)
@@ -197,7 +203,7 @@
 
 * Update ChangeLog.
 
-* Run ./bootstrap, ./configure, make.
+* Run "./bootstrap && ./configure && make && make check && make distcheck".
 
 * Run `make release-stats' if release statistics in doc/automake.texi
   have not been updated yet.
@@ -215,18 +221,7 @@
 * Don't forget to `git push' your changes so they appear in the public
   git tree.
 
-* Update the web pages at sources.redhat.com:
-  - bump version in index.rst,
-  - add entry to news.rst,
-  - run `make' to update .html files,
-  - create manuals:
-      cd doc
-      make pdf
-      make html MAKEINFOFLAGS=--no-split
-  - copy automake.html and automake.pdf to web cvs,
-  - add ChangeLog entry and commit.
-
-* Update the manuals at www.gnu.org:
+* For stable releases, update the manuals at www.gnu.org:
   - Generate manuals:
     cd doc
     wget 
"http://savannah.gnu.org/cgi-bin/viewcvs/~checkout~/texinfo/texinfo/util/gendocs.sh";
@@ -237,9 +232,12 @@
   - Check for link errors, fix them, recheck until convergence:
     <http://validator.w3.org/checklink>
 
-* Send announcement at least to address@hidden, and
-  address@hidden  If not an alpha, announcement must also go to
-  address@hidden  Copy this announcement into the NEWS feed at
+* Send the announcement at least to <address@hidden> and
+  <address@hidden>.  If the release is a stable one, the announcement
+  must also go to <address@hidden>; if it is an alpha or beta release,
+  announcement should be sent also to <address@hidden>, to
+  maximize the possibility of early testing on exotic or proprietary
+  systems.  Finally, copy the announcement into the NEWS feed at
   <https://savannah.gnu.org/projects/automake>.
 
 -----
diff --git a/Makefile.am b/Makefile.am
index 51eeb23..d0dc846 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -568,8 +568,10 @@ git-dist: maintainer-check
          echo "NEWS not updated; not releasing" 1>&2; \
          exit 1;                               \
        fi
-## Build the distribution
-       $(MAKE) $(AM_MAKEFLAGS) distcheck
+## Build the distribution.  We expect the developer to have already run
+## "make check" and "make distcheck" on his own (as required in the
+## HACKING file, section "Release procedure").
+       $(MAKE) $(AM_MAKEFLAGS) dist
 ## Finally, if anything was successful, commit the last changes and tag
 ## the release in the repository.  We don't use RCS keywords so it's OK
 ## to distribute the files before they were committed.
diff --git a/Makefile.in b/Makefile.in
index e475693..3045353 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1256,7 +1256,7 @@ git-dist: maintainer-check
          echo "NEWS not updated; not releasing" 1>&2; \
          exit 1;                               \
        fi
-       $(MAKE) $(AM_MAKEFLAGS) distcheck
+       $(MAKE) $(AM_MAKEFLAGS) dist
        cd $(srcdir) && git commit -a -s && \
           git tag -s "v$(VERSION)" -m "Release $(VERSION)"
 
diff --git a/README-alpha b/README-alpha
index 193a6dd..820bf73 100644
--- a/README-alpha
+++ b/README-alpha
@@ -1,9 +1,6 @@
 This is a test release of this package.  Using it more or less
 implicitly signs you up to help me find whatever problems you report.
 
-The documentation still needs more work.  Suggestions welcome.
-Patches even more welcome.
-
 Please send comments and problem reports about this test release to
 address@hidden  This program will get better only if you report the
 problems you encounter.


hooks/post-receive
-- 
GNU Automake