--- jsr166/build.xml	2003/05/29 04:35:42	1.32
+++ jsr166/build.xml	2003/06/06 20:48:55	1.41
@@ -59,23 +59,38 @@
 
 
 
-  <!-- Files excluded from emulation and dist-docs -->
-  <patternset id="emulation.excludes">
+  <!-- Files excluded from dist-docs and emulation jar -->
+  <patternset id="unsafe.exclusion">
     <exclude name="java/util/Random.*"/>
     <exclude name="sun/misc/Unsafe.*"/>
   </patternset>
 
+  <!-- Files excludes from emulation jar -->
+  <patternset id="atomic.exclusion">
+    <exclude name="java/util/concurrent/atomic/AtomicBoolean*"/>
+    <exclude name="java/util/concurrent/atomic/AtomicInteger*"/>
+    <exclude name="java/util/concurrent/atomic/AtomicLong*"/>
+    <exclude name="java/util/concurrent/atomic/AtomicReference*"/>
+  </patternset>
+
 
 
   <!-- Main targets -->
 
   <target name="compile"
-          depends="init, configure-compiler"
+          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}"/>
 
-    <javac srcdir="${src.dir}"
+<!--
+    <echo>javac ${gjc.args}</echo>
+    <echo>bootclasspath=${compile.bootclasspath}</echo>
+-->
+
+    <javac srcdir="${prepare.src.dir}"
           destdir="${build.classes.dir}"
             debug="${build.debug}"
        debuglevel="${build.debuglevel}"
@@ -83,8 +98,8 @@
            source="${build.sourcelevel}"
              fork="true">
 
-      <bootclasspath refid="javac.bootclasspath"/>
-      <compilerarg line="${build.javac.args}"/>
+      <compilerarg    line="${gjc.args}"/>
+      <bootclasspath refid="compile.bootclasspath"/>
 
     </javac>
 
@@ -175,8 +190,8 @@
            source="${build.sourcelevel}"
              fork="true">
 
-      <bootclasspath refid="javac.bootclasspath"/>
-      <compilerarg line="${build.javac.args} -s"/>
+      <compilerarg    line="${gjc.args} -s"/>
+      <bootclasspath refid="compile.bootclasspath"/>
 
     </javac>
 
@@ -270,8 +285,8 @@
            source="${build.sourcelevel}"
              fork="true">
 
-      <bootclasspath refid="javac.bootclasspath"/>
-      <compilerarg line="${build.javac.args}"/>
+      <compilerarg    line="${gjc.args}"/>
+      <bootclasspath refid="compile.bootclasspath"/>
 
     </javac>
 
@@ -285,7 +300,8 @@
 
     <jar destfile="${product.jar}" duplicate="add">
       <fileset dir="${build.classes.dir}">
-        <patternset refid="emulation.excludes"/>
+        <patternset refid="atomic.exclusion"/>
+        <patternset refid="unsafe.exclusion"/>
       </fileset>
       <fileset dir="${build.emulation.dir}"/>
     </jar>
@@ -325,41 +341,79 @@
       </fileset>
     </copy>
 
+    <!-- Not needed now, used for doccheck filtering:
+    <property name="generic.declarations"
+             value="public interface E {} public interface T {} public interface K {} public interface V {}"
+    />
+    -->
+
     <copy todir="${build.filter.src.dir}">
       <fileset dir="${src.dir}">
         <exclude name="**/*.html"/>
-        <patternset refid="emulation.excludes"/>
+        <patternset refid="unsafe.exclusion"/>
       </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>
+
+
+        <!--
+         # This filter uncomments lines beginning with "//@" so that
+         # javadoc can see imports that are needed to resolve links
+         # but that shouldn't be in the compiled code.
+         -->
+
         <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="matching"    value="^//@.*$"/>
+          <param name="pattern"     value="^//@"/>
           <param name="replacement" value=""/>
         </filterreader>
+
+
+        <!--
+         # The next 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.
+         #
+         # Currently commented out because doccheck doesn't work. :-(
+         -->
+
+        <!--
+        <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}">
+          <param name="matching"    value="^(.*(class|interface|implements) .*|)\{.*$"/>
+          <param name="pattern"     value="$"/>
+          <param name="replacement" value=" ${generic.declarations}"/>
+        </filterreader>
+        -->
+
       </filterchain>
     </copy>
 
@@ -371,6 +425,12 @@
 
     <mkdir dir="${build.testcases.dir}"/>
 
+<!--
+    <echo>javac ${gjc.args}</echo>
+    <echo>bootclasspath=${test.compile.bootclasspath}</echo>
+    <echo>classpath="${test.classpath}"</echo>
+-->
+
     <javac srcdir="${test.src.dir}"
           destdir="${build.testcases.dir}"
             debug="${build.debug}"
@@ -379,9 +439,9 @@
            source="${build.sourcelevel}"
              fork="true">
 
-      <classpath refid="test.classpath"/>
-      <bootclasspath refid="javac.bootclasspath"/>
-      <compilerarg line="${build.javac.args}"/>
+      <compilerarg    line="${gjc.args}"/>
+      <bootclasspath refid="test.compile.bootclasspath"/>
+      <classpath     refid="test.classpath"/>
 
     </javac>
 
@@ -403,7 +463,7 @@
                     dir="${build.reports.dir}"
                    fork="true">
 
-      <jvmarg value="${test.bootclasspath.arg}"/>
+      <jvmarg value="-Xbootclasspath/p:${test.run.bootclasspath}"/>
 
       <formatter type="xml"/>
 
@@ -447,9 +507,9 @@
   <target name="configure-compiler">
 
     <property name="gjc.version"
-             value="1.3"/>
+             value="2.0"/>
 
-    <condition property="build.novariance" value="-novariance">
+    <condition property="novariance.arg" value="-novariance">
       <and>
         <equals arg1="${gjc.version}" arg2="2.0"/>
         <or>
@@ -459,7 +519,7 @@
       </and>
     </condition>
 
-    <property name="build.novariance"
+    <property name="novariance.arg"
              value=""/>
 
     <property name="gjc.dir"
@@ -469,49 +529,57 @@
           location="${gjc.dir}/${gjc.version}/javac.jar"/>
 
     <property name="collect.jar"
-          location="${gjc.dir}/${gjc.version}/collect${build.novariance}.jar"/>
+          location="${gjc.dir}/${gjc.version}/collect${novariance.arg}.jar"/>
 
 
-    <condition property="build.warnunchecked" value="-warnunchecked">
+    <condition property="warnunchecked.arg" value="-warnunchecked">
       <istrue value="${gjc.warnunchecked}"/>
     </condition>
 
-    <property name="build.warnunchecked" value=""/>
+    <property name="warnunchecked.arg" value=""/>
+
+    <condition property="prepare.src.dir" value="${build.dir}/prepare-src">
+      <istrue value="${build.nothreads}"/>
+    </condition>
 
 
     <!--
      ! Bootclasspath munging for source compilation.
      -->
 
-    <path id="javac.bootclasspath.prefix">
-      <!-- <pathelement location="${src.dir}"/> -->
+    <path id="pre.bootclasspath">
       <pathelement location="${javac.jar}"/>
     </path>
 
-    <path id="javac.bootclasspath">
-      <!-- <pathelement location="${src.dir}"/> -->
+    <path id="compile.bootclasspath">
+      <pathelement location="${build.classes.dir}"/>
       <pathelement location="${collect.jar}"/>
       <pathelement location="${rt.jar}"/>
     </path>
 
-    <!-- Flatten bootclasspath prefix into a platform-appropriate string -->
-    <property name="javac.bootclasspath.prefix"
-             refid="javac.bootclasspath.prefix"/>
-
-    <!-- Turn the flattened bootclasspath prefix into a javac argument -->
-    <property name="build.bootclasspath.arg"
-             value='-J-Xbootclasspath/p:${javac.bootclasspath.prefix}'/>
-
-    <!-- Flatten bootclasspath for trace message -->
-    <property name="javac.bootclasspath"
-             refid="javac.bootclasspath"/>
+    <!-- Flatten paths into platform-appropriate strings -->
+    <property name="pre.bootclasspath"     refid="pre.bootclasspath"/>
+    <property name="compile.bootclasspath" refid="compile.bootclasspath"/>
+
 
     <!-- Common options in javac invocations -->
-    <property name="build.javac.args"
-             value="${build.bootclasspath.arg} ${build.warnunchecked} ${build.novariance}"/>
+    <property name="gjc.args"
+             value="-J-Xbootclasspath/p:${pre.bootclasspath} ${warnunchecked.arg} ${novariance.arg}"
+    />
+
+  </target>
 
-    <echo>javac ${build.javac.args}
-bootclasspath is ${javac.bootclasspath}</echo>
+
+  <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>
 
@@ -533,7 +601,8 @@ bootclasspath is ${javac.bootclasspath}<
   </target>
 
 
-  <target name="configure-tests">
+  <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"
@@ -554,12 +623,21 @@ bootclasspath is ${javac.bootclasspath}<
       <pathelement location="${junit.jar}"/>
     </path>
 
-    <!-- Flatten test classpath into a platform-appropriate string -->
-    <property name="test.classpath" refid="test.classpath"/>
+    <path id="test.compile.bootclasspath">
+      <pathelement location="${javac.jar}"/>
+      <pathelement location="${collect.jar}"/>
+      <pathelement location="${rt.jar}"/>
+    </path>
+
+    <path id="test.run.bootclasspath">
+      <pathelement location="${javac.jar}"/>
+      <path refid="test.classpath"/>
+    </path>
 
-    <!-- Turn the flattened test classpath into a javac argument -->
-    <property name="test.bootclasspath.arg"
-             value='-Xbootclasspath/p:${test.classpath}'/>
+    <!-- Flatten test classpaths into platform-appropriate strings -->
+    <property name="test.classpath"             refid="test.classpath"/>
+    <property name="test.compile.bootclasspath" refid="test.compile.bootclasspath"/>
+    <property name="test.run.bootclasspath"     refid="test.run.bootclasspath"/>
 
   </target>