--- jsr166/build.xml	2003/05/29 04:35:42	1.32
+++ jsr166/build.xml	2003/05/29 14:56:37	1.34
@@ -70,12 +70,14 @@
   <!-- 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}"
+    <javac srcdir="${prepare.src.dir}"
           destdir="${build.classes.dir}"
             debug="${build.debug}"
        debuglevel="${build.debuglevel}"
@@ -447,7 +449,7 @@
   <target name="configure-compiler">
 
     <property name="gjc.version"
-             value="1.3"/>
+             value="2.0"/>
 
     <condition property="build.novariance" value="-novariance">
       <and>
@@ -478,6 +480,16 @@
 
     <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.
@@ -510,8 +522,22 @@
     <property name="build.javac.args"
              value="${build.bootclasspath.arg} ${build.warnunchecked} ${build.novariance}"/>
 
-    <echo>javac ${build.javac.args}
-bootclasspath is ${javac.bootclasspath}</echo>
+    <echo>javac ${build.javac.args}</echo>
+    <echo>bootclasspath=${javac.bootclasspath}</echo>
+
+  </target>
+
+
+  <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>