--- jsr166/build.xml	2019/10/06 17:34:58	1.304
+++ jsr166/build.xml	2019/10/17 17:28:49	1.308
@@ -271,6 +271,7 @@
       <patternset refid="jdk@{target}.jtreg.tests"/>
       <arg value="-javacoptions:--patch-module=java.base=@{classes}"/>
       <arg value="-vmoptions:--patch-module=java.base=@{classes}"/>
+      <arg value="-vmoptions:${vmoptions}" if:set="vmoptions"/>
       <arg value="-agentvm"/>
       <arg value="-noreport"/>
       <arg value="-verbose:@{verbose}"/>
@@ -372,9 +373,16 @@
   <target name="docs"
           description="Builds javadocs for src/main to dist dir">
 
-    <delete dir="${docs.dir}"/>
+    <delete dir="${docs.dir}" quiet="true"/>
     <mkdir dir="${docs.dir}"/>
 
+    <!-- old school frames via docs/index.html?overview-summary.html -->
+    <!-- dash-dash-frames no longer a supported option in jdk13+ -->
+    <local name="use-frames"/>
+    <condition property="use-frames">
+      <equals arg1="${build.main.javadoc}" arg2="${javadoc12}"/>
+    </condition>
+
     <!-- the packagenames="none" hack below prevents scanning the -->
     <!-- sourcepath for packages -->
 
@@ -398,12 +406,11 @@
       </fileset>
       <arg line="-Xdocrootparent ${java.docroot.url}"/>
       <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
+      <arg value="-quiet"/>
       <arg value="-XDignore.symbol.file=true"/>
       <arg value="-html5"/>
       <arg value="--patch-module=java.base=${src.dir}"/>
-<!-- old school frames via docs/index.html?overview-summary.html -->
-<!-- TODO: - -frames no longer a supported option in jdk13+ -->
-      <arg value="--frames"/>
+      <arg value="--frames" if:set="use-frames"/>
       <arg value="--override-methods=summary"/>
       <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
       <arg value="-tag"/> <arg value="implSpec:a:Implementation Requirements:"/>
@@ -497,84 +504,84 @@
   </target>
 
   <target name="test11">
-    <antcall target="clean"/>
     <antcall>
       <param name="java.runtime.target" value="11"/>
       <param name="build.main.javac" value="${javac11}"/>
       <param name="build.main.javadoc" value="${javadoc12}"/>
       <param name="build.main.javadoc.source" value="11"/>
+      <target name="clean"/>
       <target name="test"/>
       <target name="docs"/>
     </antcall>
   </target>
 
   <target name="test12">
-    <antcall target="clean"/>
     <antcall>
       <param name="java.runtime.target" value="12"/>
       <param name="build.main.javac" value="${javac12}"/>
       <param name="build.main.javadoc" value="${javadoc12}"/>
       <param name="build.main.javadoc.source" value="12"/>
+      <target name="clean"/>
       <target name="test"/>
       <target name="docs"/>
     </antcall>
   </target>
 
   <target name="test13">
-    <antcall target="clean"/>
     <antcall>
       <param name="java.runtime.target" value="13"/>
       <param name="build.main.javac" value="${javac13}"/>
       <param name="build.main.javadoc" value="${javadoc13}"/>
       <param name="build.main.javadoc.source" value="13"/>
+      <target name="clean"/>
       <target name="test"/>
       <target name="docs"/>
     </antcall>
   </target>
 
   <target name="test14">
-    <antcall target="clean"/>
     <antcall>
       <param name="java.runtime.target" value="14"/>
       <param name="build.main.javac" value="${javac14}"/>
       <param name="build.main.javadoc" value="${javadoc14}"/>
       <param name="build.main.javadoc.source" value="14"/>
+      <target name="clean"/>
       <target name="test"/>
       <target name="docs"/>
     </antcall>
   </target>
 
   <target name="test11-12">
-    <antcall target="clean"/>
     <antcall>
       <param name="java.runtime.target" value="12"/>
       <param name="build.main.javac" value="${javac11}"/>
       <param name="build.main.javadoc" value="${javadoc12}"/>
       <param name="build.main.javadoc.source" value="11"/>
+      <target name="clean"/>
       <target name="test"/>
       <target name="docs"/>
     </antcall>
   </target>
 
   <target name="test11-13">
-    <antcall target="clean"/>
     <antcall>
       <param name="java.runtime.target" value="13"/>
       <param name="build.main.javac" value="${javac11}"/>
       <param name="build.main.javadoc" value="${javadoc13}"/>
       <param name="build.main.javadoc.source" value="11"/>
+      <target name="clean"/>
       <target name="test"/>
       <target name="docs"/>
     </antcall>
   </target>
 
   <target name="test11-14">
-    <antcall target="clean"/>
     <antcall>
       <param name="java.runtime.target" value="14"/>
       <param name="build.main.javac" value="${javac11}"/>
       <param name="build.main.javadoc" value="${javadoc14}"/>
       <param name="build.main.javadoc.source" value="11"/>
+      <target name="clean"/>
       <target name="test"/>
       <target name="docs"/>
     </antcall>