diff options
| -rw-r--r-- | eclass/java-ant-2.eclass | 20 | ||||
| -rw-r--r-- | eclass/java-utils-2.eclass | 45 |
2 files changed, 42 insertions, 23 deletions
diff --git a/eclass/java-ant-2.eclass b/eclass/java-ant-2.eclass index a04e2a9db410..28272c3f07ca 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.39 2008/09/28 15:47:48 caster Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/java-ant-2.eclass,v 1.40 2008/10/01 15:23:17 betelgeuse Exp $ inherit java-utils-2 @@ -128,6 +128,24 @@ JAVA_ANT_CLASSPATH_TAGS="javac xjavac" # default: off # ------------------------------------------------------------------------------ +[[ "${EAPI}" == "2" ]] && EXPORT_FUNCTIONS src_configure + +# ------------------------------------------------------------------------------ +# @eclass-src_configure +# +# src_configure rewrites the build.xml files +# ------------------------------------------------------------------------------ +java-ant-2_src_configure() { + # eant will call us unless called by Portage + [[ -e "${T}/java-ant-2_src_configure-run" ]] && return + + [[ "${JAVA_ANT_IGNORE_SYSTEM_CLASSES}" ]] \ + && java-ant_ignore-system-classes "${S}/build.xml" + + java-ant_bsfix + touch "${T}/java-ant-2_src_configure-run" +} + # ------------------------------------------------------------------------------ # @private java-ant_bsfix # 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 # ------------------------------------------------------------------------------ |