[java-wrappers] 39/61: [java-wrappers] Now correctly following relative paths from the Class-Path attribute

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository java-wrappers.

commit de2154e74bc0e3061dd112e7639e473e64e77a5f
Author: Vincent Fourmond <fourmond at debian.org>
Date:   Tue Apr 5 23:58:10 2011 +0000

    [java-wrappers] Now correctly following relative paths from the Class-Path attribute
---
 debian/changelog | 7 +++++++
 java-wrappers.sh | 7 ++++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index cd284a5..af48f2a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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
diff --git a/java-wrappers.sh b/java-wrappers.sh
index 0ae6957..adcf126 100644
--- a/java-wrappers.sh
+++ b/java-wrappers.sh
@@ -229,10 +229,11 @@ _recurse_jar_classpath() {
 	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"

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