--- jsr166/build.xml	2013/01/19 01:37:44	1.99
+++ jsr166/build.xml	2013/01/19 20:53:34	1.102
@@ -167,6 +167,12 @@
     <pathelement location="${build.loops.dir}"/>
   </path>
 
+  <!-- Support @jls tag, used in jdk8+ javadoc -->
+  <!-- TODO: How do we get &trade to work? -->
+  <!-- TODO: Why isn't @jls a "standard" tag? -->
+  <!--   property name="javadoc.jls.cite" value="The Java&trade; Language Specification" -->
+  <property name="javadoc.jls.cite" value="The Java Language Specification"/>
+  <property name="javadoc.jls.option" value="jls:a:See &lt;cite&gt;${javadoc.jls.cite}&lt;/cite&gt;:"/>
 
   <!-- Main targets -->
 
@@ -175,21 +181,26 @@
           description="Builds all public jars and docs"/>
 
   <target name="compile"
-          depends="init, configure-compiler"
-          description="Compiles main sources to build folder">
+          depends="configure-compiler"
+          description="Compiles src/main sources to build dir">
 
     <mkdir dir="${build.classes.dir}"/>
 
     <javac srcdir="${src.dir}"
-          destdir="${build.classes.dir}"
-            debug="${build.debug}"
-       debuglevel="${build.debuglevel}"
-      deprecation="${build.deprecation}"
-           source="${build.sourcelevel}"
-             fork="true">
+           destdir="${build.classes.dir}"
+           debug="${build.debug}"
+           debuglevel="${build.debuglevel}"
+           deprecation="${build.deprecation}"
+           classpath=""
+           includeAntRuntime="false"
+           includeJavaRuntime="false"
+           executable="${javac8}"
+           fork="true">
 
       <include name="**/*.java"/>
+      <compilerarg line="${build.args}"/>
       <compilerarg value="-XDignore.symbol.file=true"/>
+      <compilerarg value="-Xlint:all"/>
 
 <!--
       <exclude name="java/lang/**"/>
@@ -224,20 +235,24 @@
 
 
   <target name="docs"
-          description="Builds javadocs with custom tags to build folder">
+          description="Builds javadocs for src/main to dist dir">
 
-    <delete dir="${build.javadocs.dir}"/>
-    <mkdir dir="${build.javadocs.dir}"/>
+    <delete dir="${dist.javadocs.dir}"/>
+    <mkdir dir="${dist.javadocs.dir}"/>
 
     <!-- the packagenames="none" hack below prevents scanning the -->
     <!-- sourcepath for packages -->
 
-    <javadoc destdir="${build.javadocs.dir}"
+    <javadoc destdir="${dist.javadocs.dir}"
              packagenames="none"
-             link="${jdkapidocs.url}"
+             link="${jdkapi8docs.url}"
              overview="${src.dir}/intro.html"
-             sourcepath="${src.dir}:${jdksrc.dir}"
-             additionalparam="-XDignore.symbol.file=true" >
+             sourcepath="${src.dir}:${jdk8src.dir}"
+             classpath=""
+             executable="${javadoc8}">
+      <arg value="-XDignore.symbol.file=true"/>
+      <arg value="-tag"/>
+      <arg value="${javadoc.jls.option}"/>
       <fileset dir="${src.dir}" defaultexcludes="yes">
         <include name="**/*.java"/>
       </fileset>
@@ -248,7 +263,7 @@
 
 
   <target name="dist"
-          depends="init, dist-clean, dist-jar, dist-docs"
+          depends="init, dist-clean, dist-jar, docs"
           description="Puts all distributable products in single hierarchy"/>
 
 
@@ -292,30 +307,6 @@
 
 
 
-  <target name="dist-docs"
-          description="Builds javadocs without custom tags to dist folder">
-
-    <delete dir="${dist.javadocs.dir}"/>
-    <mkdir dir="${dist.javadocs.dir}"/>
-
-    <!-- the packagenames="none" hack below prevents scanning the -->
-    <!-- sourcepath for packages -->
-
-    <javadoc destdir="${dist.javadocs.dir}"
-             packagenames="none"
-             link="${jdkapidocs.url}"
-             overview="${src.dir}/intro.html"
-             sourcepath="${src.dir}:${jdksrc.dir}"
-             additionalparam="-XDignore.symbol.file=true" >
-      <fileset dir="${src.dir}" defaultexcludes="yes">
-        <include name="**/*.java"/>
-      </fileset>
-    </javadoc>
-
-  </target>
-
-
-
   <!-- Internal targets -->
 
 
@@ -639,12 +630,12 @@
 
 
   <target name="4jdk7docs"
-          description="Builds javadocs with custom tags to build folder">
+          description="Builds javadocs for src/jdk7 to dist dir">
 
-    <delete dir="${build.4jdk7.docs.dir}"/>
-    <mkdir dir="${build.4jdk7.docs.dir}"/>
+    <delete dir="${dist.4jdk7.docs.dir}"/>
+    <mkdir dir="${dist.4jdk7.docs.dir}"/>
 
-    <javadoc destdir="${build.4jdk7.docs.dir}"
+    <javadoc destdir="${dist.4jdk7.docs.dir}"
              packagenames="none"
              link="${jdkapi7docs.url}"
              overview="${4jdk7src.dir}/intro.html"
@@ -661,7 +652,7 @@
 
 
   <target name="4jdk7dist"
-          depends="4jdk7dist-clean, 4jdk7dist-jar, 4jdk7dist-docs"
+          depends="4jdk7dist-clean, 4jdk7dist-jar, 4jdk7docs"
           description="Puts all distributable products in single hierarchy"/>
 
 
@@ -680,27 +671,6 @@
 
   </target>
 
-  <target name="4jdk7dist-docs"
-          description="Builds javadocs without custom tags to dist folder">
-
-    <delete dir="${dist.4jdk7.docs.dir}"/>
-    <mkdir dir="${dist.4jdk7.docs.dir}"/>
-
-    <javadoc destdir="${dist.4jdk7.docs.dir}"
-             packagenames="none"
-             link="${jdkapi7docs.url}"
-             overview="${4jdk7src.dir}/intro.html"
-             sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
-             classpath=""
-             executable="${javadoc7}">
-      <arg value="-XDignore.symbol.file=true"/>
-      <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
-        <include name="**/*.java"/>
-      </fileset>
-    </javadoc>
-
-  </target>
-
   <target name="4jdk7dist-jar"
           depends="4jdk7clean, 4jdk7compile">
 
@@ -750,7 +720,7 @@
 
 
   <target name="jsr166xdocs"
-          description="Builds javadocs with custom tags to build folder">
+          description="Builds javadocs to dist dir">
 
     <delete dir="${build.jsr166xjavadocs.dir}"/>
     <mkdir dir="${build.jsr166xjavadocs.dir}"/>
@@ -789,7 +759,7 @@
 
 
   <target name="jsr166xdist-docs"
-          description="Builds javadocs without custom tags to dist folder">
+          description="Builds javadocs to dist dir">
 
     <delete dir="${dist.jsr166xjavadocs.dir}"/>
     <mkdir dir="${dist.jsr166xjavadocs.dir}"/>
@@ -855,7 +825,7 @@
 
 
   <target name="jsr166ydocs"
-          description="Builds javadocs with custom tags to build folder">
+          description="Builds javadocs to dist dir">
 
     <delete dir="${build.jsr166yjavadocs.dir}"/>
     <mkdir dir="${build.jsr166yjavadocs.dir}"/>
@@ -892,7 +862,7 @@
   </target>
 
   <target name="jsr166ydist-docs"
-          description="Builds javadocs without custom tags to dist folder">
+          description="Builds javadocs to dist dir">
 
     <delete dir="${dist.jsr166yjavadocs.dir}"/>
     <mkdir dir="${dist.jsr166yjavadocs.dir}"/>
@@ -960,7 +930,7 @@
 
 
   <target name="extra166ydocs"
-          description="Builds javadocs with custom tags to build folder">
+          description="Builds javadocs with custom tags to build dir">
 
     <delete dir="${build.extra166yjavadocs.dir}"/>
     <mkdir dir="${build.extra166yjavadocs.dir}"/>
@@ -997,7 +967,7 @@
   </target>
 
   <target name="extra166ydist-docs"
-          description="Builds javadocs without custom tags to dist folder">
+          description="Builds javadocs to dist dir">
 
     <delete dir="${dist.extra166yjavadocs.dir}"/>
     <mkdir dir="${dist.extra166yjavadocs.dir}"/>
@@ -1064,7 +1034,7 @@
 
 
   <target name="jsr166edocs"
-          description="Builds javadocs with custom tags to build folder">
+          description="Builds javadocs with custom tags to build dir">
 
     <delete dir="${build.jsr166ejavadocs.dir}"/>
     <mkdir dir="${build.jsr166ejavadocs.dir}"/>
@@ -1106,7 +1076,7 @@
   </target>
 
   <target name="jsr166edist-docs"
-          description="Builds javadocs without custom tags to dist folder">
+          description="Builds javadocs to dist dir">
 
     <delete dir="${dist.jsr166ejavadocs.dir}"/>
     <mkdir dir="${dist.jsr166ejavadocs.dir}"/>