rubys 01/03/20 11:01:06
Modified: proposal/gump/project xml-xalan.xml xml-xerces.xml
proposal/gump/stylesheet bash.xsl merge.xsl win2k.xsl
Log:
Split buildfile into (optional) buildfile and (optional) basedir
Also some minor changes were made in compatibility with Saxon.
Note: messages per file during merge is now history. Originally,
xalan produced lousy error messages and clean messages. Now it
produces good error messages and verbose messages.
Based on comments and code from Scott Sanders
Revision Changes Path
1.4 +5 -5 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xml-xalan.xml 2001/03/16 21:59:05 1.3
+++ xml-xalan.xml 2001/03/20 19:00:45 1.4
@@ -13,7 +13,7 @@
Release 1.x of the Xalan-Java XSLT processor
</description>
- <ant buildfile="build.xml">
+ <ant>
<property name="bsf.jar"
reference="jarpath" id="bsf" project="bsf"/>
<property name="xerces.jar"
@@ -34,7 +34,7 @@
Release 1.x of the Xalan-Java XSLT processor
</description>
- <ant buildfile="build.xml" target="dist">
+ <ant target="dist">
<property name="bsf.jar"
reference="jarpath" id="bsf" project="bsf"/>
<property name="xerces.jar"
@@ -60,7 +60,7 @@
Release 2.x of the Xalan-Java XSLT processor
</description>
- <ant buildfile="java/build.xml"/>
+ <ant basedir="java"/>
<depend project="bootstrap-ant"/>
<depend project="xml-xerces"/>
@@ -75,7 +75,7 @@
Release 2.x of the Xalan-Java XSLT processor
</description>
- <ant buildfile="java/build.xml" target="dist">
+ <ant basedir="java" target="dist">
<property name="bsf.jar"
reference="jarpath" id="bsf" project="bsf"/>
<property name="xerces.jar"
@@ -98,7 +98,7 @@
Smoke tests
</description>
- <ant buildfile="java/build.xml" target="smoketest"/>
+ <ant basedir="java" target="smoketest"/>
<depend project="jakarta-ant"/>
<depend project="xml-xerces"/>
1.4 +2 -2 jakarta-alexandria/proposal/gump/project/xml-xerces.xml
Index: xml-xerces.xml
===================================================================
RCS file: /home/cvs/jakarta-alexandria/proposal/gump/project/xml-xerces.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xml-xerces.xml 2001/03/08 02:43:05 1.3
+++ xml-xerces.xml 2001/03/20 19:00:48 1.4
@@ -7,7 +7,7 @@
<cvs repository="xml"/>
- <ant buildfile="java/build.xml" target="jar"/>
+ <ant basedir="java" target="jar"/>
<depend project="jaxp1.1"/>
<depend project="bootstrap-ant"/>
@@ -17,7 +17,7 @@
<!-- package up the distrution -->
<project name="dist-xerces">
- <ant buildfile="java/build.xml" target="pack-bin"/>
+ <ant basedir="java" target="pack-bin"/>
<depend project="jakarta-ant"/>
<depend project="xml-xalan2"/>
<depend project="xml-xerces"/>
1.18 +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.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- bash.xsl 2001/03/20 17:29:29 1.17
+++ bash.xsl 2001/03/20 19:00:56 1.18
@@ -332,9 +332,9 @@
</xsl:if>
<xsl:text>"java org.apache.tools.ant.Main</xsl:text>
- <xsl:if test="@buildfile">
+ <xsl:if test="@buildfile | @basedir">
<xsl:text> -buildfile </xsl:text>
- <xsl:value-of select="translate(@buildfile,'\','/')"/>
+ <xsl:value-of select="translate(@buildpath,'\','/')"/>
</xsl:if>
<xsl:for-each select="property">
1.3 +35 -6 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- merge.xsl 2001/03/06 18:11:52 1.2
+++ merge.xsl 2001/03/20 19:00:58 1.3
@@ -4,6 +4,15 @@
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+ <xsl:output method="xml" indent="yes" omit-xml-declaration="yes"/>
+ <xsl:strip-space elements="*"/>
+
+ <xsl:template match="*|@*">
+ <xsl:copy>
+ <xsl:apply-templates select="* | @* | text()"/>
+ </xsl:copy>
+ </xsl:template>
+
<!-- =================================================================== -->
<!-- process all projects referenced in a workspace -->
<!-- =================================================================== -->
@@ -50,10 +59,6 @@
<xsl:for-each select="project[@href]">
<xsl:variable name="home" select="@home"/>
- <xsl:message>
- <xsl:text>- </xsl:text>
- <xsl:value-of select="@href"/>
- </xsl:message>
<xsl:text> </xsl:text>
<!-- is the href found? -->
@@ -114,7 +119,7 @@
</xsl:variable>
<xsl:copy>
- <xsl:copy-of select="@*[name()!='srcdir']"/>
+ <xsl:apply-templates select="@*[name()!='srcdir']"/>
<xsl:if test="$defined-in">
<xsl:attribute name="defined-in">
@@ -126,7 +131,7 @@
<xsl:value-of select="$srcdir"/>
</xsl:attribute>
- <xsl:copy-of select="*[not(self::home|self::project)] | text()"/>
+ <xsl:apply-templates select="*[not(self::home|self::project)] | text()"/>
<!-- Compute fully qualified home directory -->
@@ -195,6 +200,30 @@
</xsl:call-template>
</xsl:for-each>
+ </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.6 +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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- win2k.xsl 2001/03/11 13:26:56 1.5
+++ win2k.xsl 2001/03/20 19:00:59 1.6
@@ -280,9 +280,9 @@
<xsl:text>SET STATUS=SUCCESS </xsl:text>
<xsl:text>java org.apache.tools.ant.Main</xsl:text>
- <xsl:if test="@buildfile">
+ <xsl:if test="@buildfile | @basedir">
<xsl:text> -buildfile </xsl:text>
- <xsl:value-of select="translate(@buildfile,'/','\')"/>
+ <xsl:value-of select="translate(@buildpath,'/','\')"/>
</xsl:if>
<xsl:for-each select="property">
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
