Changeset 14020 in osm for applications/editors/josm/i18n/build.xml

Timestamp:

2009-03-08T15:43:12+01:00 (16 years ago)

Author:

stoecker

Message:

updated

File:

• applications/editors/josm/i18n/build.xml (modified) (6 diffs)

applications/editors/josm/i18n/build.xml

@@ -15 +15 @@
 
   <property name="ant.build.javac.target" value="1.5"/>
+
+  <property name="gettexttasks.jar" value="lib/gettext-ant-tasks-0.9.6.jar"/>
+
+  <target name="init.gettext" description="Loads the Ant gettext tasks">
+    <taskdef name="gettext-extract" classname="org.xnap.commons.ant.gettext.GettextExtractKeysTask" classpath="${gettexttasks.jar}"/>
+    <taskdef name="gettext-merge" classname="org.xnap.commons.ant.gettext.GettextMergeKeysTask" classpath="${gettexttasks.jar}"/>
+    <taskdef name="gettext-dist" classname="org.xnap.commons.ant.gettext.GettextDistTask" classpath="${gettexttasks.jar}"/>
+  </target>
 
   <target name="trans_.java">
@@ -33 +41 @@
       <arg line="convsurveyor.pl ${surveyor.srcfile}"/>
     </exec>
-  </target>
-
-  <target name="java_sourcefiles.txt" depends="trans_.java">
-    <exec executable="find" osfamily="unix"
-          output="${i18n.build.dir}/java_sources.txt">
-      <arg value="${josm.build.dir}/src" />
-      <arg value="${plugin.dir}"/>
-      <arg value="${i18n.build.dir}"/>
-      <arg value="-name"/>
-      <arg value="*.java"/>
-    </exec>
-    <exec executable="sort" osfamily="unix"
-          output="${i18n.build.dir}/java_sourcefiles.txt">
-      <arg value="${i18n.build.dir}/java_sources.txt"/>
-    </exec>
-    <delete file="${i18n.build.dir}/java_sources.txt"/>
+    <copy file="specialmessages.java" todir="${i18n.build.dir}" />
   </target>
 
   <target name="po/josm.pot"
           description="Extracts message keys from the source code"
-          depends="java_sourcefiles.txt">
-    <exec executable="xgettext">
-      <arg line="-ktr -ktrn:1,2 -ktrc -kmarktr -Ljava --from-code=UTF-8 -opo/josm.pot -f${i18n.build.dir}/java_sourcefiles.txt"/>
-    </exec>
+          depends="trans_.java,init.gettext">
+    <gettext-extract keysFile="josm.pot" poDirectory="po"
+                     keywords="-k -ktrc -ktr -kmarktr -ktrn:1,2 -ktrl">
+      <fileset dir="${josm.build.dir}/src" includes="**/*.java"/>
+      <fileset dir="${plugin.dir}" includes="**/*.java"/>
+      <fileset dir="${i18n.build.dir}" includes="specialmessages.java"/>
+      <fileset dir="${i18n.build.dir}" includes="trans_*.java"/>
+    </gettext-extract>
   </target>
 
-  <target name="build" depends="po/josm.pot">
+  <target name="build" depends="po/josm.pot,init.gettext">
     <copy file="i18n.properties" todir="build/org/openstreetmap/josm" />
 
+    <gettext-merge keysFile="josm.pot" poDirectory="po"/>
+
+    <!--<gettext-dist targetBundle="org.openstreetmap.josm.i18n.Translation"
+                  poDirectory="po" outputDirectory="build"/>-->
+    <ant target="build-lang"><property name="language" value="ar"/></ant>
     <ant target="build-lang"><property name="language" value="bg"/></ant>
     <ant target="build-lang"><property name="language" value="cs"/></ant>
@@ -73 +75 @@
     <ant target="build-lang"><property name="language" value="he"/><property name="jlanguage" value="iw_IL"/></ant>
     <ant target="build-lang"><property name="language" value="ja"/></ant>
+    <ant target="build-lang"><property name="language" value="is"/></ant>
     <ant target="build-lang"><property name="language" value="it"/></ant>
     <ant target="build-lang"><property name="language" value="nl"/></ant>
@@ -92 +95 @@
     <delete file="REVISION"/>
 
-    <jar destfile="${i18n.jar}" basedir="build"
-         excludes="trans_*.java java_sourcefiles.txt">
+    <jar destfile="${i18n.jar}" basedir="build" excludes="**/*.java">
       <manifest>
         <attribute name="Extension-Name" value="JOSM Translation into various languages" />
@@ -100 +102 @@
       </manifest>
     </jar>
-
   </target>
 
   <target name="build-lang">
     <property name="jlanguage" value="${language}"/>
-    <exec executable="msgmerge">
-      <arg line="-U po/${language}.po po/josm.pot"/>
-    </exec>
-
     <exec executable="msgfmt">
       <arg line="--verbose --java2 -dbuild -rorg.openstreetmap.josm.i18n.Translation -l${jlanguage} po/${language}.po"/>
@@ -118 +115 @@
     <delete file="po/josm.pot"/>
     <delete>
-      <fileset dir="po" includes="*.po~" defaultexcludes="false"/>
+      <fileset dir="po" includes="*.*~" defaultexcludes="false"/>
     </delete>
   </target>