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.284 by jsr166, Sat Oct 27 01:16:23 2018 UTC vs.
Revision 1.290 by jsr166, Sun Dec 2 22:46:53 2018 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 202 | Line 202
202    <!-- <property name="java10.docroot.url" value="http://download.java.net/java/jdk10/docs"/> -->
203    <!-- <property name="java11.docroot.url" value="http://download.java.net/java/jdk11/docs"/> -->
204    <property name="java12.docroot.url" value="https://download.java.net/java/jdk12/docs"/>
205 <  <!-- Default jdk doc location (latest stable release seems best) -->
206 <  <!-- But pin to jdk 10 until fix for -->
207 <  <!-- 8211194: javadoc -link doesn't take module path into consideration -->
208 <  <property name="java.docroot.url"   value="${java10.docroot.url}"/>
205 >  <!-- Default jdk doc location (latest stable LTS release seems best) -->
206 >  <property name="java.docroot.url"   value="${java11.docroot.url}"/>
207  
208    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
209    <property name="java5.api.url"      value="${java5.docroot.url}/api/"/>
# Line 393 | Line 391
391    <!-- Default values: may seem strange ... -->
392    <!-- At runtime, target latest LTS, i.e. jdk11 -->
393    <!-- But at build time, target jdk9, for maximal binary portability -->
394 <  <!-- Use javadoc12, so we can use override-methods=summary, and JDK-8202628 -->
395 <  <property name="build.main.java.version" value="11"/>
394 >  <!-- Use javadoc12 (but -link to jdk11 api docs!), to get:
395 >    o override-methods=summary
396 >    o {@systemProperty ...}
397 >    o 8211194: issues linking to external documentation (was: missing package-list for JDK10 / JDK11 documentation)
398 >    o 8202628: javadoc generates bad links in TestModules.java
399 >    -->
400 >  <property name="java.runtime.target" value="11"/>
401    <property name="build.main.java" value="${java11}"/>
402    <property name="build.main.javac" value="${javac9}"/>
403    <property name="build.main.javadoc" value="${javadoc12}"/>
404 +  <property name="build.main.javadoc.source" value="${java.runtime.target}"/>
405  
406    <target name="dists"
407            depends="dist, 4jdk8dist"
# Line 471 | Line 475
475   <!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> -->
476      <javadoc destdir="${docs.dir}"
477               packagenames="none"
478 <             link="${java11.api.url}"
478 >             link="${java.api.url}"
479               overview="${src.dir}/intro.html"
480               access="${build.javadoc.access}"
481               sourcepath="${src.dir}"
482               classpath=""
483 <             source="11"
483 >             source="${build.main.javadoc.source}"
484               executable="${build.main.javadoc}">
485        <fileset dir="${src.dir}" defaultexcludes="yes">
486          <include name="**/*.java"/>
487        </fileset>
488 <      <arg line="-Xdocrootparent ${java10.docroot.url}"/>
488 >      <arg line="-Xdocrootparent ${java.docroot.url}"/>
489        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
490        <arg value="-XDignore.symbol.file=true"/>
491        <arg value="-html5"/>
492        <arg value="--patch-module=java.base=${src.dir}"/>
493 + <!-- old school frames via docs/index.html?overview-summary.html -->
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 582 | Line 587
587    <target name="test9">
588      <antcall target="clean"/>
589      <antcall>
590 <      <param name="build.main.java.version" value="9"/>
586 <      <param name="build.main.java" value="${java9}"/>
590 >      <param name="java.runtime.target" value="9"/>
591        <param name="build.main.javac" value="${javac9}"/>
592 +      <param name="build.main.javadoc" value="${javadoc12}"/>
593 +      <param name="build.main.javadoc.source" value="9"/>
594        <target name="test"/>
595 +      <target name="docs"/>
596      </antcall>
597    </target>
598  
599    <target name="test10">
600      <antcall target="clean"/>
601      <antcall>
602 <      <param name="build.main.java.version" value="10"/>
596 <      <param name="build.main.java" value="${java10}"/>
602 >      <param name="java.runtime.target" value="10"/>
603        <param name="build.main.javac" value="${javac10}"/>
604 <      <param name="build.main.javadoc" value="${javadoc10}"/>
604 >      <param name="build.main.javadoc" value="${javadoc12}"/>
605 >      <param name="build.main.javadoc.source" value="10"/>
606        <target name="test"/>
607        <target name="docs"/>
608      </antcall>
# Line 604 | Line 611
611    <target name="test11">
612      <antcall target="clean"/>
613      <antcall>
614 <      <param name="build.main.java.version" value="11"/>
608 <      <param name="build.main.java" value="${java11}"/>
614 >      <param name="java.runtime.target" value="11"/>
615        <param name="build.main.javac" value="${javac11}"/>
616 <      <param name="build.main.javadoc" value="${javadoc11}"/>
616 >      <param name="build.main.javadoc" value="${javadoc12}"/>
617 >      <param name="build.main.javadoc.source" value="11"/>
618        <target name="test"/>
619        <target name="docs"/>
620      </antcall>
# Line 616 | Line 623
623    <target name="test12">
624      <antcall target="clean"/>
625      <antcall>
626 <      <param name="build.main.java.version" value="12"/>
620 <      <param name="build.main.java" value="${java12}"/>
626 >      <param name="java.runtime.target" value="12"/>
627        <param name="build.main.javac" value="${javac12}"/>
628        <param name="build.main.javadoc" value="${javadoc12}"/>
629 +      <param name="build.main.javadoc.source" value="12"/>
630        <target name="test"/>
631        <target name="docs"/>
632      </antcall>
# Line 628 | Line 635
635    <target name="test9-11">
636      <antcall target="clean"/>
637      <antcall>
638 <      <param name="build.main.java.version" value="11"/>
632 <      <param name="build.main.java" value="${java11}"/>
638 >      <param name="java.runtime.target" value="11"/>
639        <param name="build.main.javac" value="${javac9}"/>
640 <      <param name="build.main.javadoc" value="${javadoc11}"/>
640 >      <param name="build.main.javadoc" value="${javadoc12}"/>
641 >      <param name="build.main.javadoc.source" value="9"/>
642        <target name="test"/>
643        <target name="docs"/>
644      </antcall>
# Line 640 | Line 647
647    <target name="test9-12">
648      <antcall target="clean"/>
649      <antcall>
650 <      <param name="build.main.java.version" value="12"/>
644 <      <param name="build.main.java" value="${java12}"/>
650 >      <param name="java.runtime.target" value="12"/>
651        <param name="build.main.javac" value="${javac9}"/>
652        <param name="build.main.javadoc" value="${javadoc12}"/>
653 +      <param name="build.main.javadoc.source" value="9"/>
654        <target name="test"/>
655        <target name="docs"/>
656      </antcall>
# Line 1373 | Line 1380
1380  
1381  
1382   <!-- ==============================================================
1383 <  Experimental errorprone support - https://errorprone.info
1383 >  Experimental errorprone support
1384 >  https://errorprone.info
1385 >  https://errorprone.info/docs/installation
1386 >  https://github.com/google/error-prone/issues/1143
1387   =================================================================== -->
1388 <  <property name="errorprone.jar" location="${lib.dir}/error_prone_ant-2.3.1.jar"/>
1388 >  <path id="errorprone.processorpath.path">
1389 >    <pathelement location="${lib.dir}/error_prone_core-2.3.2-with-dependencies.jar"/>
1390 >    <pathelement location="${lib.dir}/dataflow-2.5.7.jar"/>
1391 >    <pathelement location="${lib.dir}/javacutil-2.5.7.jar"/>
1392 >    <pathelement location="${lib.dir}/jFormatString-3.0.0.jar"/>
1393 >  </path>
1394 >  <property name="errorprone.processorpath" refid="errorprone.processorpath.path" />
1395    <property name="errorprone.jsr166.user.flags" value=""/>
1396    <property name="errorprone.jsr166.flags"
1397              value="-Xep:HashtableContains:OFF
1398                     -Xep:JdkObsolete:OFF
1399                     -Xep:MissingOverride:OFF
1400                     -Xep:MissingFail:OFF
1401 +                   -Xep:ThreadPriorityCheck:OFF
1402                     -Xep:MixedArrayDimensions:ERROR
1403                     -Xep:RemoveUnusedImports:ERROR
1404                     -Xep:EmptyIf:ERROR
# Line 1390 | Line 1407
1407                     -Xep:LongLiteralLowerCaseSuffix:ERROR
1408                     -Xep:RedundantThrows:ERROR
1409                     -Xep:IdentityBinaryExpression:WARN
1410 +                   -Xep:ConstructorInvokesOverridable:WARN
1411                     -Xep:MethodCanBeStatic:WARN
1412                     ${errorprone.jsr166.user.flags}"/>
1413    <!-- -Xep:WildcardImport:ERROR -->
# Line 1422 | Line 1440
1440        <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
1441        <compilerarg value="-J--illegal-access=permit"/>
1442        <compilerarg value="-XDcompilePolicy=simple"/>
1443 <      <compilerarg line="-processorpath ${errorprone.jar}"/>
1443 >      <compilerarg value="-processorpath"/>
1444 >      <compilerarg pathref="errorprone.processorpath.path"/>
1445        <compilerarg value="-Xplugin:ErrorProne
1446                            ${errorprone.jsr166.flags}"/>
1447        <compilerarg value="--patch-module=java.base=${src.dir}"/>
# Line 1439 | Line 1458
1458      </jar>
1459  
1460      <run-tck-tests
1461 <      target="${build.main.java.version}"
1461 >      target="${java.runtime.target}"
1462        workdir="${build.dir}"
1463        classes="${product.jar}">
1464        <javac-elements>
1465          <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
1466          <compilerarg value="-J--illegal-access=permit"/>
1467          <compilerarg value="-XDcompilePolicy=simple"/>
1468 <        <compilerarg line="-processorpath ${errorprone.jar}"/>
1468 >        <compilerarg line="-processorpath ${errorprone.processorpath}"/>
1469          <compilerarg value="-Xplugin:ErrorProne
1470                              ${errorprone.jsr166.flags}
1471                              ${errorprone.jsr166.test.flags}"/>
# Line 1462 | Line 1481
1481            description="Run errorprone over jtreg tests (experimental)">
1482  
1483      <run-jtreg-tests
1484 <       target="${build.main.java.version}"
1484 >       target="${java.runtime.target}"
1485         workdir="${build.dir}"
1486         classes="${product.jar}"
1487         verbose="all">
1488        <jtreg-elements>
1489          <arg value="-javacoption:-XDcompilePolicy=simple"/>
1490          <arg value="-javacoption:-processorpath"/>
1491 <        <arg value="-javacoption:${errorprone.jar}"/>
1491 >        <arg value="-javacoption:${errorprone.processorpath}"/>
1492          <arg value="-javacoption:-Xplugin:ErrorProne
1493                              ${errorprone.jsr166.flags}
1494                              ${errorprone.jsr166.test.flags}

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines