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.281 by jsr166, Sun Oct 7 03:56:13 2018 UTC vs.
Revision 1.296 by jsr166, Sat Apr 27 14:32:21 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 24 | Line 24
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 55 | Line 57
57  
58  
59    <!-- Compilation options -->
58  <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 139 | Line 140
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 151 | Line 153
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 198 | Line 201
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 <  <property name="java12.docroot.url" value="https://download.java.net/java/jdk12/docs"/>
210 <  <!-- Default jdk doc location (latest stable release seems best) -->
211 <  <!-- But pin to jdk 10 until fix for -->
212 <  <!-- 8211194: javadoc -link doesn't take module path into consideration -->
209 <  <property name="java.docroot.url"   value="${java10.docroot.url}"/>
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 217 | Line 220
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 330 | Line 334
334      </sequential>
335    </macrodef>
336  
337 +  <defjtregtests v="13"/>
338    <defjtregtests v="12"/>
339    <defjtregtests v="11"/>
340    <defjtregtests v="10"/>
# Line 341 | 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 391 | Line 396
396  
397    <!-- Main targets -->
398  
399 <  <property name="build.main.java.version" value="11"/>
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, so we can use override-methods=summary -->
407 <      <!-- Force javadoc version to be at least 12, due to JDK-8202628 -->
408 <      <condition property="build.main.javadoc"
409 <                 value="${javadoc12}"
410 <                 else="${javadoc@{v}}">
411 <        <matches pattern="^(9|10|11)$" string="@{v}"/>
412 <      </condition>
408 <    </sequential>
409 <  </macrodef>
410 <  <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"
# Line 439 | 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 481 | Line 483
483   <!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> -->
484      <javadoc destdir="${docs.dir}"
485               packagenames="none"
486 <             link="${java11.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="11"
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 ${java10.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 + <!-- TODO: --frames no longer a supported option in jdk13+ -->
504 +      <arg value="--frames"/>
505        <arg value="--override-methods=summary"/>
506        <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
507        <arg value="-tag"/> <arg value="implSpec:a:Implementation Requirements:"/>
# Line 513 | Line 519
519            description="Puts all distributable products in single hierarchy"/>
520  
521  
516  <target name="release"
517          depends="dist"
518          description="Puts entire CVS tree, plus distribution productions, in a jar">
519
520    <property name="release.jar" value="dist/jsr166-${version}-dist.jar"/>
521
522    <jar basedir="${basedir}" destfile="${release.jar}">
523      <!-- <exclude name="build/**"/> -->
524      <exclude name="${release.jar}"/>
525      <exclude name="user.properties"/>
526      <exclude name="etc/notes/**"/>
527      <exclude name="src/emulation/**"/>
528      <exclude name="**/SyntaxTest.java"/>
529      <exclude name="**/SuperfluousAbstract.java"/>
530      <manifest>
531        <attribute name="Built-By" value="${user.name}"/>
532        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
533      </manifest>
534    </jar>
535  </target>
536
537
522    <target name="clean"
523            description="Removes all build products">
524      <delete dir="${build.dir}"/>
# Line 563 | Line 547
547            description="Runs tck tests for src/main directly">
548  
549      <run-tck-tests
550 <      target="${build.main.java.version}"
550 >      target="${java.runtime.target}"
551        workdir="${build.dir}"
552        classes="${product.jar}">
553        <javac-elements>
# Line 597 | Line 581
581            depends="jar"
582            description="Runs jtreg tests for src/main using the jtreg ant task">
583      <run-jtreg-tests
584 <       target="${build.main.java.version}"
584 >       target="${java.runtime.target}"
585         workdir="${build.dir}"
586         classes="${product.jar}"/>
587    </target>
# Line 606 | Line 590
590            depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
591            description="Runs tck and jtreg tests for src/main"/>
592  
593 < <!--   <target name="jtreg8" description="Runs jtreg tests with jdk8"> -->
594 <
595 < <!--     <antcall target="jtreg"> -->
612 < <!--       <param name="build.main.java.version" value="8"/> -->
613 < <!--       <param name="build.main.javac" value="${javac8}"/> -->
614 < <!--     </antcall> -->
615 <
616 < <!--   </target> -->
617 <
618 <  <target name="test9101112"
619 <          description="Runs tck and jtreg tests for src/main for multiple java versions">
593 >  <target name="test-version-permutations"
594 >          depends="test9, test10, test11, test12, test13, test9-11, test9-12, test9-13, clean, test, docs">
595 >  </target>
596  
597 +  <target name="test9">
598      <antcall target="clean"/>
599 <    <antcall target="test">
600 <      <param name="build.main.java.version" value="9"/>
624 <      <param name="build.main.java" value="${java9}"/>
599 >    <antcall>
600 >      <param name="java.runtime.target" value="9"/>
601        <param name="build.main.javac" value="${javac9}"/>
602 +      <param name="build.main.javadoc" value="${javadoc12}"/>
603 +      <param name="build.main.javadoc.source" value="9"/>
604 +      <target name="test"/>
605 +      <target name="docs"/>
606      </antcall>
607 +  </target>
608  
609 +  <target name="test10">
610      <antcall target="clean"/>
611 <    <antcall target="test">
612 <      <param name="build.main.java.version" value="10"/>
631 <      <param name="build.main.java" value="${java10}"/>
611 >    <antcall>
612 >      <param name="java.runtime.target" value="10"/>
613        <param name="build.main.javac" value="${javac10}"/>
614 +      <param name="build.main.javadoc" value="${javadoc12}"/>
615 +      <param name="build.main.javadoc.source" value="10"/>
616 +      <target name="test"/>
617 +      <target name="docs"/>
618      </antcall>
619 +  </target>
620  
621 +  <target name="test11">
622      <antcall target="clean"/>
623 <    <antcall target="test">
624 <      <param name="build.main.java.version" value="11"/>
638 <      <param name="build.main.java" value="${java11}"/>
623 >    <antcall>
624 >      <param name="java.runtime.target" value="11"/>
625        <param name="build.main.javac" value="${javac11}"/>
626 +      <param name="build.main.javadoc" value="${javadoc12}"/>
627 +      <param name="build.main.javadoc.source" value="11"/>
628 +      <target name="test"/>
629 +      <target name="docs"/>
630      </antcall>
631 +  </target>
632  
633 +  <target name="test12">
634      <antcall target="clean"/>
635 <    <antcall target="test">
636 <      <param name="build.main.java.version" value="12"/>
645 <      <param name="build.main.java" value="${java12}"/>
646 <      <param name="build.main.javac" value="${javac12}"/>
647 <    </antcall>
648 <    <antcall target="docs">
649 <      <param name="build.main.java.version" value="12"/>
650 <      <param name="build.main.java" value="${java12}"/>
635 >    <antcall>
636 >      <param name="java.runtime.target" value="12"/>
637        <param name="build.main.javac" value="${javac12}"/>
638        <param name="build.main.javadoc" value="${javadoc12}"/>
639 +      <param name="build.main.javadoc.source" value="12"/>
640 +      <target name="test"/>
641 +      <target name="docs"/>
642      </antcall>
643 +  </target>
644  
645 <    <!-- Clean up to avoid obscure wrong class file version bugs -->
645 >  <target name="test13">
646      <antcall target="clean"/>
647 +    <antcall>
648 +      <param name="java.runtime.target" value="13"/>
649 +      <param name="build.main.javac" value="${javac13}"/>
650 +      <param name="build.main.javadoc" value="${javadoc13}"/>
651 +      <param name="build.main.javadoc.source" value="13"/>
652 +      <target name="test"/>
653 +      <target name="docs"/>
654 +    </antcall>
655 +  </target>
656 +
657 +  <target name="test9-11">
658 +    <antcall target="clean"/>
659 +    <antcall>
660 +      <param name="java.runtime.target" value="11"/>
661 +      <param name="build.main.javac" value="${javac9}"/>
662 +      <param name="build.main.javadoc" value="${javadoc12}"/>
663 +      <param name="build.main.javadoc.source" value="9"/>
664 +      <target name="test"/>
665 +      <target name="docs"/>
666 +    </antcall>
667 +  </target>
668  
669 +  <target name="test9-12">
670 +    <antcall target="clean"/>
671 +    <antcall>
672 +      <param name="java.runtime.target" value="12"/>
673 +      <param name="build.main.javac" value="${javac9}"/>
674 +      <param name="build.main.javadoc" value="${javadoc12}"/>
675 +      <param name="build.main.javadoc.source" value="9"/>
676 +      <target name="test"/>
677 +      <target name="docs"/>
678 +    </antcall>
679    </target>
680  
681 +  <target name="test9-13">
682 +    <antcall target="clean"/>
683 +    <antcall>
684 +      <param name="java.runtime.target" value="13"/>
685 +      <param name="build.main.javac" value="${javac9}"/>
686 +      <param name="build.main.javadoc" value="${javadoc13}"/>
687 +      <param name="build.main.javadoc.source" value="9"/>
688 +      <target name="test"/>
689 +      <target name="docs"/>
690 +    </antcall>
691 +  </target>
692  
693  
694    <target name="configure-compiler">
# Line 679 | Line 711
711    </target>
712  
713  
682
683  <!-- Various demos and test programs -->
684
685
686  <!-- description="Benchmark from Doug Lea's AQS paper" -->
687  <target name="loops" depends="configure-compiler">
688
689    <mkdir dir="${build.loops.dir}"/>
690
691    <javac srcdir="${loops.src.dir}"
692          destdir="${build.loops.dir}"
693            debug="${build.debug}"
694       debuglevel="${build.debuglevel}"
695      deprecation="${build.deprecation}"
696           source="${build.sourcelevel}"
697           target="${build.sourcelevel}"
698         encoding="ASCII"
699             fork="true">
700
701      <compilerarg line="${build.args}"/>
702      <classpath refid="loops.classpath"/>
703      <compilerarg value="-XDignore.symbol.file=true"/>
704
705    </javac>
706
707    <java classname="ALoops" fork="true">
708      <classpath refid="loops.classpath"/>
709    </java>
710  </target>
711
712
714    <target name="compile-test-loops" depends="jar"
715            description="Compiles all the perf tests in src/test/loops">
716  
# Line 1413 | Line 1414
1414  
1415  
1416   <!-- ==============================================================
1417 <  Experimental errorprone support - https://errorprone.info
1417 >  Experimental errorprone support
1418 >  https://errorprone.info
1419 >  https://errorprone.info/docs/installation
1420 >  https://github.com/google/error-prone/issues/1143
1421   =================================================================== -->
1422 <  <property name="errorprone.jar" location="${lib.dir}/error_prone_ant-2.3.1.jar"/>
1422 >  <path id="errorprone.processorpath.path">
1423 >    <pathelement location="${lib.dir}/error_prone_core-2.3.2-with-dependencies.jar"/>
1424 >    <pathelement location="${lib.dir}/dataflow-2.5.7.jar"/>
1425 >    <pathelement location="${lib.dir}/javacutil-2.5.7.jar"/>
1426 >    <pathelement location="${lib.dir}/jFormatString-3.0.0.jar"/>
1427 >  </path>
1428 >  <property name="errorprone.processorpath" refid="errorprone.processorpath.path" />
1429    <property name="errorprone.jsr166.user.flags" value=""/>
1430    <property name="errorprone.jsr166.flags"
1431              value="-Xep:HashtableContains:OFF
1432                     -Xep:JdkObsolete:OFF
1433                     -Xep:MissingOverride:OFF
1434                     -Xep:MissingFail:OFF
1435 +                   -Xep:ThreadPriorityCheck:OFF
1436                     -Xep:MixedArrayDimensions:ERROR
1437                     -Xep:RemoveUnusedImports:ERROR
1438                     -Xep:EmptyIf:ERROR
# Line 1430 | Line 1441
1441                     -Xep:LongLiteralLowerCaseSuffix:ERROR
1442                     -Xep:RedundantThrows:ERROR
1443                     -Xep:IdentityBinaryExpression:WARN
1444 +                   -Xep:ConstructorInvokesOverridable:WARN
1445                     -Xep:MethodCanBeStatic:WARN
1446                     ${errorprone.jsr166.user.flags}"/>
1447    <!-- -Xep:WildcardImport:ERROR -->
# Line 1462 | Line 1474
1474        <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
1475        <compilerarg value="-J--illegal-access=permit"/>
1476        <compilerarg value="-XDcompilePolicy=simple"/>
1477 <      <compilerarg line="-processorpath ${errorprone.jar}"/>
1477 >      <compilerarg value="-processorpath"/>
1478 >      <compilerarg pathref="errorprone.processorpath.path"/>
1479        <compilerarg value="-Xplugin:ErrorProne
1480                            ${errorprone.jsr166.flags}"/>
1481        <compilerarg value="--patch-module=java.base=${src.dir}"/>
# Line 1479 | Line 1492
1492      </jar>
1493  
1494      <run-tck-tests
1495 <      target="${build.main.java.version}"
1495 >      target="${java.runtime.target}"
1496        workdir="${build.dir}"
1497        classes="${product.jar}">
1498        <javac-elements>
1499          <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
1500          <compilerarg value="-J--illegal-access=permit"/>
1501          <compilerarg value="-XDcompilePolicy=simple"/>
1502 <        <compilerarg line="-processorpath ${errorprone.jar}"/>
1502 >        <compilerarg line="-processorpath ${errorprone.processorpath}"/>
1503          <compilerarg value="-Xplugin:ErrorProne
1504                              ${errorprone.jsr166.flags}
1505                              ${errorprone.jsr166.test.flags}"/>
# Line 1502 | Line 1515
1515            description="Run errorprone over jtreg tests (experimental)">
1516  
1517      <run-jtreg-tests
1518 <       target="${build.main.java.version}"
1518 >       target="${java.runtime.target}"
1519         workdir="${build.dir}"
1520         classes="${product.jar}"
1521         verbose="all">
1522        <jtreg-elements>
1523          <arg value="-javacoption:-XDcompilePolicy=simple"/>
1524          <arg value="-javacoption:-processorpath"/>
1525 <        <arg value="-javacoption:${errorprone.jar}"/>
1525 >        <arg value="-javacoption:${errorprone.processorpath}"/>
1526          <arg value="-javacoption:-Xplugin:ErrorProne
1527                              ${errorprone.jsr166.flags}
1528                              ${errorprone.jsr166.test.flags}

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines