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.269 by jsr166, Wed Mar 21 23:10:39 2018 UTC vs.
Revision 1.295 by jsr166, Sun Mar 24 00:44:14 2019 UTC

# Line 1 | Line 1
1   <project name="jsr166" default="usage"
2 <  xmlns:if="ant:if"
2 >  xmlns:if="ant:if"
3    xmlns:unless="ant:unless"
4    xmlns:ivy="antlib:org.apache.ivy.ant">
5  
# Line 23 | Line 23
23    $HOME/jdk/jdk9
24    $HOME/jdk/jdk10
25    $HOME/jdk/jdk11
26 +  $HOME/jdk/jdk12
27 +  $HOME/jdk/jdk13
28    where each of the above is a JDK or a symlink to same, and
29    $HOME/jdk/src/jdk8
30    $HOME/jdk/src/jdk9
31    $HOME/jdk/src/jdk10
32    $HOME/jdk/src/jdk11
33 +  $HOME/jdk/src/jdk12
34 +  $HOME/jdk/src/jdk13
35    where each of the above is a complete JDK source tree
36    (e.g. mercurial forest) or a symlink to same.
37  
38    Alternatively, define ant variables thus:
39    ant -Djdk$N.home=... -Djdk$N.src.home=...
40 <  for $N in 8 9 10 ...
40 >  for $N in 8 .. 13 ...
41  
42    As of 2016-03, the sources in src/main are for jdk9+ only.
43   ------------------------------------------------------------------------------
# Line 53 | Line 57
57  
58  
59    <!-- Compilation options -->
56  <property name="build.sourcelevel"    value="6"/>
60    <property name="build.debug"          value="true"/>
61    <property name="build.debuglevel"     value="source,lines,vars"/>
62    <property name="build.deprecation"    value="false"/>
# Line 104 | Line 107
107      <property name="jdk@{v}.src.dir" location="${jdk@{v}.src.home}/jdk/src/share/classes"
108        unless:set="have.java.base"/>
109      <local name="modules"/>
110 <    <available property="modules" file="${jdk@{v}.home}/jmods" type="dir"/>
110 >    <available property="modules" file="${jdk@{v}.home}/lib/modules" type="file"/>
111      <local name="boot.jar.dir"/>
112      <property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib" unless:set="modules"/>
113      <path id="bootclasspath@{v}" unless:set="modules">
# Line 136 | Line 139
139    <defjdklocations v="9"/>
140    <defjdklocations v="10"/>
141    <defjdklocations v="11"/>
142 +  <defjdklocations v="12"/>
143 +  <defjdklocations v="13"/>
144  
145    <!-- Source locations -->
146    <property name="src.dir"              location="${basedir}/src/main"/>
# Line 147 | Line 152
152    <property name="jtreg9.src.dir"       location="${test.src.dir}/jtreg"/>
153    <property name="jtreg10.src.dir"      location="${test.src.dir}/jtreg"/>
154    <property name="jtreg11.src.dir"      location="${test.src.dir}/jtreg"/>
155 +  <property name="jtreg12.src.dir"      location="${test.src.dir}/jtreg"/>
156 +  <property name="jtreg13.src.dir"      location="${test.src.dir}/jtreg"/>
157    <property name="jtreg.src.dir"        location="${jtreg9.src.dir}"/>
158    <property name="lib.dir"              location="${basedir}/lib"/>
159    <property name="dist.dir"             location="${basedir}/dist"/>
# Line 193 | Line 200
200    <property name="java8.docroot.url"  value="https://docs.oracle.com/javase/8/docs"/>
201    <property name="java9.docroot.url"  value="https://docs.oracle.com/javase/9/docs"/>
202    <property name="java10.docroot.url" value="https://docs.oracle.com/javase/10/docs"/>
203 +  <property name="java11.docroot.url" value="https://docs.oracle.com/en/java/javase/11/docs"/>
204 +  <property name="java12.docroot.url" value="https://docs.oracle.com/en/java/javase/12/docs"/>
205    <!-- The location of jdk early access docs (RIP) -->
206    <!-- <property name="java9.docroot.url" value="http://download.java.net/java/jdk9/docs"/> -->
207    <!-- <property name="java10.docroot.url" value="http://download.java.net/java/jdk10/docs"/> -->
208 <  <property name="java11.docroot.url" value="http://download.java.net/java/jdk11/docs"/>
209 <  <!-- Default jdk doc location (latest stable release seems best) -->
210 <  <property name="java.docroot.url"   value="${java10.docroot.url}"/>
208 >  <!-- <property name="java11.docroot.url" value="http://download.java.net/java/jdk11/docs"/> -->
209 > <!--   <property name="java12.docroot.url" value="https://download.java.net/java/jdk12/docs"/> -->
210 >  <property name="java13.docroot.url" value="https://download.java.net/java/early_access/jdk13/docs"/>
211 >  <!-- Default jdk doc location (latest stable LTS release seems best) -->
212 >  <property name="java.docroot.url"   value="${java11.docroot.url}"/>
213  
214    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
215    <property name="java5.api.url"      value="${java5.docroot.url}/api/"/>
# Line 208 | Line 219
219    <property name="java9.api.url"      value="${java9.docroot.url}/api/"/>
220    <property name="java10.api.url"     value="${java10.docroot.url}/api/"/>
221    <property name="java11.api.url"     value="${java11.docroot.url}/api/"/>
222 +  <property name="java12.api.url"     value="${java12.docroot.url}/api/"/>
223 +  <property name="java13.api.url"     value="${java13.docroot.url}/api/"/>
224    <property name="java.api.url"       value="${java.docroot.url}/api/"/>
225  
226    <!-- Define the "jtreg" task -->
# Line 240 | Line 253
253  
254      <local name="modules"/>
255      <condition property="modules">
256 <      <available file="${jdk@{compile-target}.home}/jmods" type="dir"/>
256 >      <available file="${jdk@{compile-target}.home}/lib/modules" type="file"/>
257      </condition>
258  
259      <local name="use-doclint"/>
# Line 321 | Line 334
334      </sequential>
335    </macrodef>
336  
337 +  <defjtregtests v="13"/>
338 +  <defjtregtests v="12"/>
339    <defjtregtests v="11"/>
340    <defjtregtests v="10"/>
341    <defjtregtests v="9"/>
# Line 331 | Line 346
346    <property name="jtreg.flags" value=""/>
347  
348    <macrodef name="run-jtreg-tests">
349 <    <!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
349 >    <!-- ant -Djtreg11.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
350      <attribute name="target"/>
351      <attribute name="workdir"/>
352      <attribute name="classes"/>
# Line 346 | Line 361
361  
362      <local name="modules"/>
363      <condition property="modules">
364 <      <available file="${jdk@{target}.home}/jmods" type="dir"/>
364 >      <available file="${jdk@{target}.home}/lib/modules" type="file"/>
365      </condition>
366  
367      <delete dir="@{workdir}/JTwork"   quiet="true"/>
# Line 381 | Line 396
396  
397    <!-- Main targets -->
398  
399 <  <property name="build.main.java.version" value="9"/>
400 <  <!-- Workaround "no nested properties in ant" -->
401 <  <macrodef name="define-build-main-properties">
402 <    <attribute name="v"/>
403 <    <sequential>
404 <      <property name="build.main.java"    value="${java@{v}}"/>
405 <      <property name="build.main.javac"   value="${javac@{v}}"/>
406 <      <!-- Force javadoc version to be at least 10,
407 <           so we can use override-methods=summary -->
408 <      <condition property="build.main.javadoc"
409 <                 value="${javadoc11}"
410 <                 else="${javadoc@{v}}">
411 <        <equals arg1="@{v}" arg2="9"/>
412 <      </condition>
398 <    </sequential>
399 <  </macrodef>
400 <  <define-build-main-properties v="${build.main.java.version}"/>
399 >  <!-- Default values: may seem strange ... -->
400 >  <!-- At runtime, target latest LTS, i.e. jdk11 -->
401 >  <!-- But at build time, target jdk9, for maximal binary portability -->
402 >  <!-- Use javadoc12 (but -link to jdk11 api docs!), to get:
403 >    o override-methods=summary
404 >    o {@systemProperty ...}
405 >    o 8211194: issues linking to external documentation (was: missing package-list for JDK10 / JDK11 documentation)
406 >    o 8202628: javadoc generates bad links in TestModules.java
407 >    -->
408 >  <property name="java.runtime.target" value="11"/>
409 >  <property name="build.main.java" value="${java11}"/>
410 >  <property name="build.main.javac" value="${javac9}"/>
411 >  <property name="build.main.javadoc" value="${javadoc12}"/>
412 >  <property name="build.main.javadoc.source" value="${java.runtime.target}"/>
413  
414    <target name="dists"
415            depends="dist, 4jdk8dist"
416            description="Builds all public jars and docs"/>
417 <          <!--
406 <              depends="dist, 4jdk8dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
407 <          -->
417 >          <!-- no longer supported: 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist -->
418  
419    <target name="compile"
420            depends="configure-compiler"
# Line 431 | Line 441
441        <compilerarg value="--patch-module=java.base=${src.dir}"/>
442        <compilerarg value="-Xprefer:source"/>
443        <compilerarg value="-XDignore.symbol.file=true"/>
444 <      <compilerarg value="-Xlint:all"/>
444 >      <compilerarg value="-Xlint:all,-removal"/>
445        <compilerarg line="--doclint-format html5"/>
446        <compilerarg value="-Xdoclint:all/protected,reference/private"/>
447        <compilerarg value="-Werror"/>
# Line 473 | Line 483
483   <!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> -->
484      <javadoc destdir="${docs.dir}"
485               packagenames="none"
486 <             link="${java9.api.url}"
486 >             link="${java.api.url}"
487               overview="${src.dir}/intro.html"
488               access="${build.javadoc.access}"
489               sourcepath="${src.dir}"
490               classpath=""
491 <             source="9"
491 >             source="${build.main.javadoc.source}"
492               executable="${build.main.javadoc}">
493 + <!-- TODO: JDK-8214571 failonerror = "true" -->
494        <fileset dir="${src.dir}" defaultexcludes="yes">
495          <include name="**/*.java"/>
496        </fileset>
497 <      <arg line="-Xdocrootparent ${java9.docroot.url}"/>
497 >      <arg line="-Xdocrootparent ${java.docroot.url}"/>
498        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
499        <arg value="-XDignore.symbol.file=true"/>
500        <arg value="-html5"/>
501        <arg value="--patch-module=java.base=${src.dir}"/>
502 + <!-- old school frames via docs/index.html?overview-summary.html -->
503 +      <arg value="--frames"/>
504        <arg value="--override-methods=summary"/>
505        <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
506        <arg value="-tag"/> <arg value="implSpec:a:Implementation Requirements:"/>
507        <arg value="-tag"/> <arg value="implNote:a:Implementation Note:"/>
508 < <!-- @apiNote tag currently unused -->
496 < <!--  <arg value="-tag"/> <arg value="apiNote:a:API Note:"/> -->
508 >      <arg value="-tag"/> <arg value="apiNote:a:API Note:"/>
509   <!-- tags added in jdk9: currently unused -->
510   <!--  <arg value="-tag"/> <arg value="revised:X"/> -->
511   <!--  <arg value="-tag"/> <arg value="spec:X"/> -->
# Line 506 | Line 518
518            description="Puts all distributable products in single hierarchy"/>
519  
520  
509  <target name="release"
510          depends="dist"
511          description="Puts entire CVS tree, plus distribution productions, in a jar">
512
513    <property name="release.jar" value="dist/jsr166-${version}-dist.jar"/>
514
515    <jar basedir="${basedir}" destfile="${release.jar}">
516      <!-- <exclude name="build/**"/> -->
517      <exclude name="${release.jar}"/>
518      <exclude name="user.properties"/>
519      <exclude name="etc/notes/**"/>
520      <exclude name="src/emulation/**"/>
521      <exclude name="**/SyntaxTest.java"/>
522      <exclude name="**/SuperfluousAbstract.java"/>
523      <manifest>
524        <attribute name="Built-By" value="${user.name}"/>
525        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
526      </manifest>
527    </jar>
528  </target>
529
530
521    <target name="clean"
522            description="Removes all build products">
523      <delete dir="${build.dir}"/>
# Line 556 | Line 546
546            description="Runs tck tests for src/main directly">
547  
548      <run-tck-tests
549 <      target="${build.main.java.version}"
549 >      target="${java.runtime.target}"
550        workdir="${build.dir}"
551        classes="${product.jar}">
552        <javac-elements>
# Line 590 | Line 580
580            depends="jar"
581            description="Runs jtreg tests for src/main using the jtreg ant task">
582      <run-jtreg-tests
583 <       target="${build.main.java.version}"
583 >       target="${java.runtime.target}"
584         workdir="${build.dir}"
585         classes="${product.jar}"/>
586    </target>
# Line 599 | Line 589
589            depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
590            description="Runs tck and jtreg tests for src/main"/>
591  
592 < <!--   <target name="jtreg8" description="Runs jtreg tests with jdk8"> -->
593 <
594 < <!--     <antcall target="jtreg"> -->
605 < <!--       <param name="build.main.java.version" value="8"/> -->
606 < <!--       <param name="build.main.javac" value="${javac8}"/> -->
607 < <!--     </antcall> -->
592 >  <target name="test-version-permutations"
593 >          depends="test9, test10, test11, test12, test13, test9-11, test9-12, test9-13, clean, test, docs">
594 >  </target>
595  
596 < <!--   </target> -->
596 >  <target name="test9">
597 >    <antcall target="clean"/>
598 >    <antcall>
599 >      <param name="java.runtime.target" value="9"/>
600 >      <param name="build.main.javac" value="${javac9}"/>
601 >      <param name="build.main.javadoc" value="${javadoc12}"/>
602 >      <param name="build.main.javadoc.source" value="9"/>
603 >      <target name="test"/>
604 >      <target name="docs"/>
605 >    </antcall>
606 >  </target>
607  
608 <  <target name="test91011"
609 <          description="Runs tck and jtreg tests for src/main for multiple java versions">
608 >  <target name="test10">
609 >    <antcall target="clean"/>
610 >    <antcall>
611 >      <param name="java.runtime.target" value="10"/>
612 >      <param name="build.main.javac" value="${javac10}"/>
613 >      <param name="build.main.javadoc" value="${javadoc12}"/>
614 >      <param name="build.main.javadoc.source" value="10"/>
615 >      <target name="test"/>
616 >      <target name="docs"/>
617 >    </antcall>
618 >  </target>
619  
620 +  <target name="test11">
621      <antcall target="clean"/>
622 <    <antcall target="test">
623 <      <param name="build.main.java.version" value="9"/>
622 >    <antcall>
623 >      <param name="java.runtime.target" value="11"/>
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="test"/>
628 >      <target name="docs"/>
629      </antcall>
630 +  </target>
631  
632 +  <target name="test12">
633      <antcall target="clean"/>
634 <    <antcall target="test">
635 <      <param name="build.main.java.version" value="10"/>
634 >    <antcall>
635 >      <param name="java.runtime.target" value="12"/>
636 >      <param name="build.main.javac" value="${javac12}"/>
637 >      <param name="build.main.javadoc" value="${javadoc12}"/>
638 >      <param name="build.main.javadoc.source" value="12"/>
639 >      <target name="test"/>
640 >      <target name="docs"/>
641      </antcall>
642 +  </target>
643  
644 +  <target name="test13">
645      <antcall target="clean"/>
646 <    <antcall target="test">
647 <      <param name="build.main.java.version" value="11"/>
646 >    <antcall>
647 >      <param name="java.runtime.target" value="13"/>
648 >      <param name="build.main.javac" value="${javac13}"/>
649 >      <param name="build.main.javadoc" value="${javadoc13}"/>
650 >      <param name="build.main.javadoc.source" value="13"/>
651 >      <target name="test"/>
652 >      <target name="docs"/>
653      </antcall>
654 +  </target>
655  
656 <    <!-- Clean up to avoid obscure wrong class file version bugs -->
656 >  <target name="test9-11">
657      <antcall target="clean"/>
658 +    <antcall>
659 +      <param name="java.runtime.target" value="11"/>
660 +      <param name="build.main.javac" value="${javac9}"/>
661 +      <param name="build.main.javadoc" value="${javadoc12}"/>
662 +      <param name="build.main.javadoc.source" value="9"/>
663 +      <target name="test"/>
664 +      <target name="docs"/>
665 +    </antcall>
666 +  </target>
667  
668 +  <target name="test9-12">
669 +    <antcall target="clean"/>
670 +    <antcall>
671 +      <param name="java.runtime.target" value="12"/>
672 +      <param name="build.main.javac" value="${javac9}"/>
673 +      <param name="build.main.javadoc" value="${javadoc12}"/>
674 +      <param name="build.main.javadoc.source" value="9"/>
675 +      <target name="test"/>
676 +      <target name="docs"/>
677 +    </antcall>
678    </target>
679  
680 +  <target name="test9-13">
681 +    <antcall target="clean"/>
682 +    <antcall>
683 +      <param name="java.runtime.target" value="13"/>
684 +      <param name="build.main.javac" value="${javac9}"/>
685 +      <param name="build.main.javadoc" value="${javadoc13}"/>
686 +      <param name="build.main.javadoc.source" value="9"/>
687 +      <target name="test"/>
688 +      <target name="docs"/>
689 +    </antcall>
690 +  </target>
691  
692  
693    <target name="configure-compiler">
# Line 653 | Line 710
710    </target>
711  
712  
656
657  <!-- Various demos and test programs -->
658
659
660  <!-- description="Benchmark from Doug Lea's AQS paper" -->
661  <target name="loops" depends="configure-compiler">
662
663    <mkdir dir="${build.loops.dir}"/>
664
665    <javac srcdir="${loops.src.dir}"
666          destdir="${build.loops.dir}"
667            debug="${build.debug}"
668       debuglevel="${build.debuglevel}"
669      deprecation="${build.deprecation}"
670           source="${build.sourcelevel}"
671           target="${build.sourcelevel}"
672         encoding="ASCII"
673             fork="true">
674
675      <compilerarg line="${build.args}"/>
676      <classpath refid="loops.classpath"/>
677      <compilerarg value="-XDignore.symbol.file=true"/>
678
679    </javac>
680
681    <java classname="ALoops" fork="true">
682      <classpath refid="loops.classpath"/>
683    </java>
684  </target>
685
686
713    <target name="compile-test-loops" depends="jar"
714            description="Compiles all the perf tests in src/test/loops">
715  
# Line 1387 | Line 1413
1413  
1414  
1415   <!-- ==============================================================
1416 <  Experimental errorprone support - http://errorprone.info
1416 >  Experimental errorprone support
1417 >  https://errorprone.info
1418 >  https://errorprone.info/docs/installation
1419 >  https://github.com/google/error-prone/issues/1143
1420   =================================================================== -->
1421 <  <property name="errorprone.jar" location="${lib.dir}/error_prone_ant-2.2.0.jar"/>
1421 >  <path id="errorprone.processorpath.path">
1422 >    <pathelement location="${lib.dir}/error_prone_core-2.3.2-with-dependencies.jar"/>
1423 >    <pathelement location="${lib.dir}/dataflow-2.5.7.jar"/>
1424 >    <pathelement location="${lib.dir}/javacutil-2.5.7.jar"/>
1425 >    <pathelement location="${lib.dir}/jFormatString-3.0.0.jar"/>
1426 >  </path>
1427 >  <property name="errorprone.processorpath" refid="errorprone.processorpath.path" />
1428    <property name="errorprone.jsr166.user.flags" value=""/>
1429    <property name="errorprone.jsr166.flags"
1430              value="-Xep:HashtableContains:OFF
1431                     -Xep:JdkObsolete:OFF
1432                     -Xep:MissingOverride:OFF
1433                     -Xep:MissingFail:OFF
1434 +                   -Xep:ThreadPriorityCheck:OFF
1435                     -Xep:MixedArrayDimensions:ERROR
1436                     -Xep:RemoveUnusedImports:ERROR
1437                     -Xep:EmptyIf:ERROR
# Line 1404 | Line 1440
1440                     -Xep:LongLiteralLowerCaseSuffix:ERROR
1441                     -Xep:RedundantThrows:ERROR
1442                     -Xep:IdentityBinaryExpression:WARN
1443 +                   -Xep:ConstructorInvokesOverridable:WARN
1444                     -Xep:MethodCanBeStatic:WARN
1445                     ${errorprone.jsr166.user.flags}"/>
1446    <!-- -Xep:WildcardImport:ERROR -->
# Line 1433 | Line 1470
1470             fork="true">
1471  
1472        <include name="**/*.java"/>
1473 +      <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
1474 +      <compilerarg value="-J--illegal-access=permit"/>
1475        <compilerarg value="-XDcompilePolicy=simple"/>
1476 <      <compilerarg line="-processorpath ${errorprone.jar}"/>
1476 >      <compilerarg value="-processorpath"/>
1477 >      <compilerarg pathref="errorprone.processorpath.path"/>
1478        <compilerarg value="-Xplugin:ErrorProne
1479                            ${errorprone.jsr166.flags}"/>
1480        <compilerarg value="--patch-module=java.base=${src.dir}"/>
# Line 1451 | Line 1491
1491      </jar>
1492  
1493      <run-tck-tests
1494 <      target="${build.main.java.version}"
1494 >      target="${java.runtime.target}"
1495        workdir="${build.dir}"
1496        classes="${product.jar}">
1497        <javac-elements>
1498 +        <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
1499 +        <compilerarg value="-J--illegal-access=permit"/>
1500          <compilerarg value="-XDcompilePolicy=simple"/>
1501 <        <compilerarg line="-processorpath ${errorprone.jar}"/>
1501 >        <compilerarg line="-processorpath ${errorprone.processorpath}"/>
1502          <compilerarg value="-Xplugin:ErrorProne
1503                              ${errorprone.jsr166.flags}
1504                              ${errorprone.jsr166.test.flags}"/>
# Line 1472 | Line 1514
1514            description="Run errorprone over jtreg tests (experimental)">
1515  
1516      <run-jtreg-tests
1517 <       target="${build.main.java.version}"
1517 >       target="${java.runtime.target}"
1518         workdir="${build.dir}"
1519         classes="${product.jar}"
1520         verbose="all">
1521        <jtreg-elements>
1522          <arg value="-javacoption:-XDcompilePolicy=simple"/>
1523          <arg value="-javacoption:-processorpath"/>
1524 <        <arg value="-javacoption:${errorprone.jar}"/>
1524 >        <arg value="-javacoption:${errorprone.processorpath}"/>
1525          <arg value="-javacoption:-Xplugin:ErrorProne
1526                              ${errorprone.jsr166.flags}
1527                              ${errorprone.jsr166.test.flags}
1528 +                            -Xep:MultipleTopLevelClasses:WARN
1529                              -Xep:NonAtomicVolatileUpdate:OFF"/>
1530        </jtreg-elements>
1531      </run-jtreg-tests>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines