/[cvs]/jsr166/build.xml
ViewVC logotype

Diff of /jsr166/build.xml

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.263 by jsr166, Tue Jan 23 06:09:53 2018 UTC revision 1.265 by jsr166, Sun Feb 4 20:00:47 2018 UTC
# Line 396  Line 396 
396      <sequential>      <sequential>
397        <property name="build.main.java"    value="${java@{v}}"/>        <property name="build.main.java"    value="${java@{v}}"/>
398        <property name="build.main.javac"   value="${javac@{v}}"/>        <property name="build.main.javac"   value="${javac@{v}}"/>
399        <property name="build.main.javadoc" value="${javadoc@{v}}"/>        <!-- 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>      </sequential>
407    </macrodef>    </macrodef>
408    <define-build-main-properties v="${build.main.java.version}"/>    <define-build-main-properties v="${build.main.java.version}"/>
# Line 490  Line 496 
496        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
497        <arg value="-html5"/>        <arg value="-html5"/>
498        <arg value="--patch-module=java.base=${src.dir}"/>        <arg value="--patch-module=java.base=${src.dir}"/>
499        <arg value="-tag"/>        <arg value="--override-methods=summary"/>
500        <arg value="${javadoc.jls.option}"/>        <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
501  <!-- @apiNote currently unused -->        <arg value="-tag"/> <arg value="implSpec:a:Implementation Requirements:"/>
502  <!--       <arg value="-tag"/> -->        <arg value="-tag"/> <arg value="implNote:a:Implementation Note:"/>
503  <!--       <arg value="apiNote:a:API Note:"/> -->  <!-- @apiNote tag currently unused -->
504        <arg value="-tag"/>  <!--  <arg value="-tag"/> <arg value="apiNote:a:API Note:"/> -->
       <arg value="implSpec:a:Implementation Requirements:"/>  
       <arg value="-tag"/>  
       <arg value="implNote:a:Implementation Note:"/>  
505  <!-- tags added in jdk9: currently unused -->  <!-- tags added in jdk9: currently unused -->
506  <!--       <arg value="-tag"/> -->  <!--  <arg value="-tag"/> <arg value="revised:X"/> -->
507  <!--       <arg value="revised:X"/> -->  <!--  <arg value="-tag"/> <arg value="spec:X"/> -->
 <!--       <arg value="-tag"/> -->  
 <!--       <arg value="spec:X"/> -->  
508      </javadoc>      </javadoc>
509    </target>    </target>
510    
# Line 845  Line 846 
846        </fileset>        </fileset>
847        <arg line="-Xdocrootparent ${java8.docroot.url}"/>        <arg line="-Xdocrootparent ${java8.docroot.url}"/>
848        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
849        <arg value="-tag"/>        <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
850        <arg value="${javadoc.jls.option}"/>        <arg value="-tag"/> <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
851  <!-- @apiNote currently unused -->        <arg value="-tag"/> <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
852  <!--       <arg value="-tag"/> -->  <!-- @apiNote tag currently unused -->
853  <!--       <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/> -->  <!--  <arg value="-tag"/> <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/> -->
       <arg value="-tag"/>  
       <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>  
       <arg value="-tag"/>  
       <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>  
854      </javadoc>      </javadoc>
855    </target>    </target>
856    
# Line 1442  Line 1439 
1439             fork="true">             fork="true">
1440    
1441        <include name="**/*.java"/>        <include name="**/*.java"/>
1442          <compilerarg value="-XDcompilePolicy=simple"/>
1443        <compilerarg line="-processorpath ${errorprone.jar}"/>        <compilerarg line="-processorpath ${errorprone.jar}"/>
1444        <compilerarg value="-Xplugin:ErrorProne        <compilerarg value="-Xplugin:ErrorProne
1445                            ${errorprone.jsr166.flags}"/>                            ${errorprone.jsr166.flags}"/>
# Line 1463  Line 1461 
1461        workdir="${build.dir}"        workdir="${build.dir}"
1462        classes="${product.jar}">        classes="${product.jar}">
1463        <javac-elements>        <javac-elements>
1464            <compilerarg value="-XDcompilePolicy=simple"/>
1465          <compilerarg line="-processorpath ${errorprone.jar}"/>          <compilerarg line="-processorpath ${errorprone.jar}"/>
1466          <compilerarg value="-Xplugin:ErrorProne          <compilerarg value="-Xplugin:ErrorProne
1467                              ${errorprone.jsr166.flags}                              ${errorprone.jsr166.flags}
# Line 1484  Line 1483 
1483         classes="${product.jar}"         classes="${product.jar}"
1484         verbose="all">         verbose="all">
1485        <jtreg-elements>        <jtreg-elements>
1486          <arg value="-javacoption:-XDcompilePolicy=byfile"/>          <arg value="-javacoption:-XDcompilePolicy=simple"/>
1487          <arg value="-javacoption:-processorpath"/>          <arg value="-javacoption:-processorpath"/>
1488          <arg value="-javacoption:${errorprone.jar}"/>          <arg value="-javacoption:${errorprone.jar}"/>
1489          <arg value="-javacoption:-Xplugin:ErrorProne          <arg value="-javacoption:-Xplugin:ErrorProne

Legend:
Removed from v.1.263  
changed lines
  Added in v.1.265

dl@cs.oswego.edu
ViewVC Help
Powered by ViewVC 1.1.27