Changeset 27742 in osm for applications/editors/josm/plugins/conflation/build.xml

Timestamp:

2012-02-10T04:42:04+01:00 (14 years ago)

Author:

joshdoe

Message:

conflation: begin rework to use Replace Geometry from utilsplugin2, see #josm7374

File:

• applications/editors/josm/plugins/conflation/build.xml (modified) (3 diffs)

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

@@ -38 +38 @@
      -->
     <property name="josm" location="../../core/dist/josm-custom.jar"/>
+    <property name="utilsplugin2" location="../../dist/utilsplugin2.jar"/>
     <property name="plugin.build.dir" value="build"/>
     <property name="plugin.src.dir" value="src"/>
@@ -61 +62 @@
         <echo message="compiling sources for  ${plugin.jar} ... "/>
         <javac srcdir="src" classpath="${josm}" debug="true" destdir="${plugin.build.dir}">
+            <classpath>
+                <pathelement path="${josm}"/>
+                <pathelement location="${utilsplugin2}"/>
+            </classpath>
             <compilerarg value="-Xlint:deprecation"/>
             <compilerarg value="-Xlint:unchecked"/>
@@ -100 +105 @@
                 <attribute name="Plugin-Class" value="org.openstreetmap.josm.plugins.conflation.ConflationPlugin"/>
                 <attribute name="Plugin-Date" value="${version.entry.commit.date}"/>
-                <attribute name="Plugin-Description" value="Tool for conflation (merging) data"/>
+                <attribute name="Plugin-Description" value="Tool for conflating (merging) data"/>
                 <attribute name="Plugin-Icon" value="images/conflation.png"/>
+                <attribute name="Plugin-Requires" value="utilsplugin2"/>
                 <attribute name="Plugin-Link" value="http://wiki.openstreetmap.org/wiki/JOSM/Plugins/Conflation"/>
                 <attribute name="Plugin-Mainversion" value="${plugin.main.version}"/>
-                <attribute name="Plugin-Version" value="0.0.1"/>
+                <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
             </manifest>
         </jar>