From owner-svn-doc-projects@FreeBSD.ORG Fri Feb 1 19:50:35 2013 Return-Path: Delivered-To: svn-doc-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 97724CDD; Fri, 1 Feb 2013 19:50:35 +0000 (UTC) (envelope-from gabor@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 7B700B63; Fri, 1 Feb 2013 19:50:35 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r11JoYPa042586; Fri, 1 Feb 2013 19:50:34 GMT (envelope-from gabor@svn.freebsd.org) Received: (from gabor@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r11JoYOB042585; Fri, 1 Feb 2013 19:50:34 GMT (envelope-from gabor@svn.freebsd.org) Message-Id: <201302011950.r11JoYOB042585@svn.freebsd.org> From: Gabor Kovesdan Date: Fri, 1 Feb 2013 19:50:34 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org Subject: svn commit: r40862 - projects/xml-tools/share/mk X-SVN-Group: doc-projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for doc projects trees List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 01 Feb 2013 19:50:35 -0000 Author: gabor Date: Fri Feb 1 19:50:33 2013 New Revision: 40862 URL: http://svnweb.freebsd.org/changeset/doc/40862 Log: - Build index in the DocBook XSL way Modified: projects/xml-tools/share/mk/doc.docbook.mk Modified: projects/xml-tools/share/mk/doc.docbook.mk ============================================================================== --- projects/xml-tools/share/mk/doc.docbook.mk Fri Feb 1 18:51:52 2013 (r40861) +++ projects/xml-tools/share/mk/doc.docbook.mk Fri Feb 1 19:50:33 2013 (r40862) @@ -139,13 +139,10 @@ DSLHTML?= ${DOC_PREFIX}/share/xml/defaul DSLPRINT?= ${DOC_PREFIX}/share/xml/default.dsl DSLPGP?= ${DOC_PREFIX}/share/xml/pgp.dsl -COLLATEINDEX= ${PREFIX}/share/sgml/docbook/dsssl/modular/bin/collateindex.pl - XSLXHTML?= ${DOC_PREFIX}/share/xsl/freebsd-xhtml.xsl XSLXHTMLCHUNK?= ${DOC_PREFIX}/share/xsl/freebsd-xhtml-chunk.xsl XSLEPUB?= ${DOC_PREFIX}/share/xsl/freebsd-epub.xsl XSLFO?= ${DOC_PREFIX}/share/xsl/freebsd-fo.xsl -INDEXREPORTSCRIPT= ${DOC_PREFIX}/share/misc/indexreport.pl IMAGES_LIB?= @@ -158,10 +155,6 @@ KNOWN_FORMATS= html html.tar html-split CSS_SHEET?= ${DOC_PREFIX}/share/misc/docbook.css PDFTEX_DEF?= ${DOC_PREFIX}/share/web2c/pdftex.def -HTMLOPTS?= -ioutput.html -d ${DSLHTML} ${HTMLFLAGS} - -HTMLTXTOPTS?= -ioutput.html -d ${DSLHTML} ${HTMLTXTFLAGS} - PRINTOPTS?= -ioutput.print -d ${DSLPRINT} ${PRINTFLAGS} .if defined(BOOK_OUTPUT) @@ -268,6 +261,13 @@ ZIP_CMD?= ${PREFIX}/bin/zip -j ${ZIP} # NO_SUBDIR= YES +# +# Index generation +# + +.if defined(GEN_INDEX) +XSLTPROCOPTS+= --param generate.index "1" +.endif # ------------------------------------------------------------------------ # @@ -421,25 +421,6 @@ CLEANFILES+= ${.CURDIR:T}.${_curformat}. .endfor .endif -# -# Index generation -# - -.if defined(GEN_INDEX) && defined(HAS_INDEX) -JADEFLAGS+= -i chap.index -HTML_SPLIT_INDEX?= html-split.index -HTML_INDEX?= html.index -PRINT_INDEX?= print.index -INDEX_SGML?= index.xml - -CLEANFILES+= ${INDEX_SGML} ${HTML_SPLIT_INDEX} ${HTML_INDEX} ${PRINT_INDEX} - -INIT_INDEX_SGML_CMD?= ${PERL} ${COLLATEINDEX} -i doc-index -N -o ${INDEX_SGML} -GEN_INDEX_SGML_CMD?= ${PERL} ${COLLATEINDEX} -i doc-index -g -o ${INDEX_SGML} ${.ALLSRC:M*.index} -.else -GEN_INDEX_SGML_CMD?= @${ECHO} "Index is disabled or no index to generate." -.endif - .MAIN: all all: ${SRCS} ${_docs} @@ -477,12 +458,10 @@ ${DOC}.parsed.xml: ${SRCS} index.html: ${DOC}.parsed.xml ${LOCAL_IMAGES_LIB} ${LOCAL_IMAGES_PNG} \ ${HTML_SPLIT_INDEX} ${LOCAL_CSS_SHEET} - ${GEN_INDEX_SGML_CMD} ${XSLTPROC} ${XSLTPROCOPTS} ${XSLXHTMLCHUNK} ${DOC}.parsed.xml ${DOC}.html: ${DOC}.parsed.xml ${LOCAL_IMAGES_LIB} ${LOCAL_IMAGES_PNG} \ ${LOCAL_CSS_SHEET} - ${GEN_INDEX_SGML_CMD} ${XSLTPROC} ${XSLTPROCOPTS} ${XSLXHTML} ${DOC}.parsed.xml > ${.TARGET} ${DOC}.html-split.tar: HTML.manifest ${LOCAL_IMAGES_LIB} \ @@ -545,7 +524,6 @@ ${.CURDIR:T}.pdb.${_curcomp}: ${DOC}.pdb .if !defined(NO_RTF) ${DOC}.rtf: ${DOC}.parsed.xml ${LOCAL_IMAGES_EPS} ${PRINT_INDEX} \ ${LOCAL_IMAGES_TXT} ${LOCAL_IMAGES_PNG} - ${GEN_INDEX_SGML_CMD} ${JADE_CMD} -V rtf-backend ${PRINTOPTS} -ioutput.rtf.images \ ${JADEOPTS} -t rtf -o ${.TARGET}-nopng ${XMLDECL} \ ${DOC}.parsed.xml @@ -570,7 +548,6 @@ ${DOC}.rtf: ${DOC}.tex: ${SRCS} ${LOCAL_IMAGES_EPS} ${PRINT_INDEX} \ ${LOCAL_IMAGES_TXT} ${LOCAL_IMAGES_EN} \ ${DOC}.parsed.xml - ${GEN_INDEX_SGML_CMD} ${JADE_CMD} -V tex-backend ${PRINTOPTS} \ ${JADEOPTS} -t tex -o ${.TARGET} ${XMLDECL} ${DOC}.parsed.xml @@ -580,7 +557,6 @@ ${DOC}.tex-ps: ${DOC}.tex .if !target(${DOC}.tex-pdf) ${DOC}.tex-pdf: ${SRCS} ${IMAGES_PDF} ${PRINT_INDEX} \ ${LOCAL_IMAGES_TXT} ${DOC}.parsed.xml - ${GEN_INDEX_SGML_CMD} ${RM} -f ${.TARGET} ${CAT} ${PDFTEX_DEF} > ${.TARGET} ${JADE_CMD} -V tex-backend ${PRINTOPTS} -ioutput.print.pdf \ @@ -641,7 +617,6 @@ ${DOC}.tex-pdf: .elif ${RENDERENGINE} == "fop" ${DOC}.fo: ${DOC}.xml ${LOCAL_IMAGES_LIB} ${LOCAL_IMAGES_PNG} - ${GEN_INDEX_SGML_CMD} ${XSLTPROC} ${XSLTPROCOPTS} ${XSLFO} ${DOC}.parsed.xml > ${.TARGET} ${DOC}.pdf: ${DOC}.fo ${LOCAL_IMAGES_LIB} ${LOCAL_IMAGES_PNG} @@ -686,35 +661,6 @@ lint validate: ${SRCS} # ------------------------------------------------------------------------ # -# Index targets -# - -# -# Generate a different .index file based on the format name -# -# If we're not generating an index (the default) then we need to create -# an empty index.xml file so that we can reference index.xml in book.sgml -# - - -${HTML_INDEX}: ${DOC}.parsed.xml ${LOCAL_IMAGES_TXT} - ${INIT_INDEX_SGML_CMD} - ${JADE_CMD} -V html-index -V nochunks ${HTMLOPTS} -ioutput.html.images \ - ${JADEOPTS} -t sgml ${XMLDECL} ${DOC}.parsed.xml > /dev/null - -${HTML_SPLIT_INDEX}: ${SRCS} ${LOCAL_IMAGES_TXT} - ${INIT_INDEX_SGML_CMD} - ${JADE_CMD} -V html-index ${HTMLOPTS} -ioutput.html.images \ - ${JADEOPTS} -t sgml ${XMLDECL} ${DOC}.parsed.xml > /dev/null - -.if !target(${PRINT_INDEX}) -${PRINT_INDEX}: ${HTML_INDEX} - ${CP} -p ${HTML_INDEX} ${.TARGET} -.endif - - -# ------------------------------------------------------------------------ -# # Compress targets # @@ -821,12 +767,6 @@ spellcheck-${_curformat}: spellcheck: ${FORMATS:C/^/spellcheck-/} -indexreport: -.for _entry in ${SRCS:M*.xml} - @echo "indexreport ${_entry}" - @${PERL} ${INDEXREPORTSCRIPT} ${.CURDIR}/${_entry} -.endfor - # # Build a list of install-format targets to be installed. These will be # dependencies for the "realinstall" target.