From: Michael Smith <xmldoc@users.sourceforge.net>
Date: Wed, 5 Apr 2006 05:01:01 +0000 (+0000)
Subject: Re-reworked the mechanism for identifying DocBook element names
X-Git-Tag: release/1.79.1~6^2~2928
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=095234769f2bc77b32ba4459bf3b8ba20ad63d17;p=docbook-dsssl

Re-reworked the mechanism for identifying DocBook element names
and DocBook XSL param names in commit messages. It now relies on
the same files in xsl/docsrc that are used in generating the TDG
links and links to the DocBook XSL stylesheet param docs.
---

diff --git a/releasetools/Targets.mk b/releasetools/Targets.mk
index 74219a05d..7603c2e95 100644
--- a/releasetools/Targets.mk
+++ b/releasetools/Targets.mk
@@ -22,11 +22,12 @@ RELEASE-NOTES.pdf: RELEASE-NOTES.xml NEWS.xml
 $(MARKUP_XSL):
 	$(MAKE) -C $(dir $(MARKUP_XSL))
 
-NEWS.xml: ChangeLog.xml TERMS.xml
+NEWS.xml: ChangeLog.xml
 	$(XSLT) $< $(CVS2CL2DOCBOOK) $@ \
 	latest-tag="'$(LATEST_TAG)'" \
 	release-version="'$(RELVER)'" \
-	terms.file="'$(shell readlink -f TERMS.xml)'"
+	element.file="'$(shell readlink -f ./docsrc/docbook-elements.xsl)'" \
+	param.file="'$(shell readlink -f ./docsrc/xsl-params.xsl)'"
 
 NEWS.html: NEWS.xml
 	$(XSLT) $< $(DOC-LINK-STYLE) $@
@@ -56,11 +57,6 @@ ChangeHistory.xml:
 	$(CVS2CL) $(CVS2CL_OPTS) \
 	--xml -f $@ -g -q
 
-TERMS.xml: $(GET_TERMS) $(DISTRIB_PARAMS_FILES) $(DOCBOOK_RNG_FILES)
-	$(XSLT) $< $< $@ \
-	element.files="'$(DOCBOOK_RNG_FILES)'" \
-	param.files="'$(DISTRIB_PARAMS_FILES)'"
-
 .CatalogManager.properties.example:
 	cp -p $(CATALOGMANAGER) .CatalogManager.properties.example
 
diff --git a/releasetools/Variables.mk b/releasetools/Variables.mk
index 61deb2c57..086f4146d 100644
--- a/releasetools/Variables.mk
+++ b/releasetools/Variables.mk
@@ -26,10 +26,6 @@ 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
 
-GET_TERMS=$(DOCBOOK_CVS)/releasetools/get-terms.xsl
-
-DOCBOOK_RNG_FILES=$(DOCBOOK_CVS)/docbook/relaxng/docbook/docbook.rng
-
 # stylesheet for generating FO version of release notes
 FO-STYLE=$(DOCBOOK_CVS)/xsl/fo/docbook.xsl