From 12d27a9e9f62e3934c32632991231c337ae173f5 Mon Sep 17 00:00:00 2001 From: Michael Smith Date: Thu, 25 Jan 2007 10:25:23 +0000 Subject: [PATCH] Moved all release metadata to VERSION file, and updated release build to rely on it. --- releasetools/Targets.mk | 5 +++-- releasetools/Variables.mk | 8 ++++---- releasetools/get-param.xsl | 23 +++++++++++++++++++++++ releasetools/get-previous-revision.xsl | 25 ------------------------- xsl/PreviousRelease | 1 - xsl/PreviousRevision | 1 - xsl/VERSION | 5 ++++- 7 files changed, 34 insertions(+), 34 deletions(-) create mode 100644 releasetools/get-param.xsl delete mode 100644 releasetools/get-previous-revision.xsl delete mode 100644 xsl/PreviousRelease delete mode 100644 xsl/PreviousRevision diff --git a/releasetools/Targets.mk b/releasetools/Targets.mk index 1d8a242d1..8d5c403d2 100644 --- a/releasetools/Targets.mk +++ b/releasetools/Targets.mk @@ -4,6 +4,8 @@ # $Id$ debug: + echo $(PREVIOUS_RELEASE) + echo $(PREVIOUS_REVISION) .PHONY: ChangeLog.xml ChangeHistory.xml @@ -49,7 +51,7 @@ NEWS.html: NEWS.xml $(NEWSFILE): NEWS.html LANG=C $(BROWSER) $(BROWSER_OPTS) $< > $@ -ChangeLog.xml: PreviousRevision +ChangeLog.xml: $(SVN) $(SVN_OPTS) log --xml --verbose \ -r HEAD:$(PREVIOUS_REVISION) \ | $(XMLLINT) $(XMLLINT_OPTS) --format - > $@ @@ -227,7 +229,6 @@ endif release-clean: clean $(MAKE) -C docsrc release-clean - $(RM) PreviousRevision $(RM) TERMS.xml $(RM) $(NEWSFILE) $(RM) NEWS.html diff --git a/releasetools/Variables.mk b/releasetools/Variables.mk index 22ca1d92e..c38ac2a01 100644 --- a/releasetools/Variables.mk +++ b/releasetools/Variables.mk @@ -60,7 +60,7 @@ MARKUP_XSL=$(DOCBOOK_SVN)/contrib/tools/tennison/modified-markup.xsl # to generate NEWS file(s) and releases notes SVNLOG2DOCBOOK=$(DOCBOOK_SVN)/releasetools/svnlog2docbook.xsl -PREVIOUS_RELEASE=$(shell if [ -f PreviousRelease ];then cat PreviousRelease; fi) +PREVIOUS_RELEASE=$(shell $(XSLTPROC) --stringparam param 'PreviousRelease' $(GETPARAM) VERSION) # stylesheet for stripping DB5 namespace STRIP_NS=$(DOCBOOK_SVN)/xsl/common/stripns.xsl @@ -86,7 +86,7 @@ DBLATEX_FLAGS = -b pdftex # file containing "What's New" info generated from Subversion log NEWSFILE=NEWS -PREVIOUS_REVISION=$(shell if [ -f PreviousRevision ];then cat PreviousRevision; fi) +PREVIOUS_REVISION=$(shell $(XSLTPROC) --stringparam param 'PreviousReleaseRevision' $(GETPARAM) VERSION) # determine RELVER automatically by: # @@ -153,8 +153,6 @@ ZIP_EXCLUDES = \ Makefile.common \ Makefile.incl \ Makefile.param \ - PreviousRelease \ - PreviousRevision \ ChangeLog\.xml \ README\.SVN \ RELEASE-NOTES\.fo \ @@ -191,6 +189,8 @@ GZIPFLAGS= XSLTPROC=xsltproc XSLTPROC_OPTS= +GETPARAM=$(DOCBOOK_SVN)/releasetools/get-param.xsl + XMLLINT=xmllint XMLLINT_OPTS= XINCLUDE=$(XMLLINT) $(XMLLINT_OPTS) --xinclude diff --git a/releasetools/get-param.xsl b/releasetools/get-param.xsl new file mode 100644 index 000000000..8984108e1 --- /dev/null +++ b/releasetools/get-param.xsl @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/releasetools/get-previous-revision.xsl b/releasetools/get-previous-revision.xsl deleted file mode 100644 index 6a1635c62..000000000 --- a/releasetools/get-previous-revision.xsl +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/xsl/PreviousRelease b/xsl/PreviousRelease deleted file mode 100644 index 0834888f5..000000000 --- a/xsl/PreviousRelease +++ /dev/null @@ -1 +0,0 @@ -1.72.0 diff --git a/xsl/PreviousRevision b/xsl/PreviousRevision deleted file mode 100644 index 4c992eef4..000000000 --- a/xsl/PreviousRevision +++ /dev/null @@ -1 +0,0 @@ -6553 diff --git a/xsl/VERSION b/xsl/VERSION index 06e463b74..d886697a9 100644 --- a/xsl/VERSION +++ b/xsl/VERSION @@ -8,13 +8,16 @@ docbook-xsl +1.72.0 +6553 +$Revision$ DocBook XSL Stylesheets - 1.72.1+pre + 1.72.1-pre -- 2.49.0