Changeset 10628 in josm for trunk/build.xml


Ignore:
Timestamp:
2016-07-24T15:31:31+02:00 (3 years ago)
Author:
Don-vip
Message:

see #12472 - error-prone causes problems with coverity and java 9, introduce an ant property to override it

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/build.xml

    r10614 r10628  
    2727        <property name="groovy.jar" location="${base.dir}/tools/groovy-all-2.4.7.jar"/>
    2828        <property name="error_prone_ant.jar" location="${base.dir}/tools/error_prone_ant-2.0.11.jar"/>
     29        <property name="javac.compiler" value="com.google.errorprone.ErrorProneAntCompilerAdapter" />
    2930        <!-- build parameter: compression level (ant -Dclevel=N)
    3031                 N ranges from 0 (no compression) to 9 (maximum compression)
     
    245246        </javac>
    246247        <!-- JMapViewer -->
    247         <javac compiler="com.google.errorprone.ErrorProneAntCompilerAdapter" sourcepath="" srcdir="${src.dir}"
     248        <javac compiler="${javac.compiler}" sourcepath="" srcdir="${src.dir}"
    248249            excludes="com/**,oauth/**,org/apache/commons/**,org/glassfish/**,org/openstreetmap/gui/jmapviewer/Demo.java,org/openstreetmap/josm/**,JOSM.java,gnu/**"
    249250            destdir="build" target="1.8" source="1.8" debug="on" includeantruntime="false" createMissingPackageInfoClass="false" encoding="UTF-8">
     
    266267        </javac>
    267268        <!-- JOSM -->
    268         <javac compiler="com.google.errorprone.ErrorProneAntCompilerAdapter" sourcepath="" srcdir="${src.dir}"
     269        <javac compiler="${javac.compiler}" sourcepath="" srcdir="${src.dir}"
    269270            excludes="com/**,oauth/**,org/apache/commons/**,org/glassfish/**,org/openstreetmap/gui/jmapviewer/Demo.java"
    270271            destdir="build" target="1.8" source="1.8" debug="on" includeantruntime="false" createMissingPackageInfoClass="false" encoding="UTF-8">
Note: See TracChangeset for help on using the changeset viewer.