Fixup release rules.

* Makefile.am (cvs-diff): Remove.
(git-dist): Do not use clcommit any more.  Use new-style tag
name.  Pass $(AM_MAKEFLAGS) to $(MAKE).
(git-diff): Adjust.
(git-release): Do not upload to sources.redhat.com.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

diff --git a/ChangeLog b/ChangeLog
index a0c55769396d766e1a8084ccd0bfb87eedfe51aa..ed862708b07e637bfa8c95b0ebb19ac6a99e41f3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2008-11-29  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+       Fixup release rules.
+       * Makefile.am (cvs-diff): Remove.
+       (git-dist): Do not use clcommit any more.  Use new-style tag
+       name.  Pass $(AM_MAKEFLAGS) to $(MAKE).
+       (git-diff): Adjust.
+       (git-release): Do not upload to sources.redhat.com.
+
 2008-11-27  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
        Fix portability issues in distcleancheck_listfiles doc example.

diff --git a/HACKING b/HACKING
index 5df650ed893f8fb527e076bad9b60291b3bcb566..307e36a51b7dcf64ffd5f5427dd42fcb7b159aac 100644 (file)
--- a/HACKING
+++ b/HACKING
@@ -146,8 +146,6 @@
 * Run `make release-stats' if release statistics in doc/automake.texi
   have not been updated yet.
 
-* NOTE: the next step has not been tested yet with git, so be careful.
-
 * Run `make git-release'.
   This will run distcheck to create the tarballs, commit the last
   NEWS/configure.ac/ChangeLog changes, tag the repository, sign
@@ -158,13 +156,37 @@
 * Update version number in configure.ac to next alpha number.
   Re-run ./bootstrap and commit.
 
+* 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:
+  - Generate manuals:
+    cd doc
+    wget "http://savannah.gnu.org/cgi-bin/viewcvs/~checkout~/texinfo/texinfo/util/gendocs.sh"
+    wget "http://savannah.gnu.org/cgi-bin/viewcvs/~checkout~/texinfo/texinfo/util/gendocs_template"
+    sh ./gendocs.sh automake  "GNU Automake"
+  - copy manuals recursively to web cvs,
+  - commit.
+
 * Send announcement at least to autotools-announce@gnu.org, and
   automake@gnu.org.  If not an alpha, announcement must also go to
-  info-gnu@gnu.org.
+  info-gnu@gnu.org.  Copy this announcement into the NEWS feed at
+  <https://savannah.gnu.org/projects/automake>.
 
 -----
 
-Copyright (C) 2003, 2007 Free Software Foundation, Inc.
+Copyright (C) 2003, 2007, 2008 Free Software Foundation, Inc.
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

diff --git a/Makefile.am b/Makefile.am
index 55e1a66bfc1028e66b6319319e5c57fef6081721..d637e10f4931e231a92f858c9ed8d835b0dab797 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -336,23 +336,18 @@ maintainer-check: automake aclocal
 
 
 git-dist: maintainer-check
-## Make sure clcommit exists (we use it at the end of git-dist).
-       @if (clcommit --version)>/dev/null 2>/dev/null; then :; else \
-         echo "Get clcommit from module cvs-utils on Savannah."; \
-         exit 1; \
-       fi
 ## Make sure the NEWS file is up-to-date.
        @if sed 1q $(srcdir)/NEWS | grep -e "$(VERSION)" > /dev/null; then :; else \
          echo "NEWS not updated; not releasing" 1>&2; \
          exit 1;                               \
        fi
 ## Build the distribution
-       $(MAKE) distcheck
+       $(MAKE) $(AM_MAKEFLAGS) distcheck
 ## 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.
-       cd $(srcdir) && clcommit && \
-         git tag -s `echo "Release-$(VERSION)" | sed 's/\./-/g'`
+       cd $(srcdir) && git commit -a -s && \
+          git tag -s "v$(VERSION)" -m "Release $(VERSION)"
 
 git-release: git-dist
        case $(VERSION) in \
@@ -360,25 +355,15 @@ git-release: git-dist
          *)      dest=ftp;; \
        esac; \
        $(srcdir)/lib/gnupload $(GNUPLOADFLAGS) \
-         --to sources.redhat.com:~ftp/pub/automake \
          --to $$dest.gnu.org:automake $(DIST_ARCHIVES)
 
-cvs-diff:
-       thisver=`echo "Release-$(VERSION)" | sed 's/\./-/g'`; \
-       if test -z "$$OLDVERSION"; then \
-         prevno=`echo "$(VERSION)" - 0.01 | bc | sed 's/^\./0./'`; \
-       else prevno="$$OLDVERSION"; fi; \
-       prevver=Release-`echo $$prevno | sed 's/\./-/g'`; \
-       cvs -f rdiff -c -r $$prevver -r $$thisver $(PACKAGE) \
-           > $(PACKAGE)-$$prevno-$(VERSION).diff
-
 git-diff:
-       thisver=`echo "Release-$(VERSION)" | sed 's/\./-/g'`; \
+       thisver="v$(VERSION)"; \
        if test -z "$$OLDVERSION"; then \
          prevno=`echo "$(VERSION)" - 0.01 | bc | sed 's/^\./0./'`; \
        else prevno="$$OLDVERSION"; fi; \
-       prevver=Release-`echo $$prevno | sed 's/\./-/g'`; \
-       git diff $$prevver $$thisver $(PACKAGE) \
+       prevver=v$$prevno; \
+       git diff $$prevver..$$thisver $(PACKAGE) \
            > $(PACKAGE)-$$prevno-$(VERSION).diff
 
 ## Check our path lengths.

diff --git a/Makefile.in b/Makefile.in
index 375bf9b2a0c1264fae08086785785decb7be1318..41dc876ca89805f9a38777e4aa3a04b7b40241a3 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -964,17 +964,13 @@ maintainer-check: automake aclocal
        fi
 
 git-dist: maintainer-check
-       @if (clcommit --version)>/dev/null 2>/dev/null; then :; else \
-         echo "Get clcommit from module cvs-utils on Savannah."; \
-         exit 1; \
-       fi
        @if sed 1q $(srcdir)/NEWS | grep -e "$(VERSION)" > /dev/null; then :; else \
          echo "NEWS not updated; not releasing" 1>&2; \
          exit 1;                               \
        fi
-       $(MAKE) distcheck
-       cd $(srcdir) && clcommit && \
-         git tag -s `echo "Release-$(VERSION)" | sed 's/\./-/g'`
+       $(MAKE) $(AM_MAKEFLAGS) distcheck
+       cd $(srcdir) && git commit -a -s && \
+          git tag -s "v$(VERSION)" -m "Release $(VERSION)"
 
 git-release: git-dist
        case $(VERSION) in \
@@ -982,25 +978,15 @@ git-release: git-dist
          *)      dest=ftp;; \
        esac; \
        $(srcdir)/lib/gnupload $(GNUPLOADFLAGS) \
-         --to sources.redhat.com:~ftp/pub/automake \
          --to $$dest.gnu.org:automake $(DIST_ARCHIVES)
 
-cvs-diff:
-       thisver=`echo "Release-$(VERSION)" | sed 's/\./-/g'`; \
-       if test -z "$$OLDVERSION"; then \
-         prevno=`echo "$(VERSION)" - 0.01 | bc | sed 's/^\./0./'`; \
-       else prevno="$$OLDVERSION"; fi; \
-       prevver=Release-`echo $$prevno | sed 's/\./-/g'`; \
-       cvs -f rdiff -c -r $$prevver -r $$thisver $(PACKAGE) \
-           > $(PACKAGE)-$$prevno-$(VERSION).diff
-
 git-diff:
-       thisver=`echo "Release-$(VERSION)" | sed 's/\./-/g'`; \
+       thisver="v$(VERSION)"; \
        if test -z "$$OLDVERSION"; then \
          prevno=`echo "$(VERSION)" - 0.01 | bc | sed 's/^\./0./'`; \
        else prevno="$$OLDVERSION"; fi; \
-       prevver=Release-`echo $$prevno | sed 's/\./-/g'`; \
-       git diff $$prevver $$thisver $(PACKAGE) \
+       prevver=v$$prevno; \
+       git diff $$prevver..$$thisver $(PACKAGE) \
            > $(PACKAGE)-$$prevno-$(VERSION).diff
 
 path-check: distdir