Changeset 30821 in osm

Timestamp:

2014-11-29T15:40:09+01:00 (10 years ago)

Author:

donvip

Message:

[josm_videomapping] make plugin rely on JNA plugin

Location:

applications/editors/josm/plugins/videomapping

Files:

• .classpath (modified) (1 diff)
• .settings/org.eclipse.jdt.core.prefs (modified) (1 diff)
• build.xml (modified) (2 diffs)
• lib/jna-3.5.2.jar (deleted)
• lib/platform-3.5.2.jar (deleted)
• nbproject/project.xml (modified) (1 diff)

applications/editors/josm/plugins/videomapping/.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 combineaccessrules="false" kind="src" path="/JOSM-jna"/>
         <classpathentry combineaccessrules="false" kind="src" path="/JOSM-log4j"/>
-        <classpathentry kind="lib" path="lib/jna-3.5.2.jar"/>
-        <classpathentry kind="lib" path="lib/platform-3.5.2.jar"/>
         <classpathentry kind="lib" path="lib/vlcj-3.1.0.jar" sourcepath="lib/vlcj-3.1.0-sources.jar">
                 <attributes>

applications/editors/josm/plugins/videomapping/.settings/org.eclipse.jdt.core.prefs

@@ -7 +7 @@
 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve

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

@@ -6 +6 @@
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
     <property name="plugin.main.version" value="7001"/>
+    <property name="plugin.author" value="Matthias Meißer"/>
+    <property name="plugin.class" value="org.openstreetmap.josm.plugins.videomapping.VideoPlugin"/>
+    <property name="plugin.description" value="(This Plugin is currently work in progress!!!) Links and syncs a georeferenced video against a GPS track, to use it for identify visible objects."/>
+    <property name="plugin.icon" value="images/videomapping.png"/>
+    <property name="plugin.link" value="http://wiki.openstreetmap.org/wiki/JOSM/Plugins/VideoMapping"/>
+    <property name="plugin.requires" value="jna;log4j"/>
 
     <!--
@@ -14 +20 @@
     <import file="../build-common.xml"/>
 
-    <property name="vlcj" value="${plugin.lib.dir}/vlcj-3.1.0.jar"/>
-    <property name="jna" value="${plugin.lib.dir}/jna-3.5.2.jar"/>
-    <property name="platform" value="${plugin.lib.dir}/platform-3.5.2.jar"/>
-    <!-- classpath -->
-    <path id="classpath">
-        <pathelement path="${josm}"/>
-        <pathelement location="${vlcj}"/>
-        <!--Add extra libraries -->
-        <pathelement location="${jna}"/>
-        <pathelement location="${platform}"/>
-        <fileset dir="../log4j/lib">
-            <include name="**/*.jar"/>
-        </fileset>
-    </path>
-    <!--
-    **********************************************************
-    ** compile - complies the source tree
-    ** Overrides the target from build-common.xml
-    **********************************************************
-    -->
-    <target name="compile" depends="init">
-        <echo message="compiling sources for ${plugin.jar} ..."/>
-        <javac srcdir="src" classpathref="classpath" debug="true" destdir="${plugin.build.dir}" encoding="UTF-8" includeantruntime="false">
-            <compilerarg value="-Xlint:deprecation"/>
-            <compilerarg value="-Xlint:unchecked"/>
-        </javac>
-    </target>
-
-    <!--
-    **********************************************************
-    ** dist - creates the plugin jar
-    **********************************************************
-    -->
-    <target name="dist" depends="compile,revision">
-        <echo message="creating ${ant.project.name}.jar ... "/>
-        <copy todir="${plugin.build.dir}/resources">
-            <fileset dir="resources"/>
-        </copy>
-        <copy todir="${plugin.build.dir}/images">
-            <fileset dir="images"/>
-        </copy>
-        <copy todir="${plugin.build.dir}/data">
-            <fileset dir="data"/>
-        </copy>
-        <copy todir="${plugin.build.dir}">
-            <fileset dir=".">
-                <include name="README"/>
-                <include name="LICENSE"/>
-            </fileset>
-        </copy>
-        <jar destfile="${plugin.jar}" basedir="${plugin.build.dir}">
-        <!--
-        ************************************************
-        ** configure these properties. Most of them will be copied to the plugins
-        ** manifest file. Property values will also show up in the list available
-        ** plugins: http://josm.openstreetmap.de/wiki/Plugins.
-        **
-        ************************************************
-        -->
-            <manifest>
-                <attribute name="Author" value="Matthias Meißer"/>
-                <attribute name="Plugin-Class" value="org.openstreetmap.josm.plugins.videomapping.VideoPlugin"/>
-                <attribute name="Plugin-Date" value="${version.entry.commit.date}"/>
-                <attribute name="Plugin-Description" value="(This Plugin is currently work in progress!!!) Links and syncs a georeferenced video against a GPS track, to use it for identify visible objects."/>
-                <attribute name="Plugin-Link" value="http://wiki.openstreetmap.org/wiki/JOSM/Plugins/VideoMapping"/>
-                <attribute name="Plugin-Icon" value="images/videomapping.png"/>
-                <attribute name="Plugin-Mainversion" value="${plugin.main.version}"/>
-                <attribute name="Plugin-Requires" value="log4j"/>
-                <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
-            </manifest>
-            <!--added to bundle libs-->
-            <zipfileset src="${jna}"/>
-            <zipfileset src="${platform}"/>
-            <zipfileset src="${vlcj}"/>
-        </jar>
-    </target>
+    <fileset id="plugin.requires.jars" dir="${plugin.dist.dir}">
+        <include name="jna.jar"/>
+        <include name="log4j.jar"/>
+    </fileset>
+        
 </project>

applications/editors/josm/plugins/videomapping/nbproject/project.xml

@@ -60 +60 @@
             <compilation-unit>
                 <package-root>src</package-root>
-                <classpath mode="compile">../../core/src;lib/jna-3.5.2.jar;lib/platform-3.5.2.jar;lib/vlcj-3.1.0-javadoc.jar;lib/vlcj-3.1.0-sources.jar;lib/vlcj-3.1.0.jar</classpath>
+                <classpath mode="compile">../../core/src;../../dist/jna.jar;lib/vlcj-3.1.0-javadoc.jar;lib/vlcj-3.1.0-sources.jar;lib/vlcj-3.1.0.jar</classpath>
                 <source-level>1.7</source-level>
             </compilation-unit>