updates for install.sh support

diff --git a/releasetools/.CatalogManager.properties.example b/releasetools/.CatalogManager.properties.example
new file mode 100644 (file)
index 0000000..813592b
--- /dev/null
+++ b/releasetools/.CatalogManager.properties.example
@@ -0,0 +1,61 @@
+######################################################################## 
+# CatalogManager provides an interface to the catalog properties.
+# Properties can come from two places: from system properties or
+# from a CatalogManager.properties file. This class provides a
+# transparent interface to both, with system properties preferred 
+# over property file values.
+
+#######################################################################
+# Catalog Files:
+# The semicolon-delimited list of catalog files.
+# Example: catalogs=/etc/xml/catalog;~/catalog.xml
+
+catalogs=
+
+#######################################################################
+# Relative Catalogs:
+# If false, relative catalog URIs are made absolute with respect to the
+# base URI of the CatalogManager.properties file. This setting only 
+# applies to catalog URIs obtained from the catalogs property in the
+# CatalogManager.properties file
+# Example: relative-catalogs = [yes|no]
+
+relative-catalogs=yes
+
+#######################################################################
+# Verbosity:
+# If non-zero, the Catalog classes will print informative and debugging
+# messages. The higher the number, the more messages.
+# Example: verbosity = [0..99]
+
+verbosity=2
+
+#######################################################################
+# Prefer:
+# Which identifier is preferred, "public" or "system"?
+# Example: xml.catalog.prefer = [public|system]
+
+prefer=system
+
+#######################################################################
+# Static-catalog:
+# Should a single catalog be constructed for all parsing, or should a
+# different catalog be created for each parser?
+# Example: static-catalog = [yes|no]
+
+static-catalog=yes
+
+#######################################################################
+# Allow-oasis-xml-catalog-pi
+# If the source document contains "oasis-xml-catalog" processing 
+# instructions, should they be used?
+# Example: allow-oasis-xml-catalog-pi = [yes|no]
+
+allow-oasis-xml-catalog-pi=yes
+
+#######################################################################
+# catalog-class-name
+# If you're using the convenience classes 
+# org.apache.xml.resolver.tools.*, this setting allows you to specify
+# an alternate class name to use for the underlying catalog.
+# Example: catalog-class-name=org.apache.xml.resolver.Resolver

diff --git a/releasetools/Targets.mk b/releasetools/Targets.mk
index d8c3b64d0d4360be76f19de3cbf6e64a63d38b0e..4bfc294c4755473ca0f701e44647d57f71a35a86 100644 (file)
--- a/releasetools/Targets.mk
+++ b/releasetools/Targets.mk
@@ -10,7 +10,13 @@ RELEASE-NOTES.html: RELEASE-NOTES.xml
 RELEASE-NOTES.txt: RELEASE-NOTES.html
        $(BROWSER) $(BROWSER_OPTS) $< > $@
 
-distrib: all $(DISTRIB_DEPENDS)
+.CatalogManager.properties.example:
+       cp -p $(CATALOGMANAGER) .CatalogManager.properties.example
+
+install.sh:
+       cp -p $(INSTALL_SH) install.sh
+
+distrib: all $(DISTRIB_DEPENDS) .CatalogManager.properties.example install.sh
        $(CVS2LOG) -w
 ifeq ($(DIFFVER),)
        $(MERGELOGS) > $(NEWSFILE)

diff --git a/releasetools/Variables.mk b/releasetools/Variables.mk
index d4acf7e9c181753285fbff11f2639f41083816f2..029d5fd7fe05f4829db8359bfa1d32412019a5a2 100644 (file)
--- a/releasetools/Variables.mk
+++ b/releasetools/Variables.mk
@@ -8,6 +8,9 @@
 
 # $Id$
 
+CATALOGMANAGER=$(DOCBOOK_CVS)/releasetools/.CatalogManager.properties.example
+INSTALL_SH=$(DOCBOOK_CVS)/releasetools/install.sh
+
 # stylesheet for generating release notes
 DOC-LINK-STYLE=$(DOCBOOK_CVS)/xsl/docsrc/doc-link-docbook.xsl