--- jsr166/build.xml	2003/09/15 14:07:36	1.57
+++ jsr166/build.xml	2003/12/07 20:49:10	1.59
@@ -22,7 +22,6 @@
 
   <!-- Compilation options -->
   <property name="build.sourcelevel"    value="1.5"/>
-  <property name="build.docsourcelevel" value="1.4"/>
   <property name="build.debug"          value="true"/>
   <property name="build.debuglevel"     value="source,lines,vars"/>
   <property name="build.deprecation"    value="false"/>
@@ -34,12 +33,11 @@
   <property name="build.lib.dir"        location="${build.dir}/lib"/>
   <property name="build.ant.dir"        location="${build.dir}/ant"/>
   <property name="build.javadocs.dir"   location="${build.dir}/javadocs"/>
-  <property name="build.sinjdocs.dir"   location="${build.dir}/sinjdocs"/>
-  <property name="build.stripped.dir"   location="${build.dir}/stripped"/>
   <property name="build.reports.dir"    location="${build.dir}/reports"/>
+  <property name="build.checkstyle.dir" location="${build.dir}/checkstyle"/>
   <property name="build.doccheck.dir"   location="${build.dir}/doccheck"/>
   <property name="build.filter.src.dir" location="${build.dir}/filtersrc"/>
-  <property name="build.filter.doccheck.dir" location="${build.dir}/filterdocchk"/>
+  <property name="build.dc-filter.dir"  location="${build.dir}/filterdocchk"/>
 
   <!-- Source locations -->
   <property name="src.dir"              location="${basedir}/src/main"/>
@@ -55,32 +53,27 @@
   <!-- Jar locations -->
   <property name="product.jar"          location="${build.lib.dir}/jsr166.jar"/>
   <property name="junit.jar"            location="${lib.dir}/junit.jar"/>
-  <property name="rt.jar"               location="${java.home}/lib/rt.jar"/>
-  <property name="sinjdoc.jar"          location="${lib.dir}/sinjdoc.jar"/>
-
+  
+  <!-- Bootclasspath argument -->
+  <property name="bootclasspath.args"   value="-Xbootclasspath/p:${product.jar}"/>
 
-  <!-- Files excluded from dist-docs -->
-  <patternset id="docs.exclusion">
-    <exclude name="java/util/Random.*"/>
-    <exclude name="sun/misc/Unsafe.*"/>
-  </patternset>
+  <!-- Test classpath -->
+  <path id="test.classpath">
+    <pathelement location="${build.testcases.dir}"/>
+    <pathelement location="${junit.jar}"/>
+  </path>
 
 
 
   <!-- Main targets -->
 
+
   <target name="compile"
           depends="init, configure-compiler, prepare-src"
           description="Compiles main sources to build folder">
 
-    <property name="prepare.src.dir" value="${src.dir}"/>
-
     <mkdir dir="${build.classes.dir}"/>
 
-<!--
-    <echo>javac ${build.args}</echo>
--->
-
     <javac srcdir="${prepare.src.dir}"
           destdir="${build.classes.dir}"
             debug="${build.debug}"
@@ -89,58 +82,35 @@
            source="${build.sourcelevel}"
              fork="true">
 
-      <compilerarg    line="${build.args}"/>
+      <compilerarg line="${build.args}"/>
 
     </javac>
 
   </target>
 
 
-  <target name="jar"
-          depends="init-jar, native-jar"
-          description="Builds library jar from compiled sources"/>
-
 
-  <target name="test"
-          depends="init, configure-tests, report-tests"
-          description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />
-
-
-  <target name="checkstyle"
-          depends="filter-src"
-          description="Reports on style errors in Java source (verbose, mostly chaff)">
+  <target name="jar"
+          depends="compile"
+          description="Builds library jar from compiled sources">
 
-    <taskdef resource="checkstyletask.properties"
-            classpath="${lib.dir}/checkstyle-all-2.4.jar"/>
+    <mkdir dir="${build.lib.dir}"/>
 
-    <checkstyle>
-      <formatter type="plain"/>  <!-- also available: type="xml" -->
-      <fileset dir="${build.filter.src.dir}" includes="**/*.java"/>
-    </checkstyle>
+    <jar destfile="${product.jar}">
+      <fileset dir="${build.classes.dir}"/>
+    </jar>
 
   </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.filter.doccheck.dir}"/>
-    </javadoc>
 
-    <echo>DocCheck output is in ${build.doccheck.dir}</echo>
+  <target name="test"
+          depends="init, configure-tests, report-tests"
+          description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />
 
-  </target>
 
 
   <target name="docs"
-          depends="filter-src"
           description="Builds javadocs with custom tags to build folder">
 
     <delete dir="${build.javadocs.dir}"/>
@@ -149,108 +119,87 @@
     <javadoc destdir="${build.javadocs.dir}"
                 link="http://java.sun.com/j2se/1.4.1/docs/api"
             overview="${src.dir}/intro.html"
-              source="${build.docsourcelevel}">
+              source="${build.sourcelevel}">
 
       <tag name="revised" description="Last revised:"/>
       <tag name="spec"    description="Specified by:"/>
-      <tag name="editor"  description="Last edited by:"/>
-      <tag name="fixme"   description="FIX ME:"/>
 
-      <packageset dir="${build.filter.src.dir}"/>
+      <packageset dir="${src.dir}"/>
 
     </javadoc>
 
   </target>
 
 
-  <target name="sinjdocs"
-          depends="configure-tests"
-          description="Builds javadocs with custom tags to build folder">
-
-    <delete dir="${build.sinjdocs.dir}"/>
-    <mkdir dir="${build.sinjdocs.dir}"/>
 
-    <java classname="net.cscott.sinjdoc.Main" fork="true">
+  <target name="checkstyle"
+          depends="filter-src"
+          description="Reports on style errors in Java source (verbose, mostly chaff)">
 
-      <jvmarg value="-Xbootclasspath/p:${test.bootclasspath}"/>
+    <taskdef resource="checkstyletask.properties"
+            classpath="${lib.dir}/checkstyle-all-3.1.jar"/>
 
-      <classpath>
-        <pathelement location="${sinjdoc.jar}"/>
-        <pathelement location="${lib.dir}/jutil.jar"/>
-        <pathelement location="${lib.dir}/cup.jar"/>
-        <path refid="test.classpath"/>
-      </classpath>
-
-      <!-- <arg value="-help"/> -->
-      <!-- <arg value="-verbose"/> -->
-      <!-- <arg value="-link"/>  <arg value="http://java.sun.com/j2se/1.4.1/docs/api"/> -->
-      
-      <arg value="-d"/>          <arg value="${build.sinjdocs.dir}"/>
-      <arg value="-sourcepath"/> <arg value="${src.dir}"/>
-      <arg value="-overview"/>   <arg value="${src.dir}/intro.html"/>
-      <arg value="-source"/>     <arg value="${build.sourcelevel}"/>
-      
-      <arg value="java.lang"/>
-      <arg value="java.util"/>
-      <arg value="java.util.concurrent"/>
-      <arg value="java.util.concurrent.atomic"/>
-      <arg value="java.util.concurrent.locks"/>
+    <mkdir dir="${build.checkstyle.dir}"/>
+    
+    <checkstyle config="etc/checkstyle/sun_checks.xml"
+       failOnViolation="false">
+      <formatter type="xml" toFile="${build.checkstyle.dir}/checkstyle-report.xml"/> 
+      <fileset dir="${build.filter.src.dir}" includes="**/*.java"/>
+    </checkstyle>
+    
+    <style in="${build.checkstyle.dir}/checkstyle-report.xml" 
+          out="${build.checkstyle.dir}/checkstyle-report.html" 
+        style="${stylesheet.dir}/checkstyle-frames.xsl"/>
 
+  </target>
 
-    </java>
 
-  </target>
 
+  <target name="doccheck"
+          depends="filter-doccheck"
+          description="Reports on javadoc style errors">
 
-  <target name="strip"
-          depends="init, configure-compiler"
-          description="Strip generics from java source (not working yet)">
-
-    <mkdir dir="${build.stripped.dir}"/>
-
-    <!--
-     # javac -s doesn't reliably generate compilable code. It generates
-     # bridge methods (marked as "synthetic") that can have identical
-     # signatures to existing methods except for the return value.
-     -->
-    <javac srcdir="${src.dir}"
-          destdir="${build.stripped.dir}"
-            debug="${build.debug}"
-       debuglevel="${build.debuglevel}"
-      deprecation="${build.deprecation}"
-           source="${build.sourcelevel}"
-             fork="true">
+    <delete dir="${build.doccheck.dir}"/>
+    <mkdir dir="${build.doccheck.dir}"/>
 
-      <compilerarg    line="${build.args} -s"/>
+    <javadoc doclet="com.sun.tools.doclets.doccheck.DocCheck"
+         docletpath="${lib.dir}/doccheck.jar"
+            destdir="${build.doccheck.dir}">
+      <packageset dir="${build.dc-filter.dir}"/>
+    </javadoc>
 
-    </javac>
+    <echo>DocCheck output is in ${build.doccheck.dir}</echo>
 
   </target>
 
+  
 
   <target name="dist"
           depends="init, dist-clean, dist-jar, dist-docs"
           description="Puts all distributable products in single hierarchy"/>
 
+
+
   <target name="release"
           depends="dist"
           description="Puts entire CVS tree, plus distribution productions, in a jar">
 
-<!--
-    #keep build dir? - dl
-    <delete dir="${build.dir}"/>
--->
     <property name="release.jar" value="dist/jsr166-${version}-dist.jar"/>
 
     <jar basedir="${basedir}" destfile="${release.jar}">
+      <!-- <exclude name="build/**"/> -->
       <exclude name="${release.jar}"/>
       <exclude name="user.properties"/>
       <exclude name="etc/notes/**"/>
+      <exclude name="src/emulation/**"/>
       <exclude name="**/SyntaxTest.java"/>
+      <exclude name="**/SuperfluousAbstract.java"/>
     </jar>
 
   </target>
 
+
+
   <target name="clean"
           description="Removes all build products">
 
@@ -261,6 +210,7 @@
   </target>
 
 
+
   <target name="dist-clean"
           description="Removes all build and distribution products">
 
@@ -269,19 +219,19 @@
   </target>
 
 
+
   <target name="dist-docs"
-          depends="filter-src"
           description="Builds javadocs without custom tags to dist folder">
 
     <delete dir="${dist.javadocs.dir}"/>
     <mkdir dir="${dist.javadocs.dir}"/>
 
     <javadoc destdir="${dist.javadocs.dir}"
-                link="http://java.sun.com/j2se/1.4.1/docs/api"
+                link="http://java.sun.com/j2se/1.4.2/docs/api"
             overview="${src.dir}/intro.html"
-              source="${build.docsourcelevel}">
+              source="${build.sourcelevel}">
 
-      <packageset dir="${build.filter.src.dir}"/>
+      <packageset dir="${src.dir}"/>
 
     </javadoc>
 
@@ -302,23 +252,6 @@
   </target>
 
 
-  <target name="init-jar">
-
-    <mkdir dir="${build.lib.dir}"/>
-
-  </target>
-
-
-  <target name="native-jar"
-          depends="compile">
-
-    <jar destfile="${product.jar}">
-      <fileset dir="${build.classes.dir}"/>
-    </jar>
-
-  </target>
-
-
   <target name="dist-jar"
           depends="clean, jar">
 
@@ -354,9 +287,13 @@
     <copy todir="${build.filter.src.dir}">
       <fileset dir="${src.dir}">
         <exclude name="**/*.html"/>
-        <patternset refid="docs.exclusion"/>
+        <!-- Files excluded from dist-docs -->
+        <exclude name="java/util/Random.*"/>
+        <exclude name="sun/misc/Unsafe.*"/>
       </fileset>
+      <!--
       <filterchain>
+      -->
 
         <!--
          # This filter gets rid of angle-bracketed type parameters
@@ -370,27 +307,29 @@
          #   tweaking.)
          -->
 
+        <!--
         <filterreader classname="jsr166.ant.filters.ReplaceFilter"
                       classpath="${build.ant.dir}">
           <param name="notmatching" value="^\s+\*\s.*$"/>
           <param name="pattern"     value="&lt;[^|>()]+?>+"/>
           <param name="replacement" value=" "/>
         </filterreader>
+        -->
 
+      <!--
       </filterchain>
+      -->
     </copy>
 
   </target>
 
 
-
-
   <target name="filter-doccheck"
           depends="filter-src">
 
-    <mkdir dir="${build.filter.doccheck.dir}"/>
+    <mkdir dir="${build.dc-filter.dir}"/>
 
-    <copy todir="${build.filter.doccheck.dir}">
+    <copy todir="${build.dc-filter.dir}">
       <fileset dir="${build.filter.src.dir}">
         <include name="**/*.html"/>
       </fileset>
@@ -400,7 +339,7 @@
              value="/** Fake type parameter. */ public interface E {} /** Fake type parameter. */ public interface T {} /** Fake type parameter. */ public interface K {} /** Fake type parameter. */ public interface V {}"
     />
 
-    <copy todir="${build.filter.doccheck.dir}">
+    <copy todir="${build.dc-filter.dir}">
       <fileset dir="${build.filter.src.dir}">
         <exclude name="**/*.html"/>
       </fileset>
@@ -438,12 +377,7 @@
 
     <mkdir dir="${build.testcases.dir}"/>
 
-<!--
-    <echo>javac ${build.args}</echo>
-    <echo>classpath="${test.classpath}"</echo>
--->
-
-    <javac srcdir="${test.src.dir}"
+    <javac srcdir="${test.src.dir}/tck"
           destdir="${build.testcases.dir}"
             debug="${build.debug}"
        debuglevel="${build.debuglevel}"
@@ -451,11 +385,10 @@
            source="${build.sourcelevel}"
              fork="true">
 
+      <compilerarg value="${bootclasspath.args}"/>
       <compilerarg line="${build.args}"/>
-      <classpath refid="test.classpath"/>
       
-      <include name="java/**"/>
-      <include name="jsr166/**"/>
+      <classpath refid="test.classpath"/>
 
     </javac>
 
@@ -477,14 +410,15 @@
                     dir="${build.reports.dir}"
                    fork="true">
 
-      <jvmarg value="-Xbootclasspath:${test.bootclasspath}"/>
+      <jvmarg value="${bootclasspath.args}"/>
+      
+      <classpath refid="test.classpath"/>
 
       <formatter type="xml"/>
 
       <batchtest todir="${build.reports.dir}">
-        <fileset dir="${test.src.dir}">
-          <include name="java/**/${testcase}Test.java"/>
-          <include name="jsr166/**/${testcase}Test.java"/>
+        <fileset dir="${test.src.dir}/tck">
+          <include name="${testcase}Test.java"/>
         </fileset>
       </batchtest>
 
@@ -532,6 +466,8 @@
     <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 -->
@@ -561,36 +497,19 @@
     <available property="junit.available"
                classname="junit.framework.Protectable"/>
 
-    <fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"
-          unless="junit.available"/>
-
     <!-- Xalan -->
     <available property="xalan.available"
                classname="org.apache.xalan.Version"/>
 
+               
+    <!-- Ant 1.6beta and later don't need or want this check -->
+    <!--    
+    <fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"
+          unless="junit.available"/>
+
     <fail message="Need Xalan 2.5.1 jar in ${ant.home}${file.separator}lib to run tests"
           unless="xalan.available"/>
-
-
-    <!--
-     ! Bootclasspath munging for testing, so JUnit can test our local
-     ! modifications to java.*.
-     -->
-
-    <path id="test.classpath">
-      <pathelement location="${product.jar}"/>
-      <pathelement location="${rt.jar}"/>
-      <pathelement location="${junit.jar}"/>
-      <pathelement location="${build.testcases.dir}"/>
-    </path>
-
-    <path id="test.bootclasspath">
-      <path refid="test.classpath"/>
-    </path>
-
-    <!-- Flatten test classpaths into platform-appropriate strings -->
-    <property name="test.classpath"         refid="test.classpath"/>
-    <property name="test.bootclasspath"     refid="test.bootclasspath"/>
+    -->
 
   </target>
 
@@ -642,13 +561,91 @@
   </target>
 
 
-  <target name="ng" depends="test">
-    <java classname="SuperfluousAbstract" fork="true">
 
-      <jvmarg value="-Xbootclasspath/p:${test.bootclasspath}"/>
+  <!-- Backward compatibility, work in progress -->
 
+
+  <target name="compat" depends="jar">
+  
+    <mkdir dir="${build.testcases.dir}"/>
+    
+    <javac srcdir="${test.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"/>
+      
+      <include name="Compatibility.java"/>
+      
+    </javac>
+    
+             
+    <java classname="Compatibility" fork="true">
+      <jvmarg value="${bootclasspath.args}"/>
+      <classpath refid="test.classpath"/>
     </java>
   </target>
 
 
+
+  <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"/>
+  <property name="pretiger.sourcelevel" value="1.4"/>
+  
+  <target name="defang" 
+       depends="init"
+   description="Generates pre-Tiger compatible source">
+   
+    <delete dir="${pretiger.src.dir}"/>
+    <mkdir dir="${pretiger.src.dir}"/>
+  
+    <exec executable="perl">
+      <arg file="etc/defang.pl"/>
+      <!-- <arg value="-v"/> -->
+      <arg value="-s"/> <arg file="${src.dir}"/>
+      <arg value="-t"/> <arg file="${pretiger.src.dir}"/>
+    </exec>
+    
+  </target>
+
+  <target name="compile-pretiger"
+          depends="init, configure-compiler, defang"
+          description="Compiles pre-Tiger sources to build folder">
+
+    <mkdir dir="${build.pretiger.dir}"/>
+
+    <javac srcdir="${pretiger.src.dir}"
+          destdir="${build.pretiger.dir}"
+            debug="${build.debug}"
+       debuglevel="${build.debuglevel}"
+      deprecation="${build.deprecation}"
+           source="${pretiger.sourcelevel}"
+             fork="true">
+
+      <compilerarg line="${build.args}"/>
+      <exclude name="**/Thread.java"/>
+
+    </javac>
+
+  </target>
+  
+  <target name="pretiger" depends="compile-pretiger">
+
+    <mkdir dir="${build.lib.dir}"/>
+    
+    <jar destfile="${pretiger.jar}">
+      <fileset dir="${build.pretiger.dir}">
+      </fileset>
+    </jar>
+    
+  </target>
+
 </project>