ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From adammurd...@apache.org
Subject cvs commit: jakarta-ant-myrmidon/tools/xsl build.xsl
Date Sat, 01 Jun 2002 06:46:29 GMT
adammurdoch    2002/05/31 23:46:29

  Modified:    tools/xsl build.xsl
  Log:
  Tidy-ups.
  
  Revision  Changes    Path
  1.24      +15 -7     jakarta-ant-myrmidon/tools/xsl/build.xsl
  
  Index: build.xsl
  ===================================================================
  RCS file: /home/cvs/jakarta-ant-myrmidon/tools/xsl/build.xsl,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- build.xsl	29 May 2002 10:50:36 -0000	1.23
  +++ build.xsl	1 Jun 2002 06:46:29 -0000	1.24
  @@ -1,7 +1,5 @@
   <xsl:stylesheet version="1.0"
  -                xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
  -                xmlns:redirect="org.apache.xalan.xslt.extensions.Redirect"
  -                extension-element-prefixes="redirect">
  +                xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
       <xsl:output indent="yes" omit-xml-declaration="yes"/>
   
       <xsl:template match="/project">
  @@ -131,7 +129,7 @@
                   </xsl:attribute>
               </target>
   
  -            <target name="jars" depends="compile, main-jars" description="Builds the
project jar files">
  +            <target name="jars" description="Builds the project jar files">
                   <xsl:attribute name="depends">
                       <xsl:text>compile, main-jars</xsl:text>
                       <xsl:for-each select="additional-build">, <xsl:value-of select="concat('build',
position(), '-jars')"/></xsl:for-each>
  @@ -195,7 +193,6 @@
                           <xsl:if test="not(unitTest/includeDescriptors = 'false')">
                               <antlib-descriptor
                                   destdir="${{test.classes}}/META-INF"
  -                                libName="tests"
                                   descriptorName="ant-descriptor.xml"
                                   rolesDescriptorName="ant-roles.xml">
                                   <fileset dir="{unitTest/sourceDirectory}">
  @@ -321,11 +318,22 @@
               </target>
   
               <!-- Extra targets -->
  -            <xsl:copy-of select="target"/>
  +            <xsl:for-each select="target">
  +                <target>
  +                    <xsl:copy-of select="@name"/>
  +                    <xsl:copy-of select="@description"/>
  +                    <xsl:attribute name="depends">
  +                        <xsl:text>prepare</xsl:text>
  +                        <xsl:for-each select="@depends">, <xsl:value-of select="."/></xsl:for-each>
  +                    </xsl:attribute>
  +                    <xsl:copy-of select="*"/>
  +                </target>
  +            </xsl:for-each>
   
           </project>
       </xsl:template>
   
  +    <!-- Template to assemble a build -->
       <xsl:template match="build|additional-build">
           <xsl:param name="build-id" select="concat('build', position())"/>
           <xsl:param name="build-classes" select="concat('${build.dir}/build', position(),
'/classes')"/>
  @@ -393,6 +401,7 @@
           </xsl:apply-templates>
       </xsl:template>
   
  +    <!-- Template to assemble a Jar -->
       <xsl:template match="jar">
           <xsl:param name="build-id"/>
           <xsl:param name="build-lib"/>
  @@ -423,7 +432,6 @@
                       <mkdir dir="${{build.conf}}/{id}"/>
                       <antlib-descriptor
                           destdir="${{build.conf}}/{id}"
  -                        libName="{id}"
                           descriptorName="ant-descriptor.xml"
                           rolesDescriptorName="ant-roles.xml">
                           <xsl:for-each select="../sourceDirectory">
  
  
  

--
To unsubscribe, e-mail:   <mailto:ant-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:ant-dev-help@jakarta.apache.org>


Mime
View raw message