[pkg-java] r13509 - in trunk/java-wrappers: . debian

[Vincent Fourmond]

Author: fourmond
Date: 2011-04-05 23:58:10 +0000 (Tue, 05 Apr 2011)
New Revision: 13509

Modified:
   trunk/java-wrappers/debian/changelog
   trunk/java-wrappers/java-wrappers.sh
Log:
[java-wrappers] Now correctly following relative paths from the Class-Path attribute

Modified: trunk/java-wrappers/debian/changelog
===================================================================
--- trunk/java-wrappers/debian/changelog	2011-04-05 03:50:37 UTC (rev 13508)
+++ trunk/java-wrappers/debian/changelog	2011-04-05 23:58:10 UTC (rev 13509)
@@ -1,3 +1,10 @@
+java-wrappers (0.1.22) experimental; urgency=low
+
+  * NOT RELEASABLE YET
+  * Now correctly following relative links from classpaths.
+
+ -- Vincent Fourmond <fourmond at debian.org>  Wed, 06 Apr 2011 01:56:41 +0200
+
 java-wrappers (0.1.21) experimental; urgency=low
 
   * Final form of the find_jar_classpath function that now only performs

Modified: trunk/java-wrappers/java-wrappers.sh
===================================================================
--- trunk/java-wrappers/java-wrappers.sh	2011-04-05 03:50:37 UTC (rev 13508)
+++ trunk/java-wrappers/java-wrappers.sh	2011-04-05 23:58:10 UTC (rev 13509)
@@ -229,10 +229,11 @@
 	java_debug "Looking at classpath of jar: '$1'"
 	for jar in $(/usr/lib/java-wrappers/get-classpath "$1"); do
 	    if [ "${jar##/}" = "$jar" ]; then
-		java_warning "jar file $1 contains relative classpath element: $jar"
-	    else
-		_recurse_jar_classpath $jar;
+		# Relative path = path relative to the location of the
+		# JAR file !
+		jar=$(dirname $1)/$jar
 	    fi
+	    _recurse_jar_classpath $jar;
 	done
     else
 	java_debug "Unable to find file $1 that may be needed"