/[cvs]/jsr166/build.xml
ViewVC logotype

Diff of /jsr166/build.xml

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.302 by jsr166, Sun Aug 18 18:55:55 2019 UTC revision 1.318 by jsr166, Wed Aug 12 14:13:43 2020 UTC
# Line 19  Line 19 
19    itself.  Because the JDK version matters and because different    itself.  Because the JDK version matters and because different
20    targets require different JDKs, we assume that users have created a    targets require different JDKs, we assume that users have created a
21    hierarchy containing:    hierarchy containing:
   $HOME/jdk/jdk8  
22    $HOME/jdk/jdk11    $HOME/jdk/jdk11
23    $HOME/jdk/jdk12    $HOME/jdk/jdk12
24    $HOME/jdk/jdk13    $HOME/jdk/jdk13
25    $HOME/jdk/jdk14    $HOME/jdk/jdk14
26      $HOME/jdk/jdk15
27      $HOME/jdk/jdk16
28    where each of the above is a JDK or a symlink to same, and    where each of the above is a JDK or a symlink to same, and
   $HOME/jdk/src/jdk8  
29    $HOME/jdk/src/jdk11    $HOME/jdk/src/jdk11
30    $HOME/jdk/src/jdk12    $HOME/jdk/src/jdk12
31    $HOME/jdk/src/jdk13    $HOME/jdk/src/jdk13
32    $HOME/jdk/src/jdk14    $HOME/jdk/src/jdk14
33    where each of the above is a complete JDK source tree    $HOME/jdk/src/jdk15
34    (e.g. mercurial forest) or a symlink to same.    $HOME/jdk/src/jdk16
35      where each of the above is a JDK source tree or a symlink to same.
36    
37    Alternatively, define ant variables thus:    Alternatively, define ant variables thus:
38    ant -Djdk$N.home=... -Djdk$N.src.home=...    ant -Djdk$N.home=... -Djdk$N.src.home=...
39    for $N in 8 .. 14 ...    for $N in 11 .. 16 ...
40    
41    As of 2016-03, the sources in src/main are for jdk9+ only.    As of 2016-03, the sources in src/main are for jdk9+ only.
42    As of 2019-08, the sources in src/main are for jdk11+ only.    As of 2019-08, the sources in src/main are for jdk11+ only.
43      As of 2019-10, compatibility support for jdk8 is dropped entirely.
44  ------------------------------------------------------------------------------  ------------------------------------------------------------------------------
45    </description>    </description>
46    
# Line 67  Line 69 
69    <property name="build.testcases.dir"         location="${build.dir}/testcases"/>    <property name="build.testcases.dir"         location="${build.dir}/testcases"/>
70    <property name="build.loops.dir"             location="${build.dir}/loops"/>    <property name="build.loops.dir"             location="${build.dir}/loops"/>
71    
   <property name="build.4jdk7.dir"             location="${build.dir}/jsr166-4jdk7"/>  
   <property name="build.4jdk7.classes.dir"     location="${build.4jdk7.dir}/classes"/>  
   <property name="build.4jdk7.tck.classes.dir" location="${build.4jdk7.dir}/tck-classes"/>  
   <property name="build.4jdk7.docs.dir"        location="${build.4jdk7.dir}/docs"/>  
   
   <property name="build.4jdk8.dir"             location="${build.dir}/jsr166-4jdk8"/>  
   <property name="build.4jdk8.classes.dir"     location="${build.4jdk8.dir}/classes"/>  
   <property name="build.4jdk8.tck.classes.dir" location="${build.4jdk8.dir}/tck-classes"/>  
   <property name="build.4jdk8.docs.dir"        location="${build.4jdk8.dir}/docs"/>  
   
   <property name="build.jsr166x.dir"           location="${build.dir}/jsr166x"/>  
   <property name="build.jsr166y.dir"           location="${build.dir}/jsr166y"/>  
   <property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>  
   <property name="build.extra166y.dir"         location="${build.dir}/extra166y"/>  
   
   <property name="build.jsr166x.classes.dir"   location="${build.jsr166x.dir}/classes"/>  
   <property name="build.jsr166y.classes.dir"   location="${build.jsr166y.dir}/classes"/>  
   <property name="build.jsr166e.classes.dir"   location="${build.jsr166e.dir}/classes"/>  
   <property name="build.extra166y.classes.dir" location="${build.extra166y.dir}/classes"/>  
   
72    <!-- JDK locations -->    <!-- JDK locations -->
73    <property name="jdks.home"  location="${user.home}/jdk"/>    <property name="jdks.home"  location="${user.home}/jdk"/>
74    
# Line 98  Line 80 
80      <property name="javac@{v}"        location="${jdk@{v}.home}/bin/javac"/>      <property name="javac@{v}"        location="${jdk@{v}.home}/bin/javac"/>
81      <property name="javadoc@{v}"      location="${jdk@{v}.home}/bin/javadoc"/>      <property name="javadoc@{v}"      location="${jdk@{v}.home}/bin/javadoc"/>
82      <property name="jdk@{v}.src.home" location="${jdks.home}/src/jdk@{v}"/>      <property name="jdk@{v}.src.home" location="${jdks.home}/src/jdk@{v}"/>
83      <local name="have.java.base"/>      <property name="jdk@{v}.src.dir"  location="${jdk@{v}.src.home}/jdk/src/java.base/share/classes"/>
     <available property="have.java.base"  
       file="${jdk@{v}.src.home}/jdk/src/java.base/share/classes" type="dir"/>  
     <property name="jdk@{v}.src.dir" location="${jdk@{v}.src.home}/jdk/src/java.base/share/classes"  
       if:set="have.java.base"/>  
     <property name="jdk@{v}.src.dir" location="${jdk@{v}.src.home}/jdk/src/share/classes"  
       unless:set="have.java.base"/>  
     <local name="modules"/>  
     <available property="modules" file="${jdk@{v}.home}/lib/modules" type="file"/>  
     <local name="boot.jar.dir"/>  
     <property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib" unless:set="modules"/>  
     <path id="bootclasspath@{v}" unless:set="modules">  
       <pathelement path="${boot.jar.dir}/resources.jar"/>  
       <pathelement path="${boot.jar.dir}/rt.jar"/>  
       <pathelement path="${boot.jar.dir}/jsse.jar"/>  
       <pathelement path="${boot.jar.dir}/jce.jar"/>  
       <pathelement path="${boot.jar.dir}/charsets.jar"/>  
     </path>  
     <property name="bootclasspath@{v}" value="${toString:bootclasspath@{v}}" unless:set="modules"/>  
84      </sequential>      </sequential>
85    </macrodef>    </macrodef>
86    
# Line 132  Line 96 
96      </sequential>      </sequential>
97    </macrodef>    </macrodef>
98    
   <defjdklocations v="8"/>  
99    <defjdklocations v="11"/>    <defjdklocations v="11"/>
100    <defjdklocations v="12"/>    <defjdklocations v="12"/>
101    <defjdklocations v="13"/>    <defjdklocations v="13"/>
102    <defjdklocations v="14"/>    <defjdklocations v="14"/>
103      <defjdklocations v="15"/>
104      <defjdklocations v="16"/>
105    
106    <!-- Source locations -->    <!-- Source locations -->
107    <property name="src.dir"              location="${basedir}/src/main"/>    <property name="src.dir"              location="${basedir}/src/main"/>
108    <property name="test.src.dir"         location="${basedir}/src/test"/>    <property name="test.src.dir"         location="${basedir}/src/test"/>
109    <property name="loops.src.dir"        location="${basedir}/src/loops"/>    <property name="loops.src.dir"        location="${basedir}/src/loops"/>
110    <property name="tck.src.dir"          location="${test.src.dir}/tck"/>    <property name="tck.src.dir"          location="${test.src.dir}/tck"/>
   <property name="jtreg8.src.dir"       location="${test.src.dir}/jtreg-jdk8"/>  
111    <property name="jtreg11.src.dir"      location="${test.src.dir}/jtreg"/>    <property name="jtreg11.src.dir"      location="${test.src.dir}/jtreg"/>
112    <property name="jtreg12.src.dir"      location="${test.src.dir}/jtreg"/>    <property name="jtreg12.src.dir"      location="${test.src.dir}/jtreg"/>
113    <property name="jtreg13.src.dir"      location="${test.src.dir}/jtreg"/>    <property name="jtreg13.src.dir"      location="${test.src.dir}/jtreg"/>
114    <property name="jtreg14.src.dir"      location="${test.src.dir}/jtreg"/>    <property name="jtreg14.src.dir"      location="${test.src.dir}/jtreg"/>
115      <property name="jtreg15.src.dir"      location="${test.src.dir}/jtreg"/>
116      <property name="jtreg16.src.dir"      location="${test.src.dir}/jtreg"/>
117    <property name="jtreg.src.dir"        location="${jtreg11.src.dir}"/>    <property name="jtreg.src.dir"        location="${jtreg11.src.dir}"/>
118    <property name="lib.dir"              location="${basedir}/lib"/>    <property name="lib.dir"              location="${basedir}/lib"/>
119    <property name="dist.dir"             location="${basedir}/dist"/>    <property name="dist.dir"             location="${basedir}/dist"/>
120    <property name="topsrc.dir"           location="${basedir}/src"/>    <property name="topsrc.dir"           location="${basedir}/src"/>
   <property name="4jdk7src.dir"         location="${topsrc.dir}/jdk7"/>  
   <property name="4jdk8src.dir"         location="${topsrc.dir}/jdk8"/>  
   <property name="jsr166xsrc.dir"       location="${topsrc.dir}/jsr166x"/>  
   <property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>  
   <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>  
   <property name="extra166ysrc.dir"     location="${topsrc.dir}/extra166y"/>  
121    
122    <!-- Javadoc locations -->    <!-- Javadoc locations -->
123    <property name="docs.dir"          location="${build.dir}/docs"/>    <property name="docs.dir"          location="${build.dir}/docs"/>
124    <property name="4jdk7docs.dir"     location="${build.4jdk7.dir}/docs"/>    <property name="dist.docs.dir"     location="${dist.dir}/docs"/>
   <property name="4jdk8docs.dir"     location="${build.4jdk8.dir}/docs"/>  
   <property name="jsr166xdocs.dir"   location="${build.jsr166x.dir}/docs"/>  
   <property name="jsr166ydocs.dir"   location="${build.jsr166y.dir}/docs"/>  
   <property name="jsr166edocs.dir"   location="${build.jsr166e.dir}/docs"/>  
   <property name="extra166ydocs.dir" location="${build.extra166y.dir}/docs"/>  
   
   <property name="dist.docs.dir"          location="${dist.dir}/docs"/>  
   <property name="dist.4jdk7docs.dir"     location="${dist.dir}/jsr166-4jdk7docs"/>  
   <property name="dist.4jdk8docs.dir"     location="${dist.dir}/jsr166-4jdk8docs"/>  
   <property name="dist.jsr166xdocs.dir"   location="${dist.dir}/jsr166xdocs"/>  
   <property name="dist.jsr166ydocs.dir"   location="${dist.dir}/jsr166ydocs"/>  
   <property name="dist.jsr166edocs.dir"   location="${dist.dir}/jsr166edocs"/>  
   <property name="dist.extra166ydocs.dir" location="${dist.dir}/extra166ydocs"/>  
125    
126    <!-- Jar locations -->    <!-- Jar locations -->
127    <property name="product.jar"      location="${build.dir}/jsr166.jar"/>    <property name="product.jar"      location="${build.dir}/jsr166.jar"/>
   <property name="4jdk7product.jar" location="${build.4jdk7.dir}/jsr166-4jdk7.jar"/>  
   <property name="4jdk8product.jar" location="${build.4jdk8.dir}/jsr166-4jdk8.jar"/>  
   <property name="jsr166x.jar"      location="${build.jsr166x.dir}/jsr166x.jar"/>  
   <property name="jsr166y.jar"      location="${build.jsr166y.dir}/jsr166y.jar"/>  
   <property name="jsr166e.jar"      location="${build.jsr166e.dir}/jsr166e.jar"/>  
   <property name="extra166y.jar"    location="${build.extra166y.dir}/extra166y.jar"/>  
128    <property name="junit.jar"        location="${lib.dir}/junit.jar"/>    <property name="junit.jar"        location="${lib.dir}/junit.jar"/>
129    
130    <!-- Canonical location of jdk docs root, to use with javadoc -Xdocrootparent flag -->    <!-- Canonical location of jdk docs root, to use with javadoc -Xdocrootparent flag -->
131    <!-- Switched to https: in 2017-10 - JDK-8190312 -->    <!-- Switched to https: in 2017-10 - JDK-8190312 -->
132    <property name="java5.docroot.url"  value="https://docs.oracle.com/javase/1.5.0/docs"/>    <!-- <property name="java5.docroot.url"  value="https://docs.oracle.com/javase/1.5.0/docs"/> -->
133    <property name="java6.docroot.url"  value="https://docs.oracle.com/javase/6/docs"/>    <!-- <property name="java6.docroot.url"  value="https://docs.oracle.com/javase/6/docs"/> -->
134    <property name="java7.docroot.url"  value="https://docs.oracle.com/javase/7/docs"/>    <!-- <property name="java7.docroot.url"  value="https://docs.oracle.com/javase/7/docs"/> -->
135    <property name="java8.docroot.url"  value="https://docs.oracle.com/javase/8/docs"/>    <!-- <property name="java8.docroot.url"  value="https://docs.oracle.com/javase/8/docs"/> -->
   <property name="java11.docroot.url" value="https://docs.oracle.com/en/java/javase/11/docs"/>  
   <property name="java12.docroot.url" value="https://docs.oracle.com/en/java/javase/12/docs"/>  
136    <!-- The location of jdk early access docs (RIP) -->    <!-- The location of jdk early access docs (RIP) -->
137    <!-- <property name="java11.docroot.url" value="http://download.java.net/java/jdk11/docs"/> -->    <!-- <property name="java11.docroot.url" value="http://download.java.net/java/jdk11/docs"/> -->
138  <!--   <property name="java12.docroot.url" value="https://download.java.net/java/jdk12/docs"/> -->    <!-- <property name="java12.docroot.url" value="https://download.java.net/java/jdk12/docs"/> -->
139    <property name="java13.docroot.url" value="https://download.java.net/java/early_access/jdk13/docs"/>    <!-- <property name="java13.docroot.url" value="https://download.java.net/java/early_access/jdk13/docs"/> -->
140    <property name="java14.docroot.url" value="https://download.java.net/java/early_access/jdk14/docs"/>    <property name="java11.docroot.url" value="https://docs.oracle.com/en/java/javase/11/docs"/>
141      <property name="java12.docroot.url" value="https://docs.oracle.com/en/java/javase/12/docs"/>
142      <property name="java13.docroot.url" value="https://docs.oracle.com/en/java/javase/13/docs"/>
143      <property name="java14.docroot.url" value="https://docs.oracle.com/en/java/javase/14/docs"/>
144      <property name="java15.docroot.url" value="https://download.java.net/java/early_access/jdk15/docs"/>
145      <property name="java16.docroot.url" value="https://download.java.net/java/early_access/jdk16/docs"/>
146    <!-- Default jdk doc location (latest stable LTS release seems best) -->    <!-- Default jdk doc location (latest stable LTS release seems best) -->
147    <property name="java.docroot.url"   value="${java11.docroot.url}"/>    <property name="java.docroot.url"   value="${java11.docroot.url}"/>
148    
149    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
   <property name="java8.api.url"      value="${java8.docroot.url}/api/"/>  
150    <property name="java11.api.url"     value="${java11.docroot.url}/api/"/>    <property name="java11.api.url"     value="${java11.docroot.url}/api/"/>
151    <property name="java12.api.url"     value="${java12.docroot.url}/api/"/>    <property name="java12.api.url"     value="${java12.docroot.url}/api/"/>
152    <property name="java13.api.url"     value="${java13.docroot.url}/api/"/>    <property name="java13.api.url"     value="${java13.docroot.url}/api/"/>
153    <property name="java14.api.url"     value="${java14.docroot.url}/api/"/>    <property name="java14.api.url"     value="${java14.docroot.url}/api/"/>
154      <property name="java15.api.url"     value="${java15.docroot.url}/api/"/>
155      <property name="java16.api.url"     value="${java15.docroot.url}/api/"/>
156    <property name="java.api.url"       value="${java.docroot.url}/api/"/>    <property name="java.api.url"       value="${java.docroot.url}/api/"/>
157    
158    <!-- Define the "jtreg" task -->    <!-- Define the "jtreg" task -->
# Line 215  Line 160 
160    <taskdef name="jtreg" classname="com.sun.javatest.regtest.Main$$Ant"    <taskdef name="jtreg" classname="com.sun.javatest.regtest.Main$$Ant"
161             classpath="${lib.dir}/jtreg.jar" />             classpath="${lib.dir}/jtreg.jar" />
162    
163    <!-- Tck options; see JSR166TestCase.java    <!-- Tck configuration options; see JSR166TestCase.java
164     To profile a single tck test class:     To profile a single tck test class:
165     ant -Djsr166.profileTests=true -Djsr166.profileThreshold=10 -Djsr166.tckTestClass=CompletableFutureTest tck     ant -Djsr166.profileTests=true -Djsr166.profileThreshold=10 -Djsr166.tckTestClass=CompletableFutureTest tck
166     To stress test a single tck test class:     To stress test a single tck test class:
# Line 238  Line 183 
183    
184      <sequential>      <sequential>
185    
     <local name="modules"/>  
     <condition property="modules">  
       <available file="${jdk@{compile-target}.home}/lib/modules" type="file"/>  
     </condition>  
   
     <local name="use-doclint"/>  
     <condition property="use-doclint">  
       <not> <equals arg1="@{target}" arg2="7"/> </not>  
     </condition>  
   
186      <mkdir dir="@{workdir}/tck-classes"/>      <mkdir dir="@{workdir}/tck-classes"/>
187    
188      <javac srcdir="@{tck.src.dir}"      <javac srcdir="@{tck.src.dir}"
# Line 267  Line 202 
202        <include name="*.java"/>        <include name="*.java"/>
203        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
204        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation,-try"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation,-try"/>
205        <compilerarg value="-Xdoclint:reference/private" if:set="use-doclint"/>        <compilerarg value="-Xdoclint:reference/private"/>
206        <compilerarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>        <compilerarg value="--patch-module=java.base=@{classes}"/>
       <compilerarg value="--patch-module=java.base=@{classes}" if:set="modules"/>  
207        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
208        <javac-elements/>        <javac-elements/>
209    
# Line 279  Line 213 
213            failonerror="true"            failonerror="true"
214            jvm="${java@{target}}"            jvm="${java@{target}}"
215            fork="true">            fork="true">
216          <jvmarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>          <jvmarg value="--patch-module=java.base=@{classes}"/>
217          <jvmarg value="--patch-module=java.base=@{classes}" if:set="modules"/>          <jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED"/>
218          <jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED" if:set="modules"/>          <jvmarg value="--add-opens=java.base/java.util=ALL-UNNAMED"/>
219          <jvmarg value="--add-opens=java.base/java.util=ALL-UNNAMED" if:set="modules"/>          <jvmarg value="--add-opens=java.base/java.util.concurrent=ALL-UNNAMED"/>
220          <jvmarg value="--add-opens=java.base/java.util.concurrent=ALL-UNNAMED" if:set="modules"/>          <jvmarg value="--add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED"/>
221          <jvmarg value="--add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED" if:set="modules"/>          <jvmarg value="--add-opens=java.base/java.util.concurrent.locks=ALL-UNNAMED"/>
222          <jvmarg value="--add-opens=java.base/java.util.concurrent.locks=ALL-UNNAMED" if:set="modules"/>          <jvmarg line="@{jvmflags}"/>
223          <jvmarg line="@{jvmflags}"/>          <!-- ant -Dvmoptions="-Xmx8m" -Djsr166.tckTestClass=CompletableFutureTest tck -->
224          <!-- ant -Dvmoptions="-Xmx8m" -Djsr166.tckTestClass=CompletableFutureTest tck -->          <jvmarg line="${vmoptions}" if:set="vmoptions"/>
225          <jvmarg line="${vmoptions}" if:set="vmoptions"/>  
226            <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
227          <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->          <syspropertyset id="system-properties-used-by-tck">
228          <syspropertyset id="system-properties-used-by-tck">            <propertyref prefix="java.util.concurrent.ForkJoinPool"/>
229            <propertyref prefix="java.util.concurrent.ForkJoinPool"/>            <propertyref prefix="jsr166."/>
230            <propertyref prefix="jsr166."/>            <propertyref name="test.timeout.factor"/>
231            <propertyref name="test.timeout.factor"/>          </syspropertyset>
232          </syspropertyset>  
233            <classpath>
234          <classpath>            <pathelement location="${junit.jar}"/>
235            <pathelement location="${junit.jar}"/>            <pathelement location="@{workdir}/tck-classes"/>
236            <pathelement location="@{workdir}/tck-classes"/>          </classpath>
         </classpath>  
237      </java>      </java>
238    
239      </sequential>      </sequential>
# Line 321  Line 254 
254      </sequential>      </sequential>
255    </macrodef>    </macrodef>
256    
257      <defjtregtests v="16"/>
258      <defjtregtests v="15"/>
259    <defjtregtests v="14"/>    <defjtregtests v="14"/>
260    <defjtregtests v="13"/>    <defjtregtests v="13"/>
261    <defjtregtests v="12"/>    <defjtregtests v="12"/>
262    <defjtregtests v="11"/>    <defjtregtests v="11"/>
   <defjtregtests v="8"/>  
263    
264    <!-- ant -Djtreg.flags=-timeoutFactor:4 -->    <!-- ant -Djtreg.flags=-timeoutFactor:4 -->
265    <property name="jtreg.flags" value=""/>    <property name="jtreg.flags" value=""/>
# Line 344  Line 278 
278      <!-- ant -Djtreg.verbose=time,fail,error jtreg -->      <!-- ant -Djtreg.verbose=time,fail,error jtreg -->
279      <property name="jtreg.verbose" value="nopass,fail,error"/>      <property name="jtreg.verbose" value="nopass,fail,error"/>
280    
     <local name="modules"/>  
     <condition property="modules">  
       <available file="${jdk@{target}.home}/lib/modules" type="file"/>  
     </condition>  
   
281      <delete dir="@{workdir}/JTwork"   quiet="true"/>      <delete dir="@{workdir}/JTwork"   quiet="true"/>
282      <jtreg dir="${jtreg@{target}.src.dir}"      <jtreg dir="${jtreg@{target}.src.dir}"
283             jdk="${jdk@{target}.home}"             jdk="${jdk@{target}.home}"
284             workDir="@{workdir}/JTwork">             workDir="@{workdir}/JTwork">
285        <patternset refid="jdk@{target}.jtreg.tests"/>        <patternset refid="jdk@{target}.jtreg.tests"/>
286        <arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>        <arg value="-javacoptions:--patch-module=java.base=@{classes}"/>
287        <arg value="-javacoptions:--patch-module=java.base=@{classes}" if:set="modules"/>        <arg value="-vmoptions:--patch-module=java.base=@{classes}"/>
288        <arg value="-vmoptions:--patch-module=java.base=@{classes}" if:set="modules"/>        <arg value="-vmoptions:${vmoptions}" if:set="vmoptions"/>
289        <arg value="-agentvm"/>        <arg value="-agentvm"/>
290        <arg value="-noreport"/>        <arg value="-noreport"/>
291        <arg value="-verbose:@{verbose}"/>        <arg value="-verbose:@{verbose}"/>
# Line 399  Line 328 
328    <property name="build.main.javadoc.source" value="${java.runtime.target}"/>    <property name="build.main.javadoc.source" value="${java.runtime.target}"/>
329    
330    <target name="dists"    <target name="dists"
331            depends="dist, 4jdk8dist"            depends="dist"
332            description="Builds all public jars and docs"/>            description="Builds all public jars and docs"/>
           <!-- no longer supported: 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist -->  
333    
334    <target name="compile"    <target name="compile"
335            depends="configure-compiler"            depends="configure-compiler"
# Line 431  Line 359 
359  <!--   Xlint:-removal for jdk12 Unsafe Object -> Reference renaming -->  <!--   Xlint:-removal for jdk12 Unsafe Object -> Reference renaming -->
360        <compilerarg value="-Xlint:all,-removal"/>        <compilerarg value="-Xlint:all,-removal"/>
361        <compilerarg line="--doclint-format html5"/>        <compilerarg line="--doclint-format html5"/>
362        <compilerarg value="-Xdoclint:all/protected,reference/private"/>  <!--  Temporarily disable doclint for private elements, due to -->
363    <!--  https://bugs.openjdk.java.net/browse/JDK-8214571 -->
364    <!--  which is expected to be fixed in openjdk 11.0.8 -->
365    <!--  <compilerarg value="-Xdoclint:all/protected,reference/private"/> -->
366          <compilerarg value="-Xdoclint:all/protected"/>
367        <compilerarg value="-Xdoclint/package:java.util.*"/>        <compilerarg value="-Xdoclint/package:java.util.*"/>
368        <compilerarg value="-Werror"/>        <compilerarg value="-Werror"/>
369        <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>        <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
# Line 459  Line 391 
391    <target name="docs"    <target name="docs"
392            description="Builds javadocs for src/main to dist dir">            description="Builds javadocs for src/main to dist dir">
393    
394      <delete dir="${docs.dir}"/>      <delete dir="${docs.dir}" quiet="true"/>
395      <mkdir dir="${docs.dir}"/>      <mkdir dir="${docs.dir}"/>
396    
397        <!-- old school frames via docs/index.html?overview-summary.html -->
398        <!-- dash-dash-frames no longer a supported option in jdk13+ -->
399        <local name="use-frames"/>
400        <condition property="use-frames">
401          <equals arg1="${build.main.javadoc}" arg2="${javadoc12}"/>
402        </condition>
403    
404      <!-- the packagenames="none" hack below prevents scanning the -->      <!-- the packagenames="none" hack below prevents scanning the -->
405      <!-- sourcepath for packages -->      <!-- sourcepath for packages -->
406    
# Line 481  Line 420 
420               executable="${build.main.javadoc}">               executable="${build.main.javadoc}">
421  <!-- TODO: JDK-8214571 failonerror = "true" -->  <!-- TODO: JDK-8214571 failonerror = "true" -->
422        <fileset dir="${src.dir}" defaultexcludes="yes">        <fileset dir="${src.dir}" defaultexcludes="yes">
423          <include name="**/*.java"/>          <include name="java/**/*.java"/>
424        </fileset>        </fileset>
425        <arg line="-Xdocrootparent ${java.docroot.url}"/>        <arg line="-Xdocrootparent ${java.docroot.url}"/>
426        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
427          <arg value="-quiet"/>
428        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
429        <arg value="-html5"/>        <arg value="-html5"/>
430          <arg value="-Xdoclint:all,-missing"/>
431        <arg value="--patch-module=java.base=${src.dir}"/>        <arg value="--patch-module=java.base=${src.dir}"/>
432  <!-- old school frames via docs/index.html?overview-summary.html -->        <arg value="--frames" if:set="use-frames"/>
 <!-- TODO: - -frames no longer a supported option in jdk13+ -->  
       <arg value="--frames"/>  
433        <arg value="--override-methods=summary"/>        <arg value="--override-methods=summary"/>
434        <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>        <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
435        <arg value="-tag"/> <arg value="implSpec:a:Implementation Requirements:"/>        <arg value="-tag"/> <arg value="implSpec:a:Implementation Requirements:"/>
# Line 532  Line 471 
471    </target>    </target>
472    
473    <target name="tck"    <target name="tck"
474            depends="jar"            depends="jar"
475            description="Runs tck tests for src/main directly">            description="Runs tck tests for src/main directly">
476    
477      <run-tck-tests      <run-tck-tests
# Line 567  Line 506 
506    </target>    </target>
507    
508    <target name="jtreg"    <target name="jtreg"
509            depends="jar"            depends="jar"
510            description="Runs jtreg tests for src/main using the jtreg ant task">            description="Runs jtreg tests for src/main using the jtreg ant task">
511      <run-jtreg-tests      <run-jtreg-tests
512         target="${java.runtime.target}"         target="${java.runtime.target}"
# Line 580  Line 519 
519            description="Runs tck and jtreg tests for src/main"/>            description="Runs tck and jtreg tests for src/main"/>
520    
521    <target name="test-version-permutations"    <target name="test-version-permutations"
522            depends="test11, test12, test13, test14, test11-12, test11-13, test11-14, clean, test, docs">            depends="test11, test12, test13, test14, test15, test16,
523    </target>            test11-12, test11-13, test11-14, test11-15, test11-16,
524              clean, test, docs"
525    <!-- jdk9 is unsupported as of 2019-08 -->            description="Runs tck and jtreg tests for various build-time and runtime java versions"/>
 <!--   <target name="test9"> -->  
 <!--     <antcall target="clean"/> -->  
 <!--     <antcall> -->  
 <!--       <param name="java.runtime.target" value="9"/> -->  
 <!--       <param name="build.main.javac" value="${javac9}"/> -->  
 <!--       <param name="build.main.javadoc" value="${javadoc12}"/> -->  
 <!--       <param name="build.main.javadoc.source" value="9"/> -->  
 <!--       <target name="test"/> -->  
 <!--       <target name="docs"/> -->  
 <!--     </antcall> -->  
 <!--   </target> -->  
   
   <!-- jdk10 is unsupported as of 2019-08 -->  
 <!--   <target name="test10"> -->  
 <!--     <antcall target="clean"/> -->  
 <!--     <antcall> -->  
 <!--       <param name="java.runtime.target" value="10"/> -->  
 <!--       <param name="build.main.javac" value="${javac10}"/> -->  
 <!--       <param name="build.main.javadoc" value="${javadoc12}"/> -->  
 <!--       <param name="build.main.javadoc.source" value="10"/> -->  
 <!--       <target name="test"/> -->  
 <!--       <target name="docs"/> -->  
 <!--     </antcall> -->  
 <!--   </target> -->  
526    
527    <target name="test11">    <target name="test11">
     <antcall target="clean"/>  
528      <antcall>      <antcall>
529        <param name="java.runtime.target" value="11"/>        <param name="java.runtime.target" value="11"/>
530        <param name="build.main.javac" value="${javac11}"/>        <param name="build.main.javac" value="${javac11}"/>
531        <param name="build.main.javadoc" value="${javadoc12}"/>        <param name="build.main.javadoc" value="${javadoc12}"/>
532        <param name="build.main.javadoc.source" value="11"/>        <param name="build.main.javadoc.source" value="11"/>
533          <target name="clean"/>
534        <target name="test"/>        <target name="test"/>
535        <target name="docs"/>        <target name="docs"/>
536      </antcall>      </antcall>
537    </target>    </target>
538    
539    <target name="test12">    <target name="test12">
     <antcall target="clean"/>  
540      <antcall>      <antcall>
541        <param name="java.runtime.target" value="12"/>        <param name="java.runtime.target" value="12"/>
542        <param name="build.main.javac" value="${javac12}"/>        <param name="build.main.javac" value="${javac12}"/>
543        <param name="build.main.javadoc" value="${javadoc12}"/>        <param name="build.main.javadoc" value="${javadoc12}"/>
544        <param name="build.main.javadoc.source" value="12"/>        <param name="build.main.javadoc.source" value="12"/>
545          <target name="clean"/>
546        <target name="test"/>        <target name="test"/>
547        <target name="docs"/>        <target name="docs"/>
548      </antcall>      </antcall>
549    </target>    </target>
550    
551    <target name="test13">    <target name="test13">
     <antcall target="clean"/>  
552      <antcall>      <antcall>
553        <param name="java.runtime.target" value="13"/>        <param name="java.runtime.target" value="13"/>
554        <param name="build.main.javac" value="${javac13}"/>        <param name="build.main.javac" value="${javac13}"/>
555        <param name="build.main.javadoc" value="${javadoc13}"/>        <param name="build.main.javadoc" value="${javadoc13}"/>
556        <param name="build.main.javadoc.source" value="13"/>        <param name="build.main.javadoc.source" value="13"/>
557          <target name="clean"/>
558        <target name="test"/>        <target name="test"/>
559        <target name="docs"/>        <target name="docs"/>
560      </antcall>      </antcall>
561    </target>    </target>
562    
563    <target name="test14">    <target name="test14">
     <antcall target="clean"/>  
564      <antcall>      <antcall>
565        <param name="java.runtime.target" value="14"/>        <param name="java.runtime.target" value="14"/>
566        <param name="build.main.javac" value="${javac14}"/>        <param name="build.main.javac" value="${javac14}"/>
567        <param name="build.main.javadoc" value="${javadoc14}"/>        <param name="build.main.javadoc" value="${javadoc14}"/>
568        <param name="build.main.javadoc.source" value="14"/>        <param name="build.main.javadoc.source" value="14"/>
569          <target name="clean"/>
570          <target name="test"/>
571          <target name="docs"/>
572        </antcall>
573      </target>
574    
575      <target name="test15">
576        <antcall>
577          <param name="java.runtime.target" value="15"/>
578          <param name="build.main.javac" value="${javac15}"/>
579          <param name="build.main.javadoc" value="${javadoc15}"/>
580          <param name="build.main.javadoc.source" value="15"/>
581          <target name="clean"/>
582          <target name="test"/>
583          <target name="docs"/>
584        </antcall>
585      </target>
586    
587      <target name="test16">
588        <antcall>
589          <param name="java.runtime.target" value="16"/>
590          <param name="build.main.javac" value="${javac16}"/>
591          <param name="build.main.javadoc" value="${javadoc16}"/>
592          <param name="build.main.javadoc.source" value="16"/>
593          <target name="clean"/>
594        <target name="test"/>        <target name="test"/>
595        <target name="docs"/>        <target name="docs"/>
596      </antcall>      </antcall>
597    </target>    </target>
598    
599    <target name="test11-12">    <target name="test11-12">
     <antcall target="clean"/>  
600      <antcall>      <antcall>
601        <param name="java.runtime.target" value="12"/>        <param name="java.runtime.target" value="12"/>
602        <param name="build.main.javac" value="${javac11}"/>        <param name="build.main.javac" value="${javac11}"/>
603        <param name="build.main.javadoc" value="${javadoc12}"/>        <param name="build.main.javadoc" value="${javadoc12}"/>
604        <param name="build.main.javadoc.source" value="11"/>        <param name="build.main.javadoc.source" value="11"/>
605          <target name="clean"/>
606        <target name="test"/>        <target name="test"/>
607        <target name="docs"/>        <target name="docs"/>
608      </antcall>      </antcall>
609    </target>    </target>
610    
611    <target name="test11-13">    <target name="test11-13">
     <antcall target="clean"/>  
612      <antcall>      <antcall>
613        <param name="java.runtime.target" value="13"/>        <param name="java.runtime.target" value="13"/>
614        <param name="build.main.javac" value="${javac11}"/>        <param name="build.main.javac" value="${javac11}"/>
615        <param name="build.main.javadoc" value="${javadoc13}"/>        <param name="build.main.javadoc" value="${javadoc13}"/>
616        <param name="build.main.javadoc.source" value="11"/>        <param name="build.main.javadoc.source" value="11"/>
617          <target name="clean"/>
618        <target name="test"/>        <target name="test"/>
619        <target name="docs"/>        <target name="docs"/>
620      </antcall>      </antcall>
621    </target>    </target>
622    
623    <target name="test11-14">    <target name="test11-14">
     <antcall target="clean"/>  
624      <antcall>      <antcall>
625        <param name="java.runtime.target" value="14"/>        <param name="java.runtime.target" value="14"/>
626        <param name="build.main.javac" value="${javac11}"/>        <param name="build.main.javac" value="${javac11}"/>
627        <param name="build.main.javadoc" value="${javadoc14}"/>        <param name="build.main.javadoc" value="${javadoc14}"/>
628        <param name="build.main.javadoc.source" value="11"/>        <param name="build.main.javadoc.source" value="11"/>
629          <target name="clean"/>
630          <target name="test"/>
631          <target name="docs"/>
632        </antcall>
633      </target>
634    
635      <target name="test11-15">
636        <antcall>
637          <param name="java.runtime.target" value="15"/>
638          <param name="build.main.javac" value="${javac11}"/>
639          <param name="build.main.javadoc" value="${javadoc15}"/>
640          <param name="build.main.javadoc.source" value="11"/>
641          <target name="clean"/>
642        <target name="test"/>        <target name="test"/>
643        <target name="docs"/>        <target name="docs"/>
644      </antcall>      </antcall>
645    </target>    </target>
646    
647      <target name="test11-16">
648        <antcall>
649          <param name="java.runtime.target" value="16"/>
650          <param name="build.main.javac" value="${javac11}"/>
651          <param name="build.main.javadoc" value="${javadoc16}"/>
652          <param name="build.main.javadoc.source" value="11"/>
653          <target name="clean"/>
654          <target name="test"/>
655          <target name="docs"/>
656        </antcall>
657      </target>
658    
659      <target name="docs16">
660        <antcall>
661          <param name="java.runtime.target" value="16"/>
662          <param name="build.main.javac" value="${javac16}"/>
663          <param name="build.main.javadoc" value="${javadoc16}"/>
664          <param name="build.main.javadoc.source" value="16"/>
665          <target name="clean"/>
666          <target name="docs"/>
667        </antcall>
668      </target>
669    
670    
671    <target name="configure-compiler">    <target name="configure-compiler">
672      <fail message="ant version too old">      <fail message="ant version too old">
# Line 732  Line 706 
706    
707        <include name="*.java"/>        <include name="*.java"/>
708        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
709        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
710        <compilerarg value="-Xbootclasspath/p:${product.jar}"/>        <compilerarg value="--patch-module=java.base=${src.dir}"/>
       <compilerarg line="${build.args}"/>  
     </javac>  
   </target>  
   
   
   <!-- jsr166 4jdk8 -->  
   
   <target name="4jdk8compile"  
           depends="configure-compiler"  
           description="Compiles src/jdk8 sources, targeting jdk8">  
   
     <mkdir dir="${build.4jdk8.classes.dir}"/>  
   
     <javac srcdir="${4jdk8src.dir}"  
            destdir="${build.4jdk8.classes.dir}"  
            debug="${build.debug}"  
            debuglevel="${build.debuglevel}"  
            deprecation="${build.deprecation}"  
            source="8"  
            target="8"  
            classpath=""  
            bootclasspath="${bootclasspath8}"  
            includeAntRuntime="false"  
            includeJavaRuntime="false"  
            encoding="ASCII"  
            executable="${javac8}"  
            fork="true">  
       <include name="**/*.java"/>  
       <compilerarg value="-Xprefer:source"/>  
       <compilerarg value="-XDignore.symbol.file=true"/>  
       <compilerarg value="-Xlint:all"/>  
       <compilerarg value="-Werror"/>  
       <compilerarg line="${build.args}"/>  
     </javac>  
   </target>  
   
   <target name="4jdk8doclint"  
           depends="configure-compiler"  
           description="Finds doclint warnings">  
   
     <mkdir dir="${build.4jdk8.classes.dir}"/>  
   
     <javac srcdir="${4jdk8src.dir}"  
            destdir="${build.4jdk8.classes.dir}"  
            debug="${build.debug}"  
            debuglevel="${build.debuglevel}"  
            deprecation="${build.deprecation}"  
            source="8"  
            target="8"  
            classpath=""  
            bootclasspath="${bootclasspath8}"  
            includeAntRuntime="false"  
            includeJavaRuntime="false"  
            encoding="ASCII"  
            executable="${javac8}"  
            fork="true">  
       <include name="**/*.java"/>  
       <compilerarg value="-Xprefer:source"/>  
       <compilerarg value="-XDignore.symbol.file=true"/>  
       <compilerarg value="-Xlint:all"/>  
       <compilerarg value="-Xdoclint:all/protected,reference/private"/>  
711        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
712      </javac>      </javac>
713    </target>    </target>
714    
715    
716    <target name="4jdk8jar"    <!-- old branches no longer maintained.  build support deleted -->
717            depends="4jdk8compile"    <!-- jsr166 4jdk8; (no longer maintained as of 2019-10) -->
           description="Builds library jar from compiled sources">  
   
     <jar destfile="${4jdk8product.jar}">  
       <fileset dir="${build.4jdk8.classes.dir}"/>  
       <manifest>  
         <attribute name="Built-By" value="${user.name}"/>  
         <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>  
       </manifest>  
     </jar>  
   </target>  
   
   
   <target name="4jdk8-tck"  
           depends="4jdk8jar"  
           description="Runs tck tests for jsr166-4jdk8 directly">  
   
     <run-tck-tests  
       target="8"  
       workdir="${build.4jdk8.dir}"  
       classes="${4jdk8product.jar}">  
       <javac-elements>  
         <!-- JDK9+ test classes -->  
         <exclude name="*9Test.java"/>  
         <exclude name="*10Test.java"/>  
         <compilerarg value="-Werror"/>  
       </javac-elements>  
     </run-tck-tests>  
   </target>  
   
   
   <target name="4jdk8-jtreg"  
           depends="4jdk8jar"  
           description="Runs jtreg tests for jsr166-4jdk8 using the jtreg ant task">  
     <run-jtreg-tests  
        target="8"  
        workdir="${build.4jdk8.dir}"  
        classes="${4jdk8product.jar}"/>  
   </target>  
   
   
   <target name="4jdk8-test"  
           depends="4jdk8-tck, 4jdk8-jtreg"  
           description="Runs tck and jtreg tests for jsr166-4jdk8"/>  
   
   
   <target name="4jdk8docs"  
           description="Builds javadocs for src/jdk8 to dist dir">  
   
     <delete dir="${4jdk8docs.dir}"/>  
     <mkdir dir="${4jdk8docs.dir}"/>  
   
     <javadoc destdir="${4jdk8docs.dir}"  
              packagenames="none"  
              link="${java8.api.url}"  
              overview="${4jdk8src.dir}/intro.html"  
              access="${build.javadoc.access}"  
              sourcepath="${4jdk8src.dir}:${jdk8.src.dir}"  
              classpath=""  
              source="8"  
              executable="${javadoc8}"  
              failonerror = "true">  
       <fileset dir="${4jdk8src.dir}" defaultexcludes="yes">  
         <include name="**/*.java"/>  
       </fileset>  
       <arg line="-Xdocrootparent ${java8.docroot.url}"/>  
       <arg value="-XDignore.symbol.file=true"/>  
       <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>  
       <arg value="-tag"/> <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>  
       <arg value="-tag"/> <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>  
 <!-- @apiNote tag currently unused -->  
 <!--  <arg value="-tag"/> <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/> -->  
     </javadoc>  
   </target>  
   
   
   <target name="4jdk8dist"  
           depends="4jdk8dist-jar, 4jdk8dist-docs"  
           description="Puts all distributable products in single hierarchy"/>  
   
   
   <target name="4jdk8clean"  
           description="Removes all 4jdk8 build products">  
     <delete dir="${build.4jdk8.dir}"/>  
   </target>  
   
   
   <target name="4jdk8dist-jar"  
           depends="4jdk8clean, 4jdk8jar">  
     <copy file="${4jdk8product.jar}" todir="${dist.dir}"/>  
   </target>  
   
   
   <target name="4jdk8dist-docs"  
           depends="4jdk8clean, 4jdk8docs">  
     <mirror-dir src="${4jdk8docs.dir}" dst="${dist.4jdk8docs.dir}"/>  
   </target>  
   
   
718    <!-- jsr166 4jdk7 (no longer maintained) -->    <!-- jsr166 4jdk7 (no longer maintained) -->
   
   <target name="4jdk7compile" depends="configure-compiler">  
     <mkdir dir="${build.4jdk7.classes.dir}"/>  
   
     <javac srcdir="${4jdk7src.dir}"  
            destdir="${build.4jdk7.classes.dir}"  
            debug="${build.debug}"  
            debuglevel="${build.debuglevel}"  
            deprecation="${build.deprecation}"  
            source="6"  
            target="6"  
            classpath=""  
            bootclasspath="${bootclasspath6}"  
            includeAntRuntime="false"  
            includeJavaRuntime="false"  
            encoding="ASCII"  
            executable="${javac7}"  
            fork="true">  
   
       <include name="**/*.java"/>  
       <compilerarg value="-Xprefer:source"/>  
       <compilerarg value="-XDignore.symbol.file=true"/>  
       <compilerarg value="-Xlint:all"/>  
       <compilerarg value="-Werror"/>  
       <compilerarg line="${build.args}"/>  
     </javac>  
   </target>  
   
   <target name="4jdk7doclint" depends="configure-compiler">  
     <mkdir dir="${build.4jdk7.classes.dir}"/>  
   
     <javac srcdir="${4jdk7src.dir}"  
            destdir="${build.4jdk7.classes.dir}"  
            debug="${build.debug}"  
            debuglevel="${build.debuglevel}"  
            deprecation="${build.deprecation}"  
            source="6"  
            target="6"  
            classpath=""  
            bootclasspath="${bootclasspath6}"  
            includeAntRuntime="false"  
            includeJavaRuntime="false"  
            encoding="ASCII"  
            executable="${javac8}"  
            fork="true">  
   
       <include name="**/*.java"/>  
       <compilerarg value="-Xprefer:source"/>  
       <compilerarg value="-XDignore.symbol.file=true"/>  
       <compilerarg value="-Xlint:all"/>  
       <compilerarg value="-Xdoclint:all/protected"/>  
       <compilerarg line="${build.args}"/>  
     </javac>  
   </target>  
   
   <target name="4jdk7jar" depends="4jdk7compile">  
     <jar destfile="${4jdk7product.jar}">  
       <fileset dir="${build.4jdk7.classes.dir}"/>  
       <manifest>  
         <attribute name="Built-By" value="${user.name}"/>  
         <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>  
       </manifest>  
     </jar>  
   </target>  
   
   <target name="4jdk7-tck" depends="4jdk7jar">  
     <run-tck-tests  
       target="7"  
       workdir="${build.4jdk7.dir}"  
       classes="${4jdk7product.jar}">  
       <javac-elements>  
         <!-- JDK8+ test classes -->  
         <exclude name="*8Test.java"/>  
         <exclude name="*9Test.java"/>  
         <exclude name="*10Test.java"/>  
         <exclude name="DoubleAccumulatorTest.java"/>  
         <exclude name="DoubleAdderTest.java"/>  
         <exclude name="LongAccumulatorTest.java"/>  
         <exclude name="LongAdderTest.java"/>  
         <exclude name="CompletableFutureTest.java"/>  
         <exclude name="SplittableRandomTest.java"/>  
         <exclude name="StampedLockTest.java"/>  
         <exclude name="SubmissionPublisherTest.java"/>  
         <compilerarg value="-Werror"/>  
       </javac-elements>  
     </run-tck-tests>  
   </target>  
   
   <!-- Runs tck tests for jsr166-4jdk7 via junit task (dead experiment) -->  
   <target name="4jdk7-tck-junit" depends="4jdk7compile">  
   
     <junit printsummary="true"  
            showoutput="true"  
            errorProperty="junit.failed"  
            failureProperty="junit.failed"  
            includeantruntime="true"  
            jvm="${java7}"  
            fork="true">  
   
       <jvmarg value="-Xbootclasspath/p:${4jdk7product.jar}"/>  
       <jvmarg value="-server"/>  
   
       <classpath>  
         <pathelement location="${junit.jar}"/>  
         <pathelement location="${build.4jdk7.tck.classes.dir}"/>  
       </classpath>  
   
       <formatter type="brief"/>  
   
       <test name="${jsr166.tckTestClass}" haltonfailure="no">  
       </test>  
     </junit>  
   </target>  
   
   <target name="4jdk7-jtreg" depends="4jdk7jar">  
     <run-jtreg-tests  
        target="7"  
        workdir="${build.4jdk7.dir}"  
        classes="${4jdk7product.jar}"/>  
   </target>  
   
   <target name="4jdk7-test" depends="4jdk7-tck, 4jdk7-jtreg"/>  
   
   <target name="4jdk7docs">  
     <delete dir="${4jdk7docs.dir}"/>  
     <mkdir dir="${4jdk7docs.dir}"/>  
   
     <javadoc destdir="${4jdk7docs.dir}"  
              packagenames="none"  
              link="${java7.api.url}"  
              overview="${4jdk7src.dir}/intro.html"  
              access="${build.javadoc.access}"  
              sourcepath="${4jdk7src.dir}:${jdk7.src.dir}"  
              classpath=""  
              executable="${javadoc7}"  
              failonerror = "true">  
       <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">  
         <include name="**/*.java"/>  
       </fileset>  
       <arg line="-Xdocrootparent ${java7.docroot.url}"/>  
       <arg value="-XDignore.symbol.file=true"/>  
     </javadoc>  
   </target>  
   
   <target name="4jdk7dist" depends="4jdk7dist-jar, 4jdk7dist-docs"/>  
   
   <target name="4jdk7clean">  
     <delete dir="${build.4jdk7.dir}"/>  
   </target>  
   
   <target name="4jdk7dist-jar" depends="4jdk7clean, 4jdk7jar">  
     <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>  
   </target>  
   
   <target name="4jdk7dist-docs" depends="4jdk7clean, 4jdk7docs">  
     <mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>  
   </target>  
   
   
719    <!-- jsr166x (no longer maintained) -->    <!-- jsr166x (no longer maintained) -->
   
   <target name="jsr166xcompile" depends="configure-compiler">  
     <mkdir dir="${build.jsr166x.classes.dir}"/>  
   
     <javac srcdir="${topsrc.dir}"  
            destdir="${build.jsr166x.classes.dir}"  
            debug="${build.debug}"  
            debuglevel="${build.debuglevel}"  
            deprecation="${build.deprecation}"  
            classpath=""  
            bootclasspath="${bootclasspath6}"  
            source="5"  
            target="5"  
            includeAntRuntime="false"  
            includeJavaRuntime="false"  
            encoding="ASCII"  
            executable="${javac7}"  
            fork="true">  
       <include name="jsr166x/**/*.java"/>  
       <compilerarg value="-XDignore.symbol.file=true"/>  
       <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>  
       <compilerarg value="-Werror"/>  
       <compilerarg line="${build.args}"/>  
     </javac>  
   </target>  
   
   <target name="jsr166xjar" depends="jsr166xcompile">  
     <jar destfile="${jsr166x.jar}">  
       <fileset dir="${build.jsr166x.classes.dir}"/>  
       <manifest>  
         <attribute name="Built-By" value="${user.name}"/>  
         <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>  
       </manifest>  
     </jar>  
   </target>  
   
   <target name="jsr166xdocs">  
     <delete dir="${jsr166xdocs.dir}"/>  
     <mkdir dir="${jsr166xdocs.dir}"/>  
   
     <javadoc destdir="${jsr166xdocs.dir}"  
              packagenames="jsr166x.*"  
              link="${java.api.url}"  
              access="${build.javadoc.access}"  
              sourcepath="${topsrc.dir}:${jdk6.src.dir}"  
              bootclasspath="${bootclasspath6}"  
              source="5"  
              executable="${javadoc7}"  
              failonerror = "true">  
       <arg line="-Xdocrootparent ${java.docroot.url}"/>  
       <arg value="-XDignore.symbol.file=true"/>  
     </javadoc>  
   </target>  
   
   <target name="jsr166xdist" depends="jsr166xdist-jar, jsr166xdist-docs"/>  
   
   <target name="jsr166xclean">  
     <delete dir="${build.jsr166x.dir}"/>  
   </target>  
   
   <target name="jsr166xdist-jar" depends="jsr166xclean, jsr166xjar">  
     <copy file="${jsr166x.jar}" todir="${dist.dir}"/>  
   </target>  
   
   <target name="jsr166xdist-docs" depends="jsr166xclean, jsr166xdocs">  
     <mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>  
   </target>  
   
   
720    <!-- jsr166y (no longer maintained) -->    <!-- jsr166y (no longer maintained) -->
   
   <target name="jsr166ycompile" depends="configure-compiler">  
     <mkdir dir="${build.jsr166y.classes.dir}"/>  
   
     <javac srcdir="${topsrc.dir}"  
            destdir="${build.jsr166y.classes.dir}"  
            debug="${build.debug}"  
            debuglevel="${build.debuglevel}"  
            deprecation="${build.deprecation}"  
            source="6"  
            target="6"  
            classpath=""  
            bootclasspath="${bootclasspath6}"  
            includeAntRuntime="false"  
            includeJavaRuntime="false"  
            encoding="ASCII"  
            executable="${javac7}"  
            fork="true">  
   
       <include name="jsr166y/**/*.java"/>  
       <compilerarg value="-XDignore.symbol.file=true"/>  
       <compilerarg value="-Xlint:all"/>  
       <compilerarg value="-Werror"/>  
       <compilerarg line="${build.args}"/>  
     </javac>  
   </target>  
   
   <target name="jsr166yjar" depends="jsr166ycompile">  
     <jar destfile="${jsr166y.jar}" index="true">  
       <fileset dir="${build.jsr166y.classes.dir}"/>  
       <manifest>  
         <attribute name="Built-By" value="${user.name}"/>  
         <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>  
       </manifest>  
     </jar>  
   </target>  
   
   <target name="jsr166ydocs">  
     <delete dir="${jsr166ydocs.dir}"/>  
     <mkdir dir="${jsr166ydocs.dir}"/>  
   
     <javadoc destdir="${jsr166ydocs.dir}"  
              packagenames="jsr166y.*"  
              link="${java.api.url}"  
              access="${build.javadoc.access}"  
              sourcepath="${topsrc.dir}:${jdk6.src.dir}"  
              bootclasspath="${bootclasspath6}"  
              source="6"  
              executable="${javadoc7}"  
              failonerror = "true">  
       <arg line="-Xdocrootparent ${java.docroot.url}"/>  
       <arg value="-XDignore.symbol.file=true"/>  
     </javadoc>  
   </target>  
   
   <target name="jsr166ydist" depends="jsr166ydist-jar, jsr166ydist-docs"/>  
   
   <target name="jsr166yclean">  
     <delete dir="${build.jsr166y.dir}"/>  
   </target>  
   
   <target name="jsr166ydist-jar" depends="jsr166yclean, jsr166yjar">  
     <copy file="${jsr166y.jar}" todir="${dist.dir}"/>  
   </target>  
   
   <target name="jsr166ydist-docs" depends="jsr166yclean, jsr166ydocs">  
     <mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>  
   </target>  
   
   
721    <!-- extra166y (no longer maintained) -->    <!-- extra166y (no longer maintained) -->
   
   <target name="extra166ycompile" depends="configure-compiler, jsr166yjar">  
     <mkdir dir="${build.extra166y.classes.dir}"/>  
   
     <javac srcdir="${topsrc.dir}"  
            destdir="${build.extra166y.classes.dir}"  
            debug="${build.debug}"  
            debuglevel="${build.debuglevel}"  
            deprecation="${build.deprecation}"  
            bootclasspath="@{jsr166y.jar}:${bootclasspath6}"  
            classpath=""  
            source="6"  
            target="6"  
            includeAntRuntime="false"  
            includeJavaRuntime="false"  
            encoding="ASCII"  
            executable="${javac7}"  
            fork="true">  
   
       <include name="extra166y/**/*.java"/>  
       <compilerarg value="-XDignore.symbol.file=true"/>  
       <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>  
       <compilerarg value="-Werror"/>  
       <compilerarg line="${build.args}"/>  
     </javac>  
   </target>  
   
   <target name="extra166yjar" depends="extra166ycompile">  
     <jar destfile="${extra166y.jar}" index="true">  
       <fileset dir="${build.extra166y.classes.dir}"/>  
       <manifest>  
         <attribute name="Built-By" value="${user.name}"/>  
         <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>  
       </manifest>  
     </jar>  
   </target>  
   
   <target name="extra166ydocs">  
     <delete dir="${extra166ydocs.dir}"/>  
     <mkdir dir="${extra166ydocs.dir}"/>  
   
     <javadoc destdir="${extra166ydocs.dir}"  
              packagenames="extra166y.*"  
              link="${java.api.url}"  
              access="${build.javadoc.access}"  
              sourcepath="${topsrc.dir}:${jdk6.src.dir}"  
              bootclasspath="${bootclasspath6}"  
              source="6"  
              executable="${javadoc7}">  
       <arg line="-Xdocrootparent ${java.docroot.url}"/>  
       <arg value="-XDignore.symbol.file=true"/>  
     </javadoc>  
   </target>  
   
   <target name="extra166ydist" depends="extra166ydist-jar, extra166ydist-docs"/>  
   
   <target name="extra166yclean">  
     <delete dir="${build.extra166y.dir}"/>  
   </target>  
   
   <target name="extra166ydist-jar" depends="extra166yclean, extra166yjar">  
     <copy file="${extra166y.jar}" todir="${dist.dir}"/>  
   </target>  
   
   <target name="extra166ydist-docs" depends="extra166yclean, extra166ydocs">  
     <mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>  
   </target>  
   
   
722    <!-- jsr166e (no longer maintained) -->    <!-- jsr166e (no longer maintained) -->
723    
   <property name="build.jsr166e.java.version" value="6"/>  
   <property name="build.jsr166e.javac" value="${javac6}"/>  
   
   <target name="jsr166ecompile" depends="configure-compiler">  
     <mkdir dir="${build.jsr166e.classes.dir}"/>  
   
     <javac srcdir="${topsrc.dir}"  
            destdir="${build.jsr166e.classes.dir}"  
            debug="${build.debug}"  
            debuglevel="${build.debuglevel}"  
            deprecation="${build.deprecation}"  
            source="${build.jsr166e.java.version}"  
            target="${build.jsr166e.java.version}"  
            classpath=""  
            includeAntRuntime="false"  
            includeJavaRuntime="false"  
            executable="${build.jsr166e.javac}"  
            fork="true">  
   
       <include name="jsr166e/**/*.java"/>  
       <compilerarg value="-XDignore.symbol.file=true"/>  
       <compilerarg value="-Xlint:all"/>  
       <compilerarg value="-Werror"/>  
       <compilerarg line="${build.args}"/>  
     </javac>  
   </target>  
   
   <target name="jsr166edoclint">  
     <mkdir dir="${build.jsr166e.classes.dir}"/>  
   
     <javac srcdir="${topsrc.dir}"  
            destdir="${build.jsr166e.classes.dir}"  
            debug="${build.debug}"  
            debuglevel="${build.debuglevel}"  
            deprecation="${build.deprecation}"  
            source="${build.jsr166e.java.version}"  
            target="${build.jsr166e.java.version}"  
            classpath=""  
            bootclasspath="${bootclasspath6}"  
            includeAntRuntime="false"  
            includeJavaRuntime="false"  
            executable="${javac8}"  
            fork="true">  
   
       <include name="jsr166e/**/*.java"/>  
       <compilerarg value="-XDignore.symbol.file=true"/>  
       <compilerarg value="-Xlint:all"/>  
       <compilerarg value="-Werror"/>  
       <compilerarg value="-Xdoclint:all/protected"/>  
     </javac>  
   </target>  
   
   <target name="jsr166ejar" depends="jsr166ecompile">  
     <jar destfile="${jsr166e.jar}" index="true">  
       <fileset dir="${build.jsr166e.classes.dir}"/>  
       <manifest>  
         <attribute name="Built-By" value="${user.name}"/>  
         <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>  
       </manifest>  
     </jar>  
   </target>  
   
   <target name="jsr166edocs">  
     <delete dir="${jsr166edocs.dir}"/>  
     <mkdir dir="${jsr166edocs.dir}"/>  
   
     <javadoc destdir="${jsr166edocs.dir}"  
              packagenames="jsr166e.*"  
              link="${java.api.url}"  
              access="${build.javadoc.access}"  
              sourcepath="${topsrc.dir}:${jdk6.src.dir}"  
              source="${build.jsr166e.java.version}"  
              executable="${javadoc7}"  
              failonerror = "true">  
       <arg line="-Xdocrootparent ${java.docroot.url}"/>  
       <arg value="-XDignore.symbol.file=true"/>  
     </javadoc>  
   </target>  
   
   <target name="jsr166e-tck-one-java-version" depends="jsr166ejar">  
     <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>  
     <run-tck-tests  
       tck.src.dir="${test.src.dir}/tck-jsr166e"  
       target="${build.jsr166e.java.version}"  
       workdir="${build.jsr166e.dir}"  
       classes="${jsr166e.jar}"/>  
   </target>  
   
   <target name="jsr166e-tck">  
   
 <!--     <antcall target="clean"/> -->  
 <!--     <antcall target="jsr166e-tck-one-java-version"> -->  
 <!--       <param name="build.jsr166e.java.version" value="8"/> -->  
 <!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->  
 <!--     </antcall> -->  
   
     <antcall target="clean"/>  
     <antcall target="jsr166e-tck-one-java-version">  
       <param name="build.jsr166e.java.version" value="7"/>  
       <param name="build.jsr166e.javac" value="${javac7}"/>  
     </antcall>  
   
     <antcall target="clean"/>  
     <antcall target="jsr166e-tck-one-java-version">  
       <param name="build.jsr166e.java.version" value="6"/>  
       <param name="build.jsr166e.javac" value="${javac6}"/>  
     </antcall>  
   </target>  
   
   <target name="jsr166e-test" depends="jsr166e-tck"/>  
   
   <target name="jsr166edist" depends="jsr166edist-jar, jsr166edist-docs"/>  
   
   <target name="jsr166eclean">  
     <delete dir="${build.jsr166e.dir}"/>  
   </target>  
   
   <target name="jsr166edist-jar"  
           depends="jsr166eclean, jsr166ejar">  
     <copy file="${jsr166e.jar}" todir="${dist.dir}"/>  
   </target>  
   
   <target name="jsr166edist-docs" depends="jsr166eclean, jsr166edocs">  
     <mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>  
   </target>  
   
   
724  <!-- Find buglets that can be detected by static build tools -->  <!-- Find buglets that can be detected by static build tools -->
725    
726  <!--   <target name="lint"> -->  <!--   <target name="lint"> -->
# Line 1423  Line 744 
744    https://github.com/google/error-prone/issues/1143    https://github.com/google/error-prone/issues/1143
745  =================================================================== -->  =================================================================== -->
746    <path id="errorprone.processorpath.path">    <path id="errorprone.processorpath.path">
747      <pathelement location="${lib.dir}/error_prone_core-2.3.2-with-dependencies.jar"/>      <pathelement location="${lib.dir}/error_prone_core-2.3.4-with-dependencies.jar"/>
748      <pathelement location="${lib.dir}/dataflow-2.5.7.jar"/>      <pathelement location="${lib.dir}/dataflow-2.5.7.jar"/>
749      <pathelement location="${lib.dir}/javacutil-2.5.7.jar"/>      <pathelement location="${lib.dir}/javacutil-2.5.7.jar"/>
750      <pathelement location="${lib.dir}/jFormatString-3.0.0.jar"/>      <pathelement location="${lib.dir}/jFormatString-3.0.0.jar"/>
751        <pathelement location="${lib.dir}/caffeine-2.8.0.jar"/>
752    </path>    </path>
753    <property name="errorprone.processorpath" refid="errorprone.processorpath.path" />    <property name="errorprone.processorpath" refid="errorprone.processorpath.path" />
754    <property name="errorprone.jsr166.user.flags" value=""/>    <property name="errorprone.jsr166.user.flags" value=""/>
755    <property name="errorprone.jsr166.flags"    <property name="errorprone.jsr166.flags"
756              value="-Xep:HashtableContains:OFF              value="-Xep:HashtableContains:OFF
757                       -Xep:PreferJavaTimeOverload:OFF
758                     -Xep:JdkObsolete:OFF                     -Xep:JdkObsolete:OFF
759                     -Xep:MissingOverride:OFF                     -Xep:MissingOverride:OFF
760                     -Xep:MissingFail:OFF                     -Xep:MissingFail:OFF

Legend:
Removed from v.1.302  
changed lines
  Added in v.1.318

dl@cs.oswego.edu
ViewVC Help
Powered by ViewVC 1.1.27