<pre style='margin:0'>
Rainer Müller (raimue) pushed a commit to branch master
in repository macports-guide.
</pre>
<p><a href="https://github.com/macports/macports-guide/commit/0215482cd92bb254c0348d03f7fd35013b66a65a">https://github.com/macports/macports-guide/commit/0215482cd92bb254c0348d03f7fd35013b66a65a</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 0215482 Makefile: Use a user-defined function for xml2html
</span>0215482 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 0215482cd92bb254c0348d03f7fd35013b66a65a
</span>Author: Rainer Müller <raimue@macports.org>
AuthorDate: Mon Apr 23 18:13:42 2018 +0200
<span style='display:block; white-space:pre;color:#404040;'> Makefile: Use a user-defined function for xml2html
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> The previous rule with target-specific parameters did not work with
</span><span style='display:block; white-space:pre;color:#404040;'> 'make all' as the prerequisite would only be executed once.
</span>---
Makefile | 38 +++++++++++++++++++-------------------
1 file changed, 19 insertions(+), 19 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/Makefile b/Makefile
</span><span style='display:block; white-space:pre;color:#808080;'>index 07aec62..8bcc8b5 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/Makefile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/Makefile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -53,25 +53,24 @@ GUIDE_XSL_CHUNK = $(GUIDE)/resources/chunk.xsl
</span> # DocBook HTML stylesheet for the guide.
STYLESHEET = docbook.css
<span style='display:block; white-space:pre;background:#ffe0e0;'>-.PHONY: all guide guide-chunked guide-dblatex clean validate
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+.PHONY: all clean guide guide-chunked guide-fromadoc guide-xml2html guide-dblatex validate
</span>
all: guide guide-chunked
# Generate the HTML guide using DocBook from the XML sources
<span style='display:block; white-space:pre;background:#ffe0e0;'>-guide: GUIDE_OUTDIR= $(GUIDE_RESULT)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-guide-chunked: GUIDE_OUTDIR = $(GUIDE_RESULT)/chunked
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-guide-chunked: GUIDE_XSL = $(GUIDE_XSL_CHUNK)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-guide: guide-xml2html
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-guide-chunked:: guide-xml2html
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+guide: $(GUIDE)/resources/xsl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(call xml2html,$(GUIDE_XML),$(GUIDE_RESULT),$(GUIDE_XSL))
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Experimental adoc input files
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-guide-fromadoc: GUIDE_XML = $(GUIDE_ADOC)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-guide-fromadoc: GUIDE_OUTDIR = $(GUIDE_RESULT)/fromadoc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-guide-fromadoc: guide-adoc2xml guide-xml2html
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+guide-chunked:: $(GUIDE)/resources/xsl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(call xml2html,$(GUIDE_XML),$(GUIDE_RESULT)/chunked,$(GUIDE_XSL_CHUNK))
</span>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Experimental adoc input files
</span> guide-adoc2xml:
$(ASCIIDOCTOR) -b docbook $(GUIDE_ADOC)/guide.adoc
<span style='display:block; white-space:pre;background:#e0ffe0;'>+guide-fromadoc: guide-adoc2xml $(GUIDE)/resources/xsl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(call xml2html,$(GUIDE_ADOC),$(GUIDE_RESULT)/adoc,$(GUIDE_XSL))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # Rules to generate HTML from DocBook XML
$(GUIDE)/resources/xsl:
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -81,24 +80,25 @@ else
</span> $(LN) -sfh $(DOCBOOK) $(GUIDE)/resources/xsl
endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>-guide-xml2html: $(GUIDE)/resources/xsl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(MKDIR) -p $(GUIDE_OUTDIR)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(CP) $(GUIDE)/resources/$(STYLESHEET) $(GUIDE_OUTDIR)/$(STYLESHEET)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(CP) $(GUIDE)/resources/images/* $(GUIDE_OUTDIR)/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(CP) $(GUIDE)/resources/*.js $(GUIDE_OUTDIR)/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+define xml2html
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(MKDIR) -p $(2)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(CP) $(GUIDE)/resources/$(STYLESHEET) $(2)/$(STYLESHEET)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(CP) $(GUIDE)/resources/images/* $(2)/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(CP) $(GUIDE)/resources/*.js $(2)/
</span> $(XSLTPROC) --xinclude \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --output $(GUIDE_OUTDIR)/index.html \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(GUIDE_XSL) $(GUIDE_XML)/guide.xml
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --output $(2)/index.html \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(3) $(1)/guide.xml
</span> # Convert all sections (h1-h9) to a link so it's easy to link to them.
# If someone knows a better way to do this please change it.
$(REINPLACE) \
's|(<h[0-9] [^>]*><a id="([^"]*)"></a>)([^<]*)(</h[0-9]>)|\1<a href="#\2">\3</a>\4|g' \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- $(GUIDE_OUTDIR)/index.html
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(2)/index.html
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+endef
</span>
guide-chunked::
# Add the table of contents to every chunked HTML file.
# If someone knows a better way to do this please change it.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- $(TCLSH) toc-for-chunked.tcl $(GUIDE_OUTDIR)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(TCLSH) toc-for-chunked.tcl $(GUIDE_RESULT)/chunked
</span>
# Generate the guide as a PDF.
guide-dblatex: SUFFIX = pdf
</pre><pre style='margin:0'>
</pre>