--- jsr166/build.xml	2003/06/26 11:55:50	1.44
+++ jsr166/build.xml	2003/09/15 14:07:36	1.57
@@ -30,19 +30,19 @@
   <!-- Build locations -->
   <property name="build.dir"            location="build"/>
   <property name="build.classes.dir"    location="${build.dir}/classes"/>
-  <property name="build.emulation.dir"  location="${build.dir}/emulation"/>
   <property name="build.testcases.dir"  location="${build.dir}/testcases"/>
   <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"/>
-  <property name="emulation.src.dir"    location="${basedir}/src/emulation"/>
   <property name="test.src.dir"         location="${basedir}/src/test"/>
   <property name="ant.src.dir"          location="${basedir}/etc/ant"/>
   <property name="stylesheet.dir"       location="${basedir}/etc/xsl"/>
@@ -56,23 +56,15 @@
   <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 -->
-  <patternset id="unsafe.exclusion">
+  <!-- Files excluded from dist-docs -->
+  <patternset id="docs.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 -->
@@ -86,8 +78,7 @@
     <mkdir dir="${build.classes.dir}"/>
 
 <!--
-    <echo>javac ${gjc.args}</echo>
-    <echo>bootclasspath=${compile.bootclasspath}</echo>
+    <echo>javac ${build.args}</echo>
 -->
 
     <javac srcdir="${prepare.src.dir}"
@@ -98,8 +89,7 @@
            source="${build.sourcelevel}"
              fork="true">
 
-      <compilerarg    line="${gjc.args}"/>
-      <bootclasspath refid="compile.bootclasspath"/>
+      <compilerarg    line="${build.args}"/>
 
     </javac>
 
@@ -107,7 +97,7 @@
 
 
   <target name="jar"
-          depends="configure-emulation, init-jar, native-jar, emulation-jar"
+          depends="init-jar, native-jar"
           description="Builds library jar from compiled sources"/>
 
 
@@ -132,8 +122,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 +131,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 +163,45 @@
   </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.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="-help"/> -->
+      <!-- <arg value="-verbose"/> -->
+      <!-- <arg value="-link"/>  <arg value="http://java.sun.com/j2se/1.4.1/docs/api"/> -->
+      
+      <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="java.lang"/>
+      <arg value="java.util"/>
+      <arg value="java.util.concurrent"/>
+      <arg value="java.util.concurrent.atomic"/>
+      <arg value="java.util.concurrent.locks"/>
+
+
+    </java>
+
+  </target>
+
+
   <target name="strip"
           depends="init, configure-compiler"
           description="Strip generics from java source (not working yet)">
@@ -190,8 +221,7 @@
            source="${build.sourcelevel}"
              fork="true">
 
-      <compilerarg    line="${gjc.args} -s"/>
-      <bootclasspath refid="compile.bootclasspath"/>
+      <compilerarg    line="${build.args} -s"/>
 
     </javac>
 
@@ -206,15 +236,16 @@
           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>
 
@@ -266,6 +297,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>
 
@@ -278,8 +310,7 @@
 
 
   <target name="native-jar"
-          depends="compile"
-          unless="build.emulation.true">
+          depends="compile">
 
     <jar destfile="${product.jar}">
       <fileset dir="${build.classes.dir}"/>
@@ -288,44 +319,6 @@
   </target>
 
 
-  <target name="compile-emulation"
-          depends="init, configure-compiler"
-          if="build.emulation.true">
-
-    <mkdir dir="${build.emulation.dir}"/>
-
-    <javac srcdir="${emulation.src.dir}"
-          destdir="${build.emulation.dir}"
-            debug="${build.debug}"
-       debuglevel="${build.debuglevel}"
-      deprecation="${build.deprecation}"
-           source="${build.sourcelevel}"
-             fork="true">
-
-      <compilerarg    line="${gjc.args}"/>
-      <bootclasspath refid="compile.bootclasspath"/>
-
-    </javac>
-
-  </target>
-
-
-  <target name="emulation-jar"
-          depends="compile-emulation"
-          if="build.emulation.true">
-
-
-    <jar destfile="${product.jar}" duplicate="add">
-      <fileset dir="${build.classes.dir}">
-        <patternset refid="atomic.exclusion"/>
-        <patternset refid="unsafe.exclusion"/>
-      </fileset>
-      <fileset dir="${build.emulation.dir}"/>
-    </jar>
-
-  </target>
-
-
   <target name="dist-jar"
           depends="clean, jar">
 
@@ -358,16 +351,10 @@
       </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="unsafe.exclusion"/>
+        <patternset refid="docs.exclusion"/>
       </fileset>
       <filterchain>
 
@@ -390,32 +377,42 @@
           <param name="replacement" value=" "/>
         </filterreader>
 
+      </filterchain>
+    </copy>
 
-        <!--
-         # 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.
-         -->
+  </target>
 
-        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
-                      classpath="${build.ant.dir}">
-          <param name="matching"    value="^//@.*$"/>
-          <param name="pattern"     value="^//@"/>
-          <param name="replacement" value=""/>
-        </filterreader>
 
 
+
+  <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 ].*$"/>
@@ -425,11 +422,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>
@@ -443,8 +439,7 @@
     <mkdir dir="${build.testcases.dir}"/>
 
 <!--
-    <echo>javac ${gjc.args}</echo>
-    <echo>bootclasspath=${test.compile.bootclasspath}</echo>
+    <echo>javac ${build.args}</echo>
     <echo>classpath="${test.classpath}"</echo>
 -->
 
@@ -456,9 +451,11 @@
            source="${build.sourcelevel}"
              fork="true">
 
-      <compilerarg    line="${gjc.args}"/>
-      <bootclasspath refid="test.compile.bootclasspath"/>
-      <classpath     refid="test.classpath"/>
+      <compilerarg line="${build.args}"/>
+      <classpath refid="test.classpath"/>
+      
+      <include name="java/**"/>
+      <include name="jsr166/**"/>
 
     </javac>
 
@@ -480,13 +477,14 @@
                     dir="${build.reports.dir}"
                    fork="true">
 
-      <jvmarg value="-Xbootclasspath/p:${test.run.bootclasspath}"/>
+      <jvmarg value="-Xbootclasspath:${test.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>
 
@@ -498,7 +496,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"
@@ -523,66 +521,21 @@
 
   <target name="configure-compiler">
 
-    <property name="gjc.version"
-             value="2.0"/>
+    <property name="unchecked.option" value="-Xlint:unchecked"/>
 
-    <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="warnunchecked.arg" value="${unchecked.option}">
+      <istrue value="${build.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}"
-    />
+    <property name="build.args" value="${warnunchecked.arg}"/>
 
   </target>
 
@@ -601,23 +554,6 @@
   </target>
 
 
-  <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>
-    </condition>
-
-  </target>
-
-
   <target name="configure-tests"
        depends="configure-compiler">
 
@@ -628,6 +564,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
@@ -636,25 +579,18 @@
 
     <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}"/>
+      <pathelement location="${junit.jar}"/>
+      <pathelement location="${build.testcases.dir}"/>
     </path>
 
-    <path id="test.run.bootclasspath">
-      <pathelement location="${javac.jar}"/>
+    <path id="test.bootclasspath">
       <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"/>
+    <property name="test.classpath"         refid="test.classpath"/>
+    <property name="test.bootclasspath"     refid="test.bootclasspath"/>
 
   </target>
 
@@ -662,7 +598,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">
@@ -688,7 +645,7 @@
   <target name="ng" depends="test">
     <java classname="SuperfluousAbstract" fork="true">
 
-      <jvmarg value="-Xbootclasspath/p:${test.run.bootclasspath}"/>
+      <jvmarg value="-Xbootclasspath/p:${test.bootclasspath}"/>
 
     </java>
   </target>