[josm-plugins] 07/369: Added support for plugins namefinder and lang-*

Bas Couwenberg sebastic at xs4all.nl
Sat Oct 18 12:03:19 UTC 2014


This is an automated email from the git hooks/post-receive script.

sebastic-guest pushed a commit to branch master
in repository josm-plugins.

commit 82c17d4a7c97f1534822eafd57646e8d4346aca8
Author: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
Date:   Mon Mar 24 17:30:02 2008 +0000

    Added support for plugins namefinder and lang-*
---
 debian/control                      |  2 +-
 debian/patches/00list               |  2 +
 debian/patches/10_build.dpatch      | 10 ++--
 debian/patches/60_lang.dpatch       | 94 +++++++++++++++++++++++++++++++++++++
 debian/patches/70_namefinder.dpatch | 74 +++++++++++++++++++++++++++++
 5 files changed, 176 insertions(+), 6 deletions(-)

diff --git a/debian/control b/debian/control
index 3dd9940..0d45123 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: contrib/utils
 Priority: extra
 Maintainer: Debian GIS Project <pkg-grass-devel at lists.alioth.debian.org>
 Uploaders: Giovanni Mascellani <g.mascellani at gmail.com>
-Build-Depends: debhelper (>= 5), cdbs, dpatch, josm
+Build-Depends: debhelper (>= 5), cdbs, dpatch, josm, gettext, libgettext-commons-java
 Standards-Version: 3.7.3
 Homepage: http://josm.openstreetmap.de
 
diff --git a/debian/patches/00list b/debian/patches/00list
index 8a60326..60883a4 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -3,3 +3,5 @@
 30_utilsplugin
 40_wmsplugin
 50_livegps
+60_lang
+70_namefinder
diff --git a/debian/patches/10_build.dpatch b/debian/patches/10_build.dpatch
index 5e7e39a..11b4860 100755
--- a/debian/patches/10_build.dpatch
+++ b/debian/patches/10_build.dpatch
@@ -5,8 +5,8 @@
 
 @DPATCH@
 diff -urNad josm-plugins-0.0.0.20080320~/build.xml josm-plugins-0.0.0.20080320/build.xml
---- josm-plugins-0.0.0.20080320~/build.xml	2008-03-20 21:44:46.000000000 +0100
-+++ josm-plugins-0.0.0.20080320/build.xml	2008-03-20 21:45:08.000000000 +0100
+--- josm-plugins-0.0.0.20080320~/build.xml	2008-03-22 14:24:19.000000000 +0100
++++ josm-plugins-0.0.0.20080320/build.xml	2008-03-23 11:19:06.000000000 +0100
 @@ -1,43 +1,49 @@
  <project name="josm-plugins" default="build" basedir=".">
  
@@ -31,14 +31,14 @@ diff -urNad josm-plugins-0.0.0.20080320~/build.xml josm-plugins-0.0.0.20080320/b
 -    <mkdir dir="../dist"/>
 -    <ant	dir="colorscheme"	antfile="build.xml"	target="dist"/>
 -    <!--ant	dir="duplicateway"	antfile="build.xml"	target="dist"/ code still uses API 0.4 -->
--    <ant	dir="lang"		antfile="build.xml"	target="dist"/>
 +  <target name="dist">
 +    <mkdir dir="${plugin.dist.dir}"/>
 +    <!-- <ant	dir="colorscheme"	antfile="build.xml"	target="dist"/> -->
 +    <!-- <ant	dir="duplicateway"	antfile="build.xml"	target="dist"/ code still uses API 0.4 -->
-+    <!-- <ant	dir="lang"		antfile="build.xml"	target="dist"/>
+     <ant	dir="lang"		antfile="build.xml"	target="dist"/>
      <ant	dir="namefinder"	antfile="build.xml"	target="dist"/>
-     <ant	dir="nearclick"		antfile="build.xml"	target="dist"/>
+-    <ant	dir="nearclick"		antfile="build.xml"	target="dist"/>
++    <!-- <ant	dir="nearclick"		antfile="build.xml"	target="dist"/>
      <ant	dir="openvisible"	antfile="build.xml"	target="dist"/>
      <ant	dir="osmarender"	antfile="build.xml"	target="dist"/>
      <ant	dir="plastic_laf"	antfile="build.xml"	target="dist"/>
diff --git a/debian/patches/60_lang.dpatch b/debian/patches/60_lang.dpatch
new file mode 100755
index 0000000..d378bf5
--- /dev/null
+++ b/debian/patches/60_lang.dpatch
@@ -0,0 +1,94 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 60_lang.dpatch by  <g.mascellani at gmail.com>
+##
+## DP: Patch for plugins lang-*
+
+ at DPATCH@
+diff -urNad josm-plugins-0.0.0.20080320~/lang/build.xml josm-plugins-0.0.0.20080320/lang/build.xml
+--- josm-plugins-0.0.0.20080320~/lang/build.xml	2008-03-22 14:08:40.000000000 +0100
++++ josm-plugins-0.0.0.20080320/lang/build.xml	2008-03-22 14:19:27.000000000 +0100
+@@ -1,20 +1,22 @@
+ <project name="lang" default="install-all" basedir=".">
+ 
+   <!-- compilation properties -->
++<!-- Not used in Debian
+   <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"/>
++<!--  <property name="plugin.jar"		value="${plugin.dist.dir}/${plugin.name}.jar"/>-->
+   
+   <property name="ant.build.javac.target" value="1.5"/>
+ 
+   <target name="dist" depends="install-all">
+   </target>
+   
+-  <target name="install-all" depends="josm-build,keys.pot">
++  <target name="install-all">
+     <ant target="install"><property name="language" value="de"/></ant>
+     <ant target="install"><property name="language" value="fr"/></ant>
+     <ant target="install"><property name="language" value="ro"/></ant>
+@@ -23,8 +25,14 @@
+ 
+   <target name="install">
+     <mkdir dir="${language}/build"/>
+-    <mkdir dir="../../dist"/>
+-    <javac srcdir="${language}/src" classpath="${josm.build.dir}/dist/josm-custom.jar" destdir="${language}/build" />
++<!--    <mkdir dir="../../dist"/>-->
++
++    <javac srcdir="${language}/src" destdir="${language}/build">
++      <classpath>
++        <pathelement path="${josm}" />
++        <pathelement path="/usr/share/java/gettext-commons.jar" />
++      </classpath>
++    </javac>
+ 
+     <exec executable="msgmerge">
+       <arg line="-U ${language}/${language}.po keys.pot"/>
+@@ -36,7 +44,7 @@
+ 
+     <copy file="i18n.properties" todir="${language}/build/org/openstreetmap/josm" />
+ 
+-    <jar destfile="../../dist/lang-${language}.jar" basedir="${language}/build">
++    <jar destfile="${plugin.dist.dir}/lang-${language}.jar" basedir="${language}/build">
+       <manifest>
+ 	<attribute name="Plugin-Class" value="org.openstreetmap.josm.TranslationLoader_${language}" />
+ 	<attribute name="Plugin-Description" value="Translation to locale ${language}" />
+@@ -46,7 +54,7 @@
+   </target>
+ 
+ 
+-
++<!-- Not used in Debian
+   <target name="josm-build">
+     <ant dir="${josm.build.dir}" />
+   </target>
+@@ -57,20 +65,21 @@
+     </exec>
+ 
+     <exec executable="xgettext">
+-      <arg line="-ktr -ktrn:1,2 -ktrc -kmarktr -Ljava --from-code=UTF-8 -okeys.pot -falljava.txt"/>
++      <arg line="-ktr -ktrn:1,2 -ktrc -kmarktr -Ljava -from-code=UTF-8 -okeys.pot -falljava.txt"/>	Add another -
+     </exec>
+   </target>
++-->
+ 
+   <target name="clean">
+     <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}" />
++<!--    <delete dir="${plugin.build.dir}" />-->
+   </target>
+ 
+   <target name="clean_lang">
+-    <delete file="../../dist/lang-${language}.jar" />
++    <delete file="${plugin.dist.dir}/lang-${language}.jar" />
+     <delete dir="${language}/build"/>
+   </target>
+ 
diff --git a/debian/patches/70_namefinder.dpatch b/debian/patches/70_namefinder.dpatch
new file mode 100755
index 0000000..7284170
--- /dev/null
+++ b/debian/patches/70_namefinder.dpatch
@@ -0,0 +1,74 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 70_namefinder.dpatch by  <g.mascellani at gmail.com>
+##
+## DP: Patch for plugin namefinder
+
+ at DPATCH@
+diff -urNad josm-plugins-0.0.0.20080320~/namefinder/build.xml josm-plugins-0.0.0.20080320/namefinder/build.xml
+--- josm-plugins-0.0.0.20080320~/namefinder/build.xml	2007-12-19 19:09:31.000000000 +0100
++++ josm-plugins-0.0.0.20080320/namefinder/build.xml	2008-03-23 11:18:18.000000000 +0100
+@@ -1,30 +1,33 @@
+ <project name="namefinder" default="dist" basedir=".">
+ 
+   <!-- compilation properties -->
++<!-- Not used in Debian
+   <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"/>
++  <property name="plugin.jar"		value="${plugin.dist.dir}/${plugin.name}.jar"/>
+ 
+   <property name="ant.build.javac.target" value="1.5"/>
+   
+   <!-- init target -->
+   <target name="init">
+-    <mkdir dir="${plugin.build.dir}" />
++    <mkdir dir="build" />
+   </target>
+   
+   <!-- clean target -->
+   <target name="clean">
+-    <delete dir="${plugin.build.dir}" />
++    <delete dir="build" />
+     <delete file="${plugin.jar}" />
+   </target>
+   
+   <!-- compile target -->
+   <target name="compile" depends="init">
+-    <javac srcdir="namefinder" destdir="${plugin.build.dir}" debug="true" source="1.5" target="1.5">
++    <javac srcdir="namefinder" destdir="build" debug="true" source="1.5" target="1.5" classpath="${josm}">
++<!-- Not used in Debian
+       <classpath>
+         <pathelement path="${josm.build.dir}/build"/>
+         <pathelement path="${josm.build.dir}/src"/>
+@@ -32,12 +35,13 @@
+           <include name="**/*.jar"/>
+         </fileset>
+       </classpath>
++-->
+     </javac>
+   </target>
+   
+   <!-- dist target - create jar file -->
+   <target name="dist" depends="compile">
+-    <jar destfile="${plugin.jar}" basedir="${plugin.build.dir}">
++    <jar destfile="${plugin.jar}" basedir="build">
+       <manifest>
+         <attribute name="Plugin-Class" value="namefinder.NameFinderPlugin" />
+         <attribute name="Plugin-Description" value="Allows selection of download areas by name, using an external service" />
+@@ -47,9 +51,11 @@
+   </target>
+   
+   <!-- install target - copy jar file to plugin destination -->
++<!-- Not used in Debian
+   <target name="install" depends="dist">
+     <copy file="../../dist/${ant.project.name}.jar" todir="${josm.home.dir}/plugins" />
+   </target>
++-->
+   
+ </project>
+ 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/josm-plugins.git



More information about the Pkg-grass-devel mailing list