commons-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From scolebou...@apache.org
Subject cvs commit: jakarta-commons/collections build.xml
Date Sun, 05 Oct 2003 23:12:16 GMT
scolebourne    2003/10/05 16:12:16

  Modified:    collections build.xml
  Log:
  Finish integration of testframework jar, with javadoc and validation build
  
  Revision  Changes    Path
  1.45      +79 -18    jakarta-commons/collections/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/collections/build.xml,v
  retrieving revision 1.44
  retrieving revision 1.45
  diff -u -r1.44 -r1.45
  --- build.xml	2 Oct 2003 23:46:54 -0000	1.44
  +++ build.xml	5 Oct 2003 23:12:15 -0000	1.45
  @@ -33,6 +33,23 @@
         <include name="**/BulkTest*.class"/>
      </patternset>
   
  +   <!-- patternset describing test framework source -->
  +   <patternset id="patternset-testframework-source">
  +      <include name="**/Bag.java"/>
  +      <include name="**/SortedBag.java"/>
  +      <include name="**/AbstractTest*.java"/>
  +      <include name="**/BulkTest*.java"/>
  +   </patternset>
  +
  +   <patternset id="patternset-exclude-distros">
  +     <exclude name="**/*.gz"/>
  +     <exclude name="**/*.zip"/>
  +     <exclude name="**/classes/**"/>
  +     <exclude name="**/classestestframework/**"/>
  +      
  +     
  +   </patternset>
  +      
      <!-- ######################################################### -->
   
      <target name="init">
  @@ -60,7 +77,7 @@
   
         <property name="name" value="commons-collections"/>
         <property name="Name" value="Commons-Collections"/>
  -      <property name="Name-Long" value="Jakarta Commons Collections Package"/>
  +      <property name="Name-Long" value="Apache Jakarta Commons Collections"/>
   
         <!-- The current version number of this component -->
         <property name="component.version" value="2.1"/>
  @@ -79,8 +96,10 @@
         <property name="source.doc" value="${basedir}/doc"/>
         <property name="dest" value="${basedir}/dist"/>
         <property name="dest.classes" value="${dest}/classes"/>
  +      <property name="dest.classes.testframework" value="${dest}/classestestframework"/>
         <property name="dest.doc" value="${dest}/docs"/>
         <property name="dest.doc.api" value="${dest.doc}/api"/>
  +      <property name="dest.doc.testframework" value="${dest.doc}/testframework"/>
         <property name="dest.jardir" value="${dest}"/>
         <property name="dest.jardir.jar" value="${dest.jardir}/${name}.jar"/>
         <property name="dest.jardir.testframework.jar" value="${dest.jardir}/${name}-testframework.jar"/>
  @@ -101,13 +120,6 @@
         <property name="javac.deprecation" value="true"/>
         <property name="javac.optimize" value="true"/>
   
  -      <patternset id="patternset-exclude-distros">
  -        <exclude name="**/${bin.name}.tar.gz"/>
  -        <exclude name="**/${bin.name}.zip"/>
  -        <exclude name="**/${src.name}.tar.gz"/>
  -        <exclude name="**/${src.name}.zip"/>
  -      </patternset>
  -      
         <!-- set the cvs.root property in the build.properties file -->
         <property name="cvs.tag" value="COLLECTIONS_2_1"/>      
         
  @@ -161,7 +173,9 @@
   
      <!-- ######################################################### -->
   
  -   <target name="doc" depends="init,doc-top,doc-copy,doc-javadoc" description="generates
javadocs and other documentation">
  +   <target name="doc"
  +           depends="init,doc-top,doc-copy,doc-javadoc,doc-javadoc-testframework"
  +           description="generates javadocs and other documentation">
      </target>
   
      <target name="doc-top" depends="init">
  @@ -207,7 +221,41 @@
                  nohelp="true"
                  nonavbar="false"
                  serialwarn="false">
  -          <group title="Jakarta-commons Collections" packages="org.apache.commons.collections"/>
  +          <link href="http://java.sun.com/products/jdk/1.3/docs/api"/>
  +      </javadoc>
  +      <delete dir="${workdir}"/>
  +   </target>
  +
  +   <target name="doc-javadoc-testframework" depends="init" if="available-src-test">
  +      <!-- copy all the relevant sources out to the work directory and javadoc that
-->
  +      <mkdir dir="${workdir}"/>
  +      <copy todir="${workdir}">
  +        <fileset dir="${source.src}">
  +          <patternset refid="patternset-testframework-source"/>
  +        </fileset>
  +      </copy>
  +      <copy todir="${workdir}"><fileset dir="${workdir}/java" /></copy>
  +      <copy todir="${workdir}"><fileset dir="${workdir}/test" /></copy>
  +      <delete dir="${workdir}/java"/>
  +      <delete dir="${workdir}/test"/>
  +      <mkdir dir="${dest.doc.testframework}"/>
  +      <javadoc packagenames="org.*"
  +               sourcepath="${workdir}"
  +               destdir="${dest.doc.testframework}"
  +               windowtitle="Apache Jakarta Commons Collections Test Framework"
  +               doctitle="Apache Jakarta Commons Collections Test Framework"
  +               bottom="&lt;small&gt;Copyright &amp;copy; 2001-${year} Apache
Software Foundation. Documenation generated ${TODAY}&lt;/small&gt;."
  +               version="true"
  +               author="true"
  +               overview="${source.src.test}/org/apache/commons/collections/overview.html"
  +               splitindex="false"
  +               nodeprecated="true"
  +               nodeprecatedlist="true"
  +               notree="true"
  +               noindex="true"
  +               nohelp="true"
  +               nonavbar="false"
  +               serialwarn="false">
             <link href="http://java.sun.com/products/jdk/1.3/docs/api"/>
         </javadoc>
         <delete dir="${workdir}"/>
  @@ -237,6 +285,24 @@
                optimize="${javac.optimize}"/>
      </target>
   
  +   <!-- validation build to ensure that testframework is independent -->
  +   <target name="validate-build-testframework" depends="init" if="available-src-test">
  +      <delete dir="${dest.classes.testframework}"/>
  +      <mkdir dir="${dest.classes.testframework}"/>
  +      <copy todir="${dest.classes.testframework}">
  +         <fileset dir="${source.src}">
  +            <patternset refid="patternset-testframework-source"/>
  +         </fileset>
  +      </copy>
  +      
  +      <javac destdir="${dest.classes.testframework}"
  +             srcdir="${dest.classes.testframework}"
  +             classpath="${classpath}"
  +             debug="${javac.debug}"
  +             deprecation="${javac.deprecation}"
  +             optimize="${javac.optimize}"/>
  +   </target>
  +
      <!-- ######################################################### -->
   
      <target name="test" depends="build-test" if="test.entry" description="runs (junit)
unit tests">
  @@ -266,8 +332,7 @@
   
      <target name="dist" depends="test,dist-jar,doc,dist-tar,dist-zip" description="builds
binary distribution"/>
   
  -   <target name="dist-jar" depends="dist-jar-main"/>
  -   <!-- Add testframework to above if it is to be released -->
  +   <target name="dist-jar" depends="dist-jar-main,dist-jar-testframework"/>
      
      <target name="dist-jar-main" depends="build">
         <mkdir dir="${dest.jardir}"/>
  @@ -301,7 +366,7 @@
         <delete dir="${workdir}"/>
      </target>
            
  -   <target name="dist-jar-testframework" depends="build-test">
  +   <target name="dist-jar-testframework" depends="validate-build-testframework, build-test">
         <mkdir dir="${dest.jardir}"/>
         
         <mkdir dir="${workdir}"/>
  @@ -321,8 +386,6 @@
      </target>
      
      <target name="dist-tar" depends="dist-jar,doc">
  -
  -      <delete dir="${dest.classes}"/>
         <mkdir dir="${workdir}/${bin.name}"/>
         <copy todir="${workdir}/${bin.name}">
            <fileset dir="${dest}">         
  @@ -345,8 +408,6 @@
      </target>  
   
      <target name="dist-zip" depends="dist-jar,doc">
  -
  -      <delete dir="${dest.classes}"/>
         <mkdir dir="${workdir}/${bin.name}"/>
         <copy todir="${workdir}/${bin.name}">
            <fileset dir="${dest}">         
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org


Mime
View raw message