Added support for using dblatex to generated PDF of release notes

(as alternative to XEP).

diff --git a/releasetools/Targets.mk b/releasetools/Targets.mk
index b09306970dc3b3fc94bfb374c62051fd2a424064..74d5939148d38b0428bfe67714f3bceb11b29db0 100644 (file)
--- a/releasetools/Targets.mk
+++ b/releasetools/Targets.mk
@@ -15,9 +15,21 @@ RELEASE-NOTES.txt: RELEASE-NOTES.html
 
 RELEASE-NOTES.pdf: RELEASE-NOTES.xml NEWS.xml
        $(XINCLUDE) $< > RELEASE-NOTES-TMP.xml
+ifeq ($(PDF_MAKER),xep)
        $(XSLT) RELEASE-NOTES-TMP.xml $(FO-STYLE) $(basename $<).fo $(FO_ENGINE).extensions=1 \
-       && $(FO_ENGINE) $(FO_ENGINE_OPTS) $(basename $<).fo
+       && $(XEP) $(XEP_FLAGS) $(basename $<).fo
        $(RM) RELEASE-NOTES-TMP.xml
+else
+ifeq ($(PDF_MAKER),dblatex)
+       $(XSLT) RELEASE-NOTES-TMP.xml $(STRIP_NS) RELEASE-NOTES-STRIPPED-TMP.xml
+       -$(DBLATEX) $(DBLATEX_FLAGS) \
+         -p $(DBX-STYLE) \
+         -o $@ \
+         RELEASE-NOTES-STRIPPED-TMP.xml
+       $(RM) RELEASE-NOTES-STRIPPED-TMP.xml
+       $(RM) RELEASE-NOTES-TMP.xml
+endif
+endif
 
 $(MARKUP_XSL):
        $(MAKE) -C $(dir $(MARKUP_XSL))

diff --git a/releasetools/Variables.mk b/releasetools/Variables.mk
index 086f4146d570dccf3d5a6c9728f6b698c3ae1d09..2aa14ff06898134e42c5d9900df4da27ef870a66 100644 (file)
--- a/releasetools/Variables.mk
+++ b/releasetools/Variables.mk
@@ -26,9 +26,15 @@ CVS2CL2DOCBOOK=$(DOCBOOK_CVS)/releasetools/cvs2cl2docbook.xsl
 # stylesheet used for determining the latest cvs tag in cvs log
 GET_LATEST_TAG=$(DOCBOOK_CVS)/releasetools/get-latest-tag.xsl
 
+# stylesheet for stripping DB5 namespace
+STRIP_NS=$(DOCBOOK_CVS)/xsl/common/stripns.xsl
+
 # stylesheet for generating FO version of release notes
 FO-STYLE=$(DOCBOOK_CVS)/xsl/fo/docbook.xsl
 
+# stylesheet for generating PDF of release notes with dblatex
+DBX-STYLE=$(DOCBOOK_CVS)/xsl/docsrc/dblatex-release-notes.xsl
+
 # browser to use for making text version of release notes
 # w3mmee is a fork of w3m; it provides a lot more options for
 # charset handling; other possible values for BROWSER include
@@ -36,9 +42,13 @@ FO-STYLE=$(DOCBOOK_CVS)/xsl/fo/docbook.xsl
 BROWSER=w3mmee
 BROWSER_OPTS=-dump
 
-# XSL-FO engine to use for coverting XSL-FO output to PDF
-FO_ENGINE=xep
-FO_ENGINE_OPTS=
+PDF_MAKER=dblatex
+
+XEP = xep
+XEP_FLAGS =
+
+DBLATEX = dblatex
+DBLATEX_FLAGS = -b pdftex
 
 # file containing "What's New" info generated from CVS log
 NEWSFILE=NEWS