--- jsr166/build.xml	2003/05/28 21:15:50	1.31
+++ jsr166/build.xml	2003/06/09 14:11:43	1.42
@@ -7,7 +7,7 @@
   Usage: ant [target]
 
   User-specific settings are read from user.properties.
-  See user.properties.sample for examples.
+  See user.properties.sample for an explanation of some useful settings.
 ------------------------------------------------------------------------------
   </description>
 
@@ -26,7 +26,6 @@
   <property name="build.debug"          value="true"/>
   <property name="build.debuglevel"     value="source,lines,vars"/>
   <property name="build.deprecation"    value="false"/>
-  <property name="build.novariance.arg" value=""/>
 
   <!-- Build locations -->
   <property name="build.dir"            location="build"/>
@@ -55,74 +54,43 @@
 
   <!-- 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"/>
 
 
 
-  <!--
-   ! Bootclasspath munging for source compilation.
-   -->
-
-  <path id="javac.bootclasspath.prefix">
-    <!-- <pathelement location="${src.dir}"/> -->
-    <pathelement location="${javac.jar}"/>
-  </path>
-
-  <path id="javac.bootclasspath">
-    <!-- <pathelement location="${src.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}'/>
-
-
-  <!--
-   ! Bootclasspath munging for testing, so JUnit can test our local
-   ! modifications to java.*.
-   -->
-
-  <path id="test.classpath">
-    <pathelement location="${product.jar}"/>
-    <pathelement location="${build.testcases.dir}"/>
-    <pathelement location="${junit.jar}"/>
-  </path>
-
-  <!-- Flatten test classpath into a platform-appropriate string -->
-  <property name="test.classpath" refid="test.classpath"/>
-
-  <!-- Turn the flattened test classpath into a javac argument -->
-  <property name="test.bootclasspath.arg"
-           value='-Xbootclasspath/p:${test.classpath}'/>
-
-
-
-  <!-- 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"
+          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}"
@@ -130,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>
 
@@ -139,12 +107,12 @@
 
 
   <target name="jar"
-          depends="check-emulation, init-jar, native-jar, emulation-jar"
+          depends="configure-emulation, init-jar, native-jar, emulation-jar"
           description="Builds library jar from compiled sources"/>
 
 
   <target name="test"
-          depends="init, check-junit, report-tests"
+          depends="init, configure-tests, report-tests"
           description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />
 
 
@@ -204,7 +172,7 @@
 
 
   <target name="strip"
-          depends="init"
+          depends="init, configure-compiler"
           description="Strip generics from java source (not working yet)">
 
     <mkdir dir="${build.stripped.dir}"/>
@@ -222,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>
 
@@ -234,6 +202,21 @@
           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">
+
+    <delete dir="${build.dir}"/>
+
+    <property name="release.jar" value="dist/jsr166-${version}-dist.jar"/>
+
+    <jar basedir="${basedir}" destfile="${release.jar}">
+      <exclude name="${release.jar}"/>
+      <exclude name="user.properties"/>
+      <exclude name="etc/notes/**"/>
+    </jar>
+
+  </target>
 
   <target name="clean"
           description="Removes all build products">
@@ -275,31 +258,13 @@
 
   <!-- Internal targets -->
 
-  <target name="set-warnings-if" if="build.warnings">
-
-    <property name="build.warnings.arg" value="-warnunchecked"/>
-
-  </target>
 
-
-  <target name="set-warnings-unless" unless="build.warnings">
-
-    <property name="build.warnings.arg" value=""/>
-
-  </target>
-
-
-  <target name="init"
-          depends="set-warnings-if, set-warnings-unless">
+  <target name="init">
 
     <!-- Version is kept in a separate file -->
     <loadfile property="version" srcFile="version.properties"/>
     <echo>Building JSR-166 version ${version}</echo>
 
-    <!-- Common options in javac invocations -->
-    <property name="build.javac.args"
-             value="${build.bootclasspath.arg} ${build.warnings.arg} ${build.novariance.arg}"/>
-
   </target>
 
 
@@ -322,7 +287,7 @@
 
 
   <target name="compile-emulation"
-          depends="init"
+          depends="init, configure-compiler"
           if="build.emulation.true">
 
     <mkdir dir="${build.emulation.dir}"/>
@@ -335,8 +300,8 @@
            source="${build.sourcelevel}"
              fork="true">
 
-      <bootclasspath refid="javac.bootclasspath"/>
-      <compilerarg line="${build.javac.args}"/>
+      <compilerarg    line="${gjc.args}"/>
+      <bootclasspath refid="compile.bootclasspath"/>
 
     </javac>
 
@@ -350,7 +315,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>
@@ -390,41 +356,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>
 
@@ -436,6 +440,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}"
@@ -444,9 +454,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>
 
@@ -468,7 +478,7 @@
                     dir="${build.reports.dir}"
                    fork="true">
 
-      <jvmarg value="${test.bootclasspath.arg}"/>
+      <jvmarg value="-Xbootclasspath/p:${test.run.bootclasspath}"/>
 
       <formatter type="xml"/>
 
@@ -509,25 +519,141 @@
   </target>
 
 
-  <target name="check-junit">
+  <target name="configure-compiler">
 
-    <!-- junit.framework.Protectable is in JUnit 3.8.1 but not in 3.7 -->
-    <available property="junit.available"
-               classname="junit.framework.Protectable"/>
+    <property name="gjc.version"
+             value="2.0"/>
 
-    <fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"
-          unless="junit.available"/>
+    <condition property="novariance.arg" value="-novariance">
+      <and>
+        <equals arg1="${gjc.version}" arg2="2.0"/>
+        <or>
+          <not><isset property="gjc.novariance"/></not>
+          <istrue value="${gjc.novariance}"/>
+        </or>
+      </and>
+    </condition>
+
+    <property name="novariance.arg"
+             value=""/>
+
+    <property name="gjc.dir"
+             value="${lib.dir}/gjc"/>
+
+    <property name="javac.jar"
+          location="${gjc.dir}/${gjc.version}/javac.jar"/>
+
+    <property name="collect.jar"
+          location="${gjc.dir}/${gjc.version}/collect${novariance.arg}.jar"/>
+
+
+    <condition property="warnunchecked.arg" value="-warnunchecked">
+      <istrue value="${gjc.warnunchecked}"/>
+    </condition>
+
+    <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="pre.bootclasspath">
+      <pathelement location="${javac.jar}"/>
+    </path>
+
+    <path id="compile.bootclasspath">
+      <pathelement location="${build.classes.dir}"/>
+      <pathelement location="${collect.jar}"/>
+      <pathelement location="${rt.jar}"/>
+    </path>
+
+    <!-- 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="gjc.args"
+             value="-J-Xbootclasspath/p:${pre.bootclasspath} ${warnunchecked.arg} ${novariance.arg}"
+    />
 
   </target>
 
 
-  <target name="check-emulation">
+  <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-emulation">
+
     <condition property="build.emulation.true">
       <or>
-        <isset property="build.emulation"/>
-        <os family="windows"/>
+        <and>
+          <os family="windows"/>
+          <not>
+            <isset property="build.emulation"/>
+          </not>
+        </and>
+        <istrue value="${build.emulation}"/>
       </or>
     </condition>
+
+  </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"/>
+
+    <fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"
+          unless="junit.available"/>
+
+
+    <!--
+     ! Bootclasspath munging for testing, so JUnit can test our local
+     ! modifications to java.*.
+     -->
+
+    <path id="test.classpath">
+      <pathelement location="${product.jar}"/>
+      <pathelement location="${build.testcases.dir}"/>
+      <pathelement location="${junit.jar}"/>
+    </path>
+
+    <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>
+
+    <!-- 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>