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

Timestamp:

2012-04-11T19:26:28+02:00 (12 years ago)

Author:

donvip

Message:

[josm_opendata] rely on jts plugin to reduce jar size

File:

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

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

@@ -31 +31 @@
     <!-- should not be necessary to change the following properties -->
     <property name="josm" location="../../core/dist/josm-custom.jar"/>
+    <property name="jts" location="../../dist/jts.jar"/>
     <property name="plugin.build.dir" value="build"/>
     <property name="plugin.src.dir" value="src"/>
@@ -93 +94 @@
     -->
     <target name="compile_geotools" depends="init">
-        <echo message="compiling JTS ... "/>
-        <javac srcdir="includes/com/vividsolutions/jts" debug="false" destdir="${plugin.build.dir}" includeAntRuntime="false" encoding="ISO-8859-1" />
         <echo message="compiling JSR-275 ... "/>
         <javac srcdir="includes/javax/measure" debug="false" destdir="${plugin.build.dir}" includeAntRuntime="false" encoding="UTF-8" />
@@ -100 +99 @@
         <javac srcdir="includes/javax/vecmath" debug="false" destdir="${plugin.build.dir}" includeAntRuntime="false" encoding="ISO-8859-1" />
         <echo message="compiling GeoTools ... "/>
-        <javac debug="true" sourcepath="" srcdir="includes" destdir="${plugin.build.dir}" includeAntRuntime="false" encoding="ISO-8859-1">
+        <javac debug="false" sourcepath="" srcdir="includes" destdir="${plugin.build.dir}" includeAntRuntime="false" encoding="ISO-8859-1">
             <include name="org/geotools/**/*.java"/>
                 <include name="org/opengis/**/*.java"/>
+            <classpath>
+                <pathelement location="${jts}"/>
+            </classpath>
         </javac>
     </target>
     <!--
     **********************************************************
-    ** compile_naptune - compiles Neptune classes
+    ** compile_neptune - compiles Neptune classes
     **********************************************************
     -->
@@ -125 +127 @@
                     <pathelement path="${plugin.build.dir}"/>
                 <pathelement location="${josm}"/>
+                <pathelement location="${jts}"/>
             </classpath>
             <compilerarg value="-Xlint:deprecation"/>
@@ -177 +180 @@
                 <attribute name="Plugin-Link" value="http://wiki.openstreetmap.org/wiki/JOSM/Plugins/OpenData"/>
                 <attribute name="Plugin-Mainversion" value="${plugin.main.version}"/>
-                <!--<attribute name="Plugin-Requires" value="jts"/>-->
+                <attribute name="Plugin-Requires" value="jts"/>
                 <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
             </manifest>