ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/build.xml
(Generate patch)

Comparing jsr166/build.xml (file contents):
Revision 1.303 by jsr166, Tue Sep 17 16:20:44 2019 UTC vs.
Revision 1.314 by jsr166, Wed May 6 16:51:05 2020 UTC

# Line 19 | Line 19
19    itself.  Because the JDK version matters and because different
20    targets require different JDKs, we assume that users have created a
21    hierarchy containing:
22  $HOME/jdk/jdk8
22    $HOME/jdk/jdk11
23    $HOME/jdk/jdk12
24    $HOME/jdk/jdk13
25    $HOME/jdk/jdk14
26 +  $HOME/jdk/jdk15
27    where each of the above is a JDK or a symlink to same, and
28  $HOME/jdk/src/jdk8
28    $HOME/jdk/src/jdk11
29    $HOME/jdk/src/jdk12
30    $HOME/jdk/src/jdk13
31    $HOME/jdk/src/jdk14
32 <  where each of the above is a complete JDK source tree
33 <  (e.g. mercurial forest) or a symlink to same.
32 >  $HOME/jdk/src/jdk15
33 >  where each of the above is a JDK source tree or a symlink to same.
34  
35    Alternatively, define ant variables thus:
36    ant -Djdk$N.home=... -Djdk$N.src.home=...
37 <  for $N in 8 .. 14 ...
37 >  for $N in 11 .. 15 ...
38  
39    As of 2016-03, the sources in src/main are for jdk9+ only.
40    As of 2019-08, the sources in src/main are for jdk11+ only.
41 +  As of 2019-10, compatibility support for jdk8 is dropped entirely.
42   ------------------------------------------------------------------------------
43    </description>
44  
# Line 67 | Line 67
67    <property name="build.testcases.dir"         location="${build.dir}/testcases"/>
68    <property name="build.loops.dir"             location="${build.dir}/loops"/>
69  
70  <property name="build.4jdk7.dir"             location="${build.dir}/jsr166-4jdk7"/>
71  <property name="build.4jdk7.classes.dir"     location="${build.4jdk7.dir}/classes"/>
72  <property name="build.4jdk7.tck.classes.dir" location="${build.4jdk7.dir}/tck-classes"/>
73  <property name="build.4jdk7.docs.dir"        location="${build.4jdk7.dir}/docs"/>
74
75  <property name="build.4jdk8.dir"             location="${build.dir}/jsr166-4jdk8"/>
76  <property name="build.4jdk8.classes.dir"     location="${build.4jdk8.dir}/classes"/>
77  <property name="build.4jdk8.tck.classes.dir" location="${build.4jdk8.dir}/tck-classes"/>
78  <property name="build.4jdk8.docs.dir"        location="${build.4jdk8.dir}/docs"/>
79
80  <property name="build.jsr166x.dir"           location="${build.dir}/jsr166x"/>
81  <property name="build.jsr166y.dir"           location="${build.dir}/jsr166y"/>
82  <property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>
83  <property name="build.extra166y.dir"         location="${build.dir}/extra166y"/>
84
85  <property name="build.jsr166x.classes.dir"   location="${build.jsr166x.dir}/classes"/>
86  <property name="build.jsr166y.classes.dir"   location="${build.jsr166y.dir}/classes"/>
87  <property name="build.jsr166e.classes.dir"   location="${build.jsr166e.dir}/classes"/>
88  <property name="build.extra166y.classes.dir" location="${build.extra166y.dir}/classes"/>
89
70    <!-- JDK locations -->
71    <property name="jdks.home"  location="${user.home}/jdk"/>
72  
# Line 98 | Line 78
78      <property name="javac@{v}"        location="${jdk@{v}.home}/bin/javac"/>
79      <property name="javadoc@{v}"      location="${jdk@{v}.home}/bin/javadoc"/>
80      <property name="jdk@{v}.src.home" location="${jdks.home}/src/jdk@{v}"/>
81 <    <local name="have.java.base"/>
102 <    <available property="have.java.base"
103 <      file="${jdk@{v}.src.home}/jdk/src/java.base/share/classes" type="dir"/>
104 <    <property name="jdk@{v}.src.dir" location="${jdk@{v}.src.home}/jdk/src/java.base/share/classes"
105 <      if:set="have.java.base"/>
106 <    <property name="jdk@{v}.src.dir" location="${jdk@{v}.src.home}/jdk/src/share/classes"
107 <      unless:set="have.java.base"/>
108 <    <local name="modules"/>
109 <    <available property="modules" file="${jdk@{v}.home}/lib/modules" type="file"/>
110 <    <local name="boot.jar.dir"/>
111 <    <property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib" unless:set="modules"/>
112 <    <path id="bootclasspath@{v}" unless:set="modules">
113 <      <pathelement path="${boot.jar.dir}/resources.jar"/>
114 <      <pathelement path="${boot.jar.dir}/rt.jar"/>
115 <      <pathelement path="${boot.jar.dir}/jsse.jar"/>
116 <      <pathelement path="${boot.jar.dir}/jce.jar"/>
117 <      <pathelement path="${boot.jar.dir}/charsets.jar"/>
118 <    </path>
119 <    <property name="bootclasspath@{v}" value="${toString:bootclasspath@{v}}" unless:set="modules"/>
81 >    <property name="jdk@{v}.src.dir"  location="${jdk@{v}.src.home}/jdk/src/java.base/share/classes"/>
82      </sequential>
83    </macrodef>
84  
# Line 132 | Line 94
94      </sequential>
95    </macrodef>
96  
135  <defjdklocations v="8"/>
97    <defjdklocations v="11"/>
98    <defjdklocations v="12"/>
99    <defjdklocations v="13"/>
100    <defjdklocations v="14"/>
101 +  <defjdklocations v="15"/>
102  
103    <!-- Source locations -->
104    <property name="src.dir"              location="${basedir}/src/main"/>
105    <property name="test.src.dir"         location="${basedir}/src/test"/>
106    <property name="loops.src.dir"        location="${basedir}/src/loops"/>
107    <property name="tck.src.dir"          location="${test.src.dir}/tck"/>
146  <property name="jtreg8.src.dir"       location="${test.src.dir}/jtreg-jdk8"/>
108    <property name="jtreg11.src.dir"      location="${test.src.dir}/jtreg"/>
109    <property name="jtreg12.src.dir"      location="${test.src.dir}/jtreg"/>
110    <property name="jtreg13.src.dir"      location="${test.src.dir}/jtreg"/>
111    <property name="jtreg14.src.dir"      location="${test.src.dir}/jtreg"/>
112 +  <property name="jtreg15.src.dir"      location="${test.src.dir}/jtreg"/>
113    <property name="jtreg.src.dir"        location="${jtreg11.src.dir}"/>
114    <property name="lib.dir"              location="${basedir}/lib"/>
115    <property name="dist.dir"             location="${basedir}/dist"/>
116    <property name="topsrc.dir"           location="${basedir}/src"/>
155  <property name="4jdk7src.dir"         location="${topsrc.dir}/jdk7"/>
156  <property name="4jdk8src.dir"         location="${topsrc.dir}/jdk8"/>
157  <property name="jsr166xsrc.dir"       location="${topsrc.dir}/jsr166x"/>
158  <property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>
159  <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
160  <property name="extra166ysrc.dir"     location="${topsrc.dir}/extra166y"/>
117  
118    <!-- Javadoc locations -->
119    <property name="docs.dir"          location="${build.dir}/docs"/>
120 <  <property name="4jdk7docs.dir"     location="${build.4jdk7.dir}/docs"/>
165 <  <property name="4jdk8docs.dir"     location="${build.4jdk8.dir}/docs"/>
166 <  <property name="jsr166xdocs.dir"   location="${build.jsr166x.dir}/docs"/>
167 <  <property name="jsr166ydocs.dir"   location="${build.jsr166y.dir}/docs"/>
168 <  <property name="jsr166edocs.dir"   location="${build.jsr166e.dir}/docs"/>
169 <  <property name="extra166ydocs.dir" location="${build.extra166y.dir}/docs"/>
170 <
171 <  <property name="dist.docs.dir"          location="${dist.dir}/docs"/>
172 <  <property name="dist.4jdk7docs.dir"     location="${dist.dir}/jsr166-4jdk7docs"/>
173 <  <property name="dist.4jdk8docs.dir"     location="${dist.dir}/jsr166-4jdk8docs"/>
174 <  <property name="dist.jsr166xdocs.dir"   location="${dist.dir}/jsr166xdocs"/>
175 <  <property name="dist.jsr166ydocs.dir"   location="${dist.dir}/jsr166ydocs"/>
176 <  <property name="dist.jsr166edocs.dir"   location="${dist.dir}/jsr166edocs"/>
177 <  <property name="dist.extra166ydocs.dir" location="${dist.dir}/extra166ydocs"/>
120 >  <property name="dist.docs.dir"     location="${dist.dir}/docs"/>
121  
122    <!-- Jar locations -->
123    <property name="product.jar"      location="${build.dir}/jsr166.jar"/>
181  <property name="4jdk7product.jar" location="${build.4jdk7.dir}/jsr166-4jdk7.jar"/>
182  <property name="4jdk8product.jar" location="${build.4jdk8.dir}/jsr166-4jdk8.jar"/>
183  <property name="jsr166x.jar"      location="${build.jsr166x.dir}/jsr166x.jar"/>
184  <property name="jsr166y.jar"      location="${build.jsr166y.dir}/jsr166y.jar"/>
185  <property name="jsr166e.jar"      location="${build.jsr166e.dir}/jsr166e.jar"/>
186  <property name="extra166y.jar"    location="${build.extra166y.dir}/extra166y.jar"/>
124    <property name="junit.jar"        location="${lib.dir}/junit.jar"/>
125  
126    <!-- Canonical location of jdk docs root, to use with javadoc -Xdocrootparent flag -->
127    <!-- Switched to https: in 2017-10 - JDK-8190312 -->
128 <  <property name="java5.docroot.url"  value="https://docs.oracle.com/javase/1.5.0/docs"/>
129 <  <property name="java6.docroot.url"  value="https://docs.oracle.com/javase/6/docs"/>
130 <  <property name="java7.docroot.url"  value="https://docs.oracle.com/javase/7/docs"/>
131 <  <property name="java8.docroot.url"  value="https://docs.oracle.com/javase/8/docs"/>
195 <  <property name="java11.docroot.url" value="https://docs.oracle.com/en/java/javase/11/docs"/>
196 <  <property name="java12.docroot.url" value="https://docs.oracle.com/en/java/javase/12/docs"/>
197 <  <property name="java13.docroot.url" value="https://docs.oracle.com/en/java/javase/13/docs"/>
128 >  <!-- <property name="java5.docroot.url"  value="https://docs.oracle.com/javase/1.5.0/docs"/> -->
129 >  <!-- <property name="java6.docroot.url"  value="https://docs.oracle.com/javase/6/docs"/> -->
130 >  <!-- <property name="java7.docroot.url"  value="https://docs.oracle.com/javase/7/docs"/> -->
131 >  <!-- <property name="java8.docroot.url"  value="https://docs.oracle.com/javase/8/docs"/> -->
132    <!-- The location of jdk early access docs (RIP) -->
133    <!-- <property name="java11.docroot.url" value="http://download.java.net/java/jdk11/docs"/> -->
134    <!-- <property name="java12.docroot.url" value="https://download.java.net/java/jdk12/docs"/> -->
135    <!-- <property name="java13.docroot.url" value="https://download.java.net/java/early_access/jdk13/docs"/> -->
136 <  <property name="java14.docroot.url" value="https://download.java.net/java/early_access/jdk14/docs"/>
136 >  <property name="java11.docroot.url" value="https://docs.oracle.com/en/java/javase/11/docs"/>
137 >  <property name="java12.docroot.url" value="https://docs.oracle.com/en/java/javase/12/docs"/>
138 >  <property name="java13.docroot.url" value="https://docs.oracle.com/en/java/javase/13/docs"/>
139 >  <property name="java14.docroot.url" value="https://docs.oracle.com/en/java/javase/14/docs"/>
140 >  <property name="java15.docroot.url" value="https://download.java.net/java/early_access/jdk15/docs"/>
141    <!-- Default jdk doc location (latest stable LTS release seems best) -->
142    <property name="java.docroot.url"   value="${java11.docroot.url}"/>
143  
144    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
207  <property name="java8.api.url"      value="${java8.docroot.url}/api/"/>
145    <property name="java11.api.url"     value="${java11.docroot.url}/api/"/>
146    <property name="java12.api.url"     value="${java12.docroot.url}/api/"/>
147    <property name="java13.api.url"     value="${java13.docroot.url}/api/"/>
148    <property name="java14.api.url"     value="${java14.docroot.url}/api/"/>
149 +  <property name="java15.api.url"     value="${java15.docroot.url}/api/"/>
150    <property name="java.api.url"       value="${java.docroot.url}/api/"/>
151  
152    <!-- Define the "jtreg" task -->
# Line 216 | Line 154
154    <taskdef name="jtreg" classname="com.sun.javatest.regtest.Main$$Ant"
155             classpath="${lib.dir}/jtreg.jar" />
156  
157 <  <!-- Tck options; see JSR166TestCase.java
157 >  <!-- Tck configuration options; see JSR166TestCase.java
158     To profile a single tck test class:
159     ant -Djsr166.profileTests=true -Djsr166.profileThreshold=10 -Djsr166.tckTestClass=CompletableFutureTest tck
160     To stress test a single tck test class:
# Line 239 | Line 177
177  
178      <sequential>
179  
242    <local name="modules"/>
243    <condition property="modules">
244      <available file="${jdk@{compile-target}.home}/lib/modules" type="file"/>
245    </condition>
246
247    <local name="use-doclint"/>
248    <condition property="use-doclint">
249      <not> <equals arg1="@{target}" arg2="7"/> </not>
250    </condition>
251
180      <mkdir dir="@{workdir}/tck-classes"/>
181  
182      <javac srcdir="@{tck.src.dir}"
# Line 268 | Line 196
196        <include name="*.java"/>
197        <compilerarg value="-XDignore.symbol.file=true"/>
198        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation,-try"/>
199 <      <compilerarg value="-Xdoclint:reference/private" if:set="use-doclint"/>
200 <      <compilerarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
273 <      <compilerarg value="--patch-module=java.base=@{classes}" if:set="modules"/>
199 >      <compilerarg value="-Xdoclint:reference/private"/>
200 >      <compilerarg value="--patch-module=java.base=@{classes}"/>
201        <compilerarg line="${build.args}"/>
202        <javac-elements/>
203  
# Line 280 | Line 207
207            failonerror="true"
208            jvm="${java@{target}}"
209            fork="true">
210 <        <jvmarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
211 <        <jvmarg value="--patch-module=java.base=@{classes}" if:set="modules"/>
212 <        <jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED" if:set="modules"/>
213 <        <jvmarg value="--add-opens=java.base/java.util=ALL-UNNAMED" if:set="modules"/>
214 <        <jvmarg value="--add-opens=java.base/java.util.concurrent=ALL-UNNAMED" if:set="modules"/>
215 <        <jvmarg value="--add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED" if:set="modules"/>
216 <        <jvmarg value="--add-opens=java.base/java.util.concurrent.locks=ALL-UNNAMED" if:set="modules"/>
217 <        <jvmarg line="@{jvmflags}"/>
218 <        <!-- ant -Dvmoptions="-Xmx8m" -Djsr166.tckTestClass=CompletableFutureTest tck -->
219 <        <jvmarg line="${vmoptions}" if:set="vmoptions"/>
220 <
221 <        <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
222 <        <syspropertyset id="system-properties-used-by-tck">
223 <          <propertyref prefix="java.util.concurrent.ForkJoinPool"/>
224 <          <propertyref prefix="jsr166."/>
225 <          <propertyref name="test.timeout.factor"/>
226 <        </syspropertyset>
227 <
228 <        <classpath>
229 <          <pathelement location="${junit.jar}"/>
230 <          <pathelement location="@{workdir}/tck-classes"/>
304 <        </classpath>
210 >        <jvmarg value="--patch-module=java.base=@{classes}"/>
211 >        <jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED"/>
212 >        <jvmarg value="--add-opens=java.base/java.util=ALL-UNNAMED"/>
213 >        <jvmarg value="--add-opens=java.base/java.util.concurrent=ALL-UNNAMED"/>
214 >        <jvmarg value="--add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED"/>
215 >        <jvmarg value="--add-opens=java.base/java.util.concurrent.locks=ALL-UNNAMED"/>
216 >        <jvmarg line="@{jvmflags}"/>
217 >        <!-- ant -Dvmoptions="-Xmx8m" -Djsr166.tckTestClass=CompletableFutureTest tck -->
218 >        <jvmarg line="${vmoptions}" if:set="vmoptions"/>
219 >
220 >        <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
221 >        <syspropertyset id="system-properties-used-by-tck">
222 >          <propertyref prefix="java.util.concurrent.ForkJoinPool"/>
223 >          <propertyref prefix="jsr166."/>
224 >          <propertyref name="test.timeout.factor"/>
225 >        </syspropertyset>
226 >
227 >        <classpath>
228 >          <pathelement location="${junit.jar}"/>
229 >          <pathelement location="@{workdir}/tck-classes"/>
230 >        </classpath>
231      </java>
232  
233      </sequential>
# Line 322 | Line 248
248      </sequential>
249    </macrodef>
250  
251 +  <defjtregtests v="15"/>
252    <defjtregtests v="14"/>
253    <defjtregtests v="13"/>
254    <defjtregtests v="12"/>
255    <defjtregtests v="11"/>
329  <defjtregtests v="8"/>
256  
257    <!-- ant -Djtreg.flags=-timeoutFactor:4 -->
258    <property name="jtreg.flags" value=""/>
# Line 345 | Line 271
271      <!-- ant -Djtreg.verbose=time,fail,error jtreg -->
272      <property name="jtreg.verbose" value="nopass,fail,error"/>
273  
348    <local name="modules"/>
349    <condition property="modules">
350      <available file="${jdk@{target}.home}/lib/modules" type="file"/>
351    </condition>
352
274      <delete dir="@{workdir}/JTwork"   quiet="true"/>
275      <jtreg dir="${jtreg@{target}.src.dir}"
276             jdk="${jdk@{target}.home}"
277             workDir="@{workdir}/JTwork">
278        <patternset refid="jdk@{target}.jtreg.tests"/>
279 <      <arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
280 <      <arg value="-javacoptions:--patch-module=java.base=@{classes}" if:set="modules"/>
281 <      <arg value="-vmoptions:--patch-module=java.base=@{classes}" if:set="modules"/>
279 >      <arg value="-javacoptions:--patch-module=java.base=@{classes}"/>
280 >      <arg value="-vmoptions:--patch-module=java.base=@{classes}"/>
281 >      <arg value="-vmoptions:${vmoptions}" if:set="vmoptions"/>
282        <arg value="-agentvm"/>
283        <arg value="-noreport"/>
284        <arg value="-verbose:@{verbose}"/>
# Line 400 | Line 321
321    <property name="build.main.javadoc.source" value="${java.runtime.target}"/>
322  
323    <target name="dists"
324 <          depends="dist, 4jdk8dist"
324 >          depends="dist"
325            description="Builds all public jars and docs"/>
405          <!-- no longer supported: 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist -->
326  
327    <target name="compile"
328            depends="configure-compiler"
# Line 432 | Line 352
352   <!--   Xlint:-removal for jdk12 Unsafe Object -> Reference renaming -->
353        <compilerarg value="-Xlint:all,-removal"/>
354        <compilerarg line="--doclint-format html5"/>
355 <      <compilerarg value="-Xdoclint:all/protected,reference/private"/>
355 > <!--  Temporarily disable doclint for private elements, due to -->
356 > <!--  https://bugs.openjdk.java.net/browse/JDK-8214571 -->
357 > <!--  which is expected to be fixed in openjdk 11.0.8 -->
358 > <!--  <compilerarg value="-Xdoclint:all/protected,reference/private"/> -->
359 >      <compilerarg value="-Xdoclint:all/protected"/>
360        <compilerarg value="-Xdoclint/package:java.util.*"/>
361        <compilerarg value="-Werror"/>
362        <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
# Line 460 | Line 384
384    <target name="docs"
385            description="Builds javadocs for src/main to dist dir">
386  
387 <    <delete dir="${docs.dir}"/>
387 >    <delete dir="${docs.dir}" quiet="true"/>
388      <mkdir dir="${docs.dir}"/>
389  
390 +    <!-- old school frames via docs/index.html?overview-summary.html -->
391 +    <!-- dash-dash-frames no longer a supported option in jdk13+ -->
392 +    <local name="use-frames"/>
393 +    <condition property="use-frames">
394 +      <equals arg1="${build.main.javadoc}" arg2="${javadoc12}"/>
395 +    </condition>
396 +
397      <!-- the packagenames="none" hack below prevents scanning the -->
398      <!-- sourcepath for packages -->
399  
# Line 486 | Line 417
417        </fileset>
418        <arg line="-Xdocrootparent ${java.docroot.url}"/>
419        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
420 +      <arg value="-quiet"/>
421        <arg value="-XDignore.symbol.file=true"/>
422        <arg value="-html5"/>
423        <arg value="--patch-module=java.base=${src.dir}"/>
424 < <!-- old school frames via docs/index.html?overview-summary.html -->
493 < <!-- TODO: - -frames no longer a supported option in jdk13+ -->
494 <      <arg value="--frames"/>
424 >      <arg value="--frames" if:set="use-frames"/>
425        <arg value="--override-methods=summary"/>
426        <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
427        <arg value="-tag"/> <arg value="implSpec:a:Implementation Requirements:"/>
# Line 533 | Line 463
463    </target>
464  
465    <target name="tck"
466 <          depends="jar"
466 >          depends="jar"
467            description="Runs tck tests for src/main directly">
468  
469      <run-tck-tests
# Line 568 | Line 498
498    </target>
499  
500    <target name="jtreg"
501 <          depends="jar"
501 >          depends="jar"
502            description="Runs jtreg tests for src/main using the jtreg ant task">
503      <run-jtreg-tests
504         target="${java.runtime.target}"
# Line 581 | Line 511
511            description="Runs tck and jtreg tests for src/main"/>
512  
513    <target name="test-version-permutations"
514 <          depends="test11, test12, test13, test14, test11-12, test11-13, test11-14, clean, test, docs">
515 <  </target>
586 <
587 <  <!-- jdk9 is unsupported as of 2019-08 -->
588 < <!--   <target name="test9"> -->
589 < <!--     <antcall target="clean"/> -->
590 < <!--     <antcall> -->
591 < <!--       <param name="java.runtime.target" value="9"/> -->
592 < <!--       <param name="build.main.javac" value="${javac9}"/> -->
593 < <!--       <param name="build.main.javadoc" value="${javadoc12}"/> -->
594 < <!--       <param name="build.main.javadoc.source" value="9"/> -->
595 < <!--       <target name="test"/> -->
596 < <!--       <target name="docs"/> -->
597 < <!--     </antcall> -->
598 < <!--   </target> -->
599 <
600 <  <!-- jdk10 is unsupported as of 2019-08 -->
601 < <!--   <target name="test10"> -->
602 < <!--     <antcall target="clean"/> -->
603 < <!--     <antcall> -->
604 < <!--       <param name="java.runtime.target" value="10"/> -->
605 < <!--       <param name="build.main.javac" value="${javac10}"/> -->
606 < <!--       <param name="build.main.javadoc" value="${javadoc12}"/> -->
607 < <!--       <param name="build.main.javadoc.source" value="10"/> -->
608 < <!--       <target name="test"/> -->
609 < <!--       <target name="docs"/> -->
610 < <!--     </antcall> -->
611 < <!--   </target> -->
514 >          depends="test11, test12, test13, test14, test15, test11-12, test11-13, test11-14, test11-15, clean, test, docs"
515 >          description="Runs tck and jtreg tests for various build-time and runtime java versions"/>
516  
517    <target name="test11">
614    <antcall target="clean"/>
518      <antcall>
519        <param name="java.runtime.target" value="11"/>
520        <param name="build.main.javac" value="${javac11}"/>
521        <param name="build.main.javadoc" value="${javadoc12}"/>
522        <param name="build.main.javadoc.source" value="11"/>
523 +      <target name="clean"/>
524        <target name="test"/>
525        <target name="docs"/>
526      </antcall>
527    </target>
528  
529    <target name="test12">
626    <antcall target="clean"/>
530      <antcall>
531        <param name="java.runtime.target" value="12"/>
532        <param name="build.main.javac" value="${javac12}"/>
533        <param name="build.main.javadoc" value="${javadoc12}"/>
534        <param name="build.main.javadoc.source" value="12"/>
535 +      <target name="clean"/>
536        <target name="test"/>
537        <target name="docs"/>
538      </antcall>
539    </target>
540  
541    <target name="test13">
638    <antcall target="clean"/>
542      <antcall>
543        <param name="java.runtime.target" value="13"/>
544        <param name="build.main.javac" value="${javac13}"/>
545        <param name="build.main.javadoc" value="${javadoc13}"/>
546        <param name="build.main.javadoc.source" value="13"/>
547 +      <target name="clean"/>
548        <target name="test"/>
549        <target name="docs"/>
550      </antcall>
551    </target>
552  
553    <target name="test14">
650    <antcall target="clean"/>
554      <antcall>
555        <param name="java.runtime.target" value="14"/>
556        <param name="build.main.javac" value="${javac14}"/>
557        <param name="build.main.javadoc" value="${javadoc14}"/>
558        <param name="build.main.javadoc.source" value="14"/>
559 +      <target name="clean"/>
560 +      <target name="test"/>
561 +      <target name="docs"/>
562 +    </antcall>
563 +  </target>
564 +
565 +  <target name="test15">
566 +    <antcall>
567 +      <param name="java.runtime.target" value="15"/>
568 +      <param name="build.main.javac" value="${javac15}"/>
569 +      <param name="build.main.javadoc" value="${javadoc15}"/>
570 +      <param name="build.main.javadoc.source" value="15"/>
571 +      <target name="clean"/>
572        <target name="test"/>
573        <target name="docs"/>
574      </antcall>
575    </target>
576  
577    <target name="test11-12">
662    <antcall target="clean"/>
578      <antcall>
579        <param name="java.runtime.target" value="12"/>
580        <param name="build.main.javac" value="${javac11}"/>
581        <param name="build.main.javadoc" value="${javadoc12}"/>
582        <param name="build.main.javadoc.source" value="11"/>
583 +      <target name="clean"/>
584        <target name="test"/>
585        <target name="docs"/>
586      </antcall>
587    </target>
588  
589    <target name="test11-13">
674    <antcall target="clean"/>
590      <antcall>
591        <param name="java.runtime.target" value="13"/>
592        <param name="build.main.javac" value="${javac11}"/>
593        <param name="build.main.javadoc" value="${javadoc13}"/>
594        <param name="build.main.javadoc.source" value="11"/>
595 +      <target name="clean"/>
596        <target name="test"/>
597        <target name="docs"/>
598      </antcall>
599    </target>
600  
601    <target name="test11-14">
686    <antcall target="clean"/>
602      <antcall>
603        <param name="java.runtime.target" value="14"/>
604        <param name="build.main.javac" value="${javac11}"/>
605        <param name="build.main.javadoc" value="${javadoc14}"/>
606        <param name="build.main.javadoc.source" value="11"/>
607 +      <target name="clean"/>
608 +      <target name="test"/>
609 +      <target name="docs"/>
610 +    </antcall>
611 +  </target>
612 +
613 +  <target name="test11-15">
614 +    <antcall>
615 +      <param name="java.runtime.target" value="15"/>
616 +      <param name="build.main.javac" value="${javac11}"/>
617 +      <param name="build.main.javadoc" value="${javadoc15}"/>
618 +      <param name="build.main.javadoc.source" value="11"/>
619 +      <target name="clean"/>
620        <target name="test"/>
621        <target name="docs"/>
622      </antcall>
# Line 733 | Line 661
661  
662        <include name="*.java"/>
663        <compilerarg value="-XDignore.symbol.file=true"/>
664 <      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
665 <      <compilerarg value="-Xbootclasspath/p:${product.jar}"/>
738 <      <compilerarg line="${build.args}"/>
739 <    </javac>
740 <  </target>
741 <
742 <
743 <  <!-- jsr166 4jdk8 -->
744 <
745 <  <target name="4jdk8compile"
746 <          depends="configure-compiler"
747 <          description="Compiles src/jdk8 sources, targeting jdk8">
748 <
749 <    <mkdir dir="${build.4jdk8.classes.dir}"/>
750 <
751 <    <javac srcdir="${4jdk8src.dir}"
752 <           destdir="${build.4jdk8.classes.dir}"
753 <           debug="${build.debug}"
754 <           debuglevel="${build.debuglevel}"
755 <           deprecation="${build.deprecation}"
756 <           source="8"
757 <           target="8"
758 <           classpath=""
759 <           bootclasspath="${bootclasspath8}"
760 <           includeAntRuntime="false"
761 <           includeJavaRuntime="false"
762 <           encoding="ASCII"
763 <           executable="${javac8}"
764 <           fork="true">
765 <      <include name="**/*.java"/>
766 <      <compilerarg value="-Xprefer:source"/>
767 <      <compilerarg value="-XDignore.symbol.file=true"/>
768 <      <compilerarg value="-Xlint:all"/>
769 <      <compilerarg value="-Werror"/>
770 <      <compilerarg line="${build.args}"/>
771 <    </javac>
772 <  </target>
773 <
774 <  <target name="4jdk8doclint"
775 <          depends="configure-compiler"
776 <          description="Finds doclint warnings">
777 <
778 <    <mkdir dir="${build.4jdk8.classes.dir}"/>
779 <
780 <    <javac srcdir="${4jdk8src.dir}"
781 <           destdir="${build.4jdk8.classes.dir}"
782 <           debug="${build.debug}"
783 <           debuglevel="${build.debuglevel}"
784 <           deprecation="${build.deprecation}"
785 <           source="8"
786 <           target="8"
787 <           classpath=""
788 <           bootclasspath="${bootclasspath8}"
789 <           includeAntRuntime="false"
790 <           includeJavaRuntime="false"
791 <           encoding="ASCII"
792 <           executable="${javac8}"
793 <           fork="true">
794 <      <include name="**/*.java"/>
795 <      <compilerarg value="-Xprefer:source"/>
796 <      <compilerarg value="-XDignore.symbol.file=true"/>
797 <      <compilerarg value="-Xlint:all"/>
798 <      <compilerarg value="-Xdoclint:all/protected,reference/private"/>
664 >      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
665 >      <compilerarg value="--patch-module=java.base=${src.dir}"/>
666        <compilerarg line="${build.args}"/>
667      </javac>
668    </target>
669  
670  
671 <  <target name="4jdk8jar"
672 <          depends="4jdk8compile"
806 <          description="Builds library jar from compiled sources">
807 <
808 <    <jar destfile="${4jdk8product.jar}">
809 <      <fileset dir="${build.4jdk8.classes.dir}"/>
810 <      <manifest>
811 <        <attribute name="Built-By" value="${user.name}"/>
812 <        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
813 <      </manifest>
814 <    </jar>
815 <  </target>
816 <
817 <
818 <  <target name="4jdk8-tck"
819 <          depends="4jdk8jar"
820 <          description="Runs tck tests for jsr166-4jdk8 directly">
821 <
822 <    <run-tck-tests
823 <      target="8"
824 <      workdir="${build.4jdk8.dir}"
825 <      classes="${4jdk8product.jar}">
826 <      <javac-elements>
827 <        <!-- JDK9+ test classes -->
828 <        <exclude name="*9Test.java"/>
829 <        <exclude name="*10Test.java"/>
830 <        <compilerarg value="-Werror"/>
831 <      </javac-elements>
832 <    </run-tck-tests>
833 <  </target>
834 <
835 <
836 <  <target name="4jdk8-jtreg"
837 <          depends="4jdk8jar"
838 <          description="Runs jtreg tests for jsr166-4jdk8 using the jtreg ant task">
839 <    <run-jtreg-tests
840 <       target="8"
841 <       workdir="${build.4jdk8.dir}"
842 <       classes="${4jdk8product.jar}"/>
843 <  </target>
844 <
845 <
846 <  <target name="4jdk8-test"
847 <          depends="4jdk8-tck, 4jdk8-jtreg"
848 <          description="Runs tck and jtreg tests for jsr166-4jdk8"/>
849 <
850 <
851 <  <target name="4jdk8docs"
852 <          description="Builds javadocs for src/jdk8 to dist dir">
853 <
854 <    <delete dir="${4jdk8docs.dir}"/>
855 <    <mkdir dir="${4jdk8docs.dir}"/>
856 <
857 <    <javadoc destdir="${4jdk8docs.dir}"
858 <             packagenames="none"
859 <             link="${java8.api.url}"
860 <             overview="${4jdk8src.dir}/intro.html"
861 <             access="${build.javadoc.access}"
862 <             sourcepath="${4jdk8src.dir}:${jdk8.src.dir}"
863 <             classpath=""
864 <             source="8"
865 <             executable="${javadoc8}"
866 <             failonerror = "true">
867 <      <fileset dir="${4jdk8src.dir}" defaultexcludes="yes">
868 <        <include name="**/*.java"/>
869 <      </fileset>
870 <      <arg line="-Xdocrootparent ${java8.docroot.url}"/>
871 <      <arg value="-XDignore.symbol.file=true"/>
872 <      <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
873 <      <arg value="-tag"/> <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
874 <      <arg value="-tag"/> <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
875 < <!-- @apiNote tag currently unused -->
876 < <!--  <arg value="-tag"/> <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/> -->
877 <    </javadoc>
878 <  </target>
879 <
880 <
881 <  <target name="4jdk8dist"
882 <          depends="4jdk8dist-jar, 4jdk8dist-docs"
883 <          description="Puts all distributable products in single hierarchy"/>
884 <
885 <
886 <  <target name="4jdk8clean"
887 <          description="Removes all 4jdk8 build products">
888 <    <delete dir="${build.4jdk8.dir}"/>
889 <  </target>
890 <
891 <
892 <  <target name="4jdk8dist-jar"
893 <          depends="4jdk8clean, 4jdk8jar">
894 <    <copy file="${4jdk8product.jar}" todir="${dist.dir}"/>
895 <  </target>
896 <
897 <
898 <  <target name="4jdk8dist-docs"
899 <          depends="4jdk8clean, 4jdk8docs">
900 <    <mirror-dir src="${4jdk8docs.dir}" dst="${dist.4jdk8docs.dir}"/>
901 <  </target>
902 <
903 <
671 >  <!-- old branches no longer maintained.  build support deleted -->
672 >  <!-- jsr166 4jdk8; (no longer maintained as of 2019-10) -->
673    <!-- jsr166 4jdk7 (no longer maintained) -->
905
906  <target name="4jdk7compile" depends="configure-compiler">
907    <mkdir dir="${build.4jdk7.classes.dir}"/>
908
909    <javac srcdir="${4jdk7src.dir}"
910           destdir="${build.4jdk7.classes.dir}"
911           debug="${build.debug}"
912           debuglevel="${build.debuglevel}"
913           deprecation="${build.deprecation}"
914           source="6"
915           target="6"
916           classpath=""
917           bootclasspath="${bootclasspath6}"
918           includeAntRuntime="false"
919           includeJavaRuntime="false"
920           encoding="ASCII"
921           executable="${javac7}"
922           fork="true">
923
924      <include name="**/*.java"/>
925      <compilerarg value="-Xprefer:source"/>
926      <compilerarg value="-XDignore.symbol.file=true"/>
927      <compilerarg value="-Xlint:all"/>
928      <compilerarg value="-Werror"/>
929      <compilerarg line="${build.args}"/>
930    </javac>
931  </target>
932
933  <target name="4jdk7doclint" depends="configure-compiler">
934    <mkdir dir="${build.4jdk7.classes.dir}"/>
935
936    <javac srcdir="${4jdk7src.dir}"
937           destdir="${build.4jdk7.classes.dir}"
938           debug="${build.debug}"
939           debuglevel="${build.debuglevel}"
940           deprecation="${build.deprecation}"
941           source="6"
942           target="6"
943           classpath=""
944           bootclasspath="${bootclasspath6}"
945           includeAntRuntime="false"
946           includeJavaRuntime="false"
947           encoding="ASCII"
948           executable="${javac8}"
949           fork="true">
950
951      <include name="**/*.java"/>
952      <compilerarg value="-Xprefer:source"/>
953      <compilerarg value="-XDignore.symbol.file=true"/>
954      <compilerarg value="-Xlint:all"/>
955      <compilerarg value="-Xdoclint:all/protected"/>
956      <compilerarg line="${build.args}"/>
957    </javac>
958  </target>
959
960  <target name="4jdk7jar" depends="4jdk7compile">
961    <jar destfile="${4jdk7product.jar}">
962      <fileset dir="${build.4jdk7.classes.dir}"/>
963      <manifest>
964        <attribute name="Built-By" value="${user.name}"/>
965        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
966      </manifest>
967    </jar>
968  </target>
969
970  <target name="4jdk7-tck" depends="4jdk7jar">
971    <run-tck-tests
972      target="7"
973      workdir="${build.4jdk7.dir}"
974      classes="${4jdk7product.jar}">
975      <javac-elements>
976        <!-- JDK8+ test classes -->
977        <exclude name="*8Test.java"/>
978        <exclude name="*9Test.java"/>
979        <exclude name="*10Test.java"/>
980        <exclude name="DoubleAccumulatorTest.java"/>
981        <exclude name="DoubleAdderTest.java"/>
982        <exclude name="LongAccumulatorTest.java"/>
983        <exclude name="LongAdderTest.java"/>
984        <exclude name="CompletableFutureTest.java"/>
985        <exclude name="SplittableRandomTest.java"/>
986        <exclude name="StampedLockTest.java"/>
987        <exclude name="SubmissionPublisherTest.java"/>
988        <compilerarg value="-Werror"/>
989      </javac-elements>
990    </run-tck-tests>
991  </target>
992
993  <!-- Runs tck tests for jsr166-4jdk7 via junit task (dead experiment) -->
994  <target name="4jdk7-tck-junit" depends="4jdk7compile">
995
996    <junit printsummary="true"
997           showoutput="true"
998           errorProperty="junit.failed"
999           failureProperty="junit.failed"
1000           includeantruntime="true"
1001           jvm="${java7}"
1002           fork="true">
1003
1004      <jvmarg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
1005      <jvmarg value="-server"/>
1006
1007      <classpath>
1008        <pathelement location="${junit.jar}"/>
1009        <pathelement location="${build.4jdk7.tck.classes.dir}"/>
1010      </classpath>
1011
1012      <formatter type="brief"/>
1013
1014      <test name="${jsr166.tckTestClass}" haltonfailure="no">
1015      </test>
1016    </junit>
1017  </target>
1018
1019  <target name="4jdk7-jtreg" depends="4jdk7jar">
1020    <run-jtreg-tests
1021       target="7"
1022       workdir="${build.4jdk7.dir}"
1023       classes="${4jdk7product.jar}"/>
1024  </target>
1025
1026  <target name="4jdk7-test" depends="4jdk7-tck, 4jdk7-jtreg"/>
1027
1028  <target name="4jdk7docs">
1029    <delete dir="${4jdk7docs.dir}"/>
1030    <mkdir dir="${4jdk7docs.dir}"/>
1031
1032    <javadoc destdir="${4jdk7docs.dir}"
1033             packagenames="none"
1034             link="${java7.api.url}"
1035             overview="${4jdk7src.dir}/intro.html"
1036             access="${build.javadoc.access}"
1037             sourcepath="${4jdk7src.dir}:${jdk7.src.dir}"
1038             classpath=""
1039             executable="${javadoc7}"
1040             failonerror = "true">
1041      <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
1042        <include name="**/*.java"/>
1043      </fileset>
1044      <arg line="-Xdocrootparent ${java7.docroot.url}"/>
1045      <arg value="-XDignore.symbol.file=true"/>
1046    </javadoc>
1047  </target>
1048
1049  <target name="4jdk7dist" depends="4jdk7dist-jar, 4jdk7dist-docs"/>
1050
1051  <target name="4jdk7clean">
1052    <delete dir="${build.4jdk7.dir}"/>
1053  </target>
1054
1055  <target name="4jdk7dist-jar" depends="4jdk7clean, 4jdk7jar">
1056    <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
1057  </target>
1058
1059  <target name="4jdk7dist-docs" depends="4jdk7clean, 4jdk7docs">
1060    <mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
1061  </target>
1062
1063
674    <!-- jsr166x (no longer maintained) -->
1065
1066  <target name="jsr166xcompile" depends="configure-compiler">
1067    <mkdir dir="${build.jsr166x.classes.dir}"/>
1068
1069    <javac srcdir="${topsrc.dir}"
1070           destdir="${build.jsr166x.classes.dir}"
1071           debug="${build.debug}"
1072           debuglevel="${build.debuglevel}"
1073           deprecation="${build.deprecation}"
1074           classpath=""
1075           bootclasspath="${bootclasspath6}"
1076           source="5"
1077           target="5"
1078           includeAntRuntime="false"
1079           includeJavaRuntime="false"
1080           encoding="ASCII"
1081           executable="${javac7}"
1082           fork="true">
1083      <include name="jsr166x/**/*.java"/>
1084      <compilerarg value="-XDignore.symbol.file=true"/>
1085      <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
1086      <compilerarg value="-Werror"/>
1087      <compilerarg line="${build.args}"/>
1088    </javac>
1089  </target>
1090
1091  <target name="jsr166xjar" depends="jsr166xcompile">
1092    <jar destfile="${jsr166x.jar}">
1093      <fileset dir="${build.jsr166x.classes.dir}"/>
1094      <manifest>
1095        <attribute name="Built-By" value="${user.name}"/>
1096        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1097      </manifest>
1098    </jar>
1099  </target>
1100
1101  <target name="jsr166xdocs">
1102    <delete dir="${jsr166xdocs.dir}"/>
1103    <mkdir dir="${jsr166xdocs.dir}"/>
1104
1105    <javadoc destdir="${jsr166xdocs.dir}"
1106             packagenames="jsr166x.*"
1107             link="${java.api.url}"
1108             access="${build.javadoc.access}"
1109             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1110             bootclasspath="${bootclasspath6}"
1111             source="5"
1112             executable="${javadoc7}"
1113             failonerror = "true">
1114      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1115      <arg value="-XDignore.symbol.file=true"/>
1116    </javadoc>
1117  </target>
1118
1119  <target name="jsr166xdist" depends="jsr166xdist-jar, jsr166xdist-docs"/>
1120
1121  <target name="jsr166xclean">
1122    <delete dir="${build.jsr166x.dir}"/>
1123  </target>
1124
1125  <target name="jsr166xdist-jar" depends="jsr166xclean, jsr166xjar">
1126    <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
1127  </target>
1128
1129  <target name="jsr166xdist-docs" depends="jsr166xclean, jsr166xdocs">
1130    <mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
1131  </target>
1132
1133
675    <!-- jsr166y (no longer maintained) -->
1135
1136  <target name="jsr166ycompile" depends="configure-compiler">
1137    <mkdir dir="${build.jsr166y.classes.dir}"/>
1138
1139    <javac srcdir="${topsrc.dir}"
1140           destdir="${build.jsr166y.classes.dir}"
1141           debug="${build.debug}"
1142           debuglevel="${build.debuglevel}"
1143           deprecation="${build.deprecation}"
1144           source="6"
1145           target="6"
1146           classpath=""
1147           bootclasspath="${bootclasspath6}"
1148           includeAntRuntime="false"
1149           includeJavaRuntime="false"
1150           encoding="ASCII"
1151           executable="${javac7}"
1152           fork="true">
1153
1154      <include name="jsr166y/**/*.java"/>
1155      <compilerarg value="-XDignore.symbol.file=true"/>
1156      <compilerarg value="-Xlint:all"/>
1157      <compilerarg value="-Werror"/>
1158      <compilerarg line="${build.args}"/>
1159    </javac>
1160  </target>
1161
1162  <target name="jsr166yjar" depends="jsr166ycompile">
1163    <jar destfile="${jsr166y.jar}" index="true">
1164      <fileset dir="${build.jsr166y.classes.dir}"/>
1165      <manifest>
1166        <attribute name="Built-By" value="${user.name}"/>
1167        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1168      </manifest>
1169    </jar>
1170  </target>
1171
1172  <target name="jsr166ydocs">
1173    <delete dir="${jsr166ydocs.dir}"/>
1174    <mkdir dir="${jsr166ydocs.dir}"/>
1175
1176    <javadoc destdir="${jsr166ydocs.dir}"
1177             packagenames="jsr166y.*"
1178             link="${java.api.url}"
1179             access="${build.javadoc.access}"
1180             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1181             bootclasspath="${bootclasspath6}"
1182             source="6"
1183             executable="${javadoc7}"
1184             failonerror = "true">
1185      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1186      <arg value="-XDignore.symbol.file=true"/>
1187    </javadoc>
1188  </target>
1189
1190  <target name="jsr166ydist" depends="jsr166ydist-jar, jsr166ydist-docs"/>
1191
1192  <target name="jsr166yclean">
1193    <delete dir="${build.jsr166y.dir}"/>
1194  </target>
1195
1196  <target name="jsr166ydist-jar" depends="jsr166yclean, jsr166yjar">
1197    <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
1198  </target>
1199
1200  <target name="jsr166ydist-docs" depends="jsr166yclean, jsr166ydocs">
1201    <mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
1202  </target>
1203
1204
676    <!-- extra166y (no longer maintained) -->
1206
1207  <target name="extra166ycompile" depends="configure-compiler, jsr166yjar">
1208    <mkdir dir="${build.extra166y.classes.dir}"/>
1209
1210    <javac srcdir="${topsrc.dir}"
1211           destdir="${build.extra166y.classes.dir}"
1212           debug="${build.debug}"
1213           debuglevel="${build.debuglevel}"
1214           deprecation="${build.deprecation}"
1215           bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
1216           classpath=""
1217           source="6"
1218           target="6"
1219           includeAntRuntime="false"
1220           includeJavaRuntime="false"
1221           encoding="ASCII"
1222           executable="${javac7}"
1223           fork="true">
1224
1225      <include name="extra166y/**/*.java"/>
1226      <compilerarg value="-XDignore.symbol.file=true"/>
1227      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
1228      <compilerarg value="-Werror"/>
1229      <compilerarg line="${build.args}"/>
1230    </javac>
1231  </target>
1232
1233  <target name="extra166yjar" depends="extra166ycompile">
1234    <jar destfile="${extra166y.jar}" index="true">
1235      <fileset dir="${build.extra166y.classes.dir}"/>
1236      <manifest>
1237        <attribute name="Built-By" value="${user.name}"/>
1238        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1239      </manifest>
1240    </jar>
1241  </target>
1242
1243  <target name="extra166ydocs">
1244    <delete dir="${extra166ydocs.dir}"/>
1245    <mkdir dir="${extra166ydocs.dir}"/>
1246
1247    <javadoc destdir="${extra166ydocs.dir}"
1248             packagenames="extra166y.*"
1249             link="${java.api.url}"
1250             access="${build.javadoc.access}"
1251             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1252             bootclasspath="${bootclasspath6}"
1253             source="6"
1254             executable="${javadoc7}">
1255      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1256      <arg value="-XDignore.symbol.file=true"/>
1257    </javadoc>
1258  </target>
1259
1260  <target name="extra166ydist" depends="extra166ydist-jar, extra166ydist-docs"/>
1261
1262  <target name="extra166yclean">
1263    <delete dir="${build.extra166y.dir}"/>
1264  </target>
1265
1266  <target name="extra166ydist-jar" depends="extra166yclean, extra166yjar">
1267    <copy file="${extra166y.jar}" todir="${dist.dir}"/>
1268  </target>
1269
1270  <target name="extra166ydist-docs" depends="extra166yclean, extra166ydocs">
1271    <mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
1272  </target>
1273
1274
677    <!-- jsr166e (no longer maintained) -->
678  
1277  <property name="build.jsr166e.java.version" value="6"/>
1278  <property name="build.jsr166e.javac" value="${javac6}"/>
1279
1280  <target name="jsr166ecompile" depends="configure-compiler">
1281    <mkdir dir="${build.jsr166e.classes.dir}"/>
1282
1283    <javac srcdir="${topsrc.dir}"
1284           destdir="${build.jsr166e.classes.dir}"
1285           debug="${build.debug}"
1286           debuglevel="${build.debuglevel}"
1287           deprecation="${build.deprecation}"
1288           source="${build.jsr166e.java.version}"
1289           target="${build.jsr166e.java.version}"
1290           classpath=""
1291           includeAntRuntime="false"
1292           includeJavaRuntime="false"
1293           executable="${build.jsr166e.javac}"
1294           fork="true">
1295
1296      <include name="jsr166e/**/*.java"/>
1297      <compilerarg value="-XDignore.symbol.file=true"/>
1298      <compilerarg value="-Xlint:all"/>
1299      <compilerarg value="-Werror"/>
1300      <compilerarg line="${build.args}"/>
1301    </javac>
1302  </target>
1303
1304  <target name="jsr166edoclint">
1305    <mkdir dir="${build.jsr166e.classes.dir}"/>
1306
1307    <javac srcdir="${topsrc.dir}"
1308           destdir="${build.jsr166e.classes.dir}"
1309           debug="${build.debug}"
1310           debuglevel="${build.debuglevel}"
1311           deprecation="${build.deprecation}"
1312           source="${build.jsr166e.java.version}"
1313           target="${build.jsr166e.java.version}"
1314           classpath=""
1315           bootclasspath="${bootclasspath6}"
1316           includeAntRuntime="false"
1317           includeJavaRuntime="false"
1318           executable="${javac8}"
1319           fork="true">
1320
1321      <include name="jsr166e/**/*.java"/>
1322      <compilerarg value="-XDignore.symbol.file=true"/>
1323      <compilerarg value="-Xlint:all"/>
1324      <compilerarg value="-Werror"/>
1325      <compilerarg value="-Xdoclint:all/protected"/>
1326    </javac>
1327  </target>
1328
1329  <target name="jsr166ejar" depends="jsr166ecompile">
1330    <jar destfile="${jsr166e.jar}" index="true">
1331      <fileset dir="${build.jsr166e.classes.dir}"/>
1332      <manifest>
1333        <attribute name="Built-By" value="${user.name}"/>
1334        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1335      </manifest>
1336    </jar>
1337  </target>
1338
1339  <target name="jsr166edocs">
1340    <delete dir="${jsr166edocs.dir}"/>
1341    <mkdir dir="${jsr166edocs.dir}"/>
1342
1343    <javadoc destdir="${jsr166edocs.dir}"
1344             packagenames="jsr166e.*"
1345             link="${java.api.url}"
1346             access="${build.javadoc.access}"
1347             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1348             source="${build.jsr166e.java.version}"
1349             executable="${javadoc7}"
1350             failonerror = "true">
1351      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1352      <arg value="-XDignore.symbol.file=true"/>
1353    </javadoc>
1354  </target>
1355
1356  <target name="jsr166e-tck-one-java-version" depends="jsr166ejar">
1357    <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
1358    <run-tck-tests
1359      tck.src.dir="${test.src.dir}/tck-jsr166e"
1360      target="${build.jsr166e.java.version}"
1361      workdir="${build.jsr166e.dir}"
1362      classes="${jsr166e.jar}"/>
1363  </target>
1364
1365  <target name="jsr166e-tck">
1366
1367 <!--     <antcall target="clean"/> -->
1368 <!--     <antcall target="jsr166e-tck-one-java-version"> -->
1369 <!--       <param name="build.jsr166e.java.version" value="8"/> -->
1370 <!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
1371 <!--     </antcall> -->
1372
1373    <antcall target="clean"/>
1374    <antcall target="jsr166e-tck-one-java-version">
1375      <param name="build.jsr166e.java.version" value="7"/>
1376      <param name="build.jsr166e.javac" value="${javac7}"/>
1377    </antcall>
1378
1379    <antcall target="clean"/>
1380    <antcall target="jsr166e-tck-one-java-version">
1381      <param name="build.jsr166e.java.version" value="6"/>
1382      <param name="build.jsr166e.javac" value="${javac6}"/>
1383    </antcall>
1384  </target>
1385
1386  <target name="jsr166e-test" depends="jsr166e-tck"/>
1387
1388  <target name="jsr166edist" depends="jsr166edist-jar, jsr166edist-docs"/>
1389
1390  <target name="jsr166eclean">
1391    <delete dir="${build.jsr166e.dir}"/>
1392  </target>
1393
1394  <target name="jsr166edist-jar"
1395          depends="jsr166eclean, jsr166ejar">
1396    <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1397  </target>
1398
1399  <target name="jsr166edist-docs" depends="jsr166eclean, jsr166edocs">
1400    <mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1401  </target>
1402
1403
679   <!-- Find buglets that can be detected by static build tools -->
680  
681   <!--   <target name="lint"> -->
# Line 1424 | Line 699
699    https://github.com/google/error-prone/issues/1143
700   =================================================================== -->
701    <path id="errorprone.processorpath.path">
702 <    <pathelement location="${lib.dir}/error_prone_core-2.3.2-with-dependencies.jar"/>
702 >    <pathelement location="${lib.dir}/error_prone_core-2.3.4-with-dependencies.jar"/>
703      <pathelement location="${lib.dir}/dataflow-2.5.7.jar"/>
704      <pathelement location="${lib.dir}/javacutil-2.5.7.jar"/>
705      <pathelement location="${lib.dir}/jFormatString-3.0.0.jar"/>
706 +    <pathelement location="${lib.dir}/caffeine-2.8.0.jar"/>
707    </path>
708    <property name="errorprone.processorpath" refid="errorprone.processorpath.path" />
709    <property name="errorprone.jsr166.user.flags" value=""/>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines