From fd0487592e7aa2d59bfb8053eea115c50285410d Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Fri, 26 May 2006 19:57:35 +0000 Subject: [PATCH] Documentation now based on Docbook XML/XSLT using xsltproc + Norman Walsh's stylesheets. It means that the CVS version is no longer depending on jade/openjade or docbook-to-man scripts. PDF is no longer part of the distribution - but can optionally be made using DSSSL/jadetex or FOP. --- buildconf.sh | 7 ++++--- configure.ac | 8 +++----- doc/Makefile.am | 14 ++++++++------ doc/yaz-proxy-man.xml | 6 ++++-- doc/yazproxy.xml.in | 19 ++++++++----------- 5 files changed, 27 insertions(+), 27 deletions(-) diff --git a/buildconf.sh b/buildconf.sh index 7becb16..7187d30 100755 --- a/buildconf.sh +++ b/buildconf.sh @@ -1,5 +1,5 @@ #!/bin/sh -# $Id: buildconf.sh,v 1.11 2006-03-30 16:38:42 adam Exp $ +# $Id: buildconf.sh,v 1.12 2006-05-26 19:57:35 adam Exp $ if automake --version|head -1 |grep '1\.[4-7]'; then echo "automake 1.4-1.7 is active. You should use automake 1.8 or later" if test -f /etc/debian_version; then @@ -70,7 +70,8 @@ Or just build the Debian packages without configuring dpkg-buildpackage -rfakeroot When building from a CVS checkout, you need these Debian tools: - autoconf, automake, libtool, gcc, docbook-utils, docbook, docbook-xml, - docbook-dsssl, jade, jadetex, libxslt1-dev, libyazpp1-dev + autoconf, automake, libtool, gcc, g++, make, + xsltproc, docbook, docbook-xml, docbook-xsl, + libxslt1-dev, libyazpp1-dev EOF fi diff --git a/configure.ac b/configure.ac index 7a4a80b..a46be3f 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ dnl yazproxy, Index Data 1994-2006 dnl See the file LICENSE for details. -dnl $Id: configure.ac,v 1.8 2006-05-01 09:17:10 adam Exp $ +dnl $Id: configure.ac,v 1.9 2006-05-26 19:57:35 adam Exp $ AC_PREREQ(2.59) AC_INIT([yazproxy],[1.2.1],[adam@indexdata.dk]) AC_CONFIG_SRCDIR(configure.ac) @@ -66,9 +66,7 @@ AC_OUTPUT([ doc/Makefile doc/yazproxy.xml doc/common/Makefile - doc/common/html.dsl - doc/common/html.xsl - doc/common/print.dsl - doc/common/tkl.xsl + doc/common/tkl.xsl doc/common/html.xsl doc/common/man.xsl + doc/common/print.dsl doc/common/html.dsl etc/Makefile ]) diff --git a/doc/Makefile.am b/doc/Makefile.am index 4384417..f9e4f81 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,4 +1,4 @@ -## $Id: Makefile.am,v 1.9 2006-04-20 12:05:54 adam Exp $ +## $Id: Makefile.am,v 1.10 2006-05-26 19:57:35 adam Exp $ docdir=$(datadir)/doc/@PACKAGE@ SUBDIRS = common @@ -14,7 +14,9 @@ XMLFILES = \ yazproxy.xml.in TOP=yazproxy.xml + MANFILES=yazproxy.8 + HTMLFILES = \ installation.html \ introduction.html \ @@ -35,19 +37,19 @@ HTMLFILES = \ windows.html \ yazproxy-man.html \ yazproxy-schema.html \ - yazproxy.html + index.html -doc_DATA = $(HTMLFILES) yazproxy.pdf +doc_DATA = $(HTMLFILES) man_MANS = $(MANFILES) EXTRA_DIST = $(XMLFILES) $(doc_DATA) $(man_MANS) $(HTMLFILES): $(XMLFILES) - jade -E14 -D $(srcdir) -d common/html.dsl -t sgml $(srcdir)/common/xml.dcl $(TOP) + xsltproc common/html.xsl $(TOP) yazproxy.8: yaz-proxy-man.xml yaz-proxy-ref.xml - docbook2man $(srcdir)/yaz-proxy-man.xml + xsltproc common/man.xsl $(srcdir)/yaz-proxy-man.xml yazproxy.pdf: $(XMLFILES) if test ! -f common/id.png ; then cp $(srcdir)/common/id.png common; fi @@ -63,7 +65,7 @@ clean-data-hook: rm -f [0-9]* *.bak dist-hook: - for f in $(srcdir)/*.html; do \ + for f in *.html; do \ found=0; \ b=`basename $$f`; \ for h in $(HTMLFILES); do \ diff --git a/doc/yaz-proxy-man.xml b/doc/yaz-proxy-man.xml index 0634c00..31f13b8 100644 --- a/doc/yaz-proxy-man.xml +++ b/doc/yaz-proxy-man.xml @@ -1,7 +1,9 @@ - ]> - + &yaz-proxy-ref; SEE ALSO diff --git a/doc/yazproxy.xml.in b/doc/yazproxy.xml.in index bbf03c8..3d39dc2 100644 --- a/doc/yazproxy.xml.in +++ b/doc/yazproxy.xml.in @@ -1,16 +1,13 @@ - - - - - - - + + %entities; + %common; ]> - + YAZ proxy User's Guide and Reference @@ -31,7 +28,7 @@ This manual covers version @VERSION@. - CVS ID: $Id: yazproxy.xml.in,v 1.7 2006-04-26 12:17:23 adam Exp $ + CVS ID: $Id: yazproxy.xml.in,v 1.8 2006-05-26 19:57:35 adam Exp $ -- 1.7.10.4