diff options
| author |   Petteri Räty <betelgeuse@gentoo.org> | 2008-01-22 21:57:03 +0000 |
|---|---|---|
| committer | Petteri Räty <betelgeuse@gentoo.org> | 2008-01-22 21:57:03 +0000 |
| commit | 69496b4d4edb228e633cbac6e080719cd4962eba (patch) | |
| tree | f402ddf2d01b6e891388894af7f5bb81a3fc8cb0 /eclass | |
| parent | Remove old version. (diff) | |
| download | gentoo-2-69496b4d4edb228e633cbac6e080719cd4962eba.tar.gz gentoo-2-69496b4d4edb228e633cbac6e080719cd4962eba.tar.bz2 gentoo-2-69496b4d4edb228e633cbac6e080719cd4962eba.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.eclass | 10 |
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} |