--- jsr166/build.xml	2013/01/19 21:35:40	1.103
+++ jsr166/build.xml	2013/01/19 23:40:04	1.107
@@ -127,21 +127,21 @@
   <property name="jdksrc.dir"           location="/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"/>
 
   <!-- Distribution locations -->
-  <property name="dist.javadocs.dir"           location="${dist.dir}/docs"/>
-  <property name="dist.4jdk7.docs.dir"         location="${dist.dir}/jsr166-4jdk7docs"/>
-  <property name="dist.jsr166xjavadocs.dir"    location="${dist.dir}/jsr166xdocs"/>
-  <property name="dist.jsr166yjavadocs.dir"    location="${dist.dir}/jsr166ydocs"/>
-  <property name="dist.jsr166ejavadocs.dir"    location="${dist.dir}/jsr166edocs"/>
-  <property name="dist.extra166yjavadocs.dir"  location="${dist.dir}/extra166ydocs"/>
+  <property name="dist.javadocs.dir"          location="${dist.dir}/docs"/>
+  <property name="dist.4jdk7.docs.dir"        location="${dist.dir}/jsr166-4jdk7docs"/>
+  <property name="dist.jsr166xjavadocs.dir"   location="${dist.dir}/jsr166xdocs"/>
+  <property name="dist.jsr166yjavadocs.dir"   location="${dist.dir}/jsr166ydocs"/>
+  <property name="dist.jsr166ejavadocs.dir"   location="${dist.dir}/jsr166edocs"/>
+  <property name="dist.extra166yjavadocs.dir" location="${dist.dir}/extra166ydocs"/>
 
   <!-- Jar locations -->
-  <property name="product.jar"          location="${build.lib.dir}/jsr166.jar"/>
-  <property name="4jdk7product.jar"     location="${build.4jdk7.lib.dir}/jsr166-4jdk7.jar"/>
-  <property name="jsr166xproduct.jar"   location="${build.jsr166xlib.dir}/jsr166x.jar"/>
-  <property name="jsr166yproduct.jar"   location="${build.jsr166ylib.dir}/jsr166y.jar"/>
-  <property name="jsr166eproduct.jar"   location="${build.jsr166elib.dir}/jsr166e.jar"/>
-  <property name="extra166yproduct.jar" location="${build.extra166ylib.dir}/extra166y.jar"/>
-  <property name="junit.jar"            location="${lib.dir}/junit.jar"/>
+  <property name="product.jar"      location="${build.lib.dir}/jsr166.jar"/>
+  <property name="4jdk7product.jar" location="${build.4jdk7.lib.dir}/jsr166-4jdk7.jar"/>
+  <property name="jsr166x.jar"      location="${build.jsr166xlib.dir}/jsr166x.jar"/>
+  <property name="jsr166y.jar"      location="${build.jsr166ylib.dir}/jsr166y.jar"/>
+  <property name="jsr166e.jar"      location="${build.jsr166elib.dir}/jsr166e.jar"/>
+  <property name="extra166y.jar"    location="${build.extra166ylib.dir}/extra166y.jar"/>
+  <property name="junit.jar"        location="${lib.dir}/junit.jar"/>
 
   <!-- Bootclasspath argument -->
   <property name="bootclasspath.args"   value="-Xbootclasspath/p:${product.jar}"/>
@@ -154,6 +154,8 @@
   <property name="jdkapi8docs.url"      value="http://download.java.net/jdk8/docs/api/"/>
   <!-- The below does not yet exist as of 2012-11 -->
   <!-- <property name="jdkapi8docs.url" value="http://docs.oracle.com/javase/8/docs/api/"/> -->
+
+  <!-- Default jdk api doc location (latest stable release seems best) -->
   <property name="jdkapidocs.url"       value="${jdkapi7docs.url}"/>
 
   <!-- Test classpath -->
@@ -177,7 +179,7 @@
   <!-- Main targets -->
 
   <target name="dists"
-          depends="dist, jsr166xdist, jsr166ydist,jsr166edist,  extra166ydist"
+          depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
           description="Builds all public jars and docs"/>
 
   <target name="compile"
@@ -310,16 +312,6 @@
   <!-- Internal targets -->
 
 
-<!--   <target name="init"> -->
-
-    <!-- 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> -->
-
-
   <target name="dist-jar"
           depends="clean, jar">
 
@@ -544,7 +536,7 @@
            debug="${build.debug}"
            debuglevel="${build.debuglevel}"
            deprecation="${build.deprecation}"
-           source="1.6"
+           source="6"
            classpath=""
            bootclasspath="${bootclasspath6}"
            includeAntRuntime="false"
@@ -572,7 +564,7 @@
            debug="${build.debug}"
            debuglevel="${build.debuglevel}"
            deprecation="${build.deprecation}"
-           source="1.6"
+           source="6"
            classpath="${junit.jar}"
            bootclasspath="${4jdk7product.jar}:${bootclasspath6}"
            includeAntRuntime="false"
@@ -683,21 +675,27 @@
 
   <target name="jsr166xcompile"
           depends="configure-compiler"
-          description="Compiles jsr166x sources">
+          description="Compiles jsr166x sources to build dir">
 
     <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">
+    <javac srcdir="${topsrc.dir}"
+           destdir="${build.jsr166x.dir}"
+           debug="${build.debug}"
+           debuglevel="${build.debuglevel}"
+           deprecation="${build.deprecation}"
+           classpath=""
+           source="5"
+           bootclasspath="${bootclasspath6}"
+           includeAntRuntime="false"
+           includeJavaRuntime="false"
+           executable="${javac7}"
+           fork="true">
 
-      <include name="**/*.java"/>
+      <include name="jsr166x/**/*.java"/>
       <compilerarg line="${build.args}"/>
       <compilerarg value="-XDignore.symbol.file=true"/>
+      <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
 
     </javac>
 
@@ -711,7 +709,7 @@
 
     <mkdir dir="${build.jsr166xlib.dir}"/>
 
-    <jar destfile="${jsr166xproduct.jar}">
+    <jar destfile="${jsr166x.jar}">
       <fileset dir="${build.jsr166x.dir}"/>
     </jar>
 
@@ -726,10 +724,12 @@
     <mkdir dir="${build.jsr166xjavadocs.dir}"/>
 
     <javadoc destdir="${build.jsr166xjavadocs.dir}"
-             packagenames="jsr166x"
+             packagenames="jsr166x.*"
              link="${jdkapidocs.url}"
-             source="${build.sourcelevel}"
-             sourcepath="${topsrc.dir}:${jdksrc.dir}"
+             source="5"
+             bootclasspath="${bootclasspath6}"
+             sourcepath="${topsrc.dir}:${jdk6src.dir}"
+             executable="${javadoc7}"
              additionalparam="-XDignore.symbol.file=true" />
 
   </target>
@@ -765,10 +765,11 @@
     <mkdir dir="${dist.jsr166xjavadocs.dir}"/>
 
     <javadoc destdir="${dist.jsr166xjavadocs.dir}"
-             packagenames="jsr166x"
+             packagenames="jsr166x.*"
              link="${jdkapidocs.url}"
              source="${build.sourcelevel}"
-             sourcepath="${topsrc.dir}:${jdksrc.dir}"
+             sourcepath="${topsrc.dir}:${jdk6src.dir}"
+             executable="${javadoc7}"
              additionalparam="-XDignore.symbol.file=true" />
 
   </target>
@@ -776,7 +777,7 @@
   <target name="jsr166xdist-jar"
           depends="jsr166xclean, jsr166xjar">
 
-    <copy file="${jsr166xproduct.jar}" todir="${dist.dir}"/>
+    <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
 
   </target>
 
@@ -794,7 +795,7 @@
            debug="${build.debug}"
            debuglevel="${build.debuglevel}"
            deprecation="${build.deprecation}"
-           source="1.6"
+           source="6"
            classpath=""
            bootclasspath="${bootclasspath6}"
            includeAntRuntime="false"
@@ -816,7 +817,7 @@
 
     <mkdir dir="${build.jsr166ylib.dir}"/>
 
-    <jar destfile="${jsr166yproduct.jar}" index="true">
+    <jar destfile="${jsr166y.jar}" index="true">
       <fileset dir="${build.jsr166y.dir}"/>
     </jar>
 
@@ -831,10 +832,12 @@
     <mkdir dir="${build.jsr166yjavadocs.dir}"/>
 
     <javadoc destdir="${build.jsr166yjavadocs.dir}"
-             packagenames="jsr166y"
+             packagenames="jsr166y.*"
              link="${jdkapidocs.url}"
-             source="${build.sourcelevel}"
-             sourcepath="${topsrc.dir}:${jdksrc.dir}"
+             source="6"
+             bootclasspath="${bootclasspath6}"
+             sourcepath="${topsrc.dir}:${jdk6src.dir}"
+             executable="${javadoc7}"
              additionalparam="-XDignore.symbol.file=true" />
 
   </target>
@@ -868,10 +871,11 @@
     <mkdir dir="${dist.jsr166yjavadocs.dir}"/>
 
     <javadoc destdir="${dist.jsr166yjavadocs.dir}"
-             packagenames="jsr166y"
+             packagenames="jsr166y.*"
              link="${jdkapidocs.url}"
              source="${build.sourcelevel}"
-             sourcepath="${topsrc.dir}:${jdksrc.dir}"
+             sourcepath="${topsrc.dir}:${jdk6src.dir}"
+             executable="${javadoc7}"
              additionalparam="-XDignore.symbol.file=true" />
 
   </target>
@@ -879,7 +883,7 @@
   <target name="jsr166ydist-jar"
           depends="jsr166yclean, jsr166yjar">
 
-    <copy file="${jsr166yproduct.jar}" todir="${dist.dir}"/>
+    <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
 
   </target>
 
@@ -896,11 +900,11 @@
     <javac srcdir="${topsrc.dir}"
            destdir="${build.extra166y.dir}"
            debug="${build.debug}"
-           classpath=""
            debuglevel="${build.debuglevel}"
            deprecation="${build.deprecation}"
-           source="1.6"
-           bootclasspath="${jsr166yproduct.jar}:${bootclasspath6}"
+           classpath=""
+           source="6"
+           bootclasspath="${jsr166y.jar}:${bootclasspath6}"
            includeAntRuntime="false"
            includeJavaRuntime="false"
            executable="${javac7}"
@@ -923,7 +927,7 @@
 
     <mkdir dir="${build.extra166ylib.dir}"/>
 
-    <jar destfile="${extra166yproduct.jar}" index="true">
+    <jar destfile="${extra166y.jar}" index="true">
       <fileset dir="${build.extra166y.dir}"/>
     </jar>
 
@@ -932,16 +936,18 @@
 
 
   <target name="extra166ydocs"
-          description="Builds javadocs with custom tags to build dir">
+          description="Builds javadocs to build dir">
 
     <delete dir="${build.extra166yjavadocs.dir}"/>
     <mkdir dir="${build.extra166yjavadocs.dir}"/>
 
     <javadoc destdir="${build.extra166yjavadocs.dir}"
-             packagenames="extra166y"
+             packagenames="extra166y.*"
              link="${jdkapidocs.url}"
-             source="${build.sourcelevel}"
-             sourcepath="${topsrc.dir}:${jdksrc.dir}"
+             source="6"
+             bootclasspath="${bootclasspath6}"
+             sourcepath="${topsrc.dir}:${jdk6src.dir}"
+             executable="${javadoc7}"
              additionalparam="-XDignore.symbol.file=true" />
 
   </target>
@@ -975,10 +981,11 @@
     <mkdir dir="${dist.extra166yjavadocs.dir}"/>
 
     <javadoc destdir="${dist.extra166yjavadocs.dir}"
-             packagenames="extra166y"
+             packagenames="extra166y.*"
              link="${jdkapidocs.url}"
              source="${build.sourcelevel}"
-             sourcepath="${topsrc.dir}:${jdksrc.dir}"
+             sourcepath="${topsrc.dir}:${jdk6src.dir}"
+             executable="${javadoc7}"
              additionalparam="-XDignore.symbol.file=true" />
 
   </target>
@@ -986,7 +993,7 @@
   <target name="extra166ydist-jar"
           depends="extra166yclean, extra166yjar">
 
-    <copy file="${extra166yproduct.jar}" todir="${dist.dir}"/>
+    <copy file="${extra166y.jar}" todir="${dist.dir}"/>
 
   </target>
 
@@ -1003,7 +1010,7 @@
            debug="${build.debug}"
            debuglevel="${build.debuglevel}"
            deprecation="${build.deprecation}"
-           source="1.7"
+           source="7"
            classpath=""
            includeAntRuntime="false"
            includeJavaRuntime="false"
@@ -1027,7 +1034,7 @@
 
     <mkdir dir="${build.jsr166elib.dir}"/>
 
-    <jar destfile="${jsr166eproduct.jar}" index="true">
+    <jar destfile="${jsr166e.jar}" index="true">
       <fileset dir="${build.jsr166e.dir}"/>
     </jar>
 
@@ -1036,21 +1043,18 @@
 
 
   <target name="jsr166edocs"
-          description="Builds javadocs with custom tags to build dir">
+          description="Builds javadocs to build dir">
 
     <delete dir="${build.jsr166ejavadocs.dir}"/>
     <mkdir dir="${build.jsr166ejavadocs.dir}"/>
 
     <javadoc destdir="${build.jsr166ejavadocs.dir}"
-             packagenames="jsr166e,jsr166e.extra"
-             link="${jdkapi7docs.url}"
-             source="1.7"
+             packagenames="jsr166e.*"
+             link="${jdkapidocs.url}"
+             source="7"
              sourcepath="${topsrc.dir}:${jdk7src.dir}"
              executable="${javadoc7}"
              additionalparam="-XDignore.symbol.file=true" >
-      <fileset dir="${topsrc.dir}" defaultexcludes="yes">
-        <include name="jsr166e/**/*.java"/>
-      </fileset>
     </javadoc>
 
   </target>
@@ -1084,10 +1088,11 @@
     <mkdir dir="${dist.jsr166ejavadocs.dir}"/>
 
     <javadoc destdir="${dist.jsr166ejavadocs.dir}"
-             packagenames="jsr166e,jsr166e.extra"
+             packagenames="jsr166e.*"
              link="${jdkapidocs.url}"
-             source="1.7"
-             sourcepath="${topsrc.dir}:${jdksrc.dir}"
+             source="7"
+             sourcepath="${topsrc.dir}:${jdk7src.dir}"
+             executable="${javadoc7}"
              additionalparam="-XDignore.symbol.file=true" />
 
   </target>
@@ -1095,7 +1100,7 @@
   <target name="jsr166edist-jar"
           depends="jsr166eclean, jsr166ejar">
 
-    <copy file="${jsr166eproduct.jar}" todir="${dist.dir}"/>
+    <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
 
   </target>