Package: josm-plugins / 0.0.svn33112+ds-1

150_routing.diff Patch series | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
Description: Fix buildfile for routing plugin
Author: David Paleino <dapal@debian.org>
Forwarded: not-needed

---
 routing/build.xml |   16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

--- a/routing/build.xml
+++ b/routing/build.xml
@@ -6,6 +6,10 @@
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
     <property name="plugin.main.version" value="10580"/>
 
+    <property name="jgrapht" value="/usr/share/java/jgrapht0.8.jar"/>
+    <property name="log4j" value="/usr/share/java/log4j-1.2.jar"/>
+
+
     <!--
     **********************************************************
     ** include targets that all plugins have in common
@@ -15,11 +19,9 @@
 
     <!-- classpath -->
     <path id="classpath">
-        <fileset dir="${plugin.lib.dir}" includes="**/*.jar"/>
         <pathelement path="${josm}"/>
-        <fileset dir="../log4j/lib">
-            <include name="**/*.jar"/>
-        </fileset>
+        <pathelement path="${jgrapht}"/>
+        <pathelement path="${log4j}"/>
     </path>
     <!--
     **********************************************************
@@ -36,7 +38,7 @@
     </target>
 
     <!-- Generate distribution -->
-    <target name="dist" depends="compile,revision" description="Generate distribution">
+    <target name="dist" depends="compile" description="Generate distribution">
         <copy todir="${plugin.build.dir}/images">
             <fileset dir="images"/>
         </copy>
@@ -67,9 +69,9 @@
                 <attribute name="Plugin-Mainversion" value="${plugin.main.version}"/>
                 <attribute name="Plugin-Stage" value="50"/>
                 <attribute name="Plugin-Requires" value="log4j"/>
-                <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
+                <attribute name="Class-Path" value="${jgrapht} ${log4j}"/>
             </manifest>
-            <zipfileset src="${plugin.lib.dir}/jgrapht-jdk1.5.jar"/>
         </jar>
     </target>
+    <target name='revision' />
 </project>