/[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.56 Revision 1.57
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.56 2007/01/30 14:12:34 caster Exp $ 9# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.57 2007/02/13 19:52:51 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
403 java-pkg_append_ JAVA_PKG_LIBRARY "${JAVA_PKG_LIBDEST}" 403 java-pkg_append_ JAVA_PKG_LIBRARY "${JAVA_PKG_LIBDEST}"
404 debug-print "Installing ${lib} to ${JAVA_PKG_LIBDEST}" 404 debug-print "Installing ${lib} to ${JAVA_PKG_LIBDEST}"
405 # otherwise make a symlink to the symlink's origin 405 # otherwise make a symlink to the symlink's origin
406 else 406 else
407 # TODO use dosym 407 # TODO use dosym
408 ln -s "$(readlink "${lib}")" \
408 ln -s "$(readlink "${lib}")" "${D}${JAVA_PKG_LIBDEST}/$(basename "${lib}")" 409 "${D}${JAVA_PKG_LIBDEST}/$(basename "${lib}")"
409 debug-print "${lib} is a symlink, linking accordanly" 410 debug-print "${lib} is a symlink, linking accordanly"
410 fi 411 fi
411 # otherwise die 412 # otherwise die
412 else 413 else
413 die "${lib} does not exist" 414 die "${lib} does not exist"
1554 java-pkg_announce-qa-violation ${msg} 1555 java-pkg_announce-qa-violation ${msg}
1555 die ${msg} 1556 die ${msg}
1556 fi 1557 fi
1557 1558
1558 local antflags="-Dnoget=true -Dmaven.mode.offline=true" 1559 local antflags="-Dnoget=true -Dmaven.mode.offline=true"
1560
1559 java-pkg_init-compiler_ 1561 java-pkg_init-compiler_
1560 local compiler="${GENTOO_COMPILER}" 1562 local compiler="${GENTOO_COMPILER}"
1561 1563
1562 local compiler_env="${JAVA_PKG_COMPILER_DIR}/${compiler}" 1564 local compiler_env="${JAVA_PKG_COMPILER_DIR}/${compiler}"
1563 1565
1631 [[ -n ${JAVA_PKG_DEBUG} ]] && antflags="${antflags} --execdebug -debug" 1633 [[ -n ${JAVA_PKG_DEBUG} ]] && antflags="${antflags} --execdebug -debug"
1632 [[ -n ${PORTAGE_QUIET} ]] && antflags="${antflags} -q" 1634 [[ -n ${PORTAGE_QUIET} ]] && antflags="${antflags} -q"
1633 1635
1634 local gcp="${EANT_GENTOO_CLASSPATH}" 1636 local gcp="${EANT_GENTOO_CLASSPATH}"
1635 1637
1638 if [[ ${EBUILD_PHASE} = "test" ]]; then
1639 antflags="${antflags} -DJunit.present=true"
1640 [[ ${gcp} && ${ANT_TASKS} = *ant-junit* ]] && gcp="${gcp} junit"
1641 fi
1642
1643 local cp
1644
1645 for atom in ${gcp}; do
1646 cp="${cp}:$(java-pkg_getjars ${atom})"
1647 done
1648
1636 if [[ "${gcp}" ]]; then 1649 if [[ ${cp} ]]; then
1637 local cp="$(java-pkg_getjars ${gcp})"
1638 # It seems ant does not like single quotes around ${cp} 1650 # It seems ant does not like single quotes around ${cp}
1639 antflags="${antflags} -Dgentoo.classpath=\"${cp}\"" 1651 antflags="${antflags} -Dgentoo.classpath=\"${cp#:}\""
1640 fi 1652 fi
1641 1653
1642 [[ -n ${JAVA_PKG_DEBUG} ]] && echo ant ${antflags} "${@}" 1654 [[ -n ${JAVA_PKG_DEBUG} ]] && echo ant ${antflags} "${@}"
1643 debug-print "Calling ant: ${antflags} ${@}" 1655 debug-print "Calling ant: ${antflags} ${@}"
1644 ant ${antflags} "${@}" || die "eant failed" 1656 ant ${antflags} "${@}" || die "eant failed"

Legend:
Removed from v.1.56  
changed lines
  Added in v.1.57

  ViewVC Help
Powered by ViewVC 1.1.20