Bring distrib/zip build into sync with other modules.

diff --git a/testdocs/.cvsignore b/testdocs/.cvsignore
index 1699a7746dc642b2b9330f833666be9b8b3d04bd..8d1fecdd453768c293926e12df6b57dfe41b84c0 100644 (file)
--- a/testdocs/.cvsignore
+++ b/testdocs/.cvsignore
@@ -13,3 +13,9 @@ htmlcustom.xsl
 mlang.sgm
 mlang.xml
 mtest
+RELEASE-NOTES.html
+RELEASE-NOTES.txt
+RELEASE-NOTES.pdf
+RELEASE-NOTES.fo
+NEWS
+

diff --git a/testdocs/Makefile b/testdocs/Makefile
index 91a538d2f2a349ae319f0eb9e922d57ebafeae9a..8b97db1fd55fe24a7f472ca8cd4ac771844bd496 100644 (file)
--- a/testdocs/Makefile
+++ b/testdocs/Makefile
@@ -1,5 +1,27 @@
 # -*- Makefile -*-
 include ../cvstools/Makefile.incl
+include ../releasetools/Variables.mk
+
+DISTRO=testdocs
+
+# value of DISTRIB_DEPENDS is a space-separated list of any
+# targets for this distro's "distrib" target to depend on
+DISTRIB_DEPENDS =
+
+# 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 =
+
+# value of DISTRIB_PACKAGES is a space-separated list of any
+# directory names that should be packaged as separate zip/tar
+# files for the release
+DISTRIB_PACKAGES =
+
+# to make sure that executable bit is retained after packaging,
+# you need to explicitly list any executable files here
+DISTRIB_EXECUTABLES =
+
 
 VPATH=.:tests/
 
@@ -56,8 +78,8 @@ TESTBASE      := $(shell ls -1 tests/*.xml | sed -e 's/\.[0-9][0-9][0-9]\.xml$$//' |
 # ======================================================================
 
 # default rule
-.PHONY: test
-test:
+.PHONY: all
+all:
        @echo "no default rule; try 'make xref.001.html' or 'make alltests'"
 
 .PHONY: $(TESTS)
@@ -90,14 +112,19 @@ $(TESTBASE):
        $(MAKE) $(basename $(notdir $(wildcard $@.[0-9][0-9][0-9].xml)))
 
 # run all tests
-.PHONY: alltests
-alltests: tests/images $(TESTS)
+.PHONY: alltests tests/images images
+alltests: tests/images images $(TESTS)
 
 tests/images:
        if [ ! -h tests/images ]; then \
          ln -s ../../xsl/images tests/images; \
        fi
 
+images:
+       if [ ! -h images ]; then \
+         ln -s ../xsl/images images; \
+       fi
+
 # ======================================================================
 
 .xml.html:
@@ -220,51 +247,8 @@ clean:
        rm -f jhelpidx.xml jhelpmap.jhm jhelpset.hs jhelptoc.xml
        find . -name '*~' -o -name '*.bak' -o -name '.#*' -o -name core | xargs rm -f
 
-.PHONY: distrib
-distrib:
-       $(CVS2LOG) -w
-ifeq ($(DIFFVER),)
-       $(MERGELOGS) > WhatsNew
-else
-       $(MERGELOGS) -v $(DIFFVER) > WhatsNew
-endif
-
-.PHONY: newversion
-newversion:
-ifeq ($(NEXTVER),)
-       $(NEXTVERSION)
-else
-       $(NEXTVERSION) -v $(NEXTVER)
-endif
-       make DIFFVER=$(DIFFVER) distrib
-
-.PHONY: zip
-zip:
-ifeq ($(ZIPVER),)
-       @echo You must specify ZIPVER for the zip target
-else
-       rm -rf /tmp/docbook-testdocs-$(ZIPVER)
-       rm -f /tmp/tar.exclude
-       rm -f /tmp/docbook-testdocs-$(ZIPVER).tar.gz
-       rm -f /tmp/docbook-testdocs-$(ZIPVER).zip
-       mkdir /tmp/docbook-testdocs-$(ZIPVER)
-       touch /tmp/tar.exclude
-       find . -print  | grep /CVS$$ | cut -c3- >> /tmp/tar.exclude
-       find . -print  | grep /CVS/ | cut -c3- >> /tmp/tar.exclude
-       find . -print  | grep .classes | cut -c3- >> /tmp/tar.exclude
-       find . -type f -name "*~"  | cut -c3- >> /tmp/tar.exclude
-       find . -type f -name ".*~"  | cut -c3- >> /tmp/tar.exclude
-       find . -type f -name "#*"  | cut -c3- >> /tmp/tar.exclude
-       find . -type f -name ".cvsignore"  | cut -c3- >> /tmp/tar.exclude
-       find . -type f -name "Makefile*"   | cut -c3- >> /tmp/tar.exclude
-       find . -type f -name "README.CVS"   | cut -c3- >> /tmp/tar.exclude
-       tar cf - * --exclude-from /tmp/tar.exclude | (cd /tmp/docbook-testdocs-$(ZIPVER); tar xf -)
-       cd /tmp && tar cf - docbook-testdocs-$(ZIPVER) | gzip > docbook-testdocs-$(ZIPVER).tar.gz
-       cd /tmp && zip -rpD docbook-testdocs-$(ZIPVER).zip docbook-testdocs-$(ZIPVER)
-       rm -f tar.exclude
-endif
-
 # remove target if error in the rule
 .DELETE_ON_ERROR:
 
+include ../releasetools/Targets.mk
 # EOF

diff --git a/testdocs/VERSION b/testdocs/VERSION
index b123147e2a162f34cf377f8b63d99b0e6f8887c2..96c2c9300e68dfe5e7f80eca72f7dc91424639d2 100644 (file)
--- a/testdocs/VERSION
+++ b/testdocs/VERSION
@@ -1 +1,85 @@
-1.1
\ No newline at end of file
+<?xml version='1.0'?> <!-- -*- nxml -*- -->
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                xmlns:fm="http://freshmeat.net/projects/freshmeat-submit/"
+               xmlns:sf="http://sourceforge.net/"
+               exclude-result-prefixes="fm sf"
+                version='1.0'>
+
+<xsl:param name="VERSION" select="string(document('')//fm:Version[1])"/>
+<xsl:param name="sf-relid" select="0"/>
+<xsl:strip-space elements="fm:*"/>
+
+<fm:project>
+  <fm:Project>DocBook</fm:Project>
+  <fm:Branch>Testdocs</fm:Branch>
+  <fm:Version>1.02.1</fm:Version>
+<!--
+  <fm:License>MIT/X Consortium License</fm:License>
+-->
+  <fm:Release-Focus>
+  <!-- Initial freshmeat announcement -->
+  <!-- Documentation -->
+  <!-- Code cleanup -->
+Minor feature enhancements
+  <!-- Major feature enhancements -->
+  <!-- Minor bugfixes -->
+  <!-- Major bugfixes -->
+  <!-- Minor security fixes -->
+  <!-- Major security fixes -->
+  </fm:Release-Focus>
+  <fm:Home-Page-URL>http://sourceforge.net/projects/docbook/</fm:Home-Page-URL>
+  <fm:Gzipped-Tar-URL>http://prdownloads.sourceforge.net/docbook/docbook-xsl-{VERSION}.tar.gz?download</fm:Gzipped-Tar-URL>
+  <fm:Zipped-Tar-URL>http://prdownloads.sourceforge.net/docbook/docbook-xsl-{VERSION}.zip?download</fm:Zipped-Tar-URL>
+  <fm:Bzipped-Tar-URL>http://prdownloads.sourceforge.net/docbook/docbook-xsl-{VERSION}.bz2?download</fm:Bzipped-Tar-URL>
+  <fm:Changelog-URL>http://sourceforge.net/project/shownotes.php?release_id={SFRELID}</fm:Changelog-URL>
+  <fm:CVS-URL>http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/docbook/xsl/</fm:CVS-URL>
+  <fm:Mailing-List-URL>http://lists.oasis-open.org/archives/docbook-apps/</fm:Mailing-List-URL>
+  <fm:Changes>This release adds a number of test cases.
+</fm:Changes>
+</fm:project>
+
+<xsl:template match="/" priority="-100">
+  <xsl:if test="$sf-relid = 0">
+    <xsl:message terminate="yes">
+      <xsl:text>You must specify the sf-relid as a parameter.</xsl:text>
+    </xsl:message>
+  </xsl:if>
+
+  <xsl:apply-templates select="//fm:project"/>
+</xsl:template>
+
+<xsl:template match="fm:project">
+  <xsl:text>&#10;</xsl:text>
+  <xsl:apply-templates/>
+  <xsl:text>&#10;</xsl:text>
+  <xsl:apply-templates select="fm:Changes" mode="text"/>
+</xsl:template>
+
+<xsl:template match="fm:Changes"/>
+
+<xsl:template match="fm:Gzipped-Tar-URL|fm:Zipped-Tar-URL|fm:Bzipped-Tar-URL">
+  <xsl:value-of select="local-name(.)"/>
+  <xsl:text>: </xsl:text>
+  <xsl:value-of select="substring-before(., '{VERSION}')"/>
+  <xsl:value-of select="$VERSION"/>
+  <xsl:value-of select="substring-after(., '{VERSION}')"/>
+  <xsl:text>&#10;</xsl:text>
+</xsl:template>
+
+<xsl:template match="fm:Changelog-URL">
+  <xsl:value-of select="local-name(.)"/>
+  <xsl:text>: </xsl:text>
+  <xsl:value-of select="substring-before(., '{SFRELID}')"/>
+  <xsl:value-of select="$sf-relid"/>
+  <xsl:value-of select="substring-after(., '{SFRELID}')"/>
+  <xsl:text>&#10;</xsl:text>
+</xsl:template>
+
+<xsl:template match="fm:*">
+  <xsl:value-of select="local-name(.)"/>
+  <xsl:text>: </xsl:text>
+  <xsl:value-of select="normalize-space(.)"/>
+  <xsl:text>&#10;</xsl:text>
+</xsl:template>
+
+</xsl:stylesheet>