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.323 by jsr166, Tue Mar 16 20:38:44 2021 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
27  $HOME/jdk/jdk16
22    $HOME/jdk/jdk17
23 +  $HOME/jdk/jdk19
24    where each of the above is a JDK or a symlink to same, and
30  $HOME/jdk/src/jdk11
31  $HOME/jdk/src/jdk12
32  $HOME/jdk/src/jdk13
33  $HOME/jdk/src/jdk14
34  $HOME/jdk/src/jdk15
35  $HOME/jdk/src/jdk16
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 .. 17 ...
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 98 | Line 88
88      </sequential>
89    </macrodef>
90  
101  <defjdklocations v="11"/>
102  <defjdklocations v="12"/>
103  <defjdklocations v="13"/>
104  <defjdklocations v="14"/>
105  <defjdklocations v="15"/>
106  <defjdklocations v="16"/>
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"/>
114  <property name="jtreg11.src.dir"      location="${test.src.dir}/jtreg"/>
115  <property name="jtreg12.src.dir"      location="${test.src.dir}/jtreg"/>
116  <property name="jtreg13.src.dir"      location="${test.src.dir}/jtreg"/>
117  <property name="jtreg14.src.dir"      location="${test.src.dir}/jtreg"/>
118  <property name="jtreg15.src.dir"      location="${test.src.dir}/jtreg"/>
119  <property name="jtreg16.src.dir"      location="${test.src.dir}/jtreg"/>
101    <property name="jtreg17.src.dir"      location="${test.src.dir}/jtreg"/>
102 <  <property name="jtreg.src.dir"        location="${jtreg11.src.dir}"/>
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 133 | 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"/> -->
140 <  <!-- The location of jdk early access docs (RIP) -->
141 <  <!-- <property name="java11.docroot.url" value="http://download.java.net/java/jdk11/docs"/> -->
142 <  <!-- <property name="java12.docroot.url" value="https://download.java.net/java/jdk12/docs"/> -->
143 <  <!-- <property name="java13.docroot.url" value="https://download.java.net/java/early_access/jdk13/docs"/> -->
144 <  <property name="java11.docroot.url" value="https://docs.oracle.com/en/java/javase/11/docs"/>
145 <  <property name="java12.docroot.url" value="https://docs.oracle.com/en/java/javase/12/docs"/>
146 <  <property name="java13.docroot.url" value="https://docs.oracle.com/en/java/javase/13/docs"/>
147 <  <property name="java14.docroot.url" value="https://docs.oracle.com/en/java/javase/14/docs"/>
148 <  <property name="java15.docroot.url" value="https://docs.oracle.com/en/java/javase/15/docs"/>
149 <  <property name="java16.docroot.url" value="https://docs.oracle.com/en/java/javase/16/docs"/>
150 <  <property name="java17.docroot.url" value="https://download.java.net/java/early_access/jdk17/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 -->
155  <property name="java11.api.url"     value="${java11.docroot.url}/api/"/>
156  <property name="java12.api.url"     value="${java12.docroot.url}/api/"/>
157  <property name="java13.api.url"     value="${java13.docroot.url}/api/"/>
158  <property name="java14.api.url"     value="${java14.docroot.url}/api/"/>
159  <property name="java15.api.url"     value="${java15.docroot.url}/api/"/>
160  <property name="java16.api.url"     value="${java16.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 261 | Line 231
231    </macrodef>
232  
233    <defjtregtests v="17"/>
234 <  <defjtregtests v="16"/>
235 <  <defjtregtests v="15"/>
236 <  <defjtregtests v="14"/>
267 <  <defjtregtests v="13"/>
268 <  <defjtregtests v="12"/>
269 <  <defjtregtests v="11"/>
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">
275    <!-- ant -Djtreg11.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
242      <attribute name="target"/>
243      <attribute name="workdir"/>
244      <attribute name="classes"/>
# Line 327 | 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
335 <    o {@systemProperty ...}
336 <    o 8211194: issues linking to external documentation (was: missing package-list for JDK10 / JDK11 documentation)
337 <    o 8202628: javadoc generates bad links in TestModules.java
338 <    -->
339 <  <property name="java.runtime.target" value="11"/>
340 <  <property name="build.main.java" value="${java11}"/>
341 <  <property name="build.main.javac" value="${javac11}"/>
342 <  <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 371 | 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 -->
375 <      <compilerarg value="-Xlint:all,-removal"/>
376 <      <compilerarg line="--doclint-format html5"/>
377 < <!--  Temporarily disable doclint for private elements, due to -->
378 < <!--  https://bugs.openjdk.java.net/browse/JDK-8214571 -->
379 < <!--  which is expected to be fixed in openjdk 11.0.8 -->
380 < <!--  <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}"/>
386
338      </javac>
339    </target>
340  
390
341    <target name="jar"
342            depends="compile"
343            description="Builds library jar for src/main from compiled sources">
# Line 405 | Line 355
355  
356    <target name="docs"
357            description="Builds javadocs for src/main to dist dir">
408
358      <delete dir="${docs.dir}" quiet="true"/>
359      <mkdir dir="${docs.dir}"/>
411
412    <!-- old school frames via docs/index.html?overview-summary.html -->
413    <!-- dash-dash-frames no longer a supported option in jdk13+ -->
414    <local name="use-frames"/>
415    <condition property="use-frames">
416      <equals arg1="${build.main.javadoc}" arg2="${javadoc12}"/>
417    </condition>
418
419    <!-- the packagenames="none" hack below prevents scanning the -->
420    <!-- sourcepath for packages -->
421
422 <!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}" -->
423 <!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}:${jdk9.src.home}/jdk/src/java.logging/share/classes" -->
424 <!-- TODO: sourcepath="${src.dir}:${jdk9.home}/src.zip" -->
425 <!-- TODO: <arg line="-sourcepath ${src.dir}:${jdk9.home}/src.zip"/> -->
426 <!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> -->
360      <javadoc destdir="${docs.dir}"
361               packagenames="none"
362               link="${java.api.url}"
# Line 433 | Line 366
366               classpath=""
367               source="${build.main.javadoc.source}"
368               executable="${build.main.javadoc}">
436 <!-- TODO: JDK-8214571 failonerror = "true" -->
369        <fileset dir="${src.dir}" defaultexcludes="yes">
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"/>
# Line 450 | 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:"/>
453 <!-- tags added in jdk9: currently unused -->
454 <!--  <arg value="-tag"/> <arg value="revised:X"/> -->
455 <!--  <arg value="-tag"/> <arg value="spec:X"/> -->
386      </javadoc>
387    </target>
388  
459
389    <target name="dist"
390            depends="dist-clean, dist-jar, dist-docs"
391            description="Puts all distributable products in single hierarchy"/>
392  
464
393    <target name="clean"
394            description="Removes all build products">
395      <delete dir="${build.dir}"/>
396    </target>
397  
470
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  
477
404    <target name="dist-jar"
405            depends="clean, jar">
406      <copy file="${product.jar}" todir="${dist.dir}"/>
# Line 488 | Line 414
414    <target name="tck"
415            depends="jar"
416            description="Runs tck tests for src/main directly">
491
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 534 | 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, test16,
538 <          test11-12, test11-13, test11-14, test11-15, test11-16,
539 <          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  
542  <target name="test11">
543    <antcall>
544      <param name="java.runtime.target" value="11"/>
545      <param name="build.main.javac" value="${javac11}"/>
546      <param name="build.main.javadoc" value="${javadoc12}"/>
547      <param name="build.main.javadoc.source" value="11"/>
548      <target name="clean"/>
549      <target name="test"/>
550      <target name="docs"/>
551    </antcall>
552  </target>
553
554  <target name="test12">
555    <antcall>
556      <param name="java.runtime.target" value="12"/>
557      <param name="build.main.javac" value="${javac12}"/>
558      <param name="build.main.javadoc" value="${javadoc12}"/>
559      <param name="build.main.javadoc.source" value="12"/>
560      <target name="clean"/>
561      <target name="test"/>
562      <target name="docs"/>
563    </antcall>
564  </target>
465  
466 <  <target name="test13">
466 >  <target name="test17">
467      <antcall>
468 <      <param name="java.runtime.target" value="13"/>
469 <      <param name="build.main.javac" value="${javac13}"/>
470 <      <param name="build.main.javadoc" value="${javadoc13}"/>
471 <      <param name="build.main.javadoc.source" value="13"/>
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 <
578 <  <target name="test14">
579 <    <antcall>
580 <      <param name="java.runtime.target" value="14"/>
581 <      <param name="build.main.javac" value="${javac14}"/>
582 <      <param name="build.main.javadoc" value="${javadoc14}"/>
583 <      <param name="build.main.javadoc.source" value="14"/>
584 <      <target name="clean"/>
585 <      <target name="test"/>
586 <      <target name="docs"/>
587 <    </antcall>
588 <  </target>
589 <
590 <  <target name="test15">
591 <    <antcall>
592 <      <param name="java.runtime.target" value="15"/>
593 <      <param name="build.main.javac" value="${javac15}"/>
594 <      <param name="build.main.javadoc" value="${javadoc15}"/>
595 <      <param name="build.main.javadoc.source" value="15"/>
596 <      <target name="clean"/>
597 <      <target name="test"/>
598 <      <target name="docs"/>
599 <    </antcall>
600 <  </target>
601 <
602 <  <target name="test16">
477 >  <target name="test19">
478      <antcall>
479 <      <param name="java.runtime.target" value="16"/>
480 <      <param name="build.main.javac" value="${javac16}"/>
481 <      <param name="build.main.javadoc" value="${javadoc16}"/>
482 <      <param name="build.main.javadoc.source" value="16"/>
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"/>
486      </antcall>
487    </target>
488  
614  <target name="test11-12">
615    <antcall>
616      <param name="java.runtime.target" value="12"/>
617      <param name="build.main.javac" value="${javac11}"/>
618      <param name="build.main.javadoc" value="${javadoc12}"/>
619      <param name="build.main.javadoc.source" value="11"/>
620      <target name="clean"/>
621      <target name="test"/>
622      <target name="docs"/>
623    </antcall>
624  </target>
625
626  <target name="test11-13">
627    <antcall>
628      <param name="java.runtime.target" value="13"/>
629      <param name="build.main.javac" value="${javac11}"/>
630      <param name="build.main.javadoc" value="${javadoc13}"/>
631      <param name="build.main.javadoc.source" value="11"/>
632      <target name="clean"/>
633      <target name="test"/>
634      <target name="docs"/>
635    </antcall>
636  </target>
637
638  <target name="test11-14">
639    <antcall>
640      <param name="java.runtime.target" value="14"/>
641      <param name="build.main.javac" value="${javac11}"/>
642      <param name="build.main.javadoc" value="${javadoc14}"/>
643      <param name="build.main.javadoc.source" value="11"/>
644      <target name="clean"/>
645      <target name="test"/>
646      <target name="docs"/>
647    </antcall>
648  </target>
649
650  <target name="test11-15">
651    <antcall>
652      <param name="java.runtime.target" value="15"/>
653      <param name="build.main.javac" value="${javac11}"/>
654      <param name="build.main.javadoc" value="${javadoc15}"/>
655      <param name="build.main.javadoc.source" value="11"/>
656      <target name="clean"/>
657      <target name="test"/>
658      <target name="docs"/>
659    </antcall>
660  </target>
661
662  <target name="test11-16">
663    <antcall>
664      <param name="java.runtime.target" value="16"/>
665      <param name="build.main.javac" value="${javac11}"/>
666      <param name="build.main.javadoc" value="${javadoc16}"/>
667      <param name="build.main.javadoc.source" value="11"/>
668      <target name="clean"/>
669      <target name="test"/>
670      <target name="docs"/>
671    </antcall>
672  </target>
673
674  <target name="docs16">
675    <antcall>
676      <param name="java.runtime.target" value="16"/>
677      <param name="build.main.javac" value="${javac16}"/>
678      <param name="build.main.javadoc" value="${javadoc16}"/>
679      <param name="build.main.javadoc.source" value="16"/>
680      <target name="clean"/>
681      <target name="docs"/>
682    </antcall>
683  </target>
684
489  
490    <target name="configure-compiler">
491      <fail message="ant version too old">
# Line 825 | 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 845 | 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