rubys 01/06/10 06:14:59
Modified: proposal/gump/project xml-xalan.xml
proposal/gump/stylesheet bash.xsl build.xsl defaults.xsl
merge.xsl win2k.xsl
Log:
Make dist-xalan2 build again. XSLTC requires CUP, JLex, and BCEL. The
build script for XSLTC also makes explicit assumptions as to where the
current working directory is, so accomodate...
Revision Changes Path
1.9 +14 -0 jakarta-alexandria/proposal/gump/project/xml-xalan.xml
Index: xml-xalan.xml
===================================================================
RCS file: /home/cvs/jakarta-alexandria/proposal/gump/project/xml-xalan.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- xml-xalan.xml 2001/05/25 22:01:09 1.8
+++ xml-xalan.xml 2001/06/10 13:14:57 1.9
@@ -88,7 +88,9 @@
<depend project="xml-xalan2"/>
<depend project="xml-stylebook2"/>
<option project="bsf"/>
+ <depend project="bcel"/>
<depend project="java_cup"/>
+ <depend project="jlex"/>
<work nested="java/build/classes"/>
<home nested="java/build/xalan-j_2_0_1"/>
@@ -109,11 +111,23 @@
<work nested="test/java/src"/>
</project>
+ <project name="bcel">
+ <url href="http://bcel.sourceforge.net/"/>
+ <home nested="java"/>
+ <jar name="bin/BCEL.jar"/>
+ </project>
+
<project name="java_cup">
<url href="http://www.cs.princeton.edu/~appel/modern/java/CUP/"/>
<home nested="java"/>
<jar name="bin/java_cup.jar"/>
<jar name="bin/runtime.jar"/>
+ </project>
+
+ <project name="jlex">
+ <url href="http://www.cs.princeton.edu/~appel/modern/java/JLex/"/>
+ <home nested="java"/>
+ <jar name="bin/JLex.jar"/>
</project>
</project>
1.29 +2 -2 jakarta-alexandria/proposal/gump/stylesheet/bash.xsl
Index: bash.xsl
===================================================================
RCS file: /home/cvs/jakarta-alexandria/proposal/gump/stylesheet/bash.xsl,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- bash.xsl 2001/04/24 15:31:49 1.28
+++ bash.xsl 2001/06/10 13:14:57 1.29
@@ -360,9 +360,9 @@
</xsl:if>
<xsl:text>"java org.apache.tools.ant.Main</xsl:text>
- <xsl:if test="@buildfile | @basedir">
+ <xsl:if test="@buildfile">
<xsl:text> -buildfile </xsl:text>
- <xsl:value-of select="translate(@buildpath,'\','/')"/>
+ <xsl:value-of select="translate(@buildfile,'\','/')"/>
</xsl:if>
<xsl:for-each select="property">
1.12 +6 -2 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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- build.xsl 2001/04/23 15:58:18 1.11
+++ build.xsl 2001/06/10 13:14:58 1.12
@@ -38,7 +38,7 @@
</xsl:for-each>
</xsl:if>
- <html log="{$logdir}/index.html"
+ <html log="{$logdir}/index.html"
banner-image="{$banner-image}" banner-link="{$banner-link}">
<title>
@@ -87,7 +87,7 @@
<xsl:copy-of select="@*"/>
<xsl:variable name="srcdir" select="@srcdir"/>
- <html log="{$logdir}/{@name}.html"
+ <html log="{$logdir}/{@name}.html"
banner-image="{$banner-image}" banner-link="{$banner-link}">
<title>
@@ -221,6 +221,10 @@
<xsl:template match="project[not(ant) and not(script)]"/>
<xsl:template match="ant">
+ <xsl:if test="@basedir">
+ <chdir dir="{../../@basedir}/{../@srcdir}/{@basedir}"/>
+ </xsl:if>
+
<xsl:copy>
<xsl:apply-templates select="@*"/>
<xsl:apply-templates select="*[name()!='property']"/>
1.2 +0 -24 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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- defaults.xsl 2001/04/22 15:27:59 1.1
+++ defaults.xsl 2001/06/10 13:14:58 1.2
@@ -204,28 +204,4 @@
</xsl:template>
- <!-- =================================================================== -->
- <!-- resolve buildpath -->
- <!-- =================================================================== -->
-
- <xsl:template match="ant">
- <xsl:copy>
- <xsl:attribute name="buildpath">
- <xsl:if test="@basedir">
- <xsl:value-of select="@basedir"/>
- <xsl:text>/</xsl:text>
- </xsl:if>
-
- <xsl:if test="@buildfile">
- <xsl:value-of select="@buildfile"/>
- </xsl:if>
- <xsl:if test="not(@buildfile)">
- <xsl:text>build.xml</xsl:text>
- </xsl:if>
- </xsl:attribute>
-
- <xsl:copy-of select="@* | * | text()"/>
- </xsl:copy>
- </xsl:template>
-
</xsl:stylesheet>
1.7 +0 -24 jakarta-alexandria/proposal/gump/stylesheet/merge.xsl
Index: merge.xsl
===================================================================
RCS file: /home/cvs/jakarta-alexandria/proposal/gump/stylesheet/merge.xsl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- merge.xsl 2001/04/11 22:12:23 1.6
+++ merge.xsl 2001/06/10 13:14:58 1.7
@@ -250,28 +250,4 @@
</xsl:template>
- <!-- =================================================================== -->
- <!-- resolve buildpath -->
- <!-- =================================================================== -->
-
- <xsl:template match="ant">
- <xsl:copy>
- <xsl:attribute name="buildpath">
- <xsl:if test="@basedir">
- <xsl:value-of select="@basedir"/>
- <xsl:text>/</xsl:text>
- </xsl:if>
-
- <xsl:if test="@buildfile">
- <xsl:value-of select="@buildfile"/>
- </xsl:if>
- <xsl:if test="not(@buildfile)">
- <xsl:text>build.xml</xsl:text>
- </xsl:if>
- </xsl:attribute>
-
- <xsl:copy-of select="@* | * | text()"/>
- </xsl:copy>
- </xsl:template>
-
</xsl:stylesheet>
1.8 +2 -2 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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- win2k.xsl 2001/04/22 15:27:59 1.7
+++ win2k.xsl 2001/06/10 13:14:58 1.8
@@ -308,9 +308,9 @@
<xsl:text>SET STATUS=SUCCESS </xsl:text>
<xsl:text>java org.apache.tools.ant.Main</xsl:text>
- <xsl:if test="@buildfile | @basedir">
+ <xsl:if test="@buildfile">
<xsl:text> -buildfile </xsl:text>
- <xsl:value-of select="translate(@buildpath,'/','\')"/>
+ <xsl:value-of select="translate(@buildfile,'/','\')"/>
</xsl:if>
<xsl:for-each select="property">
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
