[josm] 09/28: Add classpath to additional build targets.

[Sebastiaan Couwenberg]

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

sebastic pushed a commit to branch master
in repository josm.

commit 123452697493729755c9d02f0367132421ab328b
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Oct 9 13:59:58 2015 +0200

    Add classpath to additional build targets.
---
 debian/patches/00-build.patch | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/debian/patches/00-build.patch b/debian/patches/00-build.patch
index 028c44e..da6aa80 100644
--- a/debian/patches/00-build.patch
+++ b/debian/patches/00-build.patch
@@ -96,7 +96,12 @@ JARs and not depend on Internet connection.
              <arg value="-DEBUG_PARSER=false"/>
              <arg value="-DEBUG_TOKEN_MANAGER=false"/>
              <arg value="-JDK_VERSION=1.7"/>
-@@ -208,27 +223,15 @@ Build-Date: ${build.tstamp}
+@@ -204,31 +219,19 @@ Build-Date: ${build.tstamp}
+     </target>
+     <target name="compile" depends="init,javacc">
+         <!-- COTS -->
+-        <javac srcdir="${src.dir}" includes="com/**,oauth/**,org/apache/commons/**,org/glassfish/**" nowarn="on" encoding="iso-8859-1"
++        <javac srcdir="${src.dir}" classpathref="classpath" includes="com/**,oauth/**,org/apache/commons/**,org/glassfish/**" nowarn="on" encoding="iso-8859-1"
              destdir="build" target="1.7" source="1.7" debug="on" includeAntRuntime="false" createMissingPackageInfoClass="false">
              <!-- get rid of "internal proprietary API" warning -->
              <compilerarg value="-XDignore.symbol.file"/>
@@ -127,6 +132,15 @@ JARs and not depend on Internet connection.
              destdir="build" target="1.7" source="1.7" debug="on" includeantruntime="false" createMissingPackageInfoClass="false" encoding="UTF-8">
              <compilerarg value="-Xlint:cast"/>
              <compilerarg value="-Xlint:deprecation"/>
+@@ -245,7 +248,7 @@ Build-Date: ${build.tstamp}
+             <compilerarg value="-XDignore.symbol.file"/>
+         </javac>
+         <!-- JOSM -->
+-        <javac sourcepath="" srcdir="${src.dir}" excludes="com/**,oauth/**,org/apache/commons/**,org/glassfish/**,org/openstreetmap/gui/jmapviewer/Demo.java" 
++        <javac sourcepath="" srcdir="${src.dir}" classpathref="classpath" excludes="com/**,oauth/**,org/apache/commons/**,org/glassfish/**,org/openstreetmap/gui/jmapviewer/Demo.java" 
+             destdir="build" target="1.7" source="1.7" debug="on" includeantruntime="false" createMissingPackageInfoClass="false" encoding="UTF-8">
+             <compilerarg value="-Xlint:cast"/>
+             <compilerarg value="-Xlint:deprecation"/>
 @@ -272,6 +275,7 @@ Build-Date: ${build.tstamp}
          </uptodate>
          <mkdir dir="build"/>

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