--- jsr166/build.xml	2003/08/07 03:49:48	1.51
+++ jsr166/build.xml	2003/09/01 04:14:47	1.55
@@ -35,6 +35,7 @@
   <property name="build.lib.dir"        location="${build.dir}/lib"/>
   <property name="build.ant.dir"        location="${build.dir}/ant"/>
   <property name="build.javadocs.dir"   location="${build.dir}/javadocs"/>
+  <property name="build.sinjdocs.dir"   location="${build.dir}/sinjdocs"/>
   <property name="build.stripped.dir"   location="${build.dir}/stripped"/>
   <property name="build.reports.dir"    location="${build.dir}/reports"/>
   <property name="build.doccheck.dir"   location="${build.dir}/doccheck"/>
@@ -102,7 +103,9 @@
              fork="true">
 
       <compilerarg    line="${gjc.args}"/>
+<!--
       <bootclasspath refid="compile.bootclasspath"/>
+-->
 
     </javac>
 
@@ -180,8 +183,8 @@
           depends="configure-tests"
           description="Builds javadocs with custom tags to build folder">
 
-    <delete dir="${build.javadocs.dir}"/>
-    <mkdir dir="${build.javadocs.dir}"/>
+    <delete dir="${build.sinjdocs.dir}"/>
+    <mkdir dir="${build.sinjdocs.dir}"/>
 
     <java classname="net.cscott.sinjdoc.Main" fork="true">
 
@@ -195,7 +198,7 @@
       </classpath>
 
 
-      <arg value="-d"/>          <arg value="${build.javadocs.dir}"/>
+      <arg value="-d"/>          <arg value="${build.sinjdocs.dir}"/>
       <arg value="-sourcepath"/> <arg value="${src.dir}"/>
       <arg value="-overview"/>   <arg value="${src.dir}/intro.html"/>
       <arg value="-source"/>     <arg value="${build.sourcelevel}"/>
@@ -236,7 +239,9 @@
              fork="true">
 
       <compilerarg    line="${gjc.args} -s"/>
+<!--
       <bootclasspath refid="compile.bootclasspath"/>
+-->
 
     </javac>
 
@@ -313,6 +318,7 @@
     <!-- 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>
 
@@ -350,7 +356,9 @@
              fork="true">
 
       <compilerarg    line="${gjc.args}"/>
+<!--
       <bootclasspath refid="compile.bootclasspath"/>
+-->
 
     </javac>
 
@@ -520,8 +528,13 @@
              fork="true">
 
       <compilerarg    line="${gjc.args}"/>
+<!--      
       <bootclasspath refid="test.compile.bootclasspath"/>
+-->      
       <classpath     refid="test.classpath"/>
+      
+      <include name="java/**"/>
+      <include name="jsr166/**"/>
 
     </javac>
 
@@ -543,13 +556,14 @@
                     dir="${build.reports.dir}"
                    fork="true">
 
-      <jvmarg value="-Xbootclasspath/p:${test.run.bootclasspath}"/>
+      <jvmarg value="-Xbootclasspath:${test.run.bootclasspath}"/>
 
       <formatter type="xml"/>
 
       <batchtest todir="${build.reports.dir}">
         <fileset dir="${test.src.dir}">
-          <include name="**/${testcase}Test.java"/>
+          <include name="java/**/${testcase}Test.java"/>
+          <include name="jsr166/**/${testcase}Test.java"/>
         </fileset>
       </batchtest>
 
@@ -561,7 +575,7 @@
   <target name="report-tests"
           depends="run-tests">
 
-    <!-- Sets junit.report.format to frames if Xalan is present,
+    <!-- Sets junit.report.format to frames if redirection is present,
          otherwise sets it to noframes. -->
     <available property="junit.report.format"
                   value="frames"
@@ -611,13 +625,18 @@
     <property name="collect.jar"
           location="${gjc.dir}/${gjc.version}/collect${novariance.arg}.jar"/>
 
+<!--
+    <property name="unchecked.option" value="-warnunchecked"/>
+-->
+
+    <property name="unchecked.option" value="-Xlint:unchecked"/>
 
-    <condition property="warnunchecked.arg" value="-warnunchecked">
+    <condition property="warnunchecked.arg" value="${unchecked.option}">
       <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>
@@ -628,12 +647,16 @@
      -->
 
     <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>
 
@@ -643,9 +666,12 @@
 
 
     <!-- Common options in javac invocations -->
+<!--
     <property name="gjc.args"
              value="-J-Xbootclasspath/p:${pre.bootclasspath} ${warnunchecked.arg} ${novariance.arg}"
     />
+-->
+    <property name="gjc.args" value="${warnunchecked.arg} ${novariance.arg}"/>
 
   </target>
 
@@ -691,6 +717,13 @@
     <fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"
           unless="junit.available"/>
 
+    <!-- Xalan -->
+    <available property="xalan.available"
+               classname="org.apache.xalan.Version"/>
+
+    <fail message="Need Xalan 2.5.1 jar in ${ant.home}${file.separator}lib to run tests"
+          unless="xalan.available"/>
+
 
     <!--
      ! Bootclasspath munging for testing, so JUnit can test our local
@@ -699,6 +732,7 @@
 
     <path id="test.classpath">
       <pathelement location="${product.jar}"/>
+      <pathelement location="${rt.jar}"/>
       <pathelement location="${build.testcases.dir}"/>
       <pathelement location="${junit.jar}"/>
     </path>
@@ -710,7 +744,9 @@
     </path>
 
     <path id="test.run.bootclasspath">
-      <pathelement location="${javac.jar}"/>
+<!--    
+      <pathelement location="${javac.jar}"/> 
+-->      
       <path refid="test.classpath"/>
     </path>
 
@@ -725,7 +761,28 @@
 
   <!-- Anthill targets -->
 
-  <target name="anthill-build"
+  <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">