]> granicus.if.org Git - docbook-dsssl/commitdiff
Added a mechanism for "building" copies of the w2docbook.xsl,
authorMichael Smith <xmldoc@users.sourceforge.net>
Sun, 1 Jul 2007 09:44:15 +0000 (09:44 +0000)
committerMichael Smith <xmldoc@users.sourceforge.net>
Sun, 1 Jul 2007 09:44:15 +0000 (09:44 +0000)
ldocbook.xsl, cldocbook.xsl, xtangle.xsl files. All that this
"build" really does is to to first make the litprog module, then
copy over those files to the releasetools directory, prepending to
the copies a warning that they might not be up-to-date.
And so am no also checking in those copies to source control,
and updating the docbook-xsl build to use those instead of the
source versions in the litprog module.
This removes litprog as a build target/dependency for docbook-xsl.
The sole purpose of this change is just to make it easier for
other developers to do docbook-xsl release builds.
The litprog sources change very rarely, so it won't be a big
maintenance problem to keep these static copies in releasetools up
to date, and it'll certainly make it easier for developers to do
builds...

12 files changed:
releasetools/.make-litprog.xsl [new file with mode: 0644]
releasetools/cldocbook.xsl [new file with mode: 0644]
releasetools/ldocbook.xsl [new file with mode: 0644]
releasetools/w2docbook.xsl [new file with mode: 0644]
releasetools/xtangle.xsl [new file with mode: 0644]
xsl/Makefile
xsl/Makefile.incl
xsl/README.RELEASE-BUILD
xsl/docsrc/Makefile.incl
xsl/lib/Makefile
xsl/tools/xsl/build/clrefentry.xsl
xsl/tools/xsl/build/lrefentry.xsl

diff --git a/releasetools/.make-litprog.xsl b/releasetools/.make-litprog.xsl
new file mode 100644 (file)
index 0000000..9bbf389
--- /dev/null
@@ -0,0 +1,21 @@
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+  version='1.0'>
+  <xsl:import href=".identity.xsl"/>
+  <xsl:output method="xml" indent="no"/>
+  <xsl:param name="filename"/>
+  <xsl:template match="/">
+    <xsl:comment> * </xsl:comment>
+    <xsl:comment> * This is a static copy of the <xsl:value-of select="$filename"/> file from the litprog module. </xsl:comment>
+    <xsl:comment> * It *MAY NOT BE UP TO DATE*. It is provided for the convenience of </xsl:comment>
+    <xsl:comment> * developers who don't want to generate the file themselves from </xsl:comment>
+    <xsl:comment> * the sources in the ../litprog directory. To create a fresh up-to-date </xsl:comment>
+    <xsl:comment> * copy of the file, check out that directory from the source repository </xsl:comment>
+    <xsl:comment> * and build it. </xsl:comment>
+    <xsl:comment> * </xsl:comment>
+    <xsl:apply-templates/>
+  </xsl:template>
+  <!-- * some of the litprog files contain an xsl:include that -->
+  <!-- * references the litprog VERSION file; those aren't necessary for -->
+  <!-- * our purposes, so let's just omit them from our copies -->
+  <xsl:template match="*[local-name() = 'include']"/>
+</xsl:stylesheet>
diff --git a/releasetools/cldocbook.xsl b/releasetools/cldocbook.xsl
new file mode 100644 (file)
index 0000000..31fa49b
--- /dev/null
@@ -0,0 +1,131 @@
+<?xml version="1.0"?>
+<!-- * -->
+<!-- * This is a static copy of the cldocbook.xsl file from the litprog module. -->
+<!-- * It *MAY NOT BE UP TO DATE*. It is provided for the convenience of -->
+<!-- * developers who don't want to generate the file themselves from -->
+<!-- * the sources in the ../litprog directory. To create a fresh up-to-date -->
+<!-- * copy of the file, check out that directory from the source repository -->
+<!-- * and build it. -->
+<!-- * -->
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:verb="com.nwalsh.saxon.Verbatim" exclude-result-prefixes="verb src" version="1.0">
+  <xsl:import href="http://docbook.sourceforge.net/release/xsl/current/html/chunk.xsl"/>
+
+    
+
+  <xsl:template match="revhistory" mode="titlepage.mode"/>
+
+  <xsl:param name="section.autolabel" select="1"/>
+<xsl:param name="linenumbering.everyNth" select="5"/>
+<xsl:param name="linenumbering.separator" select="'| '"/>
+  <xsl:param name="local.l10n.xml" select="document('')"/>
+
+<l:i18n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0">
+  <l:l10n language="en">
+   <l:context name="title">
+      <l:template name="fragment" text="%t"/>
+    </l:context>
+  </l:l10n>
+</l:i18n>
+  <xsl:template match="src:fragment">
+  <xsl:param name="suppress-numbers" select="'0'"/>
+  <xsl:param name="linenumbering" select="'numbered'"/>
+
+  <xsl:variable name="section" select="ancestor::section[1]"/>
+  <xsl:variable name="id" select="@id"/>
+  <xsl:variable name="referents" select="//src:fragment[.//src:fragref[@linkend=$id]]"/>
+
+  <div class="src-fragment">
+  <a name="{@id}"/>
+  <table border="1" width="100%">
+    <tr>
+      <td>
+        <p>
+          <b>
+            <xsl:apply-templates select="." mode="label.markup"/>
+          </b>
+          <xsl:if test="$referents">
+            <xsl:text>: </xsl:text>
+            <xsl:for-each select="$referents">
+              <xsl:if test="position() &gt; 1">, </xsl:if>
+              <a>
+                <xsl:attribute name="href">
+                  <xsl:call-template name="href.target">
+                    <xsl:with-param name="object" select="."/>
+                  </xsl:call-template>
+                </xsl:attribute>
+                <xsl:apply-templates select="." mode="label.markup"/>
+              </a>
+            </xsl:for-each>
+          </xsl:if>
+        </p>
+      </td>
+    </tr>
+    <tr>
+      <td>
+        <xsl:choose>
+          <xsl:when test="$suppress-numbers = '0'                           and $linenumbering = 'numbered'                           and $use.extensions != '0'                           and $linenumbering.extension != '0'">
+            <xsl:variable name="rtf">
+              <xsl:apply-templates/>
+            </xsl:variable>
+            <pre class="{name(.)}">
+              <xsl:copy-of select="verb:numberLines($rtf)"/>
+            </pre>
+          </xsl:when>
+          <xsl:otherwise>
+            <pre class="{name(.)}">
+              <xsl:apply-templates/>
+            </pre>
+          </xsl:otherwise>
+        </xsl:choose>
+      </td>
+    </tr>
+  </table>
+  </div>
+</xsl:template>
+
+<xsl:template match="src:fragment" mode="label.markup">
+  <xsl:variable name="section" select="ancestor::section[1]"/>
+
+  <xsl:text>§</xsl:text>
+
+  <xsl:choose>
+    <xsl:when test="$section">
+      <xsl:variable name="section.label">
+        <xsl:apply-templates select="$section" mode="label.markup"/>
+      </xsl:variable>
+      <xsl:choose>
+        <xsl:when test="string($section.label) = ''">
+          <xsl:number from="section"/>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:copy-of select="$section.label"/>
+          <xsl:text>.</xsl:text>
+          <xsl:number from="section"/>
+        </xsl:otherwise>
+      </xsl:choose>
+    </xsl:when>
+    <xsl:otherwise>
+      <xsl:number from="/"/>
+    </xsl:otherwise>
+  </xsl:choose>
+</xsl:template>
+<xsl:template match="src:fragment" mode="title.markup">
+  <xsl:variable name="section" select="ancestor::section[1]"/>
+
+  <xsl:if test="$section">
+    <xsl:apply-templates select="$section" mode="title.markup"/>
+  </xsl:if>
+</xsl:template>
+  <xsl:template match="src:fragref">
+  <xsl:call-template name="xref"/>
+</xsl:template>
+<xsl:template match="src:fragment" mode="xref-to">
+  <xsl:variable name="section" select="ancestor::section[1]"/>
+
+  <i>
+    <xsl:apply-templates select="." mode="label.markup"/>
+    <xsl:text>. </xsl:text>
+    <xsl:apply-templates select="." mode="title.markup"/>
+  </i>
+</xsl:template>
+</xsl:stylesheet>
diff --git a/releasetools/ldocbook.xsl b/releasetools/ldocbook.xsl
new file mode 100644 (file)
index 0000000..aa3e5b1
--- /dev/null
@@ -0,0 +1,131 @@
+<?xml version="1.0"?>
+<!-- * -->
+<!-- * This is a static copy of the ldocbook.xsl file from the litprog module. -->
+<!-- * It *MAY NOT BE UP TO DATE*. It is provided for the convenience of -->
+<!-- * developers who don't want to generate the file themselves from -->
+<!-- * the sources in the ../litprog directory. To create a fresh up-to-date -->
+<!-- * copy of the file, check out that directory from the source repository -->
+<!-- * and build it. -->
+<!-- * -->
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:verb="com.nwalsh.saxon.Verbatim" exclude-result-prefixes="verb src" version="1.0">
+  <xsl:import href="http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl"/>
+
+    
+
+  <xsl:template match="revhistory" mode="titlepage.mode"/>
+
+  <xsl:param name="section.autolabel" select="1"/>
+<xsl:param name="linenumbering.everyNth" select="5"/>
+<xsl:param name="linenumbering.separator" select="'| '"/>
+  <xsl:param name="local.l10n.xml" select="document('')"/>
+
+<l:i18n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0">
+  <l:l10n language="en">
+   <l:context name="title">
+      <l:template name="fragment" text="%t"/>
+    </l:context>
+  </l:l10n>
+</l:i18n>
+  <xsl:template match="src:fragment">
+  <xsl:param name="suppress-numbers" select="'0'"/>
+  <xsl:param name="linenumbering" select="'numbered'"/>
+
+  <xsl:variable name="section" select="ancestor::section[1]"/>
+  <xsl:variable name="id" select="@id"/>
+  <xsl:variable name="referents" select="//src:fragment[.//src:fragref[@linkend=$id]]"/>
+
+  <div class="src-fragment">
+  <a name="{@id}"/>
+  <table border="1" width="100%">
+    <tr>
+      <td>
+        <p>
+          <b>
+            <xsl:apply-templates select="." mode="label.markup"/>
+          </b>
+          <xsl:if test="$referents">
+            <xsl:text>: </xsl:text>
+            <xsl:for-each select="$referents">
+              <xsl:if test="position() &gt; 1">, </xsl:if>
+              <a>
+                <xsl:attribute name="href">
+                  <xsl:call-template name="href.target">
+                    <xsl:with-param name="object" select="."/>
+                  </xsl:call-template>
+                </xsl:attribute>
+                <xsl:apply-templates select="." mode="label.markup"/>
+              </a>
+            </xsl:for-each>
+          </xsl:if>
+        </p>
+      </td>
+    </tr>
+    <tr>
+      <td>
+        <xsl:choose>
+          <xsl:when test="$suppress-numbers = '0'                           and $linenumbering = 'numbered'                           and $use.extensions != '0'                           and $linenumbering.extension != '0'">
+            <xsl:variable name="rtf">
+              <xsl:apply-templates/>
+            </xsl:variable>
+            <pre class="{name(.)}">
+              <xsl:copy-of select="verb:numberLines($rtf)"/>
+            </pre>
+          </xsl:when>
+          <xsl:otherwise>
+            <pre class="{name(.)}">
+              <xsl:apply-templates/>
+            </pre>
+          </xsl:otherwise>
+        </xsl:choose>
+      </td>
+    </tr>
+  </table>
+  </div>
+</xsl:template>
+
+<xsl:template match="src:fragment" mode="label.markup">
+  <xsl:variable name="section" select="ancestor::section[1]"/>
+
+  <xsl:text>§</xsl:text>
+
+  <xsl:choose>
+    <xsl:when test="$section">
+      <xsl:variable name="section.label">
+        <xsl:apply-templates select="$section" mode="label.markup"/>
+      </xsl:variable>
+      <xsl:choose>
+        <xsl:when test="string($section.label) = ''">
+          <xsl:number from="section"/>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:copy-of select="$section.label"/>
+          <xsl:text>.</xsl:text>
+          <xsl:number from="section"/>
+        </xsl:otherwise>
+      </xsl:choose>
+    </xsl:when>
+    <xsl:otherwise>
+      <xsl:number from="/"/>
+    </xsl:otherwise>
+  </xsl:choose>
+</xsl:template>
+<xsl:template match="src:fragment" mode="title.markup">
+  <xsl:variable name="section" select="ancestor::section[1]"/>
+
+  <xsl:if test="$section">
+    <xsl:apply-templates select="$section" mode="title.markup"/>
+  </xsl:if>
+</xsl:template>
+  <xsl:template match="src:fragref">
+  <xsl:call-template name="xref"/>
+</xsl:template>
+<xsl:template match="src:fragment" mode="xref-to">
+  <xsl:variable name="section" select="ancestor::section[1]"/>
+
+  <i>
+    <xsl:apply-templates select="." mode="label.markup"/>
+    <xsl:text>. </xsl:text>
+    <xsl:apply-templates select="." mode="title.markup"/>
+  </i>
+</xsl:template>
+</xsl:stylesheet>
diff --git a/releasetools/w2docbook.xsl b/releasetools/w2docbook.xsl
new file mode 100644 (file)
index 0000000..c03cd87
--- /dev/null
@@ -0,0 +1,71 @@
+<?xml version="1.0"?>
+<!-- * -->
+<!-- * This is a static copy of the w2docbook.xsl file from the litprog module. -->
+<!-- * It *MAY NOT BE UP TO DATE*. It is provided for the convenience of -->
+<!-- * developers who don't want to generate the file themselves from -->
+<!-- * the sources in the ../litprog directory. To create a fresh up-to-date -->
+<!-- * copy of the file, check out that directory from the source repository -->
+<!-- * and build it. -->
+<!-- * -->
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+  xmlns:src="http://nwalsh.com/xmlns/litprog/fragment"
+  exclude-result-prefixes="xsl src xml" version="1.1">
+
+  <xsl:param name="foo"></xsl:param>
+  <xsl:param name="bar"></xsl:param>
+
+  <xsl:output method="xml" indent="no" doctype-public="{$foo}" doctype-system=""/>
+
+  <xsl:preserve-space elements="*"/>
+
+  <xsl:template match="*">
+    <xsl:element name="{local-name(.)}">
+      <xsl:copy-of select="@*"/>
+      <xsl:apply-templates/>
+    </xsl:element>
+  </xsl:template>
+
+  <xsl:template match="src:fragment" priority="2">
+    <programlisting id="{@*[local-name() = 'id']}">
+      <xsl:apply-templates mode="escaped"/>
+    </programlisting>
+  </xsl:template>
+
+  <xsl:template match="src:fragref" priority="2">
+    <xref linkend="{@linkend}"/>
+  </xsl:template>
+
+  <xsl:template match="*" mode="escaped">
+    <xsl:text>&lt;</xsl:text>
+    <xsl:value-of select="name(.)"/>
+    <xsl:for-each select="@*">
+      <xsl:text> </xsl:text>
+      <xsl:value-of select="name(.)"/>
+      <xsl:text>="</xsl:text>
+      <xsl:value-of select="."/>
+      <xsl:text>"</xsl:text>
+    </xsl:for-each>
+    <xsl:text>&gt;</xsl:text>
+    <xsl:apply-templates mode="escaped"/>
+    <xsl:text>&lt;/</xsl:text>
+    <xsl:value-of select="name(.)"/>
+    <xsl:text>&gt;</xsl:text>
+  </xsl:template>
+
+  <xsl:template match="comment()" mode="escaped">
+    <xsl:text>&lt;!--</xsl:text>
+    <xsl:value-of select="."/>
+    <xsl:text>--&gt;</xsl:text>
+  </xsl:template>
+
+  <xsl:template match="processing-instruction()" mode="escaped">
+    <xsl:text>&lt;?</xsl:text>
+    <xsl:value-of select="name(.)"/>
+    <xsl:value-of select="."/>
+    <xsl:text>?&gt;</xsl:text>
+  </xsl:template>
+
+  <xsl:template match="text()" mode="escaped">
+    <xsl:copy/>
+  </xsl:template>
+</xsl:stylesheet>
diff --git a/releasetools/xtangle.xsl b/releasetools/xtangle.xsl
new file mode 100644 (file)
index 0000000..19e7e47
--- /dev/null
@@ -0,0 +1,129 @@
+<?xml version="1.0"?>
+<!-- * -->
+<!-- * This is a static copy of the xtangle.xsl file from the litprog module. -->
+<!-- * It *MAY NOT BE UP TO DATE*. It is provided for the convenience of -->
+<!-- * developers who don't want to generate the file themselves from -->
+<!-- * the sources in the ../litprog directory. To create a fresh up-to-date -->
+<!-- * copy of the file, check out that directory from the source repository -->
+<!-- * and build it. -->
+<!-- * -->
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" exclude-result-prefixes="src" version="1.0">
+
+    
+  <xsl:preserve-space elements="*"/>
+
+  <xsl:key name="fragment" match="src:fragment" use="@*[local-name() = 'id']"/>
+
+  <xsl:param name="top" select="'top'"/>
+
+
+  <xsl:output method="xml"/>
+
+  <xsl:template match="/">
+  <xsl:apply-templates select="key('fragment', $top)"/>
+</xsl:template>
+  <xsl:template match="src:fragment">
+    <xsl:variable name="first-node" select="node()[1]"/>
+  <xsl:variable name="middle-nodes" select="node()[position() &gt; 1 and position() &lt; last()]"/>
+  <xsl:variable name="last-node" select="node()[position() &gt; 1 and position() = last()]"/>
+      <xsl:choose>
+            <xsl:when test="$first-node = text() and count(node()) = 1">
+                <xsl:variable name="leading-nl" select="substring($first-node, 1, 1) = '&#10;'"/>
+        <xsl:variable name="trailing-nl" select="substring($first-node, string-length($first-node), 1) = '&#10;'"/>
+        <xsl:choose>
+                    <xsl:when test="$leading-nl and $trailing-nl">
+            <xsl:value-of select="substring($first-node, 2, string-length($first-node)-2)"/>
+          </xsl:when>
+                    <xsl:when test="$leading-nl">
+            <xsl:value-of select="substring($first-node, 2)"/>
+          </xsl:when>
+                    <xsl:when test="$trailing-nl">
+            <xsl:value-of select="substring($first-node, 1, string-length($first-node)-1)"/>
+          </xsl:when>
+                    <xsl:otherwise>
+            <xsl:value-of select="$first-node"/>
+          </xsl:otherwise>
+        </xsl:choose>
+      </xsl:when>
+            <xsl:when test="$first-node = text() and substring($first-node, 1, 1) = '&#10;'">
+        <xsl:value-of select="substring($first-node, 2)"/>
+      </xsl:when>
+            <xsl:otherwise>
+        <xsl:apply-templates select="$first-node" mode="copy"/>
+      </xsl:otherwise>
+    </xsl:choose>
+      <xsl:apply-templates select="$middle-nodes" mode="copy"/>
+      <xsl:choose>
+      <xsl:when test="$last-node = text() and substring($last-node, string-length($last-node), 1) = '&#10;'">
+        <xsl:value-of select="substring($last-node, 1, string-length($last-node)-1)"/>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:apply-templates select="$last-node" mode="copy"/>
+      </xsl:otherwise>
+    </xsl:choose>
+</xsl:template>
+  <xsl:template match="src:passthrough" mode="copy">
+  <xsl:value-of disable-output-escaping="yes" select="."/>
+</xsl:template>
+<xsl:template match="src:fragref" mode="copy">
+  <xsl:variable name="node" select="."/>
+  <xsl:choose>
+        <xsl:when test="@disable-output-escaping='yes'">
+      <xsl:element name="{name(.)}" namespace="{namespace-uri(.)}">
+          <xsl:for-each select="namespace::*">
+    <xsl:if test="string(.) != namespace-uri($node)">
+      <xsl:copy/>
+    </xsl:if>
+  </xsl:for-each>
+        <xsl:for-each select="@*">
+          <xsl:if test="not(name(.) = 'disable-output-escaping')">
+            <xsl:copy/>
+          </xsl:if>
+        </xsl:for-each>
+        <xsl:apply-templates mode="copy"/>
+      </xsl:element>
+    </xsl:when>
+        <xsl:otherwise>
+      <xsl:variable name="fragment" select="key('fragment', @linkend)"/>
+            <xsl:if test="count($fragment) != 1">
+        <xsl:message terminate="yes">
+          <xsl:text>Link to fragment "</xsl:text>
+          <xsl:value-of select="@linkend"/>
+          <xsl:text>" does not uniquely identify a single fragment.</xsl:text>
+        </xsl:message>
+      </xsl:if>
+      <xsl:if test="local-name($fragment) != 'fragment'">
+  <xsl:message terminate="yes">
+    <xsl:text>Link "</xsl:text>
+    <xsl:value-of select="@linkend"/>
+    <xsl:text>" does not point to a src:fragment.</xsl:text>
+  </xsl:message>
+</xsl:if>
+      <xsl:apply-templates select="$fragment"/>
+    </xsl:otherwise>
+  </xsl:choose>
+</xsl:template>
+<xsl:template match="*" mode="copy">
+  <xsl:variable name="node" select="."/>
+  <xsl:element name="{name(.)}" namespace="{namespace-uri(.)}">
+      <xsl:for-each select="namespace::*">
+    <xsl:if test="string(.) != namespace-uri($node)">
+      <xsl:copy/>
+    </xsl:if>
+  </xsl:for-each>
+    <xsl:copy-of select="@*"/>
+    <xsl:apply-templates mode="copy"/>
+  </xsl:element>
+</xsl:template>
+  <xsl:template match="processing-instruction()" mode="copy">
+  <xsl:processing-instruction name="{name(.)}">
+    <xsl:value-of select="."/>
+  </xsl:processing-instruction>
+</xsl:template>
+
+<xsl:template match="comment()" mode="copy">
+  <xsl:comment>
+    <xsl:value-of select="."/>
+  </xsl:comment>
+</xsl:template>
+</xsl:stylesheet>
index ff63fbb2677a007d1b2354c0c649044b2f77829b..411c4de1212eeaeaa4269b4698027272edeca5cb 100644 (file)
@@ -54,16 +54,13 @@ ifeq (,$(findstring xsltproc,$(XSLT)))
        @echo "-----------------------------------------------------------------"
 endif
 
-base: litprog
+base:
        for i in $(DIRS) __bogus__; do \
                if [ $$i != __bogus__ ] ; then \
                        echo "$(MAKE) -C $$i"; $(MAKE) -C $$i; \
                fi \
        done
 
-litprog:
-       $(MAKE) -C ../litprog
-
 xhtml:
        $(MAKE) -C xhtml
 
index a527af3939b938faf2f83560a05f90fe658d3056..be123988e30673abd07755a669e10117075e190b 100644 (file)
@@ -11,7 +11,7 @@ param.xsl: param.xweb $(PARAMS)
        $(DOCBOOK_SVN)/buildtools/paramchk -m Makefile.param $<
        $(XSLT) $< $(DOCBOOK_SVN)/xsl/profiling/profile.xsl $(PARAMPROF) profile.condition=$(PROFILECONDITION)
        $(XSLT) $(PARAMPROF) $(DOCBOOK_SVN)/xsl/profiling/strip-attributes.xsl $(PARAMSTRIP) attributes=condition
-       $(XSLT) $(PARAMSTRIP) $(DOCBOOK_SVN)/litprog/xtangle.xsl $(PARAMDBKNS)
+       $(XSLT) $(PARAMSTRIP) $(DOCBOOK_SVN)/releasetools/xtangle.xsl $(PARAMDBKNS)
 ifeq ($(ADDNEWLINE),)
        $(XSLT) $(PARAMDBKNS) $(FIXPARAMNS) $@
 else
index 439d2e6a58ec3a8c95eb331a0467f4e5f755128d..71312f0ac69601a7da57a6e0e3e04b232cacfaa8 100644 (file)
@@ -21,14 +21,17 @@ Release Build Setup/Testing
       source for the "xsl" module, you also need to have
       up-to-date working copies of the following modules:
 
-        gentext
-        litprog
         buildtools
+          tools needed for all builds
         releasetools
+          tools needed for release builds
+        gentext
+          localization source files
 
    a. Shell Environment.
-      To get my environment variables set up, I have a file that I
-      name "docbk.sh", with the following in it:
+      A good way to get your environment variables set up is to
+      create a file (name "docbk.sh" or whatever), with the
+      following in it:
 
         # directory that is base directory for all your DocBook modules
         export DOCBOOK_SVN=/opt/sandbox/docbook/trunk
@@ -43,7 +46,8 @@ Release Build Setup/Testing
         export CLASSPATH=$CLASSPATH:/etc/xml/resolver/
         export SGML_CATALOG_FILES=/etc/sgml/catalog
 
-      I source that by putting the following in my ~/.bashrc file:
+      You can then source that by putting the following in your
+      ~/.bashrc file:
 
         # set up some environment variables for DocBook/XML stuff
         . ~/docbk.sh
@@ -51,7 +55,7 @@ Release Build Setup/Testing
    b. .xmlrc
 
       You need an .xmlrc file with some system-specific data for Java
-      and XML tools in your environment. I use the following:
+      and XML tools in your environment. For example:
 
       <?xml version='1.0' encoding='utf-8'?> <!-- -*- nxml -*- -->
       <config>
@@ -89,8 +93,8 @@ Release Build Setup/Testing
    Run a test "make all" build to make sure there are no problems
    with the non-docs/non-release "normal" part of the build (the
    part that basically just builds the gentext and param files and
-   gives you a working set of stylesheets to use). The way I
-   usually run that is this:
+   gives you a working set of stylesheets to use). On way to run
+   that is this:
 
      . ~/docbk.sh && \
       svn-clean && \
@@ -104,14 +108,14 @@ Release Build Setup/Testing
    NOTE: The svn-clean command is something that's not part of the
    core subversion distribution (on my system, it's part of the
    subversion-tools package). Its function is to "wipe out
-   unversioned files from Subversion working copy". I use it
-   because our own "clean" make target doesn't clean out
-   everything that needs to be cleaned out to get your working
-   directory back to a fresh state. But svn-clean does.
+   unversioned files from Subversion working copy". It is a good
+   idea to use it because our own "clean" make target doesn't
+   clean out everything that needs to be cleaned out to get your
+   working directory back to a fresh state. But svn-clean does.
 
 2. grep the LOG file.
-   After running the above, I then grep through the LOG file to
-   see if anything looks busted, using something like:
+   After running the above, grep through the LOG file to see if
+   anything looks busted, using something like:
 
        egrep -i "error|fail|\*[^.]" LOG
 
@@ -178,8 +182,8 @@ Release Build Setup/Testing
    NOTE: The engine specified in PDF_MAKER is only used to build a
    PDF of the release notes. If you want to use xep instead of
    dblatex, specify PDF_MAKER=xep. (There's no option to use fop
-   because last time I tested it, fop still did a miserable job of
-   formatting the release notes.)
+   because fop still doesn't do an adequate job of formatting the
+   release notes.)
 
    NOTE: The "make install.sh && ./install.sh --batch &&
    . $(pwd)/.profile.incl" parts do an "install" of XML Catalog
@@ -217,10 +221,10 @@ Release Preparation
       "Major feature enhancements", "Minor bugfixes", etc.
    c. If necessary, edit the fm:Changes element to describe this
       release. Keep it at one sentence; e.g.; "This is a bug-fix
-      release with a few feature enhancements." I don't recommend
-      wasting time doing much more than that, because the dumbass
-      at Freshmeat who reviews all submissions will likely edit
-      what you submit and manage to bork it up in some way.
+      release with a few feature enhancements." It's not a good
+      idea to waste time doing much more than that, because the
+      dumbass at Freshmeat who reviews all submissions will likely
+      edit what you submit and manage to bork it up in some way.
 
 2. Check in the VERSION file:
 
index ead4c7c8bdfa4ad2283094b15505dfcc2efc94bd..522b89eef81ae7ac7ae6278be03f3a2586769263 100644 (file)
@@ -15,9 +15,9 @@ docparam.xml: $(VPATH)/param.xweb $(PARAMS)
        $(XSLT) $< ../../profiling/profile.xsl $(PARAMPROF) profile.condition=html
        $(XSLT) $(PARAMPROF) ../../profiling/strip-attributes.xsl $(PARAMSTRIP) attributes=condition
 ifeq ($(ADDNEWLINE),)
-       $(XSLT) $(PARAMSTRIP) $(DOCBOOK_SVN)/litprog/w2docbook.xsl $@
+       $(XSLT) $(PARAMSTRIP) $(DOCBOOK_SVN)/releasetools/w2docbook.xsl $@
 else
-       $(XSLT) $(PARAMSTRIP) $(DOCBOOK_SVN)/litprog/w2docbook.xsl $@.tmp
+       $(XSLT) $(PARAMSTRIP) $(DOCBOOK_SVN)/releasetools/w2docbook.xsl $@.tmp
        $(XSLT) $@.tmp $(ADDNEWLINE) $@
        $(RM) $@.tmp
 endif
index 563f913cc717937cb5dd8aeeaaf20514b16078dc..c32720e4f152203a36cd22d1e587b0cdaddcd9be 100644 (file)
@@ -13,9 +13,9 @@ lib.xml: lib.xweb
        $(XSLT) $< ../profiling/profile.xsl $(PARAMPROF) profile.condition=html
        $(XSLT) $(PARAMPROF) ../profiling/strip-attributes.xsl $(PARAMSTRIP) attributes=condition
 ifeq ($(ADDNEWLINE),)
-       $(XSLT) $(PARAMSTRIP) ../../litprog/w2docbook.xsl $@
+       $(XSLT) $(PARAMSTRIP) $(DOCBOOK_SVN)/releasetools/w2docbook.xsl $@
 else
-       $(XSLT) $(PARAMSTRIP) ../../litprog/w2docbook.xsl $@.tmp
+       $(XSLT) $(PARAMSTRIP) $(DOCBOOK_SVN)/releasetools/w2docbook.xsl $@.tmp
        $(XSLT) $@.tmp $(ADDNEWLINE) $@
        $(RM) $@.tmp
 endif
@@ -25,9 +25,9 @@ lib.xsl: lib.xweb
        $(XSLT) $< ../profiling/profile.xsl $(PARAMPROF) profile.condition=html
        $(XSLT) $(PARAMPROF) ../profiling/strip-attributes.xsl $(PARAMSTRIP) attributes=condition
 ifeq ($(ADDNEWLINE),)
-       $(XSLT) $(PARAMSTRIP) ../../litprog/xtangle.xsl $@
+       $(XSLT) $(PARAMSTRIP) $(DOCBOOK_SVN)/releasetools/xtangle.xsl $@
 else
-       $(XSLT) $(PARAMSTRIP) ../../litprog/xtangle.xsl $@.tmp
+       $(XSLT) $(PARAMSTRIP) $(DOCBOOK_SVN)/releasetools/xtangle.xsl $@.tmp
        $(XSLT) $@.tmp $(ADDNEWLINE) $@
        $(RM) $@.tmp
 endif
index 77e124cd84ee954f2e098b1fcec4f9b381b8255e..5a11fdb9edbc2a1cf6c1db9311bbae36f5885056 100644 (file)
@@ -5,7 +5,7 @@
                 exclude-result-prefixes="src verb"
                 version="1.0">
 
-<xsl:import href="../../../../litprog/html/cldocbook.xsl"/>
+<xsl:import href="../../../../releasetools/cldocbook.xsl"/>
 
 <xsl:param name="use.id.as.filename" select="1"/>
 <xsl:param name="refentry.separator" select="0"/>
index 92c8b7ac0791d3983eeff614d6a9e3ef7db1cb0d..1adf340f14016d6f723a6f3be701c0aa555ee477 100644 (file)
@@ -5,7 +5,7 @@
                 exclude-result-prefixes="src verb"
                 version="1.0">
 
-<xsl:import href="../../../../litprog/html/ldocbook.xsl"/>
+<xsl:import href="../../../../releasetools/ldocbook.xsl"/>
 
 <xsl:template match="src:fragment" mode="label.markup">
   <xsl:text>&#xA7;</xsl:text>