cvs commit: gump/stylesheet bash.xsl build.xsl win2k.xsl winxp.xsl

[bodewig]

bodewig     2004/04/05 02:25:09

  Modified:    stylesheet bash.xsl build.xsl win2k.xsl winxp.xsl
  Log:
  Don't add bootclasspath entries to the CLASSPATH environment at all.
  
  This makes "traditional" Gump consistent with Gumpy.
  
  Revision  Changes    Path
  1.92      +3 -10     gump/stylesheet/bash.xsl
  
  Index: bash.xsl
  ===================================================================
  RCS file: /home/cvs/gump/stylesheet/bash.xsl,v
  retrieving revision 1.91
  retrieving revision 1.92
  diff -u -r1.91 -r1.92
  --- bash.xsl  27 Feb 2004 08:56:57 -0000      1.91
  +++ bash.xsl  5 Apr 2004 09:25:09 -0000       1.92
  @@ -413,16 +413,9 @@
     <xsl:template match="classpath">
       <xsl:text>export CLASSPATH=$CP:$JAVA_HOME/lib/tools.jar&#10;</xsl:text>
       <xsl:for-each select="pathelement">
  -      <xsl:if test="not(@type='boot')">
  -        <xsl:text>export CLASSPATH=$CLASSPATH:</xsl:text>
  -        <xsl:value-of select="translate(@location,'\','/')"/>
  -        <xsl:text>&#10;</xsl:text>
  -      </xsl:if>
  -      <xsl:if test="@type='boot'">
  -        <xsl:text>export CLASSPATH=</xsl:text>
  -        <xsl:value-of select="translate(@location,'\','/')"/>
  -        <xsl:text>:$CLASSPATH&#10;</xsl:text>
  -      </xsl:if>
  +      <xsl:text>export CLASSPATH=$CLASSPATH:</xsl:text>
  +      <xsl:value-of select="translate(@location,'\','/')"/>
  +      <xsl:text>&#10;</xsl:text>
       </xsl:for-each>
     </xsl:template>
   
  
  
  
  1.60      +1 -1      gump/stylesheet/build.xsl
  
  Index: build.xsl
  ===================================================================
  RCS file: /home/cvs/gump/stylesheet/build.xsl,v
  retrieving revision 1.59
  retrieving revision 1.60
  diff -u -r1.59 -r1.60
  --- build.xsl 27 Feb 2004 08:56:57 -0000      1.59
  +++ build.xsl 5 Apr 2004 09:25:09 -0000       1.60
  @@ -216,7 +216,7 @@
                 </xsl:for-each>
   
                 <xsl:for-each 
select="depend[not(noclasspath)]|option[not(noclasspath)]">
  -                <xsl:for-each select="jar">
  +                <xsl:for-each select="jar[not(@type='boot')]">
                     <pathelement location="{../@home}/[EMAIL PROTECTED]">
                       <xsl:copy-of select="@type"/>
                     </pathelement>
  
  
  
  1.53      +3 -10     gump/stylesheet/win2k.xsl
  
  Index: win2k.xsl
  ===================================================================
  RCS file: /home/cvs/gump/stylesheet/win2k.xsl,v
  retrieving revision 1.52
  retrieving revision 1.53
  diff -u -r1.52 -r1.53
  --- win2k.xsl 27 Feb 2004 08:56:57 -0000      1.52
  +++ win2k.xsl 5 Apr 2004 09:25:09 -0000       1.53
  @@ -370,16 +370,9 @@
       <xsl:text>del cp.properties &gt;nul&#10;</xsl:text>
       <xsl:text>echo cp0=%JAVA_HOME:\=/%/lib/tools.jar &gt;&gt;cp.properties 
&#10;</xsl:text>
       <xsl:for-each select="pathelement">
  -      <xsl:if test="not(@type='boot')">
  -        <xsl:text>echo cp</xsl:text><xsl:value-of 
select="position()"/><xsl:text>=</xsl:text>
  -        <xsl:value-of select="translate(@location,'\','/')"/>
  -        <xsl:text> &gt;&gt;cp.properties &#10;</xsl:text>
  -      </xsl:if>
  -      <xsl:if test="@type='boot'">
  -        <xsl:text>echo cp</xsl:text><xsl:value-of 
select="position()"/><xsl:text>.boot=</xsl:text>
  -        <xsl:value-of select="translate(@location,'\','/')"/>
  -        <xsl:text> &gt;&gt;cp.properties &#10;</xsl:text>
  -      </xsl:if>
  +      <xsl:text>echo cp</xsl:text><xsl:value-of 
select="position()"/><xsl:text>=</xsl:text>
  +      <xsl:value-of select="translate(@location,'\','/')"/>
  +      <xsl:text> &gt;&gt;cp.properties &#10;</xsl:text>
       </xsl:for-each>
     </xsl:template>
   
  
  
  
  1.4       +3 -10     gump/stylesheet/winxp.xsl
  
  Index: winxp.xsl
  ===================================================================
  RCS file: /home/cvs/gump/stylesheet/winxp.xsl,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- winxp.xsl 27 Feb 2004 08:56:57 -0000      1.3
  +++ winxp.xsl 5 Apr 2004 09:25:09 -0000       1.4
  @@ -364,16 +364,9 @@
     <xsl:template match="classpath">
       <xsl:text>SET CLASSPATH=%CP%;%JAVA_HOME%\lib\tools.jar&#10;</xsl:text>
       <xsl:for-each select="pathelement">
  -      <xsl:if test="not(@type='boot')">
  -        <xsl:text>SET CLASSPATH=%CLASSPATH%;</xsl:text>
  -        <xsl:value-of select="translate(@location,'/','\')"/>
  -        <xsl:text>&#10;</xsl:text>
  -      </xsl:if>
  -      <xsl:if test="@type='boot'">
  -        <xsl:text>SET CLASSPATH=</xsl:text>
  -        <xsl:value-of select="translate(@location,'/','\')"/>
  -        <xsl:text>;%CLASSPATH%&#10;</xsl:text>
  -      </xsl:if>
  +      <xsl:text>SET CLASSPATH=%CLASSPATH%;</xsl:text>
  +      <xsl:value-of select="translate(@location,'/','\')"/>
  +      <xsl:text>&#10;</xsl:text>
       </xsl:for-each>
     </xsl:template>
   
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]