Changeset 32310 in osm

Timestamp:

2016-06-18T15:40:14+02:00 (9 years ago)

Author:

donvip

Message:

add checkstyle and findbugs targets for josm plugins

Location:

applications/editors/josm/plugins

Files:

• CustomizePublicTransportStop/build.xml (modified) (1 diff)
• build-common.xml (modified) (3 diffs)
• build.xml (modified) (1 diff)
• routes/build.xml (modified) (1 diff)

applications/editors/josm/plugins/CustomizePublicTransportStop/build.xml

@@ -96 +96 @@
 
     <target name="test"/>
+    <target name="checkstyle"/>
+    <target name="findbugs"/>
 </project>

applications/editors/josm/plugins/build-common.xml

@@ -16 +16 @@
     <property name="josm.test.build.dir"    location="../../core/test/build"/>
     <property name="groovy.jar"             location="../00_core_tools/groovy-all-2.4.6.jar"/>
+    <property name="checkstyle.jar"         location="../00_core_tools/checkstyle/checkstyle-6.19-all.jar"/>
+    <property name="findbugs-ant.jar"       location="../00_core_tools/findbugs/findbugs-ant.jar"/>
     <property name="annotations.jar"        location="../00_core_tools/findbugs/annotations.jar"/>
     <property name="plugin.build.dir"       location="build"/>
@@ -454 +456 @@
                     <path refid="test.classpath"/>
                 </classpath>
-                <javac target="1.7" source="1.7" debug="on" encoding="UTF-8">
+                <javac debug="on" encoding="UTF-8">
                     <compilerarg value="-Xlint:all"/>
                     <compilerarg value="-Xlint:-serial"/>
@@ -488 +490 @@
     </target>
 
+    <target name="checkstyle">
+        <taskdef resource="com/puppycrawl/tools/checkstyle/ant/checkstyle-ant-task.properties" classpath="${checkstyle.jar}"/>
+        <checkstyle config="../00_core_tools/checkstyle/josm_checks.xml">
+            <fileset dir="${basedir}/src" includes="**/*.java"/>
+            <fileset dir="${basedir}/test" includes="**/*.java" erroronmissingdir="false"/>
+            <formatter type="xml" toFile="checkstyle-josm-${ant.project.name}.xml"/>
+        </checkstyle>
+    </target>
+
+    <target name="findbugs" depends="dist">
+        <taskdef name="findbugs" classname="edu.umd.cs.findbugs.anttask.FindBugsTask" classpath="${findbugs-ant.jar}"/>
+        <path id="findbugs-classpath">
+            <fileset dir="../00_core_tools/findbugs/">
+                <include name="*.jar"/>
+            </fileset>
+        </path>
+        <property name="findbugs-classpath" refid="findbugs-classpath"/>
+        <findbugs output="xml"
+                outputFile="findbugs-josm-${ant.project.name}.xml"
+                classpath="${findbugs-classpath}"
+                pluginList=""
+                excludeFilter="../00_core_tools/findbugs/josm-filter.xml"
+                effort="default"
+                reportLevel="low"
+                >
+            <sourcePath path="${basedir}/src" />
+            <class location="${plugin.jar}" />
+        </findbugs>
+    </target>
+
     <target name="runjosm" depends="install">
         <java jar="${josm}" fork="true">

applications/editors/josm/plugins/build.xml

@@ -7 +7 @@
         <ant dir="../core" target="test-compile"/>
     </target>
-        <property name="ordered_plugins" value="jna/build.xml
-                                                                                        jts/build.xml
-                                                                                        gson/build.xml
-                                                                                        ejml/build.xml
-                                                                                        geotools/build.xml
-                                                                                        utilsplugin2/build.xml
-                                                                                        log4j/build.xml
-                                                                                        apache-commons/build.xml
-                                                                                        apache-http/build.xml"/>
-        <macrodef name="iterate">
-                <attribute name="target"/>
-                <sequential>
-                        <subant target="@{target}">
-                                <filelist dir="." files="${ordered_plugins}"/>
-                                <fileset  dir="." includes="*/build.xml" excludes="00_*/build.xml ${ordered_plugins}"/>
-                        </subant>
-                </sequential>
-        </macrodef>
-        <target name="clean">
-                <iterate target="clean"/>
-        </target>
-        <target name="dist" depends="compile_josm">
+    <property name="ordered_plugins" value="jna/build.xml
+                                            jts/build.xml
+                                            gson/build.xml
+                                            ejml/build.xml
+                                            geotools/build.xml
+                                            utilsplugin2/build.xml
+                                            log4j/build.xml
+                                            apache-commons/build.xml
+                                            apache-http/build.xml"/>
+    <macrodef name="iterate">
+        <attribute name="target"/>
+        <sequential>
+            <subant target="@{target}">
+                <filelist dir="." files="${ordered_plugins}"/>
+                <fileset  dir="." includes="*/build.xml" excludes="00_*/build.xml ${ordered_plugins}"/>
+            </subant>
+        </sequential>
+    </macrodef>
+    <target name="clean">
+        <iterate target="clean"/>
+    </target>
+    <target name="dist" depends="compile_josm">
         <mkdir dir="../dist"/>
-                <iterate target="dist"/>
-        </target>
-        <target name="install" depends="dist">
-                <iterate target="install"/>
-        </target>
-        <target name="test" depends="compile_josm_test">
-                <iterate target="test"/>
-        </target>
+        <iterate target="dist"/>
+    </target>
+    <target name="install" depends="dist">
+        <iterate target="install"/>
+    </target>
+    <target name="test" depends="compile_josm_test">
+        <iterate target="test"/>
+    </target>
+    <target name="checkstyle">
+        <iterate target="checkstyle"/>
+    </target>
+    <target name="findbugs">
+        <iterate target="findbugs"/>
+    </target>
 </project>

applications/editors/josm/plugins/routes/build.xml

@@ -42 +42 @@
     </target>
     <target name="test"/>
+    <target name="checkstyle"/>
+    <target name="findbugs"/>
     <target name="revision">
         <exec append="false" output="REVISION" executable="svn" failifexecutionfails="false">