Changeset 10581 in josm


Ignore:
Timestamp:
2016-07-21T02:08:50+02:00 (3 years ago)
Author:
Don-vip
Message:

see #11390, fix #12472 - Use error-prone in build (patch by simon04, modified) - requires java 8

Location:
trunk
Files:
1 added
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/README

    r10580 r10581  
    121121                            problems in source code); can be launched as an ant target in build.xml
    122122    - commons-cli-1.3.1.jar dependency of Groovy Ant task
     123    - error_prone_ant-2.0.9.jar
     124                            used to detect code errors during compilation
    123125    - findbugs/             libs and config files for findbugs (automatically detects common bugs and potential
    124126                            problems in source code); can be launched as an ant target in build.xml
  • trunk/build.xml

    r10580 r10581  
    2626        <property name="epsg.output" location="${base.dir}/data/projection/custom-epsg"/>
    2727        <property name="groovy.jar" location="${base.dir}/tools/groovy-all-2.4.7.jar"/>
     28        <property name="error_prone_ant.jar" location="${base.dir}/tools/error_prone_ant-2.0.9.jar"/>
    2829        <!-- build parameter: compression level (ant -Dclevel=N)
    2930                 N ranges from 0 (no compression) to 9 (maximum compression)
     
    244245        </javac>
    245246        <!-- JMapViewer -->
    246         <javac sourcepath="" srcdir="${src.dir}" excludes="com/**,oauth/**,org/apache/commons/**,org/glassfish/**,org/openstreetmap/gui/jmapviewer/Demo.java,org/openstreetmap/josm/**,JOSM.java,gnu/**"
     247        <javac compiler="com.google.errorprone.ErrorProneAntCompilerAdapter" sourcepath="" srcdir="${src.dir}"
     248            excludes="com/**,oauth/**,org/apache/commons/**,org/glassfish/**,org/openstreetmap/gui/jmapviewer/Demo.java,org/openstreetmap/josm/**,JOSM.java,gnu/**"
    247249            destdir="build" target="1.8" source="1.8" debug="on" includeantruntime="false" createMissingPackageInfoClass="false" encoding="UTF-8">
     250            <compilerclasspath>
     251                <pathelement location="${error_prone_ant.jar}"/>
     252            </compilerclasspath>
    248253            <compilerarg value="-Xlint:cast"/>
    249254            <compilerarg value="-Xlint:deprecation"/>
     
    261266        </javac>
    262267        <!-- JOSM -->
    263         <javac sourcepath="" srcdir="${src.dir}" excludes="com/**,oauth/**,org/apache/commons/**,org/glassfish/**,org/openstreetmap/gui/jmapviewer/Demo.java"
     268        <javac compiler="com.google.errorprone.ErrorProneAntCompilerAdapter" sourcepath="" srcdir="${src.dir}"
     269            excludes="com/**,oauth/**,org/apache/commons/**,org/glassfish/**,org/openstreetmap/gui/jmapviewer/Demo.java"
    264270            destdir="build" target="1.8" source="1.8" debug="on" includeantruntime="false" createMissingPackageInfoClass="false" encoding="UTF-8">
     271            <compilerclasspath>
     272                <pathelement location="${error_prone_ant.jar}"/>
     273            </compilerclasspath>
    265274            <compilerarg value="-Xlint:cast"/>
    266275            <compilerarg value="-Xlint:deprecation"/>
Note: See TracChangeset for help on using the changeset viewer.