[Pkg-osm-commits] [SCM] josm branch, master, updated. debian/0.0.svn4064-3-9-g3d3dbac

[Giovanni Mascellani]

The following commit has been merged in the master branch:
commit b73aa68371451b8c99c2ee99a7de77679e5bb7a0
Author: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
Date:   Sun Aug 7 12:03:49 2011 +0200

    Fix javacc execution and i18n targets.

diff --git a/debian/control b/debian/control
index 7972d58..596947b 100644
--- a/debian/control
+++ b/debian/control
@@ -19,6 +19,8 @@ Build-Depends:
  libgettext-ant-tasks-java,
  libterm-readkey-perl
  , liboauth-signpost-java (>= 1.2)
+ , javacc
+ , ant-contrib
 Standards-Version: 3.9.2
 Homepage: http://josm.openstreetmap.de
 Vcs-Git: git://git.debian.org/pkg-osm/josm.git
diff --git a/debian/patches/10-build.patch b/debian/patches/10-build.patch
index 8cd825a..a33a12a 100644
--- a/debian/patches/10-build.patch
+++ b/debian/patches/10-build.patch
@@ -10,8 +10,8 @@ Forwarded: no
 
 Index: josm/build.xml
 ===================================================================
---- josm.orig/build.xml	2011-08-07 00:51:19.000000000 +0200
-+++ josm/build.xml	2011-08-07 00:51:19.000000000 +0200
+--- josm.orig/build.xml	2011-08-07 13:23:59.000000000 +0200
++++ josm/build.xml	2011-08-07 13:24:09.000000000 +0200
 @@ -23,8 +23,9 @@
      </condition>
      <!-- Java classpath addition (all jar files to compile tests with this) -->
@@ -78,7 +78,19 @@ Index: josm/build.xml
              </manifest>
              <zipfileset dir="images" prefix="images"/>
              <zipfileset dir="data" prefix="data"/>
-@@ -124,6 +116,7 @@
+@@ -109,10 +101,7 @@
+     </target>
+     <target name="javacc">
+         <mkdir dir="${mapcss.dir}/parsergen"/>
+-        <exec append="false" executable="java" failifexecutionfails="true">
+-            <arg value="-cp"/>
+-            <arg value="${javacc.home}/javacc.jar"/>
+-            <arg value="javacc"/>
++        <exec append="false" executable="javacc" failifexecutionfails="true">
+             <arg value="-OUTPUT_DIRECTORY=${mapcss.dir}/parsergen"/>
+             <arg value="${mapcss.dir}/MapCSSParser.jj"/>
+         </exec>
+@@ -124,6 +113,7 @@
              <compilerarg value="-Xlint:deprecation"/>
              <compilerarg value="-Xlint:unchecked"/>
          </javac>
@@ -86,7 +98,7 @@ Index: josm/build.xml
      </target>
      <target name="init">
          <mkdir dir="build"/>
-@@ -133,6 +126,7 @@
+@@ -133,6 +123,7 @@
          <delete dir="build"/>
          <delete dir="dist"/>
          <delete dir="${mapcss.dir}/parsergen"/>
@@ -96,8 +108,8 @@ Index: josm/build.xml
          <fileset dir="${test.dir}/lib">
 Index: josm/i18n/build.xml
 ===================================================================
---- josm.orig/i18n/build.xml	2011-08-07 00:51:19.000000000 +0200
-+++ josm/i18n/build.xml	2011-08-07 00:55:09.000000000 +0200
+--- josm.orig/i18n/build.xml	2011-08-07 13:23:59.000000000 +0200
++++ josm/i18n/build.xml	2011-08-07 13:24:09.000000000 +0200
 @@ -1,7 +1,7 @@
  <?xml version="1.0" encoding="utf-8"?>
  <project name="JOSM i18n" default="build" basedir=".">
@@ -107,38 +119,40 @@ Index: josm/i18n/build.xml
      <property name="josm.presets" value="${josm.build.dir}/data/defaultpresets.xml"/>
      <property name="josm.style" value="${josm.build.dir}/styles/standard/elemstyles.xml"/>
      <property name="plugin.dir" value="../plugins"/>
-@@ -12,7 +12,7 @@
+@@ -12,8 +12,8 @@
      <property name="i18n.install.dir" value="${josm.build.dir}/data"/>
      <property name="po.build.dir" value="${i18n.build.dir}"/>
      <property name="ant.build.javac.target" value="1.5"/>
 -    <property name="gettexttasks.jar" value="lib/gettext-ant-tasks-0.9.7.jar"/>
+-    <property name="antcontrib.jar" value="lib/ant-contrib-1.0b3.jar"/>
 +    <property name="gettexttasks.jar" value="/usr/share/java/gettext-ant-tasks.jar"/>
-     <property name="antcontrib.jar" value="lib/ant-contrib-1.0b3.jar"/>
++    <property name="antcontrib.jar" value="/usr/share/java/ant-contrib.jar"/>
      <target name="init" description="Loads the Ant gettext and contrib tasks">
          <taskdef name="gettext-extract" classname="org.xnap.commons.ant.gettext.GettextExtractKeysTask" classpath="${gettexttasks.jar}"/>
-@@ -50,7 +50,12 @@
+         <taskdef name="gettext-merge" classname="org.xnap.commons.ant.gettext.GettextMergeKeysTask" classpath="${gettexttasks.jar}"/>
+@@ -50,14 +50,14 @@
              <fileset dir="${plugin.dir}" includes="**/*.java"/>
          </gettext-extract>
      </target>
 -    <target name="build" depends="po/josm.pot,init">
+-        <gettext-merge keysFile="josm.pot" poDirectory="po"/>
 +  <target name="build.check">
 +    <condition property="build.run">
 +      <not><available file="build-timestamp"/></not>
 +    </condition>
 +  </target>
-+    <target name="build" depends="build.check,po/josm.pot,init" if="build.run">
-         <gettext-merge keysFile="josm.pot" poDirectory="po"/>
++    <target name="build" depends="build.check,init" if="build.run">
          <antcall target="coretrans"/>
-         <foreach param="path" target="plugintrans">
-@@ -58,6 +63,7 @@
-                 <dirset dir="${plugin.dir}" includes="*"/>
-             </path>
-         </foreach>
+-        <foreach param="path" target="plugintrans">
+-            <path>
+-                <dirset dir="${plugin.dir}" includes="*"/>
+-            </path>
+-        </foreach>
 +     <touch file="build-timestamp"/>
      </target>
      <target name="coretrans">
          <mkdir dir="${po.build.dir}/core"/>
-@@ -93,11 +99,17 @@
+@@ -93,11 +93,17 @@
              </then>
          </if>
      </target>
@@ -153,6 +167,6 @@ Index: josm/i18n/build.xml
          <delete>
              <fileset dir="po" includes="*.*~" defaultexcludes="false"/>
          </delete>
-+    <delete file="build-timestamp"/>
++        <delete file="build-timestamp"/>
      </target>
  </project>

-- 
Editor for OpenStreetMap