rubys 01/03/06 07:34:23
Modified: proposal/gump/stylesheet build.xsl jakarta.xsl update.xsl
win2k.xsl xref.xsl
Log:
Add support for specifying the log directory in the workspace.
Patch provided by John Morrison <john.r.morrison.ntlworld.com>
Revision Changes Path
1.2 +25 -11 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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build.xsl 2001/02/04 18:03:54 1.1
+++ build.xsl 2001/03/06 15:34:20 1.2
@@ -8,6 +8,22 @@
</xsl:copy>
</xsl:template>
+ <xsl:variable name="basedir"
+ select="translate(/workspace/@basedir, '\', '/')"/>
+
+ <xsl:variable name="cvsdir"
+ select="translate(/workspace/@cvsdir, '\', '/')"/>
+
+ <xsl:variable name="logdir">
+ <xsl:choose>
+ <xsl:when test="/workspace/@logdir"><xsl:value-of
+ select="translate(/workspace/@logdir, '\',
'/')"/></xsl:when>
+ <xsl:otherwise><xsl:value-of select="$basedir"/>
+ <xsl:text>/log</xsl:text>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>
+
<!-- =================================================================== -->
<!-- provide support for specifying desired projects on the command line -->
<!-- =================================================================== -->
@@ -16,18 +32,18 @@
<build>
- <chdir dir="{@basedir}"/>
- <mkdir dir="log"/>
+ <chdir dir="{$basedir}"/>
+ <mkdir dir="{$logdir}"/>
<delete dir="build"/>
<delete dir="dist"/>
<xsl:for-each select="project[cvs]">
- <delete dir="{/workspace/@basedir}/{@name}"/>
- <copy fromdir="{/workspace/@cvsdir}/{@name}"
- todir="{/workspace/@basedir}/{@name}"/>
+ <delete dir="{$basedir}/{@name}"/>
+ <copy fromdir="{$cvsdir}/{@name}"
+ todir="{$basedir}/{@name}"/>
</xsl:for-each>
- <html log="{/workspace/@basedir}/log/index.html">
+ <html log="{$logdir}/index.html">
<title>
<xsl:text>Build status - </xsl:text>
<date/>
@@ -74,7 +90,7 @@
<xsl:copy-of select="@*"/>
<xsl:variable name="srcdir" select="@srcdir"/>
- <html log="{/workspace/@basedir}/log/{@name}.html">
+ <html log="{$logdir}/{@name}.html">
<title>
<xsl:text>Build </xsl:text>
<xsl:value-of select="@name"/>
@@ -150,10 +166,8 @@
</xsl:for-each>
<logic>
- <xsl:variable name="basedir" select="/workspace/@basedir"/>
-
<initdir dir="{$basedir}/{$srcdir}"
- basedon="{/workspace/@cvsdir}/{$srcdir}"/>
+ basedon="{$cvsdir}/{$srcdir}"/>
<chdir dir="{$basedir}/{$srcdir}"/>
<classpath>
@@ -242,7 +256,7 @@
</xsl:when>
<xsl:when test="@path">
- <property name="{$name}"
value="{ancestor::workspace/@basedir}/{ancestor::project/@srcdir}/{@path}"/>
+ <property name="{$name}"
value="{$basedir}/{ancestor::project/@srcdir}/{@path}"/>
</xsl:when>
<xsl:otherwise>
1.2 +3 -2 jakarta-alexandria/proposal/gump/stylesheet/jakarta.xsl
Index: jakarta.xsl
===================================================================
RCS file: /home/cvs/jakarta-alexandria/proposal/gump/stylesheet/jakarta.xsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jakarta.xsl 2001/02/04 18:03:54 1.1
+++ jakarta.xsl 2001/03/06 15:34:21 1.2
@@ -1,6 +1,8 @@
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
<xsl:output indent="yes"/>
+ <xsl:variable name="image">images/jakarta-logo.gif</xsl:variable>
+
<xsl:template match="*|@*|text()">
<xsl:copy>
<xsl:apply-templates select="*|@*|text()"/>
@@ -23,8 +25,7 @@
<tr>
<td colspan="2">
<a href="http://jakarta.apache.org">
- <img src="http://jakarta.apache.org/images/jakarta-logo.gif"
- align="left" border="0"/>
+ <img src="$image" align="left" border="0"/>
</a>
</td>
</tr>
1.3 +22 -6 jakarta-alexandria/proposal/gump/stylesheet/update.xsl
Index: update.xsl
===================================================================
RCS file: /home/cvs/jakarta-alexandria/proposal/gump/stylesheet/update.xsl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- update.xsl 2001/02/05 18:37:23 1.2
+++ update.xsl 2001/03/06 15:34:21 1.3
@@ -2,6 +2,22 @@
<xsl:output indent="yes"/>
+ <xsl:variable name="basedir"
+ select="translate(/workspace/@basedir, '\', '/')"/>
+
+ <xsl:variable name="cvsdir"
+ select="translate(/workspace/@cvsdir, '\', '/')"/>
+
+ <xsl:variable name="logdir">
+ <xsl:choose>
+ <xsl:when test="/workspace/@logdir"><xsl:value-of
+ select="translate(/workspace/@logdir, '\',
'/')"/></xsl:when>
+ <xsl:otherwise><xsl:value-of select="$basedir"/>
+ <xsl:text>/log</xsl:text>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>
+
<xsl:template match="*|@*">
<xsl:copy>
<xsl:apply-templates select="*|@*"/>
@@ -17,11 +33,11 @@
<update>
<xsl:copy-of select="@*"/>
- <mkdir dir="{@basedir}"/>
- <mkdir dir="{@basedir}/log"/>
- <mkdir dir="{@cvsdir}"/>
+ <mkdir dir="{$basedir}"/>
+ <mkdir dir="{$logdir}"/>
+ <mkdir dir="{$cvsdir}"/>
- <html log="{/workspace/@basedir}/log/cvs_index.html">
+ <html log="{$logdir}/cvs_index.html">
<title>
<xsl:text>CVS update - </xsl:text>
<date/>
@@ -57,7 +73,7 @@
</content>
</html>
- <chdir dir="{@basedir}"/>
+ <chdir dir="{$basedir}"/>
</update>
</xsl:template>
@@ -67,7 +83,7 @@
<xsl:copy>
<xsl:copy-of select="@*"/>
- <html log="{/workspace/@basedir}/log/cvs_{@name}.html">
+ <html log="{$logdir}/cvs_{@name}.html">
<title>
<xsl:text>cvs update </xsl:text>
<xsl:value-of select="@name"/>
1.3 +22 -6 jakarta-alexandria/proposal/gump/stylesheet/win2k.xsl
Index: win2k.xsl
===================================================================
RCS file: /home/cvs/jakarta-alexandria/proposal/gump/stylesheet/win2k.xsl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- win2k.xsl 2001/02/06 19:31:58 1.2
+++ win2k.xsl 2001/03/06 15:34:21 1.3
@@ -1,6 +1,22 @@
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
<xsl:strip-space elements="*"/>
+ <xsl:variable name="basedir"
+ select="translate(/workspace/@basedir, '/', '\')"/>
+
+ <xsl:variable name="cvsdir"
+ select="translate(/workspace/@cvsdir, '/', '\')"/>
+
+ <xsl:variable name="logdir">
+ <xsl:choose>
+ <xsl:when test="/workspace/@logdir"><xsl:value-of
+ select="translate(/workspace/@logdir, '/',
'\')"/></xsl:when>
+ <xsl:otherwise><xsl:value-of select="$basedir"/>
+ <xsl:text>\log</xsl:text>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>
+
<!-- =================================================================== -->
<!-- build -->
<!-- =================================================================== -->
@@ -80,7 +96,7 @@
<xsl:text>if not "%1"=="" goto top </xsl:text>
<xsl:text>chdir /d </xsl:text>
- <xsl:value-of select="translate(@basedir,'/','\')"/>
+ <xsl:value-of select="$basedir"/>
<xsl:text> </xsl:text>
<xsl:text>ENDLOCAL </xsl:text>
@@ -132,15 +148,15 @@
<xsl:text>@echo off </xsl:text>
<xsl:text>if not exist </xsl:text>
- <xsl:value-of select="translate(@basedir,'/','\')"/>
+ <xsl:value-of select="$basedir"/>
<xsl:text> mkdir </xsl:text>
- <xsl:value-of select="translate(@basedir,'/','\')"/>
+ <xsl:value-of select="$basedir"/>
<xsl:text> </xsl:text>
<xsl:text>if not exist </xsl:text>
- <xsl:value-of select="translate(@basedir,'/','\')"/>
+ <xsl:value-of select="$basedir"/>
<xsl:text>\log mkdir </xsl:text>
- <xsl:value-of select="translate(@basedir,'/','\')"/>
+ <xsl:value-of select="$basedir"/>
<xsl:text>\log </xsl:text>
<xsl:text>if not exist </xsl:text>
@@ -246,7 +262,7 @@
</xsl:template>
<!-- =================================================================== -->
- <!-- create the claspath -->
+ <!-- create the classpath -->
<!-- =================================================================== -->
<xsl:template match="classpath">
1.2 +14 -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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xref.xsl 2001/02/04 18:03:54 1.1
+++ xref.xsl 2001/03/06 15:34:21 1.2
@@ -1,5 +1,18 @@
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+ <xsl:variable name="basedir"
+ select="translate(/workspace/@basedir, '\', '/')"/>
+
+ <xsl:variable name="logdir">
+ <xsl:choose>
+ <xsl:when test="/workspace/@logdir"><xsl:value-of
+ select="translate(/workspace/@logdir, '\',
'/')"/></xsl:when>
+ <xsl:otherwise><xsl:value-of select="$basedir"/>
+ <xsl:text>/log</xsl:text>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>
+
<!-- =================================================================== -->
<!-- Produce a cross reference of project dependencies -->
<!-- =================================================================== -->
@@ -8,7 +21,7 @@
<xref>
- <html log="{/workspace/@basedir}/log/xref.html">
+ <html log="{$logdir}/xref.html">
<title>Cross Reference</title>
<sidebar>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
