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

Diff of /jsr166/build.xml

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

revision 1.263 by jsr166, Tue Jan 23 06:09:53 2018 UTC revision 1.314 by jsr166, Wed May 6 16:51:05 2020 UTC
# Line 1  Line 1 
1  <project name="jsr166" default="usage"  <project name="jsr166" default="usage"
2    xmlns:if="ant:if" xmlns:unless="ant:unless"    xmlns:if="ant:if"
3      xmlns:unless="ant:unless"
4    xmlns:ivy="antlib:org.apache.ivy.ant">    xmlns:ivy="antlib:org.apache.ivy.ant">
5    
6    <description>    <description>
# Line 18  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  
   $HOME/jdk/jdk9  
   $HOME/jdk/jdk10  
22    $HOME/jdk/jdk11    $HOME/jdk/jdk11
23      $HOME/jdk/jdk12
24      $HOME/jdk/jdk13
25      $HOME/jdk/jdk14
26      $HOME/jdk/jdk15
27    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  
   $HOME/jdk/src/jdk9  
   $HOME/jdk/src/jdk10  
28    $HOME/jdk/src/jdk11    $HOME/jdk/src/jdk11
29    where each of the above is a complete JDK source tree    $HOME/jdk/src/jdk12
30    (e.g. mercurial forest) or a symlink to same.    $HOME/jdk/src/jdk13
31      $HOME/jdk/src/jdk14
32      $HOME/jdk/src/jdk15
33      where each of the above is a JDK source tree or a symlink to same.
34    
35    Alternatively, define ant variables thus:    Alternatively, define ant variables thus:
36    ant -Djdk$N.home=... -Djdk$N.src.home=...    ant -Djdk$N.home=... -Djdk$N.src.home=...
37    for $N in 8 9 10 ...    for $N in 11 .. 15 ...
38    
39    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.
40      As of 2019-08, the sources in src/main are for jdk11+ only.
41      As of 2019-10, compatibility support for jdk8 is dropped entirely.
42  ------------------------------------------------------------------------------  ------------------------------------------------------------------------------
43    </description>    </description>
44    
# Line 52  Line 56 
56    
57    
58    <!-- Compilation options -->    <!-- Compilation options -->
   <property name="build.sourcelevel"    value="6"/>  
59    <property name="build.debug"          value="true"/>    <property name="build.debug"          value="true"/>
60    <property name="build.debuglevel"     value="source,lines,vars"/>    <property name="build.debuglevel"     value="source,lines,vars"/>
61    <property name="build.deprecation"    value="false"/>    <property name="build.deprecation"    value="false"/>
# Line 64  Line 67 
67    <property name="build.testcases.dir"         location="${build.dir}/testcases"/>    <property name="build.testcases.dir"         location="${build.dir}/testcases"/>
68    <property name="build.loops.dir"             location="${build.dir}/loops"/>    <property name="build.loops.dir"             location="${build.dir}/loops"/>
69    
   <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"/>  
   
70    <!-- JDK locations -->    <!-- JDK locations -->
71    <property name="jdks.home"  location="${user.home}/jdk"/>    <property name="jdks.home"  location="${user.home}/jdk"/>
72    
# Line 95  Line 78 
78      <property name="javac@{v}"        location="${jdk@{v}.home}/bin/javac"/>      <property name="javac@{v}"        location="${jdk@{v}.home}/bin/javac"/>
79      <property name="javadoc@{v}"      location="${jdk@{v}.home}/bin/javadoc"/>      <property name="javadoc@{v}"      location="${jdk@{v}.home}/bin/javadoc"/>
80      <property name="jdk@{v}.src.home" location="${jdks.home}/src/jdk@{v}"/>      <property name="jdk@{v}.src.home" location="${jdks.home}/src/jdk@{v}"/>
81      <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}/jmods" type="dir"/>  
     <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"/>  
82      </sequential>      </sequential>
83    </macrodef>    </macrodef>
84    
# Line 129  Line 94 
94      </sequential>      </sequential>
95    </macrodef>    </macrodef>
96    
   <defjdklocations v="6"/>  
   <defjdklocations v="7"/>  
   <defjdklocations v="8"/>  
   <defjdklocations v="9"/>  
   <defjdklocations v="10"/>  
97    <defjdklocations v="11"/>    <defjdklocations v="11"/>
98      <defjdklocations v="12"/>
99      <defjdklocations v="13"/>
100      <defjdklocations v="14"/>
101      <defjdklocations v="15"/>
102    
103    <!-- Source locations -->    <!-- Source locations -->
104    <property name="src.dir"              location="${basedir}/src/main"/>    <property name="src.dir"              location="${basedir}/src/main"/>
105    <property name="test.src.dir"         location="${basedir}/src/test"/>    <property name="test.src.dir"         location="${basedir}/src/test"/>
106    <property name="loops.src.dir"        location="${basedir}/src/loops"/>    <property name="loops.src.dir"        location="${basedir}/src/loops"/>
107    <property name="tck.src.dir"          location="${test.src.dir}/tck"/>    <property name="tck.src.dir"          location="${test.src.dir}/tck"/>
   <property name="jtreg7.src.dir"       location="${test.src.dir}/jtreg-jdk7"/>  
   <property name="jtreg8.src.dir"       location="${test.src.dir}/jtreg-jdk8"/>  
   <property name="jtreg9.src.dir"       location="${test.src.dir}/jtreg"/>  
   <property name="jtreg10.src.dir"      location="${test.src.dir}/jtreg"/>  
108    <property name="jtreg11.src.dir"      location="${test.src.dir}/jtreg"/>    <property name="jtreg11.src.dir"      location="${test.src.dir}/jtreg"/>
109    <property name="jtreg.src.dir"        location="${jtreg9.src.dir}"/>    <property name="jtreg12.src.dir"      location="${test.src.dir}/jtreg"/>
110      <property name="jtreg13.src.dir"      location="${test.src.dir}/jtreg"/>
111      <property name="jtreg14.src.dir"      location="${test.src.dir}/jtreg"/>
112      <property name="jtreg15.src.dir"      location="${test.src.dir}/jtreg"/>
113      <property name="jtreg.src.dir"        location="${jtreg11.src.dir}"/>
114    <property name="lib.dir"              location="${basedir}/lib"/>    <property name="lib.dir"              location="${basedir}/lib"/>
115    <property name="dist.dir"             location="${basedir}/dist"/>    <property name="dist.dir"             location="${basedir}/dist"/>
116    <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"/>  
117    
118    <!-- Javadoc locations -->    <!-- Javadoc locations -->
119    <property name="docs.dir"          location="${build.dir}/docs"/>    <property name="docs.dir"          location="${build.dir}/docs"/>
120    <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"/>  
121    
122    <!-- Jar locations -->    <!-- Jar locations -->
123    <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"/>  
124    <property name="junit.jar"        location="${lib.dir}/junit.jar"/>    <property name="junit.jar"        location="${lib.dir}/junit.jar"/>
125    
126    <!-- Canonical location of jdk docs root, to use with javadoc -Xdocrootparent flag -->    <!-- Canonical location of jdk docs root, to use with javadoc -Xdocrootparent flag -->
127    <!-- Switched to https: in 2017-10 - JDK-8190312 -->    <!-- Switched to https: in 2017-10 - JDK-8190312 -->
128    <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"/> -->
129    <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"/> -->
130    <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"/> -->
131    <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"/> -->
132    <property name="java9.docroot.url"  value="https://docs.oracle.com/javase/9/docs"/>    <!-- The location of jdk early access docs (RIP) -->
133    <!-- The location of jdk9 early access docs (RIP) -->    <!-- <property name="java11.docroot.url" value="http://download.java.net/java/jdk11/docs"/> -->
134    <!-- <property name="java9.docroot.url" value="http://download.java.net/java/jdk9/docs"/> -->    <!-- <property name="java12.docroot.url" value="https://download.java.net/java/jdk12/docs"/> -->
135    <!-- Default jdk doc location (latest stable release seems best) -->    <!-- <property name="java13.docroot.url" value="https://download.java.net/java/early_access/jdk13/docs"/> -->
136    <property name="java10.docroot.url" value="http://download.java.net/java/jdk10/docs"/>    <property name="java11.docroot.url" value="https://docs.oracle.com/en/java/javase/11/docs"/>
137    <property name="java11.docroot.url" value="http://download.java.net/java/jdk11/docs"/>    <property name="java12.docroot.url" value="https://docs.oracle.com/en/java/javase/12/docs"/>
138    <property name="java.docroot.url"   value="${java9.docroot.url}"/>    <property name="java13.docroot.url" value="https://docs.oracle.com/en/java/javase/13/docs"/>
139      <property name="java14.docroot.url" value="https://docs.oracle.com/en/java/javase/14/docs"/>
140      <property name="java15.docroot.url" value="https://download.java.net/java/early_access/jdk15/docs"/>
141      <!-- Default jdk doc location (latest stable LTS release seems best) -->
142      <property name="java.docroot.url"   value="${java11.docroot.url}"/>
143    
144    <!-- 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="java5.api.url"      value="${java5.docroot.url}/api/"/>  
   <property name="java6.api.url"      value="${java6.docroot.url}/api/"/>  
   <property name="java7.api.url"      value="${java7.docroot.url}/api/"/>  
   <property name="java8.api.url"      value="${java8.docroot.url}/api/"/>  
   <property name="java9.api.url"      value="${java9.docroot.url}/api/"/>  
   <property name="java10.api.url"     value="${java10.docroot.url}/api/"/>  
145    <property name="java11.api.url"     value="${java11.docroot.url}/api/"/>    <property name="java11.api.url"     value="${java11.docroot.url}/api/"/>
146      <property name="java12.api.url"     value="${java12.docroot.url}/api/"/>
147      <property name="java13.api.url"     value="${java13.docroot.url}/api/"/>
148      <property name="java14.api.url"     value="${java14.docroot.url}/api/"/>
149      <property name="java15.api.url"     value="${java15.docroot.url}/api/"/>
150    <property name="java.api.url"       value="${java.docroot.url}/api/"/>    <property name="java.api.url"       value="${java.docroot.url}/api/"/>
151    
152    <!-- Define the "jtreg" task -->    <!-- Define the "jtreg" task -->
# Line 213  Line 154 
154    <taskdef name="jtreg" classname="com.sun.javatest.regtest.Main$$Ant"    <taskdef name="jtreg" classname="com.sun.javatest.regtest.Main$$Ant"
155             classpath="${lib.dir}/jtreg.jar" />             classpath="${lib.dir}/jtreg.jar" />
156    
157    <!-- Tck options; see JSR166TestCase.java    <!-- Tck configuration options; see JSR166TestCase.java
158     To profile a single tck test class:     To profile a single tck test class:
159     ant -Djsr166.profileTests=true -Djsr166.profileThreshold=10 -Djsr166.tckTestClass=CompletableFutureTest tck     ant -Djsr166.profileTests=true -Djsr166.profileThreshold=10 -Djsr166.tckTestClass=CompletableFutureTest tck
160     To stress test a single tck test class:     To stress test a single tck test class:
# Line 236  Line 177 
177    
178      <sequential>      <sequential>
179    
     <local name="modules"/>  
     <condition property="modules">  
       <available file="${jdk@{compile-target}.home}/jmods" type="dir"/>  
     </condition>  
   
     <local name="use-doclint"/>  
     <condition property="use-doclint">  
       <not> <equals arg1="@{target}" arg2="7"/> </not>  
     </condition>  
   
180      <mkdir dir="@{workdir}/tck-classes"/>      <mkdir dir="@{workdir}/tck-classes"/>
181    
182      <javac srcdir="@{tck.src.dir}"      <javac srcdir="@{tck.src.dir}"
# Line 265  Line 196 
196        <include name="*.java"/>        <include name="*.java"/>
197        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
198        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation,-try"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation,-try"/>
199        <compilerarg value="-Xdoclint:reference/private" if:set="use-doclint"/>        <compilerarg value="-Xdoclint:reference/private"/>
200        <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"/>  
201        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
202        <javac-elements/>        <javac-elements/>
203    
# Line 277  Line 207 
207            failonerror="true"            failonerror="true"
208            jvm="${java@{target}}"            jvm="${java@{target}}"
209            fork="true">            fork="true">
210          <jvmarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>          <jvmarg value="--patch-module=java.base=@{classes}"/>
211          <jvmarg value="--patch-module=java.base=@{classes}" if:set="modules"/>          <jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED"/>
212          <jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED" if:set="modules"/>          <jvmarg value="--add-opens=java.base/java.util=ALL-UNNAMED"/>
213          <jvmarg value="--add-opens=java.base/java.util=ALL-UNNAMED" if:set="modules"/>          <jvmarg value="--add-opens=java.base/java.util.concurrent=ALL-UNNAMED"/>
214          <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"/>
215          <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"/>
216          <jvmarg value="--add-opens=java.base/java.util.concurrent.locks=ALL-UNNAMED" if:set="modules"/>          <jvmarg line="@{jvmflags}"/>
217          <jvmarg line="@{jvmflags}"/>          <!-- ant -Dvmoptions="-Xmx8m" -Djsr166.tckTestClass=CompletableFutureTest tck -->
218          <!-- ant -Dvmoptions="-Xmx8m" -Djsr166.tckTestClass=CompletableFutureTest tck -->          <jvmarg line="${vmoptions}" if:set="vmoptions"/>
219          <jvmarg line="${vmoptions}" if:set="vmoptions"/>  
220            <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
221          <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->          <syspropertyset id="system-properties-used-by-tck">
222          <syspropertyset id="system-properties-used-by-tck">            <propertyref prefix="java.util.concurrent.ForkJoinPool"/>
223            <propertyref prefix="java.util.concurrent.ForkJoinPool"/>            <propertyref prefix="jsr166."/>
224            <propertyref prefix="jsr166."/>            <propertyref name="test.timeout.factor"/>
225            <propertyref name="test.timeout.factor"/>          </syspropertyset>
226          </syspropertyset>  
227            <classpath>
228          <classpath>            <pathelement location="${junit.jar}"/>
229            <pathelement location="${junit.jar}"/>            <pathelement location="@{workdir}/tck-classes"/>
230            <pathelement location="@{workdir}/tck-classes"/>          </classpath>
         </classpath>  
231      </java>      </java>
232    
233      </sequential>      </sequential>
234    </macrodef>    </macrodef>
235    
236    <!-- Define jtreg test sets for different jdk versions -->    <!-- Define jtreg test sets for different jdk versions -->
237    <fileset dir="${jtreg11.src.dir}">    <!-- ant -Djtreg.test.pattern="**/ConcurrentHashMap/" -->
238      <patternset id="jdk11.jtreg.tests">    <!-- ant -Djtreg.test.pattern="**/ToArray.java" -->
239        <include name="**/*.java"/>    <property name="jtreg.test.pattern" value="**/*.java"/>
240      </patternset>    <macrodef name="defjtregtests">
241    </fileset>      <attribute name="v"/>
242        <sequential>
243    <fileset dir="${jtreg10.src.dir}">        <fileset dir="${jtreg@{v}.src.dir}">
244      <patternset id="jdk10.jtreg.tests">          <patternset id="jdk@{v}.jtreg.tests">
245        <include name="**/*.java"/>            <include name="${jtreg.test.pattern}"/>
246      </patternset>          </patternset>
247    </fileset>        </fileset>
248        </sequential>
249    <fileset dir="${jtreg9.src.dir}">    </macrodef>
     <patternset id="jdk9.jtreg.tests">  
       <include name="**/*.java"/>  
     </patternset>  
   </fileset>  
   
   <fileset dir="${jtreg8.src.dir}">  
     <patternset id="jdk8.jtreg.tests">  
       <include name="**/*.java"/>  
     </patternset>  
   </fileset>  
250    
251    <fileset dir="${jtreg7.src.dir}">    <defjtregtests v="15"/>
252      <patternset id="jdk7.jtreg.tests">    <defjtregtests v="14"/>
253        <include name="**/*.java"/>    <defjtregtests v="13"/>
254      </patternset>    <defjtregtests v="12"/>
255    </fileset>    <defjtregtests v="11"/>
256    
257    <!-- ant -Djtreg.flags=-timeoutFactor:4 -->    <!-- ant -Djtreg.flags=-timeoutFactor:4 -->
258    <property name="jtreg.flags" value=""/>    <property name="jtreg.flags" value=""/>
259    
260    <macrodef name="run-jtreg-tests">    <macrodef name="run-jtreg-tests">
261      <!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->      <!-- ant -Djtreg11.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
262      <attribute name="target"/>      <attribute name="target"/>
263      <attribute name="workdir"/>      <attribute name="workdir"/>
264      <attribute name="classes"/>      <attribute name="classes"/>
# Line 352  Line 271 
271      <!-- ant -Djtreg.verbose=time,fail,error jtreg -->      <!-- ant -Djtreg.verbose=time,fail,error jtreg -->
272      <property name="jtreg.verbose" value="nopass,fail,error"/>      <property name="jtreg.verbose" value="nopass,fail,error"/>
273    
     <local name="modules"/>  
     <condition property="modules">  
       <available file="${jdk@{target}.home}/jmods" type="dir"/>  
     </condition>  
   
274      <delete dir="@{workdir}/JTwork"   quiet="true"/>      <delete dir="@{workdir}/JTwork"   quiet="true"/>
275      <jtreg dir="${jtreg@{target}.src.dir}"      <jtreg dir="${jtreg@{target}.src.dir}"
276             jdk="${jdk@{target}.home}"             jdk="${jdk@{target}.home}"
277             workDir="@{workdir}/JTwork">             workDir="@{workdir}/JTwork">
278        <patternset refid="jdk@{target}.jtreg.tests"/>        <patternset refid="jdk@{target}.jtreg.tests"/>
279        <arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>        <arg value="-javacoptions:--patch-module=java.base=@{classes}"/>
280        <arg value="-javacoptions:--patch-module=java.base=@{classes}" if:set="modules"/>        <arg value="-vmoptions:--patch-module=java.base=@{classes}"/>
281        <arg value="-vmoptions:--patch-module=java.base=@{classes}" if:set="modules"/>        <arg value="-vmoptions:${vmoptions}" if:set="vmoptions"/>
282        <arg value="-agentvm"/>        <arg value="-agentvm"/>
283        <arg value="-noreport"/>        <arg value="-noreport"/>
284        <arg value="-verbose:@{verbose}"/>        <arg value="-verbose:@{verbose}"/>
# Line 384  Line 298 
298    </path>    </path>
299    
300    <!-- Support @jls tag, used in jdk8+ javadoc -->    <!-- Support @jls tag, used in jdk8+ javadoc -->
301      <!-- TODO: switch to @jls taglet, as supported by jdk14+ javadoc -->
302    <property name="javadoc.jls.cite" value="The Java&amp;trade; Language Specification"/>    <property name="javadoc.jls.cite" value="The Java&amp;trade; Language Specification"/>
303    <property name="javadoc.jls.option" value="jls:a:See &lt;cite&gt;${javadoc.jls.cite}&lt;/cite&gt;:"/>    <property name="javadoc.jls.option" value="jls:a:See &lt;cite&gt;${javadoc.jls.cite}&lt;/cite&gt;:"/>
304    
305    <!-- Main targets -->    <!-- Main targets -->
306    
307    <property name="build.main.java.version" value="9"/>    <!-- Default values: may seem strange ... -->
308    <!-- Workaround "no nested properties in ant" -->    <!-- At runtime, target latest LTS, i.e. jdk11 -->
309    <macrodef name="define-build-main-properties">    <!-- But at build time, target jdk9, for maximal binary portability -->
310      <attribute name="v"/>    <!-- ButButBut as of 2019-08, target jdk11 at build time -->
311      <sequential>    <!-- Use javadoc12 (but -link to jdk11 api docs!), to get:
312        <property name="build.main.java"    value="${java@{v}}"/>      o override-methods=summary
313        <property name="build.main.javac"   value="${javac@{v}}"/>      o {@systemProperty ...}
314        <property name="build.main.javadoc" value="${javadoc@{v}}"/>      o 8211194: issues linking to external documentation (was: missing package-list for JDK10 / JDK11 documentation)
315      </sequential>      o 8202628: javadoc generates bad links in TestModules.java
316    </macrodef>      -->
317    <define-build-main-properties v="${build.main.java.version}"/>    <property name="java.runtime.target" value="11"/>
318      <property name="build.main.java" value="${java11}"/>
319      <property name="build.main.javac" value="${javac11}"/>
320      <property name="build.main.javadoc" value="${javadoc12}"/>
321      <property name="build.main.javadoc.source" value="${java.runtime.target}"/>
322    
323    <target name="dists"    <target name="dists"
324            depends="dist, 4jdk8dist"            depends="dist"
325            description="Builds all public jars and docs"/>            description="Builds all public jars and docs"/>
           <!--  
               depends="dist, 4jdk8dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"  
           -->  
326    
327    <target name="compile"    <target name="compile"
328            depends="configure-compiler"            depends="configure-compiler"
# Line 433  Line 349 
349        <compilerarg value="--patch-module=java.base=${src.dir}"/>        <compilerarg value="--patch-module=java.base=${src.dir}"/>
350        <compilerarg value="-Xprefer:source"/>        <compilerarg value="-Xprefer:source"/>
351        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
352        <compilerarg value="-Xlint:all"/>  <!--   Xlint:-removal for jdk12 Unsafe Object -> Reference renaming -->
353          <compilerarg value="-Xlint:all,-removal"/>
354        <compilerarg line="--doclint-format html5"/>        <compilerarg line="--doclint-format html5"/>
355        <compilerarg value="-Xdoclint:all/protected,reference/private"/>  <!--  Temporarily disable doclint for private elements, due to -->
356    <!--  https://bugs.openjdk.java.net/browse/JDK-8214571 -->
357    <!--  which is expected to be fixed in openjdk 11.0.8 -->
358    <!--  <compilerarg value="-Xdoclint:all/protected,reference/private"/> -->
359          <compilerarg value="-Xdoclint:all/protected"/>
360          <compilerarg value="-Xdoclint/package:java.util.*"/>
361        <compilerarg value="-Werror"/>        <compilerarg value="-Werror"/>
362        <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>        <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
363        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
# Line 462  Line 384 
384    <target name="docs"    <target name="docs"
385            description="Builds javadocs for src/main to dist dir">            description="Builds javadocs for src/main to dist dir">
386    
387      <delete dir="${docs.dir}"/>      <delete dir="${docs.dir}" quiet="true"/>
388      <mkdir dir="${docs.dir}"/>      <mkdir dir="${docs.dir}"/>
389    
390        <!-- old school frames via docs/index.html?overview-summary.html -->
391        <!-- dash-dash-frames no longer a supported option in jdk13+ -->
392        <local name="use-frames"/>
393        <condition property="use-frames">
394          <equals arg1="${build.main.javadoc}" arg2="${javadoc12}"/>
395        </condition>
396    
397      <!-- the packagenames="none" hack below prevents scanning the -->      <!-- the packagenames="none" hack below prevents scanning the -->
398      <!-- sourcepath for packages -->      <!-- sourcepath for packages -->
399    
# Line 475  Line 404 
404  <!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> -->  <!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> -->
405      <javadoc destdir="${docs.dir}"      <javadoc destdir="${docs.dir}"
406               packagenames="none"               packagenames="none"
407               link="${java9.api.url}"               link="${java.api.url}"
408               overview="${src.dir}/intro.html"               overview="${src.dir}/intro.html"
409               access="${build.javadoc.access}"               access="${build.javadoc.access}"
410               sourcepath="${src.dir}"               sourcepath="${src.dir}"
411               classpath=""               classpath=""
412               source="9"               source="${build.main.javadoc.source}"
413               executable="${build.main.javadoc}">               executable="${build.main.javadoc}">
414    <!-- TODO: JDK-8214571 failonerror = "true" -->
415        <fileset dir="${src.dir}" defaultexcludes="yes">        <fileset dir="${src.dir}" defaultexcludes="yes">
416          <include name="**/*.java"/>          <include name="**/*.java"/>
417        </fileset>        </fileset>
418        <arg line="-Xdocrootparent ${java9.docroot.url}"/>        <arg line="-Xdocrootparent ${java.docroot.url}"/>
419        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
420          <arg value="-quiet"/>
421        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
422        <arg value="-html5"/>        <arg value="-html5"/>
423        <arg value="--patch-module=java.base=${src.dir}"/>        <arg value="--patch-module=java.base=${src.dir}"/>
424        <arg value="-tag"/>        <arg value="--frames" if:set="use-frames"/>
425        <arg value="${javadoc.jls.option}"/>        <arg value="--override-methods=summary"/>
426  <!-- @apiNote currently unused -->        <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
427  <!--       <arg value="-tag"/> -->        <arg value="-tag"/> <arg value="implSpec:a:Implementation Requirements:"/>
428  <!--       <arg value="apiNote:a:API Note:"/> -->        <arg value="-tag"/> <arg value="implNote:a:Implementation Note:"/>
429        <arg value="-tag"/>        <arg value="-tag"/> <arg value="apiNote:a:API Note:"/>
       <arg value="implSpec:a:Implementation Requirements:"/>  
       <arg value="-tag"/>  
       <arg value="implNote:a:Implementation Note:"/>  
430  <!-- tags added in jdk9: currently unused -->  <!-- tags added in jdk9: currently unused -->
431  <!--       <arg value="-tag"/> -->  <!--  <arg value="-tag"/> <arg value="revised:X"/> -->
432  <!--       <arg value="revised:X"/> -->  <!--  <arg value="-tag"/> <arg value="spec:X"/> -->
 <!--       <arg value="-tag"/> -->  
 <!--       <arg value="spec:X"/> -->  
433      </javadoc>      </javadoc>
434    </target>    </target>
435    
# Line 513  Line 439 
439            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
440    
441    
   <target name="release"  
           depends="dist"  
           description="Puts entire CVS tree, plus distribution productions, in a jar">  
   
     <property name="release.jar" value="dist/jsr166-${version}-dist.jar"/>  
   
     <jar basedir="${basedir}" destfile="${release.jar}">  
       <!-- <exclude name="build/**"/> -->  
       <exclude name="${release.jar}"/>  
       <exclude name="user.properties"/>  
       <exclude name="etc/notes/**"/>  
       <exclude name="src/emulation/**"/>  
       <exclude name="**/SyntaxTest.java"/>  
       <exclude name="**/SuperfluousAbstract.java"/>  
       <manifest>  
         <attribute name="Built-By" value="${user.name}"/>  
         <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>  
       </manifest>  
     </jar>  
   </target>  
   
   
442    <target name="clean"    <target name="clean"
443            description="Removes all build products">            description="Removes all build products">
444      <delete dir="${build.dir}"/>      <delete dir="${build.dir}"/>
# Line 559  Line 463 
463    </target>    </target>
464    
465    <target name="tck"    <target name="tck"
466            depends="jar"            depends="jar"
467            description="Runs tck tests for src/main directly">            description="Runs tck tests for src/main directly">
468    
469      <run-tck-tests      <run-tck-tests
470        target="${build.main.java.version}"        target="${java.runtime.target}"
471        workdir="${build.dir}"        workdir="${build.dir}"
472        classes="${product.jar}">        classes="${product.jar}">
473        <javac-elements>        <javac-elements>
# Line 594  Line 498 
498    </target>    </target>
499    
500    <target name="jtreg"    <target name="jtreg"
501            depends="jar"            depends="jar"
502            description="Runs jtreg tests for src/main using the jtreg ant task">            description="Runs jtreg tests for src/main using the jtreg ant task">
503      <run-jtreg-tests      <run-jtreg-tests
504         target="${build.main.java.version}"         target="${java.runtime.target}"
505         workdir="${build.dir}"         workdir="${build.dir}"
506         classes="${product.jar}"/>         classes="${product.jar}"/>
507    </target>    </target>
# Line 606  Line 510 
510            depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"            depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
511            description="Runs tck and jtreg tests for src/main"/>            description="Runs tck and jtreg tests for src/main"/>
512    
513  <!--   <target name="jtreg8" description="Runs jtreg tests with jdk8"> -->    <target name="test-version-permutations"
514              depends="test11, test12, test13, test14, test15, test11-12, test11-13, test11-14, test11-15, clean, test, docs"
515  <!--     <antcall target="jtreg"> -->            description="Runs tck and jtreg tests for various build-time and runtime java versions"/>
516  <!--       <param name="build.main.java.version" value="8"/> -->  
517  <!--       <param name="build.main.javac" value="${javac8}"/> -->    <target name="test11">
518  <!--     </antcall> -->      <antcall>
519          <param name="java.runtime.target" value="11"/>
520          <param name="build.main.javac" value="${javac11}"/>
521          <param name="build.main.javadoc" value="${javadoc12}"/>
522          <param name="build.main.javadoc.source" value="11"/>
523          <target name="clean"/>
524          <target name="test"/>
525          <target name="docs"/>
526        </antcall>
527      </target>
528    
529  <!--   </target> -->    <target name="test12">
530        <antcall>
531          <param name="java.runtime.target" value="12"/>
532          <param name="build.main.javac" value="${javac12}"/>
533          <param name="build.main.javadoc" value="${javadoc12}"/>
534          <param name="build.main.javadoc.source" value="12"/>
535          <target name="clean"/>
536          <target name="test"/>
537          <target name="docs"/>
538        </antcall>
539      </target>
540    
541    <target name="test91011"    <target name="test13">
542            description="Runs tck and jtreg tests for src/main for multiple java versions">      <antcall>
543          <param name="java.runtime.target" value="13"/>
544          <param name="build.main.javac" value="${javac13}"/>
545          <param name="build.main.javadoc" value="${javadoc13}"/>
546          <param name="build.main.javadoc.source" value="13"/>
547          <target name="clean"/>
548          <target name="test"/>
549          <target name="docs"/>
550        </antcall>
551      </target>
552    
553      <antcall target="clean"/>    <target name="test14">
554      <antcall target="test">      <antcall>
555        <param name="build.main.java.version" value="9"/>        <param name="java.runtime.target" value="14"/>
556          <param name="build.main.javac" value="${javac14}"/>
557          <param name="build.main.javadoc" value="${javadoc14}"/>
558          <param name="build.main.javadoc.source" value="14"/>
559          <target name="clean"/>
560          <target name="test"/>
561          <target name="docs"/>
562      </antcall>      </antcall>
563      </target>
564    
565      <antcall target="clean"/>    <target name="test15">
566      <antcall target="test">      <antcall>
567        <param name="build.main.java.version" value="10"/>        <param name="java.runtime.target" value="15"/>
568          <param name="build.main.javac" value="${javac15}"/>
569          <param name="build.main.javadoc" value="${javadoc15}"/>
570          <param name="build.main.javadoc.source" value="15"/>
571          <target name="clean"/>
572          <target name="test"/>
573          <target name="docs"/>
574      </antcall>      </antcall>
575      </target>
576    
577      <antcall target="clean"/>    <target name="test11-12">
578      <antcall target="test">      <antcall>
579        <param name="build.main.java.version" value="11"/>        <param name="java.runtime.target" value="12"/>
580          <param name="build.main.javac" value="${javac11}"/>
581          <param name="build.main.javadoc" value="${javadoc12}"/>
582          <param name="build.main.javadoc.source" value="11"/>
583          <target name="clean"/>
584          <target name="test"/>
585          <target name="docs"/>
586      </antcall>      </antcall>
587      </target>
588    
589      <!-- Clean up to avoid obscure wrong class file version bugs -->    <target name="test11-13">
590      <antcall target="clean"/>      <antcall>
591          <param name="java.runtime.target" value="13"/>
592          <param name="build.main.javac" value="${javac11}"/>
593          <param name="build.main.javadoc" value="${javadoc13}"/>
594          <param name="build.main.javadoc.source" value="11"/>
595          <target name="clean"/>
596          <target name="test"/>
597          <target name="docs"/>
598        </antcall>
599      </target>
600    
601      <target name="test11-14">
602        <antcall>
603          <param name="java.runtime.target" value="14"/>
604          <param name="build.main.javac" value="${javac11}"/>
605          <param name="build.main.javadoc" value="${javadoc14}"/>
606          <param name="build.main.javadoc.source" value="11"/>
607          <target name="clean"/>
608          <target name="test"/>
609          <target name="docs"/>
610        </antcall>
611    </target>    </target>
612    
613      <target name="test11-15">
614        <antcall>
615          <param name="java.runtime.target" value="15"/>
616          <param name="build.main.javac" value="${javac11}"/>
617          <param name="build.main.javadoc" value="${javadoc15}"/>
618          <param name="build.main.javadoc.source" value="11"/>
619          <target name="clean"/>
620          <target name="test"/>
621          <target name="docs"/>
622        </antcall>
623      </target>
624    
625    
626    <target name="configure-compiler">    <target name="configure-compiler">
# Line 660  Line 643 
643    </target>    </target>
644    
645    
   
   <!-- Various demos and test programs -->  
   
   
   <!-- description="Benchmark from Doug Lea's AQS paper" -->  
   <target name="loops" depends="configure-compiler">  
   
     <mkdir dir="${build.loops.dir}"/>  
   
     <javac srcdir="${loops.src.dir}"  
           destdir="${build.loops.dir}"  
             debug="${build.debug}"  
        debuglevel="${build.debuglevel}"  
       deprecation="${build.deprecation}"  
            source="${build.sourcelevel}"  
            target="${build.sourcelevel}"  
          encoding="ASCII"  
              fork="true">  
   
       <compilerarg line="${build.args}"/>  
       <classpath refid="loops.classpath"/>  
       <compilerarg value="-XDignore.symbol.file=true"/>  
   
     </javac>  
   
     <java classname="ALoops" fork="true">  
       <classpath refid="loops.classpath"/>  
     </java>  
   </target>  
   
   
646    <target name="compile-test-loops" depends="jar"    <target name="compile-test-loops" depends="jar"
647            description="Compiles all the perf tests in src/test/loops">            description="Compiles all the perf tests in src/test/loops">
648    
# Line 709  Line 661 
661    
662        <include name="*.java"/>        <include name="*.java"/>
663        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
664        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
665        <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"/>  
666        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
667      </javac>      </javac>
668    </target>    </target>
669    
670    
671    <target name="4jdk8jar"    <!-- old branches no longer maintained.  build support deleted -->
672            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}"/>  
 <!-- @apiNote currently unused -->  
 <!--       <arg value="-tag"/> -->  
 <!--       <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/> -->  
       <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;"/>  
     </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>  
   
   
673    <!-- 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>  
   
   
674    <!-- 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>  
   
   
675    <!-- 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>  
   
   
676    <!-- 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>  
   
   
677    <!-- jsr166e (no longer maintained) -->    <!-- jsr166e (no longer maintained) -->
678    
   <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>  
   
   
679  <!-- Find buglets that can be detected by static build tools -->  <!-- Find buglets that can be detected by static build tools -->
680    
681    <target name="lint">  <!--   <target name="lint"> -->
682      <antcall target="dists">  <!--     <antcall target="dists"> -->
683        <param name="build.javadoc.access" value="public"/>  <!--       <param name="build.javadoc.access" value="protected"/> -->
684      </antcall>  <!--     </antcall> -->
685    </target>  <!--   </target> -->
686    
687  <!-- Generates all doclint warnings, even for private methods (rarely useful) -->  <!-- Generates all doclint warnings, even for private methods (rarely useful) -->
688    <target name="lint-private">    <target name="doclint-private">
689      <antcall target="dist">      <antcall target="dist">
690        <param name="build.javadoc.access" value="private"/>        <param name="build.javadoc.access" value="private"/>
691      </antcall>      </antcall>
# Line 1398  Line 693 
693    
694    
695  <!-- ==============================================================  <!-- ==============================================================
696    Experimental errorprone support - http://errorprone.info    Experimental errorprone support
697      https://errorprone.info
698      https://errorprone.info/docs/installation
699      https://github.com/google/error-prone/issues/1143
700  =================================================================== -->  =================================================================== -->
701    <property name="errorprone.jar" location="${lib.dir}/error_prone_ant-2.2.0.jar"/>    <path id="errorprone.processorpath.path">
702        <pathelement location="${lib.dir}/error_prone_core-2.3.4-with-dependencies.jar"/>
703        <pathelement location="${lib.dir}/dataflow-2.5.7.jar"/>
704        <pathelement location="${lib.dir}/javacutil-2.5.7.jar"/>
705        <pathelement location="${lib.dir}/jFormatString-3.0.0.jar"/>
706        <pathelement location="${lib.dir}/caffeine-2.8.0.jar"/>
707      </path>
708      <property name="errorprone.processorpath" refid="errorprone.processorpath.path" />
709      <property name="errorprone.jsr166.user.flags" value=""/>
710    <property name="errorprone.jsr166.flags"    <property name="errorprone.jsr166.flags"
711              value="-Xep:HashtableContains:OFF              value="-Xep:HashtableContains:OFF
712                     -Xep:JdkObsolete:OFF                     -Xep:JdkObsolete:OFF
713                     -Xep:MissingOverride:OFF                     -Xep:MissingOverride:OFF
714                     -Xep:MissingFail:OFF                     -Xep:MissingFail:OFF
715                       -Xep:ThreadPriorityCheck:OFF
716                     -Xep:MixedArrayDimensions:ERROR                     -Xep:MixedArrayDimensions:ERROR
717                     -Xep:RemoveUnusedImports:ERROR                     -Xep:RemoveUnusedImports:ERROR
718                     -Xep:EmptyIf:ERROR                     -Xep:EmptyIf:ERROR
# Line 1414  Line 721 
721                     -Xep:LongLiteralLowerCaseSuffix:ERROR                     -Xep:LongLiteralLowerCaseSuffix:ERROR
722                     -Xep:RedundantThrows:ERROR                     -Xep:RedundantThrows:ERROR
723                     -Xep:IdentityBinaryExpression:WARN                     -Xep:IdentityBinaryExpression:WARN
724                     -Xep:MethodCanBeStatic:WARN"/>                     -Xep:ConstructorInvokesOverridable:WARN
725                       -Xep:MethodCanBeStatic:WARN
726                       ${errorprone.jsr166.user.flags}"/>
727    <!-- -Xep:WildcardImport:ERROR -->    <!-- -Xep:WildcardImport:ERROR -->
728    <property name="errorprone.jsr166.test.flags"    <property name="errorprone.jsr166.test.flags"
729              value="-Xep:StringSplitter:OFF              value="-Xep:StringSplitter:OFF
# Line 1442  Line 751 
751             fork="true">             fork="true">
752    
753        <include name="**/*.java"/>        <include name="**/*.java"/>
754        <compilerarg line="-processorpath ${errorprone.jar}"/>        <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
755          <compilerarg value="-J--illegal-access=permit"/>
756          <compilerarg value="-XDcompilePolicy=simple"/>
757          <compilerarg value="-processorpath"/>
758          <compilerarg pathref="errorprone.processorpath.path"/>
759        <compilerarg value="-Xplugin:ErrorProne        <compilerarg value="-Xplugin:ErrorProne
760                            ${errorprone.jsr166.flags}"/>                            ${errorprone.jsr166.flags}"/>
761        <compilerarg value="--patch-module=java.base=${src.dir}"/>        <compilerarg value="--patch-module=java.base=${src.dir}"/>
# Line 1459  Line 772 
772      </jar>      </jar>
773    
774      <run-tck-tests      <run-tck-tests
775        target="${build.main.java.version}"        target="${java.runtime.target}"
776        workdir="${build.dir}"        workdir="${build.dir}"
777        classes="${product.jar}">        classes="${product.jar}">
778        <javac-elements>        <javac-elements>
779          <compilerarg line="-processorpath ${errorprone.jar}"/>          <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
780            <compilerarg value="-J--illegal-access=permit"/>
781            <compilerarg value="-XDcompilePolicy=simple"/>
782            <compilerarg line="-processorpath ${errorprone.processorpath}"/>
783          <compilerarg value="-Xplugin:ErrorProne          <compilerarg value="-Xplugin:ErrorProne
784                              ${errorprone.jsr166.flags}                              ${errorprone.jsr166.flags}
785                              ${errorprone.jsr166.test.flags}"/>                              ${errorprone.jsr166.test.flags}"/>
# Line 1479  Line 795 
795            description="Run errorprone over jtreg tests (experimental)">            description="Run errorprone over jtreg tests (experimental)">
796    
797      <run-jtreg-tests      <run-jtreg-tests
798         target="${build.main.java.version}"         target="${java.runtime.target}"
799         workdir="${build.dir}"         workdir="${build.dir}"
800         classes="${product.jar}"         classes="${product.jar}"
801         verbose="all">         verbose="all">
802        <jtreg-elements>        <jtreg-elements>
803          <arg value="-javacoption:-XDcompilePolicy=byfile"/>          <arg value="-javacoption:-XDcompilePolicy=simple"/>
804          <arg value="-javacoption:-processorpath"/>          <arg value="-javacoption:-processorpath"/>
805          <arg value="-javacoption:${errorprone.jar}"/>          <arg value="-javacoption:${errorprone.processorpath}"/>
806          <arg value="-javacoption:-Xplugin:ErrorProne          <arg value="-javacoption:-Xplugin:ErrorProne
807                              ${errorprone.jsr166.flags}                              ${errorprone.jsr166.flags}
808                              ${errorprone.jsr166.test.flags}                              ${errorprone.jsr166.test.flags}
809                                -Xep:MultipleTopLevelClasses:WARN
810                              -Xep:NonAtomicVolatileUpdate:OFF"/>                              -Xep:NonAtomicVolatileUpdate:OFF"/>
811        </jtreg-elements>        </jtreg-elements>
812      </run-jtreg-tests>      </run-jtreg-tests>

Legend:
Removed from v.1.263  
changed lines
  Added in v.1.314

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