--- jsr166/build.xml	2019/05/22 17:36:58	1.298
+++ jsr166/build.xml	2019/06/14 20:10:53	1.299
@@ -25,6 +25,7 @@
   $HOME/jdk/jdk11
   $HOME/jdk/jdk12
   $HOME/jdk/jdk13
+  $HOME/jdk/jdk14
   where each of the above is a JDK or a symlink to same, and
   $HOME/jdk/src/jdk8
   $HOME/jdk/src/jdk9
@@ -32,12 +33,13 @@
   $HOME/jdk/src/jdk11
   $HOME/jdk/src/jdk12
   $HOME/jdk/src/jdk13
+  $HOME/jdk/src/jdk14
   where each of the above is a complete JDK source tree
   (e.g. mercurial forest) or a symlink to same.
 
   Alternatively, define ant variables thus:
   ant -Djdk$N.home=... -Djdk$N.src.home=...
-  for $N in 8 .. 13 ...
+  for $N in 8 .. 14 ...
 
   As of 2016-03, the sources in src/main are for jdk9+ only.
 ------------------------------------------------------------------------------
@@ -141,6 +143,7 @@
   <defjdklocations v="11"/>
   <defjdklocations v="12"/>
   <defjdklocations v="13"/>
+  <defjdklocations v="14"/>
 
   <!-- Source locations -->
   <property name="src.dir"              location="${basedir}/src/main"/>
@@ -154,6 +157,7 @@
   <property name="jtreg11.src.dir"      location="${test.src.dir}/jtreg"/>
   <property name="jtreg12.src.dir"      location="${test.src.dir}/jtreg"/>
   <property name="jtreg13.src.dir"      location="${test.src.dir}/jtreg"/>
+  <property name="jtreg14.src.dir"      location="${test.src.dir}/jtreg"/>
   <property name="jtreg.src.dir"        location="${jtreg9.src.dir}"/>
   <property name="lib.dir"              location="${basedir}/lib"/>
   <property name="dist.dir"             location="${basedir}/dist"/>
@@ -208,6 +212,7 @@
   <!-- <property name="java11.docroot.url" value="http://download.java.net/java/jdk11/docs"/> -->
 <!--   <property name="java12.docroot.url" value="https://download.java.net/java/jdk12/docs"/> -->
   <property name="java13.docroot.url" value="https://download.java.net/java/early_access/jdk13/docs"/>
+  <property name="java14.docroot.url" value="https://download.java.net/java/early_access/jdk14/docs"/>
   <!-- Default jdk doc location (latest stable LTS release seems best) -->
   <property name="java.docroot.url"   value="${java11.docroot.url}"/>
 
@@ -221,6 +226,7 @@
   <property name="java11.api.url"     value="${java11.docroot.url}/api/"/>
   <property name="java12.api.url"     value="${java12.docroot.url}/api/"/>
   <property name="java13.api.url"     value="${java13.docroot.url}/api/"/>
+  <property name="java14.api.url"     value="${java14.docroot.url}/api/"/>
   <property name="java.api.url"       value="${java.docroot.url}/api/"/>
 
   <!-- Define the "jtreg" task -->
@@ -334,6 +340,7 @@
     </sequential>
   </macrodef>
 
+  <defjtregtests v="14"/>
   <defjtregtests v="13"/>
   <defjtregtests v="12"/>
   <defjtregtests v="11"/>
@@ -592,7 +599,7 @@
           description="Runs tck and jtreg tests for src/main"/>
 
   <target name="test-version-permutations"
-	  depends="test9, test10, test11, test12, test13, test9-11, test9-12, test9-13, clean, test, docs">
+	  depends="test9, test10, test11, test12, test13, test14, test9-11, test9-12, test9-13, test9-14, clean, test, docs">
   </target>
 
   <target name="test9">
@@ -655,6 +662,18 @@
     </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="test"/>
+      <target name="docs"/>
+    </antcall>
+  </target>
+
   <target name="test9-11">
     <antcall target="clean"/>
     <antcall>
@@ -688,6 +707,18 @@
       <param name="build.main.javadoc.source" value="9"/>
       <target name="test"/>
       <target name="docs"/>
+    </antcall>
+  </target>
+
+  <target name="test9-14">
+    <antcall target="clean"/>
+    <antcall>
+      <param name="java.runtime.target" value="14"/>
+      <param name="build.main.javac" value="${javac9}"/>
+      <param name="build.main.javadoc" value="${javadoc14}"/>
+      <param name="build.main.javadoc.source" value="9"/>
+      <target name="test"/>
+      <target name="docs"/>
     </antcall>
   </target>