--- jsr166/build.xml	2003/06/09 14:11:43	1.42
+++ jsr166/build.xml	2003/09/01 04:21:55	1.56
@@ -35,10 +35,12 @@
   <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"/>
   <property name="build.filter.src.dir" location="${build.dir}/filtersrc"/>
+  <property name="build.filter.doccheck.dir" location="${build.dir}/filterdocchk"/>
 
   <!-- Source locations -->
   <property name="src.dir"              location="${basedir}/src/main"/>
@@ -56,7 +58,7 @@
   <property name="product.jar"          location="${build.lib.dir}/jsr166.jar"/>
   <property name="junit.jar"            location="${lib.dir}/junit.jar"/>
   <property name="rt.jar"               location="${java.home}/lib/rt.jar"/>
-
+  <property name="sinjdoc.jar"          location="${lib.dir}/sinjdoc.jar"/>
 
 
   <!-- Files excluded from dist-docs and emulation jar -->
@@ -71,6 +73,8 @@
     <exclude name="java/util/concurrent/atomic/AtomicInteger*"/>
     <exclude name="java/util/concurrent/atomic/AtomicLong*"/>
     <exclude name="java/util/concurrent/atomic/AtomicReference*"/>
+    <exclude name="java/util/concurrent/locks/LockSupport*"/>
+    <exclude name="java/util/concurrent/locks/ReentrantLock*"/>
   </patternset>
 
 
@@ -99,7 +103,9 @@
              fork="true">
 
       <compilerarg    line="${gjc.args}"/>
+<!--
       <bootclasspath refid="compile.bootclasspath"/>
+-->
 
     </javac>
 
@@ -132,8 +138,8 @@
 
 
   <target name="doccheck"
-          depends="filter-src"
-          description="Reports on javadoc style errors (not working yet)">
+          depends="filter-doccheck"
+          description="Reports on javadoc style errors">
 
     <delete dir="${build.doccheck.dir}"/>
     <mkdir dir="${build.doccheck.dir}"/>
@@ -141,9 +147,11 @@
     <javadoc doclet="com.sun.tools.doclets.doccheck.DocCheck"
          docletpath="${lib.dir}/doccheck.jar"
             destdir="${build.doccheck.dir}">
-      <packageset dir="${build.filter.src.dir}"/>
+      <packageset dir="${build.filter.doccheck.dir}"/>
     </javadoc>
 
+    <echo>DocCheck output is in ${build.doccheck.dir}</echo>
+
   </target>
 
 
@@ -171,6 +179,46 @@
   </target>
 
 
+  <target name="sinjdocs"
+          depends="configure-tests"
+          description="Builds javadocs with custom tags to build folder">
+
+    <delete dir="${build.sinjdocs.dir}"/>
+    <mkdir dir="${build.sinjdocs.dir}"/>
+
+    <java classname="net.cscott.sinjdoc.Main" fork="true">
+
+      <jvmarg value="-Xbootclasspath/p:${test.run.bootclasspath}"/>
+
+      <classpath>
+        <pathelement location="${sinjdoc.jar}"/>
+        <pathelement location="${lib.dir}/jutil.jar"/>
+        <pathelement location="${lib.dir}/cup.jar"/>
+        <path refid="test.classpath"/>
+      </classpath>
+
+
+      <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}"/>
+      <!-- <arg value="-verbose"/> -->
+      <!-- <arg value="-link"/>  <arg value="http://java.sun.com/j2se/1.4.1/docs/api"/> -->
+      <arg value="java.lang"/>
+      <arg value="java.util"/>
+      <arg value="java.util.concurrent"/>
+      <arg value="java.util.concurrent.atomic"/>
+      <arg value="java.util.concurrent.locks"/>
+
+      <!--
+      <arg value="-help"/>
+      -->
+
+    </java>
+
+  </target>
+
+
   <target name="strip"
           depends="init, configure-compiler"
           description="Strip generics from java source (not working yet)">
@@ -191,7 +239,9 @@
              fork="true">
 
       <compilerarg    line="${gjc.args} -s"/>
+<!--
       <bootclasspath refid="compile.bootclasspath"/>
+-->
 
     </javac>
 
@@ -206,14 +256,18 @@
           depends="dist"
           description="Puts entire CVS tree, plus distribution productions, in a jar">
 
+<!--
+    #keep build dir? - dl
     <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/**"/>
+      <exclude name="lib/gjc/2.1/**"/>
+      <exclude name="**/SyntaxTest.java"/>
     </jar>
 
   </target>
@@ -264,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>
 
@@ -301,7 +356,9 @@
              fork="true">
 
       <compilerarg    line="${gjc.args}"/>
+<!--
       <bootclasspath refid="compile.bootclasspath"/>
+-->
 
     </javac>
 
@@ -356,12 +413,6 @@
       </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"/>
@@ -401,19 +452,42 @@
           <param name="pattern"     value="^//@"/>
           <param name="replacement" value=""/>
         </filterreader>
+      </filterchain>
+    </copy>
+
+  </target>
+
+
+
 
+  <target name="filter-doccheck"
+          depends="filter-src">
 
+    <mkdir dir="${build.filter.doccheck.dir}"/>
+
+    <copy todir="${build.filter.doccheck.dir}">
+      <fileset dir="${build.filter.src.dir}">
+        <include name="**/*.html"/>
+      </fileset>
+    </copy>
+
+    <property name="generic.declarations"
+             value="/** Fake type parameter. */ public interface E {} /** Fake type parameter. */ public interface T {} /** Fake type parameter. */ public interface K {} /** Fake type parameter. */ public interface V {}"
+    />
+
+    <copy todir="${build.filter.doccheck.dir}">
+      <fileset dir="${build.filter.src.dir}">
+        <exclude name="**/*.html"/>
+      </fileset>
+      <filterchain>
         <!--
-         # The next two filters try to make the source look like
+         # These 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 ].*$"/>
@@ -423,11 +497,10 @@
 
         <filterreader classname="jsr166.ant.filters.ReplaceFilter"
                       classpath="${build.ant.dir}">
-          <param name="matching"    value="^(.*(class|interface|implements) .*|)\{.*$"/>
+          <param name="matching"    value="^([^*]*(class|interface|implements) .*|)\{.*$"/>
           <param name="pattern"     value="$"/>
           <param name="replacement" value=" ${generic.declarations}"/>
         </filterreader>
-        -->
 
       </filterchain>
     </copy>
@@ -455,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>
 
@@ -478,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>
 
@@ -496,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"
@@ -522,7 +601,7 @@
   <target name="configure-compiler">
 
     <property name="gjc.version"
-             value="2.0"/>
+             value="2.2"/>
 
     <condition property="novariance.arg" value="-novariance">
       <and>
@@ -546,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>
@@ -563,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>
 
@@ -578,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>
 
@@ -602,15 +693,7 @@
   <target name="configure-emulation">
 
     <condition property="build.emulation.true">
-      <or>
-        <and>
-          <os family="windows"/>
-          <not>
-            <isset property="build.emulation"/>
-          </not>
-        </and>
-        <istrue value="${build.emulation}"/>
-      </or>
+      <istrue value="${build.emulation}"/>
     </condition>
 
   </target>
@@ -626,6 +709,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
@@ -634,6 +724,7 @@
 
     <path id="test.classpath">
       <pathelement location="${product.jar}"/>
+      <pathelement location="${rt.jar}"/>
       <pathelement location="${build.testcases.dir}"/>
       <pathelement location="${junit.jar}"/>
     </path>
@@ -645,7 +736,9 @@
     </path>
 
     <path id="test.run.bootclasspath">
-      <pathelement location="${javac.jar}"/>
+<!--    
+      <pathelement location="${javac.jar}"/> 
+-->      
       <path refid="test.classpath"/>
     </path>
 
@@ -660,7 +753,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">
@@ -683,4 +797,13 @@
   </target>
 
 
+  <target name="ng" depends="test">
+    <java classname="SuperfluousAbstract" fork="true">
+
+      <jvmarg value="-Xbootclasspath/p:${test.run.bootclasspath}"/>
+
+    </java>
+  </target>
+
+
 </project>