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.210 by jsr166, Mon Apr 18 15:30:49 2016 UTC vs.
Revision 1.293 by jsr166, Thu Dec 13 01:15:07 2018 UTC

# Line 1 | Line 1
1   <project name="jsr166" default="usage"
2 <  xmlns:if="ant:if" xmlns:unless="ant:unless">
2 >  xmlns:if="ant:if"
3 >  xmlns:unless="ant:unless"
4 >  xmlns:ivy="antlib:org.apache.ivy.ant">
5  
6    <description>
7   ------------------------------------------------------------------------------
# Line 17 | 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:
20 –  $HOME/jdk/jdk6
21 –  $HOME/jdk/jdk7
22    $HOME/jdk/jdk8
23    $HOME/jdk/jdk9
24 +  $HOME/jdk/jdk10
25 +  $HOME/jdk/jdk11
26 +  $HOME/jdk/jdk12
27 +  $HOME/jdk/jdk13
28    where each of the above is a JDK or a symlink to same, and
25 –  $HOME/jdk/src/jdk6
26 –  $HOME/jdk/src/jdk7
29    $HOME/jdk/src/jdk8
30    $HOME/jdk/src/jdk9
31 +  $HOME/jdk/src/jdk10
32 +  $HOME/jdk/src/jdk11
33 +  $HOME/jdk/src/jdk12
34 +  $HOME/jdk/src/jdk13
35    where each of the above is a complete JDK source tree
36    (e.g. mercurial forest) or a symlink to same.
37  
38    Alternatively, define ant variables thus:
39    ant -Djdk$N.home=... -Djdk$N.src.home=...
40 <  for $N in 6 7 8 9 ...
40 >  for $N in 8 .. 13 ...
41  
42 <  As of 2016-03, the sources in src/main are for jdk9+ only.  The "docs"
37 <  target is currently broken.
42 >  As of 2016-03, the sources in src/main are for jdk9+ only.
43   ------------------------------------------------------------------------------
44    </description>
45  
# Line 52 | Line 57
57  
58  
59    <!-- Compilation options -->
55 –  <property name="build.sourcelevel"    value="6"/>
60    <property name="build.debug"          value="true"/>
61    <property name="build.debuglevel"     value="source,lines,vars"/>
62    <property name="build.deprecation"    value="false"/>
# Line 63 | Line 67
67    <property name="build.classes.dir"           location="${build.dir}/classes"/>
68    <property name="build.testcases.dir"         location="${build.dir}/testcases"/>
69    <property name="build.loops.dir"             location="${build.dir}/loops"/>
66 –  <property name="build.reports.dir"           location="${build.dir}/reports"/>
70  
71    <property name="build.4jdk7.dir"             location="${build.dir}/jsr166-4jdk7"/>
72    <property name="build.4jdk7.classes.dir"     location="${build.4jdk7.dir}/classes"/>
# Line 104 | Line 107
107      <property name="jdk@{v}.src.dir" location="${jdk@{v}.src.home}/jdk/src/share/classes"
108        unless:set="have.java.base"/>
109      <local name="modules"/>
110 <    <available property="modules" file="${jdk@{v}.home}/jmods" type="dir"/>
110 >    <available property="modules" file="${jdk@{v}.home}/lib/modules" type="file"/>
111      <local name="boot.jar.dir"/>
112      <property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib" unless:set="modules"/>
113      <path id="bootclasspath@{v}" unless:set="modules">
# Line 134 | Line 137
137    <defjdklocations v="7"/>
138    <defjdklocations v="8"/>
139    <defjdklocations v="9"/>
140 +  <defjdklocations v="10"/>
141 +  <defjdklocations v="11"/>
142 +  <defjdklocations v="12"/>
143  
144    <!-- Source locations -->
145    <property name="src.dir"              location="${basedir}/src/main"/>
# Line 143 | Line 149
149    <property name="jtreg7.src.dir"       location="${test.src.dir}/jtreg-jdk7"/>
150    <property name="jtreg8.src.dir"       location="${test.src.dir}/jtreg-jdk8"/>
151    <property name="jtreg9.src.dir"       location="${test.src.dir}/jtreg"/>
152 +  <property name="jtreg10.src.dir"      location="${test.src.dir}/jtreg"/>
153 +  <property name="jtreg11.src.dir"      location="${test.src.dir}/jtreg"/>
154 +  <property name="jtreg12.src.dir"      location="${test.src.dir}/jtreg"/>
155    <property name="jtreg.src.dir"        location="${jtreg9.src.dir}"/>
156    <property name="lib.dir"              location="${basedir}/lib"/>
157    <property name="dist.dir"             location="${basedir}/dist"/>
# Line 182 | Line 191
191    <property name="junit.jar"        location="${lib.dir}/junit.jar"/>
192  
193    <!-- Canonical location of jdk docs root, to use with javadoc -Xdocrootparent flag -->
194 <  <property name="java5.docroot.url"      value="http://docs.oracle.com/javase/1.5.0/docs"/>
195 <  <property name="java6.docroot.url"      value="http://docs.oracle.com/javase/6/docs"/>
196 <  <property name="java7.docroot.url"      value="http://docs.oracle.com/javase/7/docs"/>
197 <  <property name="java8.docroot.url"      value="http://docs.oracle.com/javase/8/docs"/>
198 <  <!-- The expected canonical location does not yet exist as of 2016-04 -->
199 <  <!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> -->
200 <  <property name="java9.docroot.url"      value="http://http://download.java.net/java/jdk9/docs"/>
201 <  <!-- Default jdk doc location (latest stable release seems best) -->
202 <  <property name="java.docroot.url"       value="${java8.docroot.url}"/>
194 >  <!-- Switched to https: in 2017-10 - JDK-8190312 -->
195 >  <property name="java5.docroot.url"  value="https://docs.oracle.com/javase/1.5.0/docs"/>
196 >  <property name="java6.docroot.url"  value="https://docs.oracle.com/javase/6/docs"/>
197 >  <property name="java7.docroot.url"  value="https://docs.oracle.com/javase/7/docs"/>
198 >  <property name="java8.docroot.url"  value="https://docs.oracle.com/javase/8/docs"/>
199 >  <property name="java9.docroot.url"  value="https://docs.oracle.com/javase/9/docs"/>
200 >  <property name="java10.docroot.url" value="https://docs.oracle.com/javase/10/docs"/>
201 >  <property name="java11.docroot.url" value="https://docs.oracle.com/en/java/javase/11/docs"/>
202 >  <!-- The location of jdk early access docs (RIP) -->
203 >  <!-- <property name="java9.docroot.url" value="http://download.java.net/java/jdk9/docs"/> -->
204 >  <!-- <property name="java10.docroot.url" value="http://download.java.net/java/jdk10/docs"/> -->
205 >  <!-- <property name="java11.docroot.url" value="http://download.java.net/java/jdk11/docs"/> -->
206 >  <property name="java12.docroot.url" value="https://download.java.net/java/jdk12/docs"/>
207 >  <!-- Default jdk doc location (latest stable LTS release seems best) -->
208 >  <property name="java.docroot.url"   value="${java11.docroot.url}"/>
209  
210    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
211    <property name="java5.api.url"      value="${java5.docroot.url}/api/"/>
# Line 198 | Line 213
213    <property name="java7.api.url"      value="${java7.docroot.url}/api/"/>
214    <property name="java8.api.url"      value="${java8.docroot.url}/api/"/>
215    <property name="java9.api.url"      value="${java9.docroot.url}/api/"/>
216 +  <property name="java10.api.url"     value="${java10.docroot.url}/api/"/>
217 +  <property name="java11.api.url"     value="${java11.docroot.url}/api/"/>
218 +  <property name="java12.api.url"     value="${java12.docroot.url}/api/"/>
219    <property name="java.api.url"       value="${java.docroot.url}/api/"/>
220  
221    <!-- Define the "jtreg" task -->
# Line 230 | Line 248
248  
249      <local name="modules"/>
250      <condition property="modules">
251 <      <available file="${jdk@{compile-target}.home}/jmods" type="dir"/>
251 >      <available file="${jdk@{compile-target}.home}/lib/modules" type="file"/>
252 >    </condition>
253 >
254 >    <local name="use-doclint"/>
255 >    <condition property="use-doclint">
256 >      <not> <equals arg1="@{target}" arg2="7"/> </not>
257      </condition>
258  
259      <mkdir dir="@{workdir}/tck-classes"/>
# Line 245 | Line 268
268             classpath="${junit.jar}"
269             includeAntRuntime="false"
270             includeJavaRuntime="false"
271 +           encoding="ASCII"
272             executable="${javac@{compile-target}}"
273             fork="true">
274  
275        <include name="*.java"/>
276        <compilerarg value="-XDignore.symbol.file=true"/>
277        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation,-try"/>
278 +      <compilerarg value="-Xdoclint:reference/private" if:set="use-doclint"/>
279        <compilerarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
280 <      <compilerarg value="-Xpatch:${build.classes.dir}" if:set="modules"/>
280 >      <compilerarg value="--patch-module=java.base=@{classes}" if:set="modules"/>
281        <compilerarg line="${build.args}"/>
282        <javac-elements/>
283  
# Line 263 | Line 288
288            jvm="${java@{target}}"
289            fork="true">
290          <jvmarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
291 <        <jvmarg value="-Xpatch:${build.classes.dir}" if:set="modules"/>
291 >        <jvmarg value="--patch-module=java.base=@{classes}" if:set="modules"/>
292 >        <jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED" if:set="modules"/>
293 >        <jvmarg value="--add-opens=java.base/java.util=ALL-UNNAMED" if:set="modules"/>
294 >        <jvmarg value="--add-opens=java.base/java.util.concurrent=ALL-UNNAMED" if:set="modules"/>
295 >        <jvmarg value="--add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED" if:set="modules"/>
296 >        <jvmarg value="--add-opens=java.base/java.util.concurrent.locks=ALL-UNNAMED" if:set="modules"/>
297          <jvmarg line="@{jvmflags}"/>
298 +        <!-- ant -Dvmoptions="-Xmx8m" -Djsr166.tckTestClass=CompletableFutureTest tck -->
299 +        <jvmarg line="${vmoptions}" if:set="vmoptions"/>
300  
301 <        <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
301 >        <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
302          <syspropertyset id="system-properties-used-by-tck">
303            <propertyref prefix="java.util.concurrent.ForkJoinPool"/>
304            <propertyref prefix="jsr166."/>
# Line 283 | Line 315
315    </macrodef>
316  
317    <!-- Define jtreg test sets for different jdk versions -->
318 <  <fileset dir="${jtreg9.src.dir}">
319 <    <patternset id="jdk9.jtreg.tests">
320 <      <include name="**/*.java"/>
321 <    </patternset>
322 <  </fileset>
323 <
324 <  <fileset dir="${jtreg8.src.dir}">
325 <    <patternset id="jdk8.jtreg.tests">
326 <      <include name="**/*.java"/>
327 <      <exclude name="**/SpliteratorCharacteristics.java"/>
328 <      <!-- https://bugs.openjdk.java.net/browse/JDK-6842353 -->
329 <      <exclude name="**/GCDuringIteration.java"/>
330 <    </patternset>
299 <  </fileset>
318 >  <!-- ant -Djtreg.test.pattern="**/ConcurrentHashMap/" -->
319 >  <!-- ant -Djtreg.test.pattern="**/ToArray.java" -->
320 >  <property name="jtreg.test.pattern" value="**/*.java"/>
321 >  <macrodef name="defjtregtests">
322 >    <attribute name="v"/>
323 >    <sequential>
324 >      <fileset dir="${jtreg@{v}.src.dir}">
325 >        <patternset id="jdk@{v}.jtreg.tests">
326 >          <include name="${jtreg.test.pattern}"/>
327 >        </patternset>
328 >      </fileset>
329 >    </sequential>
330 >  </macrodef>
331  
332 <  <fileset dir="${jtreg7.src.dir}">
333 <    <patternset id="jdk7.jtreg.tests">
334 <      <include name="**/*.java"/>
335 <    </patternset>
336 <  </fileset>
332 >  <defjtregtests v="12"/>
333 >  <defjtregtests v="11"/>
334 >  <defjtregtests v="10"/>
335 >  <defjtregtests v="9"/>
336 >  <defjtregtests v="8"/>
337 >  <defjtregtests v="7"/>
338  
339    <!-- ant -Djtreg.flags=-timeoutFactor:4 -->
340    <property name="jtreg.flags" value=""/>
341  
342    <macrodef name="run-jtreg-tests">
343 <    <!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
312 <    <attribute name="source" default="7"/>
343 >    <!-- ant -Djtreg11.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
344      <attribute name="target"/>
345      <attribute name="workdir"/>
346      <attribute name="classes"/>
347 +    <attribute name="verbose" default="${jtreg.verbose}"/>
348      <attribute name="jtregflags" default=""/>
349 +    <element name="jtreg-elements" optional="true"/>
350  
351      <sequential>
352  
# Line 322 | Line 355
355  
356      <local name="modules"/>
357      <condition property="modules">
358 <      <available file="${jdk@{target}.home}/jmods" type="dir"/>
358 >      <available file="${jdk@{target}.home}/lib/modules" type="file"/>
359      </condition>
360  
361      <delete dir="@{workdir}/JTwork"   quiet="true"/>
329 –    <delete dir="@{workdir}/JTreport" quiet="true"/>
362      <jtreg dir="${jtreg@{target}.src.dir}"
363             jdk="${jdk@{target}.home}"
364 <           workDir="@{workdir}/JTwork"
333 <           reportDir="@{workdir}/JTreport">
364 >           workDir="@{workdir}/JTwork">
365        <patternset refid="jdk@{target}.jtreg.tests"/>
366        <arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
367 <      <arg value="-Xpatch:${build.classes.dir}" if:set="modules"/>
367 >      <arg value="-javacoptions:--patch-module=java.base=@{classes}" if:set="modules"/>
368 >      <arg value="-vmoptions:--patch-module=java.base=@{classes}" if:set="modules"/>
369        <arg value="-agentvm"/>
370 <      <arg value="-verbose:${jtreg.verbose}"/>
370 >      <arg value="-noreport"/>
371 >      <arg value="-verbose:@{verbose}"/>
372        <arg value="-vmoptions:-esa -ea"/>
373        <arg value="-automatic"/>
374        <arg value="-k:!ignore"/>
375        <arg line="@{jtregflags}"/>
376        <arg line="${jtreg.flags}"/>
377 +      <jtreg-elements/>
378      </jtreg>
379      </sequential>
380    </macrodef>
# Line 356 | Line 390
390  
391    <!-- Main targets -->
392  
393 <  <property name="build.main.java.version" value="9"/>
393 >  <!-- Default values: may seem strange ... -->
394 >  <!-- At runtime, target latest LTS, i.e. jdk11 -->
395 >  <!-- But at build time, target jdk9, for maximal binary portability -->
396 >  <!-- Use javadoc12 (but -link to jdk11 api docs!), to get:
397 >    o override-methods=summary
398 >    o {@systemProperty ...}
399 >    o 8211194: issues linking to external documentation (was: missing package-list for JDK10 / JDK11 documentation)
400 >    o 8202628: javadoc generates bad links in TestModules.java
401 >    -->
402 >  <property name="java.runtime.target" value="11"/>
403 >  <property name="build.main.java" value="${java11}"/>
404    <property name="build.main.javac" value="${javac9}"/>
405 +  <property name="build.main.javadoc" value="${javadoc12}"/>
406 +  <property name="build.main.javadoc.source" value="${java.runtime.target}"/>
407  
408    <target name="dists"
409 <          depends="dist, 4jdk8dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
409 >          depends="dist, 4jdk8dist"
410            description="Builds all public jars and docs"/>
411 +          <!-- no longer supported: 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist -->
412  
413    <target name="compile"
414            depends="configure-compiler"
415            description="Compiles src/main sources to build dir">
416  
370 –    <local name="modules"/>
371 –    <condition property="modules">
372 –      <and>
373 –        <available file="${jdk9.home}/jmods" type="dir"/>
374 –        <equals arg1="9" arg2="${build.main.java.version}"/>
375 –      </and>
376 –    </condition>
377 –
417      <local name="destdir"/>
418 <    <property name="destdir" value="${build.classes.dir}/java.base" if:set="modules"/>
380 <    <property name="destdir" value="${build.classes.dir}" unless:set="modules"/>
418 >    <property name="destdir" value="${build.classes.dir}/java.base"/>
419  
420      <mkdir dir="${destdir}"/>
421  
# Line 389 | Line 427
427             classpath=""
428             includeAntRuntime="false"
429             includeJavaRuntime="false"
430 +           encoding="ASCII"
431             executable="${build.main.javac}"
432             fork="true">
433  
434        <include name="**/*.java"/>
435 <      <compilerarg value="-Xmodule:java.base" if:set="modules"/>
435 >      <compilerarg value="--patch-module=java.base=${src.dir}"/>
436        <compilerarg value="-Xprefer:source"/>
437        <compilerarg value="-XDignore.symbol.file=true"/>
438 <      <compilerarg value="-Xlint:all"/>
438 >      <compilerarg value="-Xlint:all,-removal"/>
439 >      <compilerarg line="--doclint-format html5"/>
440 >      <compilerarg value="-Xdoclint:all/protected,reference/private"/>
441        <compilerarg value="-Werror"/>
401 –      <compilerarg value="-Xdoclint:all/protected"/>
442        <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
443        <compilerarg line="${build.args}"/>
444  
# Line 409 | Line 449
449    <target name="jar"
450            depends="compile"
451            description="Builds library jar for src/main from compiled sources">
452 <
452 >    <local name="subdir"/>
453 >    <available property="subdir" file="${build.classes.dir}/java.base" type="dir" value="/java.base"/>
454      <jar destfile="${product.jar}">
455 <      <fileset dir="${build.classes.dir}"/>
455 >      <fileset dir="${build.classes.dir}${subdir}"/>
456        <manifest>
457          <attribute name="Built-By" value="${user.name}"/>
458          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
# Line 429 | Line 470
470      <!-- the packagenames="none" hack below prevents scanning the -->
471      <!-- sourcepath for packages -->
472  
473 + <!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}" -->
474 + <!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}:${jdk9.src.home}/jdk/src/java.logging/share/classes" -->
475 + <!-- TODO: sourcepath="${src.dir}:${jdk9.home}/src.zip" -->
476 + <!-- TODO: <arg line="-sourcepath ${src.dir}:${jdk9.home}/src.zip"/> -->
477 + <!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> -->
478      <javadoc destdir="${docs.dir}"
479               packagenames="none"
480 <             link="${java9.api.url}"
480 >             link="${java.api.url}"
481               overview="${src.dir}/intro.html"
482               access="${build.javadoc.access}"
483 <             sourcepath="${src.dir}:${jdk9.src.dir}"
483 >             sourcepath="${src.dir}"
484               classpath=""
485 <             executable="${javadoc9}">
485 >             source="${build.main.javadoc.source}"
486 >             executable="${build.main.javadoc}">
487 > <!-- TODO: JDK-8214571 failonerror = "true" -->
488        <fileset dir="${src.dir}" defaultexcludes="yes">
489          <include name="**/*.java"/>
490        </fileset>
491 <      <arg line="-Xdocrootparent ${java9.docroot.url}"/>
491 >      <arg line="-Xdocrootparent ${java.docroot.url}"/>
492        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
493        <arg value="-XDignore.symbol.file=true"/>
494 < <!--  TODO     <arg value="-Xmodule:java.base"/> -->
495 <      <arg value="-tag"/>
496 <      <arg value="${javadoc.jls.option}"/>
497 <      <arg value="-tag"/>
498 <      <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>
499 <      <arg value="-tag"/>
500 <      <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
501 <      <arg value="-tag"/>
502 <      <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
503 < <!-- tags added in jdk9 -->
504 <      <arg value="-tag"/>
505 <      <arg value="revised:X"/>
458 <      <arg value="-tag"/>
459 <      <arg value="spec:X"/>
494 >      <arg value="-html5"/>
495 >      <arg value="--patch-module=java.base=${src.dir}"/>
496 > <!-- old school frames via docs/index.html?overview-summary.html -->
497 >      <arg value="--frames"/>
498 >      <arg value="--override-methods=summary"/>
499 >      <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
500 >      <arg value="-tag"/> <arg value="implSpec:a:Implementation Requirements:"/>
501 >      <arg value="-tag"/> <arg value="implNote:a:Implementation Note:"/>
502 >      <arg value="-tag"/> <arg value="apiNote:a:API Note:"/>
503 > <!-- tags added in jdk9: currently unused -->
504 > <!--  <arg value="-tag"/> <arg value="revised:X"/> -->
505 > <!--  <arg value="-tag"/> <arg value="spec:X"/> -->
506      </javadoc>
507    </target>
508  
# Line 466 | Line 512
512            description="Puts all distributable products in single hierarchy"/>
513  
514  
469 –  <target name="release"
470 –          depends="dist"
471 –          description="Puts entire CVS tree, plus distribution productions, in a jar">
472 –
473 –    <property name="release.jar" value="dist/jsr166-${version}-dist.jar"/>
474 –
475 –    <jar basedir="${basedir}" destfile="${release.jar}">
476 –      <!-- <exclude name="build/**"/> -->
477 –      <exclude name="${release.jar}"/>
478 –      <exclude name="user.properties"/>
479 –      <exclude name="etc/notes/**"/>
480 –      <exclude name="src/emulation/**"/>
481 –      <exclude name="**/SyntaxTest.java"/>
482 –      <exclude name="**/SuperfluousAbstract.java"/>
483 –      <manifest>
484 –        <attribute name="Built-By" value="${user.name}"/>
485 –        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
486 –      </manifest>
487 –    </jar>
488 –  </target>
489 –
490 –
515    <target name="clean"
516            description="Removes all build products">
493 –
517      <delete dir="${build.dir}"/>
495 –
518    </target>
519  
520  
521    <target name="dist-clean"
522            description="Removes all build and distribution products">
501 –
523      <delete dir="${build.dir}"/>
524      <delete dir="${dist.dir}"/>
504 –
525    </target>
526  
527  
# Line 520 | Line 540
540            description="Runs tck tests for src/main directly">
541  
542      <run-tck-tests
543 <      target="${build.main.java.version}"
543 >      target="${java.runtime.target}"
544        workdir="${build.dir}"
545 <      classes="${product.jar}"/>
545 >      classes="${product.jar}">
546 >      <javac-elements>
547 >        <compilerarg value="-Werror"/>
548 >      </javac-elements>
549 >    </run-tck-tests>
550    </target>
551  
552    <target name="tck-parallelism-1"
# Line 539 | Line 563
563      </antcall>
564    </target>
565  
566 +  <target name="tck-security-manager"
567 +          description="Runs tck with a security manager">
568 +    <antcall target="tck">
569 +      <param name="jsr166.useSecurityManager" value="true"/>
570 +    </antcall>
571 +  </target>
572 +
573    <target name="jtreg"
574            depends="jar"
575            description="Runs jtreg tests for src/main using the jtreg ant task">
576      <run-jtreg-tests
577 <       target="${build.main.java.version}"
577 >       target="${java.runtime.target}"
578         workdir="${build.dir}"
579         classes="${product.jar}"/>
580    </target>
581  
582    <target name="test"
583            depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
584 <          description="Runs tck and jtreg tests for src/main">
554 <  </target>
555 <
556 < <!--   <target name="jtreg8" description="Runs jtreg tests with jdk8"> -->
584 >          description="Runs tck and jtreg tests for src/main"/>
585  
586 < <!--     <antcall target="jtreg"> -->
587 < <!--       <param name="build.main.java.version" value="8"/> -->
588 < <!--       <param name="build.main.javac" value="${javac8}"/> -->
561 < <!--     </antcall> -->
586 >  <target name="test-version-permutations"
587 >          depends="test9, test10, test11, test12, test9-11, test9-12, clean, test, docs">
588 >  </target>
589  
590 < <!--   </target> -->
590 >  <target name="test9">
591 >    <antcall target="clean"/>
592 >    <antcall>
593 >      <param name="java.runtime.target" value="9"/>
594 >      <param name="build.main.javac" value="${javac9}"/>
595 >      <param name="build.main.javadoc" value="${javadoc12}"/>
596 >      <param name="build.main.javadoc.source" value="9"/>
597 >      <target name="test"/>
598 >      <target name="docs"/>
599 >    </antcall>
600 >  </target>
601  
602 < <!--   <target name="test89" -->
603 < <!--           description="Runs tck and jtreg tests for src/main for multiple java versions"> -->
602 >  <target name="test10">
603 >    <antcall target="clean"/>
604 >    <antcall>
605 >      <param name="java.runtime.target" value="10"/>
606 >      <param name="build.main.javac" value="${javac10}"/>
607 >      <param name="build.main.javadoc" value="${javadoc12}"/>
608 >      <param name="build.main.javadoc.source" value="10"/>
609 >      <target name="test"/>
610 >      <target name="docs"/>
611 >    </antcall>
612 >  </target>
613  
614 < <!--     <antcall target="clean"/> -->
615 < <!--     <antcall target="test"> -->
616 < <!--       <param name="build.main.java.version" value="8"/> -->
617 < <!--       <param name="build.main.javac" value="${javac8}"/> -->
618 < <!--     </antcall> -->
614 >  <target name="test11">
615 >    <antcall target="clean"/>
616 >    <antcall>
617 >      <param name="java.runtime.target" value="11"/>
618 >      <param name="build.main.javac" value="${javac11}"/>
619 >      <param name="build.main.javadoc" value="${javadoc12}"/>
620 >      <param name="build.main.javadoc.source" value="11"/>
621 >      <target name="test"/>
622 >      <target name="docs"/>
623 >    </antcall>
624 >  </target>
625  
626 < <!--     <antcall target="clean"/> -->
627 < <!--     <antcall target="test"> -->
628 < <!--       <param name="build.main.java.version" value="9"/> -->
629 < <!--       <param name="build.main.javac" value="${javac9}"/> -->
630 < <!--     </antcall> -->
626 >  <target name="test12">
627 >    <antcall target="clean"/>
628 >    <antcall>
629 >      <param name="java.runtime.target" value="12"/>
630 >      <param name="build.main.javac" value="${javac12}"/>
631 >      <param name="build.main.javadoc" value="${javadoc12}"/>
632 >      <param name="build.main.javadoc.source" value="12"/>
633 >      <target name="test"/>
634 >      <target name="docs"/>
635 >    </antcall>
636 >  </target>
637  
638 < <!--   </target> -->
638 >  <target name="test9-11">
639 >    <antcall target="clean"/>
640 >    <antcall>
641 >      <param name="java.runtime.target" value="11"/>
642 >      <param name="build.main.javac" value="${javac9}"/>
643 >      <param name="build.main.javadoc" value="${javadoc12}"/>
644 >      <param name="build.main.javadoc.source" value="9"/>
645 >      <target name="test"/>
646 >      <target name="docs"/>
647 >    </antcall>
648 >  </target>
649  
650 +  <target name="test9-12">
651 +    <antcall target="clean"/>
652 +    <antcall>
653 +      <param name="java.runtime.target" value="12"/>
654 +      <param name="build.main.javac" value="${javac9}"/>
655 +      <param name="build.main.javadoc" value="${javadoc12}"/>
656 +      <param name="build.main.javadoc.source" value="9"/>
657 +      <target name="test"/>
658 +      <target name="docs"/>
659 +    </antcall>
660 +  </target>
661  
662  
663    <target name="configure-compiler">
664      <fail message="ant version too old">
665 <      <condition>
587 <        <not> <antversion atleast="1.9.1"/> </not>
588 <      </condition>
665 >      <condition> <not> <antversion atleast="1.9.1"/> </not> </condition>
666      </fail>
667  
668      <property name="unchecked.option" value="-Xlint:unchecked"/>
# Line 603 | Line 680
680    </target>
681  
682  
606 –
607 –  <!-- Various demos and test programs -->
608 –
609 –
610 –  <!-- description="Benchmark from Doug Lea's AQS paper" -->
611 –  <target name="loops" depends="configure-compiler">
612 –
613 –    <mkdir dir="${build.loops.dir}"/>
614 –
615 –    <javac srcdir="${loops.src.dir}"
616 –          destdir="${build.loops.dir}"
617 –            debug="${build.debug}"
618 –       debuglevel="${build.debuglevel}"
619 –      deprecation="${build.deprecation}"
620 –           source="${build.sourcelevel}"
621 –           target="${build.sourcelevel}"
622 –             fork="true">
623 –
624 –      <compilerarg line="${build.args}"/>
625 –      <classpath refid="loops.classpath"/>
626 –      <compilerarg value="-XDignore.symbol.file=true"/>
627 –
628 –    </javac>
629 –
630 –    <java classname="ALoops" fork="true">
631 –      <classpath refid="loops.classpath"/>
632 –    </java>
633 –
634 –  </target>
635 –
636 –
683    <target name="compile-test-loops" depends="jar"
684 <          description="compile all the perf tests in src/test/loops">
684 >          description="Compiles all the perf tests in src/test/loops">
685  
686      <mkdir dir="${build.dir}/test/loops"/>
687  
# Line 646 | Line 692
692             deprecation="${build.deprecation}"
693             includeAntRuntime="false"
694             includeJavaRuntime="false"
695 <           executable="${javac9}"
695 >           encoding="ASCII"
696 >           executable="${build.main.javac}"
697             fork="true">
698  
699        <include name="*.java"/>
# Line 654 | Line 701
701        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
702        <compilerarg value="-Xbootclasspath/p:${product.jar}"/>
703        <compilerarg line="${build.args}"/>
657 –
704      </javac>
659 –
705    </target>
706  
707  
# Line 679 | Line 724
724             bootclasspath="${bootclasspath8}"
725             includeAntRuntime="false"
726             includeJavaRuntime="false"
727 +           encoding="ASCII"
728             executable="${javac8}"
729             fork="true">
684 –
730        <include name="**/*.java"/>
731        <compilerarg value="-Xprefer:source"/>
732        <compilerarg value="-XDignore.symbol.file=true"/>
733        <compilerarg value="-Xlint:all"/>
734        <compilerarg value="-Werror"/>
735        <compilerarg line="${build.args}"/>
691 –
736      </javac>
737    </target>
738  
# Line 709 | Line 753
753             bootclasspath="${bootclasspath8}"
754             includeAntRuntime="false"
755             includeJavaRuntime="false"
756 +           encoding="ASCII"
757             executable="${javac8}"
758             fork="true">
714 –
759        <include name="**/*.java"/>
760        <compilerarg value="-Xprefer:source"/>
761        <compilerarg value="-XDignore.symbol.file=true"/>
762        <compilerarg value="-Xlint:all"/>
763 <      <compilerarg value="-Xdoclint:all/protected"/>
763 >      <compilerarg value="-Xdoclint:all/protected,reference/private"/>
764        <compilerarg line="${build.args}"/>
721 –
765      </javac>
766    </target>
767  
# Line 734 | Line 777
777          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
778        </manifest>
779      </jar>
737 –
780    </target>
781  
782  
# Line 750 | Line 792
792          <!-- JDK9+ test classes -->
793          <exclude name="*9Test.java"/>
794          <exclude name="*10Test.java"/>
795 +        <compilerarg value="-Werror"/>
796        </javac-elements>
797      </run-tck-tests>
798    </target>
# Line 767 | Line 810
810  
811    <target name="4jdk8-test"
812            depends="4jdk8-tck, 4jdk8-jtreg"
813 <          description="Runs tck and jtreg tests for jsr166-4jdk8">
771 <  </target>
813 >          description="Runs tck and jtreg tests for jsr166-4jdk8"/>
814  
815  
816    <target name="4jdk8docs"
# Line 784 | Line 826
826               access="${build.javadoc.access}"
827               sourcepath="${4jdk8src.dir}:${jdk8.src.dir}"
828               classpath=""
829 +             source="8"
830               executable="${javadoc8}"
831               failonerror = "true">
832        <fileset dir="${4jdk8src.dir}" defaultexcludes="yes">
# Line 791 | Line 834
834        </fileset>
835        <arg line="-Xdocrootparent ${java8.docroot.url}"/>
836        <arg value="-XDignore.symbol.file=true"/>
837 <      <arg value="-tag"/>
838 <      <arg value="${javadoc.jls.option}"/>
839 <      <arg value="-tag"/>
840 <      <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>
841 <      <arg value="-tag"/>
799 <      <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
800 <      <arg value="-tag"/>
801 <      <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
837 >      <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
838 >      <arg value="-tag"/> <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
839 >      <arg value="-tag"/> <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
840 > <!-- @apiNote tag currently unused -->
841 > <!--  <arg value="-tag"/> <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/> -->
842      </javadoc>
843    </target>
844  
# Line 810 | Line 850
850  
851    <target name="4jdk8clean"
852            description="Removes all 4jdk8 build products">
813 –
853      <delete dir="${build.4jdk8.dir}"/>
815 –
854    </target>
855  
856  
# Line 828 | Line 866
866    </target>
867  
868  
869 +  <!-- jsr166 4jdk7 (no longer maintained) -->
870  
871 <  <!-- jsr166 4jdk7 -->
833 <
834 <  <target name="4jdk7compile"
835 <          depends="configure-compiler"
836 <          description="Compiles src/jdk7 sources, targeting jdk7">
837 <
871 >  <target name="4jdk7compile" depends="configure-compiler">
872      <mkdir dir="${build.4jdk7.classes.dir}"/>
873  
874      <javac srcdir="${4jdk7src.dir}"
# Line 848 | Line 882
882             bootclasspath="${bootclasspath6}"
883             includeAntRuntime="false"
884             includeJavaRuntime="false"
885 +           encoding="ASCII"
886             executable="${javac7}"
887             fork="true">
888  
# Line 857 | Line 892
892        <compilerarg value="-Xlint:all"/>
893        <compilerarg value="-Werror"/>
894        <compilerarg line="${build.args}"/>
860 –
895      </javac>
896    </target>
897  
898 <  <target name="4jdk7doclint"
865 <          depends="configure-compiler"
866 <          description="Finds doclint warnings">
867 <
898 >  <target name="4jdk7doclint" depends="configure-compiler">
899      <mkdir dir="${build.4jdk7.classes.dir}"/>
900  
901      <javac srcdir="${4jdk7src.dir}"
# Line 878 | Line 909
909             bootclasspath="${bootclasspath6}"
910             includeAntRuntime="false"
911             includeJavaRuntime="false"
912 +           encoding="ASCII"
913             executable="${javac8}"
914             fork="true">
915  
# Line 887 | Line 919
919        <compilerarg value="-Xlint:all"/>
920        <compilerarg value="-Xdoclint:all/protected"/>
921        <compilerarg line="${build.args}"/>
890 –
922      </javac>
923    </target>
924  
925 <
895 <  <target name="4jdk7jar"
896 <          depends="4jdk7compile"
897 <          description="Builds library jar from compiled sources">
898 <
925 >  <target name="4jdk7jar" depends="4jdk7compile">
926      <jar destfile="${4jdk7product.jar}">
927        <fileset dir="${build.4jdk7.classes.dir}"/>
928        <manifest>
# Line 903 | Line 930
930          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
931        </manifest>
932      </jar>
906 –
933    </target>
934  
935 <
910 <  <target name="4jdk7-tck"
911 <          depends="4jdk7jar"
912 <          description="Runs tck tests for jsr166-4jdk7 directly">
913 <
935 >  <target name="4jdk7-tck" depends="4jdk7jar">
936      <run-tck-tests
937        target="7"
938        workdir="${build.4jdk7.dir}"
# Line 928 | Line 950
950          <exclude name="SplittableRandomTest.java"/>
951          <exclude name="StampedLockTest.java"/>
952          <exclude name="SubmissionPublisherTest.java"/>
953 +        <compilerarg value="-Werror"/>
954        </javac-elements>
955      </run-tck-tests>
956    </target>
957  
935 –
958    <!-- Runs tck tests for jsr166-4jdk7 via junit task (dead experiment) -->
959 <  <target name="4jdk7-tck-junit"
938 <          depends="4jdk7compile">
959 >  <target name="4jdk7-tck-junit" depends="4jdk7compile">
960  
961      <junit printsummary="true"
962             showoutput="true"
# Line 957 | Line 978
978  
979        <test name="${jsr166.tckTestClass}" haltonfailure="no">
980        </test>
960 –
981      </junit>
982    </target>
983  
984 <  <target name="4jdk7-jtreg"
965 <          depends="4jdk7jar"
966 <          description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
984 >  <target name="4jdk7-jtreg" depends="4jdk7jar">
985      <run-jtreg-tests
986         target="7"
987         workdir="${build.4jdk7.dir}"
988         classes="${4jdk7product.jar}"/>
989    </target>
990  
991 +  <target name="4jdk7-test" depends="4jdk7-tck, 4jdk7-jtreg"/>
992  
993 <  <target name="4jdk7-test"
975 <          depends="4jdk7-tck, 4jdk7-jtreg"
976 <          description="Runs tck and jtreg tests for jsr166-4jdk7">
977 <  </target>
978 <
979 <
980 <  <target name="4jdk7docs"
981 <          description="Builds javadocs for src/jdk7 to dist dir">
982 <
993 >  <target name="4jdk7docs">
994      <delete dir="${4jdk7docs.dir}"/>
995      <mkdir dir="${4jdk7docs.dir}"/>
996  
# Line 1000 | Line 1011
1011      </javadoc>
1012    </target>
1013  
1014 +  <target name="4jdk7dist" depends="4jdk7dist-jar, 4jdk7dist-docs"/>
1015  
1016 <  <target name="4jdk7dist"
1005 <          depends="4jdk7dist-jar, 4jdk7dist-docs"
1006 <          description="Puts all distributable products in single hierarchy"/>
1007 <
1008 <
1009 <  <target name="4jdk7clean"
1010 <          description="Removes all 4jdk7 build products">
1011 <
1016 >  <target name="4jdk7clean">
1017      <delete dir="${build.4jdk7.dir}"/>
1013 –
1018    </target>
1019  
1020 <
1017 <  <target name="4jdk7dist-jar"
1018 <          depends="4jdk7clean, 4jdk7jar">
1020 >  <target name="4jdk7dist-jar" depends="4jdk7clean, 4jdk7jar">
1021      <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
1022    </target>
1023  
1024 <
1023 <  <target name="4jdk7dist-docs"
1024 <          depends="4jdk7clean, 4jdk7docs">
1024 >  <target name="4jdk7dist-docs" depends="4jdk7clean, 4jdk7docs">
1025      <mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
1026    </target>
1027  
1028  
1029 <  <!-- jsr166x -->
1030 <
1031 <  <target name="jsr166xcompile"
1032 <          depends="configure-compiler"
1033 <          description="Compiles jsr166x sources to build dir">
1029 >  <!-- jsr166x (no longer maintained) -->
1030  
1031 +  <target name="jsr166xcompile" depends="configure-compiler">
1032      <mkdir dir="${build.jsr166x.classes.dir}"/>
1033  
1034      <javac srcdir="${topsrc.dir}"
# Line 1045 | Line 1042
1042             target="5"
1043             includeAntRuntime="false"
1044             includeJavaRuntime="false"
1045 +           encoding="ASCII"
1046             executable="${javac7}"
1047             fork="true">
1050 –
1048        <include name="jsr166x/**/*.java"/>
1049        <compilerarg value="-XDignore.symbol.file=true"/>
1050        <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
1051        <compilerarg value="-Werror"/>
1052        <compilerarg line="${build.args}"/>
1056 –
1053      </javac>
1054    </target>
1055  
1056 <
1061 <  <target name="jsr166xjar"
1062 <          depends="jsr166xcompile"
1063 <          description="Builds library jar from compiled sources">
1064 <
1056 >  <target name="jsr166xjar" depends="jsr166xcompile">
1057      <jar destfile="${jsr166x.jar}">
1058        <fileset dir="${build.jsr166x.classes.dir}"/>
1059        <manifest>
# Line 1069 | Line 1061
1061          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1062        </manifest>
1063      </jar>
1072 –
1064    </target>
1065  
1066 <
1076 <  <target name="jsr166xdocs"
1077 <          description="Builds javadocs to dist dir">
1078 <
1066 >  <target name="jsr166xdocs">
1067      <delete dir="${jsr166xdocs.dir}"/>
1068      <mkdir dir="${jsr166xdocs.dir}"/>
1069  
# Line 1090 | Line 1078
1078               failonerror = "true">
1079        <arg line="-Xdocrootparent ${java.docroot.url}"/>
1080        <arg value="-XDignore.symbol.file=true"/>
1093 –
1081      </javadoc>
1082    </target>
1083  
1084 +  <target name="jsr166xdist" depends="jsr166xdist-jar, jsr166xdist-docs"/>
1085  
1086 <  <target name="jsr166xdist"
1099 <          depends="jsr166xdist-jar, jsr166xdist-docs"
1100 <          description="Puts all distributable products in single hierarchy"/>
1101 <
1102 <
1103 <  <target name="jsr166xclean"
1104 <          description="Removes all jsr166x build products">
1105 <
1086 >  <target name="jsr166xclean">
1087      <delete dir="${build.jsr166x.dir}"/>
1107 –
1088    </target>
1089  
1090 <
1111 <  <target name="jsr166xdist-jar"
1112 <          depends="jsr166xclean, jsr166xjar">
1090 >  <target name="jsr166xdist-jar" depends="jsr166xclean, jsr166xjar">
1091      <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
1092    </target>
1093  
1094 <  <target name="jsr166xdist-docs"
1117 <          depends="jsr166xclean, jsr166xdocs">
1094 >  <target name="jsr166xdist-docs" depends="jsr166xclean, jsr166xdocs">
1095      <mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
1096    </target>
1097  
1121 –  <!-- jsr166y -->
1122 –
1098  
1099 <  <target name="jsr166ycompile"
1125 <          depends="configure-compiler"
1126 <          description="Compiles jsr166y sources">
1099 >  <!-- jsr166y (no longer maintained) -->
1100  
1101 +  <target name="jsr166ycompile" depends="configure-compiler">
1102      <mkdir dir="${build.jsr166y.classes.dir}"/>
1103  
1104      <javac srcdir="${topsrc.dir}"
# Line 1138 | Line 1112
1112             bootclasspath="${bootclasspath6}"
1113             includeAntRuntime="false"
1114             includeJavaRuntime="false"
1115 +           encoding="ASCII"
1116             executable="${javac7}"
1117             fork="true">
1118  
# Line 1146 | Line 1121
1121        <compilerarg value="-Xlint:all"/>
1122        <compilerarg value="-Werror"/>
1123        <compilerarg line="${build.args}"/>
1149 –
1124      </javac>
1125    </target>
1126  
1127 <
1154 <  <target name="jsr166yjar"
1155 <          depends="jsr166ycompile"
1156 <          description="Builds library jar from compiled sources">
1157 <
1127 >  <target name="jsr166yjar" depends="jsr166ycompile">
1128      <jar destfile="${jsr166y.jar}" index="true">
1129        <fileset dir="${build.jsr166y.classes.dir}"/>
1130        <manifest>
# Line 1162 | Line 1132
1132          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1133        </manifest>
1134      </jar>
1165 –
1135    </target>
1136  
1137 <
1169 <  <target name="jsr166ydocs"
1170 <          description="Builds javadocs to dist dir">
1171 <
1137 >  <target name="jsr166ydocs">
1138      <delete dir="${jsr166ydocs.dir}"/>
1139      <mkdir dir="${jsr166ydocs.dir}"/>
1140  
# Line 1183 | Line 1149
1149               failonerror = "true">
1150        <arg line="-Xdocrootparent ${java.docroot.url}"/>
1151        <arg value="-XDignore.symbol.file=true"/>
1186 –
1152      </javadoc>
1153    </target>
1154  
1155 +  <target name="jsr166ydist" depends="jsr166ydist-jar, jsr166ydist-docs"/>
1156  
1157 <  <target name="jsr166ydist"
1192 <          depends="jsr166ydist-jar, jsr166ydist-docs"
1193 <          description="Puts all distributable products in single hierarchy"/>
1194 <
1195 <
1196 <  <target name="jsr166yclean"
1197 <          description="Removes all jsr166y build products">
1198 <
1157 >  <target name="jsr166yclean">
1158      <delete dir="${build.jsr166y.dir}"/>
1200 –
1159    </target>
1160  
1161 <
1204 <  <target name="jsr166ydist-jar"
1205 <          depends="jsr166yclean, jsr166yjar">
1161 >  <target name="jsr166ydist-jar" depends="jsr166yclean, jsr166yjar">
1162      <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
1163    </target>
1164  
1165 <  <target name="jsr166ydist-docs"
1210 <          depends="jsr166yclean, jsr166ydocs">
1165 >  <target name="jsr166ydist-docs" depends="jsr166yclean, jsr166ydocs">
1166      <mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
1167    </target>
1168  
1169  
1170 <  <!-- extra166y -->
1216 <
1217 <
1218 <  <target name="extra166ycompile"
1219 <          depends="configure-compiler, jsr166yjar"
1220 <          description="Compiles extra166y sources">
1170 >  <!-- extra166y (no longer maintained) -->
1171  
1172 +  <target name="extra166ycompile" depends="configure-compiler, jsr166yjar">
1173      <mkdir dir="${build.extra166y.classes.dir}"/>
1174  
1175      <javac srcdir="${topsrc.dir}"
# Line 1232 | Line 1183
1183             target="6"
1184             includeAntRuntime="false"
1185             includeJavaRuntime="false"
1186 +           encoding="ASCII"
1187             executable="${javac7}"
1188             fork="true">
1189  
# Line 1240 | Line 1192
1192        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
1193        <compilerarg value="-Werror"/>
1194        <compilerarg line="${build.args}"/>
1243 –
1195      </javac>
1196    </target>
1197  
1198 <
1248 <  <target name="extra166yjar"
1249 <          depends="extra166ycompile"
1250 <          description="Builds library jar from compiled sources">
1251 <
1198 >  <target name="extra166yjar" depends="extra166ycompile">
1199      <jar destfile="${extra166y.jar}" index="true">
1200        <fileset dir="${build.extra166y.classes.dir}"/>
1201        <manifest>
# Line 1256 | Line 1203
1203          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1204        </manifest>
1205      </jar>
1259 –
1206    </target>
1207  
1208 <
1263 <  <target name="extra166ydocs"
1264 <          description="Builds javadocs to build dir">
1265 <
1208 >  <target name="extra166ydocs">
1209      <delete dir="${extra166ydocs.dir}"/>
1210      <mkdir dir="${extra166ydocs.dir}"/>
1211  
# Line 1276 | Line 1219
1219               executable="${javadoc7}">
1220        <arg line="-Xdocrootparent ${java.docroot.url}"/>
1221        <arg value="-XDignore.symbol.file=true"/>
1279 –
1222      </javadoc>
1223    </target>
1224  
1225 +  <target name="extra166ydist" depends="extra166ydist-jar, extra166ydist-docs"/>
1226  
1227 <  <target name="extra166ydist"
1285 <          depends="extra166ydist-jar, extra166ydist-docs"
1286 <          description="Puts all distributable products in single hierarchy"/>
1287 <
1288 <
1289 <  <target name="extra166yclean"
1290 <          description="Removes all extra166y build products">
1291 <
1227 >  <target name="extra166yclean">
1228      <delete dir="${build.extra166y.dir}"/>
1293 –
1229    </target>
1230  
1231 <
1297 <  <target name="extra166ydist-jar"
1298 <          depends="extra166yclean, extra166yjar">
1231 >  <target name="extra166ydist-jar" depends="extra166yclean, extra166yjar">
1232      <copy file="${extra166y.jar}" todir="${dist.dir}"/>
1233    </target>
1234  
1235 <  <target name="extra166ydist-docs"
1303 <          depends="extra166yclean, extra166ydocs">
1235 >  <target name="extra166ydist-docs" depends="extra166yclean, extra166ydocs">
1236      <mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
1237    </target>
1238  
1239 <  <!-- jsr166e -->
1239 >
1240 >  <!-- jsr166e (no longer maintained) -->
1241  
1242    <property name="build.jsr166e.java.version" value="6"/>
1243    <property name="build.jsr166e.javac" value="${javac6}"/>
1244  
1245 <  <target name="jsr166ecompile"
1313 <          depends="configure-compiler"
1314 <          description="Compiles jsr166e sources">
1315 <
1245 >  <target name="jsr166ecompile" depends="configure-compiler">
1246      <mkdir dir="${build.jsr166e.classes.dir}"/>
1247  
1248      <javac srcdir="${topsrc.dir}"
# Line 1333 | Line 1263
1263        <compilerarg value="-Xlint:all"/>
1264        <compilerarg value="-Werror"/>
1265        <compilerarg line="${build.args}"/>
1336 –
1266      </javac>
1267    </target>
1268  
1340 –  <!-- jsr166e: find doclint errors -->
1269    <target name="jsr166edoclint">
1342 –
1270      <mkdir dir="${build.jsr166e.classes.dir}"/>
1271  
1272      <javac srcdir="${topsrc.dir}"
# Line 1361 | Line 1288
1288        <compilerarg value="-Xlint:all"/>
1289        <compilerarg value="-Werror"/>
1290        <compilerarg value="-Xdoclint:all/protected"/>
1364 –
1291      </javac>
1292    </target>
1293  
1294 <
1369 <  <target name="jsr166ejar"
1370 <          depends="jsr166ecompile"
1371 <          description="Builds library jar from compiled sources">
1372 <
1294 >  <target name="jsr166ejar" depends="jsr166ecompile">
1295      <jar destfile="${jsr166e.jar}" index="true">
1296        <fileset dir="${build.jsr166e.classes.dir}"/>
1297        <manifest>
# Line 1377 | Line 1299
1299          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1300        </manifest>
1301      </jar>
1380 –
1302    </target>
1303  
1304 <
1384 <  <target name="jsr166edocs"
1385 <          description="Builds javadocs to build dir">
1386 <
1304 >  <target name="jsr166edocs">
1305      <delete dir="${jsr166edocs.dir}"/>
1306      <mkdir dir="${jsr166edocs.dir}"/>
1307  
# Line 1397 | Line 1315
1315               failonerror = "true">
1316        <arg line="-Xdocrootparent ${java.docroot.url}"/>
1317        <arg value="-XDignore.symbol.file=true"/>
1400 –
1318      </javadoc>
1319    </target>
1320  
1321 <
1405 <  <target name="jsr166e-tck-one-java-version"
1406 <          depends="jsr166ejar">
1407 <
1321 >  <target name="jsr166e-tck-one-java-version" depends="jsr166ejar">
1322      <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
1409 –
1323      <run-tck-tests
1324        tck.src.dir="${test.src.dir}/tck-jsr166e"
1325        target="${build.jsr166e.java.version}"
# Line 1414 | Line 1327
1327        classes="${jsr166e.jar}"/>
1328    </target>
1329  
1330 <  <target name="jsr166e-tck"
1418 <          description="Runs tck tests for jsr166e for multiple java versions">
1330 >  <target name="jsr166e-tck">
1331  
1332   <!--     <antcall target="clean"/> -->
1333   <!--     <antcall target="jsr166e-tck-one-java-version"> -->
# Line 1436 | Line 1348
1348      </antcall>
1349    </target>
1350  
1351 +  <target name="jsr166e-test" depends="jsr166e-tck"/>
1352  
1353 <  <target name="jsr166e-test"
1441 <          depends="jsr166e-tck"
1442 <          description="Runs all tests for jsr166e">
1443 <  </target>
1444 <
1445 <  <target name="jsr166edist"
1446 <          depends="jsr166edist-jar, jsr166edist-docs"
1447 <          description="Puts all distributable products in single hierarchy"/>
1448 <
1353 >  <target name="jsr166edist" depends="jsr166edist-jar, jsr166edist-docs"/>
1354  
1355 <  <target name="jsr166eclean"
1451 <          description="Removes all jsr166e build products">
1355 >  <target name="jsr166eclean">
1356      <delete dir="${build.jsr166e.dir}"/>
1357    </target>
1358  
1455 –
1359    <target name="jsr166edist-jar"
1360            depends="jsr166eclean, jsr166ejar">
1361      <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1362    </target>
1363  
1364 <  <target name="jsr166edist-docs"
1462 <          depends="jsr166eclean, jsr166edocs">
1364 >  <target name="jsr166edist-docs" depends="jsr166eclean, jsr166edocs">
1365      <mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1366    </target>
1367  
1368  
1369   <!-- Find buglets that can be detected by static build tools -->
1370  
1371 <  <target name="lint">
1372 <    <antcall target="dists">
1373 <      <param name="build.javadoc.access" value="public"/>
1374 <    </antcall>
1375 <  </target>
1371 > <!--   <target name="lint"> -->
1372 > <!--     <antcall target="dists"> -->
1373 > <!--       <param name="build.javadoc.access" value="protected"/> -->
1374 > <!--     </antcall> -->
1375 > <!--   </target> -->
1376  
1377   <!-- Generates all doclint warnings, even for private methods (rarely useful) -->
1378 <  <target name="lint-private">
1378 >  <target name="doclint-private">
1379      <antcall target="dist">
1380        <param name="build.javadoc.access" value="private"/>
1381      </antcall>
1382    </target>
1383  
1384  
1385 + <!-- ==============================================================
1386 +  Experimental errorprone support
1387 +  https://errorprone.info
1388 +  https://errorprone.info/docs/installation
1389 +  https://github.com/google/error-prone/issues/1143
1390 + =================================================================== -->
1391 +  <path id="errorprone.processorpath.path">
1392 +    <pathelement location="${lib.dir}/error_prone_core-2.3.2-with-dependencies.jar"/>
1393 +    <pathelement location="${lib.dir}/dataflow-2.5.7.jar"/>
1394 +    <pathelement location="${lib.dir}/javacutil-2.5.7.jar"/>
1395 +    <pathelement location="${lib.dir}/jFormatString-3.0.0.jar"/>
1396 +  </path>
1397 +  <property name="errorprone.processorpath" refid="errorprone.processorpath.path" />
1398 +  <property name="errorprone.jsr166.user.flags" value=""/>
1399 +  <property name="errorprone.jsr166.flags"
1400 +            value="-Xep:HashtableContains:OFF
1401 +                   -Xep:JdkObsolete:OFF
1402 +                   -Xep:MissingOverride:OFF
1403 +                   -Xep:MissingFail:OFF
1404 +                   -Xep:ThreadPriorityCheck:OFF
1405 +                   -Xep:MixedArrayDimensions:ERROR
1406 +                   -Xep:RemoveUnusedImports:ERROR
1407 +                   -Xep:EmptyIf:ERROR
1408 +                   -Xep:MultipleTopLevelClasses:ERROR
1409 +                   -Xep:ClassName:ERROR
1410 +                   -Xep:LongLiteralLowerCaseSuffix:ERROR
1411 +                   -Xep:RedundantThrows:ERROR
1412 +                   -Xep:IdentityBinaryExpression:WARN
1413 +                   -Xep:ConstructorInvokesOverridable:WARN
1414 +                   -Xep:MethodCanBeStatic:WARN
1415 +                   ${errorprone.jsr166.user.flags}"/>
1416 +  <!-- -Xep:WildcardImport:ERROR -->
1417 +  <property name="errorprone.jsr166.test.flags"
1418 +            value="-Xep:StringSplitter:OFF
1419 +                   -Xep:BoxedPrimitiveConstructor:OFF
1420 +                   -Xep:ModifyingCollectionWithItself:OFF"/>
1421 +  <!-- ant -emacs errorprone |& grep -EA1 '(warning|error):|warnings' -->
1422 +  <target name="errorprone"
1423 +          depends="clean, configure-compiler"
1424 +          description="Run errorprone over jsr166 source code (experimental)">
1425 +
1426 +    <local name="destdir"/>
1427 +    <property name="destdir" value="${build.classes.dir}/java.base"/>
1428 +    <mkdir dir="${destdir}"/>
1429 +
1430 +    <javac srcdir="${src.dir}"
1431 +           destdir="${destdir}"
1432 +           debug="${build.debug}"
1433 +           debuglevel="${build.debuglevel}"
1434 +           deprecation="${build.deprecation}"
1435 +           classpath=""
1436 +           includeAntRuntime="false"
1437 +           includeJavaRuntime="false"
1438 +           encoding="ASCII"
1439 +           executable="${build.main.javac}"
1440 +           fork="true">
1441 +
1442 +      <include name="**/*.java"/>
1443 +      <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
1444 +      <compilerarg value="-J--illegal-access=permit"/>
1445 +      <compilerarg value="-XDcompilePolicy=simple"/>
1446 +      <compilerarg value="-processorpath"/>
1447 +      <compilerarg pathref="errorprone.processorpath.path"/>
1448 +      <compilerarg value="-Xplugin:ErrorProne
1449 +                          ${errorprone.jsr166.flags}"/>
1450 +      <compilerarg value="--patch-module=java.base=${src.dir}"/>
1451 +      <compilerarg value="-Xprefer:source"/>
1452 +      <compilerarg value="-XDignore.symbol.file=true"/>
1453 +      <compilerarg value="-Xlint:all"/>
1454 +      <compilerarg value="-Xdoclint:all/protected,reference/private"/>
1455 +      <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
1456 +      <compilerarg line="${build.args}"/>
1457 +    </javac>
1458 +
1459 +    <jar destfile="${product.jar}">
1460 +      <fileset dir="${destdir}"/>
1461 +    </jar>
1462 +
1463 +    <run-tck-tests
1464 +      target="${java.runtime.target}"
1465 +      workdir="${build.dir}"
1466 +      classes="${product.jar}">
1467 +      <javac-elements>
1468 +        <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
1469 +        <compilerarg value="-J--illegal-access=permit"/>
1470 +        <compilerarg value="-XDcompilePolicy=simple"/>
1471 +        <compilerarg line="-processorpath ${errorprone.processorpath}"/>
1472 +        <compilerarg value="-Xplugin:ErrorProne
1473 +                            ${errorprone.jsr166.flags}
1474 +                            ${errorprone.jsr166.test.flags}"/>
1475 +        <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
1476 +      </javac-elements>
1477 +    </run-tck-tests>
1478 +  </target>
1479 +
1480 +  <!-- ant -emacs errorprone-jtreg |& grep -EA1 '(warning|error):' -->
1481 +  <!-- -XDcompilePolicy=simple or byfile avoids confusing UnusedImports -->
1482 +  <target name="errorprone-jtreg"
1483 +          depends="jar"
1484 +          description="Run errorprone over jtreg tests (experimental)">
1485 +
1486 +    <run-jtreg-tests
1487 +       target="${java.runtime.target}"
1488 +       workdir="${build.dir}"
1489 +       classes="${product.jar}"
1490 +       verbose="all">
1491 +      <jtreg-elements>
1492 +        <arg value="-javacoption:-XDcompilePolicy=simple"/>
1493 +        <arg value="-javacoption:-processorpath"/>
1494 +        <arg value="-javacoption:${errorprone.processorpath}"/>
1495 +        <arg value="-javacoption:-Xplugin:ErrorProne
1496 +                            ${errorprone.jsr166.flags}
1497 +                            ${errorprone.jsr166.test.flags}
1498 +                            -Xep:MultipleTopLevelClasses:WARN
1499 +                            -Xep:NonAtomicVolatileUpdate:OFF"/>
1500 +      </jtreg-elements>
1501 +    </run-jtreg-tests>
1502 +  </target>
1503 +
1504 +
1505 + <!-- ==============================================================
1506 +  Running guava tests against jsr166 code
1507 + =================================================================== -->
1508 +
1509 + <!-- <ivy:cachepath pathid="lib.path.id" inline="true" conf="*" -->
1510 + <!--   organisation="com.google.guava" module="guava-testlib" revision="21.0"/> -->
1511 + <!-- <property name="guava.version" value="21.0"/> -->
1512 +
1513 + <!-- HOWTO debug print a path id -->
1514 + <!-- <pathconvert property="guava.testlib.classpath" refid="guava.testlib.classpath" /> -->
1515 + <!-- <echo message="guava.testlib.classpath=${guava.testlib.classpath}"/> -->
1516 +
1517 + <!-- <ivy:retrieve pathid="guava.tests.classpath" type="jar" inline="true" conf="*" pattern="${lib.dir}/[type]/[artifact].[ext]" -->
1518 + <!--   organisation="com.google.guava" module="guava-tests"/> -->
1519 + <!-- <get src="http://repo2.maven.org/maven2/com/google/guava/guava-tests/${guava.version}/guava-tests-${guava.version}-tests.jar" -->
1520 + <!--   dest="${lib.dir}/jar/guava-tests-tests.jar" usetimestamp="true"/> -->
1521 + <!--     <ivy:cachepath pathid="lib.path.id" inline="true" conf="*" type="*" -->
1522 + <!--       organisation="com.google.guava" module="guava-testlib" revision="${guava.version}"/> -->
1523 +
1524 + <!-- <test name="com.google.common.collect.testing.TestsForQueuesInJavaUtil"/> -->
1525 + <!-- <test name="com.google.common.collect.testing.TestsForListsInJavaUtil"/> -->
1526 + <!-- <test name="com.google.common.collect.testing.TestsForSetsInJavaUtil"/> -->
1527 + <!-- <test name="com.google.common.collect.testing.TestsForMapsInJavaUtil"/> -->
1528 +
1529 + <!-- <ivy:retrieve pathid="guava.testlib.classpath" -->
1530 + <!--   type="*" inline="true" conf="*(private),*(public)" -->
1531 + <!--   pattern="${guava.dir}/[artifact].[ext]" -->
1532 + <!--   organisation="com.google.guava" module="guava-testlib"/> -->
1533 +
1534 + <!-- Work around bug below by downloading guava-testlib-tests.jar "by hand": -->
1535 + <!-- https://issues.apache.org/jira/browse/IVY-1444 -->
1536 + <!-- maven tests artifacts cannot be downloaded because they are mapped to private configurations -->
1537 +
1538 +  <target name="init-ivy">
1539 +    <get src="http://repo2.maven.org/maven2/org/apache/ivy/ivy/2.4.0/ivy-2.4.0.jar"
1540 +         dest="${build.dir}/ivy.jar" usetimestamp="true" skipexisting="true"/>
1541 +    <taskdef resource="org/apache/ivy/ant/antlib.xml" uri="antlib:org.apache.ivy.ant"
1542 +             classpath="${build.dir}/ivy.jar"/>
1543 +  </target>
1544 +
1545 +  <target name="guava-tests" depends="jar, init-ivy"
1546 +          description="Guava tests run against jsr166 collections">
1547 +    <property name="guava.dir" value="${build.dir}/guava-testlib"/>
1548 +    <mkdir dir="${guava.dir}"/>
1549 +    <ivy:retrieve pathid="guava.testlib.classpath"
1550 +      type="jar,bundle" inline="true" conf="default,master"
1551 +      pattern="${guava.dir}/[artifact].[ext]"
1552 +      organisation="com.google.guava" module="guava-testlib"/>
1553 +    <property name="guava.version" value="21.0"/>
1554 +    <get src="http://repo2.maven.org/maven2/com/google/guava/guava-testlib/${guava.version}/guava-testlib-${guava.version}-tests.jar"
1555 +         dest="${guava.dir}/guava-testlib-tests.jar" usetimestamp="true"/>
1556 +    <junit printsummary="true" showoutput="true" haltonfailure="true"
1557 +           jvm="${build.main.java}" fork="true">
1558 +      <jvmarg line="-ea -esa --patch-module=java.base=${product.jar}"/>
1559 +      <formatter type="brief"/>
1560 +      <classpath>
1561 +        <pathelement location="${guava.dir}/guava-testlib-tests.jar"/>
1562 +        <path refid="guava.testlib.classpath"/>
1563 +      </classpath>
1564 +
1565 +      <!-- "6" in "OpenJdk6Tests" misleadingly means "6+" -->
1566 +      <test name="com.google.common.collect.testing.OpenJdk6Tests"/>
1567 +    </junit>
1568 +  </target>
1569 +
1570   </project>

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines