diff options
| author |   Petteri Räty <betelgeuse@gentoo.org> | 2007-01-12 13:48:12 +0000 |
|---|---|---|
| committer | Petteri Räty <betelgeuse@gentoo.org> | 2007-01-12 13:48:12 +0000 |
| commit | 486955904edc7240e47434004373acc5f9501cd0 (patch) | |
| tree | f4b878a7396f4c946e7f64abf0b60510175dc26d /eclass/java-pkg-2.eclass | |
| parent | Make libstdc++ dependency x86-only - amd64 doesn't contain libdeploy.so, the ... (diff) | |
| download | historical-486955904edc7240e47434004373acc5f9501cd0.tar.gz historical-486955904edc7240e47434004373acc5f9501cd0.tar.bz2 historical-486955904edc7240e47434004373acc5f9501cd0.zip | |
Added EANT_GENTOO_CLASSPATH and EANT_EXTRA_ARGUMENTS support to the general src_compile.
Diffstat (limited to 'eclass/java-pkg-2.eclass')
| -rw-r--r-- | eclass/java-pkg-2.eclass | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/eclass/java-pkg-2.eclass b/eclass/java-pkg-2.eclass index 27311e66a77e..c433e04ed327 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.10 2007/01/10 09:59:21 betelgeuse Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/java-pkg-2.eclass,v 1.11 2007/01/12 13:48:12 betelgeuse Exp $ inherit java-utils-2 @@ -56,6 +56,9 @@ java-pkg-2_pkg_setup() { # EANT_DOC_TARGET - the target to build extra docs under the doc use flag # (default: the one provided by use_doc in # java-utils-2.eclass) +# EANT_GENTOO_CLASSPATH - class java-pkg_getjars for the value and adds to the +# gentoo.classpath property +# EANT_EXTRA_ARGUMENTS - extra arguments to pass to eant # ------------------------------------------------------------------------------ java-pkg-2_src_compile() { if [[ -e "${EANT_BUILD_XML:=build.xml}" ]]; then @@ -63,8 +66,17 @@ java-pkg-2_src_compile() { java-pkg_filter-compiler ${EANT_FILTER_COMPILER} local antflags="${EANT_BUILD_TARGET:=jar}" + + local gcp="${EANT_GENTOO_CLASSPATH}" + + if [[ "${gcp}" ]]; then + local cp="$(java-pkg_getjars ${gcp})" + # It seems ant does not like single quotes around ${cp} + antflags="${antflags} -Dgentoo.classpath=\"${cp}\"" + fi + hasq doc ${IUSE} && antflags="${antflags} $(use_doc ${EANT_DOC_TARGET})" - eant ${antflags} -f "${EANT_BUILD_XML}" + eant ${antflags} -f "${EANT_BUILD_XML}" ${EANT_EXTRA_ARGUMENTS} else echo "${FUNCNAME}: No build.xml found so nothing to do." fi |