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.288 by jsr166, Sat Nov 24 17:39:35 2018 UTC vs.
Revision 1.303 by jsr166, Tue Sep 17 16:20:44 2019 UTC

# Line 20 | Line 20
20    targets require different JDKs, we assume that users have created a
21    hierarchy containing:
22    $HOME/jdk/jdk8
23 –  $HOME/jdk/jdk9
24 –  $HOME/jdk/jdk10
23    $HOME/jdk/jdk11
24    $HOME/jdk/jdk12
25 +  $HOME/jdk/jdk13
26 +  $HOME/jdk/jdk14
27    where each of the above is a JDK or a symlink to same, and
28    $HOME/jdk/src/jdk8
29 –  $HOME/jdk/src/jdk9
30 –  $HOME/jdk/src/jdk10
29    $HOME/jdk/src/jdk11
30    $HOME/jdk/src/jdk12
31 +  $HOME/jdk/src/jdk13
32 +  $HOME/jdk/src/jdk14
33    where each of the above is a complete JDK source tree
34    (e.g. mercurial forest) or a symlink to same.
35  
36    Alternatively, define ant variables thus:
37    ant -Djdk$N.home=... -Djdk$N.src.home=...
38 <  for $N in 8 9 10 ...
38 >  for $N in 8 .. 14 ...
39  
40    As of 2016-03, the sources in src/main are for jdk9+ only.
41 +  As of 2019-08, the sources in src/main are for jdk11+ only.
42   ------------------------------------------------------------------------------
43    </description>
44  
# Line 131 | Line 132
132      </sequential>
133    </macrodef>
134  
134 –  <defjdklocations v="6"/>
135 –  <defjdklocations v="7"/>
135    <defjdklocations v="8"/>
137 –  <defjdklocations v="9"/>
138 –  <defjdklocations v="10"/>
136    <defjdklocations v="11"/>
137    <defjdklocations v="12"/>
138 +  <defjdklocations v="13"/>
139 +  <defjdklocations v="14"/>
140  
141    <!-- Source locations -->
142    <property name="src.dir"              location="${basedir}/src/main"/>
143    <property name="test.src.dir"         location="${basedir}/src/test"/>
144    <property name="loops.src.dir"        location="${basedir}/src/loops"/>
145    <property name="tck.src.dir"          location="${test.src.dir}/tck"/>
147 –  <property name="jtreg7.src.dir"       location="${test.src.dir}/jtreg-jdk7"/>
146    <property name="jtreg8.src.dir"       location="${test.src.dir}/jtreg-jdk8"/>
149 –  <property name="jtreg9.src.dir"       location="${test.src.dir}/jtreg"/>
150 –  <property name="jtreg10.src.dir"      location="${test.src.dir}/jtreg"/>
147    <property name="jtreg11.src.dir"      location="${test.src.dir}/jtreg"/>
148    <property name="jtreg12.src.dir"      location="${test.src.dir}/jtreg"/>
149 <  <property name="jtreg.src.dir"        location="${jtreg9.src.dir}"/>
149 >  <property name="jtreg13.src.dir"      location="${test.src.dir}/jtreg"/>
150 >  <property name="jtreg14.src.dir"      location="${test.src.dir}/jtreg"/>
151 >  <property name="jtreg.src.dir"        location="${jtreg11.src.dir}"/>
152    <property name="lib.dir"              location="${basedir}/lib"/>
153    <property name="dist.dir"             location="${basedir}/dist"/>
154    <property name="topsrc.dir"           location="${basedir}/src"/>
# Line 194 | Line 192
192    <property name="java6.docroot.url"  value="https://docs.oracle.com/javase/6/docs"/>
193    <property name="java7.docroot.url"  value="https://docs.oracle.com/javase/7/docs"/>
194    <property name="java8.docroot.url"  value="https://docs.oracle.com/javase/8/docs"/>
197 –  <property name="java9.docroot.url"  value="https://docs.oracle.com/javase/9/docs"/>
198 –  <property name="java10.docroot.url" value="https://docs.oracle.com/javase/10/docs"/>
195    <property name="java11.docroot.url" value="https://docs.oracle.com/en/java/javase/11/docs"/>
196 +  <property name="java12.docroot.url" value="https://docs.oracle.com/en/java/javase/12/docs"/>
197 +  <property name="java13.docroot.url" value="https://docs.oracle.com/en/java/javase/13/docs"/>
198    <!-- The location of jdk early access docs (RIP) -->
201 –  <!-- <property name="java9.docroot.url" value="http://download.java.net/java/jdk9/docs"/> -->
202 –  <!-- <property name="java10.docroot.url" value="http://download.java.net/java/jdk10/docs"/> -->
199    <!-- <property name="java11.docroot.url" value="http://download.java.net/java/jdk11/docs"/> -->
200 <  <property name="java12.docroot.url" value="https://download.java.net/java/jdk12/docs"/>
201 <  <!-- Default jdk doc location (latest stable release seems best) -->
202 <  <!-- But pin to jdk 10 until fix for -->
203 <  <!-- 8211194: javadoc -link doesn't take module path into consideration -->
204 <  <property name="java.docroot.url"   value="${java10.docroot.url}"/>
200 >  <!-- <property name="java12.docroot.url" value="https://download.java.net/java/jdk12/docs"/> -->
201 >  <!-- <property name="java13.docroot.url" value="https://download.java.net/java/early_access/jdk13/docs"/> -->
202 >  <property name="java14.docroot.url" value="https://download.java.net/java/early_access/jdk14/docs"/>
203 >  <!-- Default jdk doc location (latest stable LTS release seems best) -->
204 >  <property name="java.docroot.url"   value="${java11.docroot.url}"/>
205  
206    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
211 –  <property name="java5.api.url"      value="${java5.docroot.url}/api/"/>
212 –  <property name="java6.api.url"      value="${java6.docroot.url}/api/"/>
213 –  <property name="java7.api.url"      value="${java7.docroot.url}/api/"/>
207    <property name="java8.api.url"      value="${java8.docroot.url}/api/"/>
215 –  <property name="java9.api.url"      value="${java9.docroot.url}/api/"/>
216 –  <property name="java10.api.url"     value="${java10.docroot.url}/api/"/>
208    <property name="java11.api.url"     value="${java11.docroot.url}/api/"/>
209    <property name="java12.api.url"     value="${java12.docroot.url}/api/"/>
210 +  <property name="java13.api.url"     value="${java13.docroot.url}/api/"/>
211 +  <property name="java14.api.url"     value="${java14.docroot.url}/api/"/>
212    <property name="java.api.url"       value="${java.docroot.url}/api/"/>
213  
214    <!-- Define the "jtreg" task -->
# Line 329 | Line 322
322      </sequential>
323    </macrodef>
324  
325 +  <defjtregtests v="14"/>
326 +  <defjtregtests v="13"/>
327    <defjtregtests v="12"/>
328    <defjtregtests v="11"/>
334 –  <defjtregtests v="10"/>
335 –  <defjtregtests v="9"/>
329    <defjtregtests v="8"/>
337 –  <defjtregtests v="7"/>
330  
331    <!-- ant -Djtreg.flags=-timeoutFactor:4 -->
332    <property name="jtreg.flags" value=""/>
333  
334    <macrodef name="run-jtreg-tests">
335 <    <!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
335 >    <!-- ant -Djtreg11.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
336      <attribute name="target"/>
337      <attribute name="workdir"/>
338      <attribute name="classes"/>
# Line 385 | Line 377
377    </path>
378  
379    <!-- Support @jls tag, used in jdk8+ javadoc -->
380 +  <!-- TODO: switch to @jls taglet, as supported by jdk14+ javadoc -->
381    <property name="javadoc.jls.cite" value="The Java&amp;trade; Language Specification"/>
382    <property name="javadoc.jls.option" value="jls:a:See &lt;cite&gt;${javadoc.jls.cite}&lt;/cite&gt;:"/>
383  
# Line 393 | Line 386
386    <!-- Default values: may seem strange ... -->
387    <!-- At runtime, target latest LTS, i.e. jdk11 -->
388    <!-- But at build time, target jdk9, for maximal binary portability -->
389 <  <!-- Use javadoc12, so we can use override-methods=summary, and JDK-8202628 -->
390 <  <property name="build.main.java.version" value="11"/>
389 >  <!-- ButButBut as of 2019-08, target jdk11 at build time -->
390 >  <!-- Use javadoc12 (but -link to jdk11 api docs!), to get:
391 >    o override-methods=summary
392 >    o {@systemProperty ...}
393 >    o 8211194: issues linking to external documentation (was: missing package-list for JDK10 / JDK11 documentation)
394 >    o 8202628: javadoc generates bad links in TestModules.java
395 >    -->
396 >  <property name="java.runtime.target" value="11"/>
397    <property name="build.main.java" value="${java11}"/>
398 <  <property name="build.main.javac" value="${javac9}"/>
398 >  <property name="build.main.javac" value="${javac11}"/>
399    <property name="build.main.javadoc" value="${javadoc12}"/>
400 +  <property name="build.main.javadoc.source" value="${java.runtime.target}"/>
401  
402    <target name="dists"
403            depends="dist, 4jdk8dist"
# Line 429 | Line 429
429        <compilerarg value="--patch-module=java.base=${src.dir}"/>
430        <compilerarg value="-Xprefer:source"/>
431        <compilerarg value="-XDignore.symbol.file=true"/>
432 + <!--   Xlint:-removal for jdk12 Unsafe Object -> Reference renaming -->
433        <compilerarg value="-Xlint:all,-removal"/>
434        <compilerarg line="--doclint-format html5"/>
435        <compilerarg value="-Xdoclint:all/protected,reference/private"/>
436 +      <compilerarg value="-Xdoclint/package:java.util.*"/>
437        <compilerarg value="-Werror"/>
438        <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
439        <compilerarg line="${build.args}"/>
# Line 471 | Line 473
473   <!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> -->
474      <javadoc destdir="${docs.dir}"
475               packagenames="none"
476 <             link="${java11.api.url}"
476 >             link="${java.api.url}"
477               overview="${src.dir}/intro.html"
478               access="${build.javadoc.access}"
479               sourcepath="${src.dir}"
480               classpath=""
481 <             source="11"
481 >             source="${build.main.javadoc.source}"
482               executable="${build.main.javadoc}">
483 + <!-- TODO: JDK-8214571 failonerror = "true" -->
484        <fileset dir="${src.dir}" defaultexcludes="yes">
485          <include name="**/*.java"/>
486        </fileset>
487 <      <arg line="-Xdocrootparent ${java10.docroot.url}"/>
487 >      <arg line="-Xdocrootparent ${java.docroot.url}"/>
488        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
489        <arg value="-XDignore.symbol.file=true"/>
490        <arg value="-html5"/>
491        <arg value="--patch-module=java.base=${src.dir}"/>
492 + <!-- old school frames via docs/index.html?overview-summary.html -->
493 + <!-- TODO: - -frames no longer a supported option in jdk13+ -->
494        <arg value="--frames"/>
495        <arg value="--override-methods=summary"/>
496        <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
# Line 532 | Line 537
537            description="Runs tck tests for src/main directly">
538  
539      <run-tck-tests
540 <      target="${build.main.java.version}"
540 >      target="${java.runtime.target}"
541        workdir="${build.dir}"
542        classes="${product.jar}">
543        <javac-elements>
# Line 566 | Line 571
571            depends="jar"
572            description="Runs jtreg tests for src/main using the jtreg ant task">
573      <run-jtreg-tests
574 <       target="${build.main.java.version}"
574 >       target="${java.runtime.target}"
575         workdir="${build.dir}"
576         classes="${product.jar}"/>
577    </target>
# Line 576 | Line 581
581            description="Runs tck and jtreg tests for src/main"/>
582  
583    <target name="test-version-permutations"
584 <          depends="test9, test10, test11, test12, test9-11, test9-12, clean, test, docs">
584 >          depends="test11, test12, test13, test14, test11-12, test11-13, test11-14, clean, test, docs">
585    </target>
586  
587 <  <target name="test9">
587 >  <!-- jdk9 is unsupported as of 2019-08 -->
588 > <!--   <target name="test9"> -->
589 > <!--     <antcall target="clean"/> -->
590 > <!--     <antcall> -->
591 > <!--       <param name="java.runtime.target" value="9"/> -->
592 > <!--       <param name="build.main.javac" value="${javac9}"/> -->
593 > <!--       <param name="build.main.javadoc" value="${javadoc12}"/> -->
594 > <!--       <param name="build.main.javadoc.source" value="9"/> -->
595 > <!--       <target name="test"/> -->
596 > <!--       <target name="docs"/> -->
597 > <!--     </antcall> -->
598 > <!--   </target> -->
599 >
600 >  <!-- jdk10 is unsupported as of 2019-08 -->
601 > <!--   <target name="test10"> -->
602 > <!--     <antcall target="clean"/> -->
603 > <!--     <antcall> -->
604 > <!--       <param name="java.runtime.target" value="10"/> -->
605 > <!--       <param name="build.main.javac" value="${javac10}"/> -->
606 > <!--       <param name="build.main.javadoc" value="${javadoc12}"/> -->
607 > <!--       <param name="build.main.javadoc.source" value="10"/> -->
608 > <!--       <target name="test"/> -->
609 > <!--       <target name="docs"/> -->
610 > <!--     </antcall> -->
611 > <!--   </target> -->
612 >
613 >  <target name="test11">
614      <antcall target="clean"/>
615      <antcall>
616 <      <param name="build.main.java.version" value="9"/>
617 <      <param name="build.main.java" value="${java9}"/>
618 <      <param name="build.main.javac" value="${javac9}"/>
616 >      <param name="java.runtime.target" value="11"/>
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="test"/>
621 +      <target name="docs"/>
622      </antcall>
623    </target>
624  
625 <  <target name="test10">
625 >  <target name="test12">
626      <antcall target="clean"/>
627      <antcall>
628 <      <param name="build.main.java.version" value="10"/>
629 <      <param name="build.main.java" value="${java10}"/>
630 <      <param name="build.main.javac" value="${javac10}"/>
631 <      <param name="build.main.javadoc" value="${javadoc10}"/>
628 >      <param name="java.runtime.target" value="12"/>
629 >      <param name="build.main.javac" value="${javac12}"/>
630 >      <param name="build.main.javadoc" value="${javadoc12}"/>
631 >      <param name="build.main.javadoc.source" value="12"/>
632        <target name="test"/>
633        <target name="docs"/>
634      </antcall>
635    </target>
636  
637 <  <target name="test11">
637 >  <target name="test13">
638      <antcall target="clean"/>
639      <antcall>
640 <      <param name="build.main.java.version" value="11"/>
641 <      <param name="build.main.java" value="${java11}"/>
642 <      <param name="build.main.javac" value="${javac11}"/>
643 <      <param name="build.main.javadoc" value="${javadoc11}"/>
640 >      <param name="java.runtime.target" value="13"/>
641 >      <param name="build.main.javac" value="${javac13}"/>
642 >      <param name="build.main.javadoc" value="${javadoc13}"/>
643 >      <param name="build.main.javadoc.source" value="13"/>
644        <target name="test"/>
645        <target name="docs"/>
646      </antcall>
647    </target>
648  
649 <  <target name="test12">
649 >  <target name="test14">
650      <antcall target="clean"/>
651      <antcall>
652 <      <param name="build.main.java.version" value="12"/>
653 <      <param name="build.main.java" value="${java12}"/>
654 <      <param name="build.main.javac" value="${javac12}"/>
652 >      <param name="java.runtime.target" value="14"/>
653 >      <param name="build.main.javac" value="${javac14}"/>
654 >      <param name="build.main.javadoc" value="${javadoc14}"/>
655 >      <param name="build.main.javadoc.source" value="14"/>
656 >      <target name="test"/>
657 >      <target name="docs"/>
658 >    </antcall>
659 >  </target>
660 >
661 >  <target name="test11-12">
662 >    <antcall target="clean"/>
663 >    <antcall>
664 >      <param name="java.runtime.target" value="12"/>
665 >      <param name="build.main.javac" value="${javac11}"/>
666        <param name="build.main.javadoc" value="${javadoc12}"/>
667 +      <param name="build.main.javadoc.source" value="11"/>
668        <target name="test"/>
669        <target name="docs"/>
670      </antcall>
671    </target>
672  
673 <  <target name="test9-11">
673 >  <target name="test11-13">
674      <antcall target="clean"/>
675      <antcall>
676 <      <param name="build.main.java.version" value="11"/>
677 <      <param name="build.main.java" value="${java11}"/>
678 <      <param name="build.main.javac" value="${javac9}"/>
679 <      <param name="build.main.javadoc" value="${javadoc11}"/>
676 >      <param name="java.runtime.target" value="13"/>
677 >      <param name="build.main.javac" value="${javac11}"/>
678 >      <param name="build.main.javadoc" value="${javadoc13}"/>
679 >      <param name="build.main.javadoc.source" value="11"/>
680        <target name="test"/>
681        <target name="docs"/>
682      </antcall>
683    </target>
684  
685 <  <target name="test9-12">
685 >  <target name="test11-14">
686      <antcall target="clean"/>
687      <antcall>
688 <      <param name="build.main.java.version" value="12"/>
689 <      <param name="build.main.java" value="${java12}"/>
690 <      <param name="build.main.javac" value="${javac9}"/>
691 <      <param name="build.main.javadoc" value="${javadoc12}"/>
688 >      <param name="java.runtime.target" value="14"/>
689 >      <param name="build.main.javac" value="${javac11}"/>
690 >      <param name="build.main.javadoc" value="${javadoc14}"/>
691 >      <param name="build.main.javadoc.source" value="11"/>
692        <target name="test"/>
693        <target name="docs"/>
694      </antcall>
# Line 1451 | Line 1496
1496      </jar>
1497  
1498      <run-tck-tests
1499 <      target="${build.main.java.version}"
1499 >      target="${java.runtime.target}"
1500        workdir="${build.dir}"
1501        classes="${product.jar}">
1502        <javac-elements>
# Line 1474 | Line 1519
1519            description="Run errorprone over jtreg tests (experimental)">
1520  
1521      <run-jtreg-tests
1522 <       target="${build.main.java.version}"
1522 >       target="${java.runtime.target}"
1523         workdir="${build.dir}"
1524         classes="${product.jar}"
1525         verbose="all">

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines