/[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.150 Revision 1.153
4# Copyright (c) 2004, Karl Trygve Kalleberg <karltk@gentoo.org> 4# Copyright (c) 2004, Karl Trygve Kalleberg <karltk@gentoo.org>
5# Copyright (c) 2004-2011, Gentoo Foundation 5# Copyright (c) 2004-2011, 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.150 2012/03/13 10:05:46 sera Exp $ 9# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.153 2013/04/17 18:01:48 sera Exp $
10 10
11# ----------------------------------------------------------------------------- 11# -----------------------------------------------------------------------------
12# @eclass-begin 12# @eclass-begin
13# @eclass-shortdesc Java Utility eclass 13# @eclass-shortdesc Java Utility eclass
14# @eclass-maintainer java@gentoo.org 14# @eclass-maintainer java@gentoo.org
1684 1684
1685 echo ${flags} 1685 echo ${flags}
1686} 1686}
1687 1687
1688java-pkg_ensure-gcj() { 1688java-pkg_ensure-gcj() {
1689 if ! built_with_use sys-devel/gcc gcj ; then 1689 # was enforcing sys-devel/gcc[gcj]
1690 ewarn 1690 die "${FUNCNAME} was removed. Use use-deps available as of EAPI 2 instead. #261562"
1691 ewarn "You must build gcc with the gcj support to build with gcj"
1692 ewarn
1693 ebeep 5
1694 die "No GCJ support found!"
1695 fi
1696} 1691}
1697 1692
1698java-pkg_ensure-test() { 1693java-pkg_ensure-test() {
1699 if has test ${FEATURES} && ! has -test ${FEATURES} \ 1694 # was enforcing USE=test if FEATURES=test
1700 && has test ${IUSE} && ! use test; 1695 die "${FUNCNAME} was removed. Package mangers handle this already. #278965"
1701 then
1702 eerror "You specified FEATURES=test, but USE=test is needed"
1703 eerror "to pull in the additional dependencies for testing"
1704 die "Need USE=test enabled"
1705 fi
1706} 1696}
1707 1697
1708# ------------------------------------------------------------------------------ 1698# ------------------------------------------------------------------------------
1709# @ebuild-function java-pkg_register-ant-task 1699# @ebuild-function java-pkg_register-ant-task
1710# 1700#
2614# ------------------------------------------------------------------------------ 2604# ------------------------------------------------------------------------------
2615java-pkg_build-vm-from-handle() { 2605java-pkg_build-vm-from-handle() {
2616 debug-print-function ${FUNCNAME} "$*" 2606 debug-print-function ${FUNCNAME} "$*"
2617 2607
2618 local vm 2608 local vm
2619 vm=$(java-pkg_get-current-vm) 2609 vm=$(java-pkg_get-current-vm 2>/dev/null)
2620 if [[ $? != 0 ]]; then 2610 if [[ $? -eq 0 ]]; then
2621 eerror "${FUNCNAME}: Failed to get active vm"
2622 return 1
2623 fi
2624
2625 if has ${vm} ${JAVA_PKG_WANT_BUILD_VM}; then 2611 if has ${vm} ${JAVA_PKG_WANT_BUILD_VM}; then
2626 echo ${vm} 2612 echo ${vm}
2627 return 0 2613 return 0
2614 fi
2628 fi 2615 fi
2629 2616
2630 for vm in ${JAVA_PKG_WANT_BUILD_VM}; do 2617 for vm in ${JAVA_PKG_WANT_BUILD_VM}; do
2631 if java-config-2 --select-vm=${vm} 2>/dev/null; then 2618 if java-config-2 --select-vm=${vm} 2>/dev/null; then
2632 echo ${vm} 2619 echo ${vm}
2735 2722
2736java-pkg_die() { 2723java-pkg_die() {
2737 echo "!!! When you file a bug report, please include the following information:" >&2 2724 echo "!!! When you file a bug report, please include the following information:" >&2
2738 echo "GENTOO_VM=${GENTOO_VM} CLASSPATH=\"${CLASSPATH}\" JAVA_HOME=\"${JAVA_HOME}\"" >&2 2725 echo "GENTOO_VM=${GENTOO_VM} CLASSPATH=\"${CLASSPATH}\" JAVA_HOME=\"${JAVA_HOME}\"" >&2
2739 echo "JAVACFLAGS=\"${JAVACFLAGS}\" COMPILER=\"${GENTOO_COMPILER}\"" >&2 2726 echo "JAVACFLAGS=\"${JAVACFLAGS}\" COMPILER=\"${GENTOO_COMPILER}\"" >&2
2740 echo "and of course, the output of emerge --info" >&2 2727 echo "and of course, the output of emerge --info =${P}" >&2
2741} 2728}
2742 2729
2743 2730
2744# TODO document 2731# TODO document
2745# List jars in the source directory, ${S} 2732# List jars in the source directory, ${S}

Legend:
Removed from v.1.150  
changed lines
  Added in v.1.153

  ViewVC Help
Powered by ViewVC 1.1.20