use XSLT method to determine version number from VERSION file

(instead of grep hack); also, use w3m as the default browser for
generating plain-text output from HTML (with GC_NPROCS=1 to
prevent it from hanging under OSX/Darwin)

diff --git a/releasetools/Targets.mk b/releasetools/Targets.mk
index 736d0c47ea3b769e04458f52b137dd2d9f6358e0..2f5bea4dcea07809887c6ab5002a711f4123d581 100644 (file)
--- a/releasetools/Targets.mk
+++ b/releasetools/Targets.mk
@@ -15,7 +15,7 @@ RELEASE-NOTES.html: RELEASE-NOTES.xml NEWS.xml
        $(RM) RELEASE-NOTES-TMP.xml
 
 RELEASE-NOTES.txt: RELEASE-NOTES.html
-       LANG=C $(BROWSER) $(BROWSER_OPTS) $< > $@
+       $(BROWSER) $(BROWSER_OPTS) $< > $@
 
 RELEASE-NOTES-PARTIAL.html: RELEASE-NOTES.xml NEWS.xml
        $(XINCLUDE) $< > RELEASE-NOTES-PARTIAL-TMP.xml
@@ -25,7 +25,7 @@ RELEASE-NOTES-PARTIAL.html: RELEASE-NOTES.xml NEWS.xml
        $(RM) RELEASE-NOTES-PARTIAL-TMP.xml
 
 RELEASE-NOTES-PARTIAL.txt: RELEASE-NOTES-PARTIAL.html
-       LANG=C $(BROWSER) $(BROWSER_OPTS) $< > $@
+       $(BROWSER) $(BROWSER_OPTS) $< > $@
        $(RM) $<
 
 RELEASE-NOTES.pdf: RELEASE-NOTES.xml NEWS.xml
@@ -64,7 +64,7 @@ NEWS.html: NEWS.xml
        doc-baseuri="$(DOC_BASEURI)"
 
 $(NEWSFILE): NEWS.html
-       LANG=C $(BROWSER) $(BROWSER_OPTS) $< > $@
+       $(BROWSER) $(BROWSER_OPTS) $< > $@
 
 $(SVN_INFO_FILE):
        $(SVN) $(SVN_OPTS) info --xml \

diff --git a/releasetools/Variables.mk b/releasetools/Variables.mk
index 906854a3ef2f894f8fe66afa033f11c639499ecb..0afb978bc5324f889b3ec830fe8a1c3849e48bca 100644 (file)
--- a/releasetools/Variables.mk
+++ b/releasetools/Variables.mk
@@ -86,12 +86,12 @@ STRIP_NS=$(DOCBOOK_SVN)/xsl/common/stripns.xsl
 # stylesheet for generating FO version of release notes
 FO_STYLE=$(DOCBOOK_SVN)/xsl/fo/docbook.xsl
 
-# browser to use for making text version of release notes
-# w3mmee is a fork of w3m; it provides a lot more options for
-# charset handling; other possible values for BROWSER include
-# "w3m" and "lynx" and "links" and "elinks"
-BROWSER=w3mmee
-BROWSER_OPTS=-dump
+# BROWSER is the Web browser to use for dumpin a text version of
+# release notes; text output from w3m looks better than that from
+# elinks or lynx; but w3m sometimes hangs unexpectedly under OSX;
+# setting GC_NPROCS=1 prevents it from hanging
+BROWSER = GC_NPROCS=1 w3m
+BROWSER_OPTS = -dump
 
 PDF_MAKER=dblatex
 
@@ -108,23 +108,7 @@ PREVIOUS_REVISION=$(shell $(XSLTPROC) --stringparam get PreviousReleaseRevision
 
 TAG=$(shell $(XSLTPROC) --stringparam get Tag VERSION VERSION | $(GREP) $(GREPFLAGS) -v "xml version=")
 
-# determine RELVER automatically by:
-#
-#   - figuring out if VERSION file exists
-#   - checking to see if VERSION is an XSL stylesheet or not
-#   - grabbing the version number from VERSION file based on
-#     whether or not it is a stylesheet
-#
-RELVER := $(shell \
- if [ -f VERSION ]; then \
-   if grep "<xsl:stylesheet" VERSION >/dev/null; then \
-     grep "Version>.\+<" VERSION \
-     | sed 's/^[^<]*<fm:Version>\(.\+\)<\/fm:Version>$$/\1/' \
-     | tr -d "\n"; \
-   else cat VERSION; \
-   fi \
- fi \
-)
+RELVER=$(shell if [ -f VERSION ]; then xsltproc --stringparam get VERSION VERSION VERSION | grep -v "xml version="; fi)
 ZIPVER=$(RELVER)
 
 ifeq (snapshot,$(findstring snapshot,$(RELVER)))

diff --git a/xsl/VERSION b/xsl/VERSION
index 977bc82c54623464ee382cca3d8e98a990ace985..49457175ce6b31c90f8e401a62468b937a2a3ce6 100644 (file)
--- a/xsl/VERSION
+++ b/xsl/VERSION
@@ -66,6 +66,9 @@ Major feature enhancements
     <xsl:when test="$get = 'DistroTitle'">
       <xsl:value-of select="$DistroTitle"/>
     </xsl:when>
+    <xsl:when test="$get = 'VERSION'">
+      <xsl:value-of select="$VERSION"/>
+    </xsl:when>
     <xsl:otherwise>
       <xsl:if test="$sf-relid = 0">
         <xsl:message terminate="yes">

diff --git a/xsl/doc/Makefile b/xsl/doc/Makefile
index 3d4589b8ce9ac979e93ef3acc31e3b17d8bba8f7..1fe9420d30a423d29dddf52d4469c33c2fc40888 100644 (file)
--- a/xsl/doc/Makefile
+++ b/xsl/doc/Makefile
@@ -8,9 +8,12 @@ PROCOPT=
 XEP=xep
 XEPFLAGS=
 
-TXT_MAKER = LANG=C w3mmee
-TXT_MAKER_FLAGS = -dump -config $(W3MMEECONFIG)
-W3MMEECONFIG = ../../releasetools/w3mmee_config
+# TXT_MAKER is the Web browser to use for dumping a text version
+# of the reference docs; text output from w3m looks better than
+# that from elinks or lynx; but w3m sometimes hangs unexpectedly
+# under OSX; setting GC_NPROCS=1 prevents it from hanging
+TXT_MAKER = GC_NPROCS=1 w3m
+TXT_MAKER_FLAGS = -dump
 
 XMLID_TO_ID=../tools/xsl/build/xmlid-to-id.xsl