diff options
author | Petteri Räty <betelgeuse@gentoo.org> | 2008-10-01 15:23:17 +0000 |
---|---|---|
committer | Petteri Räty <betelgeuse@gentoo.org> | 2008-10-01 15:23:17 +0000 |
commit | 2d4b8724a18bb08c530fa10b84ba869749ef67f8 (patch) | |
tree | e1fa25cc96948d0d0523303b622595fee6229a82 /eclass/java-utils-2.eclass | |
parent | Add ~sparc keyword for testing. (diff) | |
download | gentoo-2-2d4b8724a18bb08c530fa10b84ba869749ef67f8.tar.gz gentoo-2-2d4b8724a18bb08c530fa10b84ba869749ef67f8.tar.bz2 gentoo-2-2d4b8724a18bb08c530fa10b84ba869749ef67f8.zip |
Move build.xml rewriting from eant to java-ant-2_src_configure and bundled jar checking to java-utils-2_src_prepare.
Diffstat (limited to 'eclass/java-utils-2.eclass')
-rw-r--r-- | eclass/java-utils-2.eclass | 45 |
1 files changed, 23 insertions, 22 deletions
diff --git a/eclass/java-utils-2.eclass b/eclass/java-utils-2.eclass index f475ae4b5f3a..f6b668f0effc 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.112 2008/07/22 21:27:23 betelgeuse Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.113 2008/10/01 15:23:17 betelgeuse Exp $ # ----------------------------------------------------------------------------- # @eclass-begin @@ -1803,6 +1803,24 @@ ejunit() { # ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------ +# @eclass-src_prepare +# +# src_prepare Searches for bundled jars +# ------------------------------------------------------------------------------ + +java-utils-2_src_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:" + java-pkg_find-normal-jars || echo "None found." + echo "Searching for bundled classes (no output if none found):" + find "${WORKDIR}" -name "*.class" + echo "Search done." + fi + touch "${T}/java-utils-2_src_prepare-run" +} + +# ------------------------------------------------------------------------------ # @section-begin build # @section-summary Build functions # @@ -1826,27 +1844,8 @@ eant() { debug-print-function ${FUNCNAME} $* if [[ ${EBUILD_PHASE} = compile ]]; then - # Used to be done in hooks in java-ant-2.eclass but moved here so that we can - # finally get rid of the hooks without breaking stuff - - [[ "${JAVA_ANT_IGNORE_SYSTEM_CLASSES}" && "${JAVA_PKG_BSFIX}" ]] \ - && java-ant_ignore-system-classes "${S}/build.xml" - - if hasq java-ant-2 ${INHERITED}; then - java-ant_bsfix - fi - - # eant can be called multiple times - JAVA_PKG_BSFIX="off" - - if [[ -z ${JAVA_PKG_NO_BUNDLED_SEARCH} ]] && is-java-strict; then - echo "Searching for bundled jars:" - java-pkg_find-normal-jars || echo "None found." - echo "Searching for bundled classes (no output if none found):" - find "${WORKDIR}" -name "*.class" - echo "Search done." - JAVA_PKG_NO_BUNDLED_SEARCH=true # eant can be called many times - fi + java-ant-2_src_configure + java-utils-2_src_prepare fi if ! hasq java-ant-2 ${INHERITED}; then @@ -2732,6 +2731,8 @@ is-java-strict() { return $? } +[[ "${EAPI}" = "2" ]] && EXPORT_FUNCTIONS src_prepare + # ------------------------------------------------------------------------------ # @eclass-end # ------------------------------------------------------------------------------ |