[Pkg-osm-commits] [SCM] josm-plugins branch, master, updated. debian/0.0.svn25935-1-15-g6d31e36
Giovanni Mascellani
gio at debian.org
Sat Sep 10 10:45:12 UTC 2011
The following commit has been merged in the master branch:
commit ee832c42ed352d14b6079fa6e3a64da0fd5f16fb
Author: Giovanni Mascellani <gio at debian.org>
Date: Sat Sep 10 11:29:22 2011 +0200
Deduplicating some code in master.xml.
diff --git a/debian/master.xml b/debian/master.xml
index 9988ed1..a423eb8 100644
--- a/debian/master.xml
+++ b/debian/master.xml
@@ -12,49 +12,56 @@
<mkdir dir="../dist"/>
<mkdir dir="../tmp/josm/lib"/>
</target>
+
+ <target name="do_plugin">
+ <ant dir="../${plugin.name}" antfile="build.xml" target="dist">
+ <property name="plugin.jar" value="${plugin.dist.dir}/${plugin.name}.jar"/>
+ </ant>
+ </target>
<target name="build" depends="init">
- <ant dir="../cadastre-fr" antfile="build.xml" target="dist">
- <property name="plugin.jar" value="${plugin.dist.dir}/cadastre-fr.jar"/>
- </ant>
-
- <ant dir="../colorscheme" antfile="build.xml" target="dist">
- <property name="plugin.jar" value="${plugin.dist.dir}/colorscheme.jar"/>
- </ant>
-
- <ant dir="../DirectUpload" antfile="build.xml" target="dist">
- <property name="plugin.jar" value="${plugin.dist.dir}/DirectUpload.jar"/>
- </ant>
-
- <ant dir="../editgpx" antfile="build.xml" target="dist">
- <property name="plugin.jar" value="${plugin.dist.dir}/editgpx.jar"/>
- </ant>
-
- <ant dir="../lakewalker" antfile="build.xml" target="dist">
- <property name="plugin.jar" value="${plugin.dist.dir}/lakewalker.jar"/>
- </ant>
-
- <ant dir="../livegps" antfile="build.xml" target="dist">
- <property name="plugin.jar" value="${plugin.dist.dir}/livegps.jar"/>
- </ant>
-
- <ant dir="../measurement" antfile="build.xml" target="dist">
- <property name="plugin.jar" value="${plugin.dist.dir}/measurement.jar"/>
- </ant>
-
- <ant dir="../openvisible" antfile="build.xml" target="dist">
- <property name="plugin.jar" value="${plugin.dist.dir}/openvisible.jar"/>
- </ant>
-
- <ant dir="../routing" antfile="build.xml" target="dist">
- <property name="plugin.jar" value="${plugin.dist.dir}/routing.jar"/>
- </ant>
+ <antcall target="do_plugin">
+ <param name="plugin.name" value="cadastre-fr"/>
+ </antcall>
+
+ <antcall target="do_plugin">
+ <param name="plugin.name" value="colorscheme"/>
+ </antcall>
+
+ <antcall target="do_plugin">
+ <param name="plugin.name" value="DirectUpload"/>
+ </antcall>
+
+ <antcall target="do_plugin">
+ <param name="plugin.name" value="editgpx"/>
+ </antcall>
+
+ <antcall target="do_plugin">
+ <param name="plugin.name" value="lakewalker"/>
+ </antcall>
+
+ <antcall target="do_plugin">
+ <param name="plugin.name" value="livegps"/>
+ </antcall>
+
+ <antcall target="do_plugin">
+ <param name="plugin.name" value="measurement"/>
+ </antcall>
+
+ <antcall target="do_plugin">
+ <param name="plugin.name" value="openvisible"/>
+ </antcall>
+
+ <antcall target="do_plugin">
+ <param name="plugin.name" value="routing"/>
+ </antcall>
<!-- surveyor must be compiled _after_ livegps -->
- <ant dir="../surveyor" antfile="build.xml" target="dist">
- <property name="plugin.jar" value="${plugin.dist.dir}/surveyor.jar"/>
- </ant>
+ <antcall target="do_plugin">
+ <param name="plugin.name" value="surveyor"/>
+ </antcall>
+
</target>
<target name="clean">
--
Plugins for JOSM
More information about the Pkg-osm-commits
mailing list