rubys 01/10/21 04:52:55
Modified: proposal/gump/stylesheet bash.xsl build.xsl win2k.xsl
Log:
Try putting things which are on the bootclasspath FIRST on the classpath
too.
Revision Changes Path
1.61 +10 -3 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.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- bash.xsl 2001/10/20 20:50:33 1.60
+++ bash.xsl 2001/10/21 11:52:55 1.61
@@ -344,9 +344,16 @@
<xsl:template match="classpath">
<xsl:text>export CLASSPATH=$CP:$JAVA_HOME\lib\tools.jar </xsl:text>
<xsl:for-each select="pathelement">
- <xsl:text>export CLASSPATH=$CLASSPATH:</xsl:text>
- <xsl:value-of select="translate(@location,'\','/')"/>
- <xsl:text> </xsl:text>
+ <xsl:if test="@type='boot'">
+ <xsl:text>export CLASSPATH=$CLASSPATH:</xsl:text>
+ <xsl:value-of select="translate(@location,'\','/')"/>
+ <xsl:text> </xsl:text>
+ </xsl:if>
+ <xsl:if test="not(@type='boot')">
+ <xsl:text>export CLASSPATH=</xsl:text>
+ <xsl:value-of select="translate(@location,'\','/')"/>
+ <xsl:text>:$CLASSPATH </xsl:text>
+ </xsl:if>
</xsl:for-each>
</xsl:template>
1.44 +4 -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.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- build.xsl 2001/10/21 03:26:49 1.43
+++ build.xsl 2001/10/21 11:52:55 1.44
@@ -211,8 +211,10 @@
</xsl:for-each>
<xsl:for-each select="depend[not(noclasspath)]|option">
- <xsl:for-each select="jar[not(@type='boot')]">
- <pathelement location="{../@home}/{@name}"/>
+ <xsl:for-each select="jar">
+ <pathelement location="{../@home}/{@name}">
+ <xsl:copy-of select="@type"/>
+ </pathelement>
</xsl:for-each>
</xsl:for-each>
</classpath>
1.30 +10 -3 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.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- win2k.xsl 2001/10/20 20:50:33 1.29
+++ win2k.xsl 2001/10/21 11:52:55 1.30
@@ -305,9 +305,16 @@
<xsl:template match="classpath">
<xsl:text>SET CLASSPATH=%CP%;%JAVA_HOME%\lib\tools.jar </xsl:text>
<xsl:for-each select="pathelement">
- <xsl:text>SET CLASSPATH=%CLASSPATH%;</xsl:text>
- <xsl:value-of select="translate(@location,'/','\')"/>
- <xsl:text> </xsl:text>
+ <xsl:if test="not(@type='boot')">
+ <xsl:text>SET CLASSPATH=%CLASSPATH%;</xsl:text>
+ <xsl:value-of select="translate(@location,'/','\')"/>
+ <xsl:text> </xsl:text>
+ </xsl:if>
+ <xsl:if test="@type='boot'">
+ <xsl:text>SET CLASSPATH=</xsl:text>
+ <xsl:value-of select="translate(@location,'/','\')"/>
+ <xsl:text>;%CLASSPATH% </xsl:text>
+ </xsl:if>
</xsl:for-each>
</xsl:template>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
