Removed catalog.xml from version control and updated build to

automatically generate it. (To ensure it always contains the
correct version number for the release.) Thanks to John L. Clark
for the suggestion.

diff --git a/releasetools/Targets.mk b/releasetools/Targets.mk
index 5b3bb4c5610077ad88a5b61f357caa256d461763..cdeebcb27f4244d84c3d4ba705fbf214f1968b80 100644 (file)
--- a/releasetools/Targets.mk
+++ b/releasetools/Targets.mk
@@ -24,6 +24,9 @@ RELEASE-NOTES.pdf: RELEASE-NOTES.xml
 install.sh: .CatalogManager.properties.example .urilist
        cp -p $(INSTALL_SH) install.sh
 
+catalog.xml: $(DISTRIB_MAKECATALOG)
+       $(XSLT) -output catalog.xml $(DISTRIB_MAKECATALOG) $(DISTRIB_MAKECATALOG)
+
 distrib: all $(DISTRIB_DEPENDS) RELEASE-NOTES.txt RELEASE-NOTES.pdf $(NEWSFILE) install.sh
 
 $(NEWSFILE):

diff --git a/xsl/.cvsignore b/xsl/.cvsignore
index 17fa7624947e5f9ef057edb903e66f7e6ca52c81..50769dccc1a4b14ce4bb06fc5dc30f4e6b8e35ad 100644 (file)
--- a/xsl/.cvsignore
+++ b/xsl/.cvsignore
@@ -7,5 +7,6 @@ RELEASE-NOTES.fo
 .urilist
 NEWS
 install.sh
+catalog.xml
 slides
 website

diff --git a/xsl/catalog.xml b/xsl/catalog.xml
deleted file mode 100644 (file)
index 0d5eeb8..0000000
--- a/xsl/catalog.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0"?>
-<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
-
-<!--  XML Catalog file for DocBook XSL Stylesheets distribution -->
-
-  <rewriteURI uriStartString="http://docbook.sourceforge.net/release/xsl/current/" rewritePrefix="./"/>
-  <rewriteSystem systemIdStartString="http://docbook.sourceforge.net/release/xsl/current/" rewritePrefix="./"/>
-
-  <rewriteURI uriStartString="http://docbook.sourceforge.net/release/xsl/1.69.0/" rewritePrefix="./"/>
-  <rewriteSystem systemIdStartString="http://docbook.sourceforge.net/release/xsl/1.69.0/" rewritePrefix="./"/>
-
-</catalog>

diff --git a/xsl/common/make-catalog.xsl b/xsl/common/make-catalog.xsl
new file mode 100644 (file)
index 0000000..97de15c
--- /dev/null
+++ b/xsl/common/make-catalog.xsl
@@ -0,0 +1,37 @@
+<?xml version='1.0'?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                version='1.0'>
+
+<xsl:output indent="yes"/>
+
+<!-- ********************************************************************
+     $Id$
+     ********************************************************************
+
+     This file is part of the XSL DocBook Stylesheet distribution.
+     See ../README or http://nwalsh.com/docbook/xsl/ for copyright
+     and other information.
+
+     ******************************************************************** -->
+
+<!-- ==================================================================== -->
+
+<xsl:include href="../VERSION"/>
+
+<xsl:template match="/">
+
+  <catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
+    <xsl:text>&#10;</xsl:text>
+    <xsl:comment>  XML Catalog file for DocBook XSL Stylesheets distribution </xsl:comment>
+
+    <rewriteURI uriStartString="http://docbook.sourceforge.net/release/xsl/current/" rewritePrefix="./"/>
+    <rewriteSystem systemIdStartString="http://docbook.sourceforge.net/release/xsl/current/" rewritePrefix="./"/>
+
+    <rewriteURI uriStartString="http://docbook.sourceforge.net/release/xsl/{$VERSION}/" rewritePrefix="./"/>
+    <rewriteSystem systemIdStartString="http://docbook.sourceforge.net/release/xsl/{$VERSION}/" rewritePrefix="./"/>
+
+  </catalog>
+
+</xsl:template>
+
+</xsl:stylesheet>