diff options
| author |   Alistair Bush <ali_bush@gentoo.org> | 2008-06-18 10:27:22 +0000 |
|---|---|---|
| committer | Alistair Bush <ali_bush@gentoo.org> | 2008-06-18 10:27:22 +0000 |
| commit | c80989ec1f9bae2a7a517c411f7a93bb05706cb8 (patch) | |
| tree | 5d4dd80a1a44a52fe54328e256bdd76a7d278005 /eclass | |
| parent | Version bumps #228015. (diff) | |
| download | gentoo-2-c80989ec1f9bae2a7a517c411f7a93bb05706cb8.tar.gz gentoo-2-c80989ec1f9bae2a7a517c411f7a93bb05706cb8.tar.bz2 gentoo-2-c80989ec1f9bae2a7a517c411f7a93bb05706cb8.zip | |
Prepare eclasses to support javatoolkit move.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/java-ant-2.eclass | 10 | ||||
| -rw-r--r-- | eclass/java-utils-2.eclass | 20 |
2 files changed, 26 insertions, 4 deletions
diff --git a/eclass/java-ant-2.eclass b/eclass/java-ant-2.eclass index d76321dd90c9..2befd7002547 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.32 2008/04/15 09:33:36 ali_bush Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/java-ant-2.eclass,v 1.33 2008/06/18 10:27:22 ali_bush Exp $ inherit java-utils-2 @@ -240,6 +240,11 @@ 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" + + 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} @@ -400,9 +405,12 @@ java-ant_ignore-system-classes() { # ------------------------------------------------------------------------------ java-ant_xml-rewrite() { local gen2="/usr/bin/xml-rewrite-2.py" + local gen2_1="/usr/$(get_libdir)/javatoolkit/bin/xml-rewrite-2.py" # gen1 is deprecated if [[ -x "${gen2}" ]]; then ${gen2} "${@}" || die "${gen2} failed" + elif [[ "${gen2_1}" ]]; then + ${gen2} "${@}" || die "${gen2_1} failed" else eerror "No binary for rewriting found." eerror "Do you have dev-java/javatoolkit installed?" diff --git a/eclass/java-utils-2.eclass b/eclass/java-utils-2.eclass index ddbf035bfe03..2382ecd6f85d 100644 --- a/eclass/java-utils-2.eclass +++ b/eclass/java-utils-2.eclass @@ -6,7 +6,7 @@ # # Licensed under the GNU General Public License, v2 # -# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.107 2008/05/03 21:28:45 betelgeuse Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.108 2008/06/18 10:27:22 ali_bush Exp $ # ----------------------------------------------------------------------------- # @eclass-begin @@ -2578,15 +2578,29 @@ java-pkg_jar-list() { # ------------------------------------------------------------------------------ java-pkg_verify-classes() { #$(find ${D} -type f -name '*.jar' -o -name '*.class') + + local version_verify="/usr/bin/class-version-verify.py" + + if [[ ! -x "${version_verify}" ]]; then + version_verify="/usr/$(get_libdir)/javatoolkit/bin/class-version-verify.py" + fi + + if [[ ! -x "${version_verify}" ]]; then + ewarn "Unable to perform class version checks as" + ewarn "class-version-verify.py is unavailable" + ewarn "Please install dev-java/javatoolkit." + return + fi + local target=$(java-pkg_get-target) local result local log="${T}/class-version-verify.log" if [[ -n "${1}" ]]; then - class-version-verify.py -v -t ${target} "${1}" > "${log}" + ${version_verify} -v -t ${target} "${1}" > "${log}" result=$? else ebegin "Verifying java class versions (target: ${target})" - class-version-verify.py -v -t ${target} -r "${D}" > "${log}" + ${version_verify} -v -t ${target} -r "${D}" > "${log}" result=$? eend ${result} fi |