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.320 by jsr166, Tue Sep 15 19:09:50 2020 UTC vs.
Revision 1.325 by dl, Tue Mar 22 21:28:02 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
25 <  $HOME/jdk/src/jdk11
30 <  $HOME/jdk/src/jdk12
31 <  $HOME/jdk/src/jdk13
32 <  $HOME/jdk/src/jdk14
33 <  $HOME/jdk/src/jdk15
34 <  $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 .. 16 ...
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 96 | Line 88
88      </sequential>
89    </macrodef>
90  
91 <  <defjdklocations v="11"/>
92 <  <defjdklocations v="12"/>
93 <  <defjdklocations v="13"/>
102 <  <defjdklocations v="14"/>
103 <  <defjdklocations v="15"/>
104 <  <defjdklocations v="16"/>
91 >  <defjdklocations v="17"/>
92 >  <defjdklocations v="18"/>
93 >  <defjdklocations v="19"/>
94  
95    <!-- Source locations -->
96    <property name="src.dir"              location="${basedir}/src/main"/>
97    <property name="test.src.dir"         location="${basedir}/src/test"/>
98    <property name="loops.src.dir"        location="${basedir}/src/loops"/>
99    <property name="tck.src.dir"          location="${test.src.dir}/tck"/>
100 <  <property name="jtreg11.src.dir"      location="${test.src.dir}/jtreg"/>
101 <  <property name="jtreg12.src.dir"      location="${test.src.dir}/jtreg"/>
102 <  <property name="jtreg13.src.dir"      location="${test.src.dir}/jtreg"/>
103 <  <property name="jtreg14.src.dir"      location="${test.src.dir}/jtreg"/>
115 <  <property name="jtreg15.src.dir"      location="${test.src.dir}/jtreg"/>
116 <  <property name="jtreg16.src.dir"      location="${test.src.dir}/jtreg"/>
117 <  <property name="jtreg.src.dir"        location="${jtreg11.src.dir}"/>
100 >  <property name="jtreg17.src.dir"      location="${test.src.dir}/jtreg"/>
101 >  <property name="jtreg18.src.dir"      location="${test.src.dir}/jtreg"/>
102 >  <property name="jtreg19.src.dir"      location="${test.src.dir}/jtreg"/>
103 >  <property name="jtreg.src.dir"        location="${jtreg17.src.dir}"/>
104    <property name="lib.dir"              location="${basedir}/lib"/>
105    <property name="dist.dir"             location="${basedir}/dist"/>
106    <property name="topsrc.dir"           location="${basedir}/src"/>
# Line 129 | Line 115
115  
116    <!-- Canonical location of jdk docs root, to use with javadoc -Xdocrootparent flag -->
117    <!-- Switched to https: in 2017-10 - JDK-8190312 -->
118 <  <!-- <property name="java5.docroot.url"  value="https://docs.oracle.com/javase/1.5.0/docs"/> -->
119 <  <!-- <property name="java6.docroot.url"  value="https://docs.oracle.com/javase/6/docs"/> -->
120 <  <!-- <property name="java7.docroot.url"  value="https://docs.oracle.com/javase/7/docs"/> -->
135 <  <!-- <property name="java8.docroot.url"  value="https://docs.oracle.com/javase/8/docs"/> -->
136 <  <!-- The location of jdk early access docs (RIP) -->
137 <  <!-- <property name="java11.docroot.url" value="http://download.java.net/java/jdk11/docs"/> -->
138 <  <!-- <property name="java12.docroot.url" value="https://download.java.net/java/jdk12/docs"/> -->
139 <  <!-- <property name="java13.docroot.url" value="https://download.java.net/java/early_access/jdk13/docs"/> -->
140 <  <property name="java11.docroot.url" value="https://docs.oracle.com/en/java/javase/11/docs"/>
141 <  <property name="java12.docroot.url" value="https://docs.oracle.com/en/java/javase/12/docs"/>
142 <  <property name="java13.docroot.url" value="https://docs.oracle.com/en/java/javase/13/docs"/>
143 <  <property name="java14.docroot.url" value="https://docs.oracle.com/en/java/javase/14/docs"/>
144 <  <property name="java15.docroot.url" value="https://docs.oracle.com/en/java/javase/15/docs"/>
145 <  <property name="java16.docroot.url" value="https://download.java.net/java/early_access/jdk16/docs"/>
118 >  <property name="java17.docroot.url" value="https://docs.oracle.com/en/java/javase/17/docs"/>
119 >  <property name="java18.docroot.url" value="https://download.java.net/java/early_access/jdk18/docs"/>
120 >  <property name="java19.docroot.url" value="https://download.java.net/java/early_access/jdk19/docs"/>
121    <!-- Default jdk doc location (latest stable LTS release seems best) -->
122 <  <property name="java.docroot.url"   value="${java11.docroot.url}"/>
122 >  <property name="java.docroot.url"   value="${java17.docroot.url}"/>
123  
124    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
125 <  <property name="java11.api.url"     value="${java11.docroot.url}/api/"/>
126 <  <property name="java12.api.url"     value="${java12.docroot.url}/api/"/>
127 <  <property name="java13.api.url"     value="${java13.docroot.url}/api/"/>
153 <  <property name="java14.api.url"     value="${java14.docroot.url}/api/"/>
154 <  <property name="java15.api.url"     value="${java15.docroot.url}/api/"/>
155 <  <property name="java16.api.url"     value="${java15.docroot.url}/api/"/>
125 >  <property name="java17.api.url"     value="${java17.docroot.url}/api/"/>
126 >  <property name="java18.api.url"     value="${java18.docroot.url}/api/"/>
127 >  <property name="java19.api.url"     value="${java19.docroot.url}/api/"/>
128    <property name="java.api.url"       value="${java.docroot.url}/api/"/>
129  
130    <!-- Define the "jtreg" task -->
# Line 254 | Line 226
226      </sequential>
227    </macrodef>
228  
229 <  <defjtregtests v="16"/>
230 <  <defjtregtests v="15"/>
231 <  <defjtregtests v="14"/>
260 <  <defjtregtests v="13"/>
261 <  <defjtregtests v="12"/>
262 <  <defjtregtests v="11"/>
229 >  <defjtregtests v="19"/>
230 >  <defjtregtests v="17"/>
231 >  <defjtregtests v="17"/>
232  
233    <!-- ant -Djtreg.flags=-timeoutFactor:4 -->
234    <property name="jtreg.flags" value=""/>
235  
236    <macrodef name="run-jtreg-tests">
268    <!-- ant -Djtreg11.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
237      <attribute name="target"/>
238      <attribute name="workdir"/>
239      <attribute name="classes"/>
# Line 278 | Line 246
246      <!-- ant -Djtreg.verbose=time,fail,error jtreg -->
247      <property name="jtreg.verbose" value="nopass,fail,error"/>
248  
249 <    <delete dir="@{workdir}/JTwork"   quiet="true"/>
249 >    <!-- concurrency > 1 mitigates slowness of some jtreg tests -->
250 >    <!-- BUT concurrency:auto starts "too many" VMs; just 1 free core each -->
251 >    <!-- In 2020 concurrency:3 seems like a sweet spot -->
252 >    <!-- Override using:  ant -Djtreg.concurrency="N" jtreg -->
253 >    <property name="jtreg.concurrency" value="3"/>
254 >
255 >    <delete dir="@{workdir}/JTwork" quiet="true"/>
256      <jtreg dir="${jtreg@{target}.src.dir}"
257             jdk="${jdk@{target}.home}"
258             workDir="@{workdir}/JTwork">
259        <patternset refid="jdk@{target}.jtreg.tests"/>
260 <      <arg value="-javacoptions:--patch-module=java.base=@{classes}"/>
261 <      <arg value="-vmoptions:--patch-module=java.base=@{classes}"/>
260 >      <arg value="-javacoption:--patch-module=java.base=@{classes}"/>
261 >      <arg value="-vmoption:--patch-module=java.base=@{classes}"/>
262 >      <arg value="-vmoption:-Xmx256m"/>
263 >      <arg value="-concurrency:${jtreg.concurrency}"/>
264 >      <arg value="-vmoptions:-esa -ea"/>
265        <arg value="-vmoptions:${vmoptions}" if:set="vmoptions"/>
266        <arg value="-agentvm"/>
267        <arg value="-noreport"/>
268        <arg value="-verbose:@{verbose}"/>
292      <arg value="-vmoptions:-esa -ea"/>
269        <arg value="-automatic"/>
270        <arg value="-k:!ignore"/>
271        <arg line="@{jtregflags}"/>
# Line 312 | Line 288
288    <!-- Main targets -->
289  
290    <!-- Default values: may seem strange ... -->
291 <  <!-- At runtime, target latest LTS, i.e. jdk11 -->
292 <  <!-- But at build time, target jdk9, for maximal binary portability -->
293 <  <!-- ButButBut as of 2019-08, target jdk11 at build time -->
294 <  <!-- Use javadoc12 (but -link to jdk11 api docs!), to get:
295 <    o override-methods=summary
320 <    o {@systemProperty ...}
321 <    o 8211194: issues linking to external documentation (was: missing package-list for JDK10 / JDK11 documentation)
322 <    o 8202628: javadoc generates bad links in TestModules.java
323 <    -->
324 <  <property name="java.runtime.target" value="11"/>
325 <  <property name="build.main.java" value="${java11}"/>
326 <  <property name="build.main.javac" value="${javac11}"/>
327 <  <property name="build.main.javadoc" value="${javadoc12}"/>
291 >  <!-- At runtime, target latest, but build for current LTS -->
292 >  <property name="java.runtime.target" value="19"/>
293 >  <property name="build.main.java" value="${java17}"/>
294 >  <property name="build.main.javac" value="${javac17}"/>
295 >  <property name="build.main.javadoc" value="${javadoc19}"/>
296    <property name="build.main.javadoc.source" value="${java.runtime.target}"/>
297  
298    <target name="dists"
# Line 356 | Line 324
324        <compilerarg value="--patch-module=java.base=${src.dir}"/>
325        <compilerarg value="-Xprefer:source"/>
326        <compilerarg value="-XDignore.symbol.file=true"/>
327 < <!--   Xlint:-removal for jdk12 Unsafe Object -> Reference renaming -->
360 <      <compilerarg value="-Xlint:all,-removal"/>
361 <      <compilerarg line="--doclint-format html5"/>
362 < <!--  Temporarily disable doclint for private elements, due to -->
363 < <!--  https://bugs.openjdk.java.net/browse/JDK-8214571 -->
364 < <!--  which is expected to be fixed in openjdk 11.0.8 -->
365 < <!--  <compilerarg value="-Xdoclint:all/protected,reference/private"/> -->
327 >      <compilerarg value="-Xlint:all"/>
328        <compilerarg value="-Xdoclint:all/protected"/>
329        <compilerarg value="-Xdoclint/package:java.util.*"/>
330        <compilerarg value="-Werror"/>
331        <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
332        <compilerarg line="${build.args}"/>
371
333      </javac>
334    </target>
335  
375
336    <target name="jar"
337            depends="compile"
338            description="Builds library jar for src/main from compiled sources">
# Line 390 | Line 350
350  
351    <target name="docs"
352            description="Builds javadocs for src/main to dist dir">
393
353      <delete dir="${docs.dir}" quiet="true"/>
354      <mkdir dir="${docs.dir}"/>
396
397    <!-- old school frames via docs/index.html?overview-summary.html -->
398    <!-- dash-dash-frames no longer a supported option in jdk13+ -->
399    <local name="use-frames"/>
400    <condition property="use-frames">
401      <equals arg1="${build.main.javadoc}" arg2="${javadoc12}"/>
402    </condition>
403
404    <!-- the packagenames="none" hack below prevents scanning the -->
405    <!-- sourcepath for packages -->
406
407 <!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}" -->
408 <!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}:${jdk9.src.home}/jdk/src/java.logging/share/classes" -->
409 <!-- TODO: sourcepath="${src.dir}:${jdk9.home}/src.zip" -->
410 <!-- TODO: <arg line="-sourcepath ${src.dir}:${jdk9.home}/src.zip"/> -->
411 <!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> -->
355      <javadoc destdir="${docs.dir}"
356               packagenames="none"
357               link="${java.api.url}"
# Line 418 | Line 361
361               classpath=""
362               source="${build.main.javadoc.source}"
363               executable="${build.main.javadoc}">
421 <!-- TODO: JDK-8214571 failonerror = "true" -->
364        <fileset dir="${src.dir}" defaultexcludes="yes">
365          <include name="java/**/*.java"/>
366        </fileset>
367        <arg line="-Xdocrootparent ${java.docroot.url}"/>
368        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
369 +      <arg line="-Xmaxerrs 1000 -Xmaxwarns 1"/>
370        <arg value="-quiet"/>
371        <arg value="-XDignore.symbol.file=true"/>
372        <arg value="-html5"/>
# Line 435 | Line 378
378        <arg value="-tag"/> <arg value="implSpec:a:Implementation Requirements:"/>
379        <arg value="-tag"/> <arg value="implNote:a:Implementation Note:"/>
380        <arg value="-tag"/> <arg value="apiNote:a:API Note:"/>
438 <!-- tags added in jdk9: currently unused -->
439 <!--  <arg value="-tag"/> <arg value="revised:X"/> -->
440 <!--  <arg value="-tag"/> <arg value="spec:X"/> -->
381      </javadoc>
382    </target>
383  
444
384    <target name="dist"
385            depends="dist-clean, dist-jar, dist-docs"
386            description="Puts all distributable products in single hierarchy"/>
387  
449
388    <target name="clean"
389            description="Removes all build products">
390      <delete dir="${build.dir}"/>
391    </target>
392  
455
393    <target name="dist-clean"
394            description="Removes all build and distribution products">
395      <delete dir="${build.dir}"/>
396      <delete dir="${dist.dir}"/>
397    </target>
398  
462
399    <target name="dist-jar"
400            depends="clean, jar">
401      <copy file="${product.jar}" todir="${dist.dir}"/>
# Line 473 | Line 409
409    <target name="tck"
410            depends="jar"
411            description="Runs tck tests for src/main directly">
476
412      <run-tck-tests
413        target="${java.runtime.target}"
414        workdir="${build.dir}"
415        classes="${product.jar}">
416        <javac-elements>
417 <        <compilerarg value="-Werror"/>
417 >        <!-- <compilerarg value="-Werror"/> -->
418        </javac-elements>
419      </run-tck-tests>
420    </target>
# Line 519 | Line 454
454            description="Runs tck and jtreg tests for src/main"/>
455  
456    <target name="test-version-permutations"
457 <          depends="test11, test12, test13, test14, test15, test16,
523 <          test11-12, test11-13, test11-14, test11-15, test11-16,
524 <          clean, test, docs"
457 >          depends="test17, test19, clean, test, docs"
458            description="Runs tck and jtreg tests for various build-time and runtime java versions"/>
459  
527  <target name="test11">
528    <antcall>
529      <param name="java.runtime.target" value="11"/>
530      <param name="build.main.javac" value="${javac11}"/>
531      <param name="build.main.javadoc" value="${javadoc12}"/>
532      <param name="build.main.javadoc.source" value="11"/>
533      <target name="clean"/>
534      <target name="test"/>
535      <target name="docs"/>
536    </antcall>
537  </target>
538
539  <target name="test12">
540    <antcall>
541      <param name="java.runtime.target" value="12"/>
542      <param name="build.main.javac" value="${javac12}"/>
543      <param name="build.main.javadoc" value="${javadoc12}"/>
544      <param name="build.main.javadoc.source" value="12"/>
545      <target name="clean"/>
546      <target name="test"/>
547      <target name="docs"/>
548    </antcall>
549  </target>
550
551  <target name="test13">
552    <antcall>
553      <param name="java.runtime.target" value="13"/>
554      <param name="build.main.javac" value="${javac13}"/>
555      <param name="build.main.javadoc" value="${javadoc13}"/>
556      <param name="build.main.javadoc.source" value="13"/>
557      <target name="clean"/>
558      <target name="test"/>
559      <target name="docs"/>
560    </antcall>
561  </target>
562
563  <target name="test14">
564    <antcall>
565      <param name="java.runtime.target" value="14"/>
566      <param name="build.main.javac" value="${javac14}"/>
567      <param name="build.main.javadoc" value="${javadoc14}"/>
568      <param name="build.main.javadoc.source" value="14"/>
569      <target name="clean"/>
570      <target name="test"/>
571      <target name="docs"/>
572    </antcall>
573  </target>
574
575  <target name="test15">
576    <antcall>
577      <param name="java.runtime.target" value="15"/>
578      <param name="build.main.javac" value="${javac15}"/>
579      <param name="build.main.javadoc" value="${javadoc15}"/>
580      <param name="build.main.javadoc.source" value="15"/>
581      <target name="clean"/>
582      <target name="test"/>
583      <target name="docs"/>
584    </antcall>
585  </target>
586
587  <target name="test16">
588    <antcall>
589      <param name="java.runtime.target" value="16"/>
590      <param name="build.main.javac" value="${javac16}"/>
591      <param name="build.main.javadoc" value="${javadoc16}"/>
592      <param name="build.main.javadoc.source" value="16"/>
593      <target name="clean"/>
594      <target name="test"/>
595      <target name="docs"/>
596    </antcall>
597  </target>
460  
461 <  <target name="test11-12">
461 >  <target name="test17">
462      <antcall>
463 <      <param name="java.runtime.target" value="12"/>
464 <      <param name="build.main.javac" value="${javac11}"/>
465 <      <param name="build.main.javadoc" value="${javadoc12}"/>
466 <      <param name="build.main.javadoc.source" value="11"/>
463 >      <param name="java.runtime.target" value="17"/>
464 >      <param name="build.main.javac" value="${javac17}"/>
465 >      <param name="build.main.javadoc" value="${javadoc17}"/>
466 >      <param name="build.main.javadoc.source" value="17"/>
467        <target name="clean"/>
468        <target name="test"/>
469        <target name="docs"/>
470      </antcall>
471    </target>
472 <
611 <  <target name="test11-13">
472 >  <target name="test19">
473      <antcall>
474 <      <param name="java.runtime.target" value="13"/>
475 <      <param name="build.main.javac" value="${javac11}"/>
476 <      <param name="build.main.javadoc" value="${javadoc13}"/>
477 <      <param name="build.main.javadoc.source" value="11"/>
474 >      <param name="java.runtime.target" value="19"/>
475 >      <param name="build.main.javac" value="${javac19}"/>
476 >      <param name="build.main.javadoc" value="${javadoc19}"/>
477 >      <param name="build.main.javadoc.source" value="19"/>
478        <target name="clean"/>
479        <target name="test"/>
480        <target name="docs"/>
481      </antcall>
482    </target>
483  
623  <target name="test11-14">
624    <antcall>
625      <param name="java.runtime.target" value="14"/>
626      <param name="build.main.javac" value="${javac11}"/>
627      <param name="build.main.javadoc" value="${javadoc14}"/>
628      <param name="build.main.javadoc.source" value="11"/>
629      <target name="clean"/>
630      <target name="test"/>
631      <target name="docs"/>
632    </antcall>
633  </target>
634
635  <target name="test11-15">
636    <antcall>
637      <param name="java.runtime.target" value="15"/>
638      <param name="build.main.javac" value="${javac11}"/>
639      <param name="build.main.javadoc" value="${javadoc15}"/>
640      <param name="build.main.javadoc.source" value="11"/>
641      <target name="clean"/>
642      <target name="test"/>
643      <target name="docs"/>
644    </antcall>
645  </target>
646
647  <target name="test11-16">
648    <antcall>
649      <param name="java.runtime.target" value="16"/>
650      <param name="build.main.javac" value="${javac11}"/>
651      <param name="build.main.javadoc" value="${javadoc16}"/>
652      <param name="build.main.javadoc.source" value="11"/>
653      <target name="clean"/>
654      <target name="test"/>
655      <target name="docs"/>
656    </antcall>
657  </target>
658
659  <target name="docs16">
660    <antcall>
661      <param name="java.runtime.target" value="16"/>
662      <param name="build.main.javac" value="${javac16}"/>
663      <param name="build.main.javadoc" value="${javadoc16}"/>
664      <param name="build.main.javadoc.source" value="16"/>
665      <target name="clean"/>
666      <target name="docs"/>
667    </antcall>
668  </target>
669
484  
485    <target name="configure-compiler">
486      <fail message="ant version too old">
# Line 810 | Line 624
624        <compilerarg value="-XDignore.symbol.file=true"/>
625        <compilerarg value="-Xlint:all"/>
626        <compilerarg value="-Xdoclint:all/protected,reference/private"/>
627 <      <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
627 >      <!--      <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/> -->
628 >      <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 1"/>
629        <compilerarg line="${build.args}"/>
630      </javac>
631  
# Line 830 | Line 645
645          <compilerarg value="-Xplugin:ErrorProne
646                              ${errorprone.jsr166.flags}
647                              ${errorprone.jsr166.test.flags}"/>
648 <        <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
648 >        <!--      <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/> -->
649 >        <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 1"/>
650        </javac-elements>
651      </run-tck-tests>
652    </target>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines