summaryrefslogtreecommitdiff
path: root/eclass
diff options
context:
space:
mode:
authorPetteri Räty <betelgeuse@gentoo.org>2008-01-22 21:57:03 +0000
committerPetteri Räty <betelgeuse@gentoo.org>2008-01-22 21:57:03 +0000
commit8bf2543ae794446864e72c5e36ed1b3227a905a3 (patch)
tree8608f60b49e6ffcbba9f618728c9f81a0a132b24 /eclass
parentRemove old version. (diff)
downloadhistorical-8bf2543ae794446864e72c5e36ed1b3227a905a3.tar.gz
historical-8bf2543ae794446864e72c5e36ed1b3227a905a3.tar.bz2
historical-8bf2543ae794446864e72c5e36ed1b3227a905a3.zip
Add JAVA_ANT_REWRITE_CLASSPATH support when using generation 2 rewrite. Fixes bug #207084.
Diffstat (limited to 'eclass')
-rw-r--r--eclass/java-ant-2.eclass10
1 files changed, 9 insertions, 1 deletions
diff --git a/eclass/java-ant-2.eclass b/eclass/java-ant-2.eclass
index b4b845eddec5..9c0071f1ea1d 100644
--- a/eclass/java-ant-2.eclass
+++ b/eclass/java-ant-2.eclass
@@ -14,7 +14,7 @@
#
# Licensed under the GNU General Public License, v2
#
-# $Header: /var/cvsroot/gentoo-x86/eclass/java-ant-2.eclass,v 1.25 2008/01/12 15:08:47 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/java-ant-2.eclass,v 1.26 2008/01/22 21:57:03 betelgeuse Exp $
inherit java-utils-2
@@ -262,6 +262,14 @@ java-ant_bsfix_files() {
eval xml-rewrite-2.py ${files} \
-c -e ${JAVA_PKG_BSFIX_TARGET_TAGS// / -e } \
-a nowarn -v yes ${output} || _bsfix_die "xml-rewrite2 failed: ${file}"
+
+ if [[ ${JAVA_ANT_REWRITE_CLASSPATH} ]]; then
+ eval echo "Adding gentoo.classpath to javac tasks"
+ eval xml-rewrite-2.py ${files} \
+ -c -e javac -e xjavac -a classpath -v \
+ '\${gentoo.classpath}' \
+ || _bsfix_die "xml-rewrite2 failed"
+ fi
else
debug-print "Using third generation rewriter"
eval echo "Rewriting attributes" ${output}