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.285 by jsr166, Wed Nov 21 20:58:57 2018 UTC vs.
Revision 1.288 by jsr166, Sat Nov 24 17:39:35 2018 UTC

# Line 1373 | Line 1373
1373  
1374  
1375   <!-- ==============================================================
1376 <  Experimental errorprone support - https://errorprone.info
1376 >  Experimental errorprone support
1377 >  https://errorprone.info
1378 >  https://errorprone.info/docs/installation
1379 >  https://github.com/google/error-prone/issues/1143
1380   =================================================================== -->
1381 <  <property name="errorprone.jar" location="${lib.dir}/error_prone_ant-2.3.1.jar"/>
1381 >  <path id="errorprone.processorpath.path">
1382 >    <pathelement location="${lib.dir}/error_prone_core-2.3.2-with-dependencies.jar"/>
1383 >    <pathelement location="${lib.dir}/dataflow-2.5.7.jar"/>
1384 >    <pathelement location="${lib.dir}/javacutil-2.5.7.jar"/>
1385 >    <pathelement location="${lib.dir}/jFormatString-3.0.0.jar"/>
1386 >  </path>
1387 >  <property name="errorprone.processorpath" refid="errorprone.processorpath.path" />
1388    <property name="errorprone.jsr166.user.flags" value=""/>
1389    <property name="errorprone.jsr166.flags"
1390              value="-Xep:HashtableContains:OFF
1391                     -Xep:JdkObsolete:OFF
1392                     -Xep:MissingOverride:OFF
1393                     -Xep:MissingFail:OFF
1394 +                   -Xep:ThreadPriorityCheck:OFF
1395                     -Xep:MixedArrayDimensions:ERROR
1396                     -Xep:RemoveUnusedImports:ERROR
1397                     -Xep:EmptyIf:ERROR
# Line 1390 | Line 1400
1400                     -Xep:LongLiteralLowerCaseSuffix:ERROR
1401                     -Xep:RedundantThrows:ERROR
1402                     -Xep:IdentityBinaryExpression:WARN
1403 +                   -Xep:ConstructorInvokesOverridable:WARN
1404                     -Xep:MethodCanBeStatic:WARN
1405                     ${errorprone.jsr166.user.flags}"/>
1406    <!-- -Xep:WildcardImport:ERROR -->
# Line 1422 | Line 1433
1433        <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
1434        <compilerarg value="-J--illegal-access=permit"/>
1435        <compilerarg value="-XDcompilePolicy=simple"/>
1436 <      <compilerarg line="-processorpath ${errorprone.jar}"/>
1436 >      <compilerarg value="-processorpath"/>
1437 >      <compilerarg pathref="errorprone.processorpath.path"/>
1438        <compilerarg value="-Xplugin:ErrorProne
1439                            ${errorprone.jsr166.flags}"/>
1440        <compilerarg value="--patch-module=java.base=${src.dir}"/>
# Line 1446 | Line 1458
1458          <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
1459          <compilerarg value="-J--illegal-access=permit"/>
1460          <compilerarg value="-XDcompilePolicy=simple"/>
1461 <        <compilerarg line="-processorpath ${errorprone.jar}"/>
1461 >        <compilerarg line="-processorpath ${errorprone.processorpath}"/>
1462          <compilerarg value="-Xplugin:ErrorProne
1463                              ${errorprone.jsr166.flags}
1464                              ${errorprone.jsr166.test.flags}"/>
# Line 1469 | Line 1481
1481        <jtreg-elements>
1482          <arg value="-javacoption:-XDcompilePolicy=simple"/>
1483          <arg value="-javacoption:-processorpath"/>
1484 <        <arg value="-javacoption:${errorprone.jar}"/>
1484 >        <arg value="-javacoption:${errorprone.processorpath}"/>
1485          <arg value="-javacoption:-Xplugin:ErrorProne
1486                              ${errorprone.jsr166.flags}
1487                              ${errorprone.jsr166.test.flags}

Diff Legend

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