/[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.130
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.130 2009/11/08 20:39:30 caster 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" 66hasq "${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.6 ${JAVA_PKG_PORTAGE_DEP}"
76hasq source ${JAVA_PKG_IUSE} && JAVA_PKG_E_DEPEND="${JAVA_PKG_E_DEPEND} source? ( app-arch/zip )" 76hasq 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#
365 if [[ ${jar} = *\** ]]; then 382 if [[ ${jar} = *\** ]]; then
366 eerror "The argument ${jar} to ${FUNCNAME}" 383 eerror "The argument ${jar} to ${FUNCNAME}"
367 eerror "has * in it. If you want it to glob in" 384 eerror "has * in it. If you want it to glob in"
368 eerror '${D} add ${D} to the argument.' 385 eerror '${D} add ${D} to the argument.'
369 fi 386 fi
387 debug-print "${jar} or ${D}${jar} not found"
370 die "${jar} does not exist" 388 die "${jar} does not exist"
371 fi 389 fi
372 done 390 done
373 391
374 java-pkg_do_write_ 392 java-pkg_do_write_
429# @param $@ - JNI libraries to install 447# @param $@ - JNI libraries to install
430# ------------------------------------------------------------------------------ 448# ------------------------------------------------------------------------------
431java-pkg_doso() { 449java-pkg_doso() {
432 debug-print-function ${FUNCNAME} $* 450 debug-print-function ${FUNCNAME} $*
433 451
434 [[ ${#} -lt 1 ]] && "At least one argument required for ${FUNCNAME}"
435 java-pkg_check-phase install 452 java-pkg_check-phase install
436 453
437 [[ ${#} -lt 1 ]] && die "At least one argument required for ${FUNCNAME}" 454 [[ ${#} -lt 1 ]] && die "${FUNCNAME} requires at least one argument"
438 455
439 java-pkg_init_paths_ 456 java-pkg_init_paths_
440 457
441 local lib 458 local lib
442 # for each lib 459 # for each lib
445 if [[ -e "${lib}" ]] ; then 462 if [[ -e "${lib}" ]] ; then
446 # install if it isn't a symlink 463 # install if it isn't a symlink
447 if [[ ! -L "${lib}" ]] ; then 464 if [[ ! -L "${lib}" ]] ; then
448 INSDESTTREE="${JAVA_PKG_LIBDEST}" \ 465 INSDESTTREE="${JAVA_PKG_LIBDEST}" \
449 INSOPTIONS="${LIBOPTIONS}" \ 466 INSOPTIONS="${LIBOPTIONS}" \
450 doins "${lib}" || "failed to install ${lib}" 467 doins "${lib}" || die "failed to install ${lib}"
451 java-pkg_append_ JAVA_PKG_LIBRARY "${JAVA_PKG_LIBDEST}" 468 java-pkg_append_ JAVA_PKG_LIBRARY "${JAVA_PKG_LIBDEST}"
452 debug-print "Installing ${lib} to ${JAVA_PKG_LIBDEST}" 469 debug-print "Installing ${lib} to ${JAVA_PKG_LIBDEST}"
453 # otherwise make a symlink to the symlink's origin 470 # otherwise make a symlink to the symlink's origin
454 else 471 else
455 # TODO use dosym 472 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" 473 debug-print "${lib} is a symlink, linking accordantly"
459 fi 474 fi
460 # otherwise die 475 # otherwise die
461 else 476 else
462 die "${lib} does not exist" 477 die "${lib} does not exist"
463 fi 478 fi
479java-pkg_regso() { 494java-pkg_regso() {
480 debug-print-function ${FUNCNAME} $* 495 debug-print-function ${FUNCNAME} $*
481 496
482 java-pkg_check-phase install 497 java-pkg_check-phase install
483 498
484 [[ ${#} -lt 1 ]] && "at least one argument needed" 499 [[ ${#} -lt 1 ]] && die "${FUNCNAME} requires at least one argument"
485 500
486 java-pkg_init_paths_ 501 java-pkg_init_paths_
487 502
488 local lib target_dir 503 local lib target_dir
489 for lib in "$@" ; do 504 for lib in "$@" ; do
874 889
875 local build_only="" 890 local build_only=""
876 local destdir="." 891 local destdir="."
877 local deep="" 892 local deep=""
878 local virtual="" 893 local virtual=""
894 local record_jar=""
879 895
880 [[ "${EBUILD_PHASE}" == "test" ]] && build_only="build" 896 [[ "${EBUILD_PHASE}" == "test" ]] && build_only="build"
881 897
882 while [[ "${1}" == --* ]]; do 898 while [[ "${1}" == --* ]]; do
883 if [[ "${1}" = "--build-only" ]]; then 899 if [[ "${1}" = "--build-only" ]]; then
918 for pkg in ${target_pkg//,/ }; do 934 for pkg in ${target_pkg//,/ }; do
919 java-pkg_ensure-dep "${build_only}" "${pkg}" 935 java-pkg_ensure-dep "${build_only}" "${pkg}"
920 [[ -z "${build_only}" ]] && java-pkg_record-jar_ "${pkg}" 936 [[ -z "${build_only}" ]] && java-pkg_record-jar_ "${pkg}"
921 done 937 done
922 # setting this disables further record-jar_ calls later 938 # setting this disables further record-jar_ calls later
923 build_only="build" 939 record_jar="true"
924 else 940 else
925 java-pkg_ensure-dep "${build_only}" "${target_pkg}" 941 java-pkg_ensure-dep "${build_only}" "${target_pkg}"
926 fi 942 fi
927 943
928 # Record the entire virtual as a dependency so that 944 # Record the entire virtual as a dependency so that
929 # no jars are missed. 945 # no jars are missed.
930 if [[ -z "${build_only}" && -n "${virtual}" ]]; then 946 if [[ -z "${build_only}" && -n "${virtual}" ]]; then
931 java-pkg_record-jar_ "${target_pkg}" 947 java-pkg_record-jar_ "${target_pkg}"
932 # setting this disables further record-jars_ calls later 948 # setting this disables further record-jars_ calls later
933 build_only="build" 949 record_jar="true"
934 fi 950 fi
935 951
936 pushd ${destdir} > /dev/null \ 952 pushd ${destdir} > /dev/null \
937 || die "failed to change directory to ${destdir}" 953 || die "failed to change directory to ${destdir}"
938 954
946 # If no specific target jar was indicated, link it 962 # If no specific target jar was indicated, link it
947 if [[ -z "${target_jar}" ]] ; then 963 if [[ -z "${target_jar}" ]] ; then
948 [[ -f "${target_jar}" ]] && rm "${target_jar}" 964 [[ -f "${target_jar}" ]] && rm "${target_jar}"
949 ln -snf "${jar}" \ 965 ln -snf "${jar}" \
950 || die "Failed to make symlink from ${jar} to ${jar_name}" 966 || die "Failed to make symlink from ${jar} to ${jar_name}"
967 if [[ -z "${record_jar}" ]]; then
968 if [[ -z "${build_only}" ]]; then
951 [[ -z "${build_only}" ]] && java-pkg_record-jar_ "${target_pkg}" "${jar}" 969 java-pkg_record-jar_ "${target_pkg}" "${jar}"
970 else
971 java-pkg_record-jar_ --build-only "${target_pkg}" "${jar}"
972 fi
973 fi
952 # otherwise, if the current jar is the target jar, link it 974 # otherwise, if the current jar is the target jar, link it
953 elif [[ "${jar_name}" == "${target_jar}" ]] ; then 975 elif [[ "${jar_name}" == "${target_jar}" ]] ; then
954 [[ -f "${destjar}" ]] && rm "${destjar}" 976 [[ -f "${destjar}" ]] && rm "${destjar}"
955 ln -snf "${jar}" "${destjar}" \ 977 ln -snf "${jar}" "${destjar}" \
956 || die "Failed to make symlink from ${jar} to ${destjar}" 978 || die "Failed to make symlink from ${jar} to ${destjar}"
979 if [[ -z "${record_jar}" ]]; then
980 if [[ -z "${build_only}" ]]; then
957 [[ -z "${build_only}" ]] && java-pkg_record-jar_ "${target_pkg}" "${jar}" 981 java-pkg_record-jar_ "${target_pkg}" "${jar}"
982 else
983 java-pkg_record-jar_ --build-only "${target_jar}" "${jar}"
984 fi
985 fi
958 popd > /dev/null 986 popd > /dev/null
959 return 0 987 return 0
960 fi 988 fi
961 done 989 done
962 popd > /dev/null 990 popd > /dev/null
1035 1063
1036 for pkg in ${pkgs//,/ }; do 1064 for pkg in ${pkgs//,/ }; do
1037 java-pkg_ensure-dep "${build_only}" "${pkg}" 1065 java-pkg_ensure-dep "${build_only}" "${pkg}"
1038 done 1066 done
1039 1067
1040 # Only record jars that aren't build-only 1068 for pkg in ${pkgs//,/ }; do
1041 if [[ -z "${build_only}" ]]; then 1069 if [[ -z "${build_only}" ]]; then
1042 for pkg in ${pkgs//,/ }; do
1043 java-pkg_record-jar_ "${pkg}" 1070 java-pkg_record-jar_ "${pkg}"
1071 else
1072 java-pkg_record-jar_ --build-only "${pkg}"
1073 fi
1044 done 1074 done
1045 fi
1046 1075
1047 echo "${jars}" 1076 echo "${jars}"
1048} 1077}
1049 1078
1050# ------------------------------------------------------------------------------ 1079# ------------------------------------------------------------------------------
1071java-pkg_getjar() { 1100java-pkg_getjar() {
1072 debug-print-function ${FUNCNAME} $* 1101 debug-print-function ${FUNCNAME} $*
1073 1102
1074 local build_only="" 1103 local build_only=""
1075 local virtual="" 1104 local virtual=""
1105 local record_jar=""
1076 1106
1077 [[ "${EBUILD_PHASE}" == "test" ]] && build_only="build" 1107 [[ "${EBUILD_PHASE}" == "test" ]] && build_only="build"
1078 1108
1079 while [[ "${1}" == --* ]]; do 1109 while [[ "${1}" == --* ]]; do
1080 if [[ "${1}" = "--build-only" ]]; then 1110 if [[ "${1}" = "--build-only" ]]; then
1106 java-pkg_ensure-dep "${build_only}" "${pkg}" 1136 java-pkg_ensure-dep "${build_only}" "${pkg}"
1107 1137
1108 # Record the package(Virtual) as a dependency and then set build_only 1138 # Record the package(Virtual) as a dependency and then set build_only
1109 # So that individual jars are not recorded. 1139 # So that individual jars are not recorded.
1110 if [[ -n "${virtual}" ]]; then 1140 if [[ -n "${virtual}" ]]; then
1141 if [[ -z "${build_only}" ]]; then
1111 java-pkg_record-jar_ "${pkg}" 1142 java-pkg_record-jar_ "${pkg}"
1112 build_only="true" 1143 else
1144 java-pkg_record-jar_ --build-only "${pkg}"
1145 fi
1146 record_jar="true"
1113 fi 1147 fi
1114 1148
1115 for jar in ${classpath//:/ }; do 1149 for jar in ${classpath//:/ }; do
1116 if [[ ! -f "${jar}" ]] ; then 1150 if [[ ! -f "${jar}" ]] ; then
1117 die "Installation problem with jar ${jar} in ${pkg} - is it installed?" 1151 die "Installation problem with jar ${jar} in ${pkg} - is it installed?"
1118 fi 1152 fi
1119 1153
1120 if [[ "$(basename ${jar})" == "${target_jar}" ]] ; then 1154 if [[ "$(basename ${jar})" == "${target_jar}" ]] ; then
1121 # Only record jars that aren't build-only 1155 # Only record jars that aren't build-only
1122 [[ -z "${build_only}" ]] && java-pkg_record-jar_ "${pkg}" "${jar}" 1156 if [[ -z "${record_jar}" ]]; then
1157 if [[ -z "${build_only}" ]]; then
1158 java-pkg_record-jar_ "${pkg}" "${jar}"
1159 else
1160 java-pkg_record-jar_ --build-only "${pkg}" "${jar}"
1161 fi
1162 fi
1123 echo "${jar}" 1163 echo "${jar}"
1124 return 0 1164 return 0
1125 fi 1165 fi
1126 done 1166 done
1127 1167
1308# @section-begin helper 1348# @section-begin helper
1309# @section-summary Helper functions 1349# @section-summary Helper functions
1310# 1350#
1311# Various other functions to use from an ebuild 1351# Various other functions to use from an ebuild
1312# ------------------------------------------------------------------------------ 1352# ------------------------------------------------------------------------------
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 1353
1391# ------------------------------------------------------------------------------ 1354# ------------------------------------------------------------------------------
1392# @ebuild-function java-pkg_find-normal-jars 1355# @ebuild-function java-pkg_find-normal-jars
1393# 1356#
1394# Find the files with suffix .jar file in the given directory or $WORKDIR 1357# Find the files with suffix .jar file in the given directory or $WORKDIR
1801# ------------------------------------------------------------------------------ 1764# ------------------------------------------------------------------------------
1802# @section-end helper 1765# @section-end helper
1803# ------------------------------------------------------------------------------ 1766# ------------------------------------------------------------------------------
1804 1767
1805# ------------------------------------------------------------------------------ 1768# ------------------------------------------------------------------------------
1769# @eclass-src_prepare
1770#
1771# src_prepare Searches for bundled jars
1772# Don't call directly, but via java-pkg-2_src_prepare!
1773# ------------------------------------------------------------------------------
1774
1775java-utils-2_src_prepare() {
1776 [[ ${EBUILD_PHASE} == prepare ]] &&
1777 java-pkg_func-exists java_prepare && java_prepare
1778
1779 # Remember that eant will call this unless called via Portage
1780 if [[ ! -e "${T}/java-utils-2_src_prepare-run" ]] && is-java-strict; then
1781 echo "Searching for bundled jars:"
1782 java-pkg_find-normal-jars || echo "None found."
1783 echo "Searching for bundled classes (no output if none found):"
1784 find "${WORKDIR}" -name "*.class"
1785 echo "Search done."
1786 fi
1787 touch "${T}/java-utils-2_src_prepare-run"
1788}
1789
1790# ------------------------------------------------------------------------------
1791# @eclass-pkg_preinst
1792#
1793# pkg_preinst Searches for missing and unneeded dependencies
1794# Don't call directly, but via java-pkg-2_pkg_preinst!
1795# ------------------------------------------------------------------------------
1796
1797java-utils-2_pkg_preinst() {
1798 if is-java-strict; then
1799 if has_version dev-java/java-dep-check; then
1800 [[ -e "${JAVA_PKG_ENV}" ]] || return
1801 local output=$(GENTOO_VM= java-dep-check --image "${D}" "${JAVA_PKG_ENV}")
1802 if [[ ${output} && has_version <=dev-java/java-dep-check-0.2 ]]; then
1803 ewarn "Possibly unneeded dependencies found in package.env:"
1804 for dep in ${output}; do
1805 ewarn "\t${dep}"
1806 done
1807 fi
1808 if [[ ${output} && has_version >dev-java/java-dep-check-0.2 ]]; then
1809 ewarn "${output}"
1810 fi
1811 else
1812 eerror "Install dev-java/java-dep-check for dependency checking"
1813 fi
1814 fi
1815}
1816
1817# ------------------------------------------------------------------------------
1806# @section-begin build 1818# @section-begin build
1807# @section-summary Build functions 1819# @section-summary Build functions
1808# 1820#
1809# These are some functions for building a package. In particular, it consists of 1821# These are some functions for building a package. In particular, it consists of
1810# wrappers for javac and ant. 1822# wrappers for javac and ant.
1817# compiler. Will also set proper ANT_TASKS from the variable ANT_TASKS, 1829# compiler. Will also set proper ANT_TASKS from the variable ANT_TASKS,
1818# variables: 1830# variables:
1819# EANT_GENTOO_CLASSPATH - calls java-pkg_getjars for the value and adds to the 1831# EANT_GENTOO_CLASSPATH - calls java-pkg_getjars for the value and adds to the
1820# gentoo.classpath property. Be sure to call 1832# gentoo.classpath property. Be sure to call
1821# java-ant_rewrite-classpath in src_unpack. 1833# java-ant_rewrite-classpath in src_unpack.
1834# EANT_NEEDS_TOOLS - add tools.jar to the gentoo.classpath. Should only be used
1835# for build-time purposes, the dependency is not recorded to
1836# package.env!
1822# JAVA_PKG_NO_BUNDLED_SEARCH - Don't search for bundled jars or class files 1837# JAVA_PKG_NO_BUNDLED_SEARCH - Don't search for bundled jars or class files
1823# *ANT_TASKS - used to determine ANT_TASKS before calling Ant. 1838# *ANT_TASKS - used to determine ANT_TASKS before calling Ant.
1824# ------------------------------------------------------------------------------ 1839# ------------------------------------------------------------------------------
1825eant() { 1840eant() {
1826 debug-print-function ${FUNCNAME} $* 1841 debug-print-function ${FUNCNAME} $*
1827 1842
1828 if [[ ${EBUILD_PHASE} = compile ]]; then 1843 if [[ ${EBUILD_PHASE} = compile ]]; then
1829 # Used to be done in hooks in java-ant-2.eclass but moved here so that we can 1844 java-ant-2_src_configure
1830 # finally get rid of the hooks without breaking stuff 1845 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
1838
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 1846 fi
1851 1847
1852 if ! hasq java-ant-2 ${INHERITED}; then 1848 if ! hasq java-ant-2 ${INHERITED}; then
1853 local msg="You should inherit java-ant-2 when using eant" 1849 local msg="You should inherit java-ant-2 when using eant"
1854 java-pkg_announce-qa-violation "${msg}" 1850 java-pkg_announce-qa-violation "${msg}"
1940 1936
1941 for atom in ${gcp}; do 1937 for atom in ${gcp}; do
1942 cp="${cp}:$(java-pkg_getjars ${getjarsarg} ${atom})" 1938 cp="${cp}:$(java-pkg_getjars ${getjarsarg} ${atom})"
1943 done 1939 done
1944 1940
1941 [[ -n "${EANT_NEEDS_TOOLS}" ]] && cp="${cp}:$(java-config --tools)"
1942
1945 if [[ ${cp} ]]; then 1943 if [[ ${cp} ]]; then
1946 # It seems ant does not like single quotes around ${cp} 1944 # It seems ant does not like single quotes around ${cp}
1945 cp=${cp#:}
1946 [[ ${EANT_GENTOO_CLASSPATH_EXTRA} ]] && \
1947 cp="${cp}:${EANT_GENTOO_CLASSPATH_EXTRA}"
1947 antflags="${antflags} -Dgentoo.classpath=\"${cp#:}\"" 1948 antflags="${antflags} -Dgentoo.classpath=\"${cp}\""
1948 fi 1949 fi
1949 1950
1950 [[ -n ${JAVA_PKG_DEBUG} ]] && echo ant ${antflags} "${@}" 1951 [[ -n ${JAVA_PKG_DEBUG} ]] && echo ant ${antflags} "${@}"
1951 debug-print "Calling ant (GENTOO_VM: ${GENTOO_VM}): ${antflags} ${@}" 1952 debug-print "Calling ant (GENTOO_VM: ${GENTOO_VM}): ${antflags} ${@}"
1952 ant ${antflags} "${@}" || die "eant failed" 1953 ant ${antflags} "${@}" || die "eant failed"
2055# ----------------------------------------------------------------------------- 2056# -----------------------------------------------------------------------------
2056java-pkg_init() { 2057java-pkg_init() {
2057 debug-print-function ${FUNCNAME} $* 2058 debug-print-function ${FUNCNAME} $*
2058 unset JAVAC 2059 unset JAVAC
2059 unset JAVA_HOME 2060 unset JAVA_HOME
2061
2062 java-config --help >/dev/null || {
2063 eerror ""
2064 eerror "Can't run java-config --help"
2065 eerror "Have you upgraded python recently but haven't"
2066 eerror "run python-updater yet?"
2067 die "Can't run java-config --help"
2068 }
2060 2069
2061 # People do all kinds of weird things. 2070 # People do all kinds of weird things.
2062 # http://forums.gentoo.org/viewtopic-p-3943166.html 2071 # http://forums.gentoo.org/viewtopic-p-3943166.html
2063 local silence="${SILENCE_JAVA_OPTIONS_WARNING}" 2072 local silence="${SILENCE_JAVA_OPTIONS_WARNING}"
2064 local accept="${I_WANT_GLOBAL_JAVA_OPTIONS}" 2073 local accept="${I_WANT_GLOBAL_JAVA_OPTIONS}"
2102 export CLASSPATH= 2111 export CLASSPATH=
2103 2112
2104 # Unset external ANT_ stuff 2113 # Unset external ANT_ stuff
2105 export ANT_TASKS= 2114 export ANT_TASKS=
2106 export ANT_OPTS= 2115 export ANT_OPTS=
2116 export ANT_RESPECT_JAVA_HOME=
2107} 2117}
2108 2118
2109# ------------------------------------------------------------------------------ 2119# ------------------------------------------------------------------------------
2110# @function-internal java-pkg-init-compiler_ 2120# @function-internal java-pkg-init-compiler_
2111# 2121#
2273 # Create package.env 2283 # Create package.env
2274 ( 2284 (
2275 echo "DESCRIPTION=\"${DESCRIPTION}\"" 2285 echo "DESCRIPTION=\"${DESCRIPTION}\""
2276 echo "GENERATION=\"2\"" 2286 echo "GENERATION=\"2\""
2277 echo "SLOT=\"${SLOT}\"" 2287 echo "SLOT=\"${SLOT}\""
2288 echo "CATEGORY=\"${CATEGORY}\""
2289 echo "PVR=\"${PVR}\""
2278 2290
2279 [[ -n "${JAVA_PKG_CLASSPATH}" ]] && echo "CLASSPATH=\"${JAVA_PKG_CLASSPATH}\"" 2291 [[ -n "${JAVA_PKG_CLASSPATH}" ]] && echo "CLASSPATH=\"${JAVA_PKG_CLASSPATH}\""
2280 [[ -n "${JAVA_PKG_LIBRARY}" ]] && echo "LIBRARY_PATH=\"${JAVA_PKG_LIBRARY}\"" 2292 [[ -n "${JAVA_PKG_LIBRARY}" ]] && echo "LIBRARY_PATH=\"${JAVA_PKG_LIBRARY}\""
2281 [[ -n "${JAVA_PROVIDE}" ]] && echo "PROVIDES=\"${JAVA_PROVIDE}\"" 2293 [[ -n "${JAVA_PROVIDE}" ]] && echo "PROVIDES=\"${JAVA_PROVIDE}\""
2282 [[ -f "${JAVA_PKG_DEPEND_FILE}" ]] \ 2294 [[ -f "${JAVA_PKG_DEPEND_FILE}" ]] \
2283 && echo "DEPEND=\"$(cat "${JAVA_PKG_DEPEND_FILE}" | uniq | tr '\n' ':')\"" 2295 && echo "DEPEND=\"$(cat "${JAVA_PKG_DEPEND_FILE}" | uniq | tr '\n' ':')\""
2284 [[ -f "${JAVA_PKG_OPTIONAL_DEPEND_FILE}" ]] \ 2296 [[ -f "${JAVA_PKG_OPTIONAL_DEPEND_FILE}" ]] \
2285 && echo "OPTIONAL_DEPEND=\"$(cat "${JAVA_PKG_OPTIONAL_DEPEND_FILE}" | uniq | tr '\n' ':')\"" 2297 && echo "OPTIONAL_DEPEND=\"$(cat "${JAVA_PKG_OPTIONAL_DEPEND_FILE}" | uniq | tr '\n' ':')\""
2286 echo "VM=\"$(echo ${RDEPEND} ${DEPEND} | sed -e 's/ /\n/g' | sed -n -e '/virtual\/\(jre\|jdk\)/ { p;q }')\"" # TODO cleanup ! 2298 echo "VM=\"$(echo ${RDEPEND} ${DEPEND} | sed -e 's/ /\n/g' | sed -n -e '/virtual\/\(jre\|jdk\)/ { p;q }')\"" # TODO cleanup !
2299 [[ -f "${JAVA_PKG_BUILD_DEPEND_FILE}" ]] \
2300 && echo "BUILD_DEPEND=\"$(cat "${JAVA_PKG_BUILD_DEPEND_FILE}" | uniq | tr '\n' ':')\""
2287 ) > "${JAVA_PKG_ENV}" 2301 ) > "${JAVA_PKG_ENV}"
2288 2302
2289 # register target/source 2303 # register target/source
2290 local target="$(java-pkg_get-target)" 2304 local target="$(java-pkg_get-target)"
2291 local source="$(java-pkg_get-source)" 2305 local source="$(java-pkg_get-source)"
2324# ------------------------------------------------------------------------------ 2338# ------------------------------------------------------------------------------
2325# @internal-function java-pkg_record-jar_ 2339# @internal-function java-pkg_record-jar_
2326# 2340#
2327# Record an (optional) dependency to the package.env 2341# Record an (optional) dependency to the package.env
2328# @param --optional - record dependency as optional 2342# @param --optional - record dependency as optional
2343# @param --build - record dependency as build_only
2329# @param $1 - package to record 2344# @param $1 - package to record
2330# @param $2 - (optional) jar of package to record 2345# @param $2 - (optional) jar of package to record
2331# ------------------------------------------------------------------------------ 2346# ------------------------------------------------------------------------------
2332JAVA_PKG_DEPEND_FILE="${T}/java-pkg-depend" 2347JAVA_PKG_DEPEND_FILE="${T}/java-pkg-depend"
2333JAVA_PKG_OPTIONAL_DEPEND_FILE="${T}/java-pkg-optional-depend" 2348JAVA_PKG_OPTIONAL_DEPEND_FILE="${T}/java-pkg-optional-depend"
2349JAVA_PKG_BUILD_DEPEND_FILE="${T}/java-pkg-build-depend"
2334 2350
2335java-pkg_record-jar_() { 2351java-pkg_record-jar_() {
2336 debug-print-function ${FUNCNAME} $* 2352 debug-print-function ${FUNCNAME} $*
2337 2353
2338 local depend_file="${JAVA_PKG_DEPEND_FILE}" 2354 local depend_file="${JAVA_PKG_DEPEND_FILE}"
2339 if [[ "${1}" == "--optional" ]]; then 2355 case "${1}" in
2340 depend_file="${JAVA_PKG_OPTIONAL_DEPEND_FILE}" 2356 "--optional") depend_file="${JAVA_PKG_OPTIONAL_DEPEND_FILE}"; shift;;
2341 shift 2357 "--build-only") depend_file="${JAVA_PKG_BUILD_DEPEND_FILE}"; shift;;
2342 fi 2358 esac
2343 2359
2344 local pkg=${1} jar=${2} append 2360 local pkg=${1} jar=${2} append
2345 if [[ -z "${jar}" ]]; then 2361 if [[ -z "${jar}" ]]; then
2346 append="${pkg}" 2362 append="${pkg}"
2347 else 2363 else
2400# 2416#
2401# @return 0 - function is declared 2417# @return 0 - function is declared
2402# @return 1 - function is undeclared 2418# @return 1 - function is undeclared
2403# ------------------------------------------------------------------------------ 2419# ------------------------------------------------------------------------------
2404java-pkg_func-exists() { 2420java-pkg_func-exists() {
2405 if [[ -n "$(declare -f ${1})" ]]; then 2421 declare -F ${1} > /dev/null
2406 return 0
2407 else
2408 return 1
2409 fi
2410} 2422}
2411 2423
2412# ------------------------------------------------------------------------------ 2424# ------------------------------------------------------------------------------
2413# @internal-function java-pkg_setup-vm 2425# @internal-function java-pkg_setup-vm
2414# 2426#
2498 # If you're forcing the VM, I hope you know what your doing... 2510 # 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}" 2511 debug-print "JAVA_PKG_FORCE_VM used: ${JAVA_PKG_FORCE_VM}"
2500 export GENTOO_VM="${JAVA_PKG_FORCE_VM}" 2512 export GENTOO_VM="${JAVA_PKG_FORCE_VM}"
2501 # if we're allowed to switch the vm... 2513 # if we're allowed to switch the vm...
2502 elif [[ "${JAVA_PKG_ALLOW_VM_CHANGE}" == "yes" ]]; then 2514 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}" 2515 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}}")" 2516 GENTOO_VM="$(depend-java-query --get-vm "${JAVA_PKG_NV_DEPEND:-${DEPEND}}")"
2508 fi
2509 if [[ -z "${GENTOO_VM}" || "${GENTOO_VM}" == "None" ]]; then 2517 if [[ -z "${GENTOO_VM}" || "${GENTOO_VM}" == "None" ]]; then
2510 eerror "Unable to determine VM for building from dependencies:" 2518 eerror "Unable to determine VM for building from dependencies:"
2511 echo "NV_DEPEND: ${JAVA_PKG_NV_DEPEND:-${DEPEND}}" 2519 echo "NV_DEPEND: ${JAVA_PKG_NV_DEPEND:-${DEPEND}}"
2512 echo "VNEED: ${JAVA_PKG_VNEED}"
2513 die "Failed to determine VM for building." 2520 die "Failed to determine VM for building."
2514 else 2521 else
2515 export GENTOO_VM 2522 export GENTOO_VM
2516 fi 2523 fi
2517 # otherwise just make sure the current VM is sufficient 2524 # otherwise just make sure the current VM is sufficient
2727is-java-strict() { 2734is-java-strict() {
2728 [[ -n ${JAVA_PKG_STRICT} ]] 2735 [[ -n ${JAVA_PKG_STRICT} ]]
2729 return $? 2736 return $?
2730} 2737}
2731 2738
2739
2732# ------------------------------------------------------------------------------ 2740# ------------------------------------------------------------------------------
2733# @eclass-end 2741# @eclass-end
2734# ------------------------------------------------------------------------------ 2742# ------------------------------------------------------------------------------

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

  ViewVC Help
Powered by ViewVC 1.1.20