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

Diff of /jsr166/build.xml

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

revision 1.282 by jsr166, Tue Oct 9 01:34:19 2018 UTC revision 1.304 by jsr166, Sun Oct 6 17:34:58 2019 UTC
# Line 1  Line 1 
1  <project name="jsr166" default="usage"  <project name="jsr166" default="usage"
2    xmlns:if="ant:if"    xmlns:if="ant:if"
3    xmlns:unless="ant:unless"    xmlns:unless="ant:unless"
4    xmlns:ivy="antlib:org.apache.ivy.ant">    xmlns:ivy="antlib:org.apache.ivy.ant">
5    
# 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    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  
27    $HOME/jdk/src/jdk11    $HOME/jdk/src/jdk11
28    $HOME/jdk/src/jdk12    $HOME/jdk/src/jdk12
29    where each of the above is a complete JDK source tree    $HOME/jdk/src/jdk13
30    (e.g. mercurial forest) or a symlink to same.    $HOME/jdk/src/jdk14
31      where each of the above is a JDK source tree or a symlink to same.
32    
33    Alternatively, define ant variables thus:    Alternatively, define ant variables thus:
34    ant -Djdk$N.home=... -Djdk$N.src.home=...    ant -Djdk$N.home=... -Djdk$N.src.home=...
35    for $N in 8 9 10 ...    for $N in 11 .. 14 ...
36    
37    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.
38      As of 2019-08, the sources in src/main are for jdk11+ only.
39      As of 2019-10, compatibility support for jdk8 is dropped entirely.
40  ------------------------------------------------------------------------------  ------------------------------------------------------------------------------
41    </description>    </description>
42    
# Line 55  Line 54 
54    
55    
56    <!-- Compilation options -->    <!-- Compilation options -->
   <property name="build.sourcelevel"    value="6"/>  
57    <property name="build.debug"          value="true"/>    <property name="build.debug"          value="true"/>
58    <property name="build.debuglevel"     value="source,lines,vars"/>    <property name="build.debuglevel"     value="source,lines,vars"/>
59    <property name="build.deprecation"    value="false"/>    <property name="build.deprecation"    value="false"/>
# Line 67  Line 65 
65    <property name="build.testcases.dir"         location="${build.dir}/testcases"/>    <property name="build.testcases.dir"         location="${build.dir}/testcases"/>
66    <property name="build.loops.dir"             location="${build.dir}/loops"/>    <property name="build.loops.dir"             location="${build.dir}/loops"/>
67    
   <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"/>  
   
68    <!-- JDK locations -->    <!-- JDK locations -->
69    <property name="jdks.home"  location="${user.home}/jdk"/>    <property name="jdks.home"  location="${user.home}/jdk"/>
70    
# Line 98  Line 76 
76      <property name="javac@{v}"        location="${jdk@{v}.home}/bin/javac"/>      <property name="javac@{v}"        location="${jdk@{v}.home}/bin/javac"/>
77      <property name="javadoc@{v}"      location="${jdk@{v}.home}/bin/javadoc"/>      <property name="javadoc@{v}"      location="${jdk@{v}.home}/bin/javadoc"/>
78      <property name="jdk@{v}.src.home" location="${jdks.home}/src/jdk@{v}"/>      <property name="jdk@{v}.src.home" location="${jdks.home}/src/jdk@{v}"/>
79      <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"/>  
80      </sequential>      </sequential>
81    </macrodef>    </macrodef>
82    
# Line 132  Line 92 
92      </sequential>      </sequential>
93    </macrodef>    </macrodef>
94    
   <defjdklocations v="6"/>  
   <defjdklocations v="7"/>  
   <defjdklocations v="8"/>  
   <defjdklocations v="9"/>  
   <defjdklocations v="10"/>  
95    <defjdklocations v="11"/>    <defjdklocations v="11"/>
96    <defjdklocations v="12"/>    <defjdklocations v="12"/>
97      <defjdklocations v="13"/>
98      <defjdklocations v="14"/>
99    
100    <!-- Source locations -->    <!-- Source locations -->
101    <property name="src.dir"              location="${basedir}/src/main"/>    <property name="src.dir"              location="${basedir}/src/main"/>
102    <property name="test.src.dir"         location="${basedir}/src/test"/>    <property name="test.src.dir"         location="${basedir}/src/test"/>
103    <property name="loops.src.dir"        location="${basedir}/src/loops"/>    <property name="loops.src.dir"        location="${basedir}/src/loops"/>
104    <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"/>  
105    <property name="jtreg11.src.dir"      location="${test.src.dir}/jtreg"/>    <property name="jtreg11.src.dir"      location="${test.src.dir}/jtreg"/>
106    <property name="jtreg12.src.dir"      location="${test.src.dir}/jtreg"/>    <property name="jtreg12.src.dir"      location="${test.src.dir}/jtreg"/>
107    <property name="jtreg.src.dir"        location="${jtreg9.src.dir}"/>    <property name="jtreg13.src.dir"      location="${test.src.dir}/jtreg"/>
108      <property name="jtreg14.src.dir"      location="${test.src.dir}/jtreg"/>
109      <property name="jtreg.src.dir"        location="${jtreg11.src.dir}"/>
110    <property name="lib.dir"              location="${basedir}/lib"/>    <property name="lib.dir"              location="${basedir}/lib"/>
111    <property name="dist.dir"             location="${basedir}/dist"/>    <property name="dist.dir"             location="${basedir}/dist"/>
112    <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"/>  
113    
114    <!-- Javadoc locations -->    <!-- Javadoc locations -->
115    <property name="docs.dir"          location="${build.dir}/docs"/>    <property name="docs.dir"          location="${build.dir}/docs"/>
116    <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"/>  
117    
118    <!-- Jar locations -->    <!-- Jar locations -->
119    <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"/>  
120    <property name="junit.jar"        location="${lib.dir}/junit.jar"/>    <property name="junit.jar"        location="${lib.dir}/junit.jar"/>
121    
122    <!-- Canonical location of jdk docs root, to use with javadoc -Xdocrootparent flag -->    <!-- Canonical location of jdk docs root, to use with javadoc -Xdocrootparent flag -->
123    <!-- Switched to https: in 2017-10 - JDK-8190312 -->    <!-- Switched to https: in 2017-10 - JDK-8190312 -->
124    <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"/> -->
125    <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"/> -->
126    <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"/> -->
127    <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"/>  
128    <!-- 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"/> -->  
129    <!-- <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"/> -->
130    <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"/> -->
131    <!-- Default jdk doc location (latest stable release seems best) -->    <!-- <property name="java13.docroot.url" value="https://download.java.net/java/early_access/jdk13/docs"/> -->
132    <!-- But pin to jdk 10 until fix for -->    <property name="java11.docroot.url" value="https://docs.oracle.com/en/java/javase/11/docs"/>
133    <!-- 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"/>
134    <property name="java.docroot.url"   value="${java10.docroot.url}"/>    <property name="java13.docroot.url" value="https://docs.oracle.com/en/java/javase/13/docs"/>
135      <property name="java14.docroot.url" value="https://download.java.net/java/early_access/jdk14/docs"/>
136      <!-- Default jdk doc location (latest stable LTS release seems best) -->
137      <property name="java.docroot.url"   value="${java11.docroot.url}"/>
138    
139    <!-- 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/"/>  
140    <property name="java11.api.url"     value="${java11.docroot.url}/api/"/>    <property name="java11.api.url"     value="${java11.docroot.url}/api/"/>
141    <property name="java12.api.url"     value="${java12.docroot.url}/api/"/>    <property name="java12.api.url"     value="${java12.docroot.url}/api/"/>
142      <property name="java13.api.url"     value="${java13.docroot.url}/api/"/>
143      <property name="java14.api.url"     value="${java14.docroot.url}/api/"/>
144    <property name="java.api.url"       value="${java.docroot.url}/api/"/>    <property name="java.api.url"       value="${java.docroot.url}/api/"/>
145    
146    <!-- Define the "jtreg" task -->    <!-- Define the "jtreg" task -->
# Line 224  Line 148 
148    <taskdef name="jtreg" classname="com.sun.javatest.regtest.Main$$Ant"    <taskdef name="jtreg" classname="com.sun.javatest.regtest.Main$$Ant"
149             classpath="${lib.dir}/jtreg.jar" />             classpath="${lib.dir}/jtreg.jar" />
150    
151    <!-- Tck options; see JSR166TestCase.java    <!-- Tck configuration options; see JSR166TestCase.java
152     To profile a single tck test class:     To profile a single tck test class:
153     ant -Djsr166.profileTests=true -Djsr166.profileThreshold=10 -Djsr166.tckTestClass=CompletableFutureTest tck     ant -Djsr166.profileTests=true -Djsr166.profileThreshold=10 -Djsr166.tckTestClass=CompletableFutureTest tck
154     To stress test a single tck test class:     To stress test a single tck test class:
# Line 247  Line 171 
171    
172      <sequential>      <sequential>
173    
     <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>  
   
174      <mkdir dir="@{workdir}/tck-classes"/>      <mkdir dir="@{workdir}/tck-classes"/>
175    
176      <javac srcdir="@{tck.src.dir}"      <javac srcdir="@{tck.src.dir}"
# Line 276  Line 190 
190        <include name="*.java"/>        <include name="*.java"/>
191        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
192        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation,-try"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation,-try"/>
193        <compilerarg value="-Xdoclint:reference/private" if:set="use-doclint"/>        <compilerarg value="-Xdoclint:reference/private"/>
194        <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"/>  
195        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
196        <javac-elements/>        <javac-elements/>
197    
# Line 288  Line 201 
201            failonerror="true"            failonerror="true"
202            jvm="${java@{target}}"            jvm="${java@{target}}"
203            fork="true">            fork="true">
204          <jvmarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>          <jvmarg value="--patch-module=java.base=@{classes}"/>
205          <jvmarg value="--patch-module=java.base=@{classes}" if:set="modules"/>          <jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED"/>
206          <jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED" if:set="modules"/>          <jvmarg value="--add-opens=java.base/java.util=ALL-UNNAMED"/>
207          <jvmarg value="--add-opens=java.base/java.util=ALL-UNNAMED" if:set="modules"/>          <jvmarg value="--add-opens=java.base/java.util.concurrent=ALL-UNNAMED"/>
208          <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"/>
209          <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"/>
210          <jvmarg value="--add-opens=java.base/java.util.concurrent.locks=ALL-UNNAMED" if:set="modules"/>          <jvmarg line="@{jvmflags}"/>
211          <jvmarg line="@{jvmflags}"/>          <!-- ant -Dvmoptions="-Xmx8m" -Djsr166.tckTestClass=CompletableFutureTest tck -->
212          <!-- ant -Dvmoptions="-Xmx8m" -Djsr166.tckTestClass=CompletableFutureTest tck -->          <jvmarg line="${vmoptions}" if:set="vmoptions"/>
213          <jvmarg line="${vmoptions}" if:set="vmoptions"/>  
214            <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
215          <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->          <syspropertyset id="system-properties-used-by-tck">
216          <syspropertyset id="system-properties-used-by-tck">            <propertyref prefix="java.util.concurrent.ForkJoinPool"/>
217            <propertyref prefix="java.util.concurrent.ForkJoinPool"/>            <propertyref prefix="jsr166."/>
218            <propertyref prefix="jsr166."/>            <propertyref name="test.timeout.factor"/>
219            <propertyref name="test.timeout.factor"/>          </syspropertyset>
220          </syspropertyset>  
221            <classpath>
222          <classpath>            <pathelement location="${junit.jar}"/>
223            <pathelement location="${junit.jar}"/>            <pathelement location="@{workdir}/tck-classes"/>
224            <pathelement location="@{workdir}/tck-classes"/>          </classpath>
         </classpath>  
225      </java>      </java>
226    
227      </sequential>      </sequential>
# Line 330  Line 242 
242      </sequential>      </sequential>
243    </macrodef>    </macrodef>
244    
245      <defjtregtests v="14"/>
246      <defjtregtests v="13"/>
247    <defjtregtests v="12"/>    <defjtregtests v="12"/>
248    <defjtregtests v="11"/>    <defjtregtests v="11"/>
   <defjtregtests v="10"/>  
   <defjtregtests v="9"/>  
   <defjtregtests v="8"/>  
   <defjtregtests v="7"/>  
249    
250    <!-- ant -Djtreg.flags=-timeoutFactor:4 -->    <!-- ant -Djtreg.flags=-timeoutFactor:4 -->
251    <property name="jtreg.flags" value=""/>    <property name="jtreg.flags" value=""/>
252    
253    <macrodef name="run-jtreg-tests">    <macrodef name="run-jtreg-tests">
254      <!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->      <!-- ant -Djtreg11.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
255      <attribute name="target"/>      <attribute name="target"/>
256      <attribute name="workdir"/>      <attribute name="workdir"/>
257      <attribute name="classes"/>      <attribute name="classes"/>
# Line 354  Line 264 
264      <!-- ant -Djtreg.verbose=time,fail,error jtreg -->      <!-- ant -Djtreg.verbose=time,fail,error jtreg -->
265      <property name="jtreg.verbose" value="nopass,fail,error"/>      <property name="jtreg.verbose" value="nopass,fail,error"/>
266    
     <local name="modules"/>  
     <condition property="modules">  
       <available file="${jdk@{target}.home}/lib/modules" type="file"/>  
     </condition>  
   
267      <delete dir="@{workdir}/JTwork"   quiet="true"/>      <delete dir="@{workdir}/JTwork"   quiet="true"/>
268      <jtreg dir="${jtreg@{target}.src.dir}"      <jtreg dir="${jtreg@{target}.src.dir}"
269             jdk="${jdk@{target}.home}"             jdk="${jdk@{target}.home}"
270             workDir="@{workdir}/JTwork">             workDir="@{workdir}/JTwork">
271        <patternset refid="jdk@{target}.jtreg.tests"/>        <patternset refid="jdk@{target}.jtreg.tests"/>
272        <arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>        <arg value="-javacoptions:--patch-module=java.base=@{classes}"/>
273        <arg value="-javacoptions:--patch-module=java.base=@{classes}" if:set="modules"/>        <arg value="-vmoptions:--patch-module=java.base=@{classes}"/>
       <arg value="-vmoptions:--patch-module=java.base=@{classes}" if:set="modules"/>  
274        <arg value="-agentvm"/>        <arg value="-agentvm"/>
275        <arg value="-noreport"/>        <arg value="-noreport"/>
276        <arg value="-verbose:@{verbose}"/>        <arg value="-verbose:@{verbose}"/>
# Line 386  Line 290 
290    </path>    </path>
291    
292    <!-- Support @jls tag, used in jdk8+ javadoc -->    <!-- Support @jls tag, used in jdk8+ javadoc -->
293      <!-- TODO: switch to @jls taglet, as supported by jdk14+ javadoc -->
294    <property name="javadoc.jls.cite" value="The Java&amp;trade; Language Specification"/>    <property name="javadoc.jls.cite" value="The Java&amp;trade; Language Specification"/>
295    <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;:"/>
296    
297    <!-- Main targets -->    <!-- Main targets -->
298    
299    <property name="build.main.java.version" value="11"/>    <!-- Default values: may seem strange ... -->
300    <!-- Workaround "no nested properties in ant" -->    <!-- At runtime, target latest LTS, i.e. jdk11 -->
301    <macrodef name="define-build-main-properties">    <!-- But at build time, target jdk9, for maximal binary portability -->
302      <attribute name="v"/>    <!-- ButButBut as of 2019-08, target jdk11 at build time -->
303      <sequential>    <!-- Use javadoc12 (but -link to jdk11 api docs!), to get:
304        <property name="build.main.java"    value="${java@{v}}"/>      o override-methods=summary
305        <property name="build.main.javac"   value="${javac@{v}}"/>      o {@systemProperty ...}
306        <!-- Force javadoc version to be at least 10, so we can use override-methods=summary -->      o 8211194: issues linking to external documentation (was: missing package-list for JDK10 / JDK11 documentation)
307        <!-- Force javadoc version to be at least 12, due to JDK-8202628 -->      o 8202628: javadoc generates bad links in TestModules.java
308        <condition property="build.main.javadoc"      -->
309                   value="${javadoc12}"    <property name="java.runtime.target" value="11"/>
310                   else="${javadoc@{v}}">    <property name="build.main.java" value="${java11}"/>
311          <matches pattern="^(9|10|11)$" string="@{v}"/>    <property name="build.main.javac" value="${javac11}"/>
312        </condition>    <property name="build.main.javadoc" value="${javadoc12}"/>
313      </sequential>    <property name="build.main.javadoc.source" value="${java.runtime.target}"/>
   </macrodef>  
   <define-build-main-properties v="${build.main.java.version}"/>  
314    
315    <target name="dists"    <target name="dists"
316            depends="dist, 4jdk8dist"            depends="dist"
317            description="Builds all public jars and docs"/>            description="Builds all public jars and docs"/>
           <!-- no longer supported: 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist -->  
318    
319    <target name="compile"    <target name="compile"
320            depends="configure-compiler"            depends="configure-compiler"
# Line 439  Line 341 
341        <compilerarg value="--patch-module=java.base=${src.dir}"/>        <compilerarg value="--patch-module=java.base=${src.dir}"/>
342        <compilerarg value="-Xprefer:source"/>        <compilerarg value="-Xprefer:source"/>
343        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
344        <compilerarg value="-Xlint:all"/>  <!--   Xlint:-removal for jdk12 Unsafe Object -> Reference renaming -->
345          <compilerarg value="-Xlint:all,-removal"/>
346        <compilerarg line="--doclint-format html5"/>        <compilerarg line="--doclint-format html5"/>
347        <compilerarg value="-Xdoclint:all/protected,reference/private"/>        <compilerarg value="-Xdoclint:all/protected,reference/private"/>
348          <compilerarg value="-Xdoclint/package:java.util.*"/>
349        <compilerarg value="-Werror"/>        <compilerarg value="-Werror"/>
350        <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>        <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
351        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
# Line 481  Line 385 
385  <!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> -->  <!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> -->
386      <javadoc destdir="${docs.dir}"      <javadoc destdir="${docs.dir}"
387               packagenames="none"               packagenames="none"
388               link="${java11.api.url}"               link="${java.api.url}"
389               overview="${src.dir}/intro.html"               overview="${src.dir}/intro.html"
390               access="${build.javadoc.access}"               access="${build.javadoc.access}"
391               sourcepath="${src.dir}"               sourcepath="${src.dir}"
392               classpath=""               classpath=""
393               source="11"               source="${build.main.javadoc.source}"
394               executable="${build.main.javadoc}">               executable="${build.main.javadoc}">
395    <!-- TODO: JDK-8214571 failonerror = "true" -->
396        <fileset dir="${src.dir}" defaultexcludes="yes">        <fileset dir="${src.dir}" defaultexcludes="yes">
397          <include name="**/*.java"/>          <include name="**/*.java"/>
398        </fileset>        </fileset>
399        <arg line="-Xdocrootparent ${java10.docroot.url}"/>        <arg line="-Xdocrootparent ${java.docroot.url}"/>
400        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
401        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
402        <arg value="-html5"/>        <arg value="-html5"/>
403        <arg value="--patch-module=java.base=${src.dir}"/>        <arg value="--patch-module=java.base=${src.dir}"/>
404    <!-- old school frames via docs/index.html?overview-summary.html -->
405    <!-- TODO: - -frames no longer a supported option in jdk13+ -->
406        <arg value="--frames"/>        <arg value="--frames"/>
407        <arg value="--override-methods=summary"/>        <arg value="--override-methods=summary"/>
408        <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>        <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
# Line 514  Line 421 
421            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
422    
423    
   <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>  
   
   
424    <target name="clean"    <target name="clean"
425            description="Removes all build products">            description="Removes all build products">
426      <delete dir="${build.dir}"/>      <delete dir="${build.dir}"/>
# Line 560  Line 445 
445    </target>    </target>
446    
447    <target name="tck"    <target name="tck"
448            depends="jar"            depends="jar"
449            description="Runs tck tests for src/main directly">            description="Runs tck tests for src/main directly">
450    
451      <run-tck-tests      <run-tck-tests
452        target="${build.main.java.version}"        target="${java.runtime.target}"
453        workdir="${build.dir}"        workdir="${build.dir}"
454        classes="${product.jar}">        classes="${product.jar}">
455        <javac-elements>        <javac-elements>
# Line 595  Line 480 
480    </target>    </target>
481    
482    <target name="jtreg"    <target name="jtreg"
483            depends="jar"            depends="jar"
484            description="Runs jtreg tests for src/main using the jtreg ant task">            description="Runs jtreg tests for src/main using the jtreg ant task">
485      <run-jtreg-tests      <run-jtreg-tests
486         target="${build.main.java.version}"         target="${java.runtime.target}"
487         workdir="${build.dir}"         workdir="${build.dir}"
488         classes="${product.jar}"/>         classes="${product.jar}"/>
489    </target>    </target>
# Line 607  Line 492 
492            depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"            depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
493            description="Runs tck and jtreg tests for src/main"/>            description="Runs tck and jtreg tests for src/main"/>
494    
495  <!--   <target name="jtreg8" description="Runs jtreg tests with jdk8"> -->    <target name="test-version-permutations"
496              depends="test11, test12, test13, test14, test11-12, test11-13, test11-14, clean, test, docs">
497  <!--     <antcall target="jtreg"> -->    </target>
 <!--       <param name="build.main.java.version" value="8"/> -->  
 <!--       <param name="build.main.javac" value="${javac8}"/> -->  
 <!--     </antcall> -->  
   
 <!--   </target> -->  
   
   <target name="test9101112"  
           description="Runs tck and jtreg tests for src/main for multiple java versions">  
498    
499      <target name="test11">
500      <antcall target="clean"/>      <antcall target="clean"/>
501      <antcall target="test">      <antcall>
502        <param name="build.main.java.version" value="9"/>        <param name="java.runtime.target" value="11"/>
503        <param name="build.main.java" value="${java9}"/>        <param name="build.main.javac" value="${javac11}"/>
504        <param name="build.main.javac" value="${javac9}"/>        <param name="build.main.javadoc" value="${javadoc12}"/>
505          <param name="build.main.javadoc.source" value="11"/>
506          <target name="test"/>
507          <target name="docs"/>
508      </antcall>      </antcall>
509      </target>
510    
511      <target name="test12">
512      <antcall target="clean"/>      <antcall target="clean"/>
513      <antcall target="test">      <antcall>
514        <param name="build.main.java.version" value="10"/>        <param name="java.runtime.target" value="12"/>
515        <param name="build.main.java" value="${java10}"/>        <param name="build.main.javac" value="${javac12}"/>
516        <param name="build.main.javac" value="${javac10}"/>        <param name="build.main.javadoc" value="${javadoc12}"/>
517          <param name="build.main.javadoc.source" value="12"/>
518          <target name="test"/>
519          <target name="docs"/>
520      </antcall>      </antcall>
521      </target>
522    
523      <target name="test13">
524      <antcall target="clean"/>      <antcall target="clean"/>
525      <antcall target="test">      <antcall>
526        <param name="build.main.java.version" value="11"/>        <param name="java.runtime.target" value="13"/>
527        <param name="build.main.java" value="${java11}"/>        <param name="build.main.javac" value="${javac13}"/>
528        <param name="build.main.javac" value="${javac11}"/>        <param name="build.main.javadoc" value="${javadoc13}"/>
529          <param name="build.main.javadoc.source" value="13"/>
530          <target name="test"/>
531          <target name="docs"/>
532      </antcall>      </antcall>
533      </target>
534    
535      <target name="test14">
536      <antcall target="clean"/>      <antcall target="clean"/>
537      <antcall target="test">      <antcall>
538        <param name="build.main.java.version" value="12"/>        <param name="java.runtime.target" value="14"/>
539        <param name="build.main.java" value="${java12}"/>        <param name="build.main.javac" value="${javac14}"/>
540        <param name="build.main.javac" value="${javac12}"/>        <param name="build.main.javadoc" value="${javadoc14}"/>
541          <param name="build.main.javadoc.source" value="14"/>
542          <target name="test"/>
543          <target name="docs"/>
544      </antcall>      </antcall>
545      <antcall target="docs">    </target>
546        <param name="build.main.java.version" value="12"/>  
547        <param name="build.main.java" value="${java12}"/>    <target name="test11-12">
548        <param name="build.main.javac" value="${javac12}"/>      <antcall target="clean"/>
549        <antcall>
550          <param name="java.runtime.target" value="12"/>
551          <param name="build.main.javac" value="${javac11}"/>
552        <param name="build.main.javadoc" value="${javadoc12}"/>        <param name="build.main.javadoc" value="${javadoc12}"/>
553          <param name="build.main.javadoc.source" value="11"/>
554          <target name="test"/>
555          <target name="docs"/>
556      </antcall>      </antcall>
557      </target>
558    
559      <!-- Clean up to avoid obscure wrong class file version bugs -->    <target name="test11-13">
560      <antcall target="clean"/>      <antcall target="clean"/>
561        <antcall>
562          <param name="java.runtime.target" value="13"/>
563          <param name="build.main.javac" value="${javac11}"/>
564          <param name="build.main.javadoc" value="${javadoc13}"/>
565          <param name="build.main.javadoc.source" value="11"/>
566          <target name="test"/>
567          <target name="docs"/>
568        </antcall>
569    </target>    </target>
570    
571      <target name="test11-14">
572        <antcall target="clean"/>
573        <antcall>
574          <param name="java.runtime.target" value="14"/>
575          <param name="build.main.javac" value="${javac11}"/>
576          <param name="build.main.javadoc" value="${javadoc14}"/>
577          <param name="build.main.javadoc.source" value="11"/>
578          <target name="test"/>
579          <target name="docs"/>
580        </antcall>
581      </target>
582    
583    
584    <target name="configure-compiler">    <target name="configure-compiler">
# Line 680  Line 601 
601    </target>    </target>
602    
603    
   
   <!-- 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>  
   
   
604    <target name="compile-test-loops" depends="jar"    <target name="compile-test-loops" depends="jar"
605            description="Compiles all the perf tests in src/test/loops">            description="Compiles all the perf tests in src/test/loops">
606    
# Line 729  Line 619 
619    
620        <include name="*.java"/>        <include name="*.java"/>
621        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
622        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
623        <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"/>  
624        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
625      </javac>      </javac>
626    </target>    </target>
627    
628    
629    <target name="4jdk8jar"    <!-- old branches no longer maintained.  build support deleted -->
630            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>  
   
   
631    <!-- 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>  
   
   
632    <!-- 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>  
   
   
633    <!-- 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>  
   
   
634    <!-- 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>  
   
   
635    <!-- jsr166e (no longer maintained) -->    <!-- jsr166e (no longer maintained) -->
636    
   <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>  
   
   
637  <!-- Find buglets that can be detected by static build tools -->  <!-- Find buglets that can be detected by static build tools -->
638    
639  <!--   <target name="lint"> -->  <!--   <target name="lint"> -->
# Line 1414  Line 651 
651    
652    
653  <!-- ==============================================================  <!-- ==============================================================
654    Experimental errorprone support - https://errorprone.info    Experimental errorprone support
655      https://errorprone.info
656      https://errorprone.info/docs/installation
657      https://github.com/google/error-prone/issues/1143
658  =================================================================== -->  =================================================================== -->
659    <property name="errorprone.jar" location="${lib.dir}/error_prone_ant-2.3.1.jar"/>    <path id="errorprone.processorpath.path">
660        <pathelement location="${lib.dir}/error_prone_core-2.3.2-with-dependencies.jar"/>
661        <pathelement location="${lib.dir}/dataflow-2.5.7.jar"/>
662        <pathelement location="${lib.dir}/javacutil-2.5.7.jar"/>
663        <pathelement location="${lib.dir}/jFormatString-3.0.0.jar"/>
664      </path>
665      <property name="errorprone.processorpath" refid="errorprone.processorpath.path" />
666    <property name="errorprone.jsr166.user.flags" value=""/>    <property name="errorprone.jsr166.user.flags" value=""/>
667    <property name="errorprone.jsr166.flags"    <property name="errorprone.jsr166.flags"
668              value="-Xep:HashtableContains:OFF              value="-Xep:HashtableContains:OFF
669                     -Xep:JdkObsolete:OFF                     -Xep:JdkObsolete:OFF
670                     -Xep:MissingOverride:OFF                     -Xep:MissingOverride:OFF
671                     -Xep:MissingFail:OFF                     -Xep:MissingFail:OFF
672                       -Xep:ThreadPriorityCheck:OFF
673                     -Xep:MixedArrayDimensions:ERROR                     -Xep:MixedArrayDimensions:ERROR
674                     -Xep:RemoveUnusedImports:ERROR                     -Xep:RemoveUnusedImports:ERROR
675                     -Xep:EmptyIf:ERROR                     -Xep:EmptyIf:ERROR
# Line 1431  Line 678 
678                     -Xep:LongLiteralLowerCaseSuffix:ERROR                     -Xep:LongLiteralLowerCaseSuffix:ERROR
679                     -Xep:RedundantThrows:ERROR                     -Xep:RedundantThrows:ERROR
680                     -Xep:IdentityBinaryExpression:WARN                     -Xep:IdentityBinaryExpression:WARN
681                       -Xep:ConstructorInvokesOverridable:WARN
682                     -Xep:MethodCanBeStatic:WARN                     -Xep:MethodCanBeStatic:WARN
683                     ${errorprone.jsr166.user.flags}"/>                     ${errorprone.jsr166.user.flags}"/>
684    <!-- -Xep:WildcardImport:ERROR -->    <!-- -Xep:WildcardImport:ERROR -->
# Line 1463  Line 711 
711        <!-- Needed to silence -Xep:FutureReturnValueIgnored -->        <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
712        <compilerarg value="-J--illegal-access=permit"/>        <compilerarg value="-J--illegal-access=permit"/>
713        <compilerarg value="-XDcompilePolicy=simple"/>        <compilerarg value="-XDcompilePolicy=simple"/>
714        <compilerarg line="-processorpath ${errorprone.jar}"/>        <compilerarg value="-processorpath"/>
715          <compilerarg pathref="errorprone.processorpath.path"/>
716        <compilerarg value="-Xplugin:ErrorProne        <compilerarg value="-Xplugin:ErrorProne
717                            ${errorprone.jsr166.flags}"/>                            ${errorprone.jsr166.flags}"/>
718        <compilerarg value="--patch-module=java.base=${src.dir}"/>        <compilerarg value="--patch-module=java.base=${src.dir}"/>
# Line 1480  Line 729 
729      </jar>      </jar>
730    
731      <run-tck-tests      <run-tck-tests
732        target="${build.main.java.version}"        target="${java.runtime.target}"
733        workdir="${build.dir}"        workdir="${build.dir}"
734        classes="${product.jar}">        classes="${product.jar}">
735        <javac-elements>        <javac-elements>
736          <!-- Needed to silence -Xep:FutureReturnValueIgnored -->          <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
737          <compilerarg value="-J--illegal-access=permit"/>          <compilerarg value="-J--illegal-access=permit"/>
738          <compilerarg value="-XDcompilePolicy=simple"/>          <compilerarg value="-XDcompilePolicy=simple"/>
739          <compilerarg line="-processorpath ${errorprone.jar}"/>          <compilerarg line="-processorpath ${errorprone.processorpath}"/>
740          <compilerarg value="-Xplugin:ErrorProne          <compilerarg value="-Xplugin:ErrorProne
741                              ${errorprone.jsr166.flags}                              ${errorprone.jsr166.flags}
742                              ${errorprone.jsr166.test.flags}"/>                              ${errorprone.jsr166.test.flags}"/>
# Line 1503  Line 752 
752            description="Run errorprone over jtreg tests (experimental)">            description="Run errorprone over jtreg tests (experimental)">
753    
754      <run-jtreg-tests      <run-jtreg-tests
755         target="${build.main.java.version}"         target="${java.runtime.target}"
756         workdir="${build.dir}"         workdir="${build.dir}"
757         classes="${product.jar}"         classes="${product.jar}"
758         verbose="all">         verbose="all">
759        <jtreg-elements>        <jtreg-elements>
760          <arg value="-javacoption:-XDcompilePolicy=simple"/>          <arg value="-javacoption:-XDcompilePolicy=simple"/>
761          <arg value="-javacoption:-processorpath"/>          <arg value="-javacoption:-processorpath"/>
762          <arg value="-javacoption:${errorprone.jar}"/>          <arg value="-javacoption:${errorprone.processorpath}"/>
763          <arg value="-javacoption:-Xplugin:ErrorProne          <arg value="-javacoption:-Xplugin:ErrorProne
764                              ${errorprone.jsr166.flags}                              ${errorprone.jsr166.flags}
765                              ${errorprone.jsr166.test.flags}                              ${errorprone.jsr166.test.flags}

Legend:
Removed from v.1.282  
changed lines
  Added in v.1.304

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