From 8b6be3f1f34acc440bee9e7d687807f7535c478a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Petteri=20R=C3=A4ty?= Date: Sun, 28 Jan 2007 19:53:17 +0000 Subject: [PATCH] Make the generic src_compile die with JAVA_PKG_STRICT if you are not inherit java-ant-2 also. --- eclass/java-pkg-2.eclass | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/eclass/java-pkg-2.eclass b/eclass/java-pkg-2.eclass index 276c98f29e74..79c1af5c8249 100644 --- a/eclass/java-pkg-2.eclass +++ b/eclass/java-pkg-2.eclass @@ -5,7 +5,7 @@ # # Licensed under the GNU General Public License, v2 # -# $Header: /var/cvsroot/gentoo-x86/eclass/java-pkg-2.eclass,v 1.17 2007/01/25 23:02:55 betelgeuse Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/java-pkg-2.eclass,v 1.18 2007/01/28 19:53:17 betelgeuse Exp $ inherit java-utils-2 @@ -74,6 +74,11 @@ java-pkg-2_pkg_setup() { # ------------------------------------------------------------------------------ java-pkg-2_src_compile() { if [[ -e "${EANT_BUILD_XML:=build.xml}" ]]; then + if ! hasq java-ant-2 ${INHERITED}; then + msg="You should inherit java-ant-2 always when using eant" + ewarn ${msg} + is-java-strict && die ${msg} + fi [[ "${EANT_FILTER_COMPILER}" ]] && \ java-pkg_filter-compiler ${EANT_FILTER_COMPILER} @@ -82,7 +87,7 @@ java-pkg-2_src_compile() { ANT_TASKS="${ANT_TASKS} ${EANT_ANT_TASKS}" \ eant ${antflags} -f "${EANT_BUILD_XML}" ${EANT_EXTRA_ARGS} "${@}" else - echo "${FUNCNAME}: No build.xml found so nothing to do." + echo "${FUNCNAME}: ${EANT_BUILD_XML} not found so nothing to do." fi } -- 2.26.2