Changeset 31677 in osm for applications/editors/josm/plugins/opendata/build.xml

Timestamp:

2015-10-25T01:09:59+02:00 (10 years ago)

Author:

donvip

Message:

[joms_plugins] use apache-commons plugin

File:

• applications/editors/josm/plugins/opendata/build.xml (modified) (5 diffs)

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

@@ -8 +8 @@
     <property name="plugin.canloadatruntime" value="true"/>
     <property name="plugin.link" value="http://wiki.openstreetmap.org/wiki/JOSM/Plugins/OpenData"/>
-    <property name="plugin.requires" value="jts;geotools;utilsplugin2"/>
+    <property name="plugin.requires" value="apache-commons;jts;geotools;utilsplugin2"/>
 
     <!-- ** include targets that all plugins have in common ** -->
@@ -14 +14 @@
     
     <fileset id="plugin.requires.jars" dir="${plugin.dist.dir}">
+        <include name="apache-commons.jar"/>
         <include name="jts.jar"/>
         <include name="geotools.jar"/>
@@ -19 +20 @@
     </fileset>
 
+    <property name="apache-commons" location="${plugin.dist.dir}/apache-commons.jar"/>
     <property name="jts" location="${plugin.dist.dir}/jts.jar"/>
     <property name="geotools" location="${plugin.dist.dir}/geotools.jar"/>
     
-    <!--
-    **********************************************************
-    ** compile_lang3 - compiles Apache Commons Lang 3 needed classes
-    **********************************************************
-    -->
-    <target name="compile_lang3" depends="init">
-        <echo message="compiling Apache Commons Lang 3 ... "/>
-        <javac srcdir="includes/org/apache/commons/lang3" debug="false" destdir="${plugin.build.dir}" includeAntRuntime="false" encoding="ISO-8859-1" />
-    </target>
     <!--
     **********************************************************
@@ -86 +79 @@
     **********************************************************
     -->
-    <target name="compile" depends="init, compile_lang3, compile_poi, compile_jopendoc, compile_neptune, compile_j7zip">
+    <target name="compile" depends="init, compile_poi, compile_jopendoc, compile_neptune, compile_j7zip">
         <echo message="compiling sources for ${plugin.jar} ... "/>
         <javac srcdir="src" debug="true" destdir="${plugin.build.dir}" includeAntRuntime="false" encoding="UTF-8">
@@ -92 +85 @@
                 <pathelement path="${plugin.build.dir}"/>
                 <pathelement location="${josm}"/>
+                <pathelement location="${apache-commons}"/>
                 <pathelement location="${jts}"/>
                 <pathelement location="${geotools}"/>