--- jsr166/build.xml	2003/12/08 03:10:54	1.60
+++ jsr166/build.xml	2003/12/10 01:51:11	1.62
@@ -43,6 +43,7 @@
   <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="jtreg.src.dir"        location="${test.src.dir}/jtreg"/>
   <property name="ant.src.dir"          location="${basedir}/etc/ant"/>
   <property name="stylesheet.dir"       location="${basedir}/etc/xsl"/>
   <property name="lib.dir"              location="${basedir}/lib"/>
@@ -251,8 +252,8 @@
     <echo>java.home is ${java.home}</echo>
 
   </target>
-
-
+  
+  
   <target name="dist-jar"
           depends="clean, jar">
 
@@ -410,6 +411,23 @@
 
     </javac>
 
+<!--
+    <javac srcdir="${jtreg.src.dir}"
+          destdir="${build.testcases.dir}"
+            debug="${build.debug}"
+       debuglevel="${build.debuglevel}"
+      deprecation="${build.deprecation}"
+           source="${build.sourcelevel}"
+             fork="true">
+
+      <compilerarg value="${bootclasspath.args}"/>
+      <compilerarg line="${build.args}"/>
+      
+      <classpath refid="test.classpath"/>
+
+    </javac>
+-->
+
   </target>
 
 
@@ -434,15 +452,26 @@
 
       <formatter type="xml"/>
 
-      <batchtest todir="${build.reports.dir}">
+      <batchtest todir="${build.reports.dir}" unless="no.test.tck">
         <fileset dir="${tck.src.dir}">
           <include name="**/${testcase}Test.java"/>
         </fileset>
+      </batchtest>
+      
+      <batchtest todir="${build.reports.dir}" if="do.test.old">
         <fileset dir="${test.src.dir}">
           <include name="jsr166/test/**/${testcase}Test.java"/>
         </fileset>
       </batchtest>
 
+<!--      
+      <batchtest todir="${build.reports.dir}" if="do.test.jtreg">
+        <fileset dir="${jtreg.src.dir}">
+          <include name="**/${testcase}Test.java"/>
+        </fileset>
+      </batchtest>
+-->
+
     </junit>
 
   </target>
@@ -562,11 +591,9 @@
   </target>
 
 
-
-  <!-- Backward compatibility, work in progress (some files not checked in) -->
-
-
-  <target name="compat" depends="jar">
+  <!-- Standalone sample program -->
+  
+  <target name="sample" depends="jar">
   
     <mkdir dir="${build.testcases.dir}"/>
     
@@ -583,12 +610,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>
@@ -596,6 +623,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"/>