--- jsr166/build.xml	2004/04/09 20:10:29	1.65
+++ jsr166/build.xml	2007/09/13 11:19:25	1.74
@@ -40,6 +40,13 @@
   <property name="build.doccheck.dir"   location="${build.dir}/doccheck"/>
   <property name="build.filter.src.dir" location="${build.dir}/filtersrc"/>
   <property name="build.dc-filter.dir"  location="${build.dir}/filterdocchk"/>
+  <property name="build.jsr166x.dir"    location="${build.dir}/jsr166x"/>
+  <property name="build.jsr166xlib.dir"        location="${build.dir}/jsr166xlib"/>
+  <property name="build.jsr166xjavadocs.dir"   location="${build.dir}/jsr166xjavadocs"/>
+
+  <property name="build.jsr166y.dir"    location="${build.dir}/jsr166y"/>
+  <property name="build.jsr166ylib.dir"        location="${build.dir}/jsr166ylib"/>
+  <property name="build.jsr166yjavadocs.dir"   location="${build.dir}/jsr166yjavadocs"/>
 
   <!-- Source locations -->
   <property name="src.dir"              location="${basedir}/src/main"/>
@@ -52,13 +59,21 @@
   <property name="stylesheet.dir"       location="${basedir}/etc/xsl"/>
   <property name="lib.dir"              location="${basedir}/lib"/>
   <property name="dist.dir"             location="${basedir}/dist"/>
+  <property name="topsrc.dir"           location="${basedir}/src"/>
+  <property name="jsr166xsrc.dir"       location="${basedir}/src/jsr166x"/>
+  <property name="jsr166ysrc.dir"       location="${basedir}/src/jsr166y"/>
 
   <!-- Distribution locations -->
   <property name="dist.javadocs.dir"    location="${dist.dir}/docs"/>
+  <property name="dist.jsr166xjavadocs.dir"    location="${dist.dir}/jsr166xdocs"/>
+  <property name="dist.jsr166yjavadocs.dir"    location="${dist.dir}/jsr166ydocs"/>
 
   <!-- Jar locations -->
   <property name="product.jar"          location="${build.lib.dir}/jsr166.jar"/>
+  <property name="jsr166xproduct.jar"   location="${build.jsr166xlib.dir}/jsr166x.jar"/>
+  <property name="jsr166yproduct.jar"   location="${build.jsr166ylib.dir}/jsr166y.jar"/>
   <property name="junit.jar"            location="${lib.dir}/junit.jar"/>
+  <property name="concurrent.jar"       location="${lib.dir}/concurrent.jar"/>
 
   <!-- Bootclasspath argument -->
   <property name="bootclasspath.args"   value="-Xbootclasspath/p:${product.jar}"/>
@@ -76,8 +91,12 @@
 
   <!-- J1 classpath -->
   <path id="j1.classpath">
+    <pathelement location="${build.classes.dir}"/>
     <pathelement location="${build.j1.dir}"/>
     <pathelement location="${junit.jar}"/>
+
+    <!-- Include dl.u.c for BoundedBuffer comparison -->
+    <pathelement location="${concurrent.jar}"/>
   </path>
 
 
@@ -98,7 +117,14 @@
            source="${build.sourcelevel}"
              fork="true">
 
+      <include name="**/*.java"/>
+      <compilerarg value="-XDignore.symbol.file"/>
+
+<!--
+      <exclude name="java/lang/**"/>
       <compilerarg line="${build.args}"/>
+      <compilerarg line="-Xlint -Xmaxwarns 1000"/>
+-->
 
     </javac>
 
@@ -133,12 +159,10 @@
     <mkdir dir="${build.javadocs.dir}"/>
 
     <javadoc destdir="${build.javadocs.dir}"
-                link="http://java.sun.com/j2se/1.4.1/docs/api"
+                link="http://java.sun.com/javase/6/docs/api/"
             overview="${src.dir}/intro.html"
-              source="${build.sourcelevel}">
-
-      <tag name="revised" description="Last revised:"/>
-      <tag name="spec"    description="Specified by:"/>
+            sourcepath="${src.dir}:/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"
+    >           
 
       <packageset dir="${src.dir}"/>
 
@@ -243,12 +267,31 @@
     <mkdir dir="${dist.javadocs.dir}"/>
 
     <javadoc destdir="${dist.javadocs.dir}"
-                link="http://java.sun.com/j2se/1.4.2/docs/api"
+            link="http://java.sun.com/javase/6/docs/api/"
             overview="${src.dir}/intro.html"
-              source="${build.sourcelevel}">
-
-      <packageset dir="${src.dir}"/>
 
+            sourcepath="${src.dir}:/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"
+     >
+<!--
+      <packageset dir="${src.dir}" defaultexcludes="yes">
+      <include name="java/util/concurrent"/>
+      <include name="java/util/concurrent/atomic"/>
+      <include name="java/util/concurrent/locks"/>
+      </packageset>
+-->
+      <fileset dir="${topsrc.dir}" defaultexcludes="yes">
+      <include name="main/java/util/concurrent/*.java"/>
+      <include name="main/java/util/concurrent/atomic/*.java"/>
+      <include name="main/java/util/concurrent/locks/*.java"/>
+      <include name="main/java/util/*.java"/>
+<!--
+      <include name="main/java/util/concurrent/*.html"/>
+      <include name="main/java/util/concurrent/atomic/*.html"/>
+      <include name="main/java/util/concurrent/locks/*.html"/>
+      <include name="main/java/util/*.html"/>
+-->
+<!--      <include name="jsr166x/*.java"/> -->
+      </fileset>
     </javadoc>
 
   </target>
@@ -668,7 +711,7 @@
   </target>
 
 
-  <target name="compile-j1" depends="init, configure-compiler">
+  <target name="compile-j1" depends="init, configure-compiler, compile">
 
     <mkdir dir="${build.j1.dir}"/>
 
@@ -677,8 +720,10 @@
             debug="${build.debug}"
        debuglevel="${build.debuglevel}"
       deprecation="${build.deprecation}"
-           source="${build.sourcelevel}"
-             fork="true">
+           source="${build.sourcelevel}" >
+
+      <include name="**/*.java"/>
+      <exclude name="**/dijkstra/**"/>
 
       <compilerarg line="${build.args}"/>
       <classpath refid="j1.classpath"/>
@@ -708,8 +753,22 @@
   <target name="j1" depends="compile-j1"
           description="Runs a standalone JavaOne program">
 
-    <java classname="jsr166.misc.SortedEnumSet" fork="true">
+    <java classname="${j1.test}" fork="true">
       <classpath refid="j1.classpath"/>
+      <jvmarg value="-client"/>
+
+      <!-- TestPseudoRandom args -->
+      <arg value="2"/>
+      <arg value="25"/>
+      <arg value="100000"/>
+
+      <!-- WebCrawler args -->
+      <!--
+      <arg value="jsr166.webcrawler.WebCrawler3"/>
+      <arg value="http://www.priorartisans.com"/>
+      <arg value="25"/>
+      -->
+
     </java>
 
   </target>
@@ -924,4 +983,223 @@
 
   </target>
 
+  <!-- jsr166x -->
+
+
+  <target name="jsr166xcompile"
+          depends="init, configure-compiler"
+          description="Compiles jsr166x sources">
+
+    <mkdir dir="${build.jsr166x.dir}"/>
+
+    <javac srcdir="${jsr166xsrc.dir}"
+          destdir="${build.jsr166x.dir}"
+            debug="${build.debug}"
+       debuglevel="${build.debuglevel}"
+      deprecation="${build.deprecation}"
+           source="${build.sourcelevel}"
+             fork="true">
+
+      <include name="**/*.java"/>
+      <compilerarg line="${build.args}"/>
+
+    </javac>
+
+  </target>
+
+
+
+  <target name="jsr166xjar"
+          depends="jsr166xcompile"
+          description="Builds library jar from compiled sources">
+
+    <mkdir dir="${build.jsr166xlib.dir}"/>
+
+    <jar destfile="${jsr166xproduct.jar}">
+      <fileset dir="${build.jsr166x.dir}"/>
+    </jar>
+
+  </target>
+
+
+
+  <target name="jsr166xdocs"
+          description="Builds javadocs with custom tags to build folder">
+
+    <delete dir="${build.jsr166xjavadocs.dir}"/>
+    <mkdir dir="${build.jsr166xjavadocs.dir}"/>
+
+    <javadoc destdir="${build.jsr166xjavadocs.dir}"
+             link="http://java.sun.com/javase/6/docs/api/"
+
+            sourcepath="${jsr166xsrc.dir}:/home/dl/1.5.0/j2se/martin/j2se/src/share/classes"
+
+    >
+      <packageset dir="${topsrc.dir}" defaultexcludes="yes">
+      <include name="jsr166x"/>
+      </packageset>
+
+
+    </javadoc>
+
+  </target>
+
+
+  <target name="jsr166xdist"
+          depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdist-docs"
+          description="Puts all distributable products in single hierarchy"/>
+
+
+
+  <target name="jsr166xclean"
+          description="Removes all build products">
+
+    <delete dir="${build.jsr166x.dir}"/>
+    <delete dir="${build.jsr166xlib.dir}"/>
+
+  </target>
+
+
+
+  <target name="jsr166xdist-clean"
+          description="Removes all build and distribution products">
+
+  </target>
+
+
+
+  <target name="jsr166xdist-docs"
+          description="Builds javadocs without custom tags to dist folder">
+
+    <delete dir="${dist.jsr166xjavadocs.dir}"/>
+    <mkdir dir="${dist.jsr166xjavadocs.dir}"/>
+
+    <javadoc destdir="${dist.jsr166xjavadocs.dir}"
+                link="http://java.sun.com/javase/6/docs/api/"
+              source="${build.sourcelevel}">
+
+      <packageset dir="${topsrc.dir}" defaultexcludes="yes">
+      <include name="jsr166x"/>
+      </packageset>
+
+    </javadoc>
+
+  </target>
+
+  <target name="jsr166xdist-jar"
+          depends="jsr166xclean, jsr166xjar">
+
+    <copy file="${jsr166xproduct.jar}" todir="${dist.dir}"/>
+
+  </target>
+
+  <!-- jsr166y -->
+
+
+  <target name="jsr166ycompile"
+          depends="init, configure-compiler"
+          description="Compiles jsr166y sources">
+
+    <mkdir dir="${build.jsr166y.dir}"/>
+
+    <javac srcdir="${jsr166ysrc.dir}"
+          destdir="${build.jsr166y.dir}"
+            debug="${build.debug}"
+       debuglevel="${build.debuglevel}"
+      deprecation="${build.deprecation}"
+           source="${build.sourcelevel}"
+             fork="true">
+
+      <include name="**/*.java"/>
+      <compilerarg line="${build.args}"/>
+      <compilerarg value="${bootclasspath.args}"/>
+
+<!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
+
+    </javac>
+
+  </target>
+
+
+
+  <target name="jsr166yjar"
+          depends="jsr166ycompile"
+          description="Builds library jar from compiled sources">
+
+    <mkdir dir="${build.jsr166ylib.dir}"/>
+
+    <jar destfile="${jsr166yproduct.jar}">
+      <fileset dir="${build.jsr166y.dir}"/>
+    </jar>
+
+  </target>
+
+
+
+  <target name="jsr166ydocs"
+          description="Builds javadocs with custom tags to build folder">
+
+    <delete dir="${build.jsr166yjavadocs.dir}"/>
+    <mkdir dir="${build.jsr166yjavadocs.dir}"/>
+
+    <javadoc destdir="${build.jsr166yjavadocs.dir}"
+                link="http://java.sun.com/javase/6/docs/api/"
+            sourcepath="${jsr166ysrc.dir}:/home/dl/1.5.0/j2se/martin/j2se/src/share/classes"
+
+    >
+      <packageset dir="${topsrc.dir}" defaultexcludes="no">
+      <include name="jsr166y"/>
+      </packageset>
+
+
+    </javadoc>
+
+  </target>
+
+
+  <target name="jsr166ydist"
+          depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydist-docs"
+          description="Puts all distributable products in single hierarchy"/>
+
+
+
+  <target name="jsr166yclean"
+          description="Removes all build products">
+
+    <delete dir="${build.jsr166y.dir}"/>
+    <delete dir="${build.jsr166ylib.dir}"/>
+
+  </target>
+
+
+
+  <target name="jsr166ydist-clean"
+          description="Removes all build and distribution products">
+
+  </target>
+
+  <target name="jsr166ydist-docs"
+          description="Builds javadocs without custom tags to dist folder">
+
+    <delete dir="${dist.jsr166yjavadocs.dir}"/>
+    <mkdir dir="${dist.jsr166yjavadocs.dir}"/>
+
+    <javadoc destdir="${dist.jsr166yjavadocs.dir}"
+                link="http://java.sun.com/javase/6/docs/api/"
+              source="${build.sourcelevel}">
+      <fileset dir="${topsrc.dir}" defaultexcludes="yes">
+      <include name="jsr166y/*.java"/>
+      <include name="jsr166y/forkjoin/*.java"/>
+            </fileset>
+    </javadoc>
+
+  </target>
+
+  <target name="jsr166ydist-jar"
+          depends="jsr166yclean, jsr166yjar">
+
+    <copy file="${jsr166yproduct.jar}" todir="${dist.dir}"/>
+
+  </target>
+
 </project>