You are viewing a plain text version of this content. The canonical link for it is here.
Posted to alexandria-dev@jakarta.apache.org by ru...@apache.org on 2001/08/16 21:40:50 UTC
cvs commit: jakarta-alexandria/proposal/gump/stylesheet build.xsl defaults.xsl xref.xsl
rubys 01/08/16 12:40:50
Modified: proposal/gump/stylesheet build.xsl defaults.xsl xref.xsl
Log:
Decouple the concept of module from srcdir
Revision Changes Path
1.17 +10 -10 jakarta-alexandria/proposal/gump/stylesheet/build.xsl
Index: build.xsl
===================================================================
RCS file: /home/cvs/jakarta-alexandria/proposal/gump/stylesheet/build.xsl,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- build.xsl 2001/08/16 12:08:38 1.16
+++ build.xsl 2001/08/16 19:40:49 1.17
@@ -86,6 +86,7 @@
<xsl:copy>
<xsl:copy-of select="@*"/>
<xsl:variable name="srcdir" select="@srcdir"/>
+ <xsl:variable name="module" select="@module"/>
<html log="{$logdir}/{@name}.html"
banner-image="{$banner-image}" banner-link="{$banner-link}">
@@ -124,7 +125,7 @@
<a href="project_{@defined-in}.html">definition</a>
- <xsl:for-each select="/workspace/project[cvs and @srcdir=$srcdir]">
+ <xsl:for-each select="/workspace/project[cvs and @module=$module]">
<a href="cvs_{@name}.html">cvs</a>
</xsl:for-each>
@@ -142,7 +143,7 @@
</a>
</xsl:when>
<xsl:otherwise>
- <a href="project_{@srcdir}.html">
+ <a href="project_{@module}.html">
<xsl:value-of select="$dependent"/>
</a>
</xsl:otherwise>
@@ -167,9 +168,8 @@
</xsl:for-each>
<logic>
- <initdir dir="{$basedir}/{$srcdir}"
- basedon="{$cvsdir}/{$srcdir}"/>
- <chdir dir="{$basedir}/{$srcdir}"/>
+ <initdir dir="{$srcdir}" basedon="{$cvsdir}/{$module}"/>
+ <chdir dir="{$srcdir}"/>
<classpath>
<xsl:for-each select="work">
@@ -178,10 +178,10 @@
<pathelement location="{$basedir}/{@parent}"/>
</xsl:when>
<xsl:when test="@nested">
- <pathelement location="{$basedir}/{$srcdir}/{@nested}"/>
+ <pathelement location="{$srcdir}/{@nested}"/>
</xsl:when>
<xsl:otherwise>
- <pathelement location="{$basedir}/{$srcdir}"/>
+ <pathelement location="{$srcdir}"/>
</xsl:otherwise>
</xsl:choose>
<xsl:text> </xsl:text>
@@ -222,7 +222,7 @@
<xsl:template match="ant">
<xsl:if test="@basedir">
- <chdir dir="{../../@basedir}/{../@srcdir}/{@basedir}"/>
+ <chdir dir="{../@srcdir}/{@basedir}"/>
</xsl:if>
<xsl:copy>
@@ -283,12 +283,12 @@
<xsl:when test="@reference='srcdir'">
<xsl:variable name="project" select="@project"/>
<xsl:for-each select="/workspace/project[@name=$project]">
- <property name="{$name}" value="{$basedir}/{@srcdir}" type="path"/>
+ <property name="{$name}" value="{@srcdir}" type="path"/>
</xsl:for-each>
</xsl:when>
<xsl:when test="@path">
- <property name="{$name}" value="{$basedir}/{ancestor::project/@srcdir}/{@path}" type="path"/>
+ <property name="{$name}" value="{ancestor::project/@srcdir}/{@path}" type="path"/>
</xsl:when>
<xsl:otherwise>
1.8 +19 -9 jakarta-alexandria/proposal/gump/stylesheet/defaults.xsl
Index: defaults.xsl
===================================================================
RCS file: /home/cvs/jakarta-alexandria/proposal/gump/stylesheet/defaults.xsl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- defaults.xsl 2001/08/16 12:08:38 1.7
+++ defaults.xsl 2001/08/16 19:40:50 1.8
@@ -91,13 +91,10 @@
<xsl:variable name="basedir" select="../@basedir"/>
<xsl:variable name="project" select="@name"/>
- <!-- determine the name of the source directory -->
+ <!-- determine the name of the module -->
- <xsl:variable name="srcdir">
+ <xsl:variable name="module">
<xsl:choose>
- <xsl:when test="@srcdir">
- <xsl:value-of select="@srcdir"/>
- </xsl:when>
<xsl:when test="@defined-in">
<xsl:value-of select="@defined-in"/>
</xsl:when>
@@ -107,9 +104,26 @@
</xsl:choose>
</xsl:variable>
+ <!-- determine the name of the source directory -->
+
+ <xsl:variable name="srcdir">
+ <xsl:choose>
+ <xsl:when test="@srcdir">
+ <xsl:value-of select="concat($basedir,'/',@srcdir)"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of select="concat($basedir,'/',$module)"/>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>
+
<xsl:copy>
<xsl:apply-templates select="@*[name()!='srcdir']"/>
+ <xsl:attribute name="module">
+ <xsl:value-of select="$module"/>
+ </xsl:attribute>
+
<xsl:attribute name="srcdir">
<xsl:value-of select="$srcdir"/>
</xsl:attribute>
@@ -129,8 +143,6 @@
<xsl:value-of select="home/@parent"/>
</xsl:when>
<xsl:when test="home/@nested">
- <xsl:value-of select="$basedir"/>
- <xsl:text>/</xsl:text>
<xsl:value-of select="$srcdir"/>
<xsl:text>/</xsl:text>
<xsl:value-of select="home/@nested"/>
@@ -144,8 +156,6 @@
<xsl:value-of select="@package"/>
</xsl:when>
<xsl:otherwise>
- <xsl:value-of select="$basedir"/>
- <xsl:text>/</xsl:text>
<xsl:value-of select="$srcdir"/>
</xsl:otherwise>
</xsl:choose>
1.8 +1 -1 jakarta-alexandria/proposal/gump/stylesheet/xref.xsl
Index: xref.xsl
===================================================================
RCS file: /home/cvs/jakarta-alexandria/proposal/gump/stylesheet/xref.xsl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xref.xsl 2001/08/06 00:13:04 1.7
+++ xref.xsl 2001/08/16 19:40:50 1.8
@@ -40,7 +40,7 @@
<tr>
<td>
- <a href="project_{@srcdir}.html">
+ <a href="project_{@module}.html">
<xsl:value-of select="@name"/>
</a>
</td>
---------------------------------------------------------------------
To unsubscribe, e-mail: alexandria-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: alexandria-dev-help@jakarta.apache.org