Changeset 5153 in osm for applications/editors/josm/plugins/lang

Timestamp:

2007-10-24T20:13:09+02:00 (17 years ago)

Author:

joerg

Message:

josm/plugins/*build.xml: now we use the unique target dist for creating .jar files. Use a lot more variables to be able to move the build directory. destination directory for .jar files is now plugins/dist/*.jar. correcteed clean targets

File:

• applications/editors/josm/plugins/lang/build.xml (modified) (4 diffs)

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

@@ -1 +1 @@
 <project name="lang" default="install-all" basedir=".">
 
+  <!-- compilation properties -->
+  <property name="josm.build.dir"       value="../../core"/>
+  <property name="josm.home.dir"        value="${user.home}/.josm"/>
+  <property name="josm"                 location="../../core/dist/josm-custom.jar" />
+  <property name="plugin.build.dir"     value="build"/>
+  <property name="plugin.dist.dir"      value="../dist"/>
+  <property name="plugin.name"          value="${ant.project.name}"/>
+  <property name="plugin.jar"           value="../dist/${plugin.name}.jar"/>
+  
 
-  <!-- compilation properties -->
-  <property name="josm.build.dir" value="../../core"/>
-  <property name="josm.home.dir" value="${user.home}/.josm"/>
-  <property name="plugin.build.dir" value="bin"/>
-  <property name="plugin.name" value="${ant.project.name}"/>
-  <property name="plugin.jar" value="${plugin.name}.jar"/>
-  <property name="plugins" value=".."/>
-
+  <target name="dist" depends="install-all">
+  </target>
+  
   <target name="install-all" depends="josm-build,keys.pot">
     <ant target="install"><property name="language" value="de"/></ant>
@@ -18 +22 @@
 
   <target name="install">
-    <mkdir dir="${language}/bin"/>
-    <mkdir dir="dist"/>
-    <javac srcdir="${language}/src" classpath="${josm.build.dir}/dist/josm-custom.jar" destdir="${language}/bin" />
+    <mkdir dir="${language}/build"/>
+    <mkdir dir="../dist"/>
+    <javac srcdir="${language}/src" classpath="${josm.build.dir}/dist/josm-custom.jar" destdir="${language}/build" />
 
     <exec executable="msgmerge">
@@ -27 +31 @@
 
     <exec executable="msgfmt">
-      <arg line="--java2 -d${language}/bin -rorg.openstreetmap.josm.Translation -l${language} ${language}/${language}.po"/>
+      <arg line="--java2 -d${language}/build -rorg.openstreetmap.josm.Translation -l${language} ${language}/${language}.po"/>
     </exec>
 
-    <copy file="i18n.properties" todir="${language}/bin/org/openstreetmap/josm" />
+    <copy file="i18n.properties" todir="${language}/build/org/openstreetmap/josm" />
 
-    <jar destfile="dist/lang-${language}.jar" basedir="${language}/bin">
+    <jar destfile="../dist/lang-${language}.jar" basedir="${language}/build">
       <manifest>
         <attribute name="Plugin-Class" value="org.openstreetmap.josm.TranslationLoader_${language}" />
@@ -58 +62 @@
 
   <target name="clean">
-    <delete dir="build" />
-    <delete dir="dist" />
-    <delete dir="${plugin.jar}" />
+    <ant target="clean_lang"><property name="language" value="de"/></ant>
+    <ant target="clean_lang"><property name="language" value="fr"/></ant>
+    <ant target="clean_lang"><property name="language" value="ro"/></ant>
+    <ant target="clean_lang"><property name="language" value="en_GB"/></ant>
+    <delete dir="${plugin.build.dir}" />
+  </target>
+
+  <target name="clean_lang">
+    <delete file="../dist/lang-${language}.jar" />
+    <delete dir="${language}/build"/>
   </target>