From b5119c8fa4a09c49bc7cfa9aaa7d181856a124d0 Mon Sep 17 00:00:00 2001 From: Guido Draheim Date: Wed, 27 Sep 2006 20:45:16 +0000 Subject: [PATCH] changes (.) --- ChangeLog | 1 + Makefile.am | 2 +- Makefile.in | 2 +- configure.ac | 5 +++-- docs/Makefile.am | 14 +++++++++++--- docs/Makefile.in | 14 +++++++++++--- docs/body.htm | 1 + 7 files changed, 29 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3bc955b..72174bb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,6 @@ 2006-09-27 * adding docs/zip-php.htm integrating Chris Branch's mail into the docs + * appending docs/changes.htm rule from ./ChangeLog 2006-09-26 * adding docs/notes.htm - to register some old dicussions for later diff --git a/Makefile.am b/Makefile.am index 7e39caa..b61b5b9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -11,7 +11,7 @@ rpm2: dist-bzip2 $(PACKAGE).spec rpmbuild -ta $(PACKAGE)-$(VERSION).tar.bz2 doc docs docu clean-doc clean-docs clean-docu zzip.html zzip.xml zzip.pdf \ -man mans manpages htmpages unpack clean-unpack pdfs \ +man mans manpages htmpages unpack clean-unpack changes.htm pdfs \ omf install-omf install-doc install-docs install-sf install-man3 install-mans : (cd docs && $(MAKE) `basename $@`) diff --git a/Makefile.in b/Makefile.in index ec0352b..dfd1f18 100644 --- a/Makefile.in +++ b/Makefile.in @@ -706,7 +706,7 @@ rpm2: dist-bzip2 $(PACKAGE).spec rpmbuild -ta $(PACKAGE)-$(VERSION).tar.bz2 doc docs docu clean-doc clean-docs clean-docu zzip.html zzip.xml zzip.pdf \ -man mans manpages htmpages unpack clean-unpack pdfs \ +man mans manpages htmpages unpack clean-unpack changes.htm pdfs \ omf install-omf install-doc install-docs install-sf install-man3 install-mans : (cd docs && $(MAKE) `basename $@`) diff --git a/configure.ac b/configure.ac index 65bc3bf..60dad54 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ AC_INIT(zziplib.spec) AC_PREREQ(2.49) AC_COPYRIGHT([Guido Draheim for ZZipLib.SF.net]) -AC_REVISION($Revision: 1.7 $) +AC_REVISION($Revision: 1.8 $) AC_CONFIG_AUX_DIR(uses) # ======================================================================= AC_CANONICAL_SYSTEM @@ -301,7 +301,8 @@ AX_CFLAGS_GCC_OPTION(-Wmissing-declarations) AX_ENABLE_DEFAULT_PKGCONFIGDIR AX_ENABLE_DEFAULT_ACLOCALDIR AC_SUBST([CONFIG_FILES]) -AC_OUTPUT([Makefile zzip/Makefile zzipwrap/Makefile SDL/Makefile +AC_OUTPUT([Makefile + zzip/Makefile zzipwrap/Makefile SDL/Makefile docs/Makefile test/Makefile bins/Makefile]) dnl ------------------------------------------------------------- PATCH_LIBTOOL_ON_DARWIN_ZSH_OVERQUOTING diff --git a/docs/Makefile.am b/docs/Makefile.am index 5b9e0bb..15d1115 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -14,6 +14,7 @@ htm_FILES = zzip-index.htm zzip-zip.htm zzip-file.htm zzip-sdl-rwops.htm \ configs.htm sfx-make.htm developer.htm download.htm \ history.htm referentials.htm faq.htm copying.htm notes.htm \ functions.htm zip-php.htm +htms_FILES = changes.htm SDL = @top_srcdir@/SDL SDL_RWOPS = $(SDL)/SDL_rwops_zzcat.c \ $(SDL)/SDL_rwops_zzip.c $(SDL)/SDL_rwops_zzip.h @@ -35,8 +36,8 @@ zzipdoc_FILES = makedocs.py zzipdoc/__init__.py \ zzipdoc/functionprototype.py zzipdoc/htmldocument.py \ zzipdoc/docbookdocument.py -html_FILES = $(htm_FILES:.htm=.html) \ - $(htm_FILES:.htm=.print.html) \ +html_FILES = $(htm_FILES:.htm=.html) $(htms_FILES:.htm=.html) \ + $(htm_FILES:.htm=.print.html) $(htms_FILES:.htm=.print.html) \ site.html site.print.html default : doc @@ -228,11 +229,18 @@ install-omf : omf zziplib.xml zzipmmapped.xml zzipfseeko.xml site.htm : body.htm cp $(srcdir)/body.htm site.htm mksite_sh_args = --VERSION=$(VERSION) --xml --src-dir=$(srcdir) --print -site.html : body.htm site.htm mksite.sh $(htm_FILES) +site.html : body.htm site.htm mksite.sh $(htm_FILES) $(htms_FILES) cp $(srcdir)/body.htm site.htm perl $(srcdir)/mksite.pl $(mksite_sh_args) site.htm || \ $(SHELL) $(srcdir)/mksite.sh $(mksite_sh_args) site.htm +changes.htm : $(top_srcdir)/ChangeLog Makefile + echo "
" > $@ ; cat $(top_srcdir)/ChangeLog \
+	| sed -e "s,\\&,\\&\\;,g" \
+	-e "s,<,\\<\\;,g" -e "s,>,\\>\\;,g" \
+	-e "/^[A-Z].*[12][09][09][09]/s,\\(.*\\),&," \
+	-e "/^[0-9]/s,\\(.*\\),&," >> $@ ; echo "
" >>$@ + # ----------------------------------------------- create pdf via docbook xml # sorry, the xmlto / docbook-xsl are too broken to rebuild the PDF anymore diff --git a/docs/Makefile.in b/docs/Makefile.in index fd5ce17..ae1cbe5 100644 --- a/docs/Makefile.in +++ b/docs/Makefile.in @@ -219,6 +219,7 @@ htm_FILES = zzip-index.htm zzip-zip.htm zzip-file.htm zzip-sdl-rwops.htm \ history.htm referentials.htm faq.htm copying.htm notes.htm \ functions.htm zip-php.htm +htms_FILES = changes.htm SDL_RWOPS = $(SDL)/SDL_rwops_zzcat.c \ $(SDL)/SDL_rwops_zzip.c $(SDL)/SDL_rwops_zzip.h @@ -239,8 +240,8 @@ zzipdoc_FILES = makedocs.py zzipdoc/__init__.py \ zzipdoc/functionprototype.py zzipdoc/htmldocument.py \ zzipdoc/docbookdocument.py -html_FILES = $(htm_FILES:.htm=.html) \ - $(htm_FILES:.htm=.print.html) \ +html_FILES = $(htm_FILES:.htm=.html) $(htms_FILES:.htm=.html) \ + $(htm_FILES:.htm=.print.html) $(htms_FILES:.htm=.print.html) \ site.html site.print.html omfdir = ${datadir}/omf @@ -595,11 +596,18 @@ install-omf : omf zziplib.xml zzipmmapped.xml zzipfseeko.xml # ----------------------------------------------- mksite.sh for the main html site.htm : body.htm cp $(srcdir)/body.htm site.htm -site.html : body.htm site.htm mksite.sh $(htm_FILES) +site.html : body.htm site.htm mksite.sh $(htm_FILES) $(htms_FILES) cp $(srcdir)/body.htm site.htm perl $(srcdir)/mksite.pl $(mksite_sh_args) site.htm || \ $(SHELL) $(srcdir)/mksite.sh $(mksite_sh_args) site.htm +changes.htm : $(top_srcdir)/ChangeLog Makefile + echo "
" > $@ ; cat $(top_srcdir)/ChangeLog \
+	| sed -e "s,\\&,\\&\\;,g" \
+	-e "s,<,\\<\\;,g" -e "s,>,\\>\\;,g" \
+	-e "/^[A-Z].*[12][09][09][09]/s,\\(.*\\),&," \
+	-e "/^[0-9]/s,\\(.*\\),&," >> $@ ; echo "
" >>$@ + # ----------------------------------------------- create pdf via docbook xml # sorry, the xmlto / docbook-xsl are too broken to rebuild the PDF anymore diff --git a/docs/body.htm b/docs/body.htm index ed45f5f..a2b2dba 100644 --- a/docs/body.htm +++ b/docs/body.htm @@ -70,6 +70,7 @@
<> zziplib.sf.net Home +
<> ChangeLog
LGPL/MPL license
 
-- 2.40.0