Refined mechanism for generating NEWS and RELEASENOTES.* files such that those

generated files for the xsl release will now also track changes to files in
the gentext module (e.g., new locales added or changed). This adds a
"Gentext" section to the docbook-xsl release notes.

diff --git a/releasetools/Targets.mk b/releasetools/Targets.mk
index 752396f50a36c5c12bb0d4298b3fbe5fcc4e9fef..ea231289f4654fbab9437d960f2f0646d48585ea 100644 (file)
--- a/releasetools/Targets.mk
+++ b/releasetools/Targets.mk
@@ -38,6 +38,7 @@ $(MARKUP_XSL):
 
 NEWS.xml: ChangeLog.xml
        $(XSLT) $< $(SVNLOG2DOCBOOK) $@ \
+       distro="$(DISTRO)" \
        previous-release="$(PREVIOUS_RELEASE)" \
        release-version="$(RELVER)" \
        element.file="$(shell readlink -f $(DOCBOOK_ELEMENTS))" \
@@ -52,6 +53,8 @@ $(NEWSFILE): NEWS.html
 ChangeLog.xml:
        $(SVN) $(SVN_OPTS) log --xml --verbose \
        -r HEAD:$(PREVIOUS_REVISION) \
+       $(REPOSITORY_ROOT)/trunk \
+       $(DISTRO) $(DISTRIB_CHANGELOG_INCLUDES) \
        | $(XMLLINT) $(XMLLINT_OPTS) --format - > $@
 
 ChangeHistory.xml.zip: ChangeHistory.xml

diff --git a/releasetools/Variables.mk b/releasetools/Variables.mk
index 8bc0063f98e48c21570fc3ffce5599c32943cb47..b36c0ab734119954eaa88d8fe1057947a73c9bff 100644 (file)
--- a/releasetools/Variables.mk
+++ b/releasetools/Variables.mk
@@ -10,6 +10,8 @@
 
 include $(DOCBOOK_SVN)/buildtools/Makefile.incl
 
+REPOSITORY_ROOT=https://docbook.svn.sourceforge.net/svnroot/docbook
+
 CATALOGMANAGER=$(DOCBOOK_SVN)/releasetools/.CatalogManager.properties.example
 INSTALL_SH=$(DOCBOOK_SVN)/releasetools/install.sh
 MAKECATALOG=$(DOCBOOK_SVN)/releasetools/make-catalog.xsl

diff --git a/releasetools/svnlog2docbook.xsl b/releasetools/svnlog2docbook.xsl
index e7dc47eb2943a6eeef4d30223a913152e0a866a6..840523670bc022b4ed70925039ad29c18e0b025a 100644 (file)
--- a/releasetools/svnlog2docbook.xsl
+++ b/releasetools/svnlog2docbook.xsl
@@ -22,6 +22,9 @@
   <xsl:import href="../contrib/tools/tennison/modified-markup.xsl" />
   <xsl:include href="../xsl/lib/lib.xsl" />
 
+  <!-- * name of main distro this changelog is for-->
+  <xsl:param name="distro"/>
+
   <!-- * file containing DocBook XSL stylesheet param names -->
   <xsl:param name="param.file"/>
 
@@ -70,7 +73,7 @@
   <!-- * notes, then just add a "display name" for the subdirectory -->
   <xsl:param
       name="subsections"
-      >Common Gentext Extensions FO HTML Highlighting HTMLHelp Lib Manpages Roundtrip Slides Website Params Profiling Template Tools</xsl:param>
+      >Gentext Common FO HTML HTMLHelp Lib Manpages Roundtrip Slides Website Params Highlighting Profiling Template Tools</xsl:param>
 
   <sf:users>
     <!-- * The sf:users structure associates Sourceforge usernames -->
@@ -168,7 +171,10 @@
     <xsl:if test="not($subsection = '')">
       <!-- * Output a sect2 for this subsection only if with find path names -->
       <!-- * for changed files in this subsection -->
-      <xsl:if test="logentry[paths/path[starts-with(.,concat('/trunk/xsl/',$dirname,'/'))]]">
+      <xsl:if test="logentry[paths/path[
+        starts-with(.,concat('/trunk/',$distro,'/',$dirname,'/'))
+        or starts-with(.,concat('/trunk/',$dirname,'/'))]]
+        ">
         <sect2>
           <!-- * the ID on each Sect2 is the release version plus the -->
           <!-- * subsection name; for example, xml:id="snapshost_FO" -->
@@ -217,7 +223,11 @@
   <xsl:template name="format.entries">
     <xsl:param name="dirname"/>
     <xsl:for-each
-        select="logentry[paths/path[starts-with(.,concat('/trunk/xsl/',$dirname,'/'))]]">
+      select="
+      logentry[paths/path[
+      starts-with(.,concat('/trunk/',$distro,'/',$dirname,'/'))
+      or starts-with(.,concat('/trunk/',$dirname,'/'))]]
+      ">
       <!-- * each Lisitem corresponds to a single commit -->
       <listitem>
         <xsl:text>&#xa;</xsl:text>
@@ -230,7 +240,11 @@
             <alt>
               <!-- * Only get path names for files that are in the subsection -->
               <!-- * that we are currently formatting -->
-              <xsl:for-each select="paths/path[starts-with(.,concat('/trunk/xsl/',$dirname,'/'))]">
+              <xsl:for-each select="
+                paths/path[
+                starts-with(.,concat('/trunk/',$distro,'/',$dirname,'/'))
+                or starts-with(.,concat('/trunk/',$dirname,'/'))]
+                ">
                 <xsl:apply-templates select="."/>
                 <xsl:if test="not(position() = last())">
                   <xsl:text>; </xsl:text>

diff --git a/xsl/Makefile b/xsl/Makefile
index 3043ae9192d804431f11758f89d52bdc76dca075..41f830292f119d91b5f2e3512ab9d188826023f8 100644 (file)
--- a/xsl/Makefile
+++ b/xsl/Makefile
@@ -5,14 +5,19 @@ include ../releasetools/Variables.mk
 
 DISTRO=xsl
 
+# value of DISTRIB_CHANGELOG_INCLUDES is a space-separated list of
+# any other top-level modules from which to log changes in the
+# NEWS and RELEASE-NOTES.* files for this distro
+DISTRIB_CHANGELOG_INCLUDES = gentext
+
 # value of DISTRIB_DEPENDS is a space-separated list of any
 # targets for this distro's "distrib" target to depend on
-DISTRIB_DEPENDS = gentext doc docsrc install.sh RELEASE-NOTES.txt RELEASE-NOTES.pdf
+DISTRIB_DEPENDS = extensions doc docsrc install.sh RELEASE-NOTES.txt RELEASE-NOTES.pdf
 
 # value of ZIP_EXCLUDES is a space-separated list of any file or
 # directory names (shell wildcards OK) that should be excluded
 # from the zip file and tarball for the release
-DISTRIB_EXCLUDES = gentext/$$ extensions/xsltproc doc/reference.txt$$ reference.txt.html$$ doc/reference.fo$$ doc/reference.pdf$$ tools/xsl xhtml/html2xhtml.xsl
+DISTRIB_EXCLUDES = extensions/xsltproc doc/reference.txt$$ reference.txt.html$$ doc/reference.fo$$ doc/reference.pdf$$ tools/xsl xhtml/html2xhtml.xsl
 
 # value of DISTRIB_PACKAGES is a space-separated list of any
 # directory names that should be packaged as separate zip/tar
@@ -59,11 +64,8 @@ doc: docsrc
        $(MAKE) -C doc RELVER=$(RELVER)
 
 extensions:
-       make -C ../xsl-java
-       cp -pR ../xsl-java .
-
-gentext:
-       cp -pR ../gentext .
+       $(MAKE) -C ../xsl-java
+       cp -pR ../xsl-java $@
 
 clean:
        for i in $(DIRS) __bogus__; do \
@@ -72,7 +74,6 @@ clean:
                fi \
        done
        $(RM) -r extensions
-       $(RM) -r gentext
        $(MAKE) clean -C xhtml
        $(MAKE) clean -C doc
        $(MAKE) clean -C docsrc