/[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.61 Revision 1.150
1# Base eclass for Java packages 1# Base eclass for Java packages
2# 2#
3# Copyright (c) 2004-2005, Thomas Matthijs <axxo@gentoo.org> 3# Copyright (c) 2004-2005, Thomas Matthijs <axxo@gentoo.org>
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-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.61 2007/03/03 16:27:31 betelgeuse Exp $ 9# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.150 2012/03/13 10:05:46 sera Exp $
10
11 10
12# ----------------------------------------------------------------------------- 11# -----------------------------------------------------------------------------
13# @eclass-begin 12# @eclass-begin
14# @eclass-shortdesc Java Utility eclass 13# @eclass-shortdesc Java Utility eclass
15# @eclass-maintainer java@gentoo.org 14# @eclass-maintainer java@gentoo.org
55# 54#
56# @seealso JAVA_PKG_FORCE_ANT_TASKS 55# @seealso JAVA_PKG_FORCE_ANT_TASKS
57# ----------------------------------------------------------------------------- 56# -----------------------------------------------------------------------------
58#WANT_ANT_TASKS 57#WANT_ANT_TASKS
59 58
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. At this moment it's 62# The version of portage we need to function properly. Previously it was
63# portage with phase hooks support. 63# portage with phase hooks support but now we use a version with proper env
64# saving. For EAPI 2 we have new enough stuff so let's have cleaner deps.
64# ----------------------------------------------------------------------------- 65# -----------------------------------------------------------------------------
65JAVA_PKG_PORTAGE_DEP=">=sys-apps/portage-2.1_pre1" 66has "${EAPI}" 0 1 && JAVA_PKG_PORTAGE_DEP=">=sys-apps/portage-2.1.2.7"
66 67
67# ----------------------------------------------------------------------------- 68# -----------------------------------------------------------------------------
68# @variable-internal JAVA_PKG_E_DEPEND 69# @variable-internal JAVA_PKG_E_DEPEND
69# 70#
70# 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
71# the version of java-config we want to use. We also need a recent version 72# the version of java-config we want to use. Usually the latest stable version
72# portage, that includes phase hooks. 73# so that ebuilds can use new features without depending on specific versions.
73# ----------------------------------------------------------------------------- 74# -----------------------------------------------------------------------------
74JAVA_PKG_E_DEPEND=">=dev-java/java-config-2.0.31 ${JAVA_PKG_PORTAGE_DEP}" 75JAVA_PKG_E_DEPEND=">=dev-java/java-config-2.1.9-r1 ${JAVA_PKG_PORTAGE_DEP}"
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
75 94
76# ----------------------------------------------------------------------------- 95# -----------------------------------------------------------------------------
77# @variable-external JAVA_PKG_ALLOW_VM_CHANGE 96# @variable-external JAVA_PKG_ALLOW_VM_CHANGE
78# @variable-default yes 97# @variable-default yes
79# 98#
92# Should only be used for testing and debugging. 111# Should only be used for testing and debugging.
93# 112#
94# @example Use sun-jdk-1.5 to emerge foo 113# @example Use sun-jdk-1.5 to emerge foo
95# JAVA_PKG_FORCE_VM=sun-jdk-1.5 emerge foo 114# JAVA_PKG_FORCE_VM=sun-jdk-1.5 emerge foo
96# 115#
116# -----------------------------------------------------------------------------
117
118# -----------------------------------------------------------------------------
119# @variable-external JAVA_PKG_WANT_BUILD_VM
120#
121# A list of VM handles to choose a build VM from. If the list contains the
122# currently active VM use that one, otherwise step through the list till a
123# usable/installed VM is found.
124#
125# This allows to use an explicit list of JDKs in DEPEND instead of a virtual.
126# Users of this variable must make sure at least one of the listed handles is
127# covered by DEPEND.
128# Requires JAVA_PKG_WANT_SOURCE and JAVA_PKG_WANT_TARGET to be set as well.
97# ----------------------------------------------------------------------------- 129# -----------------------------------------------------------------------------
98 130
99# ----------------------------------------------------------------------------- 131# -----------------------------------------------------------------------------
100# @variable-external JAVA_PKG_WANT_SOURCE 132# @variable-external JAVA_PKG_WANT_SOURCE
101# 133#
183# 215#
184# These are used to install Java-related things, such as jars, Javadocs, JNI 216# These are used to install Java-related things, such as jars, Javadocs, JNI
185# libraries, etc. 217# libraries, etc.
186# ----------------------------------------------------------------------------- 218# -----------------------------------------------------------------------------
187 219
220# -----------------------------------------------------------------------------
221# @ebuild-function java-pkg_doexamples
222#
223# Installs given arguments to /usr/share/doc/${PF}/examples
224# If you give it only one parameter and it is a directory it will install
225# everything in that directory to the examples directory.
226#
227# @example
228# java-pkg_doexamples demo
229# java-pkg_doexamples demo/* examples/*
230#
231# @param --subdir - If the examples need a certain directory structure
232# @param $* - list of files to install
233# ------------------------------------------------------------------------------
234java-pkg_doexamples() {
235 debug-print-function ${FUNCNAME} $*
236
237 [[ ${#} -lt 1 ]] && die "At least one argument needed"
238
239 java-pkg_check-phase install
240
241 local dest=/usr/share/doc/${PF}/examples
242 if [[ ${1} == --subdir ]]; then
243 local dest=${dest}/${2}
244 dodir ${dest}
245 shift 2
246 fi
247
248 if [[ ${#} = 1 && -d ${1} ]]; then
249 ( # dont want to pollute calling env
250 insinto "${dest}"
251 doins -r ${1}/*
252 ) || die "Installing examples failed"
253 else
254 ( # dont want to pollute calling env
255 insinto "${dest}"
256 doins -r "$@"
257 ) || die "Installing examples failed"
258 fi
259
260 # Let's make a symlink to the directory we have everything else under
261 dosym "${dest}" "${JAVA_PKG_SHAREPATH}/examples" || die
262}
188 263
189# ----------------------------------------------------------------------------- 264# -----------------------------------------------------------------------------
190# @ebuild-function java-pkg_dojar 265# @ebuild-function java-pkg_dojar
191# 266#
192# Installs any number of jars. 267# Installs any number of jars.
249 done 324 done
250 325
251 java-pkg_do_write_ 326 java-pkg_do_write_
252} 327}
253 328
254
255# ------------------------------------------------------------------------------ 329# ------------------------------------------------------------------------------
256# @internal-function depend-java-query 330# @internal-function depend-java-query
257# 331#
258# Wrapper for the depend-java-query binary to enable passing USE in env. 332# Wrapper for the depend-java-query binary to enable passing USE in env.
259# Using env variables keeps this eclass working with java-config versions that 333# Using env variables keeps this eclass working with java-config versions that
260# do not handle use flags. 334# do not handle use flags.
261# ------------------------------------------------------------------------------ 335# ------------------------------------------------------------------------------
262 336
263depend-java-query() { 337depend-java-query() {
264 # Used to have a which call here but it caused endless loops for some people 338 # Used to have a which call here but it caused endless loops for some people
265 # please tell us why if you you have any idea. Maybe bash 3.1? 339 # that had some weird bashrc voodoo for which.
266 USE="${USE}" /usr/bin/depend-java-query "${@}" 340 USE="${USE}" /usr/bin/depend-java-query "${@}"
267} 341}
268 342
269# ------------------------------------------------------------------------------ 343# ------------------------------------------------------------------------------
270# @ebuild-function java-pkg_regjar 344# @ebuild-function java-pkg_regjar
319 # java-pkg_regjar ${D}/opt/java/*.jar 393 # java-pkg_regjar ${D}/opt/java/*.jar
320 # such call will fall into this case (-e ${jar}) and will 394 # such call will fall into this case (-e ${jar}) and will
321 # record paths with ${D} in package.env 395 # record paths with ${D} in package.env
322 java-pkg_append_ JAVA_PKG_CLASSPATH "${jar#${D}}" 396 java-pkg_append_ JAVA_PKG_CLASSPATH "${jar#${D}}"
323 else 397 else
398 if [[ ${jar} = *\** ]]; then
399 eerror "The argument ${jar} to ${FUNCNAME}"
400 eerror "has * in it. If you want it to glob in"
401 eerror '${D} add ${D} to the argument.'
402 fi
403 debug-print "${jar} or ${D}${jar} not found"
324 die "${jar} does not exist" 404 die "${jar} does not exist"
325 fi 405 fi
326 done 406 done
327 407
328 java-pkg_do_write_ 408 java-pkg_do_write_
383# @param $@ - JNI libraries to install 463# @param $@ - JNI libraries to install
384# ------------------------------------------------------------------------------ 464# ------------------------------------------------------------------------------
385java-pkg_doso() { 465java-pkg_doso() {
386 debug-print-function ${FUNCNAME} $* 466 debug-print-function ${FUNCNAME} $*
387 467
388 [[ ${#} -lt 1 ]] && "At least one argument required for ${FUNCNAME}"
389 java-pkg_check-phase install 468 java-pkg_check-phase install
390 469
391 [[ ${#} -lt 1 ]] && die "At least one argument required for ${FUNCNAME}" 470 [[ ${#} -lt 1 ]] && die "${FUNCNAME} requires at least one argument"
392 471
393 java-pkg_init_paths_ 472 java-pkg_init_paths_
394 473
395 local lib 474 local lib
396 # for each lib 475 # for each lib
399 if [[ -e "${lib}" ]] ; then 478 if [[ -e "${lib}" ]] ; then
400 # install if it isn't a symlink 479 # install if it isn't a symlink
401 if [[ ! -L "${lib}" ]] ; then 480 if [[ ! -L "${lib}" ]] ; then
402 INSDESTTREE="${JAVA_PKG_LIBDEST}" \ 481 INSDESTTREE="${JAVA_PKG_LIBDEST}" \
403 INSOPTIONS="${LIBOPTIONS}" \ 482 INSOPTIONS="${LIBOPTIONS}" \
404 doins "${lib}" || "failed to install ${lib}" 483 doins "${lib}" || die "failed to install ${lib}"
405 java-pkg_append_ JAVA_PKG_LIBRARY "${JAVA_PKG_LIBDEST}" 484 java-pkg_append_ JAVA_PKG_LIBRARY "${JAVA_PKG_LIBDEST}"
406 debug-print "Installing ${lib} to ${JAVA_PKG_LIBDEST}" 485 debug-print "Installing ${lib} to ${JAVA_PKG_LIBDEST}"
407 # otherwise make a symlink to the symlink's origin 486 # otherwise make a symlink to the symlink's origin
408 else 487 else
409 # TODO use dosym 488 dosym "$(readlink "${lib}")" "${JAVA_PKG_LIBDEST}/${lib##*/}"
410 ln -s "$(readlink "${lib}")" \
411 "${D}${JAVA_PKG_LIBDEST}/$(basename "${lib}")"
412 debug-print "${lib} is a symlink, linking accordanly" 489 debug-print "${lib} is a symlink, linking accordantly"
413 fi 490 fi
414 # otherwise die 491 # otherwise die
415 else 492 else
416 die "${lib} does not exist" 493 die "${lib} does not exist"
417 fi 494 fi
433java-pkg_regso() { 510java-pkg_regso() {
434 debug-print-function ${FUNCNAME} $* 511 debug-print-function ${FUNCNAME} $*
435 512
436 java-pkg_check-phase install 513 java-pkg_check-phase install
437 514
438 [[ ${#} -lt 1 ]] && "at least one argument needed" 515 [[ ${#} -lt 1 ]] && die "${FUNCNAME} requires at least one argument"
439 516
440 java-pkg_init_paths_ 517 java-pkg_init_paths_
441 518
442 local lib target_dir 519 local lib target_dir
443 for lib in "$@" ; do 520 for lib in "$@" ; do
510# ------------------------------------------------------------------------------ 587# ------------------------------------------------------------------------------
511# @ebuild-function java-pkg_dojavadoc 588# @ebuild-function java-pkg_dojavadoc
512# 589#
513# Installs javadoc documentation. This should be controlled by the doc use flag. 590# Installs javadoc documentation. This should be controlled by the doc use flag.
514# 591#
592# @param $1: optional --symlink creates to symlink like this for html
593# documentation bundles.
515# @param $1: - The javadoc root directory. 594# @param $2: - The javadoc root directory.
516# 595#
517# @example: 596# @example:
518# java-pkg_dojavadoc docs/api 597# java-pkg_dojavadoc docs/api
598# java-pkg_dojavadoc --symlink apidocs docs/api
519# 599#
520# ------------------------------------------------------------------------------ 600# ------------------------------------------------------------------------------
521java-pkg_dojavadoc() { 601java-pkg_dojavadoc() {
602 debug-print-function ${FUNCNAME} $*
603
604 # For html documentation bundles that link to Javadoc
605 local symlink
606 if [[ ${1} = --symlink ]]; then
607 symlink=${2}
608 shift 2
609 fi
610
522 local dir="$1" 611 local dir="$1"
612 local dest=/usr/share/doc/${PF}/html
613
614 # QA checks
523 615
524 java-pkg_check-phase install 616 java-pkg_check-phase install
525 617
526 [[ -z "${dir}" ]] && die "Must specify a directory!" 618 [[ -z "${dir}" ]] && die "Must specify a directory!"
527 [[ ! -d "${dir}" ]] && die "${dir} does not exist, or isn't a directory!" 619 [[ ! -d "${dir}" ]] && die "${dir} does not exist, or isn't a directory!"
620 if [[ ! -e "${dir}/index.html" ]]; then
621 local msg="No index.html in javadoc directory"
622 ewarn "${msg}"
623 is-java-strict && die "${msg}"
624 fi
625
626 if [[ -e ${D}/${dest}/api ]]; then
627 eerror "${dest} already exists. Will not overwrite."
628 die "${dest}"
629 fi
630
631 # Renaming to match our directory layout
528 632
529 local dir_to_install="${dir}" 633 local dir_to_install="${dir}"
530 if [[ "$(basename "${dir}")" != "api" ]]; then 634 if [[ "$(basename "${dir}")" != "api" ]]; then
531 dir_to_install="${T}/api" 635 dir_to_install="${T}/api"
532 # TODO use doins 636 # TODO use doins
533 cp -r "${dir}" "${dir_to_install}" || die "cp failed" 637 cp -r "${dir}" "${dir_to_install}" || die "cp failed"
534 fi 638 fi
535 639
640 # Actual installation
641
536 java-pkg_dohtml -r ${dir_to_install} 642 java-pkg_dohtml -r "${dir_to_install}"
643
644 # Let's make a symlink to the directory we have everything else under
645 dosym ${dest}/api "${JAVA_PKG_SHAREPATH}/api" || die
646
647 if [[ ${symlink} ]]; then
648 debug-print "symlinking ${dest}/{api,${symlink}}"
649 dosym ${dest}/{api,${symlink}} || die
650 fi
537} 651}
538 652
539# ------------------------------------------------------------------------------ 653# ------------------------------------------------------------------------------
540# @ebuild-function java-pkg_dosrc 654# @ebuild-function java-pkg_dosrc
541# 655#
557# FIXME apparently this fails if you give it an empty directories 671# FIXME apparently this fails if you give it an empty directories
558java-pkg_dosrc() { 672java-pkg_dosrc() {
559 debug-print-function ${FUNCNAME} $* 673 debug-print-function ${FUNCNAME} $*
560 674
561 [ ${#} -lt 1 ] && die "At least one argument needed" 675 [ ${#} -lt 1 ] && die "At least one argument needed"
562 if ! hasq source ${IUSE}; then
563 echo "Java QA Notice: ${FUNCNAME} called without source in IUSE"
564 fi
565 676
566 java-pkg_check-phase install 677 java-pkg_check-phase install
567 678
568 [[ ${#} -lt 1 ]] && die "At least one argument needed" 679 [[ ${#} -lt 1 ]] && die "At least one argument needed"
680
681 if ! [[ ${DEPEND} = *app-arch/zip* ]]; then
682 local msg="${FUNCNAME} called without app-arch/zip in DEPEND"
683 java-pkg_announce-qa-violation ${msg}
684 fi
569 685
570 java-pkg_init_paths_ 686 java-pkg_init_paths_
571 687
572 local zip_name="${PN}-src.zip" 688 local zip_name="${PN}-src.zip"
573 local zip_path="${T}/${zip_name}" 689 local zip_path="${T}/${zip_name}"
772# @param $opt 888# @param $opt
773# --build-only - makes the jar(s) not added into package.env DEPEND line. 889# --build-only - makes the jar(s) not added into package.env DEPEND line.
774# (assumed automatically when called inside src_test) 890# (assumed automatically when called inside src_test)
775# --with-dependencies - get jars also from requested package's dependencies 891# --with-dependencies - get jars also from requested package's dependencies
776# transitively. 892# transitively.
893# --virtual - Packages passed to this function are to be handled as virtuals
894# and will not have individual jar dependencies recorded.
777# --into $dir - symlink jar(s) into $dir (must exist) instead of . 895# --into $dir - symlink jar(s) into $dir (must exist) instead of .
778# @param $1 - Package to get jars from. 896# @param $1 - Package to get jars from, or comma-separated list of packages in
897# case other parameters are not used.
779# @param $2 - jar from package. If not specified, all jars will be used. 898# @param $2 - jar from package. If not specified, all jars will be used.
780# @param $3 - When a single jar is specified, destination filename of the 899# @param $3 - When a single jar is specified, destination filename of the
781# symlink. Defaults to the name of the jar. 900# symlink. Defaults to the name of the jar.
782# ------------------------------------------------------------------------------ 901# ------------------------------------------------------------------------------
783# TODO could probably be cleaned up a little 902# TODO could probably be cleaned up a little
785 debug-print-function ${FUNCNAME} $* 904 debug-print-function ${FUNCNAME} $*
786 905
787 local build_only="" 906 local build_only=""
788 local destdir="." 907 local destdir="."
789 local deep="" 908 local deep=""
909 local virtual=""
910 local record_jar=""
790 911
791 [[ "${EBUILD_PHASE}" == "test" ]] && build_only="true" 912 [[ "${EBUILD_PHASE}" == "test" ]] && build_only="build"
792 913
793 while [[ "${1}" == --* ]]; do 914 while [[ "${1}" == --* ]]; do
794 if [[ "${1}" = "--build-only" ]]; then 915 if [[ "${1}" = "--build-only" ]]; then
795 build_only="true" 916 build_only="build"
796 elif [[ "${1}" = "--with-dependencies" ]]; then 917 elif [[ "${1}" = "--with-dependencies" ]]; then
797 deep="--with-dependencies" 918 deep="--with-dependencies"
919 elif [[ "${1}" = "--virtual" ]]; then
920 virtual="true"
798 elif [[ "${1}" = "--into" ]]; then 921 elif [[ "${1}" = "--into" ]]; then
799 destdir="${2}" 922 destdir="${2}"
800 shift 923 shift
801 else 924 else
802 die "java-pkg_jar-from called with unknown parameter: ${1}" 925 die "java-pkg_jar-from called with unknown parameter: ${1}"
806 929
807 local target_pkg="${1}" target_jar="${2}" destjar="${3}" 930 local target_pkg="${1}" target_jar="${2}" destjar="${3}"
808 931
809 [[ -z ${target_pkg} ]] && die "Must specify a package" 932 [[ -z ${target_pkg} ]] && die "Must specify a package"
810 933
934 if [[ "${EAPI}" == "1" ]]; then
935 target_pkg="${target_pkg//:/-}"
936 fi
937
811 # default destjar to the target jar 938 # default destjar to the target jar
812 [[ -z "${destjar}" ]] && destjar="${target_jar}" 939 [[ -z "${destjar}" ]] && destjar="${target_jar}"
813 940
814 local error_msg="There was a problem getting the classpath for ${target_pkg}." 941 local error_msg="There was a problem getting the classpath for ${target_pkg}."
815 local classpath 942 local classpath
816 classpath="$(java-config ${deep} --classpath=${target_pkg})" 943 classpath="$(java-config ${deep} --classpath=${target_pkg})"
817 [[ $? != 0 ]] && die ${error_msg} 944 [[ $? != 0 ]] && die ${error_msg}
818 945
946 # When we have commas this functions is called to bring jars from multiple
947 # packages. This affects recording of dependencencies performed later
948 # which expects one package only, so we do it here.
949 if [[ ${target_pkg} = *,* ]]; then
950 for pkg in ${target_pkg//,/ }; do
951 java-pkg_ensure-dep "${build_only}" "${pkg}"
952 [[ -z "${build_only}" ]] && java-pkg_record-jar_ "${pkg}"
953 done
954 # setting this disables further record-jar_ calls later
955 record_jar="true"
956 else
957 java-pkg_ensure-dep "${build_only}" "${target_pkg}"
958 fi
959
960 # Record the entire virtual as a dependency so that
961 # no jars are missed.
962 if [[ -z "${build_only}" && -n "${virtual}" ]]; then
963 java-pkg_record-jar_ "${target_pkg}"
964 # setting this disables further record-jars_ calls later
965 record_jar="true"
966 fi
967
819 pushd ${destdir} > /dev/null \ 968 pushd ${destdir} > /dev/null \
820 || die "failed to change directory to ${destdir}" 969 || die "failed to change directory to ${destdir}"
821
822 # When we have commas this functions is called to bring jars from multiple
823 # packages. This affects recording of dependencencies because that syntax uses :
824 # if we don't change them to : gjl and java-config -d -p break
825 if [[ ${target_pkg} = *,* ]]; then
826 build_only="true"
827 java-pkg_record-jar_ ${target_pkg//,/:}
828 fi
829 970
830 local jar 971 local jar
831 for jar in ${classpath//:/ }; do 972 for jar in ${classpath//:/ }; do
832 local jar_name=$(basename "${jar}") 973 local jar_name=$(basename "${jar}")
833 if [[ ! -f "${jar}" ]] ; then 974 if [[ ! -f "${jar}" ]] ; then
837 # If no specific target jar was indicated, link it 978 # If no specific target jar was indicated, link it
838 if [[ -z "${target_jar}" ]] ; then 979 if [[ -z "${target_jar}" ]] ; then
839 [[ -f "${target_jar}" ]] && rm "${target_jar}" 980 [[ -f "${target_jar}" ]] && rm "${target_jar}"
840 ln -snf "${jar}" \ 981 ln -snf "${jar}" \
841 || die "Failed to make symlink from ${jar} to ${jar_name}" 982 || die "Failed to make symlink from ${jar} to ${jar_name}"
983 if [[ -z "${record_jar}" ]]; then
984 if [[ -z "${build_only}" ]]; then
842 [[ -z "${build_only}" ]] && java-pkg_record-jar_ "${target_pkg}" "${jar}" 985 java-pkg_record-jar_ "${target_pkg}" "${jar}"
986 else
987 java-pkg_record-jar_ --build-only "${target_pkg}" "${jar}"
988 fi
989 fi
843 # otherwise, if the current jar is the target jar, link it 990 # otherwise, if the current jar is the target jar, link it
844 elif [[ "${jar_name}" == "${target_jar}" ]] ; then 991 elif [[ "${jar_name}" == "${target_jar}" ]] ; then
845 [[ -f "${destjar}" ]] && rm "${destjar}" 992 [[ -f "${destjar}" ]] && rm "${destjar}"
846 ln -snf "${jar}" "${destjar}" \ 993 ln -snf "${jar}" "${destjar}" \
847 || die "Failed to make symlink from ${jar} to ${destjar}" 994 || die "Failed to make symlink from ${jar} to ${destjar}"
995 if [[ -z "${record_jar}" ]]; then
996 if [[ -z "${build_only}" ]]; then
848 [[ -z "${build_only}" ]] && java-pkg_record-jar_ "${target_pkg}" "${jar}" 997 java-pkg_record-jar_ "${target_pkg}" "${jar}"
998 else
999 java-pkg_record-jar_ --build-only "${target_jar}" "${jar}"
1000 fi
1001 fi
849 popd > /dev/null 1002 popd > /dev/null
850 return 0 1003 return 0
851 fi 1004 fi
852 done 1005 done
853 popd > /dev/null 1006 popd > /dev/null
896 debug-print-function ${FUNCNAME} $* 1049 debug-print-function ${FUNCNAME} $*
897 1050
898 local build_only="" 1051 local build_only=""
899 local deep="" 1052 local deep=""
900 1053
901 [[ "${EBUILD_PHASE}" == "test" ]] && build_only="true" 1054 [[ "${EBUILD_PHASE}" == "test" ]] && build_only="build"
902 1055
903 while [[ "${1}" == --* ]]; do 1056 while [[ "${1}" == --* ]]; do
904 if [[ "${1}" = "--build-only" ]]; then 1057 if [[ "${1}" = "--build-only" ]]; then
905 build_only="true" 1058 build_only="build"
906 elif [[ "${1}" = "--with-dependencies" ]]; then 1059 elif [[ "${1}" = "--with-dependencies" ]]; then
907 deep="--with-dependencies" 1060 deep="--with-dependencies"
908 else 1061 else
909 die "java-pkg_jar-from called with unknown parameter: ${1}" 1062 die "java-pkg_jar-from called with unknown parameter: ${1}"
910 fi 1063 fi
911 shift 1064 shift
912 done 1065 done
913 1066
914 [[ ${#} -ne 1 ]] && die "${FUNCNAME} takes only one argument besides --*" 1067 [[ ${#} -ne 1 ]] && die "${FUNCNAME} takes only one argument besides --*"
915 1068
1069
916 local classpath pkgs="${1}" 1070 local pkgs="${1}"
1071
1072 if [[ "${EAPI}" == "1" ]]; then
1073 pkgs="${pkgs//:/-}"
1074 fi
1075
917 jars="$(java-config ${deep} --classpath=${pkgs})" 1076 jars="$(java-config ${deep} --classpath=${pkgs})"
918 [[ -z "${jars}" ]] && die "java-config --classpath=${pkgs} failed" 1077 [[ $? != 0 ]] && die "java-config --classpath=${pkgs} failed"
919 debug-print "${pkgs}:${jars}" 1078 debug-print "${pkgs}:${jars}"
920 1079
921 if [[ -z "${classpath}" ]]; then 1080 for pkg in ${pkgs//,/ }; do
922 classpath="${jars}" 1081 java-pkg_ensure-dep "${build_only}" "${pkg}"
923 else 1082 done
924 classpath="${classpath}:${jars}"
925 fi
926 1083
927 # Only record jars that aren't build-only 1084 for pkg in ${pkgs//,/ }; do
928 if [[ -z "${build_only}" ]]; then 1085 if [[ -z "${build_only}" ]]; then
929 oldifs="${IFS}"
930 IFS=","
931 for pkg in ${pkgs}; do
932 java-pkg_record-jar_ "${pkg}" 1086 java-pkg_record-jar_ "${pkg}"
1087 else
1088 java-pkg_record-jar_ --build-only "${pkg}"
1089 fi
933 done 1090 done
934 IFS="${oldifs}"
935 fi
936 1091
937 echo "${classpath}" 1092 echo "${jars}"
938} 1093}
939 1094
940# ------------------------------------------------------------------------------ 1095# ------------------------------------------------------------------------------
941# @ebuild-function java-pkg_getjar 1096# @ebuild-function java-pkg_getjar
942# 1097#
951# @example-return 1106# @example-return
952# /usr/share/xerces-2/lib/xml-apis.jar 1107# /usr/share/xerces-2/lib/xml-apis.jar
953# 1108#
954# @param $opt 1109# @param $opt
955# --build-only - makes the jar not added into package.env DEPEND line. 1110# --build-only - makes the jar not added into package.env DEPEND line.
1111# --virtual - Packages passed to this function are to be handled as virtuals
1112# and will not have individual jar dependencies recorded.
956# @param $1 - package to use 1113# @param $1 - package to use
957# @param $2 - jar to get 1114# @param $2 - jar to get
958# ------------------------------------------------------------------------------ 1115# ------------------------------------------------------------------------------
959java-pkg_getjar() { 1116java-pkg_getjar() {
960 debug-print-function ${FUNCNAME} $* 1117 debug-print-function ${FUNCNAME} $*
961 1118
962 local build_only="" 1119 local build_only=""
1120 local virtual=""
1121 local record_jar=""
963 1122
964 [[ "${EBUILD_PHASE}" == "test" ]] && build_only="true" 1123 [[ "${EBUILD_PHASE}" == "test" ]] && build_only="build"
965 1124
966 while [[ "${1}" == --* ]]; do 1125 while [[ "${1}" == --* ]]; do
967 if [[ "${1}" = "--build-only" ]]; then 1126 if [[ "${1}" = "--build-only" ]]; then
968 build_only="true" 1127 build_only="build"
1128 elif [[ "${1}" == "--virtual" ]]; then
1129 virtual="true"
969 else 1130 else
970 die "java-pkg_jar-from called with unknown parameter: ${1}" 1131 die "java-pkg_getjar called with unknown parameter: ${1}"
971 fi 1132 fi
972 shift 1133 shift
973 done 1134 done
974 1135
975 [[ ${#} -ne 2 ]] && die "${FUNCNAME} takes only two arguments besides --*" 1136 [[ ${#} -ne 2 ]] && die "${FUNCNAME} takes only two arguments besides --*"
976 1137
977 local pkg="${1}" target_jar="${2}" jar 1138 local pkg="${1}" target_jar="${2}" jar
1139
1140 if [[ "${EAPI}" == "1" ]]; then
1141 pkg="${pkg//:/-}"
1142 fi
1143
978 [[ -z ${pkg} ]] && die "Must specify package to get a jar from" 1144 [[ -z ${pkg} ]] && die "Must specify package to get a jar from"
979 [[ -z ${target_jar} ]] && die "Must specify jar to get" 1145 [[ -z ${target_jar} ]] && die "Must specify jar to get"
980 1146
981 local error_msg="Could not find classpath for ${pkg}. Are you sure its installed?" 1147 local error_msg="Could not find classpath for ${pkg}. Are you sure its installed?"
982 local classpath 1148 local classpath
983 classpath=$(java-config --classpath=${pkg}) 1149 classpath=$(java-config --classpath=${pkg})
984 [[ $? != 0 ]] && die ${error_msg} 1150 [[ $? != 0 ]] && die ${error_msg}
985 1151
1152 java-pkg_ensure-dep "${build_only}" "${pkg}"
1153
1154 # Record the package(Virtual) as a dependency and then set build_only
1155 # So that individual jars are not recorded.
1156 if [[ -n "${virtual}" ]]; then
1157 if [[ -z "${build_only}" ]]; then
1158 java-pkg_record-jar_ "${pkg}"
1159 else
1160 java-pkg_record-jar_ --build-only "${pkg}"
1161 fi
1162 record_jar="true"
1163 fi
1164
986 for jar in ${classpath//:/ }; do 1165 for jar in ${classpath//:/ }; do
987 if [[ ! -f "${jar}" ]] ; then 1166 if [[ ! -f "${jar}" ]] ; then
988 die "Installation problem with jar ${jar} in ${pkg} - is it installed?" 1167 die "Installation problem with jar ${jar} in ${pkg} - is it installed?"
989 fi 1168 fi
990 1169
991 if [[ "$(basename ${jar})" == "${target_jar}" ]] ; then 1170 if [[ "$(basename ${jar})" == "${target_jar}" ]] ; then
992 # Only record jars that aren't build-only 1171 # Only record jars that aren't build-only
993 [[ -z "${build_only}" ]] && java-pkg_record-jar_ "${pkg}" "${jar}" 1172 if [[ -z "${record_jar}" ]]; then
1173 if [[ -z "${build_only}" ]]; then
1174 java-pkg_record-jar_ "${pkg}" "${jar}"
1175 else
1176 java-pkg_record-jar_ --build-only "${pkg}" "${jar}"
1177 fi
1178 fi
994 echo "${jar}" 1179 echo "${jar}"
995 return 0 1180 return 0
996 fi 1181 fi
997 done 1182 done
998 1183
999 die "Could not find ${target_jar} in ${pkg}" 1184 die "Could not find ${target_jar} in ${pkg}"
1000 return 1 1185 return 1
1001} 1186}
1187
1188# ------------------------------------------------------------------------------
1189# @ebuild-function java-pkg_register-dependency
1190#
1191# Registers runtime dependency on a package, list of packages, or a single jar
1192# from a package, into package.env DEPEND line. Can only be called in
1193# src_install phase.
1194# Intended for binary packages where you don't need to symlink the jars or get
1195# their classpath during build. As such, the dependencies only need to be
1196# specified in ebuild's RDEPEND, and should be omitted in DEPEND.
1197#
1198# @param $1 - comma-separated list of packages, or a single package
1199# @param $2 - if param $1 is a single package, optionally specify the jar
1200# to depend on
1201#
1202# Example: Record the dependency on whole xerces-2 and xalan,
1203# java-pkg_register-dependency xerces-2,xalan
1204# Example: Record the dependency on ant.jar from ant-core
1205# java-pkg_register-dependency ant-core ant.jar
1206#
1207# Note: Passing both list of packages as the first parameter AND specifying the
1208# jar as the second is not allowed and will cause the function to die. We assume
1209# that there's more chance one passes such combination as a mistake, than that
1210# there are more packages providing identically named jar without class
1211# collisions.
1212# ------------------------------------------------------------------------------
1213java-pkg_register-dependency() {
1214 debug-print-function ${FUNCNAME} $*
1215
1216 java-pkg_check-phase install
1217
1218 [[ ${#} -gt 2 ]] && die "${FUNCNAME} takes at most two arguments"
1219
1220 local pkgs="${1}"
1221 local jar="${2}"
1222
1223 [[ -z "${pkgs}" ]] && die "${FUNCNAME} called with no package(s) specified"
1224
1225 if [[ "${EAPI}" == "1" ]]; then
1226 pkgs="${pkgs//:/-}"
1227 fi
1228
1229 if [[ -z "${jar}" ]]; then
1230 for pkg in ${pkgs//,/ }; do
1231 java-pkg_ensure-dep runtime "${pkg}"
1232 java-pkg_record-jar_ "${pkg}"
1233 done
1234 else
1235 [[ ${pkgs} == *,* ]] && \
1236 die "${FUNCNAME} called with both package list and jar name"
1237 java-pkg_ensure-dep runtime "${pkgs}"
1238 java-pkg_record-jar_ "${pkgs}" "${jar}"
1239 fi
1240
1241 java-pkg_do_write_
1242}
1243
1244# ------------------------------------------------------------------------------
1245# @ebuild-function java-pkg_register-optional-dependency
1246#
1247# Registers optional runtime dependency on a package, list of packages, or a
1248# single jar from a package, into package.env OPTIONAL_DEPEND line. Can only be
1249# called in src_install phase.
1250# Intended for packages that can use other packages when those are in classpath.
1251# Will be put on classpath by launcher if they are installed. Typical case is
1252# JDBC implementations for various databases. It's better than having USE flag
1253# for each implementation triggering hard dependency.
1254#
1255# @param $1 - comma-separated list of packages, or a single package
1256# @param $2 - if param $1 is a single package, optionally specify the jar
1257# to depend on
1258#
1259# Example: Record the optional dependency on some jdbc providers
1260# java-pkg_register-optional-dependency jdbc-jaybird,jtds-1.2,jdbc-mysql
1261#
1262# Note: Passing both list of packages as the first parameter AND specifying the
1263# jar as the second is not allowed and will cause the function to die. We assume
1264# that there's more chance one passes such combination as a mistake, than that
1265# there are more packages providing identically named jar without class
1266# collisions.
1267# ------------------------------------------------------------------------------
1268java-pkg_register-optional-dependency() {
1269 debug-print-function ${FUNCNAME} $*
1270
1271 java-pkg_check-phase install
1272
1273 [[ ${#} -gt 2 ]] && die "${FUNCNAME} takes at most two arguments"
1274
1275 local pkgs="${1}"
1276 local jar="${2}"
1277
1278 [[ -z "${pkgs}" ]] && die "${FUNCNAME} called with no package(s) specified"
1279
1280 if [[ "${EAPI}" == "1" ]]; then
1281 pkgs="${pkgs//:/-}"
1282 fi
1283
1284 if [[ -z "${jar}" ]]; then
1285 for pkg in ${pkgs//,/ }; do
1286 java-pkg_record-jar_ --optional "${pkg}"
1287 done
1288 else
1289 [[ ${pkgs} == *,* ]] && \
1290 die "${FUNCNAME} called with both package list and jar name"
1291 java-pkg_record-jar_ --optional "${pkgs}" "${jar}"
1292 fi
1293
1294 java-pkg_do_write_
1295}
1296
1297# ------------------------------------------------------------------------------
1298# @ebuild-function java-pkg_register-environment-variable
1299#
1300# Register an arbitrary environment variable into package.env. The gjl launcher
1301# for this package or any package depending on this will export it into
1302# environement before executing java command.
1303# Must only be called in src_install phase.
1304#
1305# @param $1 - variable name
1306# @param $2 - variable value
1307# ------------------------------------------------------------------------------
1308JAVA_PKG_EXTRA_ENV="${T}/java-pkg-extra-env"
1309JAVA_PKG_EXTRA_ENV_VARS=""
1310java-pkg_register-environment-variable() {
1311 debug-print-function ${FUNCNAME} $*
1312
1313 java-pkg_check-phase install
1314
1315 [[ ${#} != 2 ]] && die "${FUNCNAME} takes two arguments"
1316
1317 echo "${1}=\"${2}\"" >> ${JAVA_PKG_EXTRA_ENV}
1318 JAVA_PKG_EXTRA_ENV_VARS="${JAVA_PKG_EXTRA_ENV_VARS} ${1}"
1319
1320 java-pkg_do_write_
1321}
1322
1323# ------------------------------------------------------------------------------
1324# @ebuild-function java-pkg_get-bootclasspath
1325#
1326# Returns classpath of a given bootclasspath-providing package version.
1327#
1328# @param $1 - the version of bootclasspath (e.g. 1.5), 'auto' for bootclasspath
1329# of the current JDK
1330# ------------------------------------------------------------------------------
1331
1332java-pkg_get-bootclasspath() {
1333 local version="${1}"
1334
1335 local bcp
1336 case "${version}" in
1337 auto)
1338 bcp="$(java-config -g BOOTCLASSPATH)"
1339 ;;
1340 1.5)
1341 bcp="$(java-pkg_getjars --build-only gnu-classpath-0.98)"
1342 ;;
1343 *)
1344 eerror "unknown parameter of java-pkg_get-bootclasspath"
1345 die "unknown parameter of java-pkg_get-bootclasspath"
1346 ;;
1347 esac
1348
1349 echo "${bcp}"
1350}
1351
1002 1352
1003# This function reads stdin, and based on that input, figures out how to 1353# This function reads stdin, and based on that input, figures out how to
1004# populate jars from the filesystem. 1354# populate jars from the filesystem.
1005# Need to figure out a good way of making use of this, ie be able to use a 1355# Need to figure out a good way of making use of this, ie be able to use a
1006# string that was built instead of stdin 1356# string that was built instead of stdin
1044# @section-begin helper 1394# @section-begin helper
1045# @section-summary Helper functions 1395# @section-summary Helper functions
1046# 1396#
1047# Various other functions to use from an ebuild 1397# Various other functions to use from an ebuild
1048# ------------------------------------------------------------------------------ 1398# ------------------------------------------------------------------------------
1049
1050# ------------------------------------------------------------------------------
1051# @ebuild-function java-pkg_need
1052#
1053# Adds virtual dependencies, which can optionally be controlled by a USE flag.
1054# Currently supported virtuals are:
1055# javamail
1056# jdbc-stdext
1057# jaf
1058# jdbc-rowset
1059# jms
1060#
1061# @param $1 - Optionally indicate that the dependencies are controlled by
1062# a use flag by specifying '--use' Requires $2.
1063# @param $2 - USE flag which will enable the dependencies.
1064# @param $@ - virtual packages to add depenedencies for
1065# ------------------------------------------------------------------------------
1066# TODO rewrite to parse a line based declaration file instead -- karltk
1067#java-pkg_need() {
1068# debug-print-function ${FUNCNAME} $*
1069# local useflag
1070# if [[ ${1} == "--use" ]]; then
1071# useflag="${2}"
1072# shift 2
1073# fi
1074#
1075# if [[ -z ${1} ]]; then
1076# die "Must specify at least one virtual package."
1077# fi
1078#
1079# local depstr newdepstr
1080#
1081# for virtual in ${@}; do
1082# if has ${virtual} ${JAVA_PKG_VNEED}; then
1083# debug-print "Already registered virtual ${virtual}"
1084# continue
1085# fi
1086# case ${virtual} in
1087# javamail)
1088# debug-print "java-pkg_need: adding javamail dependencies"
1089# newdepstr="|| ( dev-java/gnu-javamail dev-java/sun-javamail-bin )"
1090# ;;
1091# jdbc-stdext)
1092# debug-print "java-pkg_need: adding jdbc-stdext dependencies"
1093# newdepstr="|| ( >=virtual/jdk-1.4 dev-java/jdbc2-stdext )"
1094# ;;
1095# jaf)
1096# debug-print "java-pkg_need: adding jaf dependencies"
1097# newdepstr="|| ( dev-java/gnu-jaf dev-java/sun-jaf-bin )"
1098# ;;
1099# jdbc-rowset)
1100# debug-print "java-pkg_need: adding jdbc-rowset dependencies"
1101# newdepstr="|| ( >=virtual/jdk-1.5 dev-java/sun-jdbc-rowset )"
1102# ;;
1103# jms)
1104# debug-print "java-pkg_need: adding jms dependencies"
1105# newdepstr="|| ( dev-java/sun-jms dev-java/openjms )"
1106# ;;
1107# *)
1108# die "Invalid virtual: ${virtual}"
1109# esac
1110#
1111# export JAVA_PKG_VNEED="${JAVA_PKG_VNEED} ${virtual}"
1112#
1113# if [[ -n ${useflag} ]]; then
1114# depstr="${depstr} ${useflag}? ( ${newdepstr} )"
1115# else
1116# depstr="${depstr} ${newdepstr}"
1117# fi
1118# done
1119#
1120# [[ -z ${JAVA_PKG_NV_DEPEND} ]] && export JAVA_PKG_NV_DEPEND="${DEPEND}"
1121# [[ -z ${JAVA_PKG_NV_RDEPEND} ]] && export JAVA_PKG_NV_RDEPEND="${RDEPEND}"
1122#
1123# export DEPEND="${DEPEND} ${depstr}"
1124# export RDEPEND="${RDEPEND} ${depstr}"
1125#}
1126 1399
1127# ------------------------------------------------------------------------------ 1400# ------------------------------------------------------------------------------
1128# @ebuild-function java-pkg_find-normal-jars 1401# @ebuild-function java-pkg_find-normal-jars
1129# 1402#
1130# Find the files with suffix .jar file in the given directory or $WORKDIR 1403# Find the files with suffix .jar file in the given directory or $WORKDIR
1296java-pkg_get-current-vm() { 1569java-pkg_get-current-vm() {
1297 echo ${GENTOO_VM} 1570 echo ${GENTOO_VM}
1298} 1571}
1299 1572
1300java-pkg_current-vm-matches() { 1573java-pkg_current-vm-matches() {
1301 hasq $(java-pkg_get-current-vm) ${@} 1574 has $(java-pkg_get-current-vm) ${@}
1302 return $? 1575 return $?
1303} 1576}
1304 1577
1305# ------------------------------------------------------------------------------ 1578# ------------------------------------------------------------------------------
1306# @ebuild-function java-pkg_get-source 1579# @ebuild-function java-pkg_get-source
1421 die "No GCJ support found!" 1694 die "No GCJ support found!"
1422 fi 1695 fi
1423} 1696}
1424 1697
1425java-pkg_ensure-test() { 1698java-pkg_ensure-test() {
1426 if hasq test ${FEATURES} && ! hasq -test ${FEATURES} \ 1699 if has test ${FEATURES} && ! has -test ${FEATURES} \
1427 && hasq test ${IUSE} && ! use test; 1700 && has test ${IUSE} && ! use test;
1428 then 1701 then
1429 eerror "You specified FEATURES=test, but USE=test is needed" 1702 eerror "You specified FEATURES=test, but USE=test is needed"
1430 eerror "to pull in the additional dependencies for testing" 1703 eerror "to pull in the additional dependencies for testing"
1431 die "Need USE=test enabled" 1704 die "Need USE=test enabled"
1432 fi 1705 fi
1468 dodir /usr/share/ant/${TASKS_DIR} 1741 dodir /usr/share/ant/${TASKS_DIR}
1469 touch "${D}/usr/share/ant/${TASKS_DIR}/${TASK_NAME}" 1742 touch "${D}/usr/share/ant/${TASKS_DIR}/${TASK_NAME}"
1470} 1743}
1471 1744
1472# ------------------------------------------------------------------------------ 1745# ------------------------------------------------------------------------------
1473# @internal-function java-pkg_ant-tasks-from-deps
1474#
1475# Function to determine ANT_TASKS from DEPEND variable for backwards
1476# compatibility with ebuilds that don't set ANT_TASKS before calling eant() or
1477# WANT_ANT_TASKS before inheriting java-pkg-2. If the DEPEND string contains
1478# "dev-java/ant" or "dev-java/ant-tasks", then it returns "all", otherwise
1479# "none". It's not smart enough to cope with USE flag depends but that shouldn't
1480# be a problem, the worst it can do is activace all tasks when not needed.
1481# Note that this is called only with JAVA_PKG_STRICT=1, to find ebuilds with
1482# insufficient dependencies, otherwise all available tasks are used for
1483# backwards compatilbility.
1484#
1485# @return "all" or "none"
1486# ------------------------------------------------------------------------------
1487java-pkg_ant-tasks-from-deps() {
1488 local found_ant found_ant_tasks
1489
1490 for dep in ${DEPEND}
1491 do
1492 local ant="$(awk '/(dev-java\/ant)/ { if (match($1, "(dev-java/ant)((-[0-9])+|$)", m)) print m[1] }' <<< ${dep})"
1493 [[ "${ant}" == "dev-java/ant" ]] && found_ant=true
1494 [[ "${dep}" == *"ant-tasks"* ]] && found_ant_tasks=true
1495 done
1496
1497 if [[ -n "${found_ant}" || -n "${found_ant_tasks}" ]]; then
1498 java-pkg_announce-qa-violation "The ebuild DEPENDS on deprecated ant or ant-tasks"
1499 echo "all"
1500 else
1501 # ebuild doesn't set ANT_TASKS and doesn't depend on ant-tasks or ant
1502 # so we deactivate all tasks that may be installed
1503 echo "none"
1504 fi
1505}
1506
1507# ------------------------------------------------------------------------------
1508# @internal-function java-pkg_ant-tasks-depend 1746# @internal-function java-pkg_ant-tasks-depend
1509# 1747#
1510# Translates the WANT_ANT_TASKS variable into valid dependencies. 1748# Translates the WANT_ANT_TASKS variable into valid dependencies.
1511# ------------------------------------------------------------------------------ 1749# ------------------------------------------------------------------------------
1512java-pkg_ant-tasks-depend() { 1750java-pkg_ant-tasks-depend() {
1514 1752
1515 if [[ -n "${WANT_ANT_TASKS}" ]]; then 1753 if [[ -n "${WANT_ANT_TASKS}" ]]; then
1516 local DEP="" 1754 local DEP=""
1517 for i in ${WANT_ANT_TASKS} 1755 for i in ${WANT_ANT_TASKS}
1518 do 1756 do
1519 if [[ ${i} != ant-* ]]; then 1757 if [[ ${i} = ant-* ]]; then
1758 DEP="${DEP}dev-java/${i} "
1759 elif [[ ${i} = */*:* ]]; then
1760 DEP="${DEP}${i} "
1761 else
1520 echo "Invalid atom in WANT_ANT_TASKS: ${i}" 1762 echo "Invalid atom in WANT_ANT_TASKS: ${i}"
1521 return 1 1763 return 1
1522 fi 1764 fi
1523 DEP="${DEP}dev-java/${i} "
1524 done 1765 done
1525 echo ${DEP} 1766 echo ${DEP}
1526 return 0 1767 return 0
1527 else 1768 else
1528 return 0 1769 return 0
1529 fi 1770 fi
1530} 1771}
1531 1772
1773
1774# ------------------------------------------------------------------------------
1775# @internal-function ejunit_
1776#
1777# Internal Junit wrapper function. Makes it easier to run the tests and checks for
1778# dev-java/junit in DEPEND. Launches the tests using junit.textui.TestRunner.
1779#
1780# @param $1 - junit package (junit or junit-4)
1781# @param $2 - -cp or -classpath
1782# @param $3 - classpath; junit and recorded dependencies get appended
1783# @param $@ - the rest of the parameters are passed to java
1784ejunit_() {
1785 debug-print-function ${FUNCNAME} $*
1786
1787 local pkgs
1788 if [[ -f ${JAVA_PKG_DEPEND_FILE} ]]; then
1789 for atom in $(cat ${JAVA_PKG_DEPEND_FILE} | tr : ' '); do
1790 pkgs=${pkgs},$(echo ${atom} | sed -re "s/^.*@//")
1791 done
1792 fi
1793
1794 local junit=${1}
1795 shift 1
1796
1797 local cp=$(java-pkg_getjars --with-dependencies ${junit}${pkgs})
1798 if [[ ${1} = -cp || ${1} = -classpath ]]; then
1799 cp="${2}:${cp}"
1800 shift 2
1801 else
1802 cp=".:${cp}"
1803 fi
1804
1805 local runner=junit.textui.TestRunner
1806 if [[ "${junit}" == "junit-4" ]] ; then
1807 runner=org.junit.runner.JUnitCore
1808 fi
1809 debug-print "Calling: java -cp \"${cp}\" -Djava.awt.headless=true ${runner} ${@}"
1810 java -cp "${cp}" -Djava.awt.headless=true ${runner} "${@}" || die "Running junit failed"
1811}
1812
1813# ------------------------------------------------------------------------------
1814# @ebuild-function ejunit
1815#
1816# Junit wrapper function. Makes it easier to run the tests and checks for
1817# dev-java/junit in DEPEND. Launches the tests using org.junit.runner.JUnitCore.
1818#
1819# Examples:
1820# ejunit -cp build/classes org.blinkenlights.jid3.test.AllTests
1821# ejunit org.blinkenlights.jid3.test.AllTests
1822# ejunit org.blinkenlights.jid3.test.FirstTest \
1823# org.blinkenlights.jid3.test.SecondTest
1824#
1825# @param $1 - -cp or -classpath
1826# @param $2 - classpath; junit and recorded dependencies get appended
1827# @param $@ - the rest of the parameters are passed to java
1828# ------------------------------------------------------------------------------
1829ejunit() {
1830 debug-print-function ${FUNCNAME} $*
1831
1832 ejunit_ "junit" "${@}"
1833}
1834
1835# ------------------------------------------------------------------------------
1836# @ebuild-function ejunit4
1837#
1838# Junit4 wrapper function. Makes it easier to run the tests and checks for
1839# dev-java/junit:4 in DEPEND. Launches the tests using junit.textui.TestRunner.
1840#
1841# Examples:
1842# ejunit4 -cp build/classes org.blinkenlights.jid3.test.AllTests
1843# ejunit4 org.blinkenlights.jid3.test.AllTests
1844# ejunit4 org.blinkenlights.jid3.test.FirstTest \
1845# org.blinkenlights.jid3.test.SecondTest
1846#
1847# @param $1 - -cp or -classpath
1848# @param $2 - classpath; junit and recorded dependencies get appended
1849# @param $@ - the rest of the parameters are passed to java
1850# ------------------------------------------------------------------------------
1851ejunit4() {
1852 debug-print-function ${FUNCNAME} $*
1853
1854 ejunit_ "junit-4" "${@}"
1855}
1856
1532# ------------------------------------------------------------------------------ 1857# ------------------------------------------------------------------------------
1533# @section-end helper 1858# @section-end helper
1534# ------------------------------------------------------------------------------ 1859# ------------------------------------------------------------------------------
1860
1861# ------------------------------------------------------------------------------
1862# @eclass-src_prepare
1863#
1864# src_prepare Searches for bundled jars
1865# Don't call directly, but via java-pkg-2_src_prepare!
1866# ------------------------------------------------------------------------------
1867
1868java-utils-2_src_prepare() {
1869 [[ ${EBUILD_PHASE} == prepare ]] &&
1870 java-pkg_func-exists java_prepare && java_prepare
1871
1872 # Remember that eant will call this unless called via Portage
1873 if [[ ! -e "${T}/java-utils-2_src_prepare-run" ]] && is-java-strict; then
1874 echo "Searching for bundled jars:"
1875 java-pkg_find-normal-jars || echo "None found."
1876 echo "Searching for bundled classes (no output if none found):"
1877 find "${WORKDIR}" -name "*.class"
1878 echo "Search done."
1879 fi
1880 touch "${T}/java-utils-2_src_prepare-run"
1881}
1882
1883# ------------------------------------------------------------------------------
1884# @eclass-pkg_preinst
1885#
1886# pkg_preinst Searches for missing and unneeded dependencies
1887# Don't call directly, but via java-pkg-2_pkg_preinst!
1888# ------------------------------------------------------------------------------
1889
1890java-utils-2_pkg_preinst() {
1891 if is-java-strict; then
1892 if has_version dev-java/java-dep-check; then
1893 [[ -e "${JAVA_PKG_ENV}" ]] || return
1894 local output=$(GENTOO_VM= java-dep-check --image "${D}" "${JAVA_PKG_ENV}")
1895 if [[ ${output} && has_version <=dev-java/java-dep-check-0.2 ]]; then
1896 ewarn "Possibly unneeded dependencies found in package.env:"
1897 for dep in ${output}; do
1898 ewarn "\t${dep}"
1899 done
1900 fi
1901 if [[ ${output} && has_version >dev-java/java-dep-check-0.2 ]]; then
1902 ewarn "${output}"
1903 fi
1904 else
1905 eerror "Install dev-java/java-dep-check for dependency checking"
1906 fi
1907 fi
1908}
1535 1909
1536# ------------------------------------------------------------------------------ 1910# ------------------------------------------------------------------------------
1537# @section-begin build 1911# @section-begin build
1538# @section-summary Build functions 1912# @section-summary Build functions
1539# 1913#
1548# compiler. Will also set proper ANT_TASKS from the variable ANT_TASKS, 1922# compiler. Will also set proper ANT_TASKS from the variable ANT_TASKS,
1549# variables: 1923# variables:
1550# EANT_GENTOO_CLASSPATH - calls java-pkg_getjars for the value and adds to the 1924# EANT_GENTOO_CLASSPATH - calls java-pkg_getjars for the value and adds to the
1551# gentoo.classpath property. Be sure to call 1925# gentoo.classpath property. Be sure to call
1552# java-ant_rewrite-classpath in src_unpack. 1926# java-ant_rewrite-classpath in src_unpack.
1927# EANT_NEEDS_TOOLS - add tools.jar to the gentoo.classpath. Should only be used
1928# for build-time purposes, the dependency is not recorded to
1929# package.env!
1553# *ANT_TASKS - used to determine ANT_TASKS before calling Ant. 1930# *ANT_TASKS - used to determine ANT_TASKS before calling Ant.
1554# ------------------------------------------------------------------------------ 1931# ------------------------------------------------------------------------------
1555eant() { 1932eant() {
1556 debug-print-function ${FUNCNAME} $* 1933 debug-print-function ${FUNCNAME} $*
1557 1934
1558 # FIXME get this working 1935 if [[ ${EBUILD_PHASE} = compile ]]; then
1559# if is-java-strict && [[ ! ${DEPEND} =~ "dev-java/ant" ]]; then 1936 java-ant-2_src_configure
1560# java-pkg_announce-qa-violation \ 1937 java-utils-2_src_prepare
1561# "Using eant, but not depending on dev-java/ant or dev-java/ant-core"
1562# fi 1938 fi
1563 1939
1564 if ! hasq java-ant-2 ${INHERITED} && is-java-strict; then 1940 if ! has java-ant-2 ${INHERITED}; then
1565 local msg="You should inherit java-ant-2 when using eant" 1941 local msg="You should inherit java-ant-2 when using eant"
1566 java-pkg_announce-qa-violation ${msg} 1942 java-pkg_announce-qa-violation "${msg}"
1567 die ${msg}
1568 fi 1943 fi
1569 1944
1570 local antflags="-Dnoget=true -Dmaven.mode.offline=true" 1945 local antflags="-Dnoget=true -Dmaven.mode.offline=true -Dbuild.sysclasspath=ignore"
1571 1946
1572 java-pkg_init-compiler_ 1947 java-pkg_init-compiler_
1573 local compiler="${GENTOO_COMPILER}" 1948 local compiler="${GENTOO_COMPILER}"
1574 1949
1575 local compiler_env="${JAVA_PKG_COMPILER_DIR}/${compiler}" 1950 local compiler_env="${JAVA_PKG_COMPILER_DIR}/${compiler}"
1576
1577 local build_compiler="$(source ${compiler_env} 1>/dev/null 2>&1; echo ${ANT_BUILD_COMPILER})" 1951 local build_compiler="$(source ${compiler_env} 1>/dev/null 2>&1; echo ${ANT_BUILD_COMPILER})"
1578 if [[ "${compiler}" != "javac" && -z "${build_compiler}" ]]; then 1952 if [[ "${compiler}" != "javac" && -z "${build_compiler}" ]]; then
1579 die "ANT_BUILD_COMPILER undefined in ${compiler_env}" 1953 die "ANT_BUILD_COMPILER undefined in ${compiler_env}"
1580 fi 1954 fi
1581 1955
1587 # java-config -p 1961 # java-config -p
1588 local build_compiler_deps="$(source ${JAVA_PKG_COMPILER_DIR}/${compiler} 1>/dev/null 2>&1; echo ${ANT_BUILD_COMPILER_DEPS})" 1962 local build_compiler_deps="$(source ${JAVA_PKG_COMPILER_DIR}/${compiler} 1>/dev/null 2>&1; echo ${ANT_BUILD_COMPILER_DEPS})"
1589 if [[ -n ${build_compiler_deps} ]]; then 1963 if [[ -n ${build_compiler_deps} ]]; then
1590 antflags="${antflags} -lib $(java-config -p ${build_compiler_deps})" 1964 antflags="${antflags} -lib $(java-config -p ${build_compiler_deps})"
1591 fi 1965 fi
1592 fi
1593
1594 if is-java-strict; then
1595 einfo "Disabling system classpath for ant"
1596 antflags="${antflags} -Dbuild.sysclasspath=ignore"
1597 fi 1966 fi
1598 1967
1599 for arg in "${@}"; do 1968 for arg in "${@}"; do
1600 if [[ ${arg} = -lib ]]; then 1969 if [[ ${arg} = -lib ]]; then
1601 if is-java-strict; then 1970 if is-java-strict; then
1610 echo "more info." 1979 echo "more info."
1611 fi 1980 fi
1612 fi 1981 fi
1613 done 1982 done
1614 1983
1615 if has_version ">=dev-java/ant-core-1.7.0"; then 1984 # parse WANT_ANT_TASKS for atoms
1616 # default ANT_TASKS to WANT_ANT_TASKS, if ANT_TASKS is not set explicitly 1985 local want_ant_tasks
1617 ANT_TASKS="${ANT_TASKS:-${WANT_ANT_TASKS}}" 1986 for i in ${WANT_ANT_TASKS}; do
1618 1987 if [[ ${i} = */*:* ]]; then
1619 # override ANT_TASKS with JAVA_PKG_FORCE_ANT_TASKS if it's set 1988 i=${i#*/}
1620 ANT_TASKS="${JAVA_PKG_FORCE_ANT_TASKS:-${ANT_TASKS}}" 1989 i=${i%:0}
1621 1990 want_ant_tasks+="${i/:/-} "
1622 if is-java-strict; then
1623 # if ant-tasks were not set by ebuild or forced, try to determine them from depends
1624 if [[ -z "${ANT_TASKS}" ]]; then
1625 ANT_TASKS="$(java-pkg_ant-tasks-from-deps)"
1626 fi
1627 else 1991 else
1992 want_ant_tasks+="${i} "
1993 fi
1994 done
1995 # default ANT_TASKS to WANT_ANT_TASKS, if ANT_TASKS is not set explicitly
1996 ANT_TASKS="${ANT_TASKS:-${want_ant_tasks% }}"
1997
1998 # override ANT_TASKS with JAVA_PKG_FORCE_ANT_TASKS if it's set
1999 ANT_TASKS="${JAVA_PKG_FORCE_ANT_TASKS:-${ANT_TASKS}}"
2000
1628 # if ant-tasks is not set by ebuild or forced, activate all of them 2001 # if ant-tasks is not set by ebuild or forced, use none
1629 ANT_TASKS="${ANT_TASKS:-all}" 2002 ANT_TASKS="${ANT_TASKS:-none}"
1630 fi
1631 2003
1632 # at this point, ANT_TASKS should be "all", "none" or explicit list 2004 # at this point, ANT_TASKS should be "all", "none" or explicit list
1633 if [[ "${ANT_TASKS}" == "all" ]]; then 2005 if [[ "${ANT_TASKS}" == "all" ]]; then
1634 einfo "Using all available ANT_TASKS" 2006 einfo "Using all available ANT_TASKS"
1635 elif [[ "${ANT_TASKS}" == "none" ]]; then 2007 elif [[ "${ANT_TASKS}" == "none" ]]; then
1636 einfo "Disabling all optional ANT_TASKS" 2008 einfo "Disabling all optional ANT_TASKS"
1637 else 2009 else
1638 einfo "Using following ANT_TASKS: ${ANT_TASKS}" 2010 einfo "Using following ANT_TASKS: ${ANT_TASKS}"
1639 fi 2011 fi
1640 2012
1641 export ANT_TASKS 2013 export ANT_TASKS
1642 fi
1643 2014
1644 [[ -n ${JAVA_PKG_DEBUG} ]] && antflags="${antflags} --execdebug -debug" 2015 [[ -n ${JAVA_PKG_DEBUG} ]] && antflags="${antflags} --execdebug -debug"
1645 [[ -n ${PORTAGE_QUIET} ]] && antflags="${antflags} -q" 2016 [[ -n ${PORTAGE_QUIET} ]] && antflags="${antflags} -q"
1646 2017
1647 local gcp="${EANT_GENTOO_CLASSPATH}" 2018 local gcp="${EANT_GENTOO_CLASSPATH}"
2019 local getjarsarg=""
1648 2020
1649 if [[ ${EBUILD_PHASE} = "test" ]]; then 2021 if [[ ${EBUILD_PHASE} = "test" ]]; then
1650 antflags="${antflags} -DJunit.present=true" 2022 antflags="${antflags} -DJunit.present=true"
1651 [[ ${gcp} && ${ANT_TASKS} = *ant-junit* ]] && gcp="${gcp} junit" 2023 [[ ${ANT_TASKS} = *ant-junit* ]] && gcp="${gcp} junit"
2024 getjarsarg="--with-dependencies"
2025 else
2026 antflags="${antflags} -Dmaven.test.skip=true"
1652 fi 2027 fi
1653 2028
1654 local cp 2029 local cp
1655 2030
1656 for atom in ${gcp}; do 2031 for atom in ${gcp}; do
1657 cp="${cp}:$(java-pkg_getjars ${atom})" 2032 cp="${cp}:$(java-pkg_getjars ${getjarsarg} ${atom})"
1658 done 2033 done
2034
2035 [[ -n "${EANT_NEEDS_TOOLS}" ]] && cp="${cp}:$(java-config --tools)"
1659 2036
1660 if [[ ${cp} ]]; then 2037 if [[ ${cp} ]]; then
1661 # It seems ant does not like single quotes around ${cp} 2038 # It seems ant does not like single quotes around ${cp}
2039 cp=${cp#:}
2040 [[ ${EANT_GENTOO_CLASSPATH_EXTRA} ]] && \
2041 cp="${cp}:${EANT_GENTOO_CLASSPATH_EXTRA}"
1662 antflags="${antflags} -Dgentoo.classpath=\"${cp#:}\"" 2042 antflags="${antflags} -Dgentoo.classpath=\"${cp}\""
1663 fi 2043 fi
1664 2044
1665 [[ -n ${JAVA_PKG_DEBUG} ]] && echo ant ${antflags} "${@}" 2045 [[ -n ${JAVA_PKG_DEBUG} ]] && echo ant ${antflags} "${@}"
1666 debug-print "Calling ant: ${antflags} ${@}" 2046 debug-print "Calling ant (GENTOO_VM: ${GENTOO_VM}): ${antflags} ${@}"
1667 ant ${antflags} "${@}" || die "eant failed" 2047 ant ${antflags} "${@}" || die "eant failed"
1668
1669} 2048}
1670 2049
1671# ------------------------------------------------------------------------------ 2050# ------------------------------------------------------------------------------
1672# @ebuild-function ejavac 2051# @ebuild-function ejavac
1673# 2052#
1768# This shouldn't be used directly. Instead, java-pkg and java-pkg-opt will 2147# This shouldn't be used directly. Instead, java-pkg and java-pkg-opt will
1769# call it during each of the phases of the merge process. 2148# call it during each of the phases of the merge process.
1770# 2149#
1771# ----------------------------------------------------------------------------- 2150# -----------------------------------------------------------------------------
1772java-pkg_init() { 2151java-pkg_init() {
2152 debug-print-function ${FUNCNAME} $*
2153
2154 # Don't set up build environment if installing from binary. #206024 #258423
2155 [[ "${MERGE_TYPE}" == "binary" ]] && return
2156 # Also try Portage's nonstandard EMERGE_FROM for old EAPIs, if it doesn't
2157 # work nothing is lost.
2158 has ${EAPI:-0} 0 1 2 3 && [[ "${EMERGE_FROM}" == "binary" ]] && return
2159
1773 unset JAVAC 2160 unset JAVAC
1774 unset JAVA_HOME 2161 unset JAVA_HOME
2162
2163 java-config --help >/dev/null || {
2164 eerror ""
2165 eerror "Can't run java-config --help"
2166 eerror "Have you upgraded python recently but haven't"
2167 eerror "run python-updater yet?"
2168 die "Can't run java-config --help"
2169 }
2170
2171 # People do all kinds of weird things.
2172 # http://forums.gentoo.org/viewtopic-p-3943166.html
2173 local silence="${SILENCE_JAVA_OPTIONS_WARNING}"
2174 local accept="${I_WANT_GLOBAL_JAVA_OPTIONS}"
2175 if [[ -n ${_JAVA_OPTIONS} && -z ${accept} && -z ${silence} ]]; then
2176 ewarn "_JAVA_OPTIONS changes what java -version outputs at least for"
2177 ewarn "sun-jdk vms and and as such break configure scripts that"
2178 ewarn "use it (for example app-office/openoffice) so we filter it out."
2179 ewarn "Use SILENCE_JAVA_OPTIONS_WARNING=true in the environment (use"
2180 ewarn "make.conf for example) to silence this warning or"
2181 ewarn "I_WANT_GLOBAL_JAVA_OPTIONS to not filter it."
2182 fi
2183
2184 if [[ -z ${accept} ]]; then
2185 # export _JAVA_OPTIONS= doesn't work because it will show up in java
2186 # -version output
2187 unset _JAVA_OPTIONS
2188 # phase hooks make this run many times without this
2189 I_WANT_GLOBAL_JAVA_OPTIONS="true"
2190 fi
2191
2192 if java-pkg_func-exists ant_src_unpack; then
2193 java-pkg_announce-qa-violation "Using old ant_src_unpack. Should be src_unpack"
2194 fi
2195
1775 java-pkg_init_paths_ 2196 java-pkg_init_paths_
1776 java-pkg_switch-vm 2197 java-pkg_switch-vm
1777 PATH=${JAVA_HOME}/bin:${PATH} 2198 PATH=${JAVA_HOME}/bin:${PATH}
1778 2199
1779 # TODO we will probably want to set JAVAC and JAVACFLAGS 2200 # TODO we will probably want to set JAVAC and JAVACFLAGS
1780 2201
1781 # Do some QA checks 2202 # Do some QA checks
1782 java-pkg_check-jikes 2203 java-pkg_check-jikes
2204
2205 # Can't use unset here because Portage does not save the unset
2206 # see https://bugs.gentoo.org/show_bug.cgi?id=189417#c11
1783 2207
1784 # When users have crazy classpaths some packages can fail to compile. 2208 # When users have crazy classpaths some packages can fail to compile.
1785 # and everything should work with empty CLASSPATH. 2209 # and everything should work with empty CLASSPATH.
1786 # This also helps prevent unexpected dependencies on random things 2210 # This also helps prevent unexpected dependencies on random things
1787 # from the CLASSPATH. 2211 # from the CLASSPATH.
1788 unset CLASSPATH 2212 export CLASSPATH=
1789 2213
1790 # Unset external ANT_ stuff 2214 # Unset external ANT_ stuff
1791 unset ANT_TASKS 2215 export ANT_TASKS=
1792 unset ANT_OPTS 2216 export ANT_OPTS=
2217 export ANT_RESPECT_JAVA_HOME=
1793} 2218}
1794 2219
1795# ------------------------------------------------------------------------------ 2220# ------------------------------------------------------------------------------
1796# @function-internal java-pkg-init-compiler_ 2221# @function-internal java-pkg-init-compiler_
1797# 2222#
1888 done 2313 done
1889 2314
1890 # If it hasn't been defined already, default to javac 2315 # If it hasn't been defined already, default to javac
1891 if [[ -z ${GENTOO_COMPILER} ]]; then 2316 if [[ -z ${GENTOO_COMPILER} ]]; then
1892 if [[ -n ${compilers} ]]; then 2317 if [[ -n ${compilers} ]]; then
1893 einfo "No suitable compiler found: defaulting javac for compilation" 2318 einfo "No suitable compiler found: defaulting to JDK default for compilation"
1894 else 2319 else
1895 # probably don't need to notify users about the default. 2320 # probably don't need to notify users about the default.
1896 :;#einfo "Defaulting to javac for compilation" 2321 :;#einfo "Defaulting to javac for compilation"
1897 fi 2322 fi
2323 if java-config -g GENTOO_COMPILER 2> /dev/null; then
2324 export GENTOO_COMPILER=$(java-config -g GENTOO_COMPILER)
2325 else
1898 export GENTOO_COMPILER=javac 2326 export GENTOO_COMPILER=javac
2327 fi
1899 else 2328 else
1900 einfo "Using ${GENTOO_COMPILER} for compilation" 2329 einfo "Using ${GENTOO_COMPILER} for compilation"
1901 fi 2330 fi
1902 2331
1903} 2332}
1919 fi 2348 fi
1920 2349
1921 JAVA_PKG_SHAREPATH="${DESTTREE}/share/${JAVA_PKG_NAME}" 2350 JAVA_PKG_SHAREPATH="${DESTTREE}/share/${JAVA_PKG_NAME}"
1922 JAVA_PKG_SOURCESPATH="${JAVA_PKG_SHAREPATH}/sources/" 2351 JAVA_PKG_SOURCESPATH="${JAVA_PKG_SHAREPATH}/sources/"
1923 JAVA_PKG_ENV="${D}${JAVA_PKG_SHAREPATH}/package.env" 2352 JAVA_PKG_ENV="${D}${JAVA_PKG_SHAREPATH}/package.env"
2353 JAVA_PKG_VIRTUALS_PATH="${DESTTREE}/share/java-config-2/virtuals"
2354 JAVA_PKG_VIRTUAL_PROVIDER="${D}/${JAVA_PKG_VIRTUALS_PATH}/${JAVA_PKG_NAME}"
1924 2355
1925 [[ -z "${JAVA_PKG_JARDEST}" ]] && JAVA_PKG_JARDEST="${JAVA_PKG_SHAREPATH}/lib" 2356 [[ -z "${JAVA_PKG_JARDEST}" ]] && JAVA_PKG_JARDEST="${JAVA_PKG_SHAREPATH}/lib"
1926 [[ -z "${JAVA_PKG_LIBDEST}" ]] && JAVA_PKG_LIBDEST="${DESTTREE}/$(get_libdir)/${JAVA_PKG_NAME}" 2357 [[ -z "${JAVA_PKG_LIBDEST}" ]] && JAVA_PKG_LIBDEST="${DESTTREE}/$(get_libdir)/${JAVA_PKG_NAME}"
1927 [[ -z "${JAVA_PKG_WARDEST}" ]] && JAVA_PKG_WARDEST="${JAVA_PKG_SHAREPATH}/webapps" 2358 [[ -z "${JAVA_PKG_WARDEST}" ]] && JAVA_PKG_WARDEST="${JAVA_PKG_SHAREPATH}/webapps"
1928 2359
1941# Writes the package.env out to disk. 2372# Writes the package.env out to disk.
1942# 2373#
1943# ------------------------------------------------------------------------------ 2374# ------------------------------------------------------------------------------
1944# TODO change to do-write, to match everything else 2375# TODO change to do-write, to match everything else
1945java-pkg_do_write_() { 2376java-pkg_do_write_() {
2377 debug-print-function ${FUNCNAME} $*
1946 java-pkg_init_paths_ 2378 java-pkg_init_paths_
1947 # Create directory for package.env 2379 # Create directory for package.env
1948 dodir "${JAVA_PKG_SHAREPATH}" 2380 dodir "${JAVA_PKG_SHAREPATH}"
1949 if [[ -n "${JAVA_PKG_CLASSPATH}" || -n "${JAVA_PKG_LIBRARY}" || -f "${JAVA_PKG_DEPEND}" ]]; then 2381 if [[ -n "${JAVA_PKG_CLASSPATH}" || -n "${JAVA_PKG_LIBRARY}" || -f \
2382 "${JAVA_PKG_DEPEND_FILE}" || -f \
2383 "${JAVA_PKG_OPTIONAL_DEPEND_FILE}" ]]; then
1950 # Create package.env 2384 # Create package.env
1951 ( 2385 (
1952 echo "DESCRIPTION=\"${DESCRIPTION}\"" 2386 echo "DESCRIPTION=\"${DESCRIPTION}\""
1953 echo "GENERATION=\"2\"" 2387 echo "GENERATION=\"2\""
2388 echo "SLOT=\"${SLOT}\""
2389 echo "CATEGORY=\"${CATEGORY}\""
2390 echo "PVR=\"${PVR}\""
1954 2391
1955 [[ -n "${JAVA_PKG_CLASSPATH}" ]] && echo "CLASSPATH=\"${JAVA_PKG_CLASSPATH}\"" 2392 [[ -n "${JAVA_PKG_CLASSPATH}" ]] && echo "CLASSPATH=\"${JAVA_PKG_CLASSPATH}\""
1956 [[ -n "${JAVA_PKG_LIBRARY}" ]] && echo "LIBRARY_PATH=\"${JAVA_PKG_LIBRARY}\"" 2393 [[ -n "${JAVA_PKG_LIBRARY}" ]] && echo "LIBRARY_PATH=\"${JAVA_PKG_LIBRARY}\""
1957 [[ -n "${JAVA_PROVIDE}" ]] && echo "PROVIDES=\"${JAVA_PROVIDE}\"" 2394 [[ -n "${JAVA_PROVIDE}" ]] && echo "PROVIDES=\"${JAVA_PROVIDE}\""
1958 [[ -f "${JAVA_PKG_DEPEND}" ]] && echo "DEPEND=\"$(cat ${JAVA_PKG_DEPEND} | uniq | tr '\n' ':')\"" 2395 [[ -f "${JAVA_PKG_DEPEND_FILE}" ]] \
2396 && echo "DEPEND=\"$(sort -u "${JAVA_PKG_DEPEND_FILE}" | tr '\n' ':')\""
2397 [[ -f "${JAVA_PKG_OPTIONAL_DEPEND_FILE}" ]] \
2398 && echo "OPTIONAL_DEPEND=\"$(sort -u "${JAVA_PKG_OPTIONAL_DEPEND_FILE}" | tr '\n' ':')\""
1959 echo "VM=\"$(echo ${RDEPEND} ${DEPEND} | sed -e 's/ /\n/g' | sed -n -e '/virtual\/\(jre\|jdk\)/ { p;q }')\"" # TODO cleanup ! 2399 echo "VM=\"$(echo ${RDEPEND} ${DEPEND} | sed -e 's/ /\n/g' | sed -n -e '/virtual\/\(jre\|jdk\)/ { p;q }')\"" # TODO cleanup !
2400 [[ -f "${JAVA_PKG_BUILD_DEPEND_FILE}" ]] \
2401 && echo "BUILD_DEPEND=\"$(sort -u "${JAVA_PKG_BUILD_DEPEND_FILE}" | tr '\n' ':')\""
1960 ) > "${JAVA_PKG_ENV}" 2402 ) > "${JAVA_PKG_ENV}"
1961 2403
1962 # register target/source 2404 # register target/source
1963 local target="$(java-pkg_get-target)" 2405 local target="$(java-pkg_get-target)"
1964 local source="$(java-pkg_get-source)" 2406 local source="$(java-pkg_get-source)"
1974 2416
1975 2417
1976 echo "MERGE_VM=\"${GENTOO_VM}\"" >> "${JAVA_PKG_ENV}" 2418 echo "MERGE_VM=\"${GENTOO_VM}\"" >> "${JAVA_PKG_ENV}"
1977 [[ -n ${GENTOO_COMPILER} ]] && echo "MERGE_COMPILER=\"${GENTOO_COMPILER}\"" >> "${JAVA_PKG_ENV}" 2419 [[ -n ${GENTOO_COMPILER} ]] && echo "MERGE_COMPILER=\"${GENTOO_COMPILER}\"" >> "${JAVA_PKG_ENV}"
1978 2420
2421 # extra env variables
2422 if [[ -n "${JAVA_PKG_EXTRA_ENV_VARS}" ]]; then
2423 cat "${JAVA_PKG_EXTRA_ENV}" >> "${JAVA_PKG_ENV}" || die
2424 # nested echo to remove leading/trailing spaces
2425 echo "ENV_VARS=\"$(echo ${JAVA_PKG_EXTRA_ENV_VARS})\"" \
2426 >> "${JAVA_PKG_ENV}" || die
2427 fi
2428
1979 # Strip unnecessary leading and trailing colons 2429 # Strip unnecessary leading and trailing colons
1980 # TODO try to cleanup if possible 2430 # TODO try to cleanup if possible
1981 sed -e "s/=\":/=\"/" -e "s/:\"$/\"/" -i "${JAVA_PKG_ENV}" || die "Did you forget to call java_init ?" 2431 sed -e "s/=\":/=\"/" -e "s/:\"$/\"/" -i "${JAVA_PKG_ENV}" || die "Did you forget to call java_init ?"
2432 else
2433 debug-print "JAVA_PKG_CLASSPATH, JAVA_PKG_LIBRARY, JAVA_PKG_DEPEND_FILE"
2434 debug-print "or JAVA_PKG_OPTIONAL_DEPEND_FILE not defined so can't"
2435 debug-print "write package.env."
1982 fi 2436 fi
1983} 2437}
1984 2438
1985# ------------------------------------------------------------------------------ 2439# ------------------------------------------------------------------------------
1986# @internal-function java-pkg_record-jar_ 2440# @internal-function java-pkg_record-jar_
1987# 2441#
1988# Record a dependency to the package.env 2442# Record an (optional) dependency to the package.env
1989# 2443# @param --optional - record dependency as optional
2444# @param --build - record dependency as build_only
2445# @param $1 - package to record
2446# @param $2 - (optional) jar of package to record
1990# ------------------------------------------------------------------------------ 2447# ------------------------------------------------------------------------------
1991JAVA_PKG_DEPEND="${T}/java-pkg-depend" 2448JAVA_PKG_DEPEND_FILE="${T}/java-pkg-depend"
2449JAVA_PKG_OPTIONAL_DEPEND_FILE="${T}/java-pkg-optional-depend"
2450JAVA_PKG_BUILD_DEPEND_FILE="${T}/java-pkg-build-depend"
1992 2451
1993java-pkg_record-jar_() { 2452java-pkg_record-jar_() {
1994 debug-print-function ${FUNCNAME} $* 2453 debug-print-function ${FUNCNAME} $*
2454
2455 local depend_file="${JAVA_PKG_DEPEND_FILE}"
2456 case "${1}" in
2457 "--optional") depend_file="${JAVA_PKG_OPTIONAL_DEPEND_FILE}"; shift;;
2458 "--build-only") depend_file="${JAVA_PKG_BUILD_DEPEND_FILE}"; shift;;
2459 esac
1995 2460
1996 local pkg=${1} jar=${2} append 2461 local pkg=${1} jar=${2} append
1997 if [[ -z "${jar}" ]]; then 2462 if [[ -z "${jar}" ]]; then
1998 append="${pkg}" 2463 append="${pkg}"
1999 else 2464 else
2000 append="$(basename ${jar})@${pkg}" 2465 append="$(basename ${jar})@${pkg}"
2001 fi 2466 fi
2002 2467
2003 echo ${append} >> ${JAVA_PKG_DEPEND} 2468 echo "${append}" >> "${depend_file}"
2004} 2469}
2005 2470
2006# ------------------------------------------------------------------------------ 2471# ------------------------------------------------------------------------------
2007# @internal-function java-pkg_append_ 2472# @internal-function java-pkg_append_
2008# 2473#
2052# 2517#
2053# @return 0 - function is declared 2518# @return 0 - function is declared
2054# @return 1 - function is undeclared 2519# @return 1 - function is undeclared
2055# ------------------------------------------------------------------------------ 2520# ------------------------------------------------------------------------------
2056java-pkg_func-exists() { 2521java-pkg_func-exists() {
2057 if [[ -n "$(declare -f ${1})" ]]; then 2522 declare -F ${1} > /dev/null
2058 return 0
2059 else
2060 return 1
2061 fi
2062} 2523}
2063 2524
2064# ------------------------------------------------------------------------------ 2525# ------------------------------------------------------------------------------
2065# @internal-function java-pkg_setup-vm 2526# @internal-function java-pkg_setup-vm
2066# 2527#
2074 if [[ "${vendor}" == "sun" ]] && java-pkg_is-vm-version-ge "1.5" ; then 2535 if [[ "${vendor}" == "sun" ]] && java-pkg_is-vm-version-ge "1.5" ; then
2075 addpredict "/dev/random" 2536 addpredict "/dev/random"
2076 elif [[ "${vendor}" == "ibm" ]]; then 2537 elif [[ "${vendor}" == "ibm" ]]; then
2077 addpredict "/proc/self/maps" 2538 addpredict "/proc/self/maps"
2078 addpredict "/proc/cpuinfo" 2539 addpredict "/proc/cpuinfo"
2079 export LANG="C" LC_ALL="C" 2540 addpredict "/proc/self/coredump_filter"
2541 elif [[ "${vendor}" == "oracle" ]]; then
2542 addpredict "/dev/random"
2543 addpredict "/proc/self/coredump_filter"
2544 elif [[ "${vendor}" == icedtea* ]] && java-pkg_is-vm-version-ge "1.7" ; then
2545 addpredict "/dev/random"
2546 addpredict "/proc/self/coredump_filter"
2080 elif [[ "${vendor}" == "jrockit" ]]; then 2547 elif [[ "${vendor}" == "jrockit" ]]; then
2081 addpredict "/proc/cpuinfo" 2548 addpredict "/proc/cpuinfo"
2082 fi 2549 fi
2083} 2550}
2084 2551
2085# ------------------------------------------------------------------------------ 2552# ------------------------------------------------------------------------------
2086# @internal-function java-pkg_needs-vm 2553# @internal-function java-pkg_needs-vm
2087# 2554#
2088# Does the current package depend on virtual/jdk? 2555# Does the current package depend on virtual/jdk or does it set
2556# JAVA_PKG_WANT_BUILD_VM?
2089# 2557#
2090# @return 0 - Package depends on virtual/jdk 2558# @return 0 - Package depends on virtual/jdk
2091# @return 1 - Package does not depend on virtual/jdk 2559# @return 1 - Package does not depend on virtual/jdk
2092# ------------------------------------------------------------------------------ 2560# ------------------------------------------------------------------------------
2093java-pkg_needs-vm() { 2561java-pkg_needs-vm() {
2094 debug-print-function ${FUNCNAME} $* 2562 debug-print-function ${FUNCNAME} $*
2095 2563
2096 if [[ -n "$(echo ${DEPEND} | sed -e '\:virtual/jdk:!d')" ]]; then 2564 if [[ -n "$(echo ${JAVA_PKG_NV_DEPEND:-${DEPEND}} | sed -e '\:virtual/jdk:!d')" ]]; then
2097 return 0 2565 return 0
2098 fi 2566 fi
2567
2568 [[ -n "${JAVA_PKG_WANT_BUILD_VM}" ]] && return 0
2099 2569
2100 return 1 2570 return 1
2101} 2571}
2102 2572
2103# ------------------------------------------------------------------------------ 2573# ------------------------------------------------------------------------------
2129# ------------------------------------------------------------------------------ 2599# ------------------------------------------------------------------------------
2130java-pkg_get-vm-version() { 2600java-pkg_get-vm-version() {
2131 debug-print-function ${FUNCNAME} $* 2601 debug-print-function ${FUNCNAME} $*
2132 2602
2133 java-config -g PROVIDES_VERSION 2603 java-config -g PROVIDES_VERSION
2604}
2605
2606# ------------------------------------------------------------------------------
2607# @internal-function java-pkg_build-vm-from-handle
2608#
2609# Selects a build vm from a list of vm handles. First checks for the system-vm
2610# beeing usable, then steps through the listed handles till a suitable vm is
2611# found.
2612#
2613# @return - VM handle of an available JDK
2614# ------------------------------------------------------------------------------
2615java-pkg_build-vm-from-handle() {
2616 debug-print-function ${FUNCNAME} "$*"
2617
2618 local vm
2619 vm=$(java-pkg_get-current-vm)
2620 if [[ $? != 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
2626 echo ${vm}
2627 return 0
2628 fi
2629
2630 for vm in ${JAVA_PKG_WANT_BUILD_VM}; do
2631 if java-config-2 --select-vm=${vm} 2>/dev/null; then
2632 echo ${vm}
2633 return 0
2634 fi
2635 done
2636
2637 eerror "${FUNCNAME}: No vm found for handles: ${JAVA_PKG_WANT_BUILD_VM}"
2638 return 1
2134} 2639}
2135 2640
2136# ------------------------------------------------------------------------------ 2641# ------------------------------------------------------------------------------
2137# @internal-function java-pkg_switch-vm 2642# @internal-function java-pkg_switch-vm
2138# 2643#
2149 # If you're forcing the VM, I hope you know what your doing... 2654 # If you're forcing the VM, I hope you know what your doing...
2150 debug-print "JAVA_PKG_FORCE_VM used: ${JAVA_PKG_FORCE_VM}" 2655 debug-print "JAVA_PKG_FORCE_VM used: ${JAVA_PKG_FORCE_VM}"
2151 export GENTOO_VM="${JAVA_PKG_FORCE_VM}" 2656 export GENTOO_VM="${JAVA_PKG_FORCE_VM}"
2152 # if we're allowed to switch the vm... 2657 # if we're allowed to switch the vm...
2153 elif [[ "${JAVA_PKG_ALLOW_VM_CHANGE}" == "yes" ]]; then 2658 elif [[ "${JAVA_PKG_ALLOW_VM_CHANGE}" == "yes" ]]; then
2154 debug-print "depend-java-query: NV_DEPEND: ${JAVA_PKG_NV_DEPEND:-${DEPEND}} VNEED: ${JAVA_PKG_VNEED}" 2659 # if there is an explicit list of handles to choose from
2155 if [[ -n ${JAVA_PKG_VNEED} ]]; then 2660 if [[ -n "${JAVA_PKG_WANT_BUILD_VM}" ]]; then
2156 GENTOO_VM="$(depend-java-query --need-virtual "${JAVA_PKG_VNEED}" --get-vm "${JAVA_PKG_NV_DEPEND:-${DEPEND}}")" 2661 debug-print "JAVA_PKG_WANT_BUILD_VM used: ${JAVA_PKG_WANT_BUILD_VM}"
2662 GENTOO_VM=$(java-pkg_build-vm-from-handle)
2663 if [[ $? != 0 ]]; then
2664 eerror "${FUNCNAME}: No VM found for handles: ${JAVA_PKG_WANT_BUILD_VM}"
2665 die "${FUNCNAME}: Failed to determine VM for building"
2666 fi
2667 # JAVA_PKG_WANT_SOURCE and JAVA_PKG_WANT_TARGET are required as
2668 # they can't be deduced from handles.
2669 if [[ -z "${JAVA_PKG_WANT_SOURCE}" ]]; then
2670 eerror "JAVA_PKG_WANT_BUILD_VM specified but not JAVA_PKG_WANT_SOURCE"
2671 die "Specify JAVA_PKG_WANT_SOURCE"
2672 fi
2673 if [[ -z "${JAVA_PKG_WANT_TARGET}" ]]; then
2674 eerror "JAVA_PKG_WANT_BUILD_VM specified but not JAVA_PKG_WANT_TARGET"
2675 die "Specify JAVA_PKG_WANT_TARGET"
2676 fi
2677 # otherwise determine a vm from dep string
2157 else 2678 else
2679 debug-print "depend-java-query: NV_DEPEND: ${JAVA_PKG_NV_DEPEND:-${DEPEND}}"
2158 GENTOO_VM="$(depend-java-query --get-vm "${JAVA_PKG_NV_DEPEND:-${DEPEND}}")" 2680 GENTOO_VM="$(depend-java-query --get-vm "${JAVA_PKG_NV_DEPEND:-${DEPEND}}")"
2681 if [[ -z "${GENTOO_VM}" || "${GENTOO_VM}" == "None" ]]; then
2682 eerror "Unable to determine VM for building from dependencies:"
2683 echo "NV_DEPEND: ${JAVA_PKG_NV_DEPEND:-${DEPEND}}"
2684 die "Failed to determine VM for building."
2685 fi
2159 fi 2686 fi
2160 if [[ -z "${GENTOO_VM}" || "${GENTOO_VM}" == "None" ]]; then
2161 eerror "Unable to determine VM for building from dependencies:"
2162 echo "NV_DEPEND: ${JAVA_PKG_NV_DEPEND:-${DEPEND}}"
2163 echo "VNEED: ${JAVA_PKG_VNEED}"
2164 die "Failed to determine VM for building."
2165 else
2166 export GENTOO_VM 2687 export GENTOO_VM
2167 fi
2168 # otherwise just make sure the current VM is sufficient 2688 # otherwise just make sure the current VM is sufficient
2169 else 2689 else
2170 java-pkg_ensure-vm-version-sufficient 2690 java-pkg_ensure-vm-version-sufficient
2171 fi 2691 fi
2172 debug-print "Using: $(java-config -f)" 2692 debug-print "Using: $(java-config -f)"
2188 2708
2189 #TODO If you know a better solution let us know. 2709 #TODO If you know a better solution let us know.
2190 java-pkg_append_ LD_LIBRARY_PATH "$(java-config -g LDPATH)" 2710 java-pkg_append_ LD_LIBRARY_PATH "$(java-config -g LDPATH)"
2191 2711
2192 local tann="${T}/announced-vm" 2712 local tann="${T}/announced-vm"
2713 # With the hooks we should only get here once from pkg_setup but better safe than sorry
2714 # if people have for example modified eclasses some where
2193 if [[ -n "${JAVA_PKG_DEBUG}" ]] || [[ ! -f "${tann}" ]] ; then 2715 if [[ -n "${JAVA_PKG_DEBUG}" ]] || [[ ! -f "${tann}" ]] ; then
2194 # Add a check for setup/preinst phase... to avoid duplicate outputs
2195 # for when FEATURES=buildpkg
2196 if [[ ${EBUILD_PHASE} != "setup" && ${EBUILD_PHASE} != "preinst" && ${EBUILD_PHASE} != "postinst" ]];
2197 then
2198 einfo "Using: $(java-config -f)" 2716 einfo "Using: $(java-config -f)"
2199 [[ ! -f "${tann}" ]] && touch "${tann}" 2717 [[ ! -f "${tann}" ]] && touch "${tann}"
2200 fi
2201 fi 2718 fi
2202 2719
2203 else 2720 else
2204 [[ -n "${JAVA_PKG_DEBUG}" ]] && ewarn "!!! This package inherits java-pkg but doesn't depend on a JDK. -bin or broken dependency!!!" 2721 [[ -n "${JAVA_PKG_DEBUG}" ]] && ewarn "!!! This package inherits java-pkg but doesn't depend on a JDK. -bin or broken dependency!!!"
2205 fi 2722 fi
2210# 2727#
2211# Enhanced die for Java packages, which displays some information that may be 2728# Enhanced die for Java packages, which displays some information that may be
2212# useful for debugging bugs on bugzilla. 2729# useful for debugging bugs on bugzilla.
2213# ------------------------------------------------------------------------------ 2730# ------------------------------------------------------------------------------
2214#register_die_hook java-pkg_die 2731#register_die_hook java-pkg_die
2215if ! hasq java-pkg_die ${EBUILD_DEATH_HOOKS}; then 2732if ! has java-pkg_die ${EBUILD_DEATH_HOOKS}; then
2216 EBUILD_DEATH_HOOKS="${EBUILD_DEATH_HOOKS} java-pkg_die" 2733 EBUILD_DEATH_HOOKS="${EBUILD_DEATH_HOOKS} java-pkg_die"
2217fi 2734fi
2218 2735
2219java-pkg_die() { 2736java-pkg_die() {
2220 echo "!!! When you file a bug report, please include the following information:" >&2 2737 echo "!!! When you file a bug report, please include the following information:" >&2
2244# not. 2761# not.
2245# @param $1 (optional) - the file to check, otherwise checks whole ${D} 2762# @param $1 (optional) - the file to check, otherwise checks whole ${D}
2246# ------------------------------------------------------------------------------ 2763# ------------------------------------------------------------------------------
2247java-pkg_verify-classes() { 2764java-pkg_verify-classes() {
2248 #$(find ${D} -type f -name '*.jar' -o -name '*.class') 2765 #$(find ${D} -type f -name '*.jar' -o -name '*.class')
2766
2767 local version_verify="/usr/bin/class-version-verify.py"
2768
2769 if [[ ! -x "${version_verify}" ]]; then
2770 version_verify="/usr/$(get_libdir)/javatoolkit/bin/class-version-verify.py"
2771 fi
2772
2773 if [[ ! -x "${version_verify}" ]]; then
2774 ewarn "Unable to perform class version checks as"
2775 ewarn "class-version-verify.py is unavailable"
2776 ewarn "Please install dev-java/javatoolkit."
2777 return
2778 fi
2779
2249 local target=$(java-pkg_get-target) 2780 local target=$(java-pkg_get-target)
2250 local result 2781 local result
2251 local log="${T}/class-version-verify.log" 2782 local log="${T}/class-version-verify.log"
2252 if [[ -n "${1}" ]]; then 2783 if [[ -n "${1}" ]]; then
2253 class-version-verify.py -v -t ${target} "${1}" > "${log}" 2784 ${version_verify} -v -t ${target} "${1}" > "${log}"
2254 result=$? 2785 result=$?
2255 else 2786 else
2256 ebegin "Verifying java class versions (target: ${target})" 2787 ebegin "Verifying java class versions (target: ${target})"
2257 class-version-verify.py -v -t ${target} -r "${D}" > "${log}" 2788 ${version_verify} -v -t ${target} -r "${D}" > "${log}"
2258 result=$? 2789 result=$?
2259 eend ${result} 2790 eend ${result}
2260 fi 2791 fi
2261 [[ -n ${JAVA_PKG_DEBUG} ]] && cat "${log}" 2792 [[ -n ${JAVA_PKG_DEBUG} ]] && cat "${log}"
2262 if [[ ${result} != 0 ]]; then 2793 if [[ ${result} != 0 ]]; then
2265 eerror "See ${log} for more details." 2796 eerror "See ${log} for more details."
2266 die "Incorrect bytecode found" 2797 die "Incorrect bytecode found"
2267 fi 2798 fi
2268} 2799}
2269 2800
2801# ----------------------------------------------------------------------------
2802# @internal-function java-pkg_ensure-dep
2803# Check that a package being used in jarfrom, getjars and getjar is contained
2804# within DEPEND or RDEPEND.
2805# @param $1 - empty - check both vars; "runtime" or "build" - check only
2806# RDEPEND, resp. DEPEND
2807# @param $2 - Package name and slot.
2808
2809java-pkg_ensure-dep() {
2810 debug-print-function ${FUNCNAME} $*
2811
2812 local limit_to="${1}"
2813 local target_pkg="${2}"
2814 local dev_error=""
2815
2816 # remove the version specification, which may include globbing (* and [123])
2817 local stripped_pkg=$(echo "${target_pkg}" | sed \
2818 's/-\([0-9*]*\(\[[0-9]*\]\)*\)*\(\.\([0-9*]*\(\[[0-9]*\]\)*\)*\)*$//')
2819
2820 debug-print "Matching against: ${stripped_pkg}"
2821
2822 if [[ ${limit_to} != runtime && ! ( "${DEPEND}" =~ "$stripped_pkg" ) ]]; then
2823 dev_error="The ebuild is attempting to use ${target_pkg} that is not"
2824 dev_error="${dev_error} declared in DEPEND."
2825 if is-java-strict; then
2826 eerror "${dev_error}"
2827 die "${dev_error}"
2828 elif [[ ${BASH_SUBSHELL} = 0 ]]; then
2829 eerror "${dev_error}"
2830 elog "Because you have this package installed the package will"
2831 elog "build without problems, but please report this to"
2832 elog "http://bugs.gentoo.org"
2833 fi
2834 fi
2835
2836 if [[ ${limit_to} != build ]]; then
2837 if [[ ! ( ${RDEPEND} =~ "${stripped_pkg}" ) ]]; then
2838 if [[ ! ( ${PDEPEND} =~ "${stripped_pkg}" ) ]]; then
2839 dev_error="The ebuild is attempting to use ${target_pkg},"
2840 dev_error="${dev_error} without specifying --build-only, that is not declared in RDEPEND"
2841 dev_error="${dev_error} or PDEPEND."
2842 if is-java-strict; then
2843 eerror "${dev_error}"
2844 die "${dev_error}"
2845 elif [[ ${BASH_SUBSHELL} = 0 ]]; then
2846 eerror "${dev_error}"
2847 elog "The package will build without problems, but may fail to run"
2848 elog "if you don't have ${target_pkg} installed, so please report"
2849 elog "this to http://bugs.gentoo.org"
2850 fi
2851 fi
2852 fi
2853 fi
2854}
2855
2270# ------------------------------------------------------------------------------ 2856# ------------------------------------------------------------------------------
2271# @section-end internal 2857# @section-end internal
2272# ------------------------------------------------------------------------------ 2858# ------------------------------------------------------------------------------
2273 2859
2274java-pkg_check-phase() { 2860java-pkg_check-phase() {
2275 local phase=${1} 2861 local phase=${1}
2276 local funcname=${2} 2862 local funcname=${FUNCNAME[1]}
2277 if is-java-strict && [[ ${EBUILD_PHASE} != ${phase} ]]; then 2863 if [[ ${EBUILD_PHASE} != ${phase} ]]; then
2278 java-pkg_announce-qa-violation \
2279 "${funcname} used outside of src_${phase}" 2864 local msg="${funcname} used outside of src_${phase}"
2865 java-pkg_announce-qa-violation "${msg}"
2280 fi 2866 fi
2281} 2867}
2282 2868
2283java-pkg_check-versioned-jar() { 2869java-pkg_check-versioned-jar() {
2284 local jar=${1} 2870 local jar=${1}
2287 java-pkg_announce-qa-violation "installing versioned jar '${jar}'" 2873 java-pkg_announce-qa-violation "installing versioned jar '${jar}'"
2288 fi 2874 fi
2289} 2875}
2290 2876
2291java-pkg_check-jikes() { 2877java-pkg_check-jikes() {
2292 if hasq jikes ${IUSE}; then 2878 if has jikes ${IUSE}; then
2293 java-pkg_announce-qa-violation "deprecated USE flag 'jikes' in IUSE" 2879 java-pkg_announce-qa-violation "deprecated USE flag 'jikes' in IUSE"
2294 fi 2880 fi
2295} 2881}
2296 2882
2297java-pkg_announce-qa-violation() { 2883java-pkg_announce-qa-violation() {
2298 if is-java-strict; then 2884 local nodie
2885 if [[ ${1} == "--nodie" ]]; then
2886 nodie="true"
2887 shift
2888 fi
2299 echo "Java QA Notice: $@" >&2 2889 echo "Java QA Notice: $@" >&2
2300 increment-qa-violations 2890 increment-qa-violations
2301 fi 2891 [[ -z "${nodie}" ]] && is-java-strict && die "${@}"
2302} 2892}
2303 2893
2304increment-qa-violations() { 2894increment-qa-violations() {
2305 let "JAVA_PKG_QA_VIOLATIONS+=1" 2895 let "JAVA_PKG_QA_VIOLATIONS+=1"
2306 export JAVA_PKG_QA_VIOLATIONS 2896 export JAVA_PKG_QA_VIOLATIONS
2309is-java-strict() { 2899is-java-strict() {
2310 [[ -n ${JAVA_PKG_STRICT} ]] 2900 [[ -n ${JAVA_PKG_STRICT} ]]
2311 return $? 2901 return $?
2312} 2902}
2313 2903
2904
2314# ------------------------------------------------------------------------------ 2905# ------------------------------------------------------------------------------
2315# @eclass-end 2906# @eclass-end
2316# ------------------------------------------------------------------------------ 2907# ------------------------------------------------------------------------------

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

  ViewVC Help
Powered by ViewVC 1.1.20