diff options
| author |   Petteri Räty <betelgeuse@gentoo.org> | 2007-01-25 23:02:55 +0000 |
|---|---|---|
| committer | Petteri Räty <betelgeuse@gentoo.org> | 2007-01-25 23:02:55 +0000 |
| commit | d3702d9ee4c07dc9d5808eff3f33b0a9057e6580 (patch) | |
| tree | 1458fd8f161431d4e667446aca53a16015af445d /eclass/java-pkg-2.eclass | |
| parent | Replacing einfo with elog (diff) | |
| download | gentoo-2-d3702d9ee4c07dc9d5808eff3f33b0a9057e6580.tar.gz gentoo-2-d3702d9ee4c07dc9d5808eff3f33b0a9057e6580.tar.bz2 gentoo-2-d3702d9ee4c07dc9d5808eff3f33b0a9057e6580.zip | |
Added EANT_ANT_TASKS to pass ANT_TASKS to eant. ANT_TASKS is unset in java-pkg_init so it can't be used in global scope.
Diffstat (limited to 'eclass/java-pkg-2.eclass')
| -rw-r--r-- | eclass/java-pkg-2.eclass | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/eclass/java-pkg-2.eclass b/eclass/java-pkg-2.eclass index 87f8568f48f2..276c98f29e74 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.16 2007/01/21 22:27:18 betelgeuse Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/java-pkg-2.eclass,v 1.17 2007/01/25 23:02:55 betelgeuse Exp $ inherit java-utils-2 @@ -69,6 +69,7 @@ java-pkg-2_pkg_setup() { # java-utils-2.eclass) # EANT_GENTOO_CLASSPATH - @see eant documention in java-utils-2.eclass # EANT_EXTRA_ARGS - extra arguments to pass to eant +# EANT_ANT_TASKS - modifies the ANT_TASKS variable in the eant environment # param: Parameters are passed to ant verbatim # ------------------------------------------------------------------------------ java-pkg-2_src_compile() { @@ -78,7 +79,8 @@ java-pkg-2_src_compile() { local antflags="${EANT_BUILD_TARGET:=jar}" hasq doc ${IUSE} && antflags="${antflags} $(use_doc ${EANT_DOC_TARGET})" - eant ${antflags} -f "${EANT_BUILD_XML}" ${EANT_EXTRA_ARGS} "${@}" + 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." fi |