From da08662c7617a2a4514290cceb003c727e43d1b3 Mon Sep 17 00:00:00 2001 From: Michael Smith Date: Wed, 5 Jul 2006 09:46:06 +0000 Subject: [PATCH] Commented out targets that rely on cvs (will update them later to use svn equivalents). Switched from DOCBOOK_CVS to DOCBOOK_SVN. --- releasetools/Targets.mk | 82 +++++++++++++++++++-------------------- releasetools/Variables.mk | 20 +++++----- 2 files changed, 51 insertions(+), 51 deletions(-) diff --git a/releasetools/Targets.mk b/releasetools/Targets.mk index 0b0335213..431acb46a 100644 --- a/releasetools/Targets.mk +++ b/releasetools/Targets.mk @@ -34,12 +34,12 @@ endif $(MARKUP_XSL): $(MAKE) -C $(dir $(MARKUP_XSL)) -NEWS.xml: ChangeLog.xml - $(XSLT) $< $(CVS2CL2DOCBOOK) $@ \ - latest-tag="'$(LATEST_TAG)'" \ - release-version="'$(RELVER)'" \ - element.file="'$(shell readlink -f ./docsrc/docbook-elements.xsl)'" \ - param.file="'$(shell readlink -f ./docsrc/xsl-params.xsl)'" +#NEWS.xml: ChangeLog.xml +# $(XSLT) $< $(CVS2CL2DOCBOOK) $@ \ +# latest-tag="'$(LATEST_TAG)'" \ +# release-version="'$(RELVER)'" \ +# element.file="'$(shell readlink -f ./docsrc/docbook-elements.xsl)'" \ +# param.file="'$(shell readlink -f ./docsrc/xsl-params.xsl)'" NEWS.html: NEWS.xml $(XSLT) $< $(DOC-LINK-STYLE) $@ @@ -47,17 +47,17 @@ NEWS.html: NEWS.xml $(NEWSFILE): NEWS.html LANG=C $(BROWSER) $(BROWSER_OPTS) $< > $@ -ChangeLog.xml: LatestTag - $(CVS2CL) $(CVS2CL_OPTS) \ - --delta $(LATEST_TAG):HEAD --stdout --xml -g -q > $@ +#ChangeLog.xml: LatestTag +# $(CVS2CL) $(CVS2CL_OPTS) \ +# --delta $(LATEST_TAG):HEAD --stdout --xml -g -q > $@ LatestTag: # Note that one of the old commit messsage in the cvs log contains # a ^Z (x1a) character, which is not legal in XML, so it must # strip it out before using it with any XML processing apps - $(CVS2CL) $(CVS2CL_OPTS) --stdout --xml -g -q \ - | $(SED) $(SED_OPTS) 's/\x1a//g' \ - | $(XSLTPROC) $(GET_LATEST_TAG) - > $@ +# $(CVS2CL) $(CVS2CL_OPTS) --stdout --xml -g -q \ +# | $(SED) $(SED_OPTS) 's/\x1a//g' \ +# | $(XSLTPROC) $(GET_LATEST_TAG) - > $@ ChangeHistory.xml.zip: ChangeHistory.xml $(ZIP) $(ZIP_OPTS) $@ $< @@ -66,8 +66,8 @@ ChangeHistory.xml.zip: ChangeHistory.xml # ChangeHistory.xml holds the whole change history for the module, # including all subdirectories ChangeHistory.xml: - $(CVS2CL) $(CVS2CL_OPTS) \ - --stdout --xml -g -q > $@ +# $(CVS2CL) $(CVS2CL_OPTS) \ +# --stdout --xml -g -q > $@ .CatalogManager.properties.example: cp -p $(CATALOGMANAGER) .CatalogManager.properties.example @@ -88,33 +88,33 @@ install.sh: $(INSTALL_SH) .CatalogManager.properties.example .urilist catalog.xm distrib: all $(DISTRIB_DEPENDS) RELEASE-NOTES.txt RELEASE-NOTES.pdf $(NEWSFILE) -newversion: -ifeq ($(CVSCHECK),) -ifeq ($(DIFFVER),) - @echo "DIFFVER must be specified." - exit 1 -else -ifeq ($(NEXTVER),$(RELVER)) - read -s -n1 -p "OK to create cvs tag $(TAGVER)? [No] "; \ - echo "$$REPLY"; \ - case $$REPLY in \ - [yY]) \ - cvs tag $(TAGVER); \ - $(MAKE) DIFFVER=$(DIFFVER) distrib; \ - ;; \ - *) echo "OK, exiting without making creating tag."; \ - exit \ - ;; \ - esac -else - @echo "VERSION $(RELVER) doesn't match specified version $(NEXTVER)." - exit 1 -endif -endif -else - @echo "CVS is not up-to-date! ($(CVSCHECK))" - exit 1 -endif +#newversion: +#ifeq ($(CVSCHECK),) +#ifeq ($(DIFFVER),) +# @echo "DIFFVER must be specified." +# exit 1 +#else +#ifeq ($(NEXTVER),$(RELVER)) +# read -s -n1 -p "OK to create cvs tag $(TAGVER)? [No] "; \ +# echo "$$REPLY"; \ +# case $$REPLY in \ +# [yY]) \ +# cvs tag $(TAGVER); \ +# $(MAKE) DIFFVER=$(DIFFVER) distrib; \ +# ;; \ +# *) echo "OK, exiting without making creating tag."; \ +# exit \ +# ;; \ +# esac +#else +# @echo "VERSION $(RELVER) doesn't match specified version $(NEXTVER)." +# exit 1 +#endif +#endif +#else +# @echo "CVS is not up-to-date! ($(CVSCHECK))" +# exit 1 +#endif freshmeat: ifeq ($(SFRELID),) diff --git a/releasetools/Variables.mk b/releasetools/Variables.mk index a37bc5209..7bbd2365f 100644 --- a/releasetools/Variables.mk +++ b/releasetools/Variables.mk @@ -8,32 +8,32 @@ # $Id$ -CATALOGMANAGER=$(DOCBOOK_CVS)/releasetools/.CatalogManager.properties.example -INSTALL_SH=$(DOCBOOK_CVS)/releasetools/install.sh -MAKECATALOG=$(DOCBOOK_CVS)/releasetools/make-catalog.xsl +CATALOGMANAGER=$(DOCBOOK_SVN)/releasetools/.CatalogManager.properties.example +INSTALL_SH=$(DOCBOOK_SVN)/releasetools/install.sh +MAKECATALOG=$(DOCBOOK_SVN)/releasetools/make-catalog.xsl # stylesheet for generating HTML version of release notes -DOC-LINK-STYLE=$(DOCBOOK_CVS)/xsl/docsrc/doc-link-docbook.xsl +DOC-LINK-STYLE=$(DOCBOOK_SVN)/xsl/docsrc/doc-link-docbook.xsl # MARKUP_XSL is a modified version of Jeni Tennison's "Markup # Utility" -MARKUP_XSL=$(DOCBOOK_CVS)/contrib/tools/tennison/modified-markup.xsl +MARKUP_XSL=$(DOCBOOK_SVN)/contrib/tools/tennison/modified-markup.xsl # stylesheet used in taking XML output from the cvs2cl(1) perl # script, and using it to generate NEWS file(s) and releases notes -CVS2CL2DOCBOOK=$(DOCBOOK_CVS)/releasetools/cvs2cl2docbook.xsl +CVS2CL2DOCBOOK=$(DOCBOOK_SVN)/releasetools/cvs2cl2docbook.xsl # stylesheet used for determining the latest cvs tag in cvs log -GET_LATEST_TAG=$(DOCBOOK_CVS)/releasetools/get-latest-tag.xsl +GET_LATEST_TAG=$(DOCBOOK_SVN)/releasetools/get-latest-tag.xsl # stylesheet for stripping DB5 namespace -STRIP_NS=$(DOCBOOK_CVS)/xsl/common/stripns.xsl +STRIP_NS=$(DOCBOOK_SVN)/xsl/common/stripns.xsl # stylesheet for generating FO version of release notes -FO-STYLE=$(DOCBOOK_CVS)/xsl/fo/docbook.xsl +FO-STYLE=$(DOCBOOK_SVN)/xsl/fo/docbook.xsl # stylesheet for generating PDF of release notes with dblatex -DBX-STYLE=$(DOCBOOK_CVS)/xsl/docsrc/dblatex-release-notes.xsl +DBX-STYLE=$(DOCBOOK_SVN)/xsl/docsrc/dblatex-release-notes.xsl # browser to use for making text version of release notes # w3mmee is a fork of w3m; it provides a lot more options for -- 2.50.0