[Pkg-osm-commits] [SCM] josm branch, master, updated. debian/0.0.svn4064-3-13-g6ea3c2e
Giovanni Mascellani
mascellani at poisson.phc.unipi.it
Sat Aug 13 21:43:47 UTC 2011
The following commit has been merged in the master branch:
commit 5e598157bdd840ed472fa71cf7e6794b517ea1be
Author: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
Date: Mon Aug 8 11:35:36 2011 +0200
Write correct classpath in generated JAR.
diff --git a/debian/josm.sh b/debian/josm.sh
index 7790fd2..9bfe5f6 100644
--- a/debian/josm.sh
+++ b/debian/josm.sh
@@ -13,6 +13,7 @@ else
JAVA_CMDS="$JAVA_HOME/bin/java /usr/lib/jvm/java-6-sun/bin/java"
fi
+export CLASSPATH="/usr/share/java/gettext-commons.jar:/usr/share/java/metadata-extractor.jar:/usr/share/java/svgSalamander.jar:/usr/share/java/gdata-core.jara:/usr/share/java/signpost-core.jar:/usr/share/java/ant.jar"
JAVA_OPTS="$JAVA_OPTS -Djava.net.preferIPv4Stack=true -Djava.net.useSystemProxies=true"
for jcmd in $JAVA_CMDS; do
diff --git a/debian/patches/10-build.patch b/debian/patches/10-build.patch
index aa34be0..8a4cbdb 100644
--- a/debian/patches/10-build.patch
+++ b/debian/patches/10-build.patch
@@ -13,9 +13,17 @@ JARs and not depend on Internet connection.
Index: josm/build.xml
===================================================================
---- josm.orig/build.xml 2011-08-08 00:29:12.000000000 +0200
-+++ josm/build.xml 2011-08-08 00:44:11.000000000 +0200
-@@ -23,8 +23,13 @@
+--- josm.orig/build.xml 2011-08-08 12:50:14.000000000 +0200
++++ josm/build.xml 2011-08-08 12:52:01.000000000 +0200
+@@ -15,6 +15,7 @@
+ <property name="build.dir" location="build"/>
+ <property name="javacc.home" location="tools"/>
+ <property name="mapcss.dir" location="${src.dir}/org/openstreetmap/josm/gui/mappaint/mapcss"/>
++ <property name="antcontrib.jar" value="/usr/share/java/ant-contrib.jar"/>
+ <!-- build parameter: compression level (ant -Dclevel=N)
+ N ranges from 0 (no compression) to 9 (maximum compression)
+ default: 9 -->
+@@ -23,10 +24,16 @@
</condition>
<!-- Java classpath addition (all jar files to compile tests with this) -->
<path id="classpath">
@@ -30,8 +38,11 @@ Index: josm/build.xml
+ <include name="ant.jar"/>
</fileset>
</path>
++ <property name="classpathprop-colon" refid="classpath"/>
-@@ -41,14 +46,7 @@
+ <!--
+ ** Used by Eclipse ant builder for updating
+@@ -41,14 +48,7 @@
-->
<target name="create-revision">
<property name="revision.dir" value="${build.dir}"/>
@@ -47,7 +58,7 @@ Index: josm/build.xml
<tstamp>
<format property="build.tstamp" pattern="yyyy-MM-dd HH:mm:ss"/>
</tstamp>
-@@ -59,31 +57,29 @@
+@@ -59,31 +59,31 @@
Revision: ${version.entry.commit.revision}
Is-Local-Build: true
Build-Date: ${build.tstamp}
@@ -74,6 +85,8 @@ Index: josm/build.xml
+
<!-- create josm-custom.jar -->
- <delete file="dist/josm-custom.jar"/>
++ <propertyregex property="classpathprop" input="${classpathprop-colon}" global="true"
++ regexp=":" replace=" "/>
<jar destfile="dist/josm-custom.jar" basedir="build" level="${clevel}">
<!-- add attribute excludes="**/*BZip2*,**/*Bzip2*" to create a non-bzip2 supporting jar -->
<manifest>
@@ -81,11 +94,11 @@ Index: josm/build.xml
<attribute name="Main-Version" value="${version.entry.commit.revision} SVN"/>
<attribute name="Main-Date" value="${version.entry.commit.date}"/>
+ <attribute name="Debian-Release" value="${debian.version}"/>
-+ <attribute name="Class-Path" value="${classpath}"/>
++ <attribute name="Class-Path" value="${classpathprop}"/>
</manifest>
<zipfileset dir="images" prefix="images"/>
<zipfileset dir="data" prefix="data"/>
-@@ -109,21 +105,18 @@
+@@ -109,30 +109,29 @@
</target>
<target name="javacc">
<mkdir dir="${mapcss.dir}/parsergen"/>
@@ -110,7 +123,10 @@ Index: josm/build.xml
</target>
<target name="init">
<mkdir dir="build"/>
-@@ -133,6 +126,7 @@
+ <mkdir dir="dist"/>
++ <taskdef resource="net/sf/antcontrib/antcontrib.properties" classpath="${antcontrib.jar}"/>
+ </target>
+ <target name="clean">
<delete dir="build"/>
<delete dir="dist"/>
<delete dir="${mapcss.dir}/parsergen"/>
@@ -120,8 +136,8 @@ Index: josm/build.xml
<fileset dir="${test.dir}/lib">
Index: josm/i18n/build.xml
===================================================================
---- josm.orig/i18n/build.xml 2011-08-08 00:29:12.000000000 +0200
-+++ josm/i18n/build.xml 2011-08-08 00:43:45.000000000 +0200
+--- josm.orig/i18n/build.xml 2011-08-08 12:50:14.000000000 +0200
++++ josm/i18n/build.xml 2011-08-08 12:51:03.000000000 +0200
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<project name="JOSM i18n" default="build" basedir=".">
diff --git a/debian/patches/90-fix_version.patch b/debian/patches/90-fix_version.patch
index 0e48d98..d4b5de0 100644
--- a/debian/patches/90-fix_version.patch
+++ b/debian/patches/90-fix_version.patch
@@ -10,9 +10,9 @@ Forwarded: not-needed
Index: josm/build.xml
===================================================================
---- josm.orig/build.xml 2011-08-08 00:25:06.000000000 +0200
-+++ josm/build.xml 2011-08-08 00:25:06.000000000 +0200
-@@ -76,7 +76,7 @@
+--- josm.orig/build.xml 2011-08-08 12:50:06.000000000 +0200
++++ josm/build.xml 2011-08-08 12:50:06.000000000 +0200
+@@ -80,7 +80,7 @@
<!-- add attribute excludes="**/*BZip2*,**/*Bzip2*" to create a non-bzip2 supporting jar -->
<manifest>
<attribute name="Main-class" value="JOSM"/>
@@ -20,11 +20,11 @@ Index: josm/build.xml
+ <attribute name="Main-Version" value="${version.entry.commit.revision}"/>
<attribute name="Main-Date" value="${version.entry.commit.date}"/>
<attribute name="Debian-Release" value="${debian.version}"/>
- <attribute name="Class-Path" value="${classpath}"/>
+ <attribute name="Class-Path" value="${classpathprop}"/>
Index: josm/src/org/openstreetmap/josm/data/Version.java
===================================================================
---- josm.orig/src/org/openstreetmap/josm/data/Version.java 2011-08-08 00:25:06.000000000 +0200
-+++ josm/src/org/openstreetmap/josm/data/Version.java 2011-08-08 00:25:06.000000000 +0200
+--- josm.orig/src/org/openstreetmap/josm/data/Version.java 2011-08-08 12:50:06.000000000 +0200
++++ josm/src/org/openstreetmap/josm/data/Version.java 2011-08-08 12:50:06.000000000 +0200
@@ -205,9 +205,6 @@
public String getAgentString() {
int v = getVersion();
--
Editor for OpenStreetMap
More information about the Pkg-osm-commits
mailing list