summaryrefslogtreecommitdiff
path: root/eclass
diff options
context:
space:
mode:
authorAlistair Bush <ali_bush@gentoo.org>2008-04-15 05:23:24 +0000
committerAlistair Bush <ali_bush@gentoo.org>2008-04-15 05:23:24 +0000
commitd11a92abad55000b2e61a5a49dd6628c020e8df8 (patch)
treea391e2ebcf9ed0836873b598b35f37525e99c8c5 /eclass
parentStable on ppc64 (diff)
downloadhistorical-d11a92abad55000b2e61a5a49dd6628c020e8df8.tar.gz
historical-d11a92abad55000b2e61a5a49dd6628c020e8df8.tar.bz2
historical-d11a92abad55000b2e61a5a49dd6628c020e8df8.zip
Updating java-ant-2.eclass to support relocation of javatoolkit
Diffstat (limited to 'eclass')
-rw-r--r--eclass/java-ant-2.eclass32
1 files changed, 20 insertions, 12 deletions
diff --git a/eclass/java-ant-2.eclass b/eclass/java-ant-2.eclass
index 079f9e972180..6541bf5d00dd 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.30 2008/03/05 19:30:29 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/java-ant-2.eclass,v 1.31 2008/04/15 05:23:24 ali_bush Exp $
inherit java-utils-2
@@ -240,29 +240,33 @@ java-ant_bsfix_files() {
# for javadoc target and all in one pass, we need the new rewriter.
local rewriter3="/usr/share/javatoolkit/xml-rewrite-3.py"
+ # xml-rewrite will be moving.
+ if [[ ! -f ${rewriter3} ]]; then
+ rewriter3="/usr/$(get_libdir)/javatoolkit/bin/xml-rewrite-3.py"
+ fi
+
if [[ ! -f ${rewriter3} ]]; then
debug-print "Using second generation rewriter"
eval echo "Rewriting source attributes" ${output}
- eval xml-rewrite-2.py ${files} \
+ java-ant_xml-rewrite ${files} \
-c -e ${JAVA_PKG_BSFIX_SOURCE_TAGS// / -e } \
- -a source -v ${want_source} ${output} || _bsfix_die "xml-rewrite2 failed: ${file}"
+ -a source -v ${want_source} ${output}
eval echo "Rewriting target attributes" ${output}
- eval xml-rewrite-2.py ${files} \
+ java-ant_xml-rewrite ${files} \
-c -e ${JAVA_PKG_BSFIX_TARGET_TAGS// / -e } \
- -a target -v ${want_target} ${output} || _bsfix_die "xml-rewrite2 failed: ${file}"
+ -a target -v ${want_target} ${output}
eval echo "Rewriting nowarn attributes" ${output}
- eval xml-rewrite-2.py ${files} \
+ java-ant_xml-rewrite ${files} \
-c -e ${JAVA_PKG_BSFIX_TARGET_TAGS// / -e } \
- -a nowarn -v yes ${output} || _bsfix_die "xml-rewrite2 failed: ${file}"
+ -a nowarn -v yes ${output}
if [[ ${JAVA_ANT_REWRITE_CLASSPATH} ]]; then
eval echo "Adding gentoo.classpath to javac tasks" ${output}
- eval xml-rewrite-2.py ${files} \
+ java-ant_xml-rewrite ${files} \
-c -e javac -e xjavac -a classpath -v \
- '\${gentoo.classpath}' \
- || _bsfix_die "xml-rewrite2 failed"
+ '\${gentoo.classpath}'
fi
else
debug-print "Using third generation rewriter"
@@ -399,10 +403,14 @@ java-ant_ignore-system-classes() {
# Run the right xml-rewrite binary with the given arguments
# ------------------------------------------------------------------------------
java-ant_xml-rewrite() {
- local gen2="/usr/bin/xml-rewrite-2.py"
# gen1 is deprecated
+ local gen2="/usr/bin/xml-rewrite-2.py"
+ #gen2 xml-rewrite will be moving.
+ if [[ ! -x "${gen2}" ]]; then
+ gen2="/usr/$(get_libdir)/javatoolkit/bin/xml-rewrite-2.py"
+ fi
if [[ -x "${gen2}" ]]; then
- ${gen2} "${@}" || die "${gen2} failed"
+ ${gen2} "${@}" || _bsfix_die "xml-rewrite2 failed : ${@}"
else
eerror "No binary for rewriting found."
eerror "Do you have dev-java/javatoolkit installed?"