/[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.93 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.93 2007/09/27 19:47:08 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 10
11# ----------------------------------------------------------------------------- 11# -----------------------------------------------------------------------------
12# @eclass-begin 12# @eclass-begin
13# @eclass-shortdesc Java Utility eclass 13# @eclass-shortdesc Java Utility eclass
14# @eclass-maintainer java@gentoo.org 14# @eclass-maintainer java@gentoo.org
59# ----------------------------------------------------------------------------- 59# -----------------------------------------------------------------------------
60# @variable-internal JAVA_PKG_PORTAGE_DEP 60# @variable-internal JAVA_PKG_PORTAGE_DEP
61# 61#
62# The version of portage we need to function properly. Previously it was 62# The version of portage we need to function properly. Previously it was
63# portage with phase hooks support but now we use a version with proper env 63# portage with phase hooks support but now we use a version with proper env
64# saving. 64# saving. For EAPI 2 we have new enough stuff so let's have cleaner deps.
65# ----------------------------------------------------------------------------- 65# -----------------------------------------------------------------------------
66JAVA_PKG_PORTAGE_DEP=">=sys-apps/portage-2.1.2.7" 66has "${EAPI}" 0 1 && JAVA_PKG_PORTAGE_DEP=">=sys-apps/portage-2.1.2.7"
67 67
68# ----------------------------------------------------------------------------- 68# -----------------------------------------------------------------------------
69# @variable-internal JAVA_PKG_E_DEPEND 69# @variable-internal JAVA_PKG_E_DEPEND
70# 70#
71# This is a convience variable to be used from the other java eclasses. This is 71# This is a convience variable to be used from the other java eclasses. This is
72# the version of java-config we want to use. Usually the latest stable version 72# the version of java-config we want to use. Usually the latest stable version
73# so that ebuilds can use new features without depending on specific versions. 73# so that ebuilds can use new features without depending on specific versions.
74# ----------------------------------------------------------------------------- 74# -----------------------------------------------------------------------------
75JAVA_PKG_E_DEPEND=">=dev-java/java-config-2.0.33-r1 ${JAVA_PKG_PORTAGE_DEP}" 75JAVA_PKG_E_DEPEND=">=dev-java/java-config-2.1.9-r1 ${JAVA_PKG_PORTAGE_DEP}"
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
76 94
77# ----------------------------------------------------------------------------- 95# -----------------------------------------------------------------------------
78# @variable-external JAVA_PKG_ALLOW_VM_CHANGE 96# @variable-external JAVA_PKG_ALLOW_VM_CHANGE
79# @variable-default yes 97# @variable-default yes
80# 98#
93# Should only be used for testing and debugging. 111# Should only be used for testing and debugging.
94# 112#
95# @example Use sun-jdk-1.5 to emerge foo 113# @example Use sun-jdk-1.5 to emerge foo
96# JAVA_PKG_FORCE_VM=sun-jdk-1.5 emerge foo 114# JAVA_PKG_FORCE_VM=sun-jdk-1.5 emerge foo
97# 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.
98# ----------------------------------------------------------------------------- 129# -----------------------------------------------------------------------------
99 130
100# ----------------------------------------------------------------------------- 131# -----------------------------------------------------------------------------
101# @variable-external JAVA_PKG_WANT_SOURCE 132# @variable-external JAVA_PKG_WANT_SOURCE
102# 133#
223 ( # dont want to pollute calling env 254 ( # dont want to pollute calling env
224 insinto "${dest}" 255 insinto "${dest}"
225 doins -r "$@" 256 doins -r "$@"
226 ) || die "Installing examples failed" 257 ) || die "Installing examples failed"
227 fi 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
228} 262}
229 263
230# ----------------------------------------------------------------------------- 264# -----------------------------------------------------------------------------
231# @ebuild-function java-pkg_dojar 265# @ebuild-function java-pkg_dojar
232# 266#
290 done 324 done
291 325
292 java-pkg_do_write_ 326 java-pkg_do_write_
293} 327}
294 328
295
296# ------------------------------------------------------------------------------ 329# ------------------------------------------------------------------------------
297# @internal-function depend-java-query 330# @internal-function depend-java-query
298# 331#
299# 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.
300# 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
365 if [[ ${jar} = *\** ]]; then 398 if [[ ${jar} = *\** ]]; then
366 eerror "The argument ${jar} to ${FUNCNAME}" 399 eerror "The argument ${jar} to ${FUNCNAME}"
367 eerror "has * in it. If you want it to glob in" 400 eerror "has * in it. If you want it to glob in"
368 eerror '${D} add ${D} to the argument.' 401 eerror '${D} add ${D} to the argument.'
369 fi 402 fi
403 debug-print "${jar} or ${D}${jar} not found"
370 die "${jar} does not exist" 404 die "${jar} does not exist"
371 fi 405 fi
372 done 406 done
373 407
374 java-pkg_do_write_ 408 java-pkg_do_write_
429# @param $@ - JNI libraries to install 463# @param $@ - JNI libraries to install
430# ------------------------------------------------------------------------------ 464# ------------------------------------------------------------------------------
431java-pkg_doso() { 465java-pkg_doso() {
432 debug-print-function ${FUNCNAME} $* 466 debug-print-function ${FUNCNAME} $*
433 467
434 [[ ${#} -lt 1 ]] && "At least one argument required for ${FUNCNAME}"
435 java-pkg_check-phase install 468 java-pkg_check-phase install
436 469
437 [[ ${#} -lt 1 ]] && die "At least one argument required for ${FUNCNAME}" 470 [[ ${#} -lt 1 ]] && die "${FUNCNAME} requires at least one argument"
438 471
439 java-pkg_init_paths_ 472 java-pkg_init_paths_
440 473
441 local lib 474 local lib
442 # for each lib 475 # for each lib
445 if [[ -e "${lib}" ]] ; then 478 if [[ -e "${lib}" ]] ; then
446 # install if it isn't a symlink 479 # install if it isn't a symlink
447 if [[ ! -L "${lib}" ]] ; then 480 if [[ ! -L "${lib}" ]] ; then
448 INSDESTTREE="${JAVA_PKG_LIBDEST}" \ 481 INSDESTTREE="${JAVA_PKG_LIBDEST}" \
449 INSOPTIONS="${LIBOPTIONS}" \ 482 INSOPTIONS="${LIBOPTIONS}" \
450 doins "${lib}" || "failed to install ${lib}" 483 doins "${lib}" || die "failed to install ${lib}"
451 java-pkg_append_ JAVA_PKG_LIBRARY "${JAVA_PKG_LIBDEST}" 484 java-pkg_append_ JAVA_PKG_LIBRARY "${JAVA_PKG_LIBDEST}"
452 debug-print "Installing ${lib} to ${JAVA_PKG_LIBDEST}" 485 debug-print "Installing ${lib} to ${JAVA_PKG_LIBDEST}"
453 # otherwise make a symlink to the symlink's origin 486 # otherwise make a symlink to the symlink's origin
454 else 487 else
455 # TODO use dosym 488 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" 489 debug-print "${lib} is a symlink, linking accordantly"
459 fi 490 fi
460 # otherwise die 491 # otherwise die
461 else 492 else
462 die "${lib} does not exist" 493 die "${lib} does not exist"
463 fi 494 fi
479java-pkg_regso() { 510java-pkg_regso() {
480 debug-print-function ${FUNCNAME} $* 511 debug-print-function ${FUNCNAME} $*
481 512
482 java-pkg_check-phase install 513 java-pkg_check-phase install
483 514
484 [[ ${#} -lt 1 ]] && "at least one argument needed" 515 [[ ${#} -lt 1 ]] && die "${FUNCNAME} requires at least one argument"
485 516
486 java-pkg_init_paths_ 517 java-pkg_init_paths_
487 518
488 local lib target_dir 519 local lib target_dir
489 for lib in "$@" ; do 520 for lib in "$@" ; do
556# ------------------------------------------------------------------------------ 587# ------------------------------------------------------------------------------
557# @ebuild-function java-pkg_dojavadoc 588# @ebuild-function java-pkg_dojavadoc
558# 589#
559# 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.
560# 591#
592# @param $1: optional --symlink creates to symlink like this for html
593# documentation bundles.
561# @param $1: - The javadoc root directory. 594# @param $2: - The javadoc root directory.
562# 595#
563# @example: 596# @example:
564# java-pkg_dojavadoc docs/api 597# java-pkg_dojavadoc docs/api
598# java-pkg_dojavadoc --symlink apidocs docs/api
565# 599#
566# ------------------------------------------------------------------------------ 600# ------------------------------------------------------------------------------
567java-pkg_dojavadoc() { 601java-pkg_dojavadoc() {
568 debug-print-function ${FUNCNAME} $* 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
569 local dir="$1" 611 local dir="$1"
612 local dest=/usr/share/doc/${PF}/html
570 613
571 # QA checks 614 # QA checks
572 615
573 java-pkg_check-phase install 616 java-pkg_check-phase install
574 617
578 local msg="No index.html in javadoc directory" 621 local msg="No index.html in javadoc directory"
579 ewarn "${msg}" 622 ewarn "${msg}"
580 is-java-strict && die "${msg}" 623 is-java-strict && die "${msg}"
581 fi 624 fi
582 625
626 if [[ -e ${D}/${dest}/api ]]; then
627 eerror "${dest} already exists. Will not overwrite."
628 die "${dest}"
629 fi
630
583 # Renaming to match our directory layout 631 # Renaming to match our directory layout
584 632
585 local dir_to_install="${dir}" 633 local dir_to_install="${dir}"
586 if [[ "$(basename "${dir}")" != "api" ]]; then 634 if [[ "$(basename "${dir}")" != "api" ]]; then
587 dir_to_install="${T}/api" 635 dir_to_install="${T}/api"
589 cp -r "${dir}" "${dir_to_install}" || die "cp failed" 637 cp -r "${dir}" "${dir_to_install}" || die "cp failed"
590 fi 638 fi
591 639
592 # Actual installation 640 # Actual installation
593 641
594 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
595} 651}
596 652
597# ------------------------------------------------------------------------------ 653# ------------------------------------------------------------------------------
598# @ebuild-function java-pkg_dosrc 654# @ebuild-function java-pkg_dosrc
599# 655#
622 678
623 [[ ${#} -lt 1 ]] && die "At least one argument needed" 679 [[ ${#} -lt 1 ]] && die "At least one argument needed"
624 680
625 if ! [[ ${DEPEND} = *app-arch/zip* ]]; then 681 if ! [[ ${DEPEND} = *app-arch/zip* ]]; then
626 local msg="${FUNCNAME} called without app-arch/zip in DEPEND" 682 local msg="${FUNCNAME} called without app-arch/zip in DEPEND"
627 if is-java-strict; then 683 java-pkg_announce-qa-violation ${msg}
628 eerror "${msg}"
629 die "${msg}"
630 else
631 echo "${msg}"
632 echo "Please report this to http://bugs.gentoo.org."
633 fi
634 fi 684 fi
635 685
636 java-pkg_init_paths_ 686 java-pkg_init_paths_
637 687
638 local zip_name="${PN}-src.zip" 688 local zip_name="${PN}-src.zip"
838# @param $opt 888# @param $opt
839# --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.
840# (assumed automatically when called inside src_test) 890# (assumed automatically when called inside src_test)
841# --with-dependencies - get jars also from requested package's dependencies 891# --with-dependencies - get jars also from requested package's dependencies
842# 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.
843# --into $dir - symlink jar(s) into $dir (must exist) instead of . 895# --into $dir - symlink jar(s) into $dir (must exist) instead of .
844# @param $1 - Package to get jars from, or comma-separated list of packages in 896# @param $1 - Package to get jars from, or comma-separated list of packages in
845# case other parameters are not used. 897# case other parameters are not used.
846# @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.
847# @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
852 debug-print-function ${FUNCNAME} $* 904 debug-print-function ${FUNCNAME} $*
853 905
854 local build_only="" 906 local build_only=""
855 local destdir="." 907 local destdir="."
856 local deep="" 908 local deep=""
909 local virtual=""
910 local record_jar=""
857 911
858 [[ "${EBUILD_PHASE}" == "test" ]] && build_only="build" 912 [[ "${EBUILD_PHASE}" == "test" ]] && build_only="build"
859 913
860 while [[ "${1}" == --* ]]; do 914 while [[ "${1}" == --* ]]; do
861 if [[ "${1}" = "--build-only" ]]; then 915 if [[ "${1}" = "--build-only" ]]; then
862 build_only="build" 916 build_only="build"
863 elif [[ "${1}" = "--with-dependencies" ]]; then 917 elif [[ "${1}" = "--with-dependencies" ]]; then
864 deep="--with-dependencies" 918 deep="--with-dependencies"
919 elif [[ "${1}" = "--virtual" ]]; then
920 virtual="true"
865 elif [[ "${1}" = "--into" ]]; then 921 elif [[ "${1}" = "--into" ]]; then
866 destdir="${2}" 922 destdir="${2}"
867 shift 923 shift
868 else 924 else
869 die "java-pkg_jar-from called with unknown parameter: ${1}" 925 die "java-pkg_jar-from called with unknown parameter: ${1}"
872 done 928 done
873 929
874 local target_pkg="${1}" target_jar="${2}" destjar="${3}" 930 local target_pkg="${1}" target_jar="${2}" destjar="${3}"
875 931
876 [[ -z ${target_pkg} ]] && die "Must specify a package" 932 [[ -z ${target_pkg} ]] && die "Must specify a package"
933
934 if [[ "${EAPI}" == "1" ]]; then
935 target_pkg="${target_pkg//:/-}"
936 fi
877 937
878 # default destjar to the target jar 938 # default destjar to the target jar
879 [[ -z "${destjar}" ]] && destjar="${target_jar}" 939 [[ -z "${destjar}" ]] && destjar="${target_jar}"
880 940
881 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}."
890 for pkg in ${target_pkg//,/ }; do 950 for pkg in ${target_pkg//,/ }; do
891 java-pkg_ensure-dep "${build_only}" "${pkg}" 951 java-pkg_ensure-dep "${build_only}" "${pkg}"
892 [[ -z "${build_only}" ]] && java-pkg_record-jar_ "${pkg}" 952 [[ -z "${build_only}" ]] && java-pkg_record-jar_ "${pkg}"
893 done 953 done
894 # setting this disables further record-jar_ calls later 954 # setting this disables further record-jar_ calls later
895 build_only="build" 955 record_jar="true"
896 else 956 else
897 java-pkg_ensure-dep "${build_only}" "${target_pkg}" 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"
898 fi 966 fi
899 967
900 pushd ${destdir} > /dev/null \ 968 pushd ${destdir} > /dev/null \
901 || die "failed to change directory to ${destdir}" 969 || die "failed to change directory to ${destdir}"
902 970
910 # If no specific target jar was indicated, link it 978 # If no specific target jar was indicated, link it
911 if [[ -z "${target_jar}" ]] ; then 979 if [[ -z "${target_jar}" ]] ; then
912 [[ -f "${target_jar}" ]] && rm "${target_jar}" 980 [[ -f "${target_jar}" ]] && rm "${target_jar}"
913 ln -snf "${jar}" \ 981 ln -snf "${jar}" \
914 || 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
915 [[ -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
916 # otherwise, if the current jar is the target jar, link it 990 # otherwise, if the current jar is the target jar, link it
917 elif [[ "${jar_name}" == "${target_jar}" ]] ; then 991 elif [[ "${jar_name}" == "${target_jar}" ]] ; then
918 [[ -f "${destjar}" ]] && rm "${destjar}" 992 [[ -f "${destjar}" ]] && rm "${destjar}"
919 ln -snf "${jar}" "${destjar}" \ 993 ln -snf "${jar}" "${destjar}" \
920 || 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
921 [[ -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
922 popd > /dev/null 1002 popd > /dev/null
923 return 0 1003 return 0
924 fi 1004 fi
925 done 1005 done
926 popd > /dev/null 1006 popd > /dev/null
985 done 1065 done
986 1066
987 [[ ${#} -ne 1 ]] && die "${FUNCNAME} takes only one argument besides --*" 1067 [[ ${#} -ne 1 ]] && die "${FUNCNAME} takes only one argument besides --*"
988 1068
989 1069
990 local classpath pkgs="${1}" 1070 local pkgs="${1}"
1071
1072 if [[ "${EAPI}" == "1" ]]; then
1073 pkgs="${pkgs//:/-}"
1074 fi
1075
991 jars="$(java-config ${deep} --classpath=${pkgs})" 1076 jars="$(java-config ${deep} --classpath=${pkgs})"
992 [[ $? != 0 || -z "${jars}" ]] && die "java-config --classpath=${pkgs} failed" 1077 [[ $? != 0 ]] && die "java-config --classpath=${pkgs} failed"
993 debug-print "${pkgs}:${jars}" 1078 debug-print "${pkgs}:${jars}"
994 1079
995 for pkg in ${pkgs//,/ }; do 1080 for pkg in ${pkgs//,/ }; do
996 java-pkg_ensure-dep "${build_only}" "${pkg}" 1081 java-pkg_ensure-dep "${build_only}" "${pkg}"
997 done 1082 done
998 1083
999 if [[ -z "${classpath}" ]]; then 1084 for pkg in ${pkgs//,/ }; do
1000 classpath="${jars}"
1001 else
1002 classpath="${classpath}:${jars}"
1003 fi
1004
1005 # Only record jars that aren't build-only
1006 if [[ -z "${build_only}" ]]; then 1085 if [[ -z "${build_only}" ]]; then
1007 for pkg in ${pkgs//,/ }; do
1008 java-pkg_record-jar_ "${pkg}" 1086 java-pkg_record-jar_ "${pkg}"
1087 else
1088 java-pkg_record-jar_ --build-only "${pkg}"
1089 fi
1009 done 1090 done
1010 fi
1011 1091
1012 echo "${classpath}" 1092 echo "${jars}"
1013} 1093}
1014 1094
1015# ------------------------------------------------------------------------------ 1095# ------------------------------------------------------------------------------
1016# @ebuild-function java-pkg_getjar 1096# @ebuild-function java-pkg_getjar
1017# 1097#
1026# @example-return 1106# @example-return
1027# /usr/share/xerces-2/lib/xml-apis.jar 1107# /usr/share/xerces-2/lib/xml-apis.jar
1028# 1108#
1029# @param $opt 1109# @param $opt
1030# --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.
1031# @param $1 - package to use 1113# @param $1 - package to use
1032# @param $2 - jar to get 1114# @param $2 - jar to get
1033# ------------------------------------------------------------------------------ 1115# ------------------------------------------------------------------------------
1034java-pkg_getjar() { 1116java-pkg_getjar() {
1035 debug-print-function ${FUNCNAME} $* 1117 debug-print-function ${FUNCNAME} $*
1036 1118
1037 local build_only="" 1119 local build_only=""
1120 local virtual=""
1121 local record_jar=""
1038 1122
1039 [[ "${EBUILD_PHASE}" == "test" ]] && build_only="build" 1123 [[ "${EBUILD_PHASE}" == "test" ]] && build_only="build"
1040 1124
1041 while [[ "${1}" == --* ]]; do 1125 while [[ "${1}" == --* ]]; do
1042 if [[ "${1}" = "--build-only" ]]; then 1126 if [[ "${1}" = "--build-only" ]]; then
1043 build_only="build" 1127 build_only="build"
1128 elif [[ "${1}" == "--virtual" ]]; then
1129 virtual="true"
1044 else 1130 else
1045 die "java-pkg_jar-from called with unknown parameter: ${1}" 1131 die "java-pkg_getjar called with unknown parameter: ${1}"
1046 fi 1132 fi
1047 shift 1133 shift
1048 done 1134 done
1049 1135
1050 [[ ${#} -ne 2 ]] && die "${FUNCNAME} takes only two arguments besides --*" 1136 [[ ${#} -ne 2 ]] && die "${FUNCNAME} takes only two arguments besides --*"
1051 1137
1052 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
1053 [[ -z ${pkg} ]] && die "Must specify package to get a jar from" 1144 [[ -z ${pkg} ]] && die "Must specify package to get a jar from"
1054 [[ -z ${target_jar} ]] && die "Must specify jar to get" 1145 [[ -z ${target_jar} ]] && die "Must specify jar to get"
1055 1146
1056 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?"
1057 local classpath 1148 local classpath
1058 classpath=$(java-config --classpath=${pkg}) 1149 classpath=$(java-config --classpath=${pkg})
1059 [[ $? != 0 ]] && die ${error_msg} 1150 [[ $? != 0 ]] && die ${error_msg}
1060 1151
1061 java-pkg_ensure-dep "${build_only}" "${pkg}" 1152 java-pkg_ensure-dep "${build_only}" "${pkg}"
1062 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
1063 for jar in ${classpath//:/ }; do 1165 for jar in ${classpath//:/ }; do
1064 if [[ ! -f "${jar}" ]] ; then 1166 if [[ ! -f "${jar}" ]] ; then
1065 die "Installation problem with jar ${jar} in ${pkg} - is it installed?" 1167 die "Installation problem with jar ${jar} in ${pkg} - is it installed?"
1066 fi 1168 fi
1067 1169
1068 if [[ "$(basename ${jar})" == "${target_jar}" ]] ; then 1170 if [[ "$(basename ${jar})" == "${target_jar}" ]] ; then
1069 # Only record jars that aren't build-only 1171 # Only record jars that aren't build-only
1070 [[ -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
1071 echo "${jar}" 1179 echo "${jar}"
1072 return 0 1180 return 0
1073 fi 1181 fi
1074 done 1182 done
1075 1183
1111 1219
1112 local pkgs="${1}" 1220 local pkgs="${1}"
1113 local jar="${2}" 1221 local jar="${2}"
1114 1222
1115 [[ -z "${pkgs}" ]] && die "${FUNCNAME} called with no package(s) specified" 1223 [[ -z "${pkgs}" ]] && die "${FUNCNAME} called with no package(s) specified"
1224
1225 if [[ "${EAPI}" == "1" ]]; then
1226 pkgs="${pkgs//:/-}"
1227 fi
1116 1228
1117 if [[ -z "${jar}" ]]; then 1229 if [[ -z "${jar}" ]]; then
1118 for pkg in ${pkgs//,/ }; do 1230 for pkg in ${pkgs//,/ }; do
1119 java-pkg_ensure-dep runtime "${pkg}" 1231 java-pkg_ensure-dep runtime "${pkg}"
1120 java-pkg_record-jar_ "${pkg}" 1232 java-pkg_record-jar_ "${pkg}"
1163 local pkgs="${1}" 1275 local pkgs="${1}"
1164 local jar="${2}" 1276 local jar="${2}"
1165 1277
1166 [[ -z "${pkgs}" ]] && die "${FUNCNAME} called with no package(s) specified" 1278 [[ -z "${pkgs}" ]] && die "${FUNCNAME} called with no package(s) specified"
1167 1279
1280 if [[ "${EAPI}" == "1" ]]; then
1281 pkgs="${pkgs//:/-}"
1282 fi
1283
1168 if [[ -z "${jar}" ]]; then 1284 if [[ -z "${jar}" ]]; then
1169 for pkg in ${pkgs//,/ }; do 1285 for pkg in ${pkgs//,/ }; do
1170 java-pkg_record-jar_ --optional "${pkg}" 1286 java-pkg_record-jar_ --optional "${pkg}"
1171 done 1287 done
1172 else 1288 else
1201 echo "${1}=\"${2}\"" >> ${JAVA_PKG_EXTRA_ENV} 1317 echo "${1}=\"${2}\"" >> ${JAVA_PKG_EXTRA_ENV}
1202 JAVA_PKG_EXTRA_ENV_VARS="${JAVA_PKG_EXTRA_ENV_VARS} ${1}" 1318 JAVA_PKG_EXTRA_ENV_VARS="${JAVA_PKG_EXTRA_ENV_VARS} ${1}"
1203 1319
1204 java-pkg_do_write_ 1320 java-pkg_do_write_
1205} 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
1206 1352
1207# 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
1208# populate jars from the filesystem. 1354# populate jars from the filesystem.
1209# 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
1210# string that was built instead of stdin 1356# string that was built instead of stdin
1248# @section-begin helper 1394# @section-begin helper
1249# @section-summary Helper functions 1395# @section-summary Helper functions
1250# 1396#
1251# Various other functions to use from an ebuild 1397# Various other functions to use from an ebuild
1252# ------------------------------------------------------------------------------ 1398# ------------------------------------------------------------------------------
1253
1254# ------------------------------------------------------------------------------
1255# @ebuild-function java-pkg_need
1256#
1257# Adds virtual dependencies, which can optionally be controlled by a USE flag.
1258# Currently supported virtuals are:
1259# javamail
1260# jdbc-stdext
1261# jaf
1262# jdbc-rowset
1263# jms
1264#
1265# @param $1 - Optionally indicate that the dependencies are controlled by
1266# a use flag by specifying '--use' Requires $2.
1267# @param $2 - USE flag which will enable the dependencies.
1268# @param $@ - virtual packages to add depenedencies for
1269# ------------------------------------------------------------------------------
1270# TODO rewrite to parse a line based declaration file instead -- karltk
1271#java-pkg_need() {
1272# debug-print-function ${FUNCNAME} $*
1273# local useflag
1274# if [[ ${1} == "--use" ]]; then
1275# useflag="${2}"
1276# shift 2
1277# fi
1278#
1279# if [[ -z ${1} ]]; then
1280# die "Must specify at least one virtual package."
1281# fi
1282#
1283# local depstr newdepstr
1284#
1285# for virtual in ${@}; do
1286# if has ${virtual} ${JAVA_PKG_VNEED}; then
1287# debug-print "Already registered virtual ${virtual}"
1288# continue
1289# fi
1290# case ${virtual} in
1291# javamail)
1292# debug-print "java-pkg_need: adding javamail dependencies"
1293# newdepstr="|| ( dev-java/gnu-javamail dev-java/sun-javamail-bin )"
1294# ;;
1295# jdbc-stdext)
1296# debug-print "java-pkg_need: adding jdbc-stdext dependencies"
1297# newdepstr="|| ( >=virtual/jdk-1.4 dev-java/jdbc2-stdext )"
1298# ;;
1299# jaf)
1300# debug-print "java-pkg_need: adding jaf dependencies"
1301# newdepstr="|| ( dev-java/gnu-jaf dev-java/sun-jaf-bin )"
1302# ;;
1303# jdbc-rowset)
1304# debug-print "java-pkg_need: adding jdbc-rowset dependencies"
1305# newdepstr="|| ( >=virtual/jdk-1.5 dev-java/sun-jdbc-rowset )"
1306# ;;
1307# jms)
1308# debug-print "java-pkg_need: adding jms dependencies"
1309# newdepstr="|| ( dev-java/sun-jms dev-java/openjms )"
1310# ;;
1311# *)
1312# die "Invalid virtual: ${virtual}"
1313# esac
1314#
1315# export JAVA_PKG_VNEED="${JAVA_PKG_VNEED} ${virtual}"
1316#
1317# if [[ -n ${useflag} ]]; then
1318# depstr="${depstr} ${useflag}? ( ${newdepstr} )"
1319# else
1320# depstr="${depstr} ${newdepstr}"
1321# fi
1322# done
1323#
1324# [[ -z ${JAVA_PKG_NV_DEPEND} ]] && export JAVA_PKG_NV_DEPEND="${DEPEND}"
1325# [[ -z ${JAVA_PKG_NV_RDEPEND} ]] && export JAVA_PKG_NV_RDEPEND="${RDEPEND}"
1326#
1327# export DEPEND="${DEPEND} ${depstr}"
1328# export RDEPEND="${RDEPEND} ${depstr}"
1329#}
1330 1399
1331# ------------------------------------------------------------------------------ 1400# ------------------------------------------------------------------------------
1332# @ebuild-function java-pkg_find-normal-jars 1401# @ebuild-function java-pkg_find-normal-jars
1333# 1402#
1334# 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
1500java-pkg_get-current-vm() { 1569java-pkg_get-current-vm() {
1501 echo ${GENTOO_VM} 1570 echo ${GENTOO_VM}
1502} 1571}
1503 1572
1504java-pkg_current-vm-matches() { 1573java-pkg_current-vm-matches() {
1505 hasq $(java-pkg_get-current-vm) ${@} 1574 has $(java-pkg_get-current-vm) ${@}
1506 return $? 1575 return $?
1507} 1576}
1508 1577
1509# ------------------------------------------------------------------------------ 1578# ------------------------------------------------------------------------------
1510# @ebuild-function java-pkg_get-source 1579# @ebuild-function java-pkg_get-source
1625 die "No GCJ support found!" 1694 die "No GCJ support found!"
1626 fi 1695 fi
1627} 1696}
1628 1697
1629java-pkg_ensure-test() { 1698java-pkg_ensure-test() {
1630 if hasq test ${FEATURES} && ! hasq -test ${FEATURES} \ 1699 if has test ${FEATURES} && ! has -test ${FEATURES} \
1631 && hasq test ${IUSE} && ! use test; 1700 && has test ${IUSE} && ! use test;
1632 then 1701 then
1633 eerror "You specified FEATURES=test, but USE=test is needed" 1702 eerror "You specified FEATURES=test, but USE=test is needed"
1634 eerror "to pull in the additional dependencies for testing" 1703 eerror "to pull in the additional dependencies for testing"
1635 die "Need USE=test enabled" 1704 die "Need USE=test enabled"
1636 fi 1705 fi
1672 dodir /usr/share/ant/${TASKS_DIR} 1741 dodir /usr/share/ant/${TASKS_DIR}
1673 touch "${D}/usr/share/ant/${TASKS_DIR}/${TASK_NAME}" 1742 touch "${D}/usr/share/ant/${TASKS_DIR}/${TASK_NAME}"
1674} 1743}
1675 1744
1676# ------------------------------------------------------------------------------ 1745# ------------------------------------------------------------------------------
1677# @internal-function java-pkg_ant-tasks-from-deps
1678#
1679# Function to determine ANT_TASKS from DEPEND variable for backwards
1680# compatibility with ebuilds that don't set ANT_TASKS before calling eant() or
1681# WANT_ANT_TASKS before inheriting java-pkg-2. If the DEPEND string contains
1682# "dev-java/ant" or "dev-java/ant-tasks", then it returns "all", otherwise
1683# "none". It's not smart enough to cope with USE flag depends but that shouldn't
1684# be a problem, the worst it can do is activace all tasks when not needed.
1685# Note that this is called only with JAVA_PKG_STRICT=1, to find ebuilds with
1686# insufficient dependencies, otherwise all available tasks are used for
1687# backwards compatilbility.
1688#
1689# @return "all" or "none"
1690# ------------------------------------------------------------------------------
1691java-pkg_ant-tasks-from-deps() {
1692 local found_ant found_ant_tasks
1693
1694 for dep in ${DEPEND}
1695 do
1696 local ant="$(awk '/(dev-java\/ant)/ { if (match($1, "(dev-java/ant)((-[0-9])+|$)", m)) print m[1] }' <<< ${dep})"
1697 [[ "${ant}" == "dev-java/ant" ]] && found_ant=true
1698 [[ "${dep}" == *"ant-tasks"* ]] && found_ant_tasks=true
1699 done
1700
1701 if [[ -n "${found_ant}" || -n "${found_ant_tasks}" ]]; then
1702 java-pkg_announce-qa-violation --nodie "The ebuild DEPENDS on deprecated ant or ant-tasks"
1703 echo "all"
1704 else
1705 # ebuild doesn't set ANT_TASKS and doesn't depend on ant-tasks or ant
1706 # so we deactivate all tasks that may be installed
1707 echo "none"
1708 fi
1709}
1710
1711# ------------------------------------------------------------------------------
1712# @internal-function java-pkg_ant-tasks-depend 1746# @internal-function java-pkg_ant-tasks-depend
1713# 1747#
1714# Translates the WANT_ANT_TASKS variable into valid dependencies. 1748# Translates the WANT_ANT_TASKS variable into valid dependencies.
1715# ------------------------------------------------------------------------------ 1749# ------------------------------------------------------------------------------
1716java-pkg_ant-tasks-depend() { 1750java-pkg_ant-tasks-depend() {
1718 1752
1719 if [[ -n "${WANT_ANT_TASKS}" ]]; then 1753 if [[ -n "${WANT_ANT_TASKS}" ]]; then
1720 local DEP="" 1754 local DEP=""
1721 for i in ${WANT_ANT_TASKS} 1755 for i in ${WANT_ANT_TASKS}
1722 do 1756 do
1723 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
1724 echo "Invalid atom in WANT_ANT_TASKS: ${i}" 1762 echo "Invalid atom in WANT_ANT_TASKS: ${i}"
1725 return 1 1763 return 1
1726 fi 1764 fi
1727 DEP="${DEP}dev-java/${i} "
1728 done 1765 done
1729 echo ${DEP} 1766 echo ${DEP}
1730 return 0 1767 return 0
1731 else 1768 else
1732 return 0 1769 return 0
1733 fi 1770 fi
1734} 1771}
1735 1772
1773
1736# ------------------------------------------------------------------------------ 1774# ------------------------------------------------------------------------------
1737# @ebuild-function ejunit 1775# @internal-function ejunit_
1738# 1776#
1739# Junit wrapper function. Makes it easier to run the tests and checks for 1777# Internal Junit wrapper function. Makes it easier to run the tests and checks for
1740# dev-java/junit in DEPEND. Launches the tests using junit.textui.TestRunner. 1778# dev-java/junit in DEPEND. Launches the tests using junit.textui.TestRunner.
1741# 1779#
1742# Examples: 1780# @param $1 - junit package (junit or junit-4)
1743# ejunit -cp build/classes org.blinkenlights.jid3.test.AllTests
1744# ejunit org.blinkenlights.jid3.test.AllTests
1745#
1746# @param $1 - -cp or -classpath 1781# @param $2 - -cp or -classpath
1747# @param $2 - classpath; junit and recorded dependencies get appended 1782# @param $3 - classpath; junit and recorded dependencies get appended
1748# @param $@ - the rest of the parameters are passed to java 1783# @param $@ - the rest of the parameters are passed to java
1749# ------------------------------------------------------------------------------
1750ejunit() { 1784ejunit_() {
1751 debug-print-function ${FUNCNAME} $* 1785 debug-print-function ${FUNCNAME} $*
1752 1786
1753 local pkgs 1787 local pkgs
1788 if [[ -f ${JAVA_PKG_DEPEND_FILE} ]]; then
1754 for atom in $(cat ${JAVA_PKG_DEPEND_FILE} | tr : ' '); do 1789 for atom in $(cat ${JAVA_PKG_DEPEND_FILE} | tr : ' '); do
1755 pkgs=${pkgs},$(echo ${atom} | sed -re "s/^.*@//") 1790 pkgs=${pkgs},$(echo ${atom} | sed -re "s/^.*@//")
1756 done 1791 done
1792 fi
1757 1793
1794 local junit=${1}
1795 shift 1
1796
1758 local cp=$(java-pkg_getjars --with-dependencies junit${pkgs}) 1797 local cp=$(java-pkg_getjars --with-dependencies ${junit}${pkgs})
1759 if [[ ${1} = -cp || ${1} = -classpath ]]; then 1798 if [[ ${1} = -cp || ${1} = -classpath ]]; then
1760 cp="${2}:${cp}" 1799 cp="${2}:${cp}"
1761 shift 2 1800 shift 2
1762 else 1801 else
1763 cp=".:${cp}" 1802 cp=".:${cp}"
1764 fi 1803 fi
1765 1804
1766 local runner=junit.textui.TestRunner 1805 local runner=junit.textui.TestRunner
1806 if [[ "${junit}" == "junit-4" ]] ; then
1807 runner=org.junit.runner.JUnitCore
1808 fi
1767 debug-print "Calling: java -cp \"${cp}\" -Djava.awt.headless=true ${runner} ${@}" 1809 debug-print "Calling: java -cp \"${cp}\" -Djava.awt.headless=true ${runner} ${@}"
1768 java -cp "${cp}" -Djava.awt.headless=true ${runner} "${@}" || die "Running junit failed" 1810 java -cp "${cp}" -Djava.awt.headless=true ${runner} "${@}" || die "Running junit failed"
1769} 1811}
1770 1812
1771# ------------------------------------------------------------------------------ 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
1857# ------------------------------------------------------------------------------
1772# @section-end helper 1858# @section-end helper
1773# ------------------------------------------------------------------------------ 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}
1774 1909
1775# ------------------------------------------------------------------------------ 1910# ------------------------------------------------------------------------------
1776# @section-begin build 1911# @section-begin build
1777# @section-summary Build functions 1912# @section-summary Build functions
1778# 1913#
1787# 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,
1788# variables: 1923# variables:
1789# 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
1790# gentoo.classpath property. Be sure to call 1925# gentoo.classpath property. Be sure to call
1791# java-ant_rewrite-classpath in src_unpack. 1926# java-ant_rewrite-classpath in src_unpack.
1792# JAVA_PKG_NO_BUNDLED_SEARCH - Don't search for bundled jars or class files 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!
1793# *ANT_TASKS - used to determine ANT_TASKS before calling Ant. 1930# *ANT_TASKS - used to determine ANT_TASKS before calling Ant.
1794# ------------------------------------------------------------------------------ 1931# ------------------------------------------------------------------------------
1795eant() { 1932eant() {
1796 debug-print-function ${FUNCNAME} $* 1933 debug-print-function ${FUNCNAME} $*
1797 1934
1798 if [[ ${EBUILD_PHASE} = compile ]]; then 1935 if [[ ${EBUILD_PHASE} = compile ]]; then
1799 # Used to be done in hooks in java-ant-2.eclass but moved here so that we can 1936 java-ant-2_src_configure
1800 # finally get rid of the hooks without breaking stuff 1937 java-utils-2_src_prepare
1801
1802 [[ "${JAVA_ANT_IGNORE_SYSTEM_CLASSES}" && "${JAVA_PKG_BSFIX}" ]] \
1803 && java-ant_ignore-system-classes "${S}/build.xml"
1804
1805 if hasq java-ant-2 ${INHERITED}; then
1806 java-ant_bsfix
1807 fi 1938 fi
1808 1939
1809 # eant can be called multiple times
1810 JAVA_PKG_BSFIX="off"
1811
1812 if [[ -z ${JAVA_PKG_NO_BUNDLED_SEARCH} ]] && is-java-strict; then
1813 echo "Searching for bundled jars:"
1814 java-pkg_find-normal-jars || echo "None found."
1815 echo "Searching for bundled classes (no output if none found):"
1816 find "${WORKDIR}" -name "*.class"
1817 echo "Search done."
1818 JAVA_PKG_NO_BUNDLED_SEARCH=true # eant can be called many times
1819 fi
1820 fi
1821
1822 if ! hasq java-ant-2 ${INHERITED}; then 1940 if ! has java-ant-2 ${INHERITED}; then
1823 local msg="You should inherit java-ant-2 when using eant" 1941 local msg="You should inherit java-ant-2 when using eant"
1824 java-pkg_announce-qa-violation "${msg}" 1942 java-pkg_announce-qa-violation "${msg}"
1825 fi 1943 fi
1826 1944
1827 local antflags="-Dnoget=true -Dmaven.mode.offline=true" 1945 local antflags="-Dnoget=true -Dmaven.mode.offline=true -Dbuild.sysclasspath=ignore"
1828 1946
1829 java-pkg_init-compiler_ 1947 java-pkg_init-compiler_
1830 local compiler="${GENTOO_COMPILER}" 1948 local compiler="${GENTOO_COMPILER}"
1831 1949
1832 local compiler_env="${JAVA_PKG_COMPILER_DIR}/${compiler}" 1950 local compiler_env="${JAVA_PKG_COMPILER_DIR}/${compiler}"
1843 # java-config -p 1961 # java-config -p
1844 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})"
1845 if [[ -n ${build_compiler_deps} ]]; then 1963 if [[ -n ${build_compiler_deps} ]]; then
1846 antflags="${antflags} -lib $(java-config -p ${build_compiler_deps})" 1964 antflags="${antflags} -lib $(java-config -p ${build_compiler_deps})"
1847 fi 1965 fi
1848 fi
1849
1850 if is-java-strict; then
1851 einfo "Disabling system classpath for ant"
1852 antflags="${antflags} -Dbuild.sysclasspath=ignore"
1853 fi 1966 fi
1854 1967
1855 for arg in "${@}"; do 1968 for arg in "${@}"; do
1856 if [[ ${arg} = -lib ]]; then 1969 if [[ ${arg} = -lib ]]; then
1857 if is-java-strict; then 1970 if is-java-strict; then
1866 echo "more info." 1979 echo "more info."
1867 fi 1980 fi
1868 fi 1981 fi
1869 done 1982 done
1870 1983
1871 # we use this in src_* so we run ant from / 1984 # parse WANT_ANT_TASKS for atoms
1872 if ROOT=/ has_version ">=dev-java/ant-core-1.7.0"; then 1985 local want_ant_tasks
1873 # default ANT_TASKS to WANT_ANT_TASKS, if ANT_TASKS is not set explicitly 1986 for i in ${WANT_ANT_TASKS}; do
1874 ANT_TASKS="${ANT_TASKS:-${WANT_ANT_TASKS}}" 1987 if [[ ${i} = */*:* ]]; then
1875 1988 i=${i#*/}
1876 # override ANT_TASKS with JAVA_PKG_FORCE_ANT_TASKS if it's set 1989 i=${i%:0}
1877 ANT_TASKS="${JAVA_PKG_FORCE_ANT_TASKS:-${ANT_TASKS}}" 1990 want_ant_tasks+="${i/:/-} "
1878
1879 if is-java-strict; then
1880 # if ant-tasks were not set by ebuild or forced, try to determine them from depends
1881 if [[ -z "${ANT_TASKS}" ]]; then
1882 ANT_TASKS="$(java-pkg_ant-tasks-from-deps)"
1883 fi
1884 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
1885 # 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
1886 ANT_TASKS="${ANT_TASKS:-all}" 2002 ANT_TASKS="${ANT_TASKS:-none}"
1887 fi
1888 2003
1889 # 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
1890 if [[ "${ANT_TASKS}" == "all" ]]; then 2005 if [[ "${ANT_TASKS}" == "all" ]]; then
1891 einfo "Using all available ANT_TASKS" 2006 einfo "Using all available ANT_TASKS"
1892 elif [[ "${ANT_TASKS}" == "none" ]]; then 2007 elif [[ "${ANT_TASKS}" == "none" ]]; then
1893 einfo "Disabling all optional ANT_TASKS" 2008 einfo "Disabling all optional ANT_TASKS"
1894 else 2009 else
1895 einfo "Using following ANT_TASKS: ${ANT_TASKS}" 2010 einfo "Using following ANT_TASKS: ${ANT_TASKS}"
1896 fi 2011 fi
1897 2012
1898 export ANT_TASKS 2013 export ANT_TASKS
1899 fi
1900 2014
1901 [[ -n ${JAVA_PKG_DEBUG} ]] && antflags="${antflags} --execdebug -debug" 2015 [[ -n ${JAVA_PKG_DEBUG} ]] && antflags="${antflags} --execdebug -debug"
1902 [[ -n ${PORTAGE_QUIET} ]] && antflags="${antflags} -q" 2016 [[ -n ${PORTAGE_QUIET} ]] && antflags="${antflags} -q"
1903 2017
1904 local gcp="${EANT_GENTOO_CLASSPATH}" 2018 local gcp="${EANT_GENTOO_CLASSPATH}"
1905 local getjarsarg="" 2019 local getjarsarg=""
1906 2020
1907 if [[ ${EBUILD_PHASE} = "test" ]]; then 2021 if [[ ${EBUILD_PHASE} = "test" ]]; then
1908 antflags="${antflags} -DJunit.present=true" 2022 antflags="${antflags} -DJunit.present=true"
1909 [[ ${gcp} && ${ANT_TASKS} = *ant-junit* ]] && gcp="${gcp} junit" 2023 [[ ${ANT_TASKS} = *ant-junit* ]] && gcp="${gcp} junit"
1910 getjarsarg="--with-dependencies" 2024 getjarsarg="--with-dependencies"
2025 else
2026 antflags="${antflags} -Dmaven.test.skip=true"
1911 fi 2027 fi
1912 2028
1913 local cp 2029 local cp
1914 2030
1915 for atom in ${gcp}; do 2031 for atom in ${gcp}; do
1916 cp="${cp}:$(java-pkg_getjars ${getjarsarg} ${atom})" 2032 cp="${cp}:$(java-pkg_getjars ${getjarsarg} ${atom})"
1917 done 2033 done
1918 2034
2035 [[ -n "${EANT_NEEDS_TOOLS}" ]] && cp="${cp}:$(java-config --tools)"
2036
1919 if [[ ${cp} ]]; then 2037 if [[ ${cp} ]]; then
1920 # 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}"
1921 antflags="${antflags} -Dgentoo.classpath=\"${cp#:}\"" 2042 antflags="${antflags} -Dgentoo.classpath=\"${cp}\""
1922 fi 2043 fi
1923 2044
1924 [[ -n ${JAVA_PKG_DEBUG} ]] && echo ant ${antflags} "${@}" 2045 [[ -n ${JAVA_PKG_DEBUG} ]] && echo ant ${antflags} "${@}"
1925 debug-print "Calling ant (GENTOO_VM: ${GENTOO_VM}): ${antflags} ${@}" 2046 debug-print "Calling ant (GENTOO_VM: ${GENTOO_VM}): ${antflags} ${@}"
1926 ant ${antflags} "${@}" || die "eant failed" 2047 ant ${antflags} "${@}" || die "eant failed"
2026# 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
2027# call it during each of the phases of the merge process. 2148# call it during each of the phases of the merge process.
2028# 2149#
2029# ----------------------------------------------------------------------------- 2150# -----------------------------------------------------------------------------
2030java-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
2031 unset JAVAC 2160 unset JAVAC
2032 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 }
2033 2170
2034 # People do all kinds of weird things. 2171 # People do all kinds of weird things.
2035 # http://forums.gentoo.org/viewtopic-p-3943166.html 2172 # http://forums.gentoo.org/viewtopic-p-3943166.html
2036 local silence="${SILENCE_JAVA_OPTIONS_WARNING}" 2173 local silence="${SILENCE_JAVA_OPTIONS_WARNING}"
2037 local accept="${I_WANT_GLOBAL_JAVA_OPTIONS}" 2174 local accept="${I_WANT_GLOBAL_JAVA_OPTIONS}"
2043 ewarn "make.conf for example) to silence this warning or" 2180 ewarn "make.conf for example) to silence this warning or"
2044 ewarn "I_WANT_GLOBAL_JAVA_OPTIONS to not filter it." 2181 ewarn "I_WANT_GLOBAL_JAVA_OPTIONS to not filter it."
2045 fi 2182 fi
2046 2183
2047 if [[ -z ${accept} ]]; then 2184 if [[ -z ${accept} ]]; then
2185 # export _JAVA_OPTIONS= doesn't work because it will show up in java
2186 # -version output
2048 unset _JAVA_OPTIONS 2187 unset _JAVA_OPTIONS
2049 # phase hooks make this run many times without this 2188 # phase hooks make this run many times without this
2050 I_WANT_GLOBAL_JAVA_OPTIONS="true" 2189 I_WANT_GLOBAL_JAVA_OPTIONS="true"
2051 fi 2190 fi
2052 2191
2060 2199
2061 # TODO we will probably want to set JAVAC and JAVACFLAGS 2200 # TODO we will probably want to set JAVAC and JAVACFLAGS
2062 2201
2063 # Do some QA checks 2202 # Do some QA checks
2064 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
2065 2207
2066 # When users have crazy classpaths some packages can fail to compile. 2208 # When users have crazy classpaths some packages can fail to compile.
2067 # and everything should work with empty CLASSPATH. 2209 # and everything should work with empty CLASSPATH.
2068 # This also helps prevent unexpected dependencies on random things 2210 # This also helps prevent unexpected dependencies on random things
2069 # from the CLASSPATH. 2211 # from the CLASSPATH.
2070 unset CLASSPATH 2212 export CLASSPATH=
2071 2213
2072 # Unset external ANT_ stuff 2214 # Unset external ANT_ stuff
2073 unset ANT_TASKS 2215 export ANT_TASKS=
2074 unset ANT_OPTS 2216 export ANT_OPTS=
2217 export ANT_RESPECT_JAVA_HOME=
2075} 2218}
2076 2219
2077# ------------------------------------------------------------------------------ 2220# ------------------------------------------------------------------------------
2078# @function-internal java-pkg-init-compiler_ 2221# @function-internal java-pkg-init-compiler_
2079# 2222#
2170 done 2313 done
2171 2314
2172 # If it hasn't been defined already, default to javac 2315 # If it hasn't been defined already, default to javac
2173 if [[ -z ${GENTOO_COMPILER} ]]; then 2316 if [[ -z ${GENTOO_COMPILER} ]]; then
2174 if [[ -n ${compilers} ]]; then 2317 if [[ -n ${compilers} ]]; then
2175 einfo "No suitable compiler found: defaulting javac for compilation" 2318 einfo "No suitable compiler found: defaulting to JDK default for compilation"
2176 else 2319 else
2177 # probably don't need to notify users about the default. 2320 # probably don't need to notify users about the default.
2178 :;#einfo "Defaulting to javac for compilation" 2321 :;#einfo "Defaulting to javac for compilation"
2179 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
2180 export GENTOO_COMPILER=javac 2326 export GENTOO_COMPILER=javac
2327 fi
2181 else 2328 else
2182 einfo "Using ${GENTOO_COMPILER} for compilation" 2329 einfo "Using ${GENTOO_COMPILER} for compilation"
2183 fi 2330 fi
2184 2331
2185} 2332}
2201 fi 2348 fi
2202 2349
2203 JAVA_PKG_SHAREPATH="${DESTTREE}/share/${JAVA_PKG_NAME}" 2350 JAVA_PKG_SHAREPATH="${DESTTREE}/share/${JAVA_PKG_NAME}"
2204 JAVA_PKG_SOURCESPATH="${JAVA_PKG_SHAREPATH}/sources/" 2351 JAVA_PKG_SOURCESPATH="${JAVA_PKG_SHAREPATH}/sources/"
2205 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}"
2206 2355
2207 [[ -z "${JAVA_PKG_JARDEST}" ]] && JAVA_PKG_JARDEST="${JAVA_PKG_SHAREPATH}/lib" 2356 [[ -z "${JAVA_PKG_JARDEST}" ]] && JAVA_PKG_JARDEST="${JAVA_PKG_SHAREPATH}/lib"
2208 [[ -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}"
2209 [[ -z "${JAVA_PKG_WARDEST}" ]] && JAVA_PKG_WARDEST="${JAVA_PKG_SHAREPATH}/webapps" 2358 [[ -z "${JAVA_PKG_WARDEST}" ]] && JAVA_PKG_WARDEST="${JAVA_PKG_SHAREPATH}/webapps"
2210 2359
2234 "${JAVA_PKG_OPTIONAL_DEPEND_FILE}" ]]; then 2383 "${JAVA_PKG_OPTIONAL_DEPEND_FILE}" ]]; then
2235 # Create package.env 2384 # Create package.env
2236 ( 2385 (
2237 echo "DESCRIPTION=\"${DESCRIPTION}\"" 2386 echo "DESCRIPTION=\"${DESCRIPTION}\""
2238 echo "GENERATION=\"2\"" 2387 echo "GENERATION=\"2\""
2388 echo "SLOT=\"${SLOT}\""
2389 echo "CATEGORY=\"${CATEGORY}\""
2390 echo "PVR=\"${PVR}\""
2239 2391
2240 [[ -n "${JAVA_PKG_CLASSPATH}" ]] && echo "CLASSPATH=\"${JAVA_PKG_CLASSPATH}\"" 2392 [[ -n "${JAVA_PKG_CLASSPATH}" ]] && echo "CLASSPATH=\"${JAVA_PKG_CLASSPATH}\""
2241 [[ -n "${JAVA_PKG_LIBRARY}" ]] && echo "LIBRARY_PATH=\"${JAVA_PKG_LIBRARY}\"" 2393 [[ -n "${JAVA_PKG_LIBRARY}" ]] && echo "LIBRARY_PATH=\"${JAVA_PKG_LIBRARY}\""
2242 [[ -n "${JAVA_PROVIDE}" ]] && echo "PROVIDES=\"${JAVA_PROVIDE}\"" 2394 [[ -n "${JAVA_PROVIDE}" ]] && echo "PROVIDES=\"${JAVA_PROVIDE}\""
2243 [[ -f "${JAVA_PKG_DEPEND_FILE}" ]] \ 2395 [[ -f "${JAVA_PKG_DEPEND_FILE}" ]] \
2244 && echo "DEPEND=\"$(cat "${JAVA_PKG_DEPEND_FILE}" | uniq | tr '\n' ':')\"" 2396 && echo "DEPEND=\"$(sort -u "${JAVA_PKG_DEPEND_FILE}" | tr '\n' ':')\""
2245 [[ -f "${JAVA_PKG_OPTIONAL_DEPEND_FILE}" ]] \ 2397 [[ -f "${JAVA_PKG_OPTIONAL_DEPEND_FILE}" ]] \
2246 && echo "OPTIONAL_DEPEND=\"$(cat "${JAVA_PKG_OPTIONAL_DEPEND_FILE}" | uniq | tr '\n' ':')\"" 2398 && echo "OPTIONAL_DEPEND=\"$(sort -u "${JAVA_PKG_OPTIONAL_DEPEND_FILE}" | tr '\n' ':')\""
2247 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' ':')\""
2248 ) > "${JAVA_PKG_ENV}" 2402 ) > "${JAVA_PKG_ENV}"
2249 2403
2250 # register target/source 2404 # register target/source
2251 local target="$(java-pkg_get-target)" 2405 local target="$(java-pkg_get-target)"
2252 local source="$(java-pkg_get-source)" 2406 local source="$(java-pkg_get-source)"
2285# ------------------------------------------------------------------------------ 2439# ------------------------------------------------------------------------------
2286# @internal-function java-pkg_record-jar_ 2440# @internal-function java-pkg_record-jar_
2287# 2441#
2288# Record an (optional) dependency to the package.env 2442# Record an (optional) dependency to the package.env
2289# @param --optional - record dependency as optional 2443# @param --optional - record dependency as optional
2444# @param --build - record dependency as build_only
2290# @param $1 - package to record 2445# @param $1 - package to record
2291# @param $2 - (optional) jar of package to record 2446# @param $2 - (optional) jar of package to record
2292# ------------------------------------------------------------------------------ 2447# ------------------------------------------------------------------------------
2293JAVA_PKG_DEPEND_FILE="${T}/java-pkg-depend" 2448JAVA_PKG_DEPEND_FILE="${T}/java-pkg-depend"
2294JAVA_PKG_OPTIONAL_DEPEND_FILE="${T}/java-pkg-optional-depend" 2449JAVA_PKG_OPTIONAL_DEPEND_FILE="${T}/java-pkg-optional-depend"
2450JAVA_PKG_BUILD_DEPEND_FILE="${T}/java-pkg-build-depend"
2295 2451
2296java-pkg_record-jar_() { 2452java-pkg_record-jar_() {
2297 debug-print-function ${FUNCNAME} $* 2453 debug-print-function ${FUNCNAME} $*
2298 2454
2299 local depend_file="${JAVA_PKG_DEPEND_FILE}" 2455 local depend_file="${JAVA_PKG_DEPEND_FILE}"
2300 if [[ "${1}" == "--optional" ]]; then 2456 case "${1}" in
2301 depend_file="${JAVA_PKG_OPTIONAL_DEPEND_FILE}" 2457 "--optional") depend_file="${JAVA_PKG_OPTIONAL_DEPEND_FILE}"; shift;;
2302 shift 2458 "--build-only") depend_file="${JAVA_PKG_BUILD_DEPEND_FILE}"; shift;;
2303 fi 2459 esac
2304 2460
2305 local pkg=${1} jar=${2} append 2461 local pkg=${1} jar=${2} append
2306 if [[ -z "${jar}" ]]; then 2462 if [[ -z "${jar}" ]]; then
2307 append="${pkg}" 2463 append="${pkg}"
2308 else 2464 else
2361# 2517#
2362# @return 0 - function is declared 2518# @return 0 - function is declared
2363# @return 1 - function is undeclared 2519# @return 1 - function is undeclared
2364# ------------------------------------------------------------------------------ 2520# ------------------------------------------------------------------------------
2365java-pkg_func-exists() { 2521java-pkg_func-exists() {
2366 if [[ -n "$(declare -f ${1})" ]]; then 2522 declare -F ${1} > /dev/null
2367 return 0
2368 else
2369 return 1
2370 fi
2371} 2523}
2372 2524
2373# ------------------------------------------------------------------------------ 2525# ------------------------------------------------------------------------------
2374# @internal-function java-pkg_setup-vm 2526# @internal-function java-pkg_setup-vm
2375# 2527#
2376# Sets up the environment for a specific VM 2528# Sets up the environment for a specific VM
2377# 2529#
2378# ------------------------------------------------------------------------------ 2530# ------------------------------------------------------------------------------
2379java-pkg_setup-vm() { 2531java-pkg_setup-vm() {
2380 debug-print-function ${FUNCNAME} $* 2532 debug-print-function ${FUNCNAME} $*
2381
2382 export LANG="C" LC_ALL="C"
2383 2533
2384 local vendor="$(java-pkg_get-vm-vendor)" 2534 local vendor="$(java-pkg_get-vm-vendor)"
2385 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
2386 addpredict "/dev/random" 2536 addpredict "/dev/random"
2387 elif [[ "${vendor}" == "ibm" ]]; then 2537 elif [[ "${vendor}" == "ibm" ]]; then
2388 addpredict "/proc/self/maps" 2538 addpredict "/proc/self/maps"
2389 addpredict "/proc/cpuinfo" 2539 addpredict "/proc/cpuinfo"
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"
2390 elif [[ "${vendor}" == "jrockit" ]]; then 2547 elif [[ "${vendor}" == "jrockit" ]]; then
2391 addpredict "/proc/cpuinfo" 2548 addpredict "/proc/cpuinfo"
2392 fi 2549 fi
2393} 2550}
2394 2551
2395# ------------------------------------------------------------------------------ 2552# ------------------------------------------------------------------------------
2396# @internal-function java-pkg_needs-vm 2553# @internal-function java-pkg_needs-vm
2397# 2554#
2398# 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?
2399# 2557#
2400# @return 0 - Package depends on virtual/jdk 2558# @return 0 - Package depends on virtual/jdk
2401# @return 1 - Package does not depend on virtual/jdk 2559# @return 1 - Package does not depend on virtual/jdk
2402# ------------------------------------------------------------------------------ 2560# ------------------------------------------------------------------------------
2403java-pkg_needs-vm() { 2561java-pkg_needs-vm() {
2404 debug-print-function ${FUNCNAME} $* 2562 debug-print-function ${FUNCNAME} $*
2405 2563
2406 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
2407 return 0 2565 return 0
2408 fi 2566 fi
2567
2568 [[ -n "${JAVA_PKG_WANT_BUILD_VM}" ]] && return 0
2409 2569
2410 return 1 2570 return 1
2411} 2571}
2412 2572
2413# ------------------------------------------------------------------------------ 2573# ------------------------------------------------------------------------------
2439# ------------------------------------------------------------------------------ 2599# ------------------------------------------------------------------------------
2440java-pkg_get-vm-version() { 2600java-pkg_get-vm-version() {
2441 debug-print-function ${FUNCNAME} $* 2601 debug-print-function ${FUNCNAME} $*
2442 2602
2443 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
2444} 2639}
2445 2640
2446# ------------------------------------------------------------------------------ 2641# ------------------------------------------------------------------------------
2447# @internal-function java-pkg_switch-vm 2642# @internal-function java-pkg_switch-vm
2448# 2643#
2459 # 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...
2460 debug-print "JAVA_PKG_FORCE_VM used: ${JAVA_PKG_FORCE_VM}" 2655 debug-print "JAVA_PKG_FORCE_VM used: ${JAVA_PKG_FORCE_VM}"
2461 export GENTOO_VM="${JAVA_PKG_FORCE_VM}" 2656 export GENTOO_VM="${JAVA_PKG_FORCE_VM}"
2462 # if we're allowed to switch the vm... 2657 # if we're allowed to switch the vm...
2463 elif [[ "${JAVA_PKG_ALLOW_VM_CHANGE}" == "yes" ]]; then 2658 elif [[ "${JAVA_PKG_ALLOW_VM_CHANGE}" == "yes" ]]; then
2464 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
2465 if [[ -n ${JAVA_PKG_VNEED} ]]; then 2660 if [[ -n "${JAVA_PKG_WANT_BUILD_VM}" ]]; then
2466 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
2467 else 2678 else
2679 debug-print "depend-java-query: NV_DEPEND: ${JAVA_PKG_NV_DEPEND:-${DEPEND}}"
2468 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
2469 fi 2686 fi
2470 if [[ -z "${GENTOO_VM}" || "${GENTOO_VM}" == "None" ]]; then
2471 eerror "Unable to determine VM for building from dependencies:"
2472 echo "NV_DEPEND: ${JAVA_PKG_NV_DEPEND:-${DEPEND}}"
2473 echo "VNEED: ${JAVA_PKG_VNEED}"
2474 die "Failed to determine VM for building."
2475 else
2476 export GENTOO_VM 2687 export GENTOO_VM
2477 fi
2478 # otherwise just make sure the current VM is sufficient 2688 # otherwise just make sure the current VM is sufficient
2479 else 2689 else
2480 java-pkg_ensure-vm-version-sufficient 2690 java-pkg_ensure-vm-version-sufficient
2481 fi 2691 fi
2482 debug-print "Using: $(java-config -f)" 2692 debug-print "Using: $(java-config -f)"
2517# 2727#
2518# 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
2519# useful for debugging bugs on bugzilla. 2729# useful for debugging bugs on bugzilla.
2520# ------------------------------------------------------------------------------ 2730# ------------------------------------------------------------------------------
2521#register_die_hook java-pkg_die 2731#register_die_hook java-pkg_die
2522if ! hasq java-pkg_die ${EBUILD_DEATH_HOOKS}; then 2732if ! has java-pkg_die ${EBUILD_DEATH_HOOKS}; then
2523 EBUILD_DEATH_HOOKS="${EBUILD_DEATH_HOOKS} java-pkg_die" 2733 EBUILD_DEATH_HOOKS="${EBUILD_DEATH_HOOKS} java-pkg_die"
2524fi 2734fi
2525 2735
2526java-pkg_die() { 2736java-pkg_die() {
2527 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
2551# not. 2761# not.
2552# @param $1 (optional) - the file to check, otherwise checks whole ${D} 2762# @param $1 (optional) - the file to check, otherwise checks whole ${D}
2553# ------------------------------------------------------------------------------ 2763# ------------------------------------------------------------------------------
2554java-pkg_verify-classes() { 2764java-pkg_verify-classes() {
2555 #$(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
2556 local target=$(java-pkg_get-target) 2780 local target=$(java-pkg_get-target)
2557 local result 2781 local result
2558 local log="${T}/class-version-verify.log" 2782 local log="${T}/class-version-verify.log"
2559 if [[ -n "${1}" ]]; then 2783 if [[ -n "${1}" ]]; then
2560 class-version-verify.py -v -t ${target} "${1}" > "${log}" 2784 ${version_verify} -v -t ${target} "${1}" > "${log}"
2561 result=$? 2785 result=$?
2562 else 2786 else
2563 ebegin "Verifying java class versions (target: ${target})" 2787 ebegin "Verifying java class versions (target: ${target})"
2564 class-version-verify.py -v -t ${target} -r "${D}" > "${log}" 2788 ${version_verify} -v -t ${target} -r "${D}" > "${log}"
2565 result=$? 2789 result=$?
2566 eend ${result} 2790 eend ${result}
2567 fi 2791 fi
2568 [[ -n ${JAVA_PKG_DEBUG} ]] && cat "${log}" 2792 [[ -n ${JAVA_PKG_DEBUG} ]] && cat "${log}"
2569 if [[ ${result} != 0 ]]; then 2793 if [[ ${result} != 0 ]]; then
2587 2811
2588 local limit_to="${1}" 2812 local limit_to="${1}"
2589 local target_pkg="${2}" 2813 local target_pkg="${2}"
2590 local dev_error="" 2814 local dev_error=""
2591 2815
2816 # remove the version specification, which may include globbing (* and [123])
2592 local stripped_pkg=$(echo "${target_pkg}" | sed \ 2817 local stripped_pkg=$(echo "${target_pkg}" | sed \
2593 's/-[0-9]*\(\.[0-9]\)*$//') 2818 's/-\([0-9*]*\(\[[0-9]*\]\)*\)*\(\.\([0-9*]*\(\[[0-9]*\]\)*\)*\)*$//')
2594 2819
2595 debug-print "Matching against: ${stripped_pkg}" 2820 debug-print "Matching against: ${stripped_pkg}"
2596 2821
2597 if [[ ${limit_to} != runtime && ! ( "${DEPEND}" =~ "$stripped_pkg" ) ]]; then 2822 if [[ ${limit_to} != runtime && ! ( "${DEPEND}" =~ "$stripped_pkg" ) ]]; then
2598 dev_error="The ebuild is attempting to use ${target_pkg} that is not" 2823 dev_error="The ebuild is attempting to use ${target_pkg} that is not"
2648 java-pkg_announce-qa-violation "installing versioned jar '${jar}'" 2873 java-pkg_announce-qa-violation "installing versioned jar '${jar}'"
2649 fi 2874 fi
2650} 2875}
2651 2876
2652java-pkg_check-jikes() { 2877java-pkg_check-jikes() {
2653 if hasq jikes ${IUSE}; then 2878 if has jikes ${IUSE}; then
2654 java-pkg_announce-qa-violation "deprecated USE flag 'jikes' in IUSE" 2879 java-pkg_announce-qa-violation "deprecated USE flag 'jikes' in IUSE"
2655 fi 2880 fi
2656} 2881}
2657 2882
2658java-pkg_announce-qa-violation() { 2883java-pkg_announce-qa-violation() {
2674is-java-strict() { 2899is-java-strict() {
2675 [[ -n ${JAVA_PKG_STRICT} ]] 2900 [[ -n ${JAVA_PKG_STRICT} ]]
2676 return $? 2901 return $?
2677} 2902}
2678 2903
2904
2679# ------------------------------------------------------------------------------ 2905# ------------------------------------------------------------------------------
2680# @eclass-end 2906# @eclass-end
2681# ------------------------------------------------------------------------------ 2907# ------------------------------------------------------------------------------

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

  ViewVC Help
Powered by ViewVC 1.1.20