[Build-common-hackers] Bug#232874: cdbs: [PATCH] support libant1.6-java

[Takashi Okamoto]

----Next_Part(Mon_Feb_16_00_32_13_2004_586)--
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit

Package: cdbs
Version: 0.4.17
Severity: normal

libant1.6-java with current cdbs doesn't work. Classpath should be
configured for all jar files in /usr/share/ant1.6/lib. 
I attached patch to fix this problem. Please take it.

regards,

Takashi Okamoto


-- System Information:
Debian Release: testing/unstable
Architecture: i386
Kernel: Linux violin 2.6.0-1-686 #2 Sun Jan 11 16:59:17 EST 2004 i686
Locale: LANG=ja_JP.eucJP, LC_CTYPE=ja_JP.eucJP

-- no debconf information

----Next_Part(Mon_Feb_16_00_32_13_2004_586)--
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Content-Disposition: inline; filename="ant-vars.mk.patch"

--- ant-vars.mk.orig	2004-02-15 17:15:57.000000000 +0900
+++ ant-vars.mk	2004-02-15 17:21:26.000000000 +0900
@@ -43,11 +43,15 @@
 # end of the class path if it exists in the JDK's lib directory.
 # You can override the complete class path using DEB_CLASSPATH.
 DEB_JARS_BASE := /usr/share/java
-DEB_CLASSPATH = $(ANT_HOME)/lib/ant.jar:$(shell for jar in $(DEB_JARS); do \
-		if [ -f "$$jar" ]; then echo -n "$${jar}:"; fi; \
-		if [ -f "$$jar".jar ]; then echo -n "$${jar}.jar:"; fi; \
-		if [ -f $(DEB_JARS_BASE)/"$$jar" ]; then echo -n "$(DEB_JARS_BASE)/$${jar}:"; fi; \
-		if [ -f $(DEB_JARS_BASE)/"$$jar".jar ]; then echo -n "$(DEB_JARS_BASE)/$${jar}.jar:"; fi; \
+DEB_CLASSPATH = $(shell \
+		for jar in $(ANT_HOME)/lib/*.jar; do \
+			if [ -f "$$jar" ]; then echo -n "$${jar}:"; fi; \
+		done; \
+		for jar in $(DEB_JARS); do \
+			if [ -f "$$jar" ]; then echo -n "$${jar}:"; fi; \
+			if [ -f "$$jar".jar ]; then echo -n "$${jar}.jar:"; fi; \
+			if [ -f $(DEB_JARS_BASE)/"$$jar" ]; then echo -n "$(DEB_JARS_BASE)/$${jar}:"; fi; \
+			if [ -f $(DEB_JARS_BASE)/"$$jar".jar ]; then echo -n "$(DEB_JARS_BASE)/$${jar}.jar:"; fi; \
 		done; \
 		if [ -f "$(JAVA_HOME)/lib/tools.jar" ]; then echo -n "$(JAVA_HOME)/lib/tools.jar"; fi)
 

----Next_Part(Mon_Feb_16_00_32_13_2004_586)----