Changeset 31763 in osm

Timestamp:

2015-11-16T22:53:30+01:00 (9 years ago)

Author:

donvip

Message:

[josm_mapdust] rely on gson plugin to avoid conflicts

Location:

applications/editors/josm/plugins/mapdust

Files:

• .classpath (modified) (1 diff)
• build.xml (modified) (4 diffs)
• lib (deleted)

applications/editors/josm/plugins/mapdust/.classpath

@@ -5 +5 @@
         <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
         <classpathentry combineaccessrules="false" kind="src" path="/JOSM"/>
-        <classpathentry kind="lib" path="lib/gson-2.2.4.jar"/>
+        <classpathentry combineaccessrules="false" kind="src" path="/JOSM-GSON"/>
         <classpathentry kind="output" path="build/classes"/>
 </classpath>

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

@@ -4 +4 @@
     <property name="commit.message" value="MapDust bug reporter plugin"/>
     <property name="plugin.main.version" value="7001"/>
-
     <property name="apidoc.dir" value="doc"/>
 
@@ -14 +13 @@
     <import file="../build-common.xml"/>
   
-    <!-- classpath -->
-    <path id="classpath">
-        <fileset dir="${plugin.lib.dir}" includes="**/*.jar"/>
-        <pathelement path="${josm}"/>
-    </path>
-
-    <!--
-    **********************************************************
-    ** compile - complies the source tree
-    **********************************************************
-    -->
-    <target name="compile" depends="init">
-        <echo message="compiling sources for ${plugin.jar} ..."/>
-        <javac srcdir="src" classpathref="classpath" debug="true" destdir="${plugin.build.dir}" includeantruntime="false">
-            <compilerarg value="-Xlint:deprecation"/>
-            <compilerarg value="-Xlint:unchecked"/>
-        </javac>
-    </target>
+        <fileset id="plugin.requires.jars" dir="${plugin.dist.dir}">
+        <include name="gson.jar"/>
+    </fileset>
 
     <target name="clean">
@@ -69 +53 @@
         </copy>
         <jar destfile="${plugin.jar}" basedir="${plugin.build.dir}">
-                <zipfileset src="lib/gson-2.2.4.jar"/>
             <manifest>
                 <attribute name="Author" value="Beata Jancso"/>
@@ -77 +60 @@
                 <attribute name="Plugin-Link" value="http://wiki.openstreetmap.org/wiki/JOSM/Plugins/MapDust"/>
                 <attribute name="Plugin-Mainversion" value="${plugin.main.version}"/>
+                <attribute name="Plugin-Requires" value="gson"/>
                 <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
                 <attribute name="Plugin-Icon" value="images/dialogs/mapdust_icon25.png"/>