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.313 by jsr166, Mon Apr 27 23:47:11 2020 UTC vs.
Revision 1.327 by jsr166, Fri Nov 25 20:33:50 2022 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"/>
101 <  <defjdklocations v="15"/>
91 >  <defjdklocations v="17"/>
92 >  <defjdklocations v="18"/>
93 >  <defjdklocations v="19"/>
94 >  <defjdklocations v="20"/>
95  
96    <!-- Source locations -->
97    <property name="src.dir"              location="${basedir}/src/main"/>
98    <property name="test.src.dir"         location="${basedir}/src/test"/>
99    <property name="loops.src.dir"        location="${basedir}/src/loops"/>
100    <property name="tck.src.dir"          location="${test.src.dir}/tck"/>
101 <  <property name="jtreg11.src.dir"      location="${test.src.dir}/jtreg"/>
102 <  <property name="jtreg12.src.dir"      location="${test.src.dir}/jtreg"/>
103 <  <property name="jtreg13.src.dir"      location="${test.src.dir}/jtreg"/>
104 <  <property name="jtreg14.src.dir"      location="${test.src.dir}/jtreg"/>
105 <  <property name="jtreg15.src.dir"      location="${test.src.dir}/jtreg"/>
113 <  <property name="jtreg.src.dir"        location="${jtreg11.src.dir}"/>
101 >  <property name="jtreg17.src.dir"      location="${test.src.dir}/jtreg"/>
102 >  <property name="jtreg18.src.dir"      location="${test.src.dir}/jtreg"/>
103 >  <property name="jtreg19.src.dir"      location="${test.src.dir}/jtreg"/>
104 >  <property name="jtreg20.src.dir"      location="${test.src.dir}/jtreg"/>
105 >  <property name="jtreg.src.dir"        location="${jtreg17.src.dir}"/>
106    <property name="lib.dir"              location="${basedir}/lib"/>
107    <property name="dist.dir"             location="${basedir}/dist"/>
108    <property name="topsrc.dir"           location="${basedir}/src"/>
# Line 125 | Line 117
117  
118    <!-- Canonical location of jdk docs root, to use with javadoc -Xdocrootparent flag -->
119    <!-- Switched to https: in 2017-10 - JDK-8190312 -->
120 <  <!-- <property name="java5.docroot.url"  value="https://docs.oracle.com/javase/1.5.0/docs"/> -->
121 <  <!-- <property name="java6.docroot.url"  value="https://docs.oracle.com/javase/6/docs"/> -->
122 <  <!-- <property name="java7.docroot.url"  value="https://docs.oracle.com/javase/7/docs"/> -->
123 <  <!-- <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="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"/>
120 >  <property name="java17.docroot.url" value="https://docs.oracle.com/en/java/javase/17/docs"/>
121 >  <property name="java18.docroot.url" value="https://docs.oracle.com/en/java/javase/18/docs"/>
122 >  <property name="java19.docroot.url" value="https://docs.oracle.com/en/java/javase/19/docs"/>
123 >  <property name="java20.docroot.url" value="https://download.java.net/java/early_access/jdk20/docs"/>
124    <!-- Default jdk doc location (latest stable LTS release seems best) -->
125 <  <property name="java.docroot.url"   value="${java11.docroot.url}"/>
125 >  <property name="java.docroot.url"   value="${java17.docroot.url}"/>
126  
127    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
128 <  <property name="java11.api.url"     value="${java11.docroot.url}/api/"/>
129 <  <property name="java12.api.url"     value="${java12.docroot.url}/api/"/>
130 <  <property name="java13.api.url"     value="${java13.docroot.url}/api/"/>
131 <  <property name="java14.api.url"     value="${java14.docroot.url}/api/"/>
149 <  <property name="java15.api.url"     value="${java15.docroot.url}/api/"/>
128 >  <property name="java17.api.url"     value="${java17.docroot.url}/api/"/>
129 >  <property name="java18.api.url"     value="${java18.docroot.url}/api/"/>
130 >  <property name="java19.api.url"     value="${java19.docroot.url}/api/"/>
131 >  <property name="java20.api.url"     value="${java20.docroot.url}/api/"/>
132    <property name="java.api.url"       value="${java.docroot.url}/api/"/>
133  
134    <!-- Define the "jtreg" task -->
# Line 248 | Line 230
230      </sequential>
231    </macrodef>
232  
233 <  <defjtregtests v="15"/>
234 <  <defjtregtests v="14"/>
235 <  <defjtregtests v="13"/>
236 <  <defjtregtests v="12"/>
255 <  <defjtregtests v="11"/>
233 >  <defjtregtests v="17"/>
234 >  <defjtregtests v="18"/>
235 >  <defjtregtests v="19"/>
236 >  <defjtregtests v="20"/>
237  
238    <!-- ant -Djtreg.flags=-timeoutFactor:4 -->
239    <property name="jtreg.flags" value=""/>
240  
241    <macrodef name="run-jtreg-tests">
261    <!-- ant -Djtreg11.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
242      <attribute name="target"/>
243      <attribute name="workdir"/>
244      <attribute name="classes"/>
# Line 271 | Line 251
251      <!-- ant -Djtreg.verbose=time,fail,error jtreg -->
252      <property name="jtreg.verbose" value="nopass,fail,error"/>
253  
254 <    <delete dir="@{workdir}/JTwork"   quiet="true"/>
254 >    <!-- concurrency > 1 mitigates slowness of some jtreg tests -->
255 >    <!-- BUT concurrency:auto starts "too many" VMs; just 1 free core each -->
256 >    <!-- In 2020 concurrency:3 seems like a sweet spot -->
257 >    <!-- Override using:  ant -Djtreg.concurrency="N" jtreg -->
258 >    <property name="jtreg.concurrency" value="3"/>
259 >
260 >    <delete dir="@{workdir}/JTwork" quiet="true"/>
261      <jtreg dir="${jtreg@{target}.src.dir}"
262             jdk="${jdk@{target}.home}"
263             workDir="@{workdir}/JTwork">
264        <patternset refid="jdk@{target}.jtreg.tests"/>
265 <      <arg value="-javacoptions:--patch-module=java.base=@{classes}"/>
266 <      <arg value="-vmoptions:--patch-module=java.base=@{classes}"/>
265 >      <arg value="-javacoption:--patch-module=java.base=@{classes}"/>
266 >      <arg value="-vmoption:--patch-module=java.base=@{classes}"/>
267 >      <arg value="-vmoption:-Xmx256m"/>
268 >      <arg value="-concurrency:${jtreg.concurrency}"/>
269 >      <arg value="-vmoptions:-esa -ea"/>
270        <arg value="-vmoptions:${vmoptions}" if:set="vmoptions"/>
271        <arg value="-agentvm"/>
272        <arg value="-noreport"/>
273        <arg value="-verbose:@{verbose}"/>
285      <arg value="-vmoptions:-esa -ea"/>
274        <arg value="-automatic"/>
275        <arg value="-k:!ignore"/>
276        <arg line="@{jtregflags}"/>
# Line 305 | Line 293
293    <!-- Main targets -->
294  
295    <!-- Default values: may seem strange ... -->
296 <  <!-- At runtime, target latest LTS, i.e. jdk11 -->
297 <  <!-- But at build time, target jdk9, for maximal binary portability -->
298 <  <!-- ButButBut as of 2019-08, target jdk11 at build time -->
299 <  <!-- Use javadoc12 (but -link to jdk11 api docs!), to get:
300 <    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}"/>
296 >  <!-- At runtime, target latest, but build for current LTS -->
297 >  <property name="java.runtime.target" value="19"/>
298 >  <property name="build.main.java" value="${java17}"/>
299 >  <property name="build.main.javac" value="${javac17}"/>
300 >  <property name="build.main.javadoc" value="${javadoc19}"/>
301    <property name="build.main.javadoc.source" value="${java.runtime.target}"/>
302  
303    <target name="dists"
# Line 349 | Line 329
329        <compilerarg value="--patch-module=java.base=${src.dir}"/>
330        <compilerarg value="-Xprefer:source"/>
331        <compilerarg value="-XDignore.symbol.file=true"/>
332 < <!--   Xlint:-removal for jdk12 Unsafe Object -> Reference renaming -->
333 <      <compilerarg value="-Xlint:all,-removal"/>
354 <      <compilerarg line="--doclint-format html5"/>
355 < <!--  Temporarily disable doclint, due to https://bugs.openjdk.java.net/browse/JDK-8214571 -->
356 < <!--  <compilerarg value="-Xdoclint:all/protected,reference/private"/> -->
332 >      <compilerarg value="-Xlint:all"/>
333 >      <compilerarg value="-Xdoclint:all/protected"/>
334        <compilerarg value="-Xdoclint/package:java.util.*"/>
335        <compilerarg value="-Werror"/>
336        <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
337        <compilerarg line="${build.args}"/>
361
338      </javac>
339    </target>
340  
365
341    <target name="jar"
342            depends="compile"
343            description="Builds library jar for src/main from compiled sources">
# Line 380 | Line 355
355  
356    <target name="docs"
357            description="Builds javadocs for src/main to dist dir">
383
358      <delete dir="${docs.dir}" quiet="true"/>
359      <mkdir dir="${docs.dir}"/>
386
387    <!-- old school frames via docs/index.html?overview-summary.html -->
388    <!-- dash-dash-frames no longer a supported option in jdk13+ -->
389    <local name="use-frames"/>
390    <condition property="use-frames">
391      <equals arg1="${build.main.javadoc}" arg2="${javadoc12}"/>
392    </condition>
393
394    <!-- the packagenames="none" hack below prevents scanning the -->
395    <!-- sourcepath for packages -->
396
397 <!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}" -->
398 <!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}:${jdk9.src.home}/jdk/src/java.logging/share/classes" -->
399 <!-- TODO: sourcepath="${src.dir}:${jdk9.home}/src.zip" -->
400 <!-- TODO: <arg line="-sourcepath ${src.dir}:${jdk9.home}/src.zip"/> -->
401 <!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> -->
360      <javadoc destdir="${docs.dir}"
361               packagenames="none"
362               link="${java.api.url}"
# Line 408 | Line 366
366               classpath=""
367               source="${build.main.javadoc.source}"
368               executable="${build.main.javadoc}">
411 <!-- TODO: JDK-8214571 failonerror = "true" -->
369        <fileset dir="${src.dir}" defaultexcludes="yes">
370 <        <include name="**/*.java"/>
370 >        <include name="java/**/*.java"/>
371        </fileset>
372        <arg line="-Xdocrootparent ${java.docroot.url}"/>
373        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
374 +      <arg line="-Xmaxerrs 1000 -Xmaxwarns 1"/>
375        <arg value="-quiet"/>
376        <arg value="-XDignore.symbol.file=true"/>
377        <arg value="-html5"/>
378 +      <arg value="-Xdoclint:all,-missing"/>
379        <arg value="--patch-module=java.base=${src.dir}"/>
380        <arg value="--frames" if:set="use-frames"/>
381        <arg value="--override-methods=summary"/>
# Line 424 | Line 383
383        <arg value="-tag"/> <arg value="implSpec:a:Implementation Requirements:"/>
384        <arg value="-tag"/> <arg value="implNote:a:Implementation Note:"/>
385        <arg value="-tag"/> <arg value="apiNote:a:API Note:"/>
427 <!-- tags added in jdk9: currently unused -->
428 <!--  <arg value="-tag"/> <arg value="revised:X"/> -->
429 <!--  <arg value="-tag"/> <arg value="spec:X"/> -->
386      </javadoc>
387    </target>
388  
433
389    <target name="dist"
390            depends="dist-clean, dist-jar, dist-docs"
391            description="Puts all distributable products in single hierarchy"/>
392  
438
393    <target name="clean"
394            description="Removes all build products">
395      <delete dir="${build.dir}"/>
396    </target>
397  
444
398    <target name="dist-clean"
399            description="Removes all build and distribution products">
400      <delete dir="${build.dir}"/>
401      <delete dir="${dist.dir}"/>
402    </target>
403  
451
404    <target name="dist-jar"
405            depends="clean, jar">
406      <copy file="${product.jar}" todir="${dist.dir}"/>
# Line 462 | Line 414
414    <target name="tck"
415            depends="jar"
416            description="Runs tck tests for src/main directly">
465
417      <run-tck-tests
418        target="${java.runtime.target}"
419        workdir="${build.dir}"
420        classes="${product.jar}">
421        <javac-elements>
422 <        <compilerarg value="-Werror"/>
422 >        <!-- <compilerarg value="-Werror"/> -->
423        </javac-elements>
424      </run-tck-tests>
425    </target>
# Line 508 | Line 459
459            description="Runs tck and jtreg tests for src/main"/>
460  
461    <target name="test-version-permutations"
462 <          depends="test11, test12, test13, test14, test15, test11-12, test11-13, test11-14, test11-15, clean, test, docs"
462 >          depends="test17, test19, clean, test, docs"
463            description="Runs tck and jtreg tests for various build-time and runtime java versions"/>
464  
514  <target name="test11">
515    <antcall>
516      <param name="java.runtime.target" value="11"/>
517      <param name="build.main.javac" value="${javac11}"/>
518      <param name="build.main.javadoc" value="${javadoc12}"/>
519      <param name="build.main.javadoc.source" value="11"/>
520      <target name="clean"/>
521      <target name="test"/>
522      <target name="docs"/>
523    </antcall>
524  </target>
525
526  <target name="test12">
527    <antcall>
528      <param name="java.runtime.target" value="12"/>
529      <param name="build.main.javac" value="${javac12}"/>
530      <param name="build.main.javadoc" value="${javadoc12}"/>
531      <param name="build.main.javadoc.source" value="12"/>
532      <target name="clean"/>
533      <target name="test"/>
534      <target name="docs"/>
535    </antcall>
536  </target>
537
538  <target name="test13">
539    <antcall>
540      <param name="java.runtime.target" value="13"/>
541      <param name="build.main.javac" value="${javac13}"/>
542      <param name="build.main.javadoc" value="${javadoc13}"/>
543      <param name="build.main.javadoc.source" value="13"/>
544      <target name="clean"/>
545      <target name="test"/>
546      <target name="docs"/>
547    </antcall>
548  </target>
549
550  <target name="test14">
551    <antcall>
552      <param name="java.runtime.target" value="14"/>
553      <param name="build.main.javac" value="${javac14}"/>
554      <param name="build.main.javadoc" value="${javadoc14}"/>
555      <param name="build.main.javadoc.source" value="14"/>
556      <target name="clean"/>
557      <target name="test"/>
558      <target name="docs"/>
559    </antcall>
560  </target>
465  
466 <  <target name="test15">
466 >  <target name="test17">
467      <antcall>
468 <      <param name="java.runtime.target" value="15"/>
469 <      <param name="build.main.javac" value="${javac15}"/>
470 <      <param name="build.main.javadoc" value="${javadoc15}"/>
471 <      <param name="build.main.javadoc.source" value="15"/>
468 >      <param name="java.runtime.target" value="17"/>
469 >      <param name="build.main.javac" value="${javac17}"/>
470 >      <param name="build.main.javadoc" value="${javadoc17}"/>
471 >      <param name="build.main.javadoc.source" value="17"/>
472        <target name="clean"/>
473        <target name="test"/>
474        <target name="docs"/>
475      </antcall>
476    </target>
477 <
574 <  <target name="test11-12">
575 <    <antcall>
576 <      <param name="java.runtime.target" value="12"/>
577 <      <param name="build.main.javac" value="${javac11}"/>
578 <      <param name="build.main.javadoc" value="${javadoc12}"/>
579 <      <param name="build.main.javadoc.source" value="11"/>
580 <      <target name="clean"/>
581 <      <target name="test"/>
582 <      <target name="docs"/>
583 <    </antcall>
584 <  </target>
585 <
586 <  <target name="test11-13">
587 <    <antcall>
588 <      <param name="java.runtime.target" value="13"/>
589 <      <param name="build.main.javac" value="${javac11}"/>
590 <      <param name="build.main.javadoc" value="${javadoc13}"/>
591 <      <param name="build.main.javadoc.source" value="11"/>
592 <      <target name="clean"/>
593 <      <target name="test"/>
594 <      <target name="docs"/>
595 <    </antcall>
596 <  </target>
597 <
598 <  <target name="test11-14">
599 <    <antcall>
600 <      <param name="java.runtime.target" value="14"/>
601 <      <param name="build.main.javac" value="${javac11}"/>
602 <      <param name="build.main.javadoc" value="${javadoc14}"/>
603 <      <param name="build.main.javadoc.source" value="11"/>
604 <      <target name="clean"/>
605 <      <target name="test"/>
606 <      <target name="docs"/>
607 <    </antcall>
608 <  </target>
609 <
610 <  <target name="test11-15">
477 >  <target name="test19">
478      <antcall>
479 <      <param name="java.runtime.target" value="15"/>
480 <      <param name="build.main.javac" value="${javac11}"/>
481 <      <param name="build.main.javadoc" value="${javadoc15}"/>
482 <      <param name="build.main.javadoc.source" value="11"/>
479 >      <param name="java.runtime.target" value="19"/>
480 >      <param name="build.main.javac" value="${javac19}"/>
481 >      <param name="build.main.javadoc" value="${javadoc19}"/>
482 >      <param name="build.main.javadoc.source" value="19"/>
483        <target name="clean"/>
484        <target name="test"/>
485        <target name="docs"/>
# Line 706 | Line 573
573    <property name="errorprone.jsr166.user.flags" value=""/>
574    <property name="errorprone.jsr166.flags"
575              value="-Xep:HashtableContains:OFF
576 +                   -Xep:PreferJavaTimeOverload:OFF
577                     -Xep:JdkObsolete:OFF
578                     -Xep:MissingOverride:OFF
579                     -Xep:MissingFail:OFF
# Line 725 | Line 593
593    <property name="errorprone.jsr166.test.flags"
594              value="-Xep:StringSplitter:OFF
595                     -Xep:BoxedPrimitiveConstructor:OFF
596 +                   -Xep:UnnecessaryParentheses:OFF
597                     -Xep:ModifyingCollectionWithItself:OFF"/>
598    <!-- ant -emacs errorprone |& grep -EA1 '(warning|error):|warnings' -->
599    <target name="errorprone"
# Line 760 | Line 629
629        <compilerarg value="-XDignore.symbol.file=true"/>
630        <compilerarg value="-Xlint:all"/>
631        <compilerarg value="-Xdoclint:all/protected,reference/private"/>
632 <      <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
632 >      <!--      <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/> -->
633 >      <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 1"/>
634        <compilerarg line="${build.args}"/>
635      </javac>
636  
# Line 780 | Line 650
650          <compilerarg value="-Xplugin:ErrorProne
651                              ${errorprone.jsr166.flags}
652                              ${errorprone.jsr166.test.flags}"/>
653 <        <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
653 >        <!--      <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/> -->
654 >        <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 1"/>
655        </javac-elements>
656      </run-tck-tests>
657    </target>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines