cvs commit: jakarta-ant/src/etc/testcases/taskdefs/optional/depend/src1 A.java B.java C.java D.java

[co...@apache.org]

conor       02/04/07 22:10:32

  Modified:    src/etc/testcases/taskdefs/optional/depend depend.xml
  Added:       src/etc/testcases/taskdefs/optional/depend/src1 A.java
                        B.java C.java D.java
  Removed:     src/etc/testcases/taskdefs/optional/depend/java A.java
                        B.java C.java D.java
  Log:
  Setup to suport more test sets for depend task
  
  Revision  Changes    Path
  1.4       +15 -12    jakarta-ant/src/etc/testcases/taskdefs/optional/depend/depend.xml
  
  Index: depend.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/etc/testcases/taskdefs/optional/depend/depend.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -w -u -r1.3 -r1.4
  --- depend.xml	5 Apr 2002 12:55:01 -0000	1.3
  +++ depend.xml	8 Apr 2002 05:10:31 -0000	1.4
  @@ -1,21 +1,24 @@
   <?xml version="1.0"?>
   
   <project name="depend" basedir="." default="help">
  -  <property name="cvssrc.dir" value="java"/>
  +  <property name="src1.dir" value="src1"/>
     <property name="tempsrc.dir" value="working"/>
     <property name="classes.dir" value="classes"/>
     <target name="help">
       <echo>This buildfile is used as part of Ant's test suite.</echo>
     </target>
   
  -  <target name="setup">
  +  <target name="basesetup">
       <mkdir dir="${tempsrc.dir}"/>
  +  </target>
  +  
  +  <target name="src1setup" depends="basesetup">
       <copy todir="${tempsrc.dir}">
  -      <fileset dir="${cvssrc.dir}"/>
  +      <fileset dir="${src1.dir}"/>
       </copy>
     </target>
     
  -  <target name="compile" depends="setup">
  +  <target name="src1compile" depends="src1setup">
       <mkdir dir="${classes.dir}"/>
       <javac srcdir="${tempsrc.dir}" destdir="${classes.dir}"/>
     </target>
  @@ -25,37 +28,37 @@
       <delete dir="${tempsrc.dir}"/>
     </target>
   
  -  <target name="testdirect" depends="compile">
  +  <target name="testdirect" depends="src1compile">
       <sleep seconds="3"/>
       <delete file="${tempsrc.dir}/C.java"/>
  -    <copy file="${cvssrc.dir}/C.java" tofile="${tempsrc.dir}/C.java"/>
  +    <copy file="${src1.dir}/C.java" tofile="${tempsrc.dir}/C.java"/>
       <depend srcdir="${tempsrc.dir}" destdir="${classes.dir}"/>
       <fileset id="result" dir="${classes.dir}"/>
     </target>
   
  -  <target name="testclosure" depends="compile">
  +  <target name="testclosure" depends="src1compile">
       <sleep seconds="3"/>
       <delete file="${tempsrc.dir}/C.java"/>
  -    <copy file="${cvssrc.dir}/C.java" tofile="${tempsrc.dir}/C.java"/>
  +    <copy file="${src1.dir}/C.java" tofile="${tempsrc.dir}/C.java"/>
       <depend srcdir="${tempsrc.dir}" destdir="${classes.dir}" closure="yes"/>
       <fileset id="result" dir="${classes.dir}"/>
     </target>
   
  -  <target name="testbasicset" depends="compile">
  +  <target name="testbasicset" depends="src1compile">
       <classfileset id="result" dir="${classes.dir}" rootclass="A"/>
     </target>
   
  -  <target name="testsmallset" depends="compile">
  +  <target name="testsmallset" depends="src1compile">
       <classfileset id="result" dir="${classes.dir}" rootclass="B"/>
     </target>
   
  -  <target name="testcomboset" depends="compile">
  +  <target name="testcomboset" depends="src1compile">
       <classfileset id="result" dir="${classes.dir}" rootclass="B">
         <include name="**/C.class"/>
       </classfileset>
     </target>
     
  -  <target name="testbyreference" depends="compile">
  +  <target name="testbyreference" depends="src1compile">
       <classfileset id="classSet" dir="${classes.dir}" rootclass="A">
         <include name="**/C.class"/>
       </classfileset>
  
  
  
  1.1                  jakarta-ant/src/etc/testcases/taskdefs/optional/depend/src1/A.java
  
  Index: A.java
  ===================================================================
  public class A extends B {
      private D d = new D();
  }
  
  
  
  
  1.1                  jakarta-ant/src/etc/testcases/taskdefs/optional/depend/src1/B.java
  
  Index: B.java
  ===================================================================
  public class B extends C {
  }
  
  
  
  
  1.1                  jakarta-ant/src/etc/testcases/taskdefs/optional/depend/src1/C.java
  
  Index: C.java
  ===================================================================
  public class C {
  }
  
  
  
  
  1.1                  jakarta-ant/src/etc/testcases/taskdefs/optional/depend/src1/D.java
  
  Index: D.java
  ===================================================================
  public class D {
  }
  
  
  
  

--
To unsubscribe, e-mail:   <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>