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.314 by jsr166, Wed May 6 16:51:05 2020 UTC vs.
Revision 1.328 by jsr166, Sat Jan 7 16:30:33 2023 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/jdk11
23 <  $HOME/jdk/jdk12
24 <  $HOME/jdk/jdk13
25 <  $HOME/jdk/jdk14
26 <  $HOME/jdk/jdk15
22 >  $HOME/jdk/jdk17
23 >  $HOME/jdk/jdk19
24    where each of the above is a JDK or a symlink to same, and
25 <  $HOME/jdk/src/jdk11
29 <  $HOME/jdk/src/jdk12
30 <  $HOME/jdk/src/jdk13
31 <  $HOME/jdk/src/jdk14
32 <  $HOME/jdk/src/jdk15
25 >  $HOME/jdk/src/jdk17
26    where each of the above is a JDK source tree or a symlink to same.
27  
28    Alternatively, define ant variables thus:
29    ant -Djdk$N.home=... -Djdk$N.src.home=...
30 <  for $N in 11 .. 15 ...
30 >  for $N in 17 .. 19 ...
31  
32    As of 2016-03, the sources in src/main are for jdk9+ only.
33    As of 2019-08, the sources in src/main are for jdk11+ only.
34    As of 2019-10, compatibility support for jdk8 is dropped entirely.
35 +  As of 2022-02, the sources in src/main are for jdk17+ only.
36   ------------------------------------------------------------------------------
37    </description>
38  
# Line 94 | Line 88
88      </sequential>
89    </macrodef>
90  
91 <  <defjdklocations v="11"/>
92 <  <defjdklocations v="12"/>
93 <  <defjdklocations v="13"/>
94 <  <defjdklocations v="14"/>
95 <  <defjdklocations v="15"/>
91 >  <defjdklocations v="17"/>
92 >  <defjdklocations v="18"/>
93 >  <defjdklocations v="19"/>
94 >  <defjdklocations v="20"/>
95 >  <defjdklocations v="21"/>
96  
97    <!-- Source locations -->
98    <property name="src.dir"              location="${basedir}/src/main"/>
99    <property name="test.src.dir"         location="${basedir}/src/test"/>
100    <property name="loops.src.dir"        location="${basedir}/src/loops"/>
101    <property name="tck.src.dir"          location="${test.src.dir}/tck"/>
102 <  <property name="jtreg11.src.dir"      location="${test.src.dir}/jtreg"/>
103 <  <property name="jtreg12.src.dir"      location="${test.src.dir}/jtreg"/>
104 <  <property name="jtreg13.src.dir"      location="${test.src.dir}/jtreg"/>
105 <  <property name="jtreg14.src.dir"      location="${test.src.dir}/jtreg"/>
106 <  <property name="jtreg15.src.dir"      location="${test.src.dir}/jtreg"/>
107 <  <property name="jtreg.src.dir"        location="${jtreg11.src.dir}"/>
102 >  <property name="jtreg17.src.dir"      location="${test.src.dir}/jtreg"/>
103 >  <property name="jtreg18.src.dir"      location="${test.src.dir}/jtreg"/>
104 >  <property name="jtreg19.src.dir"      location="${test.src.dir}/jtreg"/>
105 >  <property name="jtreg20.src.dir"      location="${test.src.dir}/jtreg"/>
106 >  <property name="jtreg21.src.dir"      location="${test.src.dir}/jtreg"/>
107 >  <property name="jtreg.src.dir"        location="${jtreg17.src.dir}"/>
108    <property name="lib.dir"              location="${basedir}/lib"/>
109    <property name="dist.dir"             location="${basedir}/dist"/>
110    <property name="topsrc.dir"           location="${basedir}/src"/>
# Line 125 | Line 119
119  
120    <!-- Canonical location of jdk docs root, to use with javadoc -Xdocrootparent flag -->
121    <!-- Switched to https: in 2017-10 - JDK-8190312 -->
122 <  <!-- <property name="java5.docroot.url"  value="https://docs.oracle.com/javase/1.5.0/docs"/> -->
123 <  <!-- <property name="java6.docroot.url"  value="https://docs.oracle.com/javase/6/docs"/> -->
124 <  <!-- <property name="java7.docroot.url"  value="https://docs.oracle.com/javase/7/docs"/> -->
125 <  <!-- <property name="java8.docroot.url"  value="https://docs.oracle.com/javase/8/docs"/> -->
126 <  <!-- 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="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"/>
122 >  <property name="java17.docroot.url" value="https://docs.oracle.com/en/java/javase/17/docs"/>
123 >  <property name="java18.docroot.url" value="https://docs.oracle.com/en/java/javase/18/docs"/>
124 >  <property name="java19.docroot.url" value="https://docs.oracle.com/en/java/javase/19/docs"/>
125 >  <property name="java20.docroot.url" value="https://download.java.net/java/early_access/jdk20/docs"/>
126 >  <property name="java21.docroot.url" value="https://download.java.net/java/early_access/jdk21/docs"/>
127    <!-- Default jdk doc location (latest stable LTS release seems best) -->
128 <  <property name="java.docroot.url"   value="${java11.docroot.url}"/>
128 >  <property name="java.docroot.url"   value="${java17.docroot.url}"/>
129  
130    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
131 <  <property name="java11.api.url"     value="${java11.docroot.url}/api/"/>
132 <  <property name="java12.api.url"     value="${java12.docroot.url}/api/"/>
133 <  <property name="java13.api.url"     value="${java13.docroot.url}/api/"/>
134 <  <property name="java14.api.url"     value="${java14.docroot.url}/api/"/>
135 <  <property name="java15.api.url"     value="${java15.docroot.url}/api/"/>
131 >  <property name="java17.api.url"     value="${java17.docroot.url}/api/"/>
132 >  <property name="java18.api.url"     value="${java18.docroot.url}/api/"/>
133 >  <property name="java19.api.url"     value="${java19.docroot.url}/api/"/>
134 >  <property name="java20.api.url"     value="${java20.docroot.url}/api/"/>
135 >  <property name="java21.api.url"     value="${java21.docroot.url}/api/"/>
136    <property name="java.api.url"       value="${java.docroot.url}/api/"/>
137  
138    <!-- Define the "jtreg" task -->
# Line 248 | Line 234
234      </sequential>
235    </macrodef>
236  
237 <  <defjtregtests v="15"/>
238 <  <defjtregtests v="14"/>
239 <  <defjtregtests v="13"/>
240 <  <defjtregtests v="12"/>
241 <  <defjtregtests v="11"/>
237 >  <defjtregtests v="17"/>
238 >  <defjtregtests v="18"/>
239 >  <defjtregtests v="19"/>
240 >  <defjtregtests v="20"/>
241 >  <defjtregtests v="21"/>
242  
243    <!-- ant -Djtreg.flags=-timeoutFactor:4 -->
244    <property name="jtreg.flags" value=""/>
245  
246    <macrodef name="run-jtreg-tests">
261    <!-- ant -Djtreg11.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
247      <attribute name="target"/>
248      <attribute name="workdir"/>
249      <attribute name="classes"/>
# Line 271 | Line 256
256      <!-- ant -Djtreg.verbose=time,fail,error jtreg -->
257      <property name="jtreg.verbose" value="nopass,fail,error"/>
258  
259 <    <delete dir="@{workdir}/JTwork"   quiet="true"/>
259 >    <!-- concurrency > 1 mitigates slowness of some jtreg tests -->
260 >    <!-- BUT concurrency:auto starts "too many" VMs; just 1 free core each -->
261 >    <!-- In 2020 concurrency:3 seems like a sweet spot -->
262 >    <!-- Override using:  ant -Djtreg.concurrency="N" jtreg -->
263 >    <property name="jtreg.concurrency" value="3"/>
264 >
265 >    <delete dir="@{workdir}/JTwork" quiet="true"/>
266      <jtreg dir="${jtreg@{target}.src.dir}"
267             jdk="${jdk@{target}.home}"
268             workDir="@{workdir}/JTwork">
269        <patternset refid="jdk@{target}.jtreg.tests"/>
270 <      <arg value="-javacoptions:--patch-module=java.base=@{classes}"/>
271 <      <arg value="-vmoptions:--patch-module=java.base=@{classes}"/>
270 >      <arg value="-javacoption:--patch-module=java.base=@{classes}"/>
271 >      <arg value="-vmoption:--patch-module=java.base=@{classes}"/>
272 >      <arg value="-vmoption:-Xmx256m"/>
273 >      <arg value="-concurrency:${jtreg.concurrency}"/>
274 >      <arg value="-vmoptions:-esa -ea"/>
275        <arg value="-vmoptions:${vmoptions}" if:set="vmoptions"/>
276        <arg value="-agentvm"/>
277        <arg value="-noreport"/>
278        <arg value="-verbose:@{verbose}"/>
285      <arg value="-vmoptions:-esa -ea"/>
279        <arg value="-automatic"/>
280        <arg value="-k:!ignore"/>
281        <arg line="@{jtregflags}"/>
# Line 305 | Line 298
298    <!-- Main targets -->
299  
300    <!-- Default values: may seem strange ... -->
301 <  <!-- At runtime, target latest LTS, i.e. jdk11 -->
302 <  <!-- But at build time, target jdk9, for maximal binary portability -->
303 <  <!-- ButButBut as of 2019-08, target jdk11 at build time -->
304 <  <!-- Use javadoc12 (but -link to jdk11 api docs!), to get:
305 <    o override-methods=summary
313 <    o {@systemProperty ...}
314 <    o 8211194: issues linking to external documentation (was: missing package-list for JDK10 / JDK11 documentation)
315 <    o 8202628: javadoc generates bad links in TestModules.java
316 <    -->
317 <  <property name="java.runtime.target" value="11"/>
318 <  <property name="build.main.java" value="${java11}"/>
319 <  <property name="build.main.javac" value="${javac11}"/>
320 <  <property name="build.main.javadoc" value="${javadoc12}"/>
301 >  <!-- At runtime, target latest, but build for current LTS -->
302 >  <property name="java.runtime.target" value="19"/>
303 >  <property name="build.main.java" value="${java17}"/>
304 >  <property name="build.main.javac" value="${javac17}"/>
305 >  <property name="build.main.javadoc" value="${javadoc19}"/>
306    <property name="build.main.javadoc.source" value="${java.runtime.target}"/>
307  
308    <target name="dists"
# Line 349 | Line 334
334        <compilerarg value="--patch-module=java.base=${src.dir}"/>
335        <compilerarg value="-Xprefer:source"/>
336        <compilerarg value="-XDignore.symbol.file=true"/>
337 < <!--   Xlint:-removal for jdk12 Unsafe Object -> Reference renaming -->
353 <      <compilerarg value="-Xlint:all,-removal"/>
354 <      <compilerarg line="--doclint-format html5"/>
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"/> -->
337 >      <compilerarg value="-Xlint:all"/>
338        <compilerarg value="-Xdoclint:all/protected"/>
339        <compilerarg value="-Xdoclint/package:java.util.*"/>
340        <compilerarg value="-Werror"/>
341        <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
342        <compilerarg line="${build.args}"/>
364
343      </javac>
344    </target>
345  
368
346    <target name="jar"
347            depends="compile"
348            description="Builds library jar for src/main from compiled sources">
# Line 383 | Line 360
360  
361    <target name="docs"
362            description="Builds javadocs for src/main to dist dir">
386
363      <delete dir="${docs.dir}" quiet="true"/>
364      <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
400 <!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}" -->
401 <!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}:${jdk9.src.home}/jdk/src/java.logging/share/classes" -->
402 <!-- TODO: sourcepath="${src.dir}:${jdk9.home}/src.zip" -->
403 <!-- TODO: <arg line="-sourcepath ${src.dir}:${jdk9.home}/src.zip"/> -->
404 <!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> -->
365      <javadoc destdir="${docs.dir}"
366               packagenames="none"
367               link="${java.api.url}"
# Line 411 | Line 371
371               classpath=""
372               source="${build.main.javadoc.source}"
373               executable="${build.main.javadoc}">
414 <!-- TODO: JDK-8214571 failonerror = "true" -->
374        <fileset dir="${src.dir}" defaultexcludes="yes">
375 <        <include name="**/*.java"/>
375 >        <include name="java/**/*.java"/>
376        </fileset>
377        <arg line="-Xdocrootparent ${java.docroot.url}"/>
378        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
379 +      <arg line="-Xmaxerrs 1000 -Xmaxwarns 1"/>
380        <arg value="-quiet"/>
381        <arg value="-XDignore.symbol.file=true"/>
382        <arg value="-html5"/>
383 +      <arg value="-Xdoclint:all,-missing"/>
384        <arg value="--patch-module=java.base=${src.dir}"/>
385        <arg value="--frames" if:set="use-frames"/>
386        <arg value="--override-methods=summary"/>
# Line 427 | Line 388
388        <arg value="-tag"/> <arg value="implSpec:a:Implementation Requirements:"/>
389        <arg value="-tag"/> <arg value="implNote:a:Implementation Note:"/>
390        <arg value="-tag"/> <arg value="apiNote:a:API Note:"/>
430 <!-- tags added in jdk9: currently unused -->
431 <!--  <arg value="-tag"/> <arg value="revised:X"/> -->
432 <!--  <arg value="-tag"/> <arg value="spec:X"/> -->
391      </javadoc>
392    </target>
393  
436
394    <target name="dist"
395            depends="dist-clean, dist-jar, dist-docs"
396            description="Puts all distributable products in single hierarchy"/>
397  
441
398    <target name="clean"
399            description="Removes all build products">
400      <delete dir="${build.dir}"/>
401    </target>
402  
447
403    <target name="dist-clean"
404            description="Removes all build and distribution products">
405      <delete dir="${build.dir}"/>
406      <delete dir="${dist.dir}"/>
407    </target>
408  
454
409    <target name="dist-jar"
410            depends="clean, jar">
411      <copy file="${product.jar}" todir="${dist.dir}"/>
# Line 465 | Line 419
419    <target name="tck"
420            depends="jar"
421            description="Runs tck tests for src/main directly">
468
422      <run-tck-tests
423        target="${java.runtime.target}"
424        workdir="${build.dir}"
425        classes="${product.jar}">
426        <javac-elements>
427 <        <compilerarg value="-Werror"/>
427 >        <!-- <compilerarg value="-Werror"/> -->
428        </javac-elements>
429      </run-tck-tests>
430    </target>
# Line 511 | Line 464
464            description="Runs tck and jtreg tests for src/main"/>
465  
466    <target name="test-version-permutations"
467 <          depends="test11, test12, test13, test14, test15, test11-12, test11-13, test11-14, test11-15, clean, test, docs"
467 >          depends="test17, test19, clean, test, docs"
468            description="Runs tck and jtreg tests for various build-time and runtime java versions"/>
469  
517  <target name="test11">
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">
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">
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">
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>
470  
471 <  <target name="test15">
471 >  <target name="test17">
472      <antcall>
473 <      <param name="java.runtime.target" value="15"/>
474 <      <param name="build.main.javac" value="${javac15}"/>
475 <      <param name="build.main.javadoc" value="${javadoc15}"/>
476 <      <param name="build.main.javadoc.source" value="15"/>
473 >      <param name="java.runtime.target" value="17"/>
474 >      <param name="build.main.javac" value="${javac17}"/>
475 >      <param name="build.main.javadoc" value="${javadoc17}"/>
476 >      <param name="build.main.javadoc.source" value="17"/>
477        <target name="clean"/>
478        <target name="test"/>
479        <target name="docs"/>
480      </antcall>
481    </target>
482 <
577 <  <target name="test11-12">
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">
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">
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">
482 >  <target name="test19">
483      <antcall>
484 <      <param name="java.runtime.target" value="15"/>
485 <      <param name="build.main.javac" value="${javac11}"/>
486 <      <param name="build.main.javadoc" value="${javadoc15}"/>
487 <      <param name="build.main.javadoc.source" value="11"/>
484 >      <param name="java.runtime.target" value="19"/>
485 >      <param name="build.main.javac" value="${javac19}"/>
486 >      <param name="build.main.javadoc" value="${javadoc19}"/>
487 >      <param name="build.main.javadoc.source" value="19"/>
488        <target name="clean"/>
489        <target name="test"/>
490        <target name="docs"/>
# Line 709 | Line 578
578    <property name="errorprone.jsr166.user.flags" value=""/>
579    <property name="errorprone.jsr166.flags"
580              value="-Xep:HashtableContains:OFF
581 +                   -Xep:PreferJavaTimeOverload:OFF
582                     -Xep:JdkObsolete:OFF
583                     -Xep:MissingOverride:OFF
584                     -Xep:MissingFail:OFF
# Line 728 | Line 598
598    <property name="errorprone.jsr166.test.flags"
599              value="-Xep:StringSplitter:OFF
600                     -Xep:BoxedPrimitiveConstructor:OFF
601 +                   -Xep:UnnecessaryParentheses:OFF
602                     -Xep:ModifyingCollectionWithItself:OFF"/>
603    <!-- ant -emacs errorprone |& grep -EA1 '(warning|error):|warnings' -->
604    <target name="errorprone"
# Line 763 | Line 634
634        <compilerarg value="-XDignore.symbol.file=true"/>
635        <compilerarg value="-Xlint:all"/>
636        <compilerarg value="-Xdoclint:all/protected,reference/private"/>
637 <      <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
637 >      <!--      <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/> -->
638 >      <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 1"/>
639        <compilerarg line="${build.args}"/>
640      </javac>
641  
# Line 783 | Line 655
655          <compilerarg value="-Xplugin:ErrorProne
656                              ${errorprone.jsr166.flags}
657                              ${errorprone.jsr166.test.flags}"/>
658 <        <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
658 >        <!--      <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/> -->
659 >        <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 1"/>
660        </javac-elements>
661      </run-tck-tests>
662    </target>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines