--- jsr166/build.xml	2007/09/18 12:46:40	1.75
+++ jsr166/build.xml	2009/01/06 16:31:52	1.76
@@ -42,6 +42,10 @@
   <property name="build.jsr166ylib.dir"        location="${build.dir}/jsr166ylib"/>
   <property name="build.jsr166yjavadocs.dir"   location="${build.dir}/jsr166yjavadocs"/>
 
+  <property name="build.extra166y.dir"    location="${build.dir}/extra166y"/>
+  <property name="build.extra166ylib.dir"        location="${build.dir}/extra166ylib"/>
+  <property name="build.extra166yjavadocs.dir"   location="${build.dir}/extra166yjavadocs"/>
+
   <!-- Source locations -->
   <property name="src.dir"              location="${basedir}/src/main"/>
   <property name="test.src.dir"         location="${basedir}/src/test"/>
@@ -53,16 +57,19 @@
   <property name="topsrc.dir"           location="${basedir}/src"/>
   <property name="jsr166xsrc.dir"       location="${basedir}/src/jsr166x"/>
   <property name="jsr166ysrc.dir"       location="${basedir}/src/jsr166y"/>
+  <property name="extra166ysrc.dir"       location="${basedir}/src/extra166y"/>
 
   <!-- 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"/>
+  <property name="dist.extra166yjavadocs.dir"    location="${dist.dir}/extra166ydocs"/>
 
   <!-- 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="extra166yproduct.jar"   location="${build.extra166ylib.dir}/extra166y.jar"/>
   <property name="junit.jar"            location="${lib.dir}/junit.jar"/>
 
   <!-- Bootclasspath argument -->
@@ -600,7 +607,7 @@
 
     <mkdir dir="${build.jsr166ylib.dir}"/>
 
-    <jar destfile="${jsr166yproduct.jar}">
+    <jar destfile="${jsr166yproduct.jar}" index="true">
       <fileset dir="${build.jsr166y.dir}"/>
     </jar>
 
@@ -661,7 +668,6 @@
               source="${build.sourcelevel}">
       <fileset dir="${topsrc.dir}" defaultexcludes="yes">
       <include name="jsr166y/*.java"/>
-      <include name="jsr166y/forkjoin/*.java"/>
             </fileset>
     </javadoc>
 
@@ -674,4 +680,112 @@
 
   </target>
 
+  <!-- extra166y -->
+
+
+  <target name="extra166ycompile"
+          depends="init, configure-compiler"
+          description="Compiles extra166y sources">
+
+    <mkdir dir="${build.extra166y.dir}"/>
+
+    <javac srcdir="${extra166ysrc.dir}"
+          destdir="${build.extra166y.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="extra166yjar"
+          depends="extra166ycompile"
+          description="Builds library jar from compiled sources">
+
+    <mkdir dir="${build.extra166ylib.dir}"/>
+
+    <jar destfile="${extra166yproduct.jar}" index="true">
+      <fileset dir="${build.extra166y.dir}"/>
+    </jar>
+
+  </target>
+
+
+
+  <target name="extra166ydocs"
+          description="Builds javadocs with custom tags to build folder">
+
+    <delete dir="${build.extra166yjavadocs.dir}"/>
+    <mkdir dir="${build.extra166yjavadocs.dir}"/>
+
+    <javadoc destdir="${build.extra166yjavadocs.dir}"
+                link="http://java.sun.com/javase/6/docs/api/"
+            sourcepath="${extra166ysrc.dir}:/home/dl/1.5.0/j2se/martin/j2se/src/share/classes"
+
+    >
+      <packageset dir="${topsrc.dir}" defaultexcludes="no">
+      <include name="extra166y"/>
+      </packageset>
+
+
+    </javadoc>
+
+  </target>
+
+
+  <target name="extra166ydist"
+          depends="extra166ydist-clean, extra166ydist-jar, extra166ydist-docs"
+          description="Puts all distributable products in single hierarchy"/>
+
+
+
+  <target name="extra166yclean"
+          description="Removes all build products">
+
+    <delete dir="${build.extra166y.dir}"/>
+    <delete dir="${build.extra166ylib.dir}"/>
+
+  </target>
+
+
+
+  <target name="extra166ydist-clean"
+          description="Removes all build and distribution products">
+
+  </target>
+
+  <target name="extra166ydist-docs"
+          description="Builds javadocs without custom tags to dist folder">
+
+    <delete dir="${dist.extra166yjavadocs.dir}"/>
+    <mkdir dir="${dist.extra166yjavadocs.dir}"/>
+
+    <javadoc destdir="${dist.extra166yjavadocs.dir}"
+                link="http://java.sun.com/javase/6/docs/api/"
+              source="${build.sourcelevel}">
+      <fileset dir="${topsrc.dir}" defaultexcludes="yes">
+      <include name="extra166y/*.java"/>
+            </fileset>
+    </javadoc>
+
+  </target>
+
+  <target name="extra166ydist-jar"
+          depends="extra166yclean, extra166yjar">
+
+    <copy file="${extra166yproduct.jar}" todir="${dist.dir}"/>
+
+  </target>
+
 </project>