--- jsr166/build.xml	2003/05/28 14:19:25	1.30
+++ jsr166/build.xml	2003/05/29 14:56:37	1.34
@@ -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>
 
@@ -54,55 +54,11 @@
 
   <!-- 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="javac.args" 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.javac.args" value='-Xbootclasspath/p:${test.classpath}'/>
-
-
-
   <!-- Files excluded from emulation and dist-docs -->
   <patternset id="emulation.excludes">
     <exclude name="java/util/Random.*"/>
@@ -114,12 +70,14 @@
   <!-- 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}"
+    <javac srcdir="${prepare.src.dir}"
           destdir="${build.classes.dir}"
             debug="${build.debug}"
        debuglevel="${build.debuglevel}"
@@ -128,7 +86,7 @@
              fork="true">
 
       <bootclasspath refid="javac.bootclasspath"/>
-      <compilerarg line="${javac.args} ${build.warnings.option}"/>
+      <compilerarg line="${build.javac.args}"/>
 
     </javac>
 
@@ -136,12 +94,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)" />
 
 
@@ -200,16 +158,17 @@
   </target>
 
 
-  <!--
-   # 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.
-   -->
   <target name="strip"
-          depends="init">
+          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}"
@@ -219,7 +178,7 @@
              fork="true">
 
       <bootclasspath refid="javac.bootclasspath"/>
-      <compilerarg line="${javac.args} ${build.warnings.option} -s"/>
+      <compilerarg line="${build.javac.args} -s"/>
 
     </javac>
 
@@ -271,22 +230,8 @@
 
   <!-- Internal targets -->
 
-  <target name="set-warnings-if" if="build.warnings">
-
-    <property name="build.warnings.option" value="-warnunchecked"/>
-
-  </target>
-
-
-  <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">
+  <target name="init">
 
     <!-- Version is kept in a separate file -->
     <loadfile property="version" srcFile="version.properties"/>
@@ -314,7 +259,7 @@
 
 
   <target name="compile-emulation"
-          depends="init"
+          depends="init, configure-compiler"
           if="build.emulation.true">
 
     <mkdir dir="${build.emulation.dir}"/>
@@ -328,7 +273,7 @@
              fork="true">
 
       <bootclasspath refid="javac.bootclasspath"/>
-      <compilerarg line="${javac.args} ${build.warnings.option}"/>
+      <compilerarg line="${build.javac.args}"/>
 
     </javac>
 
@@ -378,6 +323,13 @@
 
     <copy todir="${build.filter.src.dir}">
       <fileset dir="${src.dir}">
+        <include name="**/*.html"/>
+      </fileset>
+    </copy>
+
+    <copy todir="${build.filter.src.dir}">
+      <fileset dir="${src.dir}">
+        <exclude name="**/*.html"/>
         <patternset refid="emulation.excludes"/>
       </fileset>
       <filterchain>
@@ -429,9 +381,9 @@
            source="${build.sourcelevel}"
              fork="true">
 
-      <bootclasspath refid="javac.bootclasspath"/>
-      <compilerarg line="${javac.args} ${build.warnings.option}"/>
       <classpath refid="test.classpath"/>
+      <bootclasspath refid="javac.bootclasspath"/>
+      <compilerarg line="${build.javac.args}"/>
 
     </javac>
 
@@ -453,7 +405,7 @@
                     dir="${build.reports.dir}"
                    fork="true">
 
-      <jvmarg value="${test.javac.args}"/>
+      <jvmarg value="${test.bootclasspath.arg}"/>
 
       <formatter type="xml"/>
 
@@ -494,25 +446,147 @@
   </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="build.novariance" 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="build.novariance"
+             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${build.novariance}.jar"/>
+
+
+    <condition property="build.warnunchecked" value="-warnunchecked">
+      <istrue value="${gjc.warnunchecked}"/>
+    </condition>
+
+    <property name="build.warnunchecked" value=""/>
+
+    <condition property="prepare.src.dir" value="${build.dir}/prepare-src">
+      <or>
+        <and>
+          <not><isset property="build.nothreads"/></not>
+          <equals arg1="${gjc.version}" arg2="2.0"/>
+        </and>
+        <istrue value="${build.nothreads}"/>
+      </or>
+    </condition>
+
+
+    <!--
+     ! 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}'/>
+
+    <!-- Flatten bootclasspath for trace message -->
+    <property name="javac.bootclasspath"
+             refid="javac.bootclasspath"/>
+
+    <!-- Common options in javac invocations -->
+    <property name="build.javac.args"
+             value="${build.bootclasspath.arg} ${build.warnunchecked} ${build.novariance}"/>
+
+    <echo>javac ${build.javac.args}</echo>
+    <echo>bootclasspath=${javac.bootclasspath}</echo>
 
   </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">
+
+    <!-- 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>
+
+    <!-- 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}'/>
+
   </target>