jmartin     01/03/30 04:30:37

  Modified:    .        build.xml
  Log:
  Tidyed up the classpath declaration and allowed the output of the test
  target to be overidden to be xml
  
  Revision  Changes    Path
  1.12      +29 -18    jakarta-alexandria/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-alexandria/build.xml,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- build.xml 2001/03/10 10:06:22     1.11
  +++ build.xml 2001/03/30 12:30:37     1.12
  @@ -5,7 +5,14 @@
       <property name="javadoc.destdir" value="${build.dir}/docs/api"/>
       <property name="year" value="2000"/>
       <property name="build.classes" value="classes" />
  +    <property name="test.format" value="plain" />
   
  +    <path id="classpath">
  +      <fileset dir="lib">
  +        <include name="*.jar"/>
  +      </fileset>
  +    </path>
  +
       <target name="prepare">
           <mkdir dir="${build.dir}" />
           <mkdir dir="${build.classes}" />
  @@ -25,14 +32,18 @@
   
       <target name="clean" description="Clear compiled classes">
           <delete dir="${build.classes}" />
  +        <delete dir="${build.dir}" />
  +        <delete dir="${src.dir}/org/apache/alexandria/xml" />
       </target>
   
       <target name="main" depends="prepare,apis" description="Build Alexandria">
           <javac
               srcdir="${src.dir}"
  -            destdir="${build.classes}"
  -            
classpath="lib/xerces.jar;lib/castor-0.8.11.jar;lib/turbine-2.0.jar;../batik/batik-rasterizer.jar;lib/xalan.jar;${ant.home}/lib/junit.jar"
  -        />
  +            destdir="${build.classes}" >
  +          <classpath>
  +            <fileset dir="lib" includes="*.jar"/>
  +          </classpath>
  +        </javac>
           <jar jarfile="${build.dir}/Alexandria.jar" basedir="${build.classes}"
               excludes="**/test_*.class"
           />
  @@ -72,7 +83,7 @@
           <java classname="org.exolab.castor.builder.SourceGenerator"
               fork="true" 
               dir="src/java"
  -            classpath="lib/castor-0.8.11.jar:lib/xerces.jar" >
  +            classpathref="classpath" >
               <arg value="-f" />
               <arg value="-i" />
               <arg value="../xml/workspace.xsd" />
  @@ -83,7 +94,7 @@
           <java classname="org.exolab.castor.builder.SourceGenerator"
               fork="true" 
               dir="src/java"
  -            classpath="lib/castor-0.8.11.jar:lib/xerces.jar" >
  +            classpathref="classpath" >
               <arg value="-f" />
               <arg value="-i" />
               <arg value="../xml/blame.xsd" />
  @@ -94,7 +105,7 @@
           <java classname="org.exolab.castor.builder.SourceGenerator"
               fork="true" 
               dir="src/java"
  -            classpath="lib/castor-0.8.11.jar:lib/xerces.jar" >
  +            classpathref="classpath" >
               <arg value="-f" />
               <arg value="-i" />
               <arg value="../xml/stats.xsd" />
  @@ -105,7 +116,7 @@
           <java classname="org.exolab.castor.builder.SourceGenerator"
               fork="true" 
               dir="src/java"
  -            classpath="lib/castor-0.8.11.jar:lib/xerces.jar" >
  +            classpathref="classpath" >
               <arg value="-f" />
               <arg value="-i" />
               <arg value="../xml/alltests.xsd" />
  @@ -187,16 +198,16 @@
       <property name="src.dir" value="src/java"/>
   
       <target name="test">
  -        <junit>
  -            <formatter type="plain"/>
  -            <classpath>
  -                <pathelement path="classes"/>
  -            </classpath>
  -            <batchtest>
  -                <fileset dir="${src.dir}">
  -                    <include name="**/test_*.java"/>
  -                </fileset>
  -            </batchtest>
  -        </junit>
  +      <junit>
  +        <formatter type="${test.format}"/>
  +        <classpath>
  +          <pathelement path="classes"/>
  +        </classpath>
  +        <batchtest>
  +          <fileset dir="${src.dir}">
  +            <include name="**/test_*.java"/>
  +          </fileset>
  +        </batchtest>
  +      </junit>
       </target>
   </project>
  
  
  

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

Reply via email to