--- jsr166/build.xml	2002/12/11 15:59:11	1.11
+++ jsr166/build.xml	2003/12/08 03:10:54	1.60
@@ -1,22 +1,30 @@
-<project name="jsr166" default="jar">
+<project name="jsr166" default="usage">
 
   <description>
+------------------------------------------------------------------------------
+  Build file for JSR-166
 
-    Build file for JSR-166
-
-    Note that junit.jar must be in ${ant.home}/lib for the
-    test target to work. [FIXME: This should be automatically
-    enforced by this build file by failing with a message if
-    junit.jar is not in the right place.]
+  Usage: ant [target]
 
+  User-specific settings are read from user.properties.
+  See user.properties.sample for an explanation of some useful settings.
+------------------------------------------------------------------------------
   </description>
 
+  <target name="usage" description="Advises user to run with -projecthelp">
+    <echo>Run "ant -projecthelp" for full usage information.</echo>
+  </target>
+
+
+  <!-- User-specific settings -->
+  <property file="user.properties"/>
+
+
   <!-- Compilation options -->
   <property name="build.sourcelevel"    value="1.5"/>
   <property name="build.debug"          value="true"/>
   <property name="build.debuglevel"     value="source,lines,vars"/>
-  <property name="build.deprecation"    value="true"/>
-  <property name="build.warnings"       value="true"/>
+  <property name="build.deprecation"    value="false"/>
 
   <!-- Build locations -->
   <property name="build.dir"            location="build"/>
@@ -26,11 +34,15 @@
   <property name="build.ant.dir"        location="${build.dir}/ant"/>
   <property name="build.javadocs.dir"   location="${build.dir}/javadocs"/>
   <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.dc-filter.dir"  location="${build.dir}/filterdocchk"/>
 
   <!-- Source locations -->
-  <property name="src.dir"              location="${basedir}"/>
-  <property name="test.src.dir"         location="${basedir}/etc/testcases"/>
+  <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"/>
@@ -41,28 +53,28 @@
 
   <!-- Jar locations -->
   <property name="product.jar"          location="${build.lib.dir}/jsr166.jar"/>
-  <property name="javac.jar"            location="${lib.dir}/javac.jar"/>
-  <property name="collect.jar"          location="${lib.dir}/collect.jar"/>
   <property name="junit.jar"            location="${lib.dir}/junit.jar"/>
-  <property name="rt.jar"               location="${java.home}/lib/rt.jar"/>
-
-  <property name="javac.args"           value='-J-Xbootclasspath/p:${javac.jar}'/>
-
-  <path id="javac.bootclasspath">
-    <pathelement location="${collect.jar}"/>
-    <pathelement location="${rt.jar}"/>
-  </path>
+  
+  <!-- Bootclasspath argument -->
+  <property name="bootclasspath.args"   value="-Xbootclasspath/p:${product.jar}"/>
 
+  <!-- Test classpath -->
   <path id="test.classpath">
-    <pathelement location="${product.jar}"/>
+    <pathelement location="${build.testcases.dir}"/>
+    <pathelement location="${junit.jar}"/>
   </path>
 
 
+
   <!-- Main targets -->
 
-  <target name="compile" depends="init"
-          description="Compiles all sources to build folder">
+
+  <target name="compile"
+          depends="init, configure-compiler"
+          description="Compiles main sources to build folder">
+
     <mkdir dir="${build.classes.dir}"/>
+
     <javac srcdir="${src.dir}"
           destdir="${build.classes.dir}"
             debug="${build.debug}"
@@ -71,163 +83,316 @@
            source="${build.sourcelevel}"
              fork="true">
 
-      <bootclasspath refid="javac.bootclasspath"/>
-      <compilerarg line="${javac.args} ${build.warnings.option}"/>
-
-      <!-- need this because srcdir is basedir! -->
-      <include name="java/**/*.java"/>
+      <compilerarg line="${build.args}"/>
 
     </javac>
+
   </target>
 
 
-  <target name="jar" depends="compile"
+
+  <target name="jar"
+          depends="compile"
           description="Builds library jar from compiled sources">
+
     <mkdir dir="${build.lib.dir}"/>
-    <jar basedir="${build.classes.dir}"
-        destfile="${product.jar}"
-    />
+
+    <jar destfile="${product.jar}">
+      <fileset dir="${build.classes.dir}"/>
+    </jar>
+
   </target>
 
 
-  <target name="test" depends="init, report-tests"
-          description="Runs all tests"/>
+
+  <target name="test"
+          depends="init, configure-tests, report-tests"
+          description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />
 
 
-  <target name="docs" depends="init, clean-filtered-src, filter-src"
+
+  <target name="docs"
           description="Builds javadocs with custom tags to build folder">
+
     <delete dir="${build.javadocs.dir}"/>
     <mkdir dir="${build.javadocs.dir}"/>
+
     <javadoc destdir="${build.javadocs.dir}"
                 link="http://java.sun.com/j2se/1.4.1/docs/api"
             overview="${src.dir}/intro.html"
               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}">
-        <include name="java/**"/>
-      </packageset>
+      <tag name="spec"    description="Specified by:"/>
+
+      <packageset dir="${src.dir}"/>
 
     </javadoc>
+
   </target>
 
 
-  <target name="dist" depends="init, dist-clean, dist-jar, dist-docs"/>
 
+  <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 name="clean"
-          description="Removes all build products">
-    <delete dir="${build.dir}"/>
-    <delete dir="${build.classes.dir}"/>
-    <delete dir="${build.lib.dir}"/>
   </target>
 
 
-  <target name="dist-clean"
-          description="Removes all build and distribution products">
-    <delete dir="${dist.dir}"/>
-  </target>
 
+  <target name="checkstyle"
+          depends="filter-src"
+          description="Reports on style errors in Java source (verbose, mostly chaff)">
 
-  <!-- Internal targets -->
+    <taskdef resource="checkstyletask.properties"
+            classpath="${lib.dir}/checkstyle-all-3.1.jar"/>
 
-  <target name="set-warnings-if" if="build.warnings">
-    <property name="build.warnings.option" value="-warnunchecked"/>
-  </target>
+    <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 name="set-warnings-unless" unless="build.warnings">
-    <property name="build.warnings.option" value=""/>
   </target>
 
-  <target name="init" depends="set-warnings-if, set-warnings-unless">
-    <!-- Version is kept in a separate file -->
-    <loadfile property="version" srcFile="version.properties"/>
-    <echo>Building JSR-166 version ${version}</echo>
+  
+
+  <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">
+
+    <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-filtered-src">
-    <delete dir="${build.filter.src.dir}"/>
+
+  <target name="clean"
+          description="Removes all build products">
+
+    <delete dir="${build.dir}"/>
+    <delete dir="${build.classes.dir}"/>
+    <delete dir="${build.lib.dir}"/>
+
   </target>
 
 
-  <target name="dist-jar" depends="clean, jar">
-    <copy file="${product.jar}" todir="${dist.dir}"/>
+
+  <target name="dist-clean"
+          description="Removes all build and distribution products">
+
+    <delete dir="${dist.dir}"/>
+
   </target>
 
 
-  <target name="dist-docs" depends="clean-filtered-src, filter-src"
+
+  <target name="dist-docs"
           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.sourcelevel}">
 
-      <packageset dir="${build.filter.src.dir}">
-        <include name="java/**"/>
-      </packageset>
+      <packageset dir="${src.dir}"/>
 
     </javadoc>
+
+  </target>
+
+
+
+  <!-- Internal targets -->
+
+
+  <target name="init">
+
+    <!-- Version is kept in a separate file -->
+    <loadfile property="version" srcFile="version.properties"/>
+    <echo>Building JSR-166 version ${version}</echo>
+    <echo>java.home is ${java.home}</echo>
+
   </target>
 
 
-  <target name="compile-ant-filter">
+  <target name="dist-jar"
+          depends="clean, jar">
+
+    <copy file="${product.jar}" todir="${dist.dir}"/>
+
+  </target>
+
+
+  <target name="compile-ant-filter"
+          depends="init">
+
     <mkdir dir="${build.ant.dir}"/>
+
     <javac srcdir="${ant.src.dir}"
           destdir="${build.ant.dir}"
            source="1.4"
     />
+
   </target>
 
 
-  <target name="filter-src" depends="compile-ant-filter">
+  <target name="filter-src"
+          depends="compile-ant-filter">
+
     <mkdir dir="${build.filter.src.dir}"/>
+
     <copy todir="${build.filter.src.dir}">
       <fileset dir="${src.dir}">
-        <include name="**/*.java"/>
+        <include name="**/*.html"/>
       </fileset>
+    </copy>
+
+    <copy todir="${build.filter.src.dir}">
+      <fileset dir="${src.dir}">
+        <exclude name="**/*.html"/>
+        <!-- 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
+         # so that javadoc can run on the result. The following
+         # heuristic seems to work:
+         #
+         # For all lines not starting with space(s)-asterisk-space(s),
+         #   replace <something> with a space, where there may be more
+         #   than one right angle bracket at the end, and "something"
+         #   must not contain parens or pipes. (This may need some
+         #   tweaking.)
+         -->
+
+        <!--
         <filterreader classname="jsr166.ant.filters.ReplaceFilter"
                       classpath="${build.ant.dir}">
-          <!--
-           # These arguments are to get rid of angle-bracketed type
-           # parameters so that javadoc can run on the result. The
-           # following heuristic that seems to work:
-           #
-           # For all lines not starting with space(s)-asterisk-space(s),
-           #   replace <something> with a space, where there may be more
-           #   than one right angle bracket at the end, and "something"
-           #   must not contain parens or pipes. (This may need some
-           #   tweaking.)
-           -->
           <param name="notmatching" value="^\s+\*\s.*$"/>
-          <param name="pattern" value="&lt;[^|>()]+?>+"/>
+          <param name="pattern"     value="&lt;[^|>()]+?>+"/>
           <param name="replacement" value=" "/>
         </filterreader>
+        -->
+
+      <!--
+      </filterchain>
+      -->
+    </copy>
+
+  </target>
+
+
+  <target name="filter-doccheck"
+          depends="filter-src">
+
+    <mkdir dir="${build.dc-filter.dir}"/>
+
+    <copy todir="${build.dc-filter.dir}">
+      <fileset dir="${build.filter.src.dir}">
+        <include name="**/*.html"/>
+      </fileset>
+    </copy>
+
+    <property name="generic.declarations"
+             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.dc-filter.dir}">
+      <fileset dir="${build.filter.src.dir}">
+        <exclude name="**/*.html"/>
+      </fileset>
+      <filterchain>
+        <!--
+         # These two filters try to make the source look like
+         # something that doccheck can process. The first removes
+         # -source 1.4 assertions and the second adds in a bunch
+         # of single letter public nested marker interfaces so that
+         # the generic type parameters are recognized.
+         -->
+
+        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
+                      classpath="${build.ant.dir}">
+          <param name="matching"    value="^\s*assert[\s ].*$"/>
+          <param name="pattern"     value="assert"/>
+          <param name="replacement" value="//assert"/>
+        </filterreader>
+
         <filterreader classname="jsr166.ant.filters.ReplaceFilter"
                       classpath="${build.ant.dir}">
-          <!--
-           # These arguments are to uncomment lines beginning with
-           # "//@" so that javadoc can see imports that are needed
-           # to resolve links but that shouldn't be in the compiled
-           # code.
-           -->
-          <param name="matching" value="^//@.*$"/>
-          <param name="pattern" value="^//@"/>
-          <param name="replacement" value=""/>
+          <param name="matching"    value="^([^*]*(class|interface|implements) .*|)\{.*$"/>
+          <param name="pattern"     value="$"/>
+          <param name="replacement" value=" ${generic.declarations}"/>
         </filterreader>
+
       </filterchain>
     </copy>
+
   </target>
 
 
-  <target name="compile-tests" depends="jar">
+  <target name="compile-tests"
+          depends="jar">
+
     <mkdir dir="${build.testcases.dir}"/>
+
+    <javac srcdir="${tck.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>
+
     <javac srcdir="${test.src.dir}"
           destdir="${build.testcases.dir}"
             debug="${build.debug}"
@@ -236,42 +401,57 @@
            source="${build.sourcelevel}"
              fork="true">
 
-      <bootclasspath refid="javac.bootclasspath"/>
-      <compilerarg line="${javac.args} ${build.warnings.option}"/>
+      <include name="jsr166/test/**"/>
+      
+      <compilerarg value="${bootclasspath.args}"/>
+      <compilerarg line="${build.args}"/>
+      
       <classpath refid="test.classpath"/>
-      <include name="**/*Test.java"/>
 
     </javac>
+
   </target>
 
 
-  <target name="run-tests" depends="compile-tests">
+  <target name="run-tests"
+          depends="compile-tests">
+
+    <!-- May be overridden by user.properties -->
+    <property name="testcase" value="*"/>
+
     <mkdir dir="${build.reports.dir}"/>
+
     <junit printsummary="true"
              showoutput="true"
           errorProperty="junit.failed"
         failureProperty="junit.failed"
-                    dir="${build.reports.dir}">
+                    dir="${build.reports.dir}"
+                   fork="true">
 
-      <classpath>
-        <path refid="test.classpath"/>
-        <pathelement location="${build.testcases.dir}"/>
-      </classpath>
+      <jvmarg value="${bootclasspath.args}"/>
+      
+      <classpath refid="test.classpath"/>
 
       <formatter type="xml"/>
 
       <batchtest todir="${build.reports.dir}">
+        <fileset dir="${tck.src.dir}">
+          <include name="**/${testcase}Test.java"/>
+        </fileset>
         <fileset dir="${test.src.dir}">
-          <include name="**/*Test.java"/>
+          <include name="jsr166/test/**/${testcase}Test.java"/>
         </fileset>
       </batchtest>
 
     </junit>
+
   </target>
 
 
-  <target name="report-tests" depends="run-tests">
-    <!-- Sets junit.report.format to frames if Xalan is present,
+  <target name="report-tests"
+          depends="run-tests">
+
+    <!-- Sets junit.report.format to frames if redirection is present,
          otherwise sets it to noframes. -->
     <available property="junit.report.format"
                   value="frames"
@@ -290,7 +470,183 @@
     </junitreport>
 
     <fail message="Test Cases Failed" if="junit.failed"/>
+
+  </target>
+
+
+  <target name="configure-compiler">
+
+    <property name="unchecked.option" value="-Xlint:unchecked"/>
+
+    <condition property="warnunchecked.arg" value="${unchecked.option}">
+      <istrue value="${build.warnunchecked}"/>
+    </condition>
+
+    <property name="warnunchecked.arg" value=""/>
+
+
+    <!-- Common options in javac invocations -->
+    <property name="build.args" value="${warnunchecked.arg}"/>
+
   </target>
 
 
+  <target name="configure-tests"
+       depends="configure-compiler">
+
+    <!-- junit.framework.Protectable is in JUnit 3.8.1 but not in 3.7 -->
+    <available property="junit.available"
+               classname="junit.framework.Protectable"/>
+
+    <!-- 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"/>
+    -->
+
+  </target>
+
+
+
+  <!-- Anthill targets -->
+
+  <target name="anthill-build">
+  
+    <!-- Override this in user.properties -->
+    <property name="tiger.home" location="e:/j2sdk1.5.0"/>
+    
+    <exec resultproperty="result.property" dir="${basedir}" executable="${tiger.home}/bin/java">
+      <arg value="-Xmx256000000"/>
+      <!-- classpath of new JVM -->
+      <arg value="-classpath"/> <arg path="${java.class.path}"/>
+      <!-- location of Ant home directory -->
+      <arg value="-Dant.home=${ant.home}"/>
+      <!-- the Ant main class -->
+      <arg value="org.apache.tools.ant.Main"/>
+      <!-- The build file -->
+      <arg value="-buildfile"/>  <arg value="build.xml"/>
+      <!-- the target to build on the new Ant instance -->
+      <arg value="-DJAVA_HOME=${tiger.home}"/>
+      <arg value="do-anthill-build"/>
+    </exec>
+  </target>
+  
+  <target name="do-anthill-build"
+          depends="jar, test, docs, dist-docs"/>
+
+  <target name="anthill-publish">
+
+    <copy todir="${deployDir}/docs/private">
+      <fileset dir="${build.javadocs.dir}"/>
+    </copy>
+
+    <copy todir="${deployDir}/docs/public">
+      <fileset dir="${dist.javadocs.dir}"/>
+    </copy>
+
+    <copy tofile="${deployDir}/index.html"
+          file="${basedir}/etc/anthill-index.html"/>
+
+    <copy todir="${deployDir}/notes">
+      <fileset dir="${basedir}/etc/notes"/>
+    </copy>
+
+  </target>
+
+
+
+  <!-- Backward compatibility, work in progress (some files not checked in) -->
+
+
+  <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>