/[gentoo-x86]/eclass/java-utils-2.eclass
Gentoo

Diff of /eclass/java-utils-2.eclass

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 1.74 Revision 1.75
4# Copyright (c) 2004, Karl Trygve Kalleberg <karltk@gentoo.org> 4# Copyright (c) 2004, Karl Trygve Kalleberg <karltk@gentoo.org>
5# Copyright (c) 2004-2005, Gentoo Foundation 5# Copyright (c) 2004-2005, Gentoo Foundation
6# 6#
7# Licensed under the GNU General Public License, v2 7# Licensed under the GNU General Public License, v2
8# 8#
9# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.74 2007/04/20 15:23:28 betelgeuse Exp $ 9# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.75 2007/04/20 16:13:46 betelgeuse Exp $
10 10
11 11
12# ----------------------------------------------------------------------------- 12# -----------------------------------------------------------------------------
13# @eclass-begin 13# @eclass-begin
14# @eclass-shortdesc Java Utility eclass 14# @eclass-shortdesc Java Utility eclass
1715 local gcp="${EANT_GENTOO_CLASSPATH}" 1715 local gcp="${EANT_GENTOO_CLASSPATH}"
1716 1716
1717 if [[ ${EBUILD_PHASE} = "test" ]]; then 1717 if [[ ${EBUILD_PHASE} = "test" ]]; then
1718 antflags="${antflags} -DJunit.present=true" 1718 antflags="${antflags} -DJunit.present=true"
1719 [[ ${gcp} && ${ANT_TASKS} = *ant-junit* ]] && gcp="${gcp} junit" 1719 [[ ${gcp} && ${ANT_TASKS} = *ant-junit* ]] && gcp="${gcp} junit"
1720 local getjarsarg="--with-dependencies"
1720 fi 1721 fi
1721 1722
1722 local cp 1723 local cp
1723 1724
1724 for atom in ${gcp}; do 1725 for atom in ${gcp}; do
1725 cp="${cp}:$(java-pkg_getjars ${atom})" 1726 cp="${cp}:$(java-pkg_getjars ${getjarsarg} ${atom})"
1726 done 1727 done
1727 1728
1728 if [[ ${cp} ]]; then 1729 if [[ ${cp} ]]; then
1729 # It seems ant does not like single quotes around ${cp} 1730 # It seems ant does not like single quotes around ${cp}
1730 antflags="${antflags} -Dgentoo.classpath=\"${cp#:}\"" 1731 antflags="${antflags} -Dgentoo.classpath=\"${cp#:}\""
1731 fi 1732 fi
1732 1733
1733 [[ -n ${JAVA_PKG_DEBUG} ]] && echo ant ${antflags} "${@}" 1734 [[ -n ${JAVA_PKG_DEBUG} ]] && echo ant ${antflags} "${@}"
1734 debug-print "Calling ant: ${antflags} ${@}" 1735 debug-print "Calling ant (GENTOO_VM: ${GENTOO_VM}): ${antflags} ${@}"
1735 ant ${antflags} "${@}" || die "eant failed" 1736 ant ${antflags} "${@}" || die "eant failed"
1736
1737} 1737}
1738 1738
1739# ------------------------------------------------------------------------------ 1739# ------------------------------------------------------------------------------
1740# @ebuild-function ejavac 1740# @ebuild-function ejavac
1741# 1741#

Legend:
Removed from v.1.74  
changed lines
  Added in v.1.75

  ViewVC Help
Powered by ViewVC 1.1.20