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

Diff of /jsr166/build.xml

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

revision 1.269 by jsr166, Wed Mar 21 23:10:39 2018 UTC revision 1.274 by jsr166, Fri Jun 22 18:55:33 2018 UTC
# Line 104  Line 104 
104      <property name="jdk@{v}.src.dir" location="${jdk@{v}.src.home}/jdk/src/share/classes"      <property name="jdk@{v}.src.dir" location="${jdk@{v}.src.home}/jdk/src/share/classes"
105        unless:set="have.java.base"/>        unless:set="have.java.base"/>
106      <local name="modules"/>      <local name="modules"/>
107      <available property="modules" file="${jdk@{v}.home}/jmods" type="dir"/>      <available property="modules" file="${jdk@{v}.home}/lib/modules" type="file"/>
108      <local name="boot.jar.dir"/>      <local name="boot.jar.dir"/>
109      <property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib" unless:set="modules"/>      <property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib" unless:set="modules"/>
110      <path id="bootclasspath@{v}" unless:set="modules">      <path id="bootclasspath@{v}" unless:set="modules">
# Line 240  Line 240 
240    
241      <local name="modules"/>      <local name="modules"/>
242      <condition property="modules">      <condition property="modules">
243        <available file="${jdk@{compile-target}.home}/jmods" type="dir"/>        <available file="${jdk@{compile-target}.home}/lib/modules" type="file"/>
244      </condition>      </condition>
245    
246      <local name="use-doclint"/>      <local name="use-doclint"/>
# Line 346  Line 346 
346    
347      <local name="modules"/>      <local name="modules"/>
348      <condition property="modules">      <condition property="modules">
349        <available file="${jdk@{target}.home}/jmods" type="dir"/>        <available file="${jdk@{target}.home}/lib/modules" type="file"/>
350      </condition>      </condition>
351    
352      <delete dir="@{workdir}/JTwork"   quiet="true"/>      <delete dir="@{workdir}/JTwork"   quiet="true"/>
# Line 492  Line 492 
492        <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>        <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
493        <arg value="-tag"/> <arg value="implSpec:a:Implementation Requirements:"/>        <arg value="-tag"/> <arg value="implSpec:a:Implementation Requirements:"/>
494        <arg value="-tag"/> <arg value="implNote:a:Implementation Note:"/>        <arg value="-tag"/> <arg value="implNote:a:Implementation Note:"/>
495  <!-- @apiNote tag currently unused -->        <arg value="-tag"/> <arg value="apiNote:a:API Note:"/>
 <!--  <arg value="-tag"/> <arg value="apiNote:a:API Note:"/> -->  
496  <!-- tags added in jdk9: currently unused -->  <!-- tags added in jdk9: currently unused -->
497  <!--  <arg value="-tag"/> <arg value="revised:X"/> -->  <!--  <arg value="-tag"/> <arg value="revised:X"/> -->
498  <!--  <arg value="-tag"/> <arg value="spec:X"/> -->  <!--  <arg value="-tag"/> <arg value="spec:X"/> -->
# Line 1389  Line 1388 
1388  <!-- ==============================================================  <!-- ==============================================================
1389    Experimental errorprone support - http://errorprone.info    Experimental errorprone support - http://errorprone.info
1390  =================================================================== -->  =================================================================== -->
1391    <property name="errorprone.jar" location="${lib.dir}/error_prone_ant-2.2.0.jar"/>    <property name="errorprone.jar" location="${lib.dir}/error_prone_ant-2.3.1.jar"/>
1392    <property name="errorprone.jsr166.user.flags" value=""/>    <property name="errorprone.jsr166.user.flags" value=""/>
1393    <property name="errorprone.jsr166.flags"    <property name="errorprone.jsr166.flags"
1394              value="-Xep:HashtableContains:OFF              value="-Xep:HashtableContains:OFF
# Line 1433  Line 1432 
1432             fork="true">             fork="true">
1433    
1434        <include name="**/*.java"/>        <include name="**/*.java"/>
1435          <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
1436          <compilerarg value="-J--illegal-access=permit"/>
1437        <compilerarg value="-XDcompilePolicy=simple"/>        <compilerarg value="-XDcompilePolicy=simple"/>
1438        <compilerarg line="-processorpath ${errorprone.jar}"/>        <compilerarg line="-processorpath ${errorprone.jar}"/>
1439        <compilerarg value="-Xplugin:ErrorProne        <compilerarg value="-Xplugin:ErrorProne
# Line 1455  Line 1456 
1456        workdir="${build.dir}"        workdir="${build.dir}"
1457        classes="${product.jar}">        classes="${product.jar}">
1458        <javac-elements>        <javac-elements>
1459            <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
1460            <compilerarg value="-J--illegal-access=permit"/>
1461          <compilerarg value="-XDcompilePolicy=simple"/>          <compilerarg value="-XDcompilePolicy=simple"/>
1462          <compilerarg line="-processorpath ${errorprone.jar}"/>          <compilerarg line="-processorpath ${errorprone.jar}"/>
1463          <compilerarg value="-Xplugin:ErrorProne          <compilerarg value="-Xplugin:ErrorProne
# Line 1483  Line 1486 
1486          <arg value="-javacoption:-Xplugin:ErrorProne          <arg value="-javacoption:-Xplugin:ErrorProne
1487                              ${errorprone.jsr166.flags}                              ${errorprone.jsr166.flags}
1488                              ${errorprone.jsr166.test.flags}                              ${errorprone.jsr166.test.flags}
1489                                -Xep:MultipleTopLevelClasses:WARN
1490                              -Xep:NonAtomicVolatileUpdate:OFF"/>                              -Xep:NonAtomicVolatileUpdate:OFF"/>
1491        </jtreg-elements>        </jtreg-elements>
1492      </run-jtreg-tests>      </run-jtreg-tests>

Legend:
Removed from v.1.269  
changed lines
  Added in v.1.274

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