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

Diff of /jsr166/build.xml

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

revision 1.285 by jsr166, Wed Nov 21 20:58:57 2018 UTC revision 1.313 by jsr166, Mon Apr 27 23:47:11 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  
   $HOME/jdk/jdk9  
   $HOME/jdk/jdk10  
22    $HOME/jdk/jdk11    $HOME/jdk/jdk11
23    $HOME/jdk/jdk12    $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    $HOME/jdk/src/jdk12    $HOME/jdk/src/jdk12
30    where each of the above is a complete JDK source tree    $HOME/jdk/src/jdk13
31    (e.g. mercurial forest) or a symlink to same.    $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 66  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 97  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}/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"/>  
82      </sequential>      </sequential>
83    </macrodef>    </macrodef>
84    
# Line 131  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"/>    <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="jtreg12.src.dir"      location="${test.src.dir}/jtreg"/>    <property name="jtreg12.src.dir"      location="${test.src.dir}/jtreg"/>
110    <property name="jtreg.src.dir"        location="${jtreg9.src.dir}"/>    <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"/> -->
   <property name="java9.docroot.url"  value="https://docs.oracle.com/javase/9/docs"/>  
   <property name="java10.docroot.url" value="https://docs.oracle.com/javase/10/docs"/>  
   <property name="java11.docroot.url" value="https://docs.oracle.com/en/java/javase/11/docs"/>  
132    <!-- The location of jdk early access docs (RIP) -->    <!-- The location of jdk early access docs (RIP) -->
   <!-- <property name="java9.docroot.url" value="http://download.java.net/java/jdk9/docs"/> -->  
   <!-- <property name="java10.docroot.url" value="http://download.java.net/java/jdk10/docs"/> -->  
133    <!-- <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"/> -->
134    <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"/> -->
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    <!-- But pin to jdk 10 until fix for -->    <property name="java11.docroot.url" value="https://docs.oracle.com/en/java/javase/11/docs"/>
137    <!-- 8211194: javadoc -link doesn't take module path into consideration -->    <property name="java12.docroot.url" value="https://docs.oracle.com/en/java/javase/12/docs"/>
138    <property name="java.docroot.url"   value="${java10.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/"/>    <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 223  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 246  Line 177 
177    
178      <sequential>      <sequential>
179    
     <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>  
   
180      <mkdir dir="@{workdir}/tck-classes"/>      <mkdir dir="@{workdir}/tck-classes"/>
181    
182      <javac srcdir="@{tck.src.dir}"      <javac srcdir="@{tck.src.dir}"
# Line 275  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 287  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>
# Line 329  Line 248 
248      </sequential>      </sequential>
249    </macrodef>    </macrodef>
250    
251      <defjtregtests v="15"/>
252      <defjtregtests v="14"/>
253      <defjtregtests v="13"/>
254    <defjtregtests v="12"/>    <defjtregtests v="12"/>
255    <defjtregtests v="11"/>    <defjtregtests v="11"/>
   <defjtregtests v="10"/>  
   <defjtregtests v="9"/>  
   <defjtregtests v="8"/>  
   <defjtregtests v="7"/>  
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 353  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}/lib/modules" type="file"/>  
     </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 385  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    
# Line 393  Line 307 
307    <!-- Default values: may seem strange ... -->    <!-- Default values: may seem strange ... -->
308    <!-- At runtime, target latest LTS, i.e. jdk11 -->    <!-- At runtime, target latest LTS, i.e. jdk11 -->
309    <!-- But at build time, target jdk9, for maximal binary portability -->    <!-- But at build time, target jdk9, for maximal binary portability -->
310    <!-- Use javadoc12, so we can use override-methods=summary, and JDK-8202628 -->    <!-- ButButBut as of 2019-08, target jdk11 at build time -->
311    <property name="build.main.java.version" value="11"/>    <!-- Use javadoc12 (but -link to jdk11 api docs!), to get:
312        o override-methods=summary
313        o {@systemProperty ...}
314        o 8211194: issues linking to external documentation (was: missing package-list for JDK10 / JDK11 documentation)
315        o 8202628: javadoc generates bad links in TestModules.java
316        -->
317      <property name="java.runtime.target" value="11"/>
318    <property name="build.main.java" value="${java11}"/>    <property name="build.main.java" value="${java11}"/>
319    <property name="build.main.javac" value="${javac9}"/>    <property name="build.main.javac" value="${javac11}"/>
320    <property name="build.main.javadoc" value="${javadoc12}"/>    <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"/>
           <!-- no longer supported: 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist -->  
326    
327    <target name="compile"    <target name="compile"
328            depends="configure-compiler"            depends="configure-compiler"
# Line 429  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    <!--   Xlint:-removal for jdk12 Unsafe Object -> Reference renaming -->
353        <compilerarg value="-Xlint:all,-removal"/>        <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, due to https://bugs.openjdk.java.net/browse/JDK-8214571 -->
356    <!--  <compilerarg value="-Xdoclint:all/protected,reference/private"/> -->
357          <compilerarg value="-Xdoclint/package:java.util.*"/>
358        <compilerarg value="-Werror"/>        <compilerarg value="-Werror"/>
359        <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>        <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
360        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
# Line 458  Line 381 
381    <target name="docs"    <target name="docs"
382            description="Builds javadocs for src/main to dist dir">            description="Builds javadocs for src/main to dist dir">
383    
384      <delete dir="${docs.dir}"/>      <delete dir="${docs.dir}" quiet="true"/>
385      <mkdir dir="${docs.dir}"/>      <mkdir dir="${docs.dir}"/>
386    
387        <!-- old school frames via docs/index.html?overview-summary.html -->
388        <!-- dash-dash-frames no longer a supported option in jdk13+ -->
389        <local name="use-frames"/>
390        <condition property="use-frames">
391          <equals arg1="${build.main.javadoc}" arg2="${javadoc12}"/>
392        </condition>
393    
394      <!-- the packagenames="none" hack below prevents scanning the -->      <!-- the packagenames="none" hack below prevents scanning the -->
395      <!-- sourcepath for packages -->      <!-- sourcepath for packages -->
396    
# Line 471  Line 401 
401  <!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> -->  <!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> -->
402      <javadoc destdir="${docs.dir}"      <javadoc destdir="${docs.dir}"
403               packagenames="none"               packagenames="none"
404               link="${java11.api.url}"               link="${java.api.url}"
405               overview="${src.dir}/intro.html"               overview="${src.dir}/intro.html"
406               access="${build.javadoc.access}"               access="${build.javadoc.access}"
407               sourcepath="${src.dir}"               sourcepath="${src.dir}"
408               classpath=""               classpath=""
409               source="11"               source="${build.main.javadoc.source}"
410               executable="${build.main.javadoc}">               executable="${build.main.javadoc}">
411    <!-- TODO: JDK-8214571 failonerror = "true" -->
412        <fileset dir="${src.dir}" defaultexcludes="yes">        <fileset dir="${src.dir}" defaultexcludes="yes">
413          <include name="**/*.java"/>          <include name="**/*.java"/>
414        </fileset>        </fileset>
415        <arg line="-Xdocrootparent ${java10.docroot.url}"/>        <arg line="-Xdocrootparent ${java.docroot.url}"/>
416        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
417          <arg value="-quiet"/>
418        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
419        <arg value="-html5"/>        <arg value="-html5"/>
420        <arg value="--patch-module=java.base=${src.dir}"/>        <arg value="--patch-module=java.base=${src.dir}"/>
421        <arg value="--frames"/>        <arg value="--frames" if:set="use-frames"/>
422        <arg value="--override-methods=summary"/>        <arg value="--override-methods=summary"/>
423        <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>        <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
424        <arg value="-tag"/> <arg value="implSpec:a:Implementation Requirements:"/>        <arg value="-tag"/> <arg value="implSpec:a:Implementation Requirements:"/>
# Line 528  Line 460 
460    </target>    </target>
461    
462    <target name="tck"    <target name="tck"
463            depends="jar"            depends="jar"
464            description="Runs tck tests for src/main directly">            description="Runs tck tests for src/main directly">
465    
466      <run-tck-tests      <run-tck-tests
467        target="${build.main.java.version}"        target="${java.runtime.target}"
468        workdir="${build.dir}"        workdir="${build.dir}"
469        classes="${product.jar}">        classes="${product.jar}">
470        <javac-elements>        <javac-elements>
# Line 563  Line 495 
495    </target>    </target>
496    
497    <target name="jtreg"    <target name="jtreg"
498            depends="jar"            depends="jar"
499            description="Runs jtreg tests for src/main using the jtreg ant task">            description="Runs jtreg tests for src/main using the jtreg ant task">
500      <run-jtreg-tests      <run-jtreg-tests
501         target="${build.main.java.version}"         target="${java.runtime.target}"
502         workdir="${build.dir}"         workdir="${build.dir}"
503         classes="${product.jar}"/>         classes="${product.jar}"/>
504    </target>    </target>
# Line 576  Line 508 
508            description="Runs tck and jtreg tests for src/main"/>            description="Runs tck and jtreg tests for src/main"/>
509    
510    <target name="test-version-permutations"    <target name="test-version-permutations"
511            depends="test9, test10, test11, test12, test9-11, test9-12, clean, test, docs">            depends="test11, test12, test13, test14, test15, test11-12, test11-13, test11-14, test11-15, clean, test, docs"
512              description="Runs tck and jtreg tests for various build-time and runtime java versions"/>
513    
514      <target name="test11">
515        <antcall>
516          <param name="java.runtime.target" value="11"/>
517          <param name="build.main.javac" value="${javac11}"/>
518          <param name="build.main.javadoc" value="${javadoc12}"/>
519          <param name="build.main.javadoc.source" value="11"/>
520          <target name="clean"/>
521          <target name="test"/>
522          <target name="docs"/>
523        </antcall>
524      </target>
525    
526      <target name="test12">
527        <antcall>
528          <param name="java.runtime.target" value="12"/>
529          <param name="build.main.javac" value="${javac12}"/>
530          <param name="build.main.javadoc" value="${javadoc12}"/>
531          <param name="build.main.javadoc.source" value="12"/>
532          <target name="clean"/>
533          <target name="test"/>
534          <target name="docs"/>
535        </antcall>
536    </target>    </target>
537    
538    <target name="test9">    <target name="test13">
     <antcall target="clean"/>  
539      <antcall>      <antcall>
540        <param name="build.main.java.version" value="9"/>        <param name="java.runtime.target" value="13"/>
541        <param name="build.main.java" value="${java9}"/>        <param name="build.main.javac" value="${javac13}"/>
542        <param name="build.main.javac" value="${javac9}"/>        <param name="build.main.javadoc" value="${javadoc13}"/>
543          <param name="build.main.javadoc.source" value="13"/>
544          <target name="clean"/>
545        <target name="test"/>        <target name="test"/>
546          <target name="docs"/>
547      </antcall>      </antcall>
548    </target>    </target>
549    
550    <target name="test10">    <target name="test14">
     <antcall target="clean"/>  
551      <antcall>      <antcall>
552        <param name="build.main.java.version" value="10"/>        <param name="java.runtime.target" value="14"/>
553        <param name="build.main.java" value="${java10}"/>        <param name="build.main.javac" value="${javac14}"/>
554        <param name="build.main.javac" value="${javac10}"/>        <param name="build.main.javadoc" value="${javadoc14}"/>
555        <param name="build.main.javadoc" value="${javadoc10}"/>        <param name="build.main.javadoc.source" value="14"/>
556          <target name="clean"/>
557        <target name="test"/>        <target name="test"/>
558        <target name="docs"/>        <target name="docs"/>
559      </antcall>      </antcall>
560    </target>    </target>
561    
562    <target name="test11">    <target name="test15">
     <antcall target="clean"/>  
563      <antcall>      <antcall>
564        <param name="build.main.java.version" value="11"/>        <param name="java.runtime.target" value="15"/>
565        <param name="build.main.java" value="${java11}"/>        <param name="build.main.javac" value="${javac15}"/>
566        <param name="build.main.javac" value="${javac11}"/>        <param name="build.main.javadoc" value="${javadoc15}"/>
567        <param name="build.main.javadoc" value="${javadoc11}"/>        <param name="build.main.javadoc.source" value="15"/>
568          <target name="clean"/>
569        <target name="test"/>        <target name="test"/>
570        <target name="docs"/>        <target name="docs"/>
571      </antcall>      </antcall>
572    </target>    </target>
573    
574    <target name="test12">    <target name="test11-12">
     <antcall target="clean"/>  
575      <antcall>      <antcall>
576        <param name="build.main.java.version" value="12"/>        <param name="java.runtime.target" value="12"/>
577        <param name="build.main.java" value="${java12}"/>        <param name="build.main.javac" value="${javac11}"/>
       <param name="build.main.javac" value="${javac12}"/>  
578        <param name="build.main.javadoc" value="${javadoc12}"/>        <param name="build.main.javadoc" value="${javadoc12}"/>
579          <param name="build.main.javadoc.source" value="11"/>
580          <target name="clean"/>
581        <target name="test"/>        <target name="test"/>
582        <target name="docs"/>        <target name="docs"/>
583      </antcall>      </antcall>
584    </target>    </target>
585    
586    <target name="test9-11">    <target name="test11-13">
     <antcall target="clean"/>  
587      <antcall>      <antcall>
588        <param name="build.main.java.version" value="11"/>        <param name="java.runtime.target" value="13"/>
589        <param name="build.main.java" value="${java11}"/>        <param name="build.main.javac" value="${javac11}"/>
590        <param name="build.main.javac" value="${javac9}"/>        <param name="build.main.javadoc" value="${javadoc13}"/>
591        <param name="build.main.javadoc" value="${javadoc11}"/>        <param name="build.main.javadoc.source" value="11"/>
592          <target name="clean"/>
593        <target name="test"/>        <target name="test"/>
594        <target name="docs"/>        <target name="docs"/>
595      </antcall>      </antcall>
596    </target>    </target>
597    
598    <target name="test9-12">    <target name="test11-14">
     <antcall target="clean"/>  
599      <antcall>      <antcall>
600        <param name="build.main.java.version" value="12"/>        <param name="java.runtime.target" value="14"/>
601        <param name="build.main.java" value="${java12}"/>        <param name="build.main.javac" value="${javac11}"/>
602        <param name="build.main.javac" value="${javac9}"/>        <param name="build.main.javadoc" value="${javadoc14}"/>
603        <param name="build.main.javadoc" value="${javadoc12}"/>        <param name="build.main.javadoc.source" value="11"/>
604          <target name="clean"/>
605          <target name="test"/>
606          <target name="docs"/>
607        </antcall>
608      </target>
609    
610      <target name="test11-15">
611        <antcall>
612          <param name="java.runtime.target" value="15"/>
613          <param name="build.main.javac" value="${javac11}"/>
614          <param name="build.main.javadoc" value="${javadoc15}"/>
615          <param name="build.main.javadoc.source" value="11"/>
616          <target name="clean"/>
617        <target name="test"/>        <target name="test"/>
618        <target name="docs"/>        <target name="docs"/>
619      </antcall>      </antcall>
# Line 688  Line 658 
658    
659        <include name="*.java"/>        <include name="*.java"/>
660        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
661        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
662        <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"/>  
663        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
664      </javac>      </javac>
665    </target>    </target>
666    
667    
668    <target name="4jdk8jar"    <!-- old branches no longer maintained.  build support deleted -->
669            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>  
   
   
670    <!-- 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>  
   
   
671    <!-- 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>  
   
   
672    <!-- 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>  
   
   
673    <!-- 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>  
   
   
674    <!-- jsr166e (no longer maintained) -->    <!-- jsr166e (no longer maintained) -->
675    
   <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>  
   
   
676  <!-- Find buglets that can be detected by static build tools -->  <!-- Find buglets that can be detected by static build tools -->
677    
678  <!--   <target name="lint"> -->  <!--   <target name="lint"> -->
# Line 1373  Line 690 
690    
691    
692  <!-- ==============================================================  <!-- ==============================================================
693    Experimental errorprone support - https://errorprone.info    Experimental errorprone support
694      https://errorprone.info
695      https://errorprone.info/docs/installation
696      https://github.com/google/error-prone/issues/1143
697  =================================================================== -->  =================================================================== -->
698    <property name="errorprone.jar" location="${lib.dir}/error_prone_ant-2.3.1.jar"/>    <path id="errorprone.processorpath.path">
699        <pathelement location="${lib.dir}/error_prone_core-2.3.4-with-dependencies.jar"/>
700        <pathelement location="${lib.dir}/dataflow-2.5.7.jar"/>
701        <pathelement location="${lib.dir}/javacutil-2.5.7.jar"/>
702        <pathelement location="${lib.dir}/jFormatString-3.0.0.jar"/>
703        <pathelement location="${lib.dir}/caffeine-2.8.0.jar"/>
704      </path>
705      <property name="errorprone.processorpath" refid="errorprone.processorpath.path" />
706    <property name="errorprone.jsr166.user.flags" value=""/>    <property name="errorprone.jsr166.user.flags" value=""/>
707    <property name="errorprone.jsr166.flags"    <property name="errorprone.jsr166.flags"
708              value="-Xep:HashtableContains:OFF              value="-Xep:HashtableContains:OFF
709                     -Xep:JdkObsolete:OFF                     -Xep:JdkObsolete:OFF
710                     -Xep:MissingOverride:OFF                     -Xep:MissingOverride:OFF
711                     -Xep:MissingFail:OFF                     -Xep:MissingFail:OFF
712                       -Xep:ThreadPriorityCheck:OFF
713                     -Xep:MixedArrayDimensions:ERROR                     -Xep:MixedArrayDimensions:ERROR
714                     -Xep:RemoveUnusedImports:ERROR                     -Xep:RemoveUnusedImports:ERROR
715                     -Xep:EmptyIf:ERROR                     -Xep:EmptyIf:ERROR
# Line 1390  Line 718 
718                     -Xep:LongLiteralLowerCaseSuffix:ERROR                     -Xep:LongLiteralLowerCaseSuffix:ERROR
719                     -Xep:RedundantThrows:ERROR                     -Xep:RedundantThrows:ERROR
720                     -Xep:IdentityBinaryExpression:WARN                     -Xep:IdentityBinaryExpression:WARN
721                       -Xep:ConstructorInvokesOverridable:WARN
722                     -Xep:MethodCanBeStatic:WARN                     -Xep:MethodCanBeStatic:WARN
723                     ${errorprone.jsr166.user.flags}"/>                     ${errorprone.jsr166.user.flags}"/>
724    <!-- -Xep:WildcardImport:ERROR -->    <!-- -Xep:WildcardImport:ERROR -->
# Line 1422  Line 751 
751        <!-- Needed to silence -Xep:FutureReturnValueIgnored -->        <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
752        <compilerarg value="-J--illegal-access=permit"/>        <compilerarg value="-J--illegal-access=permit"/>
753        <compilerarg value="-XDcompilePolicy=simple"/>        <compilerarg value="-XDcompilePolicy=simple"/>
754        <compilerarg line="-processorpath ${errorprone.jar}"/>        <compilerarg value="-processorpath"/>
755          <compilerarg pathref="errorprone.processorpath.path"/>
756        <compilerarg value="-Xplugin:ErrorProne        <compilerarg value="-Xplugin:ErrorProne
757                            ${errorprone.jsr166.flags}"/>                            ${errorprone.jsr166.flags}"/>
758        <compilerarg value="--patch-module=java.base=${src.dir}"/>        <compilerarg value="--patch-module=java.base=${src.dir}"/>
# Line 1439  Line 769 
769      </jar>      </jar>
770    
771      <run-tck-tests      <run-tck-tests
772        target="${build.main.java.version}"        target="${java.runtime.target}"
773        workdir="${build.dir}"        workdir="${build.dir}"
774        classes="${product.jar}">        classes="${product.jar}">
775        <javac-elements>        <javac-elements>
776          <!-- Needed to silence -Xep:FutureReturnValueIgnored -->          <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
777          <compilerarg value="-J--illegal-access=permit"/>          <compilerarg value="-J--illegal-access=permit"/>
778          <compilerarg value="-XDcompilePolicy=simple"/>          <compilerarg value="-XDcompilePolicy=simple"/>
779          <compilerarg line="-processorpath ${errorprone.jar}"/>          <compilerarg line="-processorpath ${errorprone.processorpath}"/>
780          <compilerarg value="-Xplugin:ErrorProne          <compilerarg value="-Xplugin:ErrorProne
781                              ${errorprone.jsr166.flags}                              ${errorprone.jsr166.flags}
782                              ${errorprone.jsr166.test.flags}"/>                              ${errorprone.jsr166.test.flags}"/>
# Line 1462  Line 792 
792            description="Run errorprone over jtreg tests (experimental)">            description="Run errorprone over jtreg tests (experimental)">
793    
794      <run-jtreg-tests      <run-jtreg-tests
795         target="${build.main.java.version}"         target="${java.runtime.target}"
796         workdir="${build.dir}"         workdir="${build.dir}"
797         classes="${product.jar}"         classes="${product.jar}"
798         verbose="all">         verbose="all">
799        <jtreg-elements>        <jtreg-elements>
800          <arg value="-javacoption:-XDcompilePolicy=simple"/>          <arg value="-javacoption:-XDcompilePolicy=simple"/>
801          <arg value="-javacoption:-processorpath"/>          <arg value="-javacoption:-processorpath"/>
802          <arg value="-javacoption:${errorprone.jar}"/>          <arg value="-javacoption:${errorprone.processorpath}"/>
803          <arg value="-javacoption:-Xplugin:ErrorProne          <arg value="-javacoption:-Xplugin:ErrorProne
804                              ${errorprone.jsr166.flags}                              ${errorprone.jsr166.flags}
805                              ${errorprone.jsr166.test.flags}                              ${errorprone.jsr166.test.flags}

Legend:
Removed from v.1.285  
changed lines
  Added in v.1.313

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