FYI: release automation cleanup [m4--release--1.4--patch-4]

[Gary V. Vaughan]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Applied to branch-1_4.

  * looking for address@hidden/m4--release--1.4--patch-3 to compare with
  * comparing to address@hidden/m4--release--1.4--patch-3
  D  doc/.arch-ids/gendocs.sh.id
  D  doc/.arch-ids/gendocs_template.id
  D  doc/gendocs.sh
  D  doc/gendocs_template
  M  ChangeLog
  M  Makefile.in
  M  doc/m4.texinfo
  M  Makefile.maint
  
  * modified files
  
  Index: Changelog
  from  Gary V. Vaughan  <address@hidden>
  
        Changes needed to automate the release process for 1.4.3:
  
        * Makefile.in (dist): Make .tar.bz2 tarball too.
        * Makefile.maint (TSDEPS_DIST): Remove m4/libtool.m4.
        (cvs-news): Look 1 line further down for NEWS release number.
        (cvs-dist): We don't use automake, so make dist is fine.
        Remove double . before suffixes.
        (cvs-release): Don't mention manual.html.
        (fetch): Get latest gendocs files.
        (web-manual): Rewritten to use gendoc for multiformat manuals.
        * doc/gendocs.sh: Don't save an old version in m4 CVS!
        * doc/m4.texinfo (Index): HFS+ (the file system on my Mac) is case
        preserving, but case insensitive, so generating html docs per node
        clashes between Index.html, the node file, and index.html, the
        top-level of the document tree...
        (Index macro): ...so renamed to this.  Changed all references.
  
  --- orig/Makefile.in
  +++ mod/Makefile.in
  @@ -114,6 +114,7 @@
        done
        chmod -R a+r $(PACKAGE)-$(VERSION)
        tar chozf $(PACKAGE)-$(VERSION).tar.gz $(PACKAGE)-$(VERSION)
  +     tar chojf $(PACKAGE)-$(VERSION).tar.bz2 $(PACKAGE)-$(VERSION)
        rm -rf $(PACKAGE)-$(VERSION)
   
   # For an explanation of the following Makefile rules, see node
  
  
  --- orig/Makefile.maint
  +++ mod/Makefile.maint
  @@ -1,4 +1,4 @@
  -## Makefile.maint -- Makefile rules for libtool maintainers -*-Makefile-*-
  +## Makefile.maint -- Makefile rules for m4 maintainers -*-Makefile-*-
   ##
   ## Copyright (C) 2004, 2005 Free Software Foundation
   ##
  @@ -42,7 +42,6 @@
        echo " *** $$xdeltaname, $$xdeltaname.sig and";\
        echo " *** $$xdeltaname.directive.asc to either"
        echo " *** /incoming/alpha or /incoming/ftp on ftp-upload.gnu.org."
  -     echo " *** You might need to upload manual.html to webcvs/libtool."
   
   .PHONY: version-check
   version-check:
  @@ -65,7 +64,7 @@
   
   # TSDEPS will be defined to TSDEPS_DIST at `make dist' time
   TSDEPS =
  -TSDEPS_DIST = ChangeLog m4/libtool.m4
  +TSDEPS_DIST = ChangeLog
   CVS = cvs # set it to `:' to avoid CVS operations
   
   .PHONY: timestamps update-timestamps
  @@ -79,7 +78,7 @@
   .PHONY: cvs-news
   cvs-news:
   ## Make sure the NEWS file is up-to-date:
  -     @if sed '1,2d;3q' $(srcdir)/NEWS | grep -e "$(VERSION)" >/dev/null; \
  +     @if sed '1,3d;4q' $(srcdir)/NEWS | grep -e "$(VERSION)" >/dev/null; \
        then :; \
        else \
          echo "NEWS not updated; not releasing" 1>&2; \
  @@ -106,7 +105,9 @@
        (cd Fetchdir && \
        $(WGETSGO)/autoconf/autoconf/INSTALL; \
        $(WGETSGO)/automake/automake/lib/install-sh; \
  -     $(WGETSGO)/texinfo/texinfo/doc/texinfo.tex )
  +     $(WGETSGO)/texinfo/texinfo/doc/texinfo.tex; \
  +     $(WGETSGO)/texinfo/texinfo/util/gendocs.sh; \
  +     $(WGETSGO)/texinfo/texinfo/util/gendocs_template; )
   ## Don't exit after test because we want to give as many errors as
   ## possible.
        @stat=0; for file in $(FETCHFILES); do \
  @@ -133,13 +134,13 @@
   .PHONY: cvs-dist
   cvs-dist: cvs-news timestamps
   ## Build the distribution:
  -     $(MAKE) distcheck
  +     $(MAKE) dist
   ## Finally, if everything was successful, tag the release
        cd $(srcdir) \
  -       && $(CVS) -q tag `echo "release-$(VERSION)" | sed 's/\./-/g'`
  +       && $(CVS) -q tag `echo "release-$(VERSION)" | sed 's/\./_/g'`
   ## Generate signatures and directives for FSF ftp-upload:
        for suffix in .gz .bz2; do \
  -       ofile="$(PACKAGE)-$(VERSION).tar.$$suffix"; \
  +       ofile="$(PACKAGE)-$(VERSION).tar$$suffix"; \
          $(GPG) --detach-sign $$ofile \
          && echo "directory: $(PACKAGE)" > $$ofile.directive \
          && $(GPG) --clearsign $$ofile.directive \
  @@ -209,7 +210,12 @@
   
   .PHONY: web-manual
   web-manual:
  -     @$(LN_S) $(top_srcdir)/doc/libtool.texi doc/manual.texi
  -     $(TEXI2HTML) -I doc -monolithic -number -verbose doc/manual.texi
  -     @mv doc/manual.html manual.html
  -     @rm -f doc/manual.texi
  +     @ln -s `cd $(srcdir) && pwd`/doc/$(PACKAGE).texinfo doc/$(PACKAGE).texi
  +     @ln -s `cd $(srcdir) && pwd`/doc/version.texi doc/version.texi
  +     @ln -s `pwd`/Fetchdir/gendocs.sh doc/gendocs.sh
  +     @ln -s `pwd`/Fetchdir/gendocs_template doc/gendocs_template
  +     @cd doc; \
  +       $(SHELL) ./gendocs.sh $(PACKAGE) "GNU $(PACKAGE) - GNU macro 
processor"
  +     @rm -rf doc/$(PACKAGE).texi doc/version.texi doc/gendocs* manual
  +     @mv -f doc/manual .
  +     @echo " *** Upload the manual directory to web-cvs."
  
  
  --- orig/doc/m4.texinfo
  +++ mod/doc/m4.texinfo
  @@ -208,7 +208,7 @@
   Macros for text handling
   
   * Len::                         Calculating length of strings
  -* Index::                       Searching for substrings
  +* Index macro::                 Searching for substrings
   * Regexp::                      Searching for regular expressions
   * Substr::                      Extracting substrings
   * Translit::                    Translating characters
  @@ -2392,7 +2392,7 @@
   
   @menu
   * Len::                         Calculating length of strings
  -* Index::                       Searching for substrings
  +* Index macro::                 Searching for substrings
   * Regexp::                      Searching for regular expressions
   * Substr::                      Extracting substrings
   * Translit::                    Translating characters
  @@ -2400,7 +2400,7 @@
   * Format::                      Formatting strings (printf-like)
   @end menu
   
  address@hidden Len, Index, Text handling, Text handling
  address@hidden Len, Index macro, Text handling, Text handling
   @section Calculating length of strings
   
   @cindex length of strings
  @@ -2425,7 +2425,7 @@
   
   The builtin macro @code{len} is recognized only when given arguments.
   
  address@hidden Index, Regexp, Len, Text handling
  address@hidden Index macro, Regexp, Len, Text handling
   @section Searching for substrings
   
   @findex index
  @@ -2451,7 +2451,7 @@
   
   The builtin macro @code{index} is recognized only when given arguments.
   
  address@hidden Regexp, Substr, Index, Text handling
  address@hidden Regexp, Substr, Index macro, Text handling
   @section Searching for regular expressions
   
   @cindex regular expressions
  
  
  
- -- 
Gary V. Vaughan      ())_.  address@hidden,gnu.org}
Research Scientist   ( '/   http://tkd.kicks-ass.net
GNU Hacker           / )=   http://www.gnu.org/software/libtool
Technical Author   `(_~)_   http://sources.redhat.com/autobook
_________________________________________________________
This patch notification generated by tlaapply version 0.9
http://tkd.kicks-ass.net/arch/address@hidden/cvs-utils--tla--1.0
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.4 (Darwin)

iD8DBQFCS/0ZFRMICSmD1gYRAraRAKC+3xr2NoGUyH2hyv+4i/JveI3KkwCeLlNC
N0l15s1zx7Ja1gI8EvJmy7g=
=spnU
-----END PGP SIGNATURE-----