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

Diff of /jsr166/build.xml

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

<
revision 1.242 by jsr166, Sat Apr 1 21:47:32 2017 UTC revision 1.308 by jsr166, Thu Oct 17 17:28:49 2019 UTC
# Line 1  Line 1 
1  <project name="jsr166" default="usage"  <project name="jsr166" default="usage"
2    xmlns:if="ant:if" xmlns:unless="ant:unless"    xmlns:if="ant:if"
3      xmlns:unless="ant:unless"
4    xmlns:ivy="antlib:org.apache.ivy.ant">    xmlns:ivy="antlib:org.apache.ivy.ant">
5    
6    <description>    <description>
# Line 18  Line 19 
19    itself.  Because the JDK version matters and because different    itself.  Because the JDK version matters and because different
20    targets require different JDKs, we assume that users have created a    targets require different JDKs, we assume that users have created a
21    hierarchy containing:    hierarchy containing:
22    $HOME/jdk/jdk8    $HOME/jdk/jdk11
23    $HOME/jdk/jdk9    $HOME/jdk/jdk12
24    $HOME/jdk/jdk10    $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
27    $HOME/jdk/src/jdk8    $HOME/jdk/src/jdk11
28    $HOME/jdk/src/jdk9    $HOME/jdk/src/jdk12
29    $HOME/jdk/src/jdk10    $HOME/jdk/src/jdk13
30    where each of the above is a complete JDK source tree    $HOME/jdk/src/jdk14
31    (e.g. mercurial forest) or a symlink to same.    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 50  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 62  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 93  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}/jmods" type="dir"/>  
     <local name="boot.jar.dir"/>  
     <property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib" unless:set="modules"/>  
     <path id="bootclasspath@{v}" unless:set="modules">  
       <pathelement path="${boot.jar.dir}/resources.jar"/>  
       <pathelement path="${boot.jar.dir}/rt.jar"/>  
       <pathelement path="${boot.jar.dir}/jsse.jar"/>  
       <pathelement path="${boot.jar.dir}/jce.jar"/>  
       <pathelement path="${boot.jar.dir}/charsets.jar"/>  
     </path>  
     <property name="bootclasspath@{v}" value="${toString:bootclasspath@{v}}" unless:set="modules"/>  
80      </sequential>      </sequential>
81    </macrodef>    </macrodef>
82    
# Line 127  Line 92 
92      </sequential>      </sequential>
93    </macrodef>    </macrodef>
94    
95    <defjdklocations v="6"/>    <defjdklocations v="11"/>
96    <defjdklocations v="7"/>    <defjdklocations v="12"/>
97    <defjdklocations v="8"/>    <defjdklocations v="13"/>
98    <defjdklocations v="9"/>    <defjdklocations v="14"/>
   <defjdklocations v="10"/>  
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"/>
105    <property name="jtreg7.src.dir"       location="${test.src.dir}/jtreg-jdk7"/>    <property name="jtreg11.src.dir"      location="${test.src.dir}/jtreg"/>
106    <property name="jtreg8.src.dir"       location="${test.src.dir}/jtreg-jdk8"/>    <property name="jtreg12.src.dir"      location="${test.src.dir}/jtreg"/>
107    <property name="jtreg9.src.dir"       location="${test.src.dir}/jtreg"/>    <property name="jtreg13.src.dir"      location="${test.src.dir}/jtreg"/>
108    <property name="jtreg10.src.dir"      location="${test.src.dir}/jtreg"/>    <property name="jtreg14.src.dir"      location="${test.src.dir}/jtreg"/>
109    <property name="jtreg.src.dir"        location="${jtreg9.src.dir}"/>    <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    <property name="java5.docroot.url"      value="http://docs.oracle.com/javase/1.5.0/docs"/>    <!-- Switched to https: in 2017-10 - JDK-8190312 -->
124    <property name="java6.docroot.url"      value="http://docs.oracle.com/javase/6/docs"/>    <!-- <property name="java5.docroot.url"  value="https://docs.oracle.com/javase/1.5.0/docs"/> -->
125    <property name="java7.docroot.url"      value="http://docs.oracle.com/javase/7/docs"/>    <!-- <property name="java6.docroot.url"  value="https://docs.oracle.com/javase/6/docs"/> -->
126    <property name="java8.docroot.url"      value="http://docs.oracle.com/javase/8/docs"/>    <!-- <property name="java7.docroot.url"  value="https://docs.oracle.com/javase/7/docs"/> -->
127    <!-- The expected canonical location does not yet exist as of 2016-04 -->    <!-- <property name="java8.docroot.url"  value="https://docs.oracle.com/javase/8/docs"/> -->
128    <!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> -->    <!-- The location of jdk early access docs (RIP) -->
129    <property name="java9.docroot.url"      value="http://download.java.net/java/jdk9/docs"/>    <!-- <property name="java11.docroot.url" value="http://download.java.net/java/jdk11/docs"/> -->
130    <!-- Default jdk doc location (latest stable release seems best) -->    <!-- <property name="java12.docroot.url" value="https://download.java.net/java/jdk12/docs"/> -->
131    <property name="java.docroot.url"       value="${java8.docroot.url}"/>    <!-- <property name="java13.docroot.url" value="https://download.java.net/java/early_access/jdk13/docs"/> -->
132      <property name="java11.docroot.url" value="https://docs.oracle.com/en/java/javase/11/docs"/>
133      <property name="java12.docroot.url" value="https://docs.oracle.com/en/java/javase/12/docs"/>
134      <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 -->
140    <property name="java5.api.url"      value="${java5.docroot.url}/api/"/>    <property name="java11.api.url"     value="${java11.docroot.url}/api/"/>
141    <property name="java6.api.url"      value="${java6.docroot.url}/api/"/>    <property name="java12.api.url"     value="${java12.docroot.url}/api/"/>
142    <property name="java7.api.url"      value="${java7.docroot.url}/api/"/>    <property name="java13.api.url"     value="${java13.docroot.url}/api/"/>
143    <property name="java8.api.url"      value="${java8.docroot.url}/api/"/>    <property name="java14.api.url"     value="${java14.docroot.url}/api/"/>
   <property name="java9.api.url"      value="${java9.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 204  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 227  Line 171 
171    
172      <sequential>      <sequential>
173    
     <local name="modules"/>  
     <condition property="modules">  
       <available file="${jdk@{compile-target}.home}/jmods" type="dir"/>  
     </condition>  
   
     <local name="use-doclint"/>  
     <condition property="use-doclint">  
       <not> <equals arg1="@{target}" arg2="7"/> </not>  
     </condition>  
   
174      <mkdir dir="@{workdir}/tck-classes"/>      <mkdir dir="@{workdir}/tck-classes"/>
175    
176      <javac srcdir="@{tck.src.dir}"      <javac srcdir="@{tck.src.dir}"
# Line 256  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 268  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>
228    </macrodef>    </macrodef>
229    
230    <!-- Define jtreg test sets for different jdk versions -->    <!-- Define jtreg test sets for different jdk versions -->
231    <fileset dir="${jtreg9.src.dir}">    <!-- ant -Djtreg.test.pattern="**/ConcurrentHashMap/" -->
232      <patternset id="jdk9.jtreg.tests">    <!-- ant -Djtreg.test.pattern="**/ToArray.java" -->
233        <include name="**/*.java"/>    <property name="jtreg.test.pattern" value="**/*.java"/>
234      </patternset>    <macrodef name="defjtregtests">
235    </fileset>      <attribute name="v"/>
236        <sequential>
237    <fileset dir="${jtreg8.src.dir}">        <fileset dir="${jtreg@{v}.src.dir}">
238      <patternset id="jdk8.jtreg.tests">          <patternset id="jdk@{v}.jtreg.tests">
239        <include name="**/*.java"/>            <include name="${jtreg.test.pattern}"/>
240      </patternset>          </patternset>
241    </fileset>        </fileset>
242        </sequential>
243      </macrodef>
244    
245    <fileset dir="${jtreg7.src.dir}">    <defjtregtests v="14"/>
246      <patternset id="jdk7.jtreg.tests">    <defjtregtests v="13"/>
247        <include name="**/*.java"/>    <defjtregtests v="12"/>
248      </patternset>    <defjtregtests v="11"/>
   </fileset>  
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 -->
     <attribute name="source" default="7"/>  
255      <attribute name="target"/>      <attribute name="target"/>
256      <attribute name="workdir"/>      <attribute name="workdir"/>
257      <attribute name="classes"/>      <attribute name="classes"/>
258        <attribute name="verbose" default="${jtreg.verbose}"/>
259      <attribute name="jtregflags" default=""/>      <attribute name="jtregflags" default=""/>
260        <element name="jtreg-elements" optional="true"/>
261    
262      <sequential>      <sequential>
263    
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}/jmods" type="dir"/>  
     </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}"/>
274        <arg value="-vmoptions:--patch-module java.base=@{classes}" if:set="modules"/>        <arg value="-vmoptions:${vmoptions}" if:set="vmoptions"/>
275        <arg value="-agentvm"/>        <arg value="-agentvm"/>
276        <arg value="-noreport"/>        <arg value="-noreport"/>
277        <arg value="-verbose:${jtreg.verbose}"/>        <arg value="-verbose:@{verbose}"/>
278        <arg value="-vmoptions:-esa -ea"/>        <arg value="-vmoptions:-esa -ea"/>
279        <arg value="-automatic"/>        <arg value="-automatic"/>
280        <arg value="-k:!ignore"/>        <arg value="-k:!ignore"/>
281        <arg line="@{jtregflags}"/>        <arg line="@{jtregflags}"/>
282        <arg line="${jtreg.flags}"/>        <arg line="${jtreg.flags}"/>
283          <jtreg-elements/>
284      </jtreg>      </jtreg>
285      </sequential>      </sequential>
286    </macrodef>    </macrodef>
# Line 361  Line 291 
291    </path>    </path>
292    
293    <!-- Support @jls tag, used in jdk8+ javadoc -->    <!-- Support @jls tag, used in jdk8+ javadoc -->
294      <!-- TODO: switch to @jls taglet, as supported by jdk14+ javadoc -->
295    <property name="javadoc.jls.cite" value="The Java&amp;trade; Language Specification"/>    <property name="javadoc.jls.cite" value="The Java&amp;trade; Language Specification"/>
296    <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;:"/>
297    
298    <!-- Main targets -->    <!-- Main targets -->
299    
300    <property name="build.main.java.version" value="9"/>    <!-- Default values: may seem strange ... -->
301    <property name="build.main.javac" value="${javac9}"/>    <!-- At runtime, target latest LTS, i.e. jdk11 -->
302      <!-- But at build time, target jdk9, for maximal binary portability -->
303      <!-- ButButBut as of 2019-08, target jdk11 at build time -->
304      <!-- Use javadoc12 (but -link to jdk11 api docs!), to get:
305        o override-methods=summary
306        o {@systemProperty ...}
307        o 8211194: issues linking to external documentation (was: missing package-list for JDK10 / JDK11 documentation)
308        o 8202628: javadoc generates bad links in TestModules.java
309        -->
310      <property name="java.runtime.target" value="11"/>
311      <property name="build.main.java" value="${java11}"/>
312      <property name="build.main.javac" value="${javac11}"/>
313      <property name="build.main.javadoc" value="${javadoc12}"/>
314      <property name="build.main.javadoc.source" value="${java.runtime.target}"/>
315    
316    <target name="dists"    <target name="dists"
317            depends="dist, 4jdk8dist"            depends="dist"
318            description="Builds all public jars and docs"/>            description="Builds all public jars and docs"/>
           <!--  
               depends="dist, 4jdk8dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"  
           -->  
319    
320    <target name="compile"    <target name="compile"
321            depends="configure-compiler"            depends="configure-compiler"
322            description="Compiles src/main sources to build dir">            description="Compiles src/main sources to build dir">
323    
     <local name="modules"/>  
     <condition property="modules">  
       <and>  
         <available file="${jdk9.home}/jmods" type="dir"/>  
         <equals arg1="9" arg2="${build.main.java.version}"/>  
       </and>  
     </condition>  
   
324      <local name="destdir"/>      <local name="destdir"/>
325      <property name="destdir" value="${build.classes.dir}/java.base" if:set="modules"/>      <property name="destdir" value="${build.classes.dir}/java.base"/>
     <property name="destdir" value="${build.classes.dir}" unless:set="modules"/>  
326    
327      <mkdir dir="${destdir}"/>      <mkdir dir="${destdir}"/>
328    
# Line 407  Line 339 
339             fork="true">             fork="true">
340    
341        <include name="**/*.java"/>        <include name="**/*.java"/>
342        <compilerarg value="--patch-module=java.base=${src.dir}" if:set="modules"/>        <compilerarg value="--patch-module=java.base=${src.dir}"/>
343        <compilerarg value="-Xprefer:source"/>        <compilerarg value="-Xprefer:source"/>
344        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
345        <compilerarg value="-Xlint:all"/>  <!--   Xlint:-removal for jdk12 Unsafe Object -> Reference renaming -->
346        <compilerarg value="-Werror"/>        <compilerarg value="-Xlint:all,-removal"/>
347          <compilerarg line="--doclint-format html5"/>
348        <compilerarg value="-Xdoclint:all/protected,reference/private"/>        <compilerarg value="-Xdoclint:all/protected,reference/private"/>
349          <compilerarg value="-Xdoclint/package:java.util.*"/>
350          <compilerarg value="-Werror"/>
351        <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>        <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
352        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
353    
# Line 438  Line 373 
373    <target name="docs"    <target name="docs"
374            description="Builds javadocs for src/main to dist dir">            description="Builds javadocs for src/main to dist dir">
375    
376      <delete dir="${docs.dir}"/>      <delete dir="${docs.dir}" quiet="true"/>
377      <mkdir dir="${docs.dir}"/>      <mkdir dir="${docs.dir}"/>
378    
379        <!-- old school frames via docs/index.html?overview-summary.html -->
380        <!-- dash-dash-frames no longer a supported option in jdk13+ -->
381        <local name="use-frames"/>
382        <condition property="use-frames">
383          <equals arg1="${build.main.javadoc}" arg2="${javadoc12}"/>
384        </condition>
385    
386      <!-- the packagenames="none" hack below prevents scanning the -->      <!-- the packagenames="none" hack below prevents scanning the -->
387      <!-- sourcepath for packages -->      <!-- sourcepath for packages -->
388    
# Line 451  Line 393 
393  <!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> -->  <!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> -->
394      <javadoc destdir="${docs.dir}"      <javadoc destdir="${docs.dir}"
395               packagenames="none"               packagenames="none"
396               link="${java9.api.url}"               link="${java.api.url}"
397               overview="${src.dir}/intro.html"               overview="${src.dir}/intro.html"
398               access="${build.javadoc.access}"               access="${build.javadoc.access}"
399               sourcepath="${src.dir}"               sourcepath="${src.dir}"
400               classpath=""               classpath=""
401               executable="${javadoc9}">               source="${build.main.javadoc.source}"
402                 executable="${build.main.javadoc}">
403    <!-- TODO: JDK-8214571 failonerror = "true" -->
404        <fileset dir="${src.dir}" defaultexcludes="yes">        <fileset dir="${src.dir}" defaultexcludes="yes">
405          <include name="**/*.java"/>          <include name="**/*.java"/>
406        </fileset>        </fileset>
407        <arg line="-Xdocrootparent ${java9.docroot.url}"/>        <arg line="-Xdocrootparent ${java.docroot.url}"/>
408        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
409          <arg value="-quiet"/>
410        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
411          <arg value="-html5"/>
412        <arg value="--patch-module=java.base=${src.dir}"/>        <arg value="--patch-module=java.base=${src.dir}"/>
413        <arg value="-tag"/>        <arg value="--frames" if:set="use-frames"/>
414        <arg value="${javadoc.jls.option}"/>        <arg value="--override-methods=summary"/>
415  <!-- @apiNote currently unused -->        <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
416  <!--       <arg value="-tag"/> -->        <arg value="-tag"/> <arg value="implSpec:a:Implementation Requirements:"/>
417  <!--       <arg value="apiNote:a:API Note:"/> -->        <arg value="-tag"/> <arg value="implNote:a:Implementation Note:"/>
418        <arg value="-tag"/>        <arg value="-tag"/> <arg value="apiNote:a:API Note:"/>
       <arg value="implSpec:a:Implementation Requirements:"/>  
       <arg value="-tag"/>  
       <arg value="implNote:a:Implementation Note:"/>  
419  <!-- tags added in jdk9: currently unused -->  <!-- tags added in jdk9: currently unused -->
420  <!--       <arg value="-tag"/> -->  <!--  <arg value="-tag"/> <arg value="revised:X"/> -->
421  <!--       <arg value="revised:X"/> -->  <!--  <arg value="-tag"/> <arg value="spec:X"/> -->
 <!--       <arg value="-tag"/> -->  
 <!--       <arg value="spec:X"/> -->  
422      </javadoc>      </javadoc>
423    </target>    </target>
424    
# Line 487  Line 428 
428            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
429    
430    
   <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>  
   
   
431    <target name="clean"    <target name="clean"
432            description="Removes all build products">            description="Removes all build products">
433      <delete dir="${build.dir}"/>      <delete dir="${build.dir}"/>
# Line 533  Line 452 
452    </target>    </target>
453    
454    <target name="tck"    <target name="tck"
455            depends="jar"            depends="jar"
456            description="Runs tck tests for src/main directly">            description="Runs tck tests for src/main directly">
457    
458      <run-tck-tests      <run-tck-tests
459        target="${build.main.java.version}"        target="${java.runtime.target}"
460        workdir="${build.dir}"        workdir="${build.dir}"
461        classes="${product.jar}">        classes="${product.jar}">
462        <javac-elements>        <javac-elements>
# Line 568  Line 487 
487    </target>    </target>
488    
489    <target name="jtreg"    <target name="jtreg"
490            depends="jar"            depends="jar"
491            description="Runs jtreg tests for src/main using the jtreg ant task">            description="Runs jtreg tests for src/main using the jtreg ant task">
492      <run-jtreg-tests      <run-jtreg-tests
493         target="${build.main.java.version}"         target="${java.runtime.target}"
494         workdir="${build.dir}"         workdir="${build.dir}"
495         classes="${product.jar}"/>         classes="${product.jar}"/>
496    </target>    </target>
# Line 580  Line 499 
499            depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"            depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
500            description="Runs tck and jtreg tests for src/main"/>            description="Runs tck and jtreg tests for src/main"/>