[Pkg-osm-commits] [SCM] josm-plugins branch, master, updated. debian/0.0.svn25935-1-15-g6d31e36

[Giovanni Mascellani]

The following commit has been merged in the master branch:
commit 6d31e361d3aedc39f5f710695fa3179714ead0ac
Author: Giovanni Mascellani <gio at debian.org>
Date:   Sat Sep 10 12:21:30 2011 +0200

    Fix master.xml.

diff --git a/debian/master.xml b/debian/master.xml
index 20f1a7b..579a2d4 100644
--- a/debian/master.xml
+++ b/debian/master.xml
@@ -4,23 +4,26 @@
     <property name="josm.build.dir"     location="../tmp/josm"/>
     <property name="josm"               location="/usr/share/josm/josm.jar"/>
     <property name="plugin.dist.dir"    location="../dist"/>
-    <property name="po.build.dir"       location="../build/po"/>
+    <property name="plugin.dir"         location=".."/>
+    <property name="po.build.dir"       value="../build"/>
 
     <xmlproperty file="../svn-info.xml" prefix="version" keepRoot="false" collapseAttributes="true"/>
 
 
     <target name="init">
         <mkdir dir="${josm.build.dir}"/> 
-        <mkdir dir="{plugin.dist.dir}"/>
-        <mkdir dir="{po.build.dir}"/>
+        <mkdir dir="${plugin.dist.dir}"/>
+        <mkdir dir="${po.build.dir}"/>
     </target>
 
     <target name="do_plugin">
       <!-- The data dir could have been deleted from GIT repository when empty -->
-      <mkdir dir="${plugin.name}/data"/>
+      <mkdir dir="../${plugin.name}/data"/>
 
       <!-- Build the translation files -->
-      <ant dir="../${plugin.name}" antfile="../i18n/build.xml" target="plugintrans"/>
+      <ant dir="../i18n" antfile="build.xml" target="plugintrans">
+	<property name="path" value="${plugin.name}"/>
+      </ant>
 
       <!-- Build the plugin -->
       <ant dir="../${plugin.name}" antfile="build.xml" target="dist">
@@ -86,5 +89,6 @@
         <ant dir="../surveyor"           antfile="build.xml" target="clean"/>
         <delete dir="../tmp"/>
         <delete dir="${plugin.dist.dir}"/>
+	<delete dir="${po.build.dir}"/>
     </target>
 </project>

-- 
Plugins for JOSM