--- jsr166/build.xml	2003/12/07 20:49:10	1.59
+++ jsr166/build.xml	2003/12/09 18:38:28	1.61
@@ -42,6 +42,7 @@
   <!-- Source locations -->
   <property name="src.dir"              location="${basedir}/src/main"/>
   <property name="test.src.dir"         location="${basedir}/src/test"/>
+  <property name="tck.src.dir"          location="${test.src.dir}/tck"/>
   <property name="ant.src.dir"          location="${basedir}/etc/ant"/>
   <property name="stylesheet.dir"       location="${basedir}/etc/xsl"/>
   <property name="lib.dir"              location="${basedir}/lib"/>
@@ -69,12 +70,12 @@
 
 
   <target name="compile"
-          depends="init, configure-compiler, prepare-src"
+          depends="init, configure-compiler"
           description="Compiles main sources to build folder">
 
     <mkdir dir="${build.classes.dir}"/>
 
-    <javac srcdir="${prepare.src.dir}"
+    <javac srcdir="${src.dir}"
           destdir="${build.classes.dir}"
             debug="${build.debug}"
        debuglevel="${build.debuglevel}"
@@ -132,6 +133,25 @@
 
 
 
+  <target name="doccheck"
+          depends="filter-doccheck"
+          description="Reports on javadoc style errors">
+
+    <delete dir="${build.doccheck.dir}"/>
+    <mkdir dir="${build.doccheck.dir}"/>
+
+    <javadoc doclet="com.sun.tools.doclets.doccheck.DocCheck"
+         docletpath="${lib.dir}/doccheck.jar"
+            destdir="${build.doccheck.dir}">
+      <packageset dir="${build.dc-filter.dir}"/>
+    </javadoc>
+
+    <echo>DocCheck output is in ${build.doccheck.dir}</echo>
+
+  </target>
+
+
+
   <target name="checkstyle"
           depends="filter-src"
           description="Reports on style errors in Java source (verbose, mostly chaff)">
@@ -153,25 +173,6 @@
 
   </target>
 
-
-
-  <target name="doccheck"
-          depends="filter-doccheck"
-          description="Reports on javadoc style errors">
-
-    <delete dir="${build.doccheck.dir}"/>
-    <mkdir dir="${build.doccheck.dir}"/>
-
-    <javadoc doclet="com.sun.tools.doclets.doccheck.DocCheck"
-         docletpath="${lib.dir}/doccheck.jar"
-            destdir="${build.doccheck.dir}">
-      <packageset dir="${build.dc-filter.dir}"/>
-    </javadoc>
-
-    <echo>DocCheck output is in ${build.doccheck.dir}</echo>
-
-  </target>
-
   
 
   <target name="dist"
@@ -250,8 +251,8 @@
     <echo>java.home is ${java.home}</echo>
 
   </target>
-
-
+  
+  
   <target name="dist-jar"
           depends="clean, jar">
 
@@ -377,7 +378,7 @@
 
     <mkdir dir="${build.testcases.dir}"/>
 
-    <javac srcdir="${test.src.dir}/tck"
+    <javac srcdir="${tck.src.dir}"
           destdir="${build.testcases.dir}"
             debug="${build.debug}"
        debuglevel="${build.debuglevel}"
@@ -392,6 +393,23 @@
 
     </javac>
 
+    <javac srcdir="${test.src.dir}"
+          destdir="${build.testcases.dir}"
+            debug="${build.debug}"
+       debuglevel="${build.debuglevel}"
+      deprecation="${build.deprecation}"
+           source="${build.sourcelevel}"
+             fork="true">
+
+      <include name="jsr166/test/**"/>
+      
+      <compilerarg value="${bootclasspath.args}"/>
+      <compilerarg line="${build.args}"/>
+      
+      <classpath refid="test.classpath"/>
+
+    </javac>
+
   </target>
 
 
@@ -417,8 +435,11 @@
       <formatter type="xml"/>
 
       <batchtest todir="${build.reports.dir}">
-        <fileset dir="${test.src.dir}/tck">
-          <include name="${testcase}Test.java"/>
+        <fileset dir="${tck.src.dir}">
+          <include name="**/${testcase}Test.java"/>
+        </fileset>
+        <fileset dir="${test.src.dir}">
+          <include name="jsr166/test/**/${testcase}Test.java"/>
         </fileset>
       </batchtest>
 
@@ -462,12 +483,6 @@
     </condition>
 
     <property name="warnunchecked.arg" value=""/>
-    
-    <condition property="prepare.src.dir" value="${build.dir}/prepare-src">
-      <istrue value="${build.nothreads}"/>
-    </condition>
-    
-    <property name="prepare.src.dir" value="${src.dir}"/>
 
 
     <!-- Common options in javac invocations -->
@@ -476,20 +491,6 @@
   </target>
 
 
-  <target name="prepare-src"
-          depends="configure-compiler"
-          if="prepare.src.dir">
-
-    <mkdir dir="${prepare.src.dir}"/>
-    <copy todir="${prepare.src.dir}">
-      <fileset dir="${src.dir}">
-        <exclude name="java/lang/**"/>
-      </fileset>
-    </copy>
-
-  </target>
-
-
   <target name="configure-tests"
        depends="configure-compiler">
 
@@ -561,11 +562,9 @@
   </target>
 
 
-
-  <!-- Backward compatibility, work in progress -->
-
-
-  <target name="compat" depends="jar">
+  <!-- Standalone sample program -->
+  
+  <target name="sample" depends="jar">
   
     <mkdir dir="${build.testcases.dir}"/>
     
@@ -582,12 +581,12 @@
       
       <classpath refid="test.classpath"/>
       
-      <include name="Compatibility.java"/>
+      <include name="jsr166/test/Sample.java"/>
       
     </javac>
     
              
-    <java classname="Compatibility" fork="true">
+    <java classname="jsr166.test.Sample" fork="true">
       <jvmarg value="${bootclasspath.args}"/>
       <classpath refid="test.classpath"/>
     </java>
@@ -595,6 +594,10 @@
 
 
 
+  <!-- Backward compatibility, work in progress (some files not checked in) -->
+
+
+
   <property name="pretiger.src.dir"     location="${build.dir}/pretiger/src"/>
   <property name="build.pretiger.dir"   location="${build.dir}/pretiger/classes"/>
   <property name="pretiger.jar"         location="${build.lib.dir}/jsr166-pretiger.jar"/>