/[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.110 Revision 1.148
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.110 2008/07/09 21:16:40 betelgeuse Exp $ 9# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.148 2011/12/13 14:42:39 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
59# ----------------------------------------------------------------------------- 59# -----------------------------------------------------------------------------
60# @variable-internal JAVA_PKG_PORTAGE_DEP 60# @variable-internal JAVA_PKG_PORTAGE_DEP
61# 61#
62# The version of portage we need to function properly. Previously it was 62# The version of portage we need to function properly. Previously it was
63# portage with phase hooks support but now we use a version with proper env 63# portage with phase hooks support but now we use a version with proper env
64# saving. 64# saving. For EAPI 2 we have new enough stuff so let's have cleaner deps.
65# ----------------------------------------------------------------------------- 65# -----------------------------------------------------------------------------
66JAVA_PKG_PORTAGE_DEP=">=sys-apps/portage-2.1.2.7" 66has "${EAPI}" 0 1 && JAVA_PKG_PORTAGE_DEP=">=sys-apps/portage-2.1.2.7"
67 67
68# ----------------------------------------------------------------------------- 68# -----------------------------------------------------------------------------
69# @variable-internal JAVA_PKG_E_DEPEND 69# @variable-internal JAVA_PKG_E_DEPEND
70# 70#
71# This is a convience variable to be used from the other java eclasses. This is 71# This is a convience variable to be used from the other java eclasses. This is
72# the version of java-config we want to use. Usually the latest stable version 72# the version of java-config we want to use. Usually the latest stable version
73# so that ebuilds can use new features without depending on specific versions. 73# so that ebuilds can use new features without depending on specific versions.
74# ----------------------------------------------------------------------------- 74# -----------------------------------------------------------------------------
75JAVA_PKG_E_DEPEND=">=dev-java/java-config-2.0.33-r1 ${JAVA_PKG_PORTAGE_DEP}" 75JAVA_PKG_E_DEPEND=">=dev-java/java-config-2.1.9-r1 ${JAVA_PKG_PORTAGE_DEP}"
76hasq source ${JAVA_PKG_IUSE} && JAVA_PKG_E_DEPEND="${JAVA_PKG_E_DEPEND} source? ( app-arch/zip )" 76has source ${JAVA_PKG_IUSE} && JAVA_PKG_E_DEPEND="${JAVA_PKG_E_DEPEND} source? ( app-arch/zip )"
77
78# -----------------------------------------------------------------------------
79# @variable-preinherit JAVA_PKG_WANT_BOOTCLASSPATH
80#
81# The version of bootclasspath the package needs to work. Translates to a proper
82# dependency. The bootclasspath has to be obtained by java-ant_rewrite-bootclasspath
83# -----------------------------------------------------------------------------
84
85if [[ -n "${JAVA_PKG_WANT_BOOTCLASSPATH}" ]]; then
86 if [[ "${JAVA_PKG_WANT_BOOTCLASSPATH}" == "1.5" ]]; then
87 JAVA_PKG_E_DEPEND="${JAVA_PKG_E_DEPEND} >=dev-java/gnu-classpath-0.98-r1:0.98"
88 else
89 eerror "Unknown value of JAVA_PKG_WANT_BOOTCLASSPATH"
90 # since die in global scope doesn't work, this will make repoman fail
91 JAVA_PKG_E_DEPEND="${JAVA_PKG_E_DEPEND} BAD_JAVA_PKG_WANT_BOOTCLASSPATH"
92 fi
93fi
77 94
78# ----------------------------------------------------------------------------- 95# -----------------------------------------------------------------------------
79# @variable-external JAVA_PKG_ALLOW_VM_CHANGE 96# @variable-external JAVA_PKG_ALLOW_VM_CHANGE
80# @variable-default yes 97# @variable-default yes
81# 98#
224 ( # dont want to pollute calling env 241 ( # dont want to pollute calling env
225 insinto "${dest}" 242 insinto "${dest}"
226 doins -r "$@" 243 doins -r "$@"
227 ) || die "Installing examples failed" 244 ) || die "Installing examples failed"
228 fi 245 fi
246
247 # Let's make a symlink to the directory we have everything else under
248 dosym "${dest}" "${JAVA_PKG_SHAREPATH}/examples" || die
229} 249}
230 250
231# ----------------------------------------------------------------------------- 251# -----------------------------------------------------------------------------
232# @ebuild-function java-pkg_dojar 252# @ebuild-function java-pkg_dojar
233# 253#
365 if [[ ${jar} = *\** ]]; then 385 if [[ ${jar} = *\** ]]; then
366 eerror "The argument ${jar} to ${FUNCNAME}" 386 eerror "The argument ${jar} to ${FUNCNAME}"
367 eerror "has * in it. If you want it to glob in" 387 eerror "has * in it. If you want it to glob in"
368 eerror '${D} add ${D} to the argument.' 388 eerror '${D} add ${D} to the argument.'
369 fi 389 fi
390 debug-print "${jar} or ${D}${jar} not found"
370 die "${jar} does not exist" 391 die "${jar} does not exist"
371 fi 392 fi
372 done 393 done
373 394
374 java-pkg_do_write_ 395 java-pkg_do_write_
429# @param $@ - JNI libraries to install 450# @param $@ - JNI libraries to install
430# ------------------------------------------------------------------------------ 451# ------------------------------------------------------------------------------
431java-pkg_doso() { 452java-pkg_doso() {
432 debug-print-function ${FUNCNAME} $* 453 debug-print-function ${FUNCNAME} $*
433 454
434 [[ ${#} -lt 1 ]] && "At least one argument required for ${FUNCNAME}"
435 java-pkg_check-phase install 455 java-pkg_check-phase install
436 456
437 [[ ${#} -lt 1 ]] && die "At least one argument required for ${FUNCNAME}" 457 [[ ${#} -lt 1 ]] && die "${FUNCNAME} requires at least one argument"
438 458
439 java-pkg_init_paths_ 459 java-pkg_init_paths_
440 460
441 local lib 461 local lib
442 # for each lib 462 # for each lib
445 if [[ -e "${lib}" ]] ; then 465 if [[ -e "${lib}" ]] ; then
446 # install if it isn't a symlink 466 # install if it isn't a symlink
447 if [[ ! -L "${lib}" ]] ; then 467 if [[ ! -L "${lib}" ]] ; then
448 INSDESTTREE="${JAVA_PKG_LIBDEST}" \ 468 INSDESTTREE="${JAVA_PKG_LIBDEST}" \
449 INSOPTIONS="${LIBOPTIONS}" \ 469 INSOPTIONS="${LIBOPTIONS}" \
450 doins "${lib}" || "failed to install ${lib}" 470 doins "${lib}" || die "failed to install ${lib}"
451 java-pkg_append_ JAVA_PKG_LIBRARY "${JAVA_PKG_LIBDEST}" 471 java-pkg_append_ JAVA_PKG_LIBRARY "${JAVA_PKG_LIBDEST}"
452 debug-print "Installing ${lib} to ${JAVA_PKG_LIBDEST}" 472 debug-print "Installing ${lib} to ${JAVA_PKG_LIBDEST}"
453 # otherwise make a symlink to the symlink's origin 473 # otherwise make a symlink to the symlink's origin
454 else 474 else
455 # TODO use dosym 475 dosym "$(readlink "${lib}")" "${JAVA_PKG_LIBDEST}/${lib##*/}"
456 ln -s "$(readlink "${lib}")" \
457 "${D}${JAVA_PKG_LIBDEST}/$(basename "${lib}")"
458 debug-print "${lib} is a symlink, linking accordanly" 476 debug-print "${lib} is a symlink, linking accordantly"
459 fi 477 fi
460 # otherwise die 478 # otherwise die
461 else 479 else
462 die "${lib} does not exist" 480 die "${lib} does not exist"
463 fi 481 fi
479java-pkg_regso() { 497java-pkg_regso() {
480 debug-print-function ${FUNCNAME} $* 498 debug-print-function ${FUNCNAME} $*
481 499
482 java-pkg_check-phase install 500 java-pkg_check-phase install
483 501
484 [[ ${#} -lt 1 ]] && "at least one argument needed" 502 [[ ${#} -lt 1 ]] && die "${FUNCNAME} requires at least one argument"
485 503
486 java-pkg_init_paths_ 504 java-pkg_init_paths_
487 505
488 local lib target_dir 506 local lib target_dir
489 for lib in "$@" ; do 507 for lib in "$@" ; do
874 892
875 local build_only="" 893 local build_only=""
876 local destdir="." 894 local destdir="."
877 local deep="" 895 local deep=""
878 local virtual="" 896 local virtual=""
897 local record_jar=""
879 898
880 [[ "${EBUILD_PHASE}" == "test" ]] && build_only="build" 899 [[ "${EBUILD_PHASE}" == "test" ]] && build_only="build"
881 900
882 while [[ "${1}" == --* ]]; do 901 while [[ "${1}" == --* ]]; do
883 if [[ "${1}" = "--build-only" ]]; then 902 if [[ "${1}" = "--build-only" ]]; then
918 for pkg in ${target_pkg//,/ }; do 937 for pkg in ${target_pkg//,/ }; do
919 java-pkg_ensure-dep "${build_only}" "${pkg}" 938 java-pkg_ensure-dep "${build_only}" "${pkg}"
920 [[ -z "${build_only}" ]] && java-pkg_record-jar_ "${pkg}" 939 [[ -z "${build_only}" ]] && java-pkg_record-jar_ "${pkg}"
921 done 940 done
922 # setting this disables further record-jar_ calls later 941 # setting this disables further record-jar_ calls later
923 build_only="build" 942 record_jar="true"
924 else 943 else
925 java-pkg_ensure-dep "${build_only}" "${target_pkg}" 944 java-pkg_ensure-dep "${build_only}" "${target_pkg}"
926 fi 945 fi
927 946
928 # Record the entire virtual as a dependency so that 947 # Record the entire virtual as a dependency so that
929 # no jars are missed. 948 # no jars are missed.
930 if [[ -z "${build_only}" && -n "${virtual}" ]]; then 949 if [[ -z "${build_only}" && -n "${virtual}" ]]; then
931 java-pkg_record-jar_ "${target_pkg}" 950 java-pkg_record-jar_ "${target_pkg}"
932 # setting this disables further record-jars_ calls later 951 # setting this disables further record-jars_ calls later
933 build_only="build" 952 record_jar="true"
934 fi 953 fi
935 954
936 pushd ${destdir} > /dev/null \ 955 pushd ${destdir} > /dev/null \
937 || die "failed to change directory to ${destdir}" 956 || die "failed to change directory to ${destdir}"
938 957
946 # If no specific target jar was indicated, link it 965 # If no specific target jar was indicated, link it
947 if [[ -z "${target_jar}" ]] ; then 966 if [[ -z "${target_jar}" ]] ; then
948 [[ -f "${target_jar}" ]] && rm "${target_jar}" 967 [[ -f "${target_jar}" ]] && rm "${target_jar}"
949 ln -snf "${jar}" \ 968 ln -snf "${jar}" \
950 || die "Failed to make symlink from ${jar} to ${jar_name}" 969 || die "Failed to make symlink from ${jar} to ${jar_name}"
970 if [[ -z "${record_jar}" ]]; then
971 if [[ -z "${build_only}" ]]; then
951 [[ -z "${build_only}" ]] && java-pkg_record-jar_ "${target_pkg}" "${jar}" 972 java-pkg_record-jar_ "${target_pkg}" "${jar}"
973 else
974 java-pkg_record-jar_ --build-only "${target_pkg}" "${jar}"
975 fi
976 fi
952 # otherwise, if the current jar is the target jar, link it 977 # otherwise, if the current jar is the target jar, link it
953 elif [[ "${jar_name}" == "${target_jar}" ]] ; then 978 elif [[ "${jar_name}" == "${target_jar}" ]] ; then
954 [[ -f "${destjar}" ]] && rm "${destjar}" 979 [[ -f "${destjar}" ]] && rm "${destjar}"
955 ln -snf "${jar}" "${destjar}" \ 980 ln -snf "${jar}" "${destjar}" \
956 || die "Failed to make symlink from ${jar} to ${destjar}" 981 || die "Failed to make symlink from ${jar} to ${destjar}"
982 if [[ -z "${record_jar}" ]]; then
983 if [[ -z "${build_only}" ]]; then
957 [[ -z "${build_only}" ]] && java-pkg_record-jar_ "${target_pkg}" "${jar}" 984 java-pkg_record-jar_ "${target_pkg}" "${jar}"
985 else
986 java-pkg_record-jar_ --build-only "${target_jar}" "${jar}"
987 fi
988 fi
958 popd > /dev/null 989 popd > /dev/null
959 return 0 990 return 0
960 fi 991 fi
961 done 992 done
962 popd > /dev/null 993 popd > /dev/null
1035 1066
1036 for pkg in ${pkgs//,/ }; do 1067 for pkg in ${pkgs//,/ }; do
1037 java-pkg_ensure-dep "${build_only}" "${pkg}" 1068 java-pkg_ensure-dep "${build_only}" "${pkg}"
1038 done 1069 done
1039 1070
1040 # Only record jars that aren't build-only 1071 for pkg in ${pkgs//,/ }; do
1041 if [[ -z "${build_only}" ]]; then 1072 if [[ -z "${build_only}" ]]; then
1042 for pkg in ${pkgs//,/ }; do
1043 java-pkg_record-jar_ "${pkg}" 1073 java-pkg_record-jar_ "${pkg}"
1074 else
1075 java-pkg_record-jar_ --build-only "${pkg}"
1076 fi
1044 done 1077 done
1045 fi
1046 1078
1047 echo "${jars}" 1079 echo "${jars}"
1048} 1080}
1049 1081
1050# ------------------------------------------------------------------------------ 1082# ------------------------------------------------------------------------------
1071java-pkg_getjar() { 1103java-pkg_getjar() {
1072 debug-print-function ${FUNCNAME} $* 1104 debug-print-function ${FUNCNAME} $*
1073 1105
1074 local build_only="" 1106 local build_only=""
1075 local virtual="" 1107 local virtual=""
1108 local record_jar=""
1076 1109
1077 [[ "${EBUILD_PHASE}" == "test" ]] && build_only="build" 1110 [[ "${EBUILD_PHASE}" == "test" ]] && build_only="build"
1078 1111
1079 while [[ "${1}" == --* ]]; do 1112 while [[ "${1}" == --* ]]; do
1080 if [[ "${1}" = "--build-only" ]]; then 1113 if [[ "${1}" = "--build-only" ]]; then
1106 java-pkg_ensure-dep "${build_only}" "${pkg}" 1139 java-pkg_ensure-dep "${build_only}" "${pkg}"
1107 1140
1108 # Record the package(Virtual) as a dependency and then set build_only 1141 # Record the package(Virtual) as a dependency and then set build_only
1109 # So that individual jars are not recorded. 1142 # So that individual jars are not recorded.
1110 if [[ -n "${virtual}" ]]; then 1143 if [[ -n "${virtual}" ]]; then
1144 if [[ -z "${build_only}" ]]; then
1111 java-pkg_record-jar_ "${pkg}" 1145 java-pkg_record-jar_ "${pkg}"
1112 build_only="true" 1146 else
1147 java-pkg_record-jar_ --build-only "${pkg}"
1148 fi
1149 record_jar="true"
1113 fi 1150 fi
1114 1151
1115 for jar in ${classpath//:/ }; do 1152 for jar in ${classpath//:/ }; do
1116 if [[ ! -f "${jar}" ]] ; then 1153 if [[ ! -f "${jar}" ]] ; then
1117 die "Installation problem with jar ${jar} in ${pkg} - is it installed?" 1154 die "Installation problem with jar ${jar} in ${pkg} - is it installed?"
1118 fi 1155 fi
1119 1156
1120 if [[ "$(basename ${jar})" == "${target_jar}" ]] ; then 1157 if [[ "$(basename ${jar})" == "${target_jar}" ]] ; then
1121 # Only record jars that aren't build-only 1158 # Only record jars that aren't build-only
1122 [[ -z "${build_only}" ]] && java-pkg_record-jar_ "${pkg}" "${jar}" 1159 if [[ -z "${record_jar}" ]]; then
1160 if [[ -z "${build_only}" ]]; then
1161 java-pkg_record-jar_ "${pkg}" "${jar}"
1162 else
1163 java-pkg_record-jar_ --build-only "${pkg}" "${jar}"
1164 fi
1165 fi
1123 echo "${jar}" 1166 echo "${jar}"
1124 return 0 1167 return 0
1125 fi 1168 fi
1126 done 1169 done
1127 1170
1261 echo "${1}=\"${2}\"" >> ${JAVA_PKG_EXTRA_ENV} 1304 echo "${1}=\"${2}\"" >> ${JAVA_PKG_EXTRA_ENV}
1262 JAVA_PKG_EXTRA_ENV_VARS="${JAVA_PKG_EXTRA_ENV_VARS} ${1}" 1305 JAVA_PKG_EXTRA_ENV_VARS="${JAVA_PKG_EXTRA_ENV_VARS} ${1}"
1263 1306
1264 java-pkg_do_write_ 1307 java-pkg_do_write_
1265} 1308}
1309
1310# ------------------------------------------------------------------------------
1311# @ebuild-function java-pkg_get-bootclasspath
1312#
1313# Returns classpath of a given bootclasspath-providing package version.
1314#
1315# @param $1 - the version of bootclasspath (e.g. 1.5), 'auto' for bootclasspath
1316# of the current JDK
1317# ------------------------------------------------------------------------------
1318
1319java-pkg_get-bootclasspath() {
1320 local version="${1}"
1321
1322 local bcp
1323 case "${version}" in
1324 auto)
1325 bcp="$(java-config -g BOOTCLASSPATH)"
1326 ;;
1327 1.5)
1328 bcp="$(java-pkg_getjars --build-only gnu-classpath-0.98)"
1329 ;;
1330 *)
1331 eerror "unknown parameter of java-pkg_get-bootclasspath"
1332 die "unknown parameter of java-pkg_get-bootclasspath"
1333 ;;
1334 esac
1335
1336 echo "${bcp}"
1337}
1338
1266 1339
1267# This function reads stdin, and based on that input, figures out how to 1340# This function reads stdin, and based on that input, figures out how to
1268# populate jars from the filesystem. 1341# populate jars from the filesystem.
1269# Need to figure out a good way of making use of this, ie be able to use a 1342# Need to figure out a good way of making use of this, ie be able to use a
1270# string that was built instead of stdin 1343# string that was built instead of stdin
1308# @section-begin helper 1381# @section-begin helper
1309# @section-summary Helper functions 1382# @section-summary Helper functions
1310# 1383#
1311# Various other functions to use from an ebuild 1384# Various other functions to use from an ebuild
1312# ------------------------------------------------------------------------------ 1385# ------------------------------------------------------------------------------
1313
1314# ------------------------------------------------------------------------------
1315# @ebuild-function java-pkg_need
1316#
1317# Adds virtual dependencies, which can optionally be controlled by a USE flag.
1318# Currently supported virtuals are:
1319# javamail
1320# jdbc-stdext
1321# jaf
1322# jdbc-rowset
1323# jms
1324#
1325# @param $1 - Optionally indicate that the dependencies are controlled by
1326# a use flag by specifying '--use' Requires $2.
1327# @param $2 - USE flag which will enable the dependencies.
1328# @param $@ - virtual packages to add depenedencies for
1329# ------------------------------------------------------------------------------
1330# TODO rewrite to parse a line based declaration file instead -- karltk
1331#java-pkg_need() {
1332# debug-print-function ${FUNCNAME} $*
1333# local useflag
1334# if [[ ${1} == "--use" ]]; then
1335# useflag="${2}"
1336# shift 2
1337# fi
1338#
1339# if [[ -z ${1} ]]; then
1340# die "Must specify at least one virtual package."
1341# fi
1342#
1343# local depstr newdepstr
1344#
1345# for virtual in ${@}; do
1346# if has ${virtual} ${JAVA_PKG_VNEED}; then
1347# debug-print "Already registered virtual ${virtual}"
1348# continue
1349# fi
1350# case ${virtual} in
1351# javamail)
1352# debug-print "java-pkg_need: adding javamail dependencies"
1353# newdepstr="|| ( dev-java/gnu-javamail dev-java/sun-javamail-bin )"
1354# ;;
1355# jdbc-stdext)
1356# debug-print "java-pkg_need: adding jdbc-stdext dependencies"
1357# newdepstr="|| ( >=virtual/jdk-1.4 dev-java/jdbc2-stdext )"
1358# ;;
1359# jaf)
1360# debug-print "java-pkg_need: adding jaf dependencies"
1361# newdepstr="|| ( dev-java/gnu-jaf dev-java/sun-jaf-bin )"
1362# ;;
1363# jdbc-rowset)
1364# debug-print "java-pkg_need: adding jdbc-rowset dependencies"
1365# newdepstr="|| ( >=virtual/jdk-1.5 dev-java/sun-jdbc-rowset )"
1366# ;;
1367# jms)
1368# debug-print "java-pkg_need: adding jms dependencies"
1369# newdepstr="|| ( dev-java/sun-jms dev-java/openjms )"
1370# ;;
1371# *)
1372# die "Invalid virtual: ${virtual}"
1373# esac
1374#
1375# export JAVA_PKG_VNEED="${JAVA_PKG_VNEED} ${virtual}"
1376#
1377# if [[ -n ${useflag} ]]; then
1378# depstr="${depstr} ${useflag}? ( ${newdepstr} )"
1379# else
1380# depstr="${depstr} ${newdepstr}"
1381# fi
1382# done
1383#
1384# [[ -z ${JAVA_PKG_NV_DEPEND} ]] && export JAVA_PKG_NV_DEPEND="${DEPEND}"
1385# [[ -z ${JAVA_PKG_NV_RDEPEND} ]] && export JAVA_PKG_NV_RDEPEND="${RDEPEND}"
1386#
1387# export DEPEND="${DEPEND} ${depstr}"
1388# export RDEPEND="${RDEPEND} ${depstr}"
1389#}
1390 1386
1391# ------------------------------------------------------------------------------ 1387# ------------------------------------------------------------------------------
1392# @ebuild-function java-pkg_find-normal-jars 1388# @ebuild-function java-pkg_find-normal-jars
1393# 1389#
1394# Find the files with suffix .jar file in the given directory or $WORKDIR 1390# Find the files with suffix .jar file in the given directory or $WORKDIR
1560java-pkg_get-current-vm() { 1556java-pkg_get-current-vm() {
1561 echo ${GENTOO_VM} 1557 echo ${GENTOO_VM}
1562} 1558}
1563 1559
1564java-pkg_current-vm-matches() { 1560java-pkg_current-vm-matches() {
1565 hasq $(java-pkg_get-current-vm) ${@} 1561 has $(java-pkg_get-current-vm) ${@}
1566 return $? 1562 return $?
1567} 1563}
1568 1564
1569# ------------------------------------------------------------------------------ 1565# ------------------------------------------------------------------------------
1570# @ebuild-function java-pkg_get-source 1566# @ebuild-function java-pkg_get-source
1685 die "No GCJ support found!" 1681 die "No GCJ support found!"
1686 fi 1682 fi
1687} 1683}
1688 1684
1689java-pkg_ensure-test() { 1685java-pkg_ensure-test() {
1690 if hasq test ${FEATURES} && ! hasq -test ${FEATURES} \ 1686 if has test ${FEATURES} && ! has -test ${FEATURES} \
1691 && hasq test ${IUSE} && ! use test; 1687 && has test ${IUSE} && ! use test;
1692 then 1688 then
1693 eerror "You specified FEATURES=test, but USE=test is needed" 1689 eerror "You specified FEATURES=test, but USE=test is needed"
1694 eerror "to pull in the additional dependencies for testing" 1690 eerror "to pull in the additional dependencies for testing"
1695 die "Need USE=test enabled" 1691 die "Need USE=test enabled"
1696 fi 1692 fi
1759 else 1755 else
1760 return 0 1756 return 0
1761 fi 1757 fi
1762} 1758}
1763 1759
1760
1764# ------------------------------------------------------------------------------ 1761# ------------------------------------------------------------------------------
1765# @ebuild-function ejunit 1762# @internal-function ejunit_
1766# 1763#
1767# Junit wrapper function. Makes it easier to run the tests and checks for 1764# Internal Junit wrapper function. Makes it easier to run the tests and checks for
1768# dev-java/junit in DEPEND. Launches the tests using junit.textui.TestRunner. 1765# dev-java/junit in DEPEND. Launches the tests using junit.textui.TestRunner.
1769# 1766#
1770# Examples: 1767# @param $1 - junit package (junit or junit-4)
1771# ejunit -cp build/classes org.blinkenlights.jid3.test.AllTests
1772# ejunit org.blinkenlights.jid3.test.AllTests
1773#
1774# @param $1 - -cp or -classpath 1768# @param $2 - -cp or -classpath
1775# @param $2 - classpath; junit and recorded dependencies get appended 1769# @param $3 - classpath; junit and recorded dependencies get appended
1776# @param $@ - the rest of the parameters are passed to java 1770# @param $@ - the rest of the parameters are passed to java
1777# ------------------------------------------------------------------------------
1778ejunit() { 1771ejunit_() {
1779 debug-print-function ${FUNCNAME} $* 1772 debug-print-function ${FUNCNAME} $*
1780 1773
1781 local pkgs 1774 local pkgs
1782 if [[ -f ${JAVA_PKG_DEPEND_FILE} ]]; then 1775 if [[ -f ${JAVA_PKG_DEPEND_FILE} ]]; then
1783 for atom in $(cat ${JAVA_PKG_DEPEND_FILE} | tr : ' '); do 1776 for atom in $(cat ${JAVA_PKG_DEPEND_FILE} | tr : ' '); do
1784 pkgs=${pkgs},$(echo ${atom} | sed -re "s/^.*@//") 1777 pkgs=${pkgs},$(echo ${atom} | sed -re "s/^.*@//")
1785 done 1778 done
1786 fi 1779 fi
1787 1780
1781 local junit=${1}
1782 shift 1
1783
1788 local cp=$(java-pkg_getjars --with-dependencies junit${pkgs}) 1784 local cp=$(java-pkg_getjars --with-dependencies ${junit}${pkgs})
1789 if [[ ${1} = -cp || ${1} = -classpath ]]; then 1785 if [[ ${1} = -cp || ${1} = -classpath ]]; then
1790 cp="${2}:${cp}" 1786 cp="${2}:${cp}"
1791 shift 2 1787 shift 2
1792 else 1788 else
1793 cp=".:${cp}" 1789 cp=".:${cp}"
1794 fi 1790 fi
1795 1791
1796 local runner=junit.textui.TestRunner 1792 local runner=junit.textui.TestRunner
1793 if [[ "${junit}" == "junit-4" ]] ; then
1794 runner=org.junit.runner.JUnitCore
1795 fi
1797 debug-print "Calling: java -cp \"${cp}\" -Djava.awt.headless=true ${runner} ${@}" 1796 debug-print "Calling: java -cp \"${cp}\" -Djava.awt.headless=true ${runner} ${@}"
1798 java -cp "${cp}" -Djava.awt.headless=true ${runner} "${@}" || die "Running junit failed" 1797 java -cp "${cp}" -Djava.awt.headless=true ${runner} "${@}" || die "Running junit failed"
1799} 1798}
1800 1799
1801# ------------------------------------------------------------------------------ 1800# ------------------------------------------------------------------------------
1801# @ebuild-function ejunit
1802#
1803# Junit wrapper function. Makes it easier to run the tests and checks for
1804# dev-java/junit in DEPEND. Launches the tests using org.junit.runner.JUnitCore.
1805#
1806# Examples:
1807# ejunit -cp build/classes org.blinkenlights.jid3.test.AllTests
1808# ejunit org.blinkenlights.jid3.test.AllTests
1809# ejunit org.blinkenlights.jid3.test.FirstTest \
1810# org.blinkenlights.jid3.test.SecondTest
1811#
1812# @param $1 - -cp or -classpath
1813# @param $2 - classpath; junit and recorded dependencies get appended
1814# @param $@ - the rest of the parameters are passed to java
1815# ------------------------------------------------------------------------------
1816ejunit() {
1817 debug-print-function ${FUNCNAME} $*
1818
1819 ejunit_ "junit" "${@}"
1820}
1821
1822# ------------------------------------------------------------------------------
1823# @ebuild-function ejunit4
1824#
1825# Junit4 wrapper function. Makes it easier to run the tests and checks for
1826# dev-java/junit:4 in DEPEND. Launches the tests using junit.textui.TestRunner.
1827#
1828# Examples:
1829# ejunit4 -cp build/classes org.blinkenlights.jid3.test.AllTests
1830# ejunit4 org.blinkenlights.jid3.test.AllTests
1831# ejunit4 org.blinkenlights.jid3.test.FirstTest \
1832# org.blinkenlights.jid3.test.SecondTest
1833#
1834# @param $1 - -cp or -classpath
1835# @param $2 - classpath; junit and recorded dependencies get appended
1836# @param $@ - the rest of the parameters are passed to java
1837# ------------------------------------------------------------------------------
1838ejunit4() {
1839 debug-print-function ${FUNCNAME} $*
1840
1841 ejunit_ "junit-4" "${@}"
1842}
1843
1844# ------------------------------------------------------------------------------
1802# @section-end helper 1845# @section-end helper
1803# ------------------------------------------------------------------------------ 1846# ------------------------------------------------------------------------------
1847
1848# ------------------------------------------------------------------------------
1849# @eclass-src_prepare
1850#
1851# src_prepare Searches for bundled jars
1852# Don't call directly, but via java-pkg-2_src_prepare!
1853# ------------------------------------------------------------------------------
1854
1855java-utils-2_src_prepare() {
1856 [[ ${EBUILD_PHASE} == prepare ]] &&
1857 java-pkg_func-exists java_prepare && java_prepare
1858
1859 # Remember that eant will call this unless called via Portage
1860 if [[ ! -e "${T}/java-utils-2_src_prepare-run" ]] && is-java-strict; then
1861 echo "Searching for bundled jars:"
1862 java-pkg_find-normal-jars || echo "None found."
1863 echo "Searching for bundled classes (no output if none found):"
1864 find "${WORKDIR}" -name "*.class"
1865 echo "Search done."
1866 fi
1867 touch "${T}/java-utils-2_src_prepare-run"
1868}
1869
1870# ------------------------------------------------------------------------------
1871# @eclass-pkg_preinst
1872#
1873# pkg_preinst Searches for missing and unneeded dependencies
1874# Don't call directly, but via java-pkg-2_pkg_preinst!
1875# ------------------------------------------------------------------------------
1876
1877java-utils-2_pkg_preinst() {
1878 if is-java-strict; then
1879 if has_version dev-java/java-dep-check; then
1880 [[ -e "${JAVA_PKG_ENV}" ]] || return
1881 local output=$(GENTOO_VM= java-dep-check --image "${D}" "${JAVA_PKG_ENV}")
1882 if [[ ${output} && has_version <=dev-java/java-dep-check-0.2 ]]; then
1883 ewarn "Possibly unneeded dependencies found in package.env:"
1884 for dep in ${output}; do
1885 ewarn "\t${dep}"
1886 done
1887 fi
1888 if [[ ${output} && has_version >dev-java/java-dep-check-0.2 ]]; then
1889 ewarn "${output}"
1890 fi
1891 else
1892 eerror "Install dev-java/java-dep-check for dependency checking"
1893 fi
1894 fi
1895}
1804 1896
1805# ------------------------------------------------------------------------------ 1897# ------------------------------------------------------------------------------
1806# @section-begin build 1898# @section-begin build
1807# @section-summary Build functions 1899# @section-summary Build functions
1808# 1900#
1817# compiler. Will also set proper ANT_TASKS from the variable ANT_TASKS, 1909# compiler. Will also set proper ANT_TASKS from the variable ANT_TASKS,
1818# variables: 1910# variables:
1819# EANT_GENTOO_CLASSPATH - calls java-pkg_getjars for the value and adds to the 1911# EANT_GENTOO_CLASSPATH - calls java-pkg_getjars for the value and adds to the
1820# gentoo.classpath property. Be sure to call 1912# gentoo.classpath property. Be sure to call
1821# java-ant_rewrite-classpath in src_unpack. 1913# java-ant_rewrite-classpath in src_unpack.
1822# JAVA_PKG_NO_BUNDLED_SEARCH - Don't search for bundled jars or class files 1914# EANT_NEEDS_TOOLS - add tools.jar to the gentoo.classpath. Should only be used
1915# for build-time purposes, the dependency is not recorded to
1916# package.env!
1823# *ANT_TASKS - used to determine ANT_TASKS before calling Ant. 1917# *ANT_TASKS - used to determine ANT_TASKS before calling Ant.
1824# ------------------------------------------------------------------------------ 1918# ------------------------------------------------------------------------------
1825eant() { 1919eant() {
1826 debug-print-function ${FUNCNAME} $* 1920 debug-print-function ${FUNCNAME} $*
1827 1921
1828 if [[ ${EBUILD_PHASE} = compile ]]; then 1922 if [[ ${EBUILD_PHASE} = compile ]]; then
1829 # Used to be done in hooks in java-ant-2.eclass but moved here so that we can 1923 java-ant-2_src_configure
1830 # finally get rid of the hooks without breaking stuff 1924 java-utils-2_src_prepare
1831
1832 [[ "${JAVA_ANT_IGNORE_SYSTEM_CLASSES}" && "${JAVA_PKG_BSFIX}" ]] \
1833 && java-ant_ignore-system-classes "${S}/build.xml"
1834
1835 if hasq java-ant-2 ${INHERITED}; then
1836 java-ant_bsfix
1837 fi 1925 fi
1838 1926
1839 # eant can be called multiple times
1840 JAVA_PKG_BSFIX="off"
1841
1842 if [[ -z ${JAVA_PKG_NO_BUNDLED_SEARCH} ]] && is-java-strict; then
1843 echo "Searching for bundled jars:"
1844 java-pkg_find-normal-jars || echo "None found."
1845 echo "Searching for bundled classes (no output if none found):"
1846 find "${WORKDIR}" -name "*.class"
1847 echo "Search done."
1848 JAVA_PKG_NO_BUNDLED_SEARCH=true # eant can be called many times
1849 fi
1850 fi
1851
1852 if ! hasq java-ant-2 ${INHERITED}; then 1927 if ! has java-ant-2 ${INHERITED}; then
1853 local msg="You should inherit java-ant-2 when using eant" 1928 local msg="You should inherit java-ant-2 when using eant"
1854 java-pkg_announce-qa-violation "${msg}" 1929 java-pkg_announce-qa-violation "${msg}"
1855 fi 1930 fi
1856 1931
1857 local antflags="-Dnoget=true -Dmaven.mode.offline=true -Dbuild.sysclasspath=ignore" 1932 local antflags="-Dnoget=true -Dmaven.mode.offline=true -Dbuild.sysclasspath=ignore"
1932 2007
1933 if [[ ${EBUILD_PHASE} = "test" ]]; then 2008 if [[ ${EBUILD_PHASE} = "test" ]]; then
1934 antflags="${antflags} -DJunit.present=true" 2009 antflags="${antflags} -DJunit.present=true"
1935 [[ ${ANT_TASKS} = *ant-junit* ]] && gcp="${gcp} junit" 2010 [[ ${ANT_TASKS} = *ant-junit* ]] && gcp="${gcp} junit"
1936 getjarsarg="--with-dependencies" 2011 getjarsarg="--with-dependencies"
2012 else
2013 antflags="${antflags} -Dmaven.test.skip=true"
1937 fi 2014 fi
1938 2015
1939 local cp 2016 local cp
1940 2017
1941 for atom in ${gcp}; do 2018 for atom in ${gcp}; do
1942 cp="${cp}:$(java-pkg_getjars ${getjarsarg} ${atom})" 2019 cp="${cp}:$(java-pkg_getjars ${getjarsarg} ${atom})"
1943 done 2020 done
1944 2021
2022 [[ -n "${EANT_NEEDS_TOOLS}" ]] && cp="${cp}:$(java-config --tools)"
2023
1945 if [[ ${cp} ]]; then 2024 if [[ ${cp} ]]; then
1946 # It seems ant does not like single quotes around ${cp} 2025 # It seems ant does not like single quotes around ${cp}
2026 cp=${cp#:}
2027 [[ ${EANT_GENTOO_CLASSPATH_EXTRA} ]] && \
2028 cp="${cp}:${EANT_GENTOO_CLASSPATH_EXTRA}"
1947 antflags="${antflags} -Dgentoo.classpath=\"${cp#:}\"" 2029 antflags="${antflags} -Dgentoo.classpath=\"${cp}\""
1948 fi 2030 fi
1949 2031
1950 [[ -n ${JAVA_PKG_DEBUG} ]] && echo ant ${antflags} "${@}" 2032 [[ -n ${JAVA_PKG_DEBUG} ]] && echo ant ${antflags} "${@}"
1951 debug-print "Calling ant (GENTOO_VM: ${GENTOO_VM}): ${antflags} ${@}" 2033 debug-print "Calling ant (GENTOO_VM: ${GENTOO_VM}): ${antflags} ${@}"
1952 ant ${antflags} "${@}" || die "eant failed" 2034 ant ${antflags} "${@}" || die "eant failed"
2053# call it during each of the phases of the merge process. 2135# call it during each of the phases of the merge process.
2054# 2136#
2055# ----------------------------------------------------------------------------- 2137# -----------------------------------------------------------------------------
2056java-pkg_init() { 2138java-pkg_init() {
2057 debug-print-function ${FUNCNAME} $* 2139 debug-print-function ${FUNCNAME} $*
2140
2141 # Don't set up build environment if installing from binary. #206024 #258423
2142 [[ "${MERGE_TYPE}" == "binary" ]] && return
2143 # Also try Portage's nonstandard EMERGE_FROM for old EAPIs, if it doesn't
2144 # work nothing is lost.
2145 has ${EAPI:-0} 0 1 2 3 && [[ "${EMERGE_FROM}" == "binary" ]] && return
2146
2058 unset JAVAC 2147 unset JAVAC
2059 unset JAVA_HOME 2148 unset JAVA_HOME
2149
2150 java-config --help >/dev/null || {
2151 eerror ""
2152 eerror "Can't run java-config --help"
2153 eerror "Have you upgraded python recently but haven't"
2154 eerror "run python-updater yet?"
2155 die "Can't run java-config --help"
2156 }
2060 2157
2061 # People do all kinds of weird things. 2158 # People do all kinds of weird things.
2062 # http://forums.gentoo.org/viewtopic-p-3943166.html 2159 # http://forums.gentoo.org/viewtopic-p-3943166.html
2063 local silence="${SILENCE_JAVA_OPTIONS_WARNING}" 2160 local silence="${SILENCE_JAVA_OPTIONS_WARNING}"
2064 local accept="${I_WANT_GLOBAL_JAVA_OPTIONS}" 2161 local accept="${I_WANT_GLOBAL_JAVA_OPTIONS}"
2102 export CLASSPATH= 2199 export CLASSPATH=
2103 2200
2104 # Unset external ANT_ stuff 2201 # Unset external ANT_ stuff
2105 export ANT_TASKS= 2202 export ANT_TASKS=
2106 export ANT_OPTS= 2203 export ANT_OPTS=
2204 export ANT_RESPECT_JAVA_HOME=
2107} 2205}
2108 2206
2109# ------------------------------------------------------------------------------ 2207# ------------------------------------------------------------------------------
2110# @function-internal java-pkg-init-compiler_ 2208# @function-internal java-pkg-init-compiler_
2111# 2209#
2273 # Create package.env 2371 # Create package.env
2274 ( 2372 (
2275 echo "DESCRIPTION=\"${DESCRIPTION}\"" 2373 echo "DESCRIPTION=\"${DESCRIPTION}\""
2276 echo "GENERATION=\"2\"" 2374 echo "GENERATION=\"2\""
2277 echo "SLOT=\"${SLOT}\"" 2375 echo "SLOT=\"${SLOT}\""
2376 echo "CATEGORY=\"${CATEGORY}\""
2377 echo "PVR=\"${PVR}\""
2278 2378
2279 [[ -n "${JAVA_PKG_CLASSPATH}" ]] && echo "CLASSPATH=\"${JAVA_PKG_CLASSPATH}\"" 2379 [[ -n "${JAVA_PKG_CLASSPATH}" ]] && echo "CLASSPATH=\"${JAVA_PKG_CLASSPATH}\""
2280 [[ -n "${JAVA_PKG_LIBRARY}" ]] && echo "LIBRARY_PATH=\"${JAVA_PKG_LIBRARY}\"" 2380 [[ -n "${JAVA_PKG_LIBRARY}" ]] && echo "LIBRARY_PATH=\"${JAVA_PKG_LIBRARY}\""
2281 [[ -n "${JAVA_PROVIDE}" ]] && echo "PROVIDES=\"${JAVA_PROVIDE}\"" 2381 [[ -n "${JAVA_PROVIDE}" ]] && echo "PROVIDES=\"${JAVA_PROVIDE}\""
2282 [[ -f "${JAVA_PKG_DEPEND_FILE}" ]] \ 2382 [[ -f "${JAVA_PKG_DEPEND_FILE}" ]] \
2283 && echo "DEPEND=\"$(cat "${JAVA_PKG_DEPEND_FILE}" | uniq | tr '\n' ':')\"" 2383 && echo "DEPEND=\"$(sort -u "${JAVA_PKG_DEPEND_FILE}" | tr '\n' ':')\""
2284 [[ -f "${JAVA_PKG_OPTIONAL_DEPEND_FILE}" ]] \ 2384 [[ -f "${JAVA_PKG_OPTIONAL_DEPEND_FILE}" ]] \
2285 && echo "OPTIONAL_DEPEND=\"$(cat "${JAVA_PKG_OPTIONAL_DEPEND_FILE}" | uniq | tr '\n' ':')\"" 2385 && echo "OPTIONAL_DEPEND=\"$(sort -u "${JAVA_PKG_OPTIONAL_DEPEND_FILE}" | tr '\n' ':')\""
2286 echo "VM=\"$(echo ${RDEPEND} ${DEPEND} | sed -e 's/ /\n/g' | sed -n -e '/virtual\/\(jre\|jdk\)/ { p;q }')\"" # TODO cleanup ! 2386 echo "VM=\"$(echo ${RDEPEND} ${DEPEND} | sed -e 's/ /\n/g' | sed -n -e '/virtual\/\(jre\|jdk\)/ { p;q }')\"" # TODO cleanup !
2387 [[ -f "${JAVA_PKG_BUILD_DEPEND_FILE}" ]] \
2388 && echo "BUILD_DEPEND=\"$(sort -u "${JAVA_PKG_BUILD_DEPEND_FILE}" | tr '\n' ':')\""
2287 ) > "${JAVA_PKG_ENV}" 2389 ) > "${JAVA_PKG_ENV}"
2288 2390
2289 # register target/source 2391 # register target/source
2290 local target="$(java-pkg_get-target)" 2392 local target="$(java-pkg_get-target)"
2291 local source="$(java-pkg_get-source)" 2393 local source="$(java-pkg_get-source)"
2324# ------------------------------------------------------------------------------ 2426# ------------------------------------------------------------------------------
2325# @internal-function java-pkg_record-jar_ 2427# @internal-function java-pkg_record-jar_
2326# 2428#
2327# Record an (optional) dependency to the package.env 2429# Record an (optional) dependency to the package.env
2328# @param --optional - record dependency as optional 2430# @param --optional - record dependency as optional
2431# @param --build - record dependency as build_only
2329# @param $1 - package to record 2432# @param $1 - package to record
2330# @param $2 - (optional) jar of package to record 2433# @param $2 - (optional) jar of package to record
2331# ------------------------------------------------------------------------------ 2434# ------------------------------------------------------------------------------
2332JAVA_PKG_DEPEND_FILE="${T}/java-pkg-depend" 2435JAVA_PKG_DEPEND_FILE="${T}/java-pkg-depend"
2333JAVA_PKG_OPTIONAL_DEPEND_FILE="${T}/java-pkg-optional-depend" 2436JAVA_PKG_OPTIONAL_DEPEND_FILE="${T}/java-pkg-optional-depend"
2437JAVA_PKG_BUILD_DEPEND_FILE="${T}/java-pkg-build-depend"
2334 2438
2335java-pkg_record-jar_() { 2439java-pkg_record-jar_() {
2336 debug-print-function ${FUNCNAME} $* 2440 debug-print-function ${FUNCNAME} $*
2337 2441
2338 local depend_file="${JAVA_PKG_DEPEND_FILE}" 2442 local depend_file="${JAVA_PKG_DEPEND_FILE}"
2339 if [[ "${1}" == "--optional" ]]; then 2443 case "${1}" in
2340 depend_file="${JAVA_PKG_OPTIONAL_DEPEND_FILE}" 2444 "--optional") depend_file="${JAVA_PKG_OPTIONAL_DEPEND_FILE}"; shift;;
2341 shift 2445 "--build-only") depend_file="${JAVA_PKG_BUILD_DEPEND_FILE}"; shift;;
2342 fi 2446 esac
2343 2447
2344 local pkg=${1} jar=${2} append 2448 local pkg=${1} jar=${2} append
2345 if [[ -z "${jar}" ]]; then 2449 if [[ -z "${jar}" ]]; then
2346 append="${pkg}" 2450 append="${pkg}"
2347 else 2451 else
2400# 2504#
2401# @return 0 - function is declared 2505# @return 0 - function is declared
2402# @return 1 - function is undeclared 2506# @return 1 - function is undeclared
2403# ------------------------------------------------------------------------------ 2507# ------------------------------------------------------------------------------
2404java-pkg_func-exists() { 2508java-pkg_func-exists() {
2405 if [[ -n "$(declare -f ${1})" ]]; then 2509 declare -F ${1} > /dev/null
2406 return 0
2407 else
2408 return 1
2409 fi
2410} 2510}
2411 2511
2412# ------------------------------------------------------------------------------ 2512# ------------------------------------------------------------------------------
2413# @internal-function java-pkg_setup-vm 2513# @internal-function java-pkg_setup-vm
2414# 2514#
2415# Sets up the environment for a specific VM 2515# Sets up the environment for a specific VM
2416# 2516#
2417# ------------------------------------------------------------------------------ 2517# ------------------------------------------------------------------------------
2418java-pkg_setup-vm() { 2518java-pkg_setup-vm() {
2419 debug-print-function ${FUNCNAME} $* 2519 debug-print-function ${FUNCNAME} $*
2420
2421 export LANG="C" LC_ALL="C"
2422 2520
2423 local vendor="$(java-pkg_get-vm-vendor)" 2521 local vendor="$(java-pkg_get-vm-vendor)"
2424 if [[ "${vendor}" == "sun" ]] && java-pkg_is-vm-version-ge "1.5" ; then 2522 if [[ "${vendor}" == "sun" ]] && java-pkg_is-vm-version-ge "1.5" ; then
2425 addpredict "/dev/random" 2523 addpredict "/dev/random"
2426 elif [[ "${vendor}" == "ibm" ]]; then 2524 elif [[ "${vendor}" == "ibm" ]]; then
2427 addpredict "/proc/self/maps" 2525 addpredict "/proc/self/maps"
2428 addpredict "/proc/cpuinfo" 2526 addpredict "/proc/cpuinfo"
2527 addpredict "/proc/self/coredump_filter"
2528 elif [[ "${vendor}" == "oracle" ]]; then
2529 addpredict "/dev/random"
2530 addpredict "/proc/self/coredump_filter"
2531 elif [[ "${vendor}" == icedtea* ]] && java-pkg_is-vm-version-ge "1.7" ; then
2532 addpredict "/dev/random"
2533 addpredict "/proc/self/coredump_filter"
2429 elif [[ "${vendor}" == "jrockit" ]]; then 2534 elif [[ "${vendor}" == "jrockit" ]]; then
2430 addpredict "/proc/cpuinfo" 2535 addpredict "/proc/cpuinfo"
2431 fi 2536 fi
2432} 2537}
2433 2538
2440# @return 1 - Package does not depend on virtual/jdk 2545# @return 1 - Package does not depend on virtual/jdk
2441# ------------------------------------------------------------------------------ 2546# ------------------------------------------------------------------------------
2442java-pkg_needs-vm() { 2547java-pkg_needs-vm() {
2443 debug-print-function ${FUNCNAME} $* 2548 debug-print-function ${FUNCNAME} $*
2444 2549
2445 if [[ -n "$(echo ${DEPEND} | sed -e '\:virtual/jdk:!d')" ]]; then 2550 if [[ -n "$(echo ${JAVA_PKG_NV_DEPEND:-${DEPEND}} | sed -e '\:virtual/jdk:!d')" ]]; then
2446 return 0 2551 return 0
2447 fi 2552 fi
2448 2553
2449 return 1 2554 return 1
2450} 2555}
2498 # If you're forcing the VM, I hope you know what your doing... 2603 # If you're forcing the VM, I hope you know what your doing...
2499 debug-print "JAVA_PKG_FORCE_VM used: ${JAVA_PKG_FORCE_VM}" 2604 debug-print "JAVA_PKG_FORCE_VM used: ${JAVA_PKG_FORCE_VM}"
2500 export GENTOO_VM="${JAVA_PKG_FORCE_VM}" 2605 export GENTOO_VM="${JAVA_PKG_FORCE_VM}"
2501 # if we're allowed to switch the vm... 2606 # if we're allowed to switch the vm...
2502 elif [[ "${JAVA_PKG_ALLOW_VM_CHANGE}" == "yes" ]]; then 2607 elif [[ "${JAVA_PKG_ALLOW_VM_CHANGE}" == "yes" ]]; then
2503 debug-print "depend-java-query: NV_DEPEND: ${JAVA_PKG_NV_DEPEND:-${DEPEND}} VNEED: ${JAVA_PKG_VNEED}" 2608 debug-print "depend-java-query: NV_DEPEND: ${JAVA_PKG_NV_DEPEND:-${DEPEND}}"
2504 if [[ -n ${JAVA_PKG_VNEED} ]]; then
2505 GENTOO_VM="$(depend-java-query --need-virtual "${JAVA_PKG_VNEED}" --get-vm "${JAVA_PKG_NV_DEPEND:-${DEPEND}}")"
2506 else
2507 GENTOO_VM="$(depend-java-query --get-vm "${JAVA_PKG_NV_DEPEND:-${DEPEND}}")" 2609 GENTOO_VM="$(depend-java-query --get-vm "${JAVA_PKG_NV_DEPEND:-${DEPEND}}")"
2508 fi
2509 if [[ -z "${GENTOO_VM}" || "${GENTOO_VM}" == "None" ]]; then 2610 if [[ -z "${GENTOO_VM}" || "${GENTOO_VM}" == "None" ]]; then
2510 eerror "Unable to determine VM for building from dependencies:" 2611 eerror "Unable to determine VM for building from dependencies:"
2511 echo "NV_DEPEND: ${JAVA_PKG_NV_DEPEND:-${DEPEND}}" 2612 echo "NV_DEPEND: ${JAVA_PKG_NV_DEPEND:-${DEPEND}}"
2512 echo "VNEED: ${JAVA_PKG_VNEED}"
2513 die "Failed to determine VM for building." 2613 die "Failed to determine VM for building."
2514 else 2614 else
2515 export GENTOO_VM 2615 export GENTOO_VM
2516 fi 2616 fi
2517 # otherwise just make sure the current VM is sufficient 2617 # otherwise just make sure the current VM is sufficient
2556# 2656#
2557# Enhanced die for Java packages, which displays some information that may be 2657# Enhanced die for Java packages, which displays some information that may be
2558# useful for debugging bugs on bugzilla. 2658# useful for debugging bugs on bugzilla.
2559# ------------------------------------------------------------------------------ 2659# ------------------------------------------------------------------------------
2560#register_die_hook java-pkg_die 2660#register_die_hook java-pkg_die
2561if ! hasq java-pkg_die ${EBUILD_DEATH_HOOKS}; then 2661if ! has java-pkg_die ${EBUILD_DEATH_HOOKS}; then
2562 EBUILD_DEATH_HOOKS="${EBUILD_DEATH_HOOKS} java-pkg_die" 2662 EBUILD_DEATH_HOOKS="${EBUILD_DEATH_HOOKS} java-pkg_die"
2563fi 2663fi
2564 2664
2565java-pkg_die() { 2665java-pkg_die() {
2566 echo "!!! When you file a bug report, please include the following information:" >&2 2666 echo "!!! When you file a bug report, please include the following information:" >&2
2640 2740
2641 local limit_to="${1}" 2741 local limit_to="${1}"
2642 local target_pkg="${2}" 2742 local target_pkg="${2}"
2643 local dev_error="" 2743 local dev_error=""
2644 2744
2745 # remove the version specification, which may include globbing (* and [123])
2645 local stripped_pkg=$(echo "${target_pkg}" | sed \ 2746 local stripped_pkg=$(echo "${target_pkg}" | sed \
2646 's/-[0-9]*\(\.[0-9]\)*$//') 2747 's/-\([0-9*]*\(\[[0-9]*\]\)*\)*\(\.\([0-9*]*\(\[[0-9]*\]\)*\)*\)*$//')
2647 2748
2648 debug-print "Matching against: ${stripped_pkg}" 2749 debug-print "Matching against: ${stripped_pkg}"
2649 2750
2650 if [[ ${limit_to} != runtime && ! ( "${DEPEND}" =~ "$stripped_pkg" ) ]]; then 2751 if [[ ${limit_to} != runtime && ! ( "${DEPEND}" =~ "$stripped_pkg" ) ]]; then
2651 dev_error="The ebuild is attempting to use ${target_pkg} that is not" 2752 dev_error="The ebuild is attempting to use ${target_pkg} that is not"
2701 java-pkg_announce-qa-violation "installing versioned jar '${jar}'" 2802 java-pkg_announce-qa-violation "installing versioned jar '${jar}'"
2702 fi 2803 fi
2703} 2804}
2704 2805
2705java-pkg_check-jikes() { 2806java-pkg_check-jikes() {
2706 if hasq jikes ${IUSE}; then 2807 if has jikes ${IUSE}; then
2707 java-pkg_announce-qa-violation "deprecated USE flag 'jikes' in IUSE" 2808 java-pkg_announce-qa-violation "deprecated USE flag 'jikes' in IUSE"
2708 fi 2809 fi
2709} 2810}
2710 2811
2711java-pkg_announce-qa-violation() { 2812java-pkg_announce-qa-violation() {
2727is-java-strict() { 2828is-java-strict() {
2728 [[ -n ${JAVA_PKG_STRICT} ]] 2829 [[ -n ${JAVA_PKG_STRICT} ]]
2729 return $? 2830 return $?
2730} 2831}
2731 2832
2833
2732# ------------------------------------------------------------------------------ 2834# ------------------------------------------------------------------------------
2733# @eclass-end 2835# @eclass-end
2734# ------------------------------------------------------------------------------ 2836# ------------------------------------------------------------------------------

Legend:
Removed from v.1.110  
changed lines
  Added in v.1.148

  ViewVC Help
Powered by ViewVC 1.1.20