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.324 by jsr166, Wed Sep 29 01:13:44 2021 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/jdk18
23 >  $HOME/jdk/jdk19
24    where each of the above is a JDK or a symlink to same, and
31  $HOME/jdk/src/jdk11
32  $HOME/jdk/src/jdk12
33  $HOME/jdk/src/jdk13
34  $HOME/jdk/src/jdk14
35  $HOME/jdk/src/jdk15
36  $HOME/jdk/src/jdk16
25    $HOME/jdk/src/jdk17
38  $HOME/jdk/src/jdk18
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 .. 18 ...
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 100 | Line 88
88      </sequential>
89    </macrodef>
90  
103  <defjdklocations v="11"/>
104  <defjdklocations v="12"/>
105  <defjdklocations v="13"/>
106  <defjdklocations v="14"/>
107  <defjdklocations v="15"/>
108  <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"/>
117  <property name="jtreg11.src.dir"      location="${test.src.dir}/jtreg"/>
118  <property name="jtreg12.src.dir"      location="${test.src.dir}/jtreg"/>
119  <property name="jtreg13.src.dir"      location="${test.src.dir}/jtreg"/>
120  <property name="jtreg14.src.dir"      location="${test.src.dir}/jtreg"/>
121  <property name="jtreg15.src.dir"      location="${test.src.dir}/jtreg"/>
122  <property name="jtreg16.src.dir"      location="${test.src.dir}/jtreg"/>
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="jtreg.src.dir"        location="${jtreg11.src.dir}"/>
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 137 | 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 -->
140  <!-- <property name="java5.docroot.url"  value="https://docs.oracle.com/javase/1.5.0/docs"/> -->
141  <!-- <property name="java6.docroot.url"  value="https://docs.oracle.com/javase/6/docs"/> -->
142  <!-- <property name="java7.docroot.url"  value="https://docs.oracle.com/javase/7/docs"/> -->
143  <!-- <property name="java8.docroot.url"  value="https://docs.oracle.com/javase/8/docs"/> -->
144  <!-- The location of jdk early access docs (RIP) -->
145  <!-- <property name="java11.docroot.url" value="http://download.java.net/java/jdk11/docs"/> -->
146  <!-- <property name="java12.docroot.url" value="https://download.java.net/java/jdk12/docs"/> -->
147  <!-- <property name="java13.docroot.url" value="https://download.java.net/java/early_access/jdk13/docs"/> -->
148  <property name="java11.docroot.url" value="https://docs.oracle.com/en/java/javase/11/docs"/>
149  <property name="java12.docroot.url" value="https://docs.oracle.com/en/java/javase/12/docs"/>
150  <property name="java13.docroot.url" value="https://docs.oracle.com/en/java/javase/13/docs"/>
151  <property name="java14.docroot.url" value="https://docs.oracle.com/en/java/javase/14/docs"/>
152  <property name="java15.docroot.url" value="https://docs.oracle.com/en/java/javase/15/docs"/>
153  <property name="java16.docroot.url" value="https://docs.oracle.com/en/java/javase/16/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="${java17.docroot.url}"/>
123  
124    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
160  <property name="java11.api.url"     value="${java11.docroot.url}/api/"/>
161  <property name="java12.api.url"     value="${java12.docroot.url}/api/"/>
162  <property name="java13.api.url"     value="${java13.docroot.url}/api/"/>
163  <property name="java14.api.url"     value="${java14.docroot.url}/api/"/>
164  <property name="java15.api.url"     value="${java15.docroot.url}/api/"/>
165  <property name="java16.api.url"     value="${java16.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 266 | Line 226
226      </sequential>
227    </macrodef>
228  
229 <  <defjtregtests v="18"/>
229 >  <defjtregtests v="19"/>
230 >  <defjtregtests v="17"/>
231    <defjtregtests v="17"/>
271  <defjtregtests v="16"/>
272  <defjtregtests v="15"/>
273  <defjtregtests v="14"/>
274  <defjtregtests v="13"/>
275  <defjtregtests v="12"/>
276  <defjtregtests v="11"/>
232  
233    <!-- ant -Djtreg.flags=-timeoutFactor:4 -->
234    <property name="jtreg.flags" value=""/>
235  
236    <macrodef name="run-jtreg-tests">
282    <!-- ant -Djtreg11.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
237      <attribute name="target"/>
238      <attribute name="workdir"/>
239      <attribute name="classes"/>
# Line 334 | 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
342 <    o {@systemProperty ...}
343 <    o 8211194: issues linking to external documentation (was: missing package-list for JDK10 / JDK11 documentation)
344 <    o 8202628: javadoc generates bad links in TestModules.java
345 <    -->
346 <  <property name="java.runtime.target" value="11"/>
347 <  <property name="build.main.java" value="${java11}"/>
348 <  <property name="build.main.javac" value="${javac11}"/>
349 <  <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 378 | 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 -->
382 <      <compilerarg value="-Xlint:all,-removal"/>
383 <      <compilerarg line="--doclint-format html5"/>
384 < <!--  Temporarily disable doclint for private elements, due to -->
385 < <!--  https://bugs.openjdk.java.net/browse/JDK-8214571 -->
386 < <!--  which is expected to be fixed in openjdk 11.0.8 -->
387 < <!--  <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}"/>
393
333      </javac>
334    </target>
335  
397
336    <target name="jar"
337            depends="compile"
338            description="Builds library jar for src/main from compiled sources">
# Line 412 | Line 350
350  
351    <target name="docs"
352            description="Builds javadocs for src/main to dist dir">
415
353      <delete dir="${docs.dir}" quiet="true"/>
354      <mkdir dir="${docs.dir}"/>
418
419    <!-- old school frames via docs/index.html?overview-summary.html -->
420    <!-- dash-dash-frames no longer a supported option in jdk13+ -->
421    <local name="use-frames"/>
422    <condition property="use-frames">
423      <equals arg1="${build.main.javadoc}" arg2="${javadoc12}"/>
424    </condition>
425
426    <!-- the packagenames="none" hack below prevents scanning the -->
427    <!-- sourcepath for packages -->
428
429 <!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}" -->
430 <!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}:${jdk9.src.home}/jdk/src/java.logging/share/classes" -->
431 <!-- TODO: sourcepath="${src.dir}:${jdk9.home}/src.zip" -->
432 <!-- TODO: <arg line="-sourcepath ${src.dir}:${jdk9.home}/src.zip"/> -->
433 <!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> -->
355      <javadoc destdir="${docs.dir}"
356               packagenames="none"
357               link="${java.api.url}"
# Line 440 | Line 361
361               classpath=""
362               source="${build.main.javadoc.source}"
363               executable="${build.main.javadoc}">
443 <!-- 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 457 | 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:"/>
460 <!-- tags added in jdk9: currently unused -->
461 <!--  <arg value="-tag"/> <arg value="revised:X"/> -->
462 <!--  <arg value="-tag"/> <arg value="spec:X"/> -->
381      </javadoc>
382    </target>
383  
466
384    <target name="dist"
385            depends="dist-clean, dist-jar, dist-docs"
386            description="Puts all distributable products in single hierarchy"/>
387  
471
388    <target name="clean"
389            description="Removes all build products">
390      <delete dir="${build.dir}"/>
391    </target>
392  
477
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  
484
399    <target name="dist-jar"
400            depends="clean, jar">
401      <copy file="${product.jar}" todir="${dist.dir}"/>
# Line 495 | Line 409
409    <target name="tck"
410            depends="jar"
411            description="Runs tck tests for src/main directly">
498
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 541 | 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,
545 <          test11-12, test11-13, test11-14, test11-15, test11-16,
546 <          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  
549  <target name="test11">
550    <antcall>
551      <param name="java.runtime.target" value="11"/>
552      <param name="build.main.javac" value="${javac11}"/>
553      <param name="build.main.javadoc" value="${javadoc12}"/>
554      <param name="build.main.javadoc.source" value="11"/>
555      <target name="clean"/>
556      <target name="test"/>
557      <target name="docs"/>
558    </antcall>
559  </target>
560
561  <target name="test12">
562    <antcall>
563      <param name="java.runtime.target" value="12"/>
564      <param name="build.main.javac" value="${javac12}"/>
565      <param name="build.main.javadoc" value="${javadoc12}"/>
566      <param name="build.main.javadoc.source" value="12"/>
567      <target name="clean"/>
568      <target name="test"/>
569      <target name="docs"/>
570    </antcall>
571  </target>
572
573  <target name="test13">
574    <antcall>
575      <param name="java.runtime.target" value="13"/>
576      <param name="build.main.javac" value="${javac13}"/>
577      <param name="build.main.javadoc" value="${javadoc13}"/>
578      <param name="build.main.javadoc.source" value="13"/>
579      <target name="clean"/>
580      <target name="test"/>
581      <target name="docs"/>
582    </antcall>
583  </target>
584
585  <target name="test14">
586    <antcall>
587      <param name="java.runtime.target" value="14"/>
588      <param name="build.main.javac" value="${javac14}"/>
589      <param name="build.main.javadoc" value="${javadoc14}"/>
590      <param name="build.main.javadoc.source" value="14"/>
591      <target name="clean"/>
592      <target name="test"/>
593      <target name="docs"/>
594    </antcall>
595  </target>
596
597  <target name="test15">
598    <antcall>
599      <param name="java.runtime.target" value="15"/>
600      <param name="build.main.javac" value="${javac15}"/>
601      <param name="build.main.javadoc" value="${javadoc15}"/>
602      <param name="build.main.javadoc.source" value="15"/>
603      <target name="clean"/>
604      <target name="test"/>
605      <target name="docs"/>
606    </antcall>
607  </target>
608
609  <target name="test16">
610    <antcall>
611      <param name="java.runtime.target" value="16"/>
612      <param name="build.main.javac" value="${javac16}"/>
613      <param name="build.main.javadoc" value="${javadoc16}"/>
614      <param name="build.main.javadoc.source" value="16"/>
615      <target name="clean"/>
616      <target name="test"/>
617      <target name="docs"/>
618    </antcall>
619  </target>
620
621  <target name="test11-12">
622    <antcall>
623      <param name="java.runtime.target" value="12"/>
624      <param name="build.main.javac" value="${javac11}"/>
625      <param name="build.main.javadoc" value="${javadoc12}"/>
626      <param name="build.main.javadoc.source" value="11"/>
627      <target name="clean"/>
628      <target name="test"/>
629      <target name="docs"/>
630    </antcall>
631  </target>
632
633  <target name="test11-13">
634    <antcall>
635      <param name="java.runtime.target" value="13"/>
636      <param name="build.main.javac" value="${javac11}"/>
637      <param name="build.main.javadoc" value="${javadoc13}"/>
638      <param name="build.main.javadoc.source" value="11"/>
639      <target name="clean"/>
640      <target name="test"/>
641      <target name="docs"/>
642    </antcall>
643  </target>
460  
461 <  <target name="test11-14">
461 >  <target name="test17">
462      <antcall>
463 <      <param name="java.runtime.target" value="14"/>
464 <      <param name="build.main.javac" value="${javac11}"/>
465 <      <param name="build.main.javadoc" value="${javadoc14}"/>
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 <
657 <  <target name="test11-15">
472 >  <target name="test19">
473      <antcall>
474 <      <param name="java.runtime.target" value="15"/>
475 <      <param name="build.main.javac" value="${javac11}"/>
476 <      <param name="build.main.javadoc" value="${javadoc15}"/>
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  
669  <target name="test11-16">
670    <antcall>
671      <param name="java.runtime.target" value="16"/>
672      <param name="build.main.javac" value="${javac11}"/>
673      <param name="build.main.javadoc" value="${javadoc16}"/>
674      <param name="build.main.javadoc.source" value="11"/>
675      <target name="clean"/>
676      <target name="test"/>
677      <target name="docs"/>
678    </antcall>
679  </target>
680
681  <target name="docs16">
682    <antcall>
683      <param name="java.runtime.target" value="16"/>
684      <param name="build.main.javac" value="${javac16}"/>
685      <param name="build.main.javadoc" value="${javadoc16}"/>
686      <param name="build.main.javadoc.source" value="16"/>
687      <target name="clean"/>
688      <target name="docs"/>
689    </antcall>
690  </target>
691
484  
485    <target name="configure-compiler">
486      <fail message="ant version too old">
# Line 832 | 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 852 | 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