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/src/stylesheets build.xsl
Date Fri, 19 Apr 2002 12:29:17 GMT
adammurdoch    02/04/19 05:29:17

  Modified:    .        build.xml
               ant1compat project.xml
               antlib   project.xml
               antlib/src/conf archive.mf selftest-extension1.mf
                        selftest.mf
               container project.xml
               container/src/conf myrmidon-launcher.mf
               framework project.xml
               src/stylesheets build.xsl
  Added:       myrmidon project.xml
  Log:
  - Finished up the descriptor for ant1compat.
  - Added descriptor for building the distribution.
  - Moved stuff around in the project classpaths.
  - Made a bucketload of stylesheet fixes.
  
  Revision  Changes    Path
  1.7       +7 -0      jakarta-ant-myrmidon/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-ant-myrmidon/build.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- build.xml	17 Apr 2002 12:01:25 -0000	1.6
  +++ build.xml	19 Apr 2002 12:29:16 -0000	1.7
  @@ -37,6 +37,10 @@
                  out="ant1compat/sample-build.xml"
                  style="src/stylesheets/build.xsl"
                  processor="trax" />
  +        <style in="myrmidon/project.xml"
  +               out="myrmidon/sample-build.xml"
  +               style="src/stylesheets/build.xsl"
  +               processor="trax" />
       </target>
   
       <target name="build-projects" description="Builds all of the projects">
  @@ -81,6 +85,9 @@
           </antcall>
           <antcall target="call-project-target">
               <param name="project" value="ant1compat"/>
  +        </antcall>
  +        <antcall target="call-project-target">
  +            <param name="project" value="myrmidon"/>
           </antcall>
       </target>
   
  
  
  
  1.3       +39 -2     jakarta-ant-myrmidon/ant1compat/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-ant-myrmidon/ant1compat/project.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- project.xml	18 Apr 2002 13:02:59 -0000	1.2
  +++ project.xml	19 Apr 2002 12:29:17 -0000	1.3
  @@ -5,20 +5,43 @@
       <inceptionYear>2002</inceptionYear>
       <package>org.apache.tools.ant</package>
   
  +    <property name="build.ant1classes" value="${build.dir}/ant1classes"/>
  +
       <classpath>
  -        <fileset dir="../lib" includes="*.jar"/>
           <fileset dir="../api/build/lib" includes="*.jar"/>
           <fileset dir="../aut/build/lib" includes="*.jar"/>
  -        <fileset dir="../container/build/lib" includes="*api*.jar"/>
  +        <fileset dir="../lib" includes="*.jar"/>
       </classpath>
   
       <build>
           <sourceDirectory>src/java</sourceDirectory>
   
  +        <classpath>
  +            <path location="${build.ant1classes}"/>
  +            <fileset dir="../container/build/lib" includes="*api*.jar"/>
  +        </classpath>
  +
  +        <prepare>
  +            <unjar src="lib/ant.jar" dest="${build.ant1classes}" overwrite="false"/>
  +            <unjar src="lib/optional.jar" dest="${build.ant1classes}" overwrite="false"/>
  +        </prepare>
  +
           <antlib>
               <id>myrmidon-ant1-compat</id>
               <includeDescriptors>false</includeDescriptors>
               <metainf dir="src/conf" includes="*.xml"/>
  +            <fileset dir="${build.ant1classes}">
  +                <include name="org/apache/tools/ant/**"/>
  +                <exclude name="**/ant/Main.class"/>
  +                <exclude name="**/ant/Task.class"/>
  +                <exclude name="**/ant/BuildException.class"/>
  +                <exclude name="**/ant/taskdefs/Ant.class"/>
  +                <exclude name="**/ant/taskdefs/CallTarget.class"/>
  +                <exclude name="**/ant/types/Path.class"/>
  +            </fileset>
  +
  +            <extension extension-name="myrmidon.ant1.compat"
  +                       specification-version="1.0"/>
               <depends>
                   <extension extension-name="com.sun.tools"
                              specification-version="1.0"/>
  @@ -28,5 +51,19 @@
   
       <unitTest>
           <sourceDirectory>src/test</sourceDirectory>
  +
  +        <unitTestPatterns>
  +            <!-- Need Ant1.5+ to run Ant1Compat tests, because of classpath
  +                 problems in Ant1.4 JUnit Task (prepends ant.jar to classpath) -->
  +            <exclude name="**/Ant1CompatTestCase.*" unless="ant1.5"/>
  +        </unitTestPatterns>
  +
  +        <classpath>
  +            <fileset dir="../container/build/lib" includes="*.jar"/>
  +            <path location="../aut/build/test/classes"/>
  +            <path location="../container/build/test/classes"/>
  +            <path location="../framework/build/test/classes"/>
  +        </classpath>
       </unitTest>
  +
   </project>
  
  
  
  1.3       +4 -2      jakarta-ant-myrmidon/antlib/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-ant-myrmidon/antlib/project.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- project.xml	18 Apr 2002 13:02:59 -0000	1.2
  +++ project.xml	19 Apr 2002 12:29:17 -0000	1.3
  @@ -9,13 +9,14 @@
           <fileset dir="../api/build/lib" includes="*.jar"/>
           <fileset dir="../aut/build/lib" includes="*.jar"/>
           <fileset dir="../framework/build/lib" includes="*.jar"/>
  +        <fileset dir="../lib" includes="**/*.jar"/>
       </classpath>
   
       <build>
           <sourceDirectory>src/java</sourceDirectory>
   
           <classpath>
  -            <fileset dir="../lib" includes="**/*.jar"/>
  +            <path location="../tools/xalan/xml-apis.jar"/>
               <fileset dir="../container/build/lib" includes="*api*.jar"/>
           </classpath>
   
  @@ -78,6 +79,8 @@
                              specification-version="1.0"
                              implementation-version="1.0.2"
                              implementation-vendor-id="org.apache.avalon"/>
  +                <extension extension-name="com.sun.tools"
  +                           implementation-version="1.0"/>
               </depends>
           </antlib>
           <jar>
  @@ -101,7 +104,6 @@
       <unitTest>
           <sourceDirectory>src/test</sourceDirectory>
           <classpath>
  -            <fileset dir="../lib" includes="**/*.jar" excludes="xml-apis.jar"/>
               <fileset dir="../container/build/lib" includes="*.jar"/>
               <path location="../aut/build/test/classes"/>
               <path location="../container/build/test/classes"/>
  
  
  
  1.2       +3 -2      jakarta-ant-myrmidon/antlib/src/conf/archive.mf
  
  Index: archive.mf
  ===================================================================
  RCS file: /home/cvs/jakarta-ant-myrmidon/antlib/src/conf/archive.mf,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- archive.mf	14 Apr 2002 10:56:38 -0000	1.1
  +++ archive.mf	19 Apr 2002 12:29:17 -0000	1.2
  @@ -1,3 +1,4 @@
   Manifest-Version: 1.0
  -Extension-List: bzip2
  -bzip2-Extension-Name: excalibur-bzip2
  +Created-By: Apache Ant Project
  +Extension-List: ext2
  +ext1-Extension-Name: excalibur-bzip2
  
  
  
  1.2       +3 -9      jakarta-ant-myrmidon/antlib/src/conf/selftest-extension1.mf
  
  Index: selftest-extension1.mf
  ===================================================================
  RCS file: /home/cvs/jakarta-ant-myrmidon/antlib/src/conf/selftest-extension1.mf,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- selftest-extension1.mf	14 Apr 2002 10:56:38 -0000	1.1
  +++ selftest-extension1.mf	19 Apr 2002 12:29:17 -0000	1.2
  @@ -1,11 +1,5 @@
   Manifest-Version: 1.0
  -Extension-Name: cornerstone.test.extension
  -Specification-Title: Avalon Cornerstone Test Extension
  -Specification-Version: 1.1
  -Specification-Vendor: Jakarta Apache
  +Created-By: Apache Ant Project
  +Extension-Name: myrmidon.test.extension
  +Specification-Version: 1.0
   Implementation-Vendor-Id: org.apache.avalon
  -Implementation-Vendor: Apache Avalon Project
  -Implementation-Version: 1.0.2
  -Extension-List: tools
  -tools-Extension-Name: com.sun.tools
  -tools-Specification-Version: 1.0
  
  
  
  1.2       +6 -10     jakarta-ant-myrmidon/antlib/src/conf/selftest.mf
  
  Index: selftest.mf
  ===================================================================
  RCS file: /home/cvs/jakarta-ant-myrmidon/antlib/src/conf/selftest.mf,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- selftest.mf	14 Apr 2002 10:56:38 -0000	1.1
  +++ selftest.mf	19 Apr 2002 12:29:17 -0000	1.2
  @@ -1,11 +1,7 @@
   Manifest-Version: 1.0
  -Created-By: Apache Avalon Project
  -Extension-Name: cornerstone.demo.simple
  -Specification-Title: Avalon Cornerstone SimpleServer Demo Extension
  -Implementation-Vendor-Id: org.apache.avalon
  -Implementation-Vendor: Apache Avalon Project
  -Extension-List: required1 
  -required1-Extension-Name: cornerstone.test.extension
  -required1-Specification-Version: 1.0
  -required1-Implementation-Version: 1.0.2
  -required1-Implementation-Vendor-Id: org.apache.avalon
  +Created-By: Apache Ant Project
  +Extension-List: ext2 ext3
  +ext1-Extension-Name: myrmidon.test.extension
  +ext1-Specification-Version: 1.0
  +ext1-Implementation-Vendor-Id: org.apache.avalon
  +ext2-Extension-Name: com.sun.tools
  
  
  
  1.5       +4 -4      jakarta-ant-myrmidon/container/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-ant-myrmidon/container/project.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- project.xml	18 Apr 2002 13:03:00 -0000	1.4
  +++ project.xml	19 Apr 2002 12:29:17 -0000	1.5
  @@ -9,14 +9,13 @@
       <classpath>
           <fileset dir="../api/build/lib" includes="*.jar"/>
           <fileset dir="../aut/build/lib" includes="*.jar"/>
  +        <fileset dir="../lib" includes="**/*.jar"/>
       </classpath>
   
       <build>
           <sourceDirectory>src/java</sourceDirectory>
   
  -        <classpath>
  -            <fileset dir="../lib" includes="**/*.jar"/>
  -        </classpath>
  +        <classpath location="../tools/xalan/xml-apis.jar"/>
   
           <jar>
               <id>myrmidon-container</id>
  @@ -39,6 +38,7 @@
           </jar>
           <jar>
               <id>myrmidon-launcher</id>
  +            <name>myrmidon-launcher.jar</name>
               <includeDescriptors>false</includeDescriptors>
               <attribute name="Main-Class" value="org.apache.myrmidon.launcher.Main"/>
               <patternset>
  @@ -51,8 +51,8 @@
           <sourceDirectory>src/test</sourceDirectory>
   
           <classpath>
  -            <fileset dir="../lib" includes="**/*.jar" excludes="xml-apis.jar"/>
               <path location="../aut/build/test/classes"/>
  +            <path location="../tools/lib/jdepend-2.2.jar"/>
           </classpath>
   
           <unitTestPatterns>
  
  
  
  1.2       +2 -2      jakarta-ant-myrmidon/container/src/conf/myrmidon-launcher.mf
  
  Index: myrmidon-launcher.mf
  ===================================================================
  RCS file: /home/cvs/jakarta-ant-myrmidon/container/src/conf/myrmidon-launcher.mf,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- myrmidon-launcher.mf	11 Apr 2002 13:23:40 -0000	1.1
  +++ myrmidon-launcher.mf	19 Apr 2002 12:29:17 -0000	1.2
  @@ -1,3 +1,3 @@
   Manifest-Version: 1.0
  -Main-Class: org.apache.myrmidon.launcher.Main
  -Created-By: Apache Ant Project
  \ No newline at end of file
  +Created-By: Apache Ant Project
  +Main-Class: org.apache.myrmidon.launcher.Main
  \ No newline at end of file
  
  
  
  1.3       +2 -2      jakarta-ant-myrmidon/framework/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-ant-myrmidon/framework/project.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- project.xml	18 Apr 2002 13:03:00 -0000	1.2
  +++ project.xml	19 Apr 2002 12:29:17 -0000	1.3
  @@ -9,6 +9,7 @@
       <classpath>
           <fileset dir="../aut/build/lib" includes="*.jar"/>
           <fileset dir="../api/build/lib" includes="*.jar"/>
  +        <fileset dir="../lib" includes="**/*.jar"/>
       </classpath>
   
       <build>
  @@ -17,8 +18,8 @@
   
           <classpath>
               <ant-runtime/>
  +            <path location="../tools/xalan/xml-apis.jar"/>
               <fileset dir="../container/build/lib" includes="*api*.jar"/>
  -            <fileset dir="../lib" includes="**/*.jar"/>
           </classpath>
   
           <prepare>
  @@ -97,7 +98,6 @@
       <unitTest>
           <sourceDirectory>src/test</sourceDirectory>
           <classpath>
  -            <fileset dir="../lib" includes="**/*.jar" excludes="xml-apis.jar"/>
               <path location="../aut/build/test/classes"/>
               <path location="../container/build/test/classes"/>
               <fileset dir="../container/build/lib" includes="*.jar"/>
  
  
  
  1.1                  jakarta-ant-myrmidon/myrmidon/project.xml
  
  Index: project.xml
  ===================================================================
  <project>
      <name>Myrmidon Distribution</name>
      <id>myrmidon-distribution</id>
      <currentVersion>1.0</currentVersion>
      <inceptionYear>2000-2002</inceptionYear>
  
      <build>
  
          <dist-prepare>
              <!-- lib/ dir -->
              <mkdir dir="${dist.dir}/lib"/>
              <copy todir="${dist.dir}/lib">
                  <fileset dir="../aut/build/lib" includes="*.jar, *.atl"/>
                  <fileset dir="../api/build/lib" includes="*.jar, *.atl"/>
                  <fileset dir="../container/build/lib" includes="myrmidon-container-api-*.jar"/>
                  <fileset dir="../framework/build/lib" includes="*.jar, *.atl"/>
                  <fileset dir="../antlib/build/lib" includes="*.jar, *.atl" excludes="selftest*"/>
                  <fileset dir="../ant1compat/build/lib" includes="*.jar, *.atl"/>
                  <fileset dir="../lib" includes="*.jar"/>
                  <fileset dir="../tools/xalan" includes="*.jar"/>
              </copy>
  
              <!-- bin/ dir -->
              <property name="dist.bin" value="${dist.dir}/bin"/>
              <mkdir dir="${dist.bin}"/>
              <copy todir="${dist.bin}">
                  <fileset dir="../container/build/lib" includes="myrmidon-launcher.jar"/>
                  <fileset dir="src/script"/>
              </copy>
              <chmod dir="${dist.dir}" perm="go-rwx" />
              <chmod file="${dist.bin}/ant" perm="u+x"/>
              <chmod file="${dist.bin}/antRun" perm="u+x"/>
              <fixcrlf srcdir="${dist.bin}" eol="crlf" includes="*.bat" />
              <fixcrlf srcdir="${dist.bin}" eol="lf" includes="*.sh, ant, antRun" />
  
              <!-- bin/lib/ dir -->
              <mkdir dir="${dist.bin}/lib"/>
              <copy todir="${dist.bin}/lib" file="../container/build/lib/myrmidon-container-1.0.jar">
                  <fileset dir="../lib/bin/lib" includes="*.jar"/>
              </copy>
  
              <!-- ext/ dir -->
              <mkdir dir="${dist.dir}/ext"/>
              <copy todir="${dist.dir}/ext">
                  <fileset dir="../antlib/build/lib" includes="selftest*"/>
                  <fileset dir="../lib/ext" includes="*.jar"/>
              </copy>
  
              <!-- Samples and docs -->
              <copy todir="${dist.dir}/samples">
                  <fileset dir="src/samples"/>
              </copy>
              <copy todir="${dist.dir}/docs">
                  <fileset dir="../site/docs"/>
              </copy>
  
          </dist-prepare>
  
      </build>
  
  </project>
  
  
  1.5       +118 -59   jakarta-ant-myrmidon/src/stylesheets/build.xsl
  
  Index: build.xsl
  ===================================================================
  RCS file: /home/cvs/jakarta-ant-myrmidon/src/stylesheets/build.xsl,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- build.xsl	18 Apr 2002 13:03:00 -0000	1.4
  +++ build.xsl	19 Apr 2002 12:29:17 -0000	1.5
  @@ -46,6 +46,9 @@
               <property name="junit.failonerror" value="false"/>
               <property name="single.test" value="*"/>
   
  +            <!-- Global properties -->
  +            <xsl:copy-of select="property"/>
  +
               <!-- Various paths and patternsets -->
               <path id="project.class.path">
                   <xsl:copy-of select="classpath/*|classpath/@*"/>
  @@ -97,13 +100,27 @@
               </target>
   
               <target name="prepare">
  +                <!-- Check for junit -->
                   <available property="junit.present"
                              classname="junit.framework.TestCase"/>
  +
  +                <!-- Determine Java version -->
                   <available property="jdk1.2+" classname="java.lang.ThreadLocal" />
                   <available property="jdk1.3+" classname="java.lang.StrictMath" />
                   <available property="jdk1.4+" classname="java.lang.CharSequence" />
   
  -                <xsl:if test="build/jar[not(includeDescriptors = 'false')]|build/antlib[not(includeDescriptors
= 'false')]" >
  +                <!-- Check for Ant version 1.5 -->
  +                <property resource="org/apache/tools/ant/version.txt"
  +                          classpath="${java.class.path}"/>
  +                <condition property="ant1.5">
  +                    <or>
  +                        <equals arg1="${VERSION}" arg2="1.5alpha"/>
  +                        <equals arg1="${VERSION}" arg2="1.5"/>
  +                    </or>
  +                </condition>
  +
  +                <!-- taskdef the antlib descriptor task, necessary -->
  +                <xsl:if test="build/jar[not(includeDescriptors = 'false')]|build/antlib[not(includeDescriptors
= 'false')]|unitTest[not(includeDescriptors='false')]" >
                       <taskdef name="antlib-descriptor"
                           classname="org.apache.myrmidon.build.AntlibDescriptorTask">
                           <classpath>
  @@ -120,29 +137,33 @@
               <target name="compile-src" depends="prepare">
                   <mkdir dir="${{build.classes}}"/>
   
  -                <!-- Compile all classes -->
  -                <javac
  -                    destdir="${{build.classes}}"
  -                    debug="${{build.debug}}"
  -                    optimize="${{build.optimize}}"
  -                    deprecation="${{build.deprecation}}"
  -                    target="1.2">
  -                    <xsl:if test="not(build/classpath/ant-runtime)">
  -                        <xsl:attribute name="includeAntRuntime">false</xsl:attribute>
  -                    </xsl:if>
  -                    <classpath refid="compile.class.path"/>
  -                    <src refid="project.source.path"/>
  -                    <patternset refid="project.compile.patternset"/>
  -                </javac>
  -
  -                <!-- copy resources to same location as .class files -->
  -                <copy todir="${{build.classes}}">
  -                    <xsl:for-each select="build/sourceDirectory">
  -                        <fileset dir="{.}">
  -                            <exclude name="**/*.java"/>
  -                        </fileset>
  -                    </xsl:for-each>
  -                </copy>
  +                <xsl:if test="build/sourceDirectory">
  +
  +                    <!-- Compile all classes -->
  +                    <javac
  +                        destdir="${{build.classes}}"
  +                        debug="${{build.debug}}"
  +                        optimize="${{build.optimize}}"
  +                        deprecation="${{build.deprecation}}"
  +                        target="1.2">
  +                        <xsl:if test="not(build/classpath/ant-runtime)">
  +                            <xsl:attribute name="includeAntRuntime">false</xsl:attribute>
  +                        </xsl:if>
  +                        <classpath refid="compile.class.path"/>
  +                        <src refid="project.source.path"/>
  +                        <patternset refid="project.compile.patternset"/>
  +                    </javac>
  +
  +                    <!-- copy resources to same location as .class files -->
  +                    <copy todir="${{build.classes}}">
  +                        <xsl:for-each select="build/sourceDirectory">
  +                            <fileset dir="{.}">
  +                                <exclude name="**/*.java"/>
  +                            </fileset>
  +                        </xsl:for-each>
  +                    </copy>
  +
  +                </xsl:if>
               </target>
   
               <xsl:choose>
  @@ -231,7 +252,7 @@
   
                   <xsl:otherwise>
                       <target name="compile" depends="compile-src"/>
  -                    <target name="test" depends="compile">
  +                    <target name="test" depends="jars">
                           <echo>This project has no unit tests.</echo>
                       </target>
                   </xsl:otherwise>
  @@ -243,26 +264,28 @@
               </target>
   
               <target name="javadocs" description="Generates the javadocs">
  -                <mkdir dir="${{dist.javadocs}}"/>
  -                <javadoc
  -                    destdir="${{dist.javadocs}}">
  -                    <classpath refid="compile.class.path" />
  -                    <sourcepath refid="project.source.path" />
  -                    <xsl:for-each select="package">
  -                        <package name="{.}.*"/>
  -                    </xsl:for-each>
  -                    <doclet name="com.sun.tools.doclets.standard.Standard">
  -                        <param name="-author"/>
  -                        <param name="-version"/>
  -                        <param name="-doctitle" value="{name} v{currentVersion}"/>
  -                        <param name="-windowtitle" value="{name} v{currentVersion}"/>
  -                        <param name="-link" value="http://java.sun.com/j2se/1.4/docs/api/"/>
  -                        <param name="-link" value="http://java.sun.com/j2ee/sdk_1.3/techdocs/api/"/>
  -                        <param name="-link" value="http://jakarta.apache.org/avalon/api/"/>
  -                        <param name="-bottom"
  -                            value="&quot;Copyright &#169; {inceptionYear} Apache
Jakarta Project. All Rights Reserved.&quot;"/>
  -                    </doclet>
  -                </javadoc>
  +                <xsl:if test="build/sourceDirectory">
  +                    <mkdir dir="${{dist.javadocs}}"/>
  +                    <javadoc
  +                        destdir="${{dist.javadocs}}">
  +                        <classpath refid="compile.class.path" />
  +                        <sourcepath refid="project.source.path" />
  +                        <xsl:for-each select="package">
  +                            <package name="{.}.*"/>
  +                        </xsl:for-each>
  +                        <doclet name="com.sun.tools.doclets.standard.Standard">
  +                            <param name="-author"/>
  +                            <param name="-version"/>
  +                            <param name="-doctitle" value="{name} v{currentVersion}"/>
  +                            <param name="-windowtitle" value="{name} v{currentVersion}"/>
  +                            <param name="-link" value="http://java.sun.com/j2se/1.4/docs/api/"/>
  +                            <param name="-link" value="http://java.sun.com/j2ee/sdk_1.3/techdocs/api/"/>
  +                            <param name="-link" value="http://jakarta.apache.org/avalon/api/"/>
  +                            <param name="-bottom"
  +                                value="&quot;Copyright &#169; {inceptionYear} Apache
Jakarta Project. All Rights Reserved.&quot;"/>
  +                        </doclet>
  +                    </javadoc>
  +                </xsl:if>
               </target>
   
               <!-- Creates the distribution -->
  @@ -271,12 +294,15 @@
                       description="Creates the distribution">
   
                   <mkdir dir="${{dist.dir}}"/>
  +
                   <copy todir="${{dist.dir}}">
                       <fileset dir="${{build.lib}}" includes="*.jar, *.atl"/>
  -                    <fileset dir=".." includes="LICENSE.txt, KEYS"/>
  +                    <fileset dir=".." includes="LICENSE.txt, KEYS, WARNING"/>
                       <fileset dir="." includes="README.txt"/>
                   </copy>
   
  +                <xsl:copy-of select="build/dist-prepare/*"/>
  +
                   <mkdir dir="${{dist.base}}"/>
   
                   <xsl:variable name="distname" select="concat(id, '-', currentVersion)"/>
  @@ -325,8 +351,8 @@
               <xsl:apply-templates select="extension">
                   <xsl:with-param name="prefix"></xsl:with-param>
               </xsl:apply-templates>
  -            <xsl:for-each select="depends/extension[1]">Extension-List: ext1</xsl:for-each>
  -            <xsl:for-each select="depends/extension[position() > 1]">, ext<xsl:value-of
select="position()+1"/></xsl:for-each>
  +            <xsl:for-each select="depends/extension[1]">Extension-List:</xsl:for-each>
  +            <xsl:for-each select="depends/extension"> ext<xsl:value-of select="position()+1"/></xsl:for-each>
               <xsl:for-each select="depends/extension[last()]"><xsl:text>
   </xsl:text>
               </xsl:for-each>
  @@ -358,33 +384,66 @@
   
           <copy todir="${{build.conf}}/{id}" file="../LICENSE.txt"/>
   
  -        <xsl:variable name="jarExt">
  +        <xsl:variable name="jarName">
               <xsl:choose>
  -                <xsl:when test="name() = 'antlib'">atl</xsl:when>
  -                <xsl:otherwise>jar</xsl:otherwise>
  +                <xsl:when test="name">
  +                    <xsl:value-of select="name"/>
  +                </xsl:when>
  +                <xsl:when test="self::antlib">
  +                    <!-- Don't include version info in antlib name, since
  +                         name is currently used to locate the antlib when
  +                         importing. -->
  +                    <xsl:value-of select="concat(id, '.atl')"/>
  +                </xsl:when>
  +                <xsl:otherwise>
  +                    <xsl:value-of select="concat(id, '-', /project/currentVersion, '.jar')"/>
  +                </xsl:otherwise>
               </xsl:choose>
           </xsl:variable>
   
  -        <jar jarfile="${{build.lib}}/{id}-{/project/currentVersion}.{$jarExt}"
  +        <jar jarfile="${{build.lib}}/{$jarName}"
               basedir="${{build.classes}}"
               compress="${{build.compress}}"
               manifest="src/conf/{id}.mf">
               <metainf dir="${{build.conf}}/{id}" />
               <xsl:copy-of select="patternset"/>
  +            <xsl:copy-of select="fileset"/>
               <xsl:copy-of select="metainf"/>
           </jar>
       </xsl:template>
   
       <xsl:template match="extension">
           <xsl:param name="prefix" select="concat( 'ext', position(), '-' )"/>
  -        <!--<xsl:param name="prefix"/>-->
  -<xsl:value-of select="$prefix"/>Extension-Name: <xsl:value-of select="@extension-name"/><xsl:text>
  -</xsl:text><xsl:value-of select="$prefix"/>Specification-Vendor: <xsl:value-of
select="@specification-vendor"/><xsl:text>
  -</xsl:text><xsl:value-of select="$prefix"/>Specification-Version: <xsl:value-of
select="@specification-version"/><xsl:text>
  -</xsl:text><xsl:value-of select="$prefix"/>Implementation-Vendor: <xsl:value-of
select="@implementation-vendor"/><xsl:text>
  -</xsl:text><xsl:value-of select="$prefix"/>Implementation-Vendor-Id: <xsl:value-of
select="@implementation-vendor-id"/><xsl:text>
  -</xsl:text><xsl:value-of select="$prefix"/>Implementation-Version: <xsl:value-of
select="@implementation-version"/><xsl:text>
  +        <xsl:if test="@extension-name">
  +            <xsl:value-of select="$prefix"/>Extension-Name: <xsl:value-of select="@extension-name"/>
  +            <xsl:text>
  +</xsl:text>
  +        </xsl:if>
  +        <xsl:if test="@specification-vendor">
  +            <xsl:value-of select="$prefix"/>Specification-Vendor: <xsl:value-of
select="@specification-vendor"/>
  +            <xsl:text>
  +</xsl:text>
  +        </xsl:if>
  +        <xsl:if test="@specification-version">
  +            <xsl:value-of select="$prefix"/>Specification-Version: <xsl:value-of
select="@specification-version"/>
  +            <xsl:text>
   </xsl:text>
  +        </xsl:if>
  +        <xsl:if test="@implementation-vendor">
  +            <xsl:value-of select="$prefix"/>Implementation-Vendor: <xsl:value-of
select="@implementation-vendor"/>
  +            <xsl:text>
  +</xsl:text>
  +        </xsl:if>
  +        <xsl:if test="@implementation-vendor-id">
  +            <xsl:value-of select="$prefix"/>Implementation-Vendor-Id: <xsl:value-of
select="@implementation-vendor-id"/>
  +            <xsl:text>
  +</xsl:text>
  +        </xsl:if>
  +        <xsl:if test="@implemenation-version">
  +            <xsl:value-of select="$prefix"/>Implementation-Version: <xsl:value-of
select="@implementation-version"/>
  +            <xsl:text>
  +</xsl:text>
  +        </xsl:if>
       </xsl:template>
   
       <!-- Chuck all text content -->
  
  
  

--
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