Changeset 33491 in osm for applications/editors


Ignore:
Timestamp:
2017-08-09T22:12:19+02:00 (7 years ago)
Author:
donvip
Message:

see #josm14794 - update to latest checkstyle changes

File:
1 edited

Legend:

Unmodified
Added
Removed
  • applications/editors/josm/plugins/build-common.xml

    r33490 r33491  
    1717    <property name="error_prone_ant.jar"    location="../00_core_tools/error_prone_ant.jar"/>
    1818    <property name="checkstyle.jar"         location="../00_core_tools/checkstyle/checkstyle-all.jar"/>
     19    <property name="checkstyle-build.dir"   location="../00_core_tools/checkstyle/build"/>
    1920    <property name="findbugs-ant.jar"       location="../00_core_tools/findbugs/findbugs-ant.jar"/>
    2021    <property name="annotations.jar"        location="../00_core_tools/findbugs/annotations.jar"/>
     
    302303    <target name="clean">
    303304        <delete dir="${plugin.build.dir}"/>
     305        <delete dir="${checkstyle-build.dir}"/>
    304306        <delete file="${plugin.jar}"/>
    305307    </target>
     
    514516    </target>
    515517
    516     <target name="checkstyle">
    517         <taskdef resource="com/puppycrawl/tools/checkstyle/ant/checkstyle-ant-task.properties" classpath="${checkstyle.jar}"/>
    518         <checkstyle config="../00_core_tools/checkstyle/josm_checks.xml">
     518    <target name="checkstyle-compile">
     519        <mkdir dir="${checkstyle-build.dir}"/>
     520        <javac sourcepath="" srcdir="../00_core_tools/checkstyle/src" failonerror="true"
     521            destdir="${checkstyle-build.dir}" target="${ant.build.javac.target}" source="${ant.build.javac.source}" debug="on"
     522            includeantruntime="false" createMissingPackageInfoClass="false"
     523            encoding="UTF-8" classpath="${checkstyle.jar}">
     524        </javac>
     525    </target>
     526    <target name="checkstyle" depends="checkstyle-compile">
     527        <taskdef resource="com/puppycrawl/tools/checkstyle/ant/checkstyle-ant-task.properties" classpath="${checkstyle.jar}:${checkstyle-build.dir}"/>
     528        <checkstyle config="${basedir}/../00_core_tools/checkstyle/josm_checks.xml">
    519529            <fileset dir="${basedir}/src" includes="**/*.java" excludes="boofcv/**/*.java,
    520530                                                                         com/google/**/*.java,
Note: See TracChangeset for help on using the changeset viewer.