diff options
| author |   Petteri Räty <betelgeuse@gentoo.org> | 2009-03-27 20:58:57 +0000 |
|---|---|---|
| committer | Petteri Räty <betelgeuse@gentoo.org> | 2009-03-27 20:58:57 +0000 |
| commit | b451d458008f35dc10ae37853b1f3578dc9f2ae1 (patch) | |
| tree | 9d95161cd565170504d64c8fcc9f92ac70a61e83 /eclass | |
| parent | Revbump with broken patch disabled to stop duplicates of bug 262567 from flow... (diff) | |
| download | gentoo-2-b451d458008f35dc10ae37853b1f3578dc9f2ae1.tar.gz gentoo-2-b451d458008f35dc10ae37853b1f3578dc9f2ae1.tar.bz2 gentoo-2-b451d458008f35dc10ae37853b1f3578dc9f2ae1.zip | |
run java_prepare before bundled jar check and use EBUILD_PHASE to detect when to run it
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/java-utils-2.eclass | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/eclass/java-utils-2.eclass b/eclass/java-utils-2.eclass index 63e257f93db3..2072a539ae03 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.124 2009/03/27 19:40:38 betelgeuse Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.125 2009/03/27 20:58:57 betelgeuse Exp $ # ----------------------------------------------------------------------------- # @eclass-begin @@ -1810,6 +1810,9 @@ ejunit() { # ------------------------------------------------------------------------------ java-utils-2_src_prepare() { + [[ ${EBUILD_PHASE} == prepare ]] && + java-pkg_func-exists java_prepare && java_prepare + # Remember that eant will call this unless called via Portage if [[ ! -e "${T}/java-utils-2_src_prepare-run" ]] && is-java-strict; then echo "Searching for bundled jars:" @@ -1817,7 +1820,6 @@ java-utils-2_src_prepare() { echo "Searching for bundled classes (no output if none found):" find "${WORKDIR}" -name "*.class" echo "Search done." - java-pkg_func-exists "java_prepare" && java_prepare fi touch "${T}/java-utils-2_src_prepare-run" } |