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.263 by jsr166, Tue Jan 23 06:09:53 2018 UTC vs.
Revision 1.265 by jsr166, Sun Feb 4 20:00:47 2018 UTC

# Line 396 | Line 396
396      <sequential>
397        <property name="build.main.java"    value="${java@{v}}"/>
398        <property name="build.main.javac"   value="${javac@{v}}"/>
399 <      <property name="build.main.javadoc" value="${javadoc@{v}}"/>
399 >      <!-- Force javadoc version to be at least 10,
400 >           so we can use override-methods=summary -->
401 >      <condition property="build.main.javadoc"
402 >                 value="${javadoc10}"
403 >                 else="${javadoc@{v}}">
404 >        <equals arg1="@{v}" arg2="9"/>
405 >      </condition>
406      </sequential>
407    </macrodef>
408    <define-build-main-properties v="${build.main.java.version}"/>
# Line 490 | Line 496
496        <arg value="-XDignore.symbol.file=true"/>
497        <arg value="-html5"/>
498        <arg value="--patch-module=java.base=${src.dir}"/>
499 <      <arg value="-tag"/>
500 <      <arg value="${javadoc.jls.option}"/>
501 < <!-- @apiNote currently unused -->
502 < <!--       <arg value="-tag"/> -->
503 < <!--       <arg value="apiNote:a:API Note:"/> -->
504 <      <arg value="-tag"/>
499 <      <arg value="implSpec:a:Implementation Requirements:"/>
500 <      <arg value="-tag"/>
501 <      <arg value="implNote:a:Implementation Note:"/>
499 >      <arg value="--override-methods=summary"/>
500 >      <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
501 >      <arg value="-tag"/> <arg value="implSpec:a:Implementation Requirements:"/>
502 >      <arg value="-tag"/> <arg value="implNote:a:Implementation Note:"/>
503 > <!-- @apiNote tag currently unused -->
504 > <!--  <arg value="-tag"/> <arg value="apiNote:a:API Note:"/> -->
505   <!-- tags added in jdk9: currently unused -->
506 < <!--       <arg value="-tag"/> -->
507 < <!--       <arg value="revised:X"/> -->
505 < <!--       <arg value="-tag"/> -->
506 < <!--       <arg value="spec:X"/> -->
506 > <!--  <arg value="-tag"/> <arg value="revised:X"/> -->
507 > <!--  <arg value="-tag"/> <arg value="spec:X"/> -->
508      </javadoc>
509    </target>
510  
# Line 845 | Line 846
846        </fileset>
847        <arg line="-Xdocrootparent ${java8.docroot.url}"/>
848        <arg value="-XDignore.symbol.file=true"/>
849 <      <arg value="-tag"/>
850 <      <arg value="${javadoc.jls.option}"/>
851 < <!-- @apiNote currently unused -->
852 < <!--       <arg value="-tag"/> -->
853 < <!--       <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/> -->
853 <      <arg value="-tag"/>
854 <      <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
855 <      <arg value="-tag"/>
856 <      <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
849 >      <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
850 >      <arg value="-tag"/> <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
851 >      <arg value="-tag"/> <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
852 > <!-- @apiNote tag currently unused -->
853 > <!--  <arg value="-tag"/> <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/> -->
854      </javadoc>
855    </target>
856  
# Line 1442 | Line 1439
1439             fork="true">
1440  
1441        <include name="**/*.java"/>
1442 +      <compilerarg value="-XDcompilePolicy=simple"/>
1443        <compilerarg line="-processorpath ${errorprone.jar}"/>
1444        <compilerarg value="-Xplugin:ErrorProne
1445                            ${errorprone.jsr166.flags}"/>
# Line 1463 | Line 1461
1461        workdir="${build.dir}"
1462        classes="${product.jar}">
1463        <javac-elements>
1464 +        <compilerarg value="-XDcompilePolicy=simple"/>
1465          <compilerarg line="-processorpath ${errorprone.jar}"/>
1466          <compilerarg value="-Xplugin:ErrorProne
1467                              ${errorprone.jsr166.flags}
# Line 1484 | Line 1483
1483         classes="${product.jar}"
1484         verbose="all">
1485        <jtreg-elements>
1486 <        <arg value="-javacoption:-XDcompilePolicy=byfile"/>
1486 >        <arg value="-javacoption:-XDcompilePolicy=simple"/>
1487          <arg value="-javacoption:-processorpath"/>
1488          <arg value="-javacoption:${errorprone.jar}"/>
1489          <arg value="-javacoption:-Xplugin:ErrorProne

Diff Legend

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