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 74219a05d993350bf0e446ae4c5f286b5d52cfac..7603c2e958177b0771fe5aca24c5f444f0dc8bda 100644 (file)
--- 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 61deb2c578f013711ec9fd6f9c2b241cfb598938..086f4146d570dccf3d5a6c9728f6b698c3ae1d09 100644 (file)
--- 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