Made changes to re-activate build of ChangeLog.xml and

ChangeHistory.xml files.

diff --git a/releasetools/Targets.mk b/releasetools/Targets.mk
index 6e3d2d33e757609536287fb778a89893804a4fab..6845cd7d2f50bb39746aac697af111593e4fcd95 100644 (file)
--- a/releasetools/Targets.mk
+++ b/releasetools/Targets.mk
@@ -47,17 +47,14 @@ NEWS.html: NEWS.xml
 $(NEWSFILE): NEWS.html
        LANG=C $(BROWSER) $(BROWSER_OPTS) $< > $@
 
-#ChangeLog.xml: LatestTag
-#      $(CVS2CL) $(CVS2CL_OPTS) \
-#      --delta $(LATEST_TAG):HEAD --stdout --xml -g -q > $@
+ChangeLog.xml: PreviousRelease
+       $(SVN) $(SVN_OPTS) log --xml --verbose \
+       -r HEAD:$(PREVIOUS_RELEASE) \
+       | $(XMLLINT) $(XMLLINT_OPTS) --format - > $@
 
-LatestTag:
-# Note that one of the old commit messsage in the cvs log contains
-# a ^Z (x1a) character, which is not legal in XML, so it must
-# strip it out before using it with any XML processing apps
-#      $(CVS2CL) $(CVS2CL_OPTS) --stdout --xml -g -q \
-#      | $(SED) $(SED_OPTS) 's/\x1a//g' \
-#      | $(XSLTPROC) $(GET_LATEST_TAG) - > $@
+PreviousRelease:
+       $(SVN) $(SVN_OPTS) list --xml VERSION \
+       | $(XSLTPROC) $(GET_PREVIOUS_RELEASE) - > $@
 
 ChangeHistory.xml.zip: ChangeHistory.xml
        $(ZIP) $(ZIP_OPTS) $@ $<
@@ -66,8 +63,7 @@ ChangeHistory.xml.zip: ChangeHistory.xml
 # ChangeHistory.xml holds the whole change history for the module,
 # including all subdirectories
 ChangeHistory.xml:
-#      $(CVS2CL) $(CVS2CL_OPTS) \
-#      --stdout --xml -g -q > $@
+       $(SVN) $(SVN_OPTS) log --xml --verbose > $@
 
 .CatalogManager.properties.example:
        cp -p $(CATALOGMANAGER) .CatalogManager.properties.example

diff --git a/releasetools/Variables.mk b/releasetools/Variables.mk
index 7bbd2365f092fb9c2c27411092677b0b462e7999..1ab37da95b4979c2693363c0ea5f8a4c8358611a 100644 (file)
--- a/releasetools/Variables.mk
+++ b/releasetools/Variables.mk
@@ -23,8 +23,9 @@ MARKUP_XSL=$(DOCBOOK_SVN)/contrib/tools/tennison/modified-markup.xsl
 # script, and using it to generate NEWS file(s) and releases notes
 CVS2CL2DOCBOOK=$(DOCBOOK_SVN)/releasetools/cvs2cl2docbook.xsl
 
-# stylesheet used for determining the latest cvs tag in cvs log
-GET_LATEST_TAG=$(DOCBOOK_SVN)/releasetools/get-latest-tag.xsl
+# stylesheet used for determining the revision number of the
+# last/latest release
+GET_PREVIOUS_RELEASE=$(DOCBOOK_SVN)/releasetools/get-previous-release.xsl
 
 # stylesheet for stripping DB5 namespace
 STRIP_NS=$(DOCBOOK_SVN)/xsl/common/stripns.xsl
@@ -53,7 +54,7 @@ DBLATEX_FLAGS = -b pdftex
 # file containing "What's New" info generated from CVS log
 NEWSFILE=NEWS
 
-LATEST_TAG=$(shell if [ -f LatestTag ];then cat LatestTag; fi)
+PREVIOUS_RELEASE=$(shell if [ -f PreviousRelease ];then cat PreviousRelease; fi)
 
 # determine RELVER automatically by:
 #
@@ -159,8 +160,8 @@ XMLLINT=xmllint
 XMLLINT_OPTS=
 XINCLUDE=$(XMLLINT) $(XMLLINT_OPTS) --xinclude
 
-CVS2CL=cvs2cl
-CVS2CL_OPTS=
+SVN=svn
+SVN_OPTS=
 
 SED=sed
 SED_OPTS=

diff --git a/releasetools/get-latest-tag.xsl b/releasetools/get-previous-release.xsl
similarity index 60%
rename from releasetools/get-latest-tag.xsl
rename to releasetools/get-previous-release.xsl
index e0ec2500486812443b315a14fc77edda02f91e94..61e9cf476d9e30e8dd450547222cd8737ebd3d96 100644 (file)
--- a/releasetools/get-latest-tag.xsl
+++ b/releasetools/get-previous-release.xsl
@@ -14,10 +14,12 @@
   <xsl:output method="text"/>
 
   <xsl:template match="/">
-    <!-- * Get the value of the first tagdatetag element in the document -->
-    <!-- * that starts with a "V" (V1691, etc.). That is, hopefully, the -->
-    <!-- * tag for the previous release. -->
-    <xsl:value-of select="(//*[local-name() = 'tagdatetag'][starts-with(.,'V')])[1]"/>
+    <!-- * The value of the "revision" attribute on the commit element -->
+    <!-- * indicates the last time the file was checked in; since this -->
+    <!-- * is the VERSION file, and that only gets checked in once per -->
+    <!-- * release, that value should indicate the revision number -->
+    <!-- * associated with the latest release. -->
+    <xsl:value-of select="/lists/list/entry/commit/@revision"/>
   </xsl:template>
 
 </xsl:stylesheet>