--- jsr166/build.xml	2003/08/01 19:34:05	1.47
+++ jsr166/build.xml	2003/08/26 19:59:14	1.53
@@ -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"/>
@@ -57,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 -->
@@ -72,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,8 +102,10 @@
            source="${build.sourcelevel}"
              fork="true">
 
+<!--
       <compilerarg    line="${gjc.args}"/>
       <bootclasspath refid="compile.bootclasspath"/>
+-->
 
     </javac>
 
@@ -145,6 +150,8 @@
       <packageset dir="${build.filter.doccheck.dir}"/>
     </javadoc>
 
+    <echo>DocCheck output is in ${build.doccheck.dir}</echo>
+
   </target>
 
 
@@ -172,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,8 +238,10 @@
            source="${build.sourcelevel}"
              fork="true">
 
+    <!--
       <compilerarg    line="${gjc.args} -s"/>
       <bootclasspath refid="compile.bootclasspath"/>
+     -->
 
     </javac>
 
@@ -475,7 +524,9 @@
            source="${build.sourcelevel}"
              fork="true">
 
+<!--
       <compilerarg    line="${gjc.args}"/>
+-->
       <bootclasspath refid="test.compile.bootclasspath"/>
       <classpath     refid="test.classpath"/>
 
@@ -541,7 +592,7 @@
 
 
   <target name="configure-compiler">
-
+<!--
     <property name="gjc.version"
              value="2.2"/>
 
@@ -567,7 +618,7 @@
     <property name="collect.jar"
           location="${gjc.dir}/${gjc.version}/collect${novariance.arg}.jar"/>
 
-
+-->
     <condition property="warnunchecked.arg" value="-warnunchecked">
       <istrue value="${gjc.warnunchecked}"/>
     </condition>
@@ -599,9 +650,11 @@
 
 
     <!-- Common options in javac invocations -->
+<!--
     <property name="gjc.args"
              value="-J-Xbootclasspath/p:${pre.bootclasspath} ${warnunchecked.arg} ${novariance.arg}"
     />
+-->
 
   </target>