/[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.81 Revision 1.113
4# Copyright (c) 2004, Karl Trygve Kalleberg <karltk@gentoo.org> 4# Copyright (c) 2004, Karl Trygve Kalleberg <karltk@gentoo.org>
5# Copyright (c) 2004-2005, Gentoo Foundation 5# Copyright (c) 2004-2005, Gentoo Foundation
6# 6#
7# Licensed under the GNU General Public License, v2 7# Licensed under the GNU General Public License, v2
8# 8#
9# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.81 2007/04/27 10:14:15 caster Exp $ 9# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.113 2008/10/01 15:23:17 betelgeuse 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
58#WANT_ANT_TASKS 57#WANT_ANT_TASKS
59 58
60# ----------------------------------------------------------------------------- 59# -----------------------------------------------------------------------------
61# @variable-internal JAVA_PKG_PORTAGE_DEP 60# @variable-internal JAVA_PKG_PORTAGE_DEP
62# 61#
63# 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
64# portage with phase hooks support. 63# portage with phase hooks support but now we use a version with proper env
64# saving.
65# ----------------------------------------------------------------------------- 65# -----------------------------------------------------------------------------
66JAVA_PKG_PORTAGE_DEP=">=sys-apps/portage-2.1_pre1" 66JAVA_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. We also need a recent version 72# the version of java-config we want to use. Usually the latest stable version
73# portage, that includes phase hooks. 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.31 ${JAVA_PKG_PORTAGE_DEP}" 75JAVA_PKG_E_DEPEND=">=dev-java/java-config-2.0.33-r1 ${JAVA_PKG_PORTAGE_DEP}"
76hasq source ${JAVA_PKG_IUSE} && JAVA_PKG_E_DEPEND="${JAVA_PKG_E_DEPEND} source? ( app-arch/zip )"
76 77
77# ----------------------------------------------------------------------------- 78# -----------------------------------------------------------------------------
78# @variable-external JAVA_PKG_ALLOW_VM_CHANGE 79# @variable-external JAVA_PKG_ALLOW_VM_CHANGE
79# @variable-default yes 80# @variable-default yes
80# 81#
195# 196#
196# @example 197# @example
197# java-pkg_doexamples demo 198# java-pkg_doexamples demo
198# java-pkg_doexamples demo/* examples/* 199# java-pkg_doexamples demo/* examples/*
199# 200#
201# @param --subdir - If the examples need a certain directory structure
200# @param $* - list of files to install 202# @param $* - list of files to install
201# ------------------------------------------------------------------------------ 203# ------------------------------------------------------------------------------
202java-pkg_doexamples() { 204java-pkg_doexamples() {
203 debug-print-function ${FUNCNAME} $* 205 debug-print-function ${FUNCNAME} $*
204 206
205 [[ ${#} -lt 1 ]] && die "At least one argument needed" 207 [[ ${#} -lt 1 ]] && die "At least one argument needed"
206 208
207 java-pkg_check-phase install 209 java-pkg_check-phase install
208 210
209 local dest=/usr/share/doc/${PF}/examples 211 local dest=/usr/share/doc/${PF}/examples
212 if [[ ${1} == --subdir ]]; then
213 local dest=${dest}/${2}
214 dodir ${dest}
215 shift 2
216 fi
217
210 if [[ ${#} = 1 && -d ${1} ]]; then 218 if [[ ${#} = 1 && -d ${1} ]]; then
211 ( # dont want to pollute calling env 219 ( # dont want to pollute calling env
212 insinto "${dest}" 220 insinto "${dest}"
213 doins -r ${1}/* 221 doins -r ${1}/*
214 ) || die "Installing examples failed" 222 ) || die "Installing examples failed"
283 done 291 done
284 292
285 java-pkg_do_write_ 293 java-pkg_do_write_
286} 294}
287 295
288
289# ------------------------------------------------------------------------------ 296# ------------------------------------------------------------------------------
290# @internal-function depend-java-query 297# @internal-function depend-java-query
291# 298#
292# Wrapper for the depend-java-query binary to enable passing USE in env. 299# Wrapper for the depend-java-query binary to enable passing USE in env.
293# Using env variables keeps this eclass working with java-config versions that 300# Using env variables keeps this eclass working with java-config versions that
438 if [[ -e "${lib}" ]] ; then 445 if [[ -e "${lib}" ]] ; then
439 # install if it isn't a symlink 446 # install if it isn't a symlink
440 if [[ ! -L "${lib}" ]] ; then 447 if [[ ! -L "${lib}" ]] ; then
441 INSDESTTREE="${JAVA_PKG_LIBDEST}" \ 448 INSDESTTREE="${JAVA_PKG_LIBDEST}" \
442 INSOPTIONS="${LIBOPTIONS}" \ 449 INSOPTIONS="${LIBOPTIONS}" \
443 doins "${lib}" || "failed to install ${lib}" 450 doins "${lib}" || die "failed to install ${lib}"
444 java-pkg_append_ JAVA_PKG_LIBRARY "${JAVA_PKG_LIBDEST}" 451 java-pkg_append_ JAVA_PKG_LIBRARY "${JAVA_PKG_LIBDEST}"
445 debug-print "Installing ${lib} to ${JAVA_PKG_LIBDEST}" 452 debug-print "Installing ${lib} to ${JAVA_PKG_LIBDEST}"
446 # otherwise make a symlink to the symlink's origin 453 # otherwise make a symlink to the symlink's origin
447 else 454 else
448 # TODO use dosym 455 # TODO use dosym
549# ------------------------------------------------------------------------------ 556# ------------------------------------------------------------------------------
550# @ebuild-function java-pkg_dojavadoc 557# @ebuild-function java-pkg_dojavadoc
551# 558#
552# Installs javadoc documentation. This should be controlled by the doc use flag. 559# Installs javadoc documentation. This should be controlled by the doc use flag.
553# 560#
561# @param $1: optional --symlink creates to symlink like this for html
562# documentation bundles.
554# @param $1: - The javadoc root directory. 563# @param $2: - The javadoc root directory.
555# 564#
556# @example: 565# @example:
557# java-pkg_dojavadoc docs/api 566# java-pkg_dojavadoc docs/api
567# java-pkg_dojavadoc --symlink apidocs docs/api
558# 568#
559# ------------------------------------------------------------------------------ 569# ------------------------------------------------------------------------------
560java-pkg_dojavadoc() { 570java-pkg_dojavadoc() {
561 debug-print-function ${FUNCNAME} $* 571 debug-print-function ${FUNCNAME} $*
572
573 # For html documentation bundles that link to Javadoc
574 local symlink
575 if [[ ${1} = --symlink ]]; then
576 symlink=${2}
577 shift 2
578 fi
579
562 local dir="$1" 580 local dir="$1"
581 local dest=/usr/share/doc/${PF}/html
563 582
564 # QA checks 583 # QA checks
565 584
566 java-pkg_check-phase install 585 java-pkg_check-phase install
567 586
571 local msg="No index.html in javadoc directory" 590 local msg="No index.html in javadoc directory"
572 ewarn "${msg}" 591 ewarn "${msg}"
573 is-java-strict && die "${msg}" 592 is-java-strict && die "${msg}"
574 fi 593 fi
575 594
595 if [[ -e ${D}/${dest}/api ]]; then
596 eerror "${dest} already exists. Will not overwrite."
597 die "${dest}"
598 fi
599
576 # Renaming to match our directory layout 600 # Renaming to match our directory layout
577 601
578 local dir_to_install="${dir}" 602 local dir_to_install="${dir}"
579 if [[ "$(basename "${dir}")" != "api" ]]; then 603 if [[ "$(basename "${dir}")" != "api" ]]; then
580 dir_to_install="${T}/api" 604 dir_to_install="${T}/api"
582 cp -r "${dir}" "${dir_to_install}" || die "cp failed" 606 cp -r "${dir}" "${dir_to_install}" || die "cp failed"
583 fi 607 fi
584 608
585 # Actual installation 609 # Actual installation
586 610
587 java-pkg_dohtml -r ${dir_to_install} 611 java-pkg_dohtml -r "${dir_to_install}"
612
613 # Let's make a symlink to the directory we have everything else under
614 dosym ${dest}/api "${JAVA_PKG_SHAREPATH}/api" || die
615
616 if [[ ${symlink} ]]; then
617 debug-print "symlinking ${dest}/{api,${symlink}}"
618 dosym ${dest}/{api,${symlink}} || die
619 fi
588} 620}
589 621
590# ------------------------------------------------------------------------------ 622# ------------------------------------------------------------------------------
591# @ebuild-function java-pkg_dosrc 623# @ebuild-function java-pkg_dosrc
592# 624#
615 647
616 [[ ${#} -lt 1 ]] && die "At least one argument needed" 648 [[ ${#} -lt 1 ]] && die "At least one argument needed"
617 649
618 if ! [[ ${DEPEND} = *app-arch/zip* ]]; then 650 if ! [[ ${DEPEND} = *app-arch/zip* ]]; then
619 local msg="${FUNCNAME} called without app-arch/zip in DEPEND" 651 local msg="${FUNCNAME} called without app-arch/zip in DEPEND"
620 if is-java-strict; then 652 java-pkg_announce-qa-violation ${msg}
621 eerror "${msg}"
622 die "${msg}"
623 else
624 echo "${msg}"
625 echo "Please report this to http://bugs.gentoo.org."
626 fi
627 fi 653 fi
628 654
629 java-pkg_init_paths_ 655 java-pkg_init_paths_
630 656
631 local zip_name="${PN}-src.zip" 657 local zip_name="${PN}-src.zip"
831# @param $opt 857# @param $opt
832# --build-only - makes the jar(s) not added into package.env DEPEND line. 858# --build-only - makes the jar(s) not added into package.env DEPEND line.
833# (assumed automatically when called inside src_test) 859# (assumed automatically when called inside src_test)
834# --with-dependencies - get jars also from requested package's dependencies 860# --with-dependencies - get jars also from requested package's dependencies
835# transitively. 861# transitively.
862# --virtual - Packages passed to this function are to be handled as virtuals
863# and will not have individual jar dependencies recorded.
836# --into $dir - symlink jar(s) into $dir (must exist) instead of . 864# --into $dir - symlink jar(s) into $dir (must exist) instead of .
837# @param $1 - Package to get jars from, or comma-separated list of packages in 865# @param $1 - Package to get jars from, or comma-separated list of packages in
838# case other parameters are not used. 866# case other parameters are not used.
839# @param $2 - jar from package. If not specified, all jars will be used. 867# @param $2 - jar from package. If not specified, all jars will be used.
840# @param $3 - When a single jar is specified, destination filename of the 868# @param $3 - When a single jar is specified, destination filename of the
845 debug-print-function ${FUNCNAME} $* 873 debug-print-function ${FUNCNAME} $*
846 874
847 local build_only="" 875 local build_only=""
848 local destdir="." 876 local destdir="."
849 local deep="" 877 local deep=""
878 local virtual=""
850 879
851 [[ "${EBUILD_PHASE}" == "test" ]] && build_only="build" 880 [[ "${EBUILD_PHASE}" == "test" ]] && build_only="build"
852 881
853 while [[ "${1}" == --* ]]; do 882 while [[ "${1}" == --* ]]; do
854 if [[ "${1}" = "--build-only" ]]; then 883 if [[ "${1}" = "--build-only" ]]; then
855 build_only="build" 884 build_only="build"
856 elif [[ "${1}" = "--with-dependencies" ]]; then 885 elif [[ "${1}" = "--with-dependencies" ]]; then
857 deep="--with-dependencies" 886 deep="--with-dependencies"
887 elif [[ "${1}" = "--virtual" ]]; then
888 virtual="true"
858 elif [[ "${1}" = "--into" ]]; then 889 elif [[ "${1}" = "--into" ]]; then
859 destdir="${2}" 890 destdir="${2}"
860 shift 891 shift
861 else 892 else
862 die "java-pkg_jar-from called with unknown parameter: ${1}" 893 die "java-pkg_jar-from called with unknown parameter: ${1}"
865 done 896 done
866 897
867 local target_pkg="${1}" target_jar="${2}" destjar="${3}" 898 local target_pkg="${1}" target_jar="${2}" destjar="${3}"
868 899
869 [[ -z ${target_pkg} ]] && die "Must specify a package" 900 [[ -z ${target_pkg} ]] && die "Must specify a package"
901
902 if [[ "${EAPI}" == "1" ]]; then
903 target_pkg="${target_pkg//:/-}"
904 fi
870 905
871 # default destjar to the target jar 906 # default destjar to the target jar
872 [[ -z "${destjar}" ]] && destjar="${target_jar}" 907 [[ -z "${destjar}" ]] && destjar="${target_jar}"
873 908
874 local error_msg="There was a problem getting the classpath for ${target_pkg}." 909 local error_msg="There was a problem getting the classpath for ${target_pkg}."
886 done 921 done
887 # setting this disables further record-jar_ calls later 922 # setting this disables further record-jar_ calls later
888 build_only="build" 923 build_only="build"
889 else 924 else
890 java-pkg_ensure-dep "${build_only}" "${target_pkg}" 925 java-pkg_ensure-dep "${build_only}" "${target_pkg}"
926 fi
927
928 # Record the entire virtual as a dependency so that
929 # no jars are missed.
930 if [[ -z "${build_only}" && -n "${virtual}" ]]; then
931 java-pkg_record-jar_ "${target_pkg}"
932 # setting this disables further record-jars_ calls later
933 build_only="build"
891 fi 934 fi
892 935
893 pushd ${destdir} > /dev/null \ 936 pushd ${destdir} > /dev/null \
894 || die "failed to change directory to ${destdir}" 937 || die "failed to change directory to ${destdir}"
895 938
978 done 1021 done
979 1022
980 [[ ${#} -ne 1 ]] && die "${FUNCNAME} takes only one argument besides --*" 1023 [[ ${#} -ne 1 ]] && die "${FUNCNAME} takes only one argument besides --*"
981 1024
982 1025
983 local classpath pkgs="${1}" 1026 local pkgs="${1}"
1027
1028 if [[ "${EAPI}" == "1" ]]; then
1029 pkgs="${pkgs//:/-}"
1030 fi
1031
984 jars="$(java-config ${deep} --classpath=${pkgs})" 1032 jars="$(java-config ${deep} --classpath=${pkgs})"
985 [[ $? != 0 || -z "${jars}" ]] && die "java-config --classpath=${pkgs} failed" 1033 [[ $? != 0 ]] && die "java-config --classpath=${pkgs} failed"
986 debug-print "${pkgs}:${jars}" 1034 debug-print "${pkgs}:${jars}"
987 1035
988 for pkg in ${pkgs//,/ }; do 1036 for pkg in ${pkgs//,/ }; do
989 java-pkg_ensure-dep "${build_only}" "${pkg}" 1037 java-pkg_ensure-dep "${build_only}" "${pkg}"
990 done 1038 done
991
992 if [[ -z "${classpath}" ]]; then
993 classpath="${jars}"
994 else
995 classpath="${classpath}:${jars}"
996 fi
997 1039
998 # Only record jars that aren't build-only 1040 # Only record jars that aren't build-only
999 if [[ -z "${build_only}" ]]; then 1041 if [[ -z "${build_only}" ]]; then
1000 for pkg in ${pkgs//,/ }; do 1042 for pkg in ${pkgs//,/ }; do
1001 java-pkg_record-jar_ "${pkg}" 1043 java-pkg_record-jar_ "${pkg}"
1002 done 1044 done
1003 fi 1045 fi
1004 1046
1005 echo "${classpath}" 1047 echo "${jars}"
1006} 1048}
1007 1049
1008# ------------------------------------------------------------------------------ 1050# ------------------------------------------------------------------------------
1009# @ebuild-function java-pkg_getjar 1051# @ebuild-function java-pkg_getjar
1010# 1052#
1019# @example-return 1061# @example-return
1020# /usr/share/xerces-2/lib/xml-apis.jar 1062# /usr/share/xerces-2/lib/xml-apis.jar
1021# 1063#
1022# @param $opt 1064# @param $opt
1023# --build-only - makes the jar not added into package.env DEPEND line. 1065# --build-only - makes the jar not added into package.env DEPEND line.
1066# --virtual - Packages passed to this function are to be handled as virtuals
1067# and will not have individual jar dependencies recorded.
1024# @param $1 - package to use 1068# @param $1 - package to use
1025# @param $2 - jar to get 1069# @param $2 - jar to get
1026# ------------------------------------------------------------------------------ 1070# ------------------------------------------------------------------------------
1027java-pkg_getjar() { 1071java-pkg_getjar() {
1028 debug-print-function ${FUNCNAME} $* 1072 debug-print-function ${FUNCNAME} $*
1029 1073
1030 local build_only="" 1074 local build_only=""
1075 local virtual=""
1031 1076
1032 [[ "${EBUILD_PHASE}" == "test" ]] && build_only="build" 1077 [[ "${EBUILD_PHASE}" == "test" ]] && build_only="build"
1033 1078
1034 while [[ "${1}" == --* ]]; do 1079 while [[ "${1}" == --* ]]; do
1035 if [[ "${1}" = "--build-only" ]]; then 1080 if [[ "${1}" = "--build-only" ]]; then
1036 build_only="build" 1081 build_only="build"
1082 elif [[ "${1}" == "--virtual" ]]; then
1083 virtual="true"
1037 else 1084 else
1038 die "java-pkg_jar-from called with unknown parameter: ${1}" 1085 die "java-pkg_getjar called with unknown parameter: ${1}"
1039 fi 1086 fi
1040 shift 1087 shift
1041 done 1088 done
1042 1089
1043 [[ ${#} -ne 2 ]] && die "${FUNCNAME} takes only two arguments besides --*" 1090 [[ ${#} -ne 2 ]] && die "${FUNCNAME} takes only two arguments besides --*"
1044 1091
1045 local pkg="${1}" target_jar="${2}" jar 1092 local pkg="${1}" target_jar="${2}" jar
1093
1094 if [[ "${EAPI}" == "1" ]]; then
1095 pkg="${pkg//:/-}"
1096 fi
1097
1046 [[ -z ${pkg} ]] && die "Must specify package to get a jar from" 1098 [[ -z ${pkg} ]] && die "Must specify package to get a jar from"
1047 [[ -z ${target_jar} ]] && die "Must specify jar to get" 1099 [[ -z ${target_jar} ]] && die "Must specify jar to get"
1048 1100
1049 local error_msg="Could not find classpath for ${pkg}. Are you sure its installed?" 1101 local error_msg="Could not find classpath for ${pkg}. Are you sure its installed?"
1050 local classpath 1102 local classpath
1051 classpath=$(java-config --classpath=${pkg}) 1103 classpath=$(java-config --classpath=${pkg})
1052 [[ $? != 0 ]] && die ${error_msg} 1104 [[ $? != 0 ]] && die ${error_msg}
1053 1105
1054 java-pkg_ensure-dep "${build_only}" "${pkg}" 1106 java-pkg_ensure-dep "${build_only}" "${pkg}"
1107
1108 # Record the package(Virtual) as a dependency and then set build_only
1109 # So that individual jars are not recorded.
1110 if [[ -n "${virtual}" ]]; then
1111 java-pkg_record-jar_ "${pkg}"
1112 build_only="true"
1113 fi
1055 1114
1056 for jar in ${classpath//:/ }; do 1115 for jar in ${classpath//:/ }; do
1057 if [[ ! -f "${jar}" ]] ; then 1116 if [[ ! -f "${jar}" ]] ; then
1058 die "Installation problem with jar ${jar} in ${pkg} - is it installed?" 1117 die "Installation problem with jar ${jar} in ${pkg} - is it installed?"
1059 fi 1118 fi
1077# from a package, into package.env DEPEND line. Can only be called in 1136# from a package, into package.env DEPEND line. Can only be called in
1078# src_install phase. 1137# src_install phase.
1079# Intended for binary packages where you don't need to symlink the jars or get 1138# Intended for binary packages where you don't need to symlink the jars or get
1080# their classpath during build. As such, the dependencies only need to be 1139# their classpath during build. As such, the dependencies only need to be
1081# specified in ebuild's RDEPEND, and should be omitted in DEPEND. 1140# specified in ebuild's RDEPEND, and should be omitted in DEPEND.
1082# Get the classpath provided by any number of packages.
1083# 1141#
1084# @param $1 - comma-separated list of packages, or a single package 1142# @param $1 - comma-separated list of packages, or a single package
1085# @param $2 - if param $1 is a single package, optionally specify the jar 1143# @param $2 - if param $1 is a single package, optionally specify the jar
1086# to depend on 1144# to depend on
1087# 1145#
1105 1163
1106 local pkgs="${1}" 1164 local pkgs="${1}"
1107 local jar="${2}" 1165 local jar="${2}"
1108 1166
1109 [[ -z "${pkgs}" ]] && die "${FUNCNAME} called with no package(s) specified" 1167 [[ -z "${pkgs}" ]] && die "${FUNCNAME} called with no package(s) specified"
1168
1169 if [[ "${EAPI}" == "1" ]]; then
1170 pkgs="${pkgs//:/-}"
1171 fi
1110 1172
1111 if [[ -z "${jar}" ]]; then 1173 if [[ -z "${jar}" ]]; then
1112 for pkg in ${pkgs//,/ }; do 1174 for pkg in ${pkgs//,/ }; do
1113 java-pkg_ensure-dep runtime "${pkg}" 1175 java-pkg_ensure-dep runtime "${pkg}"
1114 java-pkg_record-jar_ "${pkg}" 1176 java-pkg_record-jar_ "${pkg}"
1118 die "${FUNCNAME} called with both package list and jar name" 1180 die "${FUNCNAME} called with both package list and jar name"
1119 java-pkg_ensure-dep runtime "${pkgs}" 1181 java-pkg_ensure-dep runtime "${pkgs}"
1120 java-pkg_record-jar_ "${pkgs}" "${jar}" 1182 java-pkg_record-jar_ "${pkgs}" "${jar}"
1121 fi 1183 fi
1122 1184
1123 java-pkg_do_write_ 1185 java-pkg_do_write_
1186}
1187
1188# ------------------------------------------------------------------------------
1189# @ebuild-function java-pkg_register-optional-dependency
1190#
1191# Registers optional runtime dependency on a package, list of packages, or a
1192# single jar from a package, into package.env OPTIONAL_DEPEND line. Can only be
1193# called in src_install phase.
1194# Intended for packages that can use other packages when those are in classpath.
1195# Will be put on classpath by launcher if they are installed. Typical case is
1196# JDBC implementations for various databases. It's better than having USE flag
1197# for each implementation triggering hard dependency.
1198#
1199# @param $1 - comma-separated list of packages, or a single package
1200# @param $2 - if param $1 is a single package, optionally specify the jar
1201# to depend on
1202#
1203# Example: Record the optional dependency on some jdbc providers
1204# java-pkg_register-optional-dependency jdbc-jaybird,jtds-1.2,jdbc-mysql
1205#
1206# Note: Passing both list of packages as the first parameter AND specifying the
1207# jar as the second is not allowed and will cause the function to die. We assume
1208# that there's more chance one passes such combination as a mistake, than that
1209# there are more packages providing identically named jar without class
1210# collisions.
1211# ------------------------------------------------------------------------------
1212java-pkg_register-optional-dependency() {
1213 debug-print-function ${FUNCNAME} $*
1214
1215 java-pkg_check-phase install
1216
1217 [[ ${#} -gt 2 ]] && die "${FUNCNAME} takes at most two arguments"
1218
1219 local pkgs="${1}"
1220 local jar="${2}"
1221
1222 [[ -z "${pkgs}" ]] && die "${FUNCNAME} called with no package(s) specified"
1223
1224 if [[ "${EAPI}" == "1" ]]; then
1225 pkgs="${pkgs//:/-}"
1226 fi
1227
1228 if [[ -z "${jar}" ]]; then
1229 for pkg in ${pkgs//,/ }; do
1230 java-pkg_record-jar_ --optional "${pkg}"
1231 done
1232 else
1233 [[ ${pkgs} == *,* ]] && \
1234 die "${FUNCNAME} called with both package list and jar name"
1235 java-pkg_record-jar_ --optional "${pkgs}" "${jar}"
1236 fi
1237
1238 java-pkg_do_write_
1239}
1240
1241# ------------------------------------------------------------------------------
1242# @ebuild-function java-pkg_register-environment-variable
1243#
1244# Register an arbitrary environment variable into package.env. The gjl launcher
1245# for this package or any package depending on this will export it into
1246# environement before executing java command.
1247# Must only be called in src_install phase.
1248#
1249# @param $1 - variable name
1250# @param $2 - variable value
1251# ------------------------------------------------------------------------------
1252JAVA_PKG_EXTRA_ENV="${T}/java-pkg-extra-env"
1253JAVA_PKG_EXTRA_ENV_VARS=""
1254java-pkg_register-environment-variable() {
1255 debug-print-function ${FUNCNAME} $*
1256
1257 java-pkg_check-phase install
1258
1259 [[ ${#} != 2 ]] && die "${FUNCNAME} takes two arguments"
1260
1261 echo "${1}=\"${2}\"" >> ${JAVA_PKG_EXTRA_ENV}
1262 JAVA_PKG_EXTRA_ENV_VARS="${JAVA_PKG_EXTRA_ENV_VARS} ${1}"
1263
1264 java-pkg_do_write_
1124} 1265}
1125 1266
1126# This function reads stdin, and based on that input, figures out how to 1267# This function reads stdin, and based on that input, figures out how to
1127# populate jars from the filesystem. 1268# populate jars from the filesystem.
1128# Need to figure out a good way of making use of this, ie be able to use a 1269# Need to figure out a good way of making use of this, ie be able to use a
1591 dodir /usr/share/ant/${TASKS_DIR} 1732 dodir /usr/share/ant/${TASKS_DIR}
1592 touch "${D}/usr/share/ant/${TASKS_DIR}/${TASK_NAME}" 1733 touch "${D}/usr/share/ant/${TASKS_DIR}/${TASK_NAME}"
1593} 1734}
1594 1735
1595# ------------------------------------------------------------------------------ 1736# ------------------------------------------------------------------------------
1596# @internal-function java-pkg_ant-tasks-from-deps
1597#
1598# Function to determine ANT_TASKS from DEPEND variable for backwards
1599# compatibility with ebuilds that don't set ANT_TASKS before calling eant() or
1600# WANT_ANT_TASKS before inheriting java-pkg-2. If the DEPEND string contains
1601# "dev-java/ant" or "dev-java/ant-tasks", then it returns "all", otherwise
1602# "none". It's not smart enough to cope with USE flag depends but that shouldn't
1603# be a problem, the worst it can do is activace all tasks when not needed.
1604# Note that this is called only with JAVA_PKG_STRICT=1, to find ebuilds with
1605# insufficient dependencies, otherwise all available tasks are used for
1606# backwards compatilbility.
1607#
1608# @return "all" or "none"
1609# ------------------------------------------------------------------------------
1610java-pkg_ant-tasks-from-deps() {
1611 local found_ant found_ant_tasks
1612
1613 for dep in ${DEPEND}
1614 do
1615 local ant="$(awk '/(dev-java\/ant)/ { if (match($1, "(dev-java/ant)((-[0-9])+|$)", m)) print m[1] }' <<< ${dep})"
1616 [[ "${ant}" == "dev-java/ant" ]] && found_ant=true
1617 [[ "${dep}" == *"ant-tasks"* ]] && found_ant_tasks=true
1618 done
1619
1620 if [[ -n "${found_ant}" || -n "${found_ant_tasks}" ]]; then
1621 java-pkg_announce-qa-violation "The ebuild DEPENDS on deprecated ant or ant-tasks"
1622 echo "all"
1623 else
1624 # ebuild doesn't set ANT_TASKS and doesn't depend on ant-tasks or ant
1625 # so we deactivate all tasks that may be installed
1626 echo "none"
1627 fi
1628}
1629
1630# ------------------------------------------------------------------------------
1631# @internal-function java-pkg_ant-tasks-depend 1737# @internal-function java-pkg_ant-tasks-depend
1632# 1738#
1633# Translates the WANT_ANT_TASKS variable into valid dependencies. 1739# Translates the WANT_ANT_TASKS variable into valid dependencies.
1634# ------------------------------------------------------------------------------ 1740# ------------------------------------------------------------------------------
1635java-pkg_ant-tasks-depend() { 1741java-pkg_ant-tasks-depend() {
1637 1743
1638 if [[ -n "${WANT_ANT_TASKS}" ]]; then 1744 if [[ -n "${WANT_ANT_TASKS}" ]]; then
1639 local DEP="" 1745 local DEP=""
1640 for i in ${WANT_ANT_TASKS} 1746 for i in ${WANT_ANT_TASKS}
1641 do 1747 do
1642 if [[ ${i} != ant-* ]]; then 1748 if [[ ${i} = ant-* ]]; then
1749 DEP="${DEP}dev-java/${i} "
1750 elif [[ ${i} = */*:* ]]; then
1751 DEP="${DEP}${i} "
1752 else
1643 echo "Invalid atom in WANT_ANT_TASKS: ${i}" 1753 echo "Invalid atom in WANT_ANT_TASKS: ${i}"
1644 return 1 1754 return 1
1645 fi 1755 fi
1646 DEP="${DEP}dev-java/${i} "
1647 done 1756 done
1648 echo ${DEP} 1757 echo ${DEP}
1649 return 0 1758 return 0
1650 else 1759 else
1651 return 0 1760 return 0
1652 fi 1761 fi
1653} 1762}
1654 1763
1655# ------------------------------------------------------------------------------ 1764# ------------------------------------------------------------------------------
1765# @ebuild-function ejunit
1766#
1767# Junit wrapper function. Makes it easier to run the tests and checks for
1768# dev-java/junit in DEPEND. Launches the tests using junit.textui.TestRunner.
1769#
1770# Examples:
1771# ejunit -cp build/classes org.blinkenlights.jid3.test.AllTests
1772# ejunit org.blinkenlights.jid3.test.AllTests
1773#
1774# @param $1 - -cp or -classpath
1775# @param $2 - classpath; junit and recorded dependencies get appended
1776# @param $@ - the rest of the parameters are passed to java
1777# ------------------------------------------------------------------------------
1778ejunit() {
1779 debug-print-function ${FUNCNAME} $*
1780
1781 local pkgs
1782 if [[ -f ${JAVA_PKG_DEPEND_FILE} ]]; then
1783 for atom in $(cat ${JAVA_PKG_DEPEND_FILE} | tr : ' '); do
1784 pkgs=${pkgs},$(echo ${atom} | sed -re "s/^.*@//")
1785 done
1786 fi
1787
1788 local cp=$(java-pkg_getjars --with-dependencies junit${pkgs})
1789 if [[ ${1} = -cp || ${1} = -classpath ]]; then
1790 cp="${2}:${cp}"
1791 shift 2
1792 else
1793 cp=".:${cp}"
1794 fi
1795
1796 local runner=junit.textui.TestRunner
1797 debug-print "Calling: java -cp \"${cp}\" -Djava.awt.headless=true ${runner} ${@}"
1798 java -cp "${cp}" -Djava.awt.headless=true ${runner} "${@}" || die "Running junit failed"
1799}
1800
1801# ------------------------------------------------------------------------------
1656# @section-end helper 1802# @section-end helper
1657# ------------------------------------------------------------------------------ 1803# ------------------------------------------------------------------------------
1804
1805# ------------------------------------------------------------------------------
1806# @eclass-src_prepare
1807#
1808# src_prepare Searches for bundled jars
1809# ------------------------------------------------------------------------------
1810
1811java-utils-2_src_prepare() {
1812 # Remember that eant will call this unless called via Portage
1813 if [[ ! -e "${T}/java-utils-2_src_prepare-run" ]] && is-java-strict; then
1814 echo "Searching for bundled jars:"
1815 java-pkg_find-normal-jars || echo "None found."
1816 echo "Searching for bundled classes (no output if none found):"
1817 find "${WORKDIR}" -name "*.class"
1818 echo "Search done."
1819 fi
1820 touch "${T}/java-utils-2_src_prepare-run"
1821}
1658 1822
1659# ------------------------------------------------------------------------------ 1823# ------------------------------------------------------------------------------
1660# @section-begin build 1824# @section-begin build
1661# @section-summary Build functions 1825# @section-summary Build functions
1662# 1826#
1671# compiler. Will also set proper ANT_TASKS from the variable ANT_TASKS, 1835# compiler. Will also set proper ANT_TASKS from the variable ANT_TASKS,
1672# variables: 1836# variables:
1673# EANT_GENTOO_CLASSPATH - calls java-pkg_getjars for the value and adds to the 1837# EANT_GENTOO_CLASSPATH - calls java-pkg_getjars for the value and adds to the
1674# gentoo.classpath property. Be sure to call 1838# gentoo.classpath property. Be sure to call
1675# java-ant_rewrite-classpath in src_unpack. 1839# java-ant_rewrite-classpath in src_unpack.
1840# JAVA_PKG_NO_BUNDLED_SEARCH - Don't search for bundled jars or class files
1676# *ANT_TASKS - used to determine ANT_TASKS before calling Ant. 1841# *ANT_TASKS - used to determine ANT_TASKS before calling Ant.
1677# ------------------------------------------------------------------------------ 1842# ------------------------------------------------------------------------------
1678eant() { 1843eant() {
1679 debug-print-function ${FUNCNAME} $* 1844 debug-print-function ${FUNCNAME} $*
1680 1845
1681 # FIXME get this working 1846 if [[ ${EBUILD_PHASE} = compile ]]; then
1682# if is-java-strict && [[ ! ${DEPEND} =~ "dev-java/ant" ]]; then 1847 java-ant-2_src_configure
1683# java-pkg_announce-qa-violation \ 1848 java-utils-2_src_prepare
1684# "Using eant, but not depending on dev-java/ant or dev-java/ant-core"
1685# fi 1849 fi
1686 1850
1687 if ! hasq java-ant-2 ${INHERITED} && is-java-strict; then 1851 if ! hasq java-ant-2 ${INHERITED}; then
1688 local msg="You should inherit java-ant-2 when using eant" 1852 local msg="You should inherit java-ant-2 when using eant"
1689 java-pkg_announce-qa-violation ${msg} 1853 java-pkg_announce-qa-violation "${msg}"
1690 die ${msg}
1691 fi 1854 fi
1692 1855
1693 local antflags="-Dnoget=true -Dmaven.mode.offline=true" 1856 local antflags="-Dnoget=true -Dmaven.mode.offline=true -Dbuild.sysclasspath=ignore"
1694 1857
1695 java-pkg_init-compiler_ 1858 java-pkg_init-compiler_
1696 local compiler="${GENTOO_COMPILER}" 1859 local compiler="${GENTOO_COMPILER}"
1697 1860
1698 local compiler_env="${JAVA_PKG_COMPILER_DIR}/${compiler}" 1861 local compiler_env="${JAVA_PKG_COMPILER_DIR}/${compiler}"
1699
1700 local build_compiler="$(source ${compiler_env} 1>/dev/null 2>&1; echo ${ANT_BUILD_COMPILER})" 1862 local build_compiler="$(source ${compiler_env} 1>/dev/null 2>&1; echo ${ANT_BUILD_COMPILER})"
1701 if [[ "${compiler}" != "javac" && -z "${build_compiler}" ]]; then 1863 if [[ "${compiler}" != "javac" && -z "${build_compiler}" ]]; then
1702 die "ANT_BUILD_COMPILER undefined in ${compiler_env}" 1864 die "ANT_BUILD_COMPILER undefined in ${compiler_env}"
1703 fi 1865 fi
1704 1866
1710 # java-config -p 1872 # java-config -p
1711 local build_compiler_deps="$(source ${JAVA_PKG_COMPILER_DIR}/${compiler} 1>/dev/null 2>&1; echo ${ANT_BUILD_COMPILER_DEPS})" 1873 local build_compiler_deps="$(source ${JAVA_PKG_COMPILER_DIR}/${compiler} 1>/dev/null 2>&1; echo ${ANT_BUILD_COMPILER_DEPS})"
1712 if [[ -n ${build_compiler_deps} ]]; then 1874 if [[ -n ${build_compiler_deps} ]]; then
1713 antflags="${antflags} -lib $(java-config -p ${build_compiler_deps})" 1875 antflags="${antflags} -lib $(java-config -p ${build_compiler_deps})"
1714 fi 1876 fi
1715 fi
1716
1717 if is-java-strict; then
1718 einfo "Disabling system classpath for ant"
1719 antflags="${antflags} -Dbuild.sysclasspath=ignore"
1720 fi 1877 fi
1721 1878
1722 for arg in "${@}"; do 1879 for arg in "${@}"; do
1723 if [[ ${arg} = -lib ]]; then 1880 if [[ ${arg} = -lib ]]; then
1724 if is-java-strict; then 1881 if is-java-strict; then
1733 echo "more info." 1890 echo "more info."
1734 fi 1891 fi
1735 fi 1892 fi
1736 done 1893 done
1737 1894
1738 if has_version ">=dev-java/ant-core-1.7.0"; then 1895 # parse WANT_ANT_TASKS for atoms
1739 # default ANT_TASKS to WANT_ANT_TASKS, if ANT_TASKS is not set explicitly 1896 local want_ant_tasks
1740 ANT_TASKS="${ANT_TASKS:-${WANT_ANT_TASKS}}" 1897 for i in ${WANT_ANT_TASKS}; do
1741 1898 if [[ ${i} = */*:* ]]; then
1742 # override ANT_TASKS with JAVA_PKG_FORCE_ANT_TASKS if it's set 1899 i=${i#*/}
1743 ANT_TASKS="${JAVA_PKG_FORCE_ANT_TASKS:-${ANT_TASKS}}" 1900 i=${i%:0}
1744 1901 want_ant_tasks+="${i/:/-} "
1745 if is-java-strict; then
1746 # if ant-tasks were not set by ebuild or forced, try to determine them from depends
1747 if [[ -z "${ANT_TASKS}" ]]; then
1748 ANT_TASKS="$(java-pkg_ant-tasks-from-deps)"
1749 fi
1750 else 1902 else
1903 want_ant_tasks+="${i} "
1904 fi
1905 done
1906 # default ANT_TASKS to WANT_ANT_TASKS, if ANT_TASKS is not set explicitly
1907 ANT_TASKS="${ANT_TASKS:-${want_ant_tasks% }}"
1908
1909 # override ANT_TASKS with JAVA_PKG_FORCE_ANT_TASKS if it's set
1910 ANT_TASKS="${JAVA_PKG_FORCE_ANT_TASKS:-${ANT_TASKS}}"
1911
1751 # if ant-tasks is not set by ebuild or forced, activate all of them 1912 # if ant-tasks is not set by ebuild or forced, use none
1752 ANT_TASKS="${ANT_TASKS:-all}" 1913 ANT_TASKS="${ANT_TASKS:-none}"
1753 fi
1754 1914
1755 # at this point, ANT_TASKS should be "all", "none" or explicit list 1915 # at this point, ANT_TASKS should be "all", "none" or explicit list
1756 if [[ "${ANT_TASKS}" == "all" ]]; then 1916 if [[ "${ANT_TASKS}" == "all" ]]; then
1757 einfo "Using all available ANT_TASKS" 1917 einfo "Using all available ANT_TASKS"
1758 elif [[ "${ANT_TASKS}" == "none" ]]; then 1918 elif [[ "${ANT_TASKS}" == "none" ]]; then
1759 einfo "Disabling all optional ANT_TASKS" 1919 einfo "Disabling all optional ANT_TASKS"
1760 else 1920 else
1761 einfo "Using following ANT_TASKS: ${ANT_TASKS}" 1921 einfo "Using following ANT_TASKS: ${ANT_TASKS}"
1762 fi 1922 fi
1763 1923
1764 export ANT_TASKS 1924 export ANT_TASKS
1765 fi
1766 1925
1767 [[ -n ${JAVA_PKG_DEBUG} ]] && antflags="${antflags} --execdebug -debug" 1926 [[ -n ${JAVA_PKG_DEBUG} ]] && antflags="${antflags} --execdebug -debug"
1768 [[ -n ${PORTAGE_QUIET} ]] && antflags="${antflags} -q" 1927 [[ -n ${PORTAGE_QUIET} ]] && antflags="${antflags} -q"
1769 1928
1770 local gcp="${EANT_GENTOO_CLASSPATH}" 1929 local gcp="${EANT_GENTOO_CLASSPATH}"
1771 local getjarsarg="" 1930 local getjarsarg=""
1772 1931
1773 if [[ ${EBUILD_PHASE} = "test" ]]; then 1932 if [[ ${EBUILD_PHASE} = "test" ]]; then
1774 antflags="${antflags} -DJunit.present=true" 1933 antflags="${antflags} -DJunit.present=true"
1775 [[ ${gcp} && ${ANT_TASKS} = *ant-junit* ]] && gcp="${gcp} junit" 1934 [[ ${ANT_TASKS} = *ant-junit* ]] && gcp="${gcp} junit"
1776 getjarsarg="--with-dependencies" 1935 getjarsarg="--with-dependencies"
1777 fi 1936 fi
1778 1937
1779 local cp 1938 local cp
1780 1939
1782 cp="${cp}:$(java-pkg_getjars ${getjarsarg} ${atom})" 1941 cp="${cp}:$(java-pkg_getjars ${getjarsarg} ${atom})"
1783 done 1942 done
1784 1943
1785 if [[ ${cp} ]]; then 1944 if [[ ${cp} ]]; then
1786 # It seems ant does not like single quotes around ${cp} 1945 # It seems ant does not like single quotes around ${cp}
1946 cp=${cp#:}
1947 [[ ${EANT_GENTOO_CLASSPATH_EXTRA} ]] && \
1948 cp="${cp}:${EANT_GENTOO_CLASSPATH_EXTRA}"
1787 antflags="${antflags} -Dgentoo.classpath=\"${cp#:}\"" 1949 antflags="${antflags} -Dgentoo.classpath=\"${cp}\""
1788 fi 1950 fi
1789 1951
1790 [[ -n ${JAVA_PKG_DEBUG} ]] && echo ant ${antflags} "${@}" 1952 [[ -n ${JAVA_PKG_DEBUG} ]] && echo ant ${antflags} "${@}"
1791 debug-print "Calling ant (GENTOO_VM: ${GENTOO_VM}): ${antflags} ${@}" 1953 debug-print "Calling ant (GENTOO_VM: ${GENTOO_VM}): ${antflags} ${@}"
1792 ant ${antflags} "${@}" || die "eant failed" 1954 ant ${antflags} "${@}" || die "eant failed"
1892# This shouldn't be used directly. Instead, java-pkg and java-pkg-opt will 2054# This shouldn't be used directly. Instead, java-pkg and java-pkg-opt will
1893# call it during each of the phases of the merge process. 2055# call it during each of the phases of the merge process.
1894# 2056#
1895# ----------------------------------------------------------------------------- 2057# -----------------------------------------------------------------------------
1896java-pkg_init() { 2058java-pkg_init() {
2059 debug-print-function ${FUNCNAME} $*
1897 unset JAVAC 2060 unset JAVAC
1898 unset JAVA_HOME 2061 unset JAVA_HOME
1899 2062
1900 # People do all kinds of weird things. 2063 # People do all kinds of weird things.
1901 # http://forums.gentoo.org/viewtopic-p-3943166.html 2064 # http://forums.gentoo.org/viewtopic-p-3943166.html
1909 ewarn "make.conf for example) to silence this warning or" 2072 ewarn "make.conf for example) to silence this warning or"
1910 ewarn "I_WANT_GLOBAL_JAVA_OPTIONS to not filter it." 2073 ewarn "I_WANT_GLOBAL_JAVA_OPTIONS to not filter it."
1911 fi 2074 fi
1912 2075
1913 if [[ -z ${accept} ]]; then 2076 if [[ -z ${accept} ]]; then
2077 # export _JAVA_OPTIONS= doesn't work because it will show up in java
2078 # -version output
1914 unset _JAVA_OPTIONS 2079 unset _JAVA_OPTIONS
1915 # phase hooks make this run many times without this 2080 # phase hooks make this run many times without this
1916 I_WANT_GLOBAL_JAVA_OPTIONS="true" 2081 I_WANT_GLOBAL_JAVA_OPTIONS="true"
1917 fi 2082 fi
1918 2083
2084 if java-pkg_func-exists ant_src_unpack; then
2085 java-pkg_announce-qa-violation "Using old ant_src_unpack. Should be src_unpack"
2086 fi
2087
1919 java-pkg_init_paths_ 2088 java-pkg_init_paths_
1920 java-pkg_switch-vm 2089 java-pkg_switch-vm
1921 PATH=${JAVA_HOME}/bin:${PATH} 2090 PATH=${JAVA_HOME}/bin:${PATH}
1922 2091
1923 # TODO we will probably want to set JAVAC and JAVACFLAGS 2092 # TODO we will probably want to set JAVAC and JAVACFLAGS
1924 2093
1925 # Do some QA checks 2094 # Do some QA checks
1926 java-pkg_check-jikes 2095 java-pkg_check-jikes
2096
2097 # Can't use unset here because Portage does not save the unset
2098 # see https://bugs.gentoo.org/show_bug.cgi?id=189417#c11
1927 2099
1928 # When users have crazy classpaths some packages can fail to compile. 2100 # When users have crazy classpaths some packages can fail to compile.
1929 # and everything should work with empty CLASSPATH. 2101 # and everything should work with empty CLASSPATH.
1930 # This also helps prevent unexpected dependencies on random things 2102 # This also helps prevent unexpected dependencies on random things
1931 # from the CLASSPATH. 2103 # from the CLASSPATH.
1932 unset CLASSPATH 2104 export CLASSPATH=
1933 2105
1934 # Unset external ANT_ stuff 2106 # Unset external ANT_ stuff
1935 unset ANT_TASKS 2107 export ANT_TASKS=
1936 unset ANT_OPTS 2108 export ANT_OPTS=
1937} 2109}
1938 2110
1939# ------------------------------------------------------------------------------ 2111# ------------------------------------------------------------------------------
1940# @function-internal java-pkg-init-compiler_ 2112# @function-internal java-pkg-init-compiler_
1941# 2113#
2032 done 2204 done
2033 2205
2034 # If it hasn't been defined already, default to javac 2206 # If it hasn't been defined already, default to javac
2035 if [[ -z ${GENTOO_COMPILER} ]]; then 2207 if [[ -z ${GENTOO_COMPILER} ]]; then
2036 if [[ -n ${compilers} ]]; then 2208 if [[ -n ${compilers} ]]; then
2037 einfo "No suitable compiler found: defaulting javac for compilation" 2209 einfo "No suitable compiler found: defaulting to JDK default for compilation"
2038 else 2210 else
2039 # probably don't need to notify users about the default. 2211 # probably don't need to notify users about the default.
2040 :;#einfo "Defaulting to javac for compilation" 2212 :;#einfo "Defaulting to javac for compilation"
2041 fi 2213 fi
2214 if java-config -g GENTOO_COMPILER 2> /dev/null; then
2215 export GENTOO_COMPILER=$(java-config -g GENTOO_COMPILER)
2216 else
2042 export GENTOO_COMPILER=javac 2217 export GENTOO_COMPILER=javac
2218 fi
2043 else 2219 else
2044 einfo "Using ${GENTOO_COMPILER} for compilation" 2220 einfo "Using ${GENTOO_COMPILER} for compilation"
2045 fi 2221 fi
2046 2222
2047} 2223}
2063 fi 2239 fi
2064 2240
2065 JAVA_PKG_SHAREPATH="${DESTTREE}/share/${JAVA_PKG_NAME}" 2241 JAVA_PKG_SHAREPATH="${DESTTREE}/share/${JAVA_PKG_NAME}"
2066 JAVA_PKG_SOURCESPATH="${JAVA_PKG_SHAREPATH}/sources/" 2242 JAVA_PKG_SOURCESPATH="${JAVA_PKG_SHAREPATH}/sources/"
2067 JAVA_PKG_ENV="${D}${JAVA_PKG_SHAREPATH}/package.env" 2243 JAVA_PKG_ENV="${D}${JAVA_PKG_SHAREPATH}/package.env"
2244 JAVA_PKG_VIRTUALS_PATH="${DESTTREE}/share/java-config-2/virtuals"
2245 JAVA_PKG_VIRTUAL_PROVIDER="${D}/${JAVA_PKG_VIRTUALS_PATH}/${JAVA_PKG_NAME}"
2068 2246
2069 [[ -z "${JAVA_PKG_JARDEST}" ]] && JAVA_PKG_JARDEST="${JAVA_PKG_SHAREPATH}/lib" 2247 [[ -z "${JAVA_PKG_JARDEST}" ]] && JAVA_PKG_JARDEST="${JAVA_PKG_SHAREPATH}/lib"
2070 [[ -z "${JAVA_PKG_LIBDEST}" ]] && JAVA_PKG_LIBDEST="${DESTTREE}/$(get_libdir)/${JAVA_PKG_NAME}" 2248 [[ -z "${JAVA_PKG_LIBDEST}" ]] && JAVA_PKG_LIBDEST="${DESTTREE}/$(get_libdir)/${JAVA_PKG_NAME}"
2071 [[ -z "${JAVA_PKG_WARDEST}" ]] && JAVA_PKG_WARDEST="${JAVA_PKG_SHAREPATH}/webapps" 2249 [[ -z "${JAVA_PKG_WARDEST}" ]] && JAVA_PKG_WARDEST="${JAVA_PKG_SHAREPATH}/webapps"
2072 2250
2085# Writes the package.env out to disk. 2263# Writes the package.env out to disk.
2086# 2264#
2087# ------------------------------------------------------------------------------ 2265# ------------------------------------------------------------------------------
2088# TODO change to do-write, to match everything else 2266# TODO change to do-write, to match everything else
2089java-pkg_do_write_() { 2267java-pkg_do_write_() {
2268 debug-print-function ${FUNCNAME} $*
2090 java-pkg_init_paths_ 2269 java-pkg_init_paths_
2091 # Create directory for package.env 2270 # Create directory for package.env
2092 dodir "${JAVA_PKG_SHAREPATH}" 2271 dodir "${JAVA_PKG_SHAREPATH}"
2093 if [[ -n "${JAVA_PKG_CLASSPATH}" || -n "${JAVA_PKG_LIBRARY}" || -f "${JAVA_PKG_DEPEND}" ]]; then 2272 if [[ -n "${JAVA_PKG_CLASSPATH}" || -n "${JAVA_PKG_LIBRARY}" || -f \
2273 "${JAVA_PKG_DEPEND_FILE}" || -f \
2274 "${JAVA_PKG_OPTIONAL_DEPEND_FILE}" ]]; then
2094 # Create package.env 2275 # Create package.env
2095 ( 2276 (
2096 echo "DESCRIPTION=\"${DESCRIPTION}\"" 2277 echo "DESCRIPTION=\"${DESCRIPTION}\""
2097 echo "GENERATION=\"2\"" 2278 echo "GENERATION=\"2\""
2279 echo "SLOT=\"${SLOT}\""
2098 2280
2099 [[ -n "${JAVA_PKG_CLASSPATH}" ]] && echo "CLASSPATH=\"${JAVA_PKG_CLASSPATH}\"" 2281 [[ -n "${JAVA_PKG_CLASSPATH}" ]] && echo "CLASSPATH=\"${JAVA_PKG_CLASSPATH}\""
2100 [[ -n "${JAVA_PKG_LIBRARY}" ]] && echo "LIBRARY_PATH=\"${JAVA_PKG_LIBRARY}\"" 2282 [[ -n "${JAVA_PKG_LIBRARY}" ]] && echo "LIBRARY_PATH=\"${JAVA_PKG_LIBRARY}\""
2101 [[ -n "${JAVA_PROVIDE}" ]] && echo "PROVIDES=\"${JAVA_PROVIDE}\"" 2283 [[ -n "${JAVA_PROVIDE}" ]] && echo "PROVIDES=\"${JAVA_PROVIDE}\""
2102 [[ -f "${JAVA_PKG_DEPEND}" ]] && echo "DEPEND=\"$(cat ${JAVA_PKG_DEPEND} | uniq | tr '\n' ':')\"" 2284 [[ -f "${JAVA_PKG_DEPEND_FILE}" ]] \
2285 && echo "DEPEND=\"$(cat "${JAVA_PKG_DEPEND_FILE}" | uniq | tr '\n' ':')\""
2286 [[ -f "${JAVA_PKG_OPTIONAL_DEPEND_FILE}" ]] \
2287 && echo "OPTIONAL_DEPEND=\"$(cat "${JAVA_PKG_OPTIONAL_DEPEND_FILE}" | uniq | tr '\n' ':')\""
2103 echo "VM=\"$(echo ${RDEPEND} ${DEPEND} | sed -e 's/ /\n/g' | sed -n -e '/virtual\/\(jre\|jdk\)/ { p;q }')\"" # TODO cleanup ! 2288 echo "VM=\"$(echo ${RDEPEND} ${DEPEND} | sed -e 's/ /\n/g' | sed -n -e '/virtual\/\(jre\|jdk\)/ { p;q }')\"" # TODO cleanup !
2104 ) > "${JAVA_PKG_ENV}" 2289 ) > "${JAVA_PKG_ENV}"
2105 2290
2106 # register target/source 2291 # register target/source
2107 local target="$(java-pkg_get-target)" 2292 local target="$(java-pkg_get-target)"
2118 2303
2119 2304
2120 echo "MERGE_VM=\"${GENTOO_VM}\"" >> "${JAVA_PKG_ENV}" 2305 echo "MERGE_VM=\"${GENTOO_VM}\"" >> "${JAVA_PKG_ENV}"
2121 [[ -n ${GENTOO_COMPILER} ]] && echo "MERGE_COMPILER=\"${GENTOO_COMPILER}\"" >> "${JAVA_PKG_ENV}" 2306 [[ -n ${GENTOO_COMPILER} ]] && echo "MERGE_COMPILER=\"${GENTOO_COMPILER}\"" >> "${JAVA_PKG_ENV}"
2122 2307
2308 # extra env variables
2309 if [[ -n "${JAVA_PKG_EXTRA_ENV_VARS}" ]]; then
2310 cat "${JAVA_PKG_EXTRA_ENV}" >> "${JAVA_PKG_ENV}" || die
2311 # nested echo to remove leading/trailing spaces
2312 echo "ENV_VARS=\"$(echo ${JAVA_PKG_EXTRA_ENV_VARS})\"" \
2313 >> "${JAVA_PKG_ENV}" || die
2314 fi
2315
2123 # Strip unnecessary leading and trailing colons 2316 # Strip unnecessary leading and trailing colons
2124 # TODO try to cleanup if possible 2317 # TODO try to cleanup if possible
2125 sed -e "s/=\":/=\"/" -e "s/:\"$/\"/" -i "${JAVA_PKG_ENV}" || die "Did you forget to call java_init ?" 2318 sed -e "s/=\":/=\"/" -e "s/:\"$/\"/" -i "${JAVA_PKG_ENV}" || die "Did you forget to call java_init ?"
2319 else
2320 debug-print "JAVA_PKG_CLASSPATH, JAVA_PKG_LIBRARY, JAVA_PKG_DEPEND_FILE"
2321 debug-print "or JAVA_PKG_OPTIONAL_DEPEND_FILE not defined so can't"
2322 debug-print "write package.env."
2126 fi 2323 fi
2127} 2324}
2128 2325
2129# ------------------------------------------------------------------------------ 2326# ------------------------------------------------------------------------------
2130# @internal-function java-pkg_record-jar_ 2327# @internal-function java-pkg_record-jar_
2131# 2328#
2132# Record a dependency to the package.env 2329# Record an (optional) dependency to the package.env
2133# 2330# @param --optional - record dependency as optional
2331# @param $1 - package to record
2332# @param $2 - (optional) jar of package to record
2134# ------------------------------------------------------------------------------ 2333# ------------------------------------------------------------------------------
2135JAVA_PKG_DEPEND="${T}/java-pkg-depend" 2334JAVA_PKG_DEPEND_FILE="${T}/java-pkg-depend"
2335JAVA_PKG_OPTIONAL_DEPEND_FILE="${T}/java-pkg-optional-depend"
2136 2336
2137java-pkg_record-jar_() { 2337java-pkg_record-jar_() {
2138 debug-print-function ${FUNCNAME} $* 2338 debug-print-function ${FUNCNAME} $*
2339
2340 local depend_file="${JAVA_PKG_DEPEND_FILE}"
2341 if [[ "${1}" == "--optional" ]]; then
2342 depend_file="${JAVA_PKG_OPTIONAL_DEPEND_FILE}"
2343 shift
2344 fi
2139 2345
2140 local pkg=${1} jar=${2} append 2346 local pkg=${1} jar=${2} append
2141 if [[ -z "${jar}" ]]; then 2347 if [[ -z "${jar}" ]]; then
2142 append="${pkg}" 2348 append="${pkg}"
2143 else 2349 else
2144 append="$(basename ${jar})@${pkg}" 2350 append="$(basename ${jar})@${pkg}"
2145 fi 2351 fi
2146 2352
2147 echo ${append} >> ${JAVA_PKG_DEPEND} 2353 echo "${append}" >> "${depend_file}"
2148} 2354}
2149 2355
2150# ------------------------------------------------------------------------------ 2356# ------------------------------------------------------------------------------
2151# @internal-function java-pkg_append_ 2357# @internal-function java-pkg_append_
2152# 2358#
2212# 2418#
2213# ------------------------------------------------------------------------------ 2419# ------------------------------------------------------------------------------
2214java-pkg_setup-vm() { 2420java-pkg_setup-vm() {
2215 debug-print-function ${FUNCNAME} $* 2421 debug-print-function ${FUNCNAME} $*
2216 2422
2423 export LANG="C" LC_ALL="C"
2424
2217 local vendor="$(java-pkg_get-vm-vendor)" 2425 local vendor="$(java-pkg_get-vm-vendor)"
2218 if [[ "${vendor}" == "sun" ]] && java-pkg_is-vm-version-ge "1.5" ; then 2426 if [[ "${vendor}" == "sun" ]] && java-pkg_is-vm-version-ge "1.5" ; then
2219 addpredict "/dev/random" 2427 addpredict "/dev/random"
2220 elif [[ "${vendor}" == "ibm" ]]; then 2428 elif [[ "${vendor}" == "ibm" ]]; then
2221 addpredict "/proc/self/maps" 2429 addpredict "/proc/self/maps"
2222 addpredict "/proc/cpuinfo" 2430 addpredict "/proc/cpuinfo"
2223 export LANG="C" LC_ALL="C"
2224 elif [[ "${vendor}" == "jrockit" ]]; then 2431 elif [[ "${vendor}" == "jrockit" ]]; then
2225 addpredict "/proc/cpuinfo" 2432 addpredict "/proc/cpuinfo"
2226 fi 2433 fi
2227} 2434}
2228 2435
2332 2539
2333 #TODO If you know a better solution let us know. 2540 #TODO If you know a better solution let us know.
2334 java-pkg_append_ LD_LIBRARY_PATH "$(java-config -g LDPATH)" 2541 java-pkg_append_ LD_LIBRARY_PATH "$(java-config -g LDPATH)"
2335 2542
2336 local tann="${T}/announced-vm" 2543 local tann="${T}/announced-vm"
2544 # With the hooks we should only get here once from pkg_setup but better safe than sorry
2545 # if people have for example modified eclasses some where
2337 if [[ -n "${JAVA_PKG_DEBUG}" ]] || [[ ! -f "${tann}" ]] ; then 2546 if [[ -n "${JAVA_PKG_DEBUG}" ]] || [[ ! -f "${tann}" ]] ; then
2338 # Add a check for setup/preinst phase... to avoid duplicate outputs
2339 # for when FEATURES=buildpkg
2340 if [[ ${EBUILD_PHASE} != "setup" && ${EBUILD_PHASE} != "preinst" && ${EBUILD_PHASE} != "postinst" ]];
2341 then
2342 einfo "Using: $(java-config -f)" 2547 einfo "Using: $(java-config -f)"
2343 [[ ! -f "${tann}" ]] && touch "${tann}" 2548 [[ ! -f "${tann}" ]] && touch "${tann}"
2344 fi
2345 fi 2549 fi
2346 2550
2347 else 2551 else
2348 [[ -n "${JAVA_PKG_DEBUG}" ]] && ewarn "!!! This package inherits java-pkg but doesn't depend on a JDK. -bin or broken dependency!!!" 2552 [[ -n "${JAVA_PKG_DEBUG}" ]] && ewarn "!!! This package inherits java-pkg but doesn't depend on a JDK. -bin or broken dependency!!!"
2349 fi 2553 fi
2388# not. 2592# not.
2389# @param $1 (optional) - the file to check, otherwise checks whole ${D} 2593# @param $1 (optional) - the file to check, otherwise checks whole ${D}
2390# ------------------------------------------------------------------------------ 2594# ------------------------------------------------------------------------------
2391java-pkg_verify-classes() { 2595java-pkg_verify-classes() {
2392 #$(find ${D} -type f -name '*.jar' -o -name '*.class') 2596 #$(find ${D} -type f -name '*.jar' -o -name '*.class')
2597
2598 local version_verify="/usr/bin/class-version-verify.py"
2599
2600 if [[ ! -x "${version_verify}" ]]; then
2601 version_verify="/usr/$(get_libdir)/javatoolkit/bin/class-version-verify.py"
2602 fi
2603
2604 if [[ ! -x "${version_verify}" ]]; then
2605 ewarn "Unable to perform class version checks as"
2606 ewarn "class-version-verify.py is unavailable"
2607 ewarn "Please install dev-java/javatoolkit."
2608 return
2609 fi
2610
2393 local target=$(java-pkg_get-target) 2611 local target=$(java-pkg_get-target)
2394 local result 2612 local result
2395 local log="${T}/class-version-verify.log" 2613 local log="${T}/class-version-verify.log"
2396 if [[ -n "${1}" ]]; then 2614 if [[ -n "${1}" ]]; then
2397 class-version-verify.py -v -t ${target} "${1}" > "${log}" 2615 ${version_verify} -v -t ${target} "${1}" > "${log}"
2398 result=$? 2616 result=$?
2399 else 2617 else
2400 ebegin "Verifying java class versions (target: ${target})" 2618 ebegin "Verifying java class versions (target: ${target})"
2401 class-version-verify.py -v -t ${target} -r "${D}" > "${log}" 2619 ${version_verify} -v -t ${target} -r "${D}" > "${log}"
2402 result=$? 2620 result=$?
2403 eend ${result} 2621 eend ${result}
2404 fi 2622 fi
2405 [[ -n ${JAVA_PKG_DEBUG} ]] && cat "${log}" 2623 [[ -n ${JAVA_PKG_DEBUG} ]] && cat "${log}"
2406 if [[ ${result} != 0 ]]; then 2624 if [[ ${result} != 0 ]]; then
2416# Check that a package being used in jarfrom, getjars and getjar is contained 2634# Check that a package being used in jarfrom, getjars and getjar is contained
2417# within DEPEND or RDEPEND. 2635# within DEPEND or RDEPEND.
2418# @param $1 - empty - check both vars; "runtime" or "build" - check only 2636# @param $1 - empty - check both vars; "runtime" or "build" - check only
2419# RDEPEND, resp. DEPEND 2637# RDEPEND, resp. DEPEND
2420# @param $2 - Package name and slot. 2638# @param $2 - Package name and slot.
2639
2421java-pkg_ensure-dep() { 2640java-pkg_ensure-dep() {
2422 debug-print-function ${FUNCNAME} $* 2641 debug-print-function ${FUNCNAME} $*
2423 2642
2424 local limit_to="${1}" 2643 local limit_to="${1}"
2425 local target_pkg="${2}" 2644 local target_pkg="${2}"
2426 local dev_error="" 2645 local dev_error=""
2427 2646
2428 local stripped_pkg=$(echo "${target_pkg}" | sed \ 2647 local stripped_pkg=$(echo "${target_pkg}" | sed \
2429 's/-[0-9]*\(\.[0-9]\)*$//') 2648 's/-[0-9]*\(\.[0-9]\)*$//')
2649
2650 debug-print "Matching against: ${stripped_pkg}"
2430 2651
2431 if [[ ${limit_to} != runtime && ! ( "${DEPEND}" =~ "$stripped_pkg" ) ]]; then 2652 if [[ ${limit_to} != runtime && ! ( "${DEPEND}" =~ "$stripped_pkg" ) ]]; then
2432 dev_error="The ebuild is attempting to use ${target_pkg} that is not" 2653 dev_error="The ebuild is attempting to use ${target_pkg} that is not"
2433 dev_error="${dev_error} declared in DEPEND." 2654 dev_error="${dev_error} declared in DEPEND."
2434 if is-java-strict; then 2655 if is-java-strict; then
2656 eerror "${dev_error}"
2435 die "${dev_error}" 2657 die "${dev_error}"
2436 elif [[ ${BASH_SUBSHELL} = 0 ]]; then 2658 elif [[ ${BASH_SUBSHELL} = 0 ]]; then
2437 eerror "${dev_error}" 2659 eerror "${dev_error}"
2438 elog "Because you have this package installed the package will" 2660 elog "Because you have this package installed the package will"
2439 elog "build without problems, but please report this to" 2661 elog "build without problems, but please report this to"
2440 elog "http://bugs.gentoo.org" 2662 elog "http://bugs.gentoo.org"
2441 fi 2663 fi
2442 fi 2664 fi
2443 2665
2666 if [[ ${limit_to} != build ]]; then
2444 if [[ ${limit_to} != build && ! ( ${RDEPEND} =~ "${stripped_pkg}" ) ]]; then 2667 if [[ ! ( ${RDEPEND} =~ "${stripped_pkg}" ) ]]; then
2668 if [[ ! ( ${PDEPEND} =~ "${stripped_pkg}" ) ]]; then
2445 dev_error="The ebuild is attempting to use ${target_pkg}," 2669 dev_error="The ebuild is attempting to use ${target_pkg},"
2446 dev_error="${dev_error} without specifying --build-only, that is not declared in RDEPEND." 2670 dev_error="${dev_error} without specifying --build-only, that is not declared in RDEPEND"
2671 dev_error="${dev_error} or PDEPEND."
2447 if is-java-strict; then 2672 if is-java-strict; then
2673 eerror "${dev_error}"
2448 die "${dev_error}" 2674 die "${dev_error}"
2449 elif [[ ${BASH_SUBSHELL} = 0 ]]; then 2675 elif [[ ${BASH_SUBSHELL} = 0 ]]; then
2450 eerror "${dev_error}" 2676 eerror "${dev_error}"
2451 elog "The package will build without problems, but may fail to run" 2677 elog "The package will build without problems, but may fail to run"
2452 elog "if you don't have ${target_pkg} installed, so please report" 2678 elog "if you don't have ${target_pkg} installed, so please report"
2453 elog "this to http://bugs.gentoo.org" 2679 elog "this to http://bugs.gentoo.org"
2680 fi
2681 fi
2454 fi 2682 fi
2455 fi 2683 fi
2456} 2684}
2457 2685
2458# ------------------------------------------------------------------------------ 2686# ------------------------------------------------------------------------------
2459# @section-end internal 2687# @section-end internal
2460# ------------------------------------------------------------------------------ 2688# ------------------------------------------------------------------------------
2461 2689
2462java-pkg_check-phase() { 2690java-pkg_check-phase() {
2463 local phase=${1} 2691 local phase=${1}
2464 local funcname=${2} 2692 local funcname=${FUNCNAME[1]}
2465 if is-java-strict && [[ ${EBUILD_PHASE} != ${phase} ]]; then 2693 if [[ ${EBUILD_PHASE} != ${phase} ]]; then
2466 java-pkg_announce-qa-violation \
2467 "${funcname} used outside of src_${phase}" 2694 local msg="${funcname} used outside of src_${phase}"
2695 java-pkg_announce-qa-violation "${msg}"
2468 fi 2696 fi
2469} 2697}
2470 2698
2471java-pkg_check-versioned-jar() { 2699java-pkg_check-versioned-jar() {
2472 local jar=${1} 2700 local jar=${1}
2481 java-pkg_announce-qa-violation "deprecated USE flag 'jikes' in IUSE" 2709 java-pkg_announce-qa-violation "deprecated USE flag 'jikes' in IUSE"
2482 fi 2710 fi
2483} 2711}
2484 2712
2485java-pkg_announce-qa-violation() { 2713java-pkg_announce-qa-violation() {
2486 if is-java-strict; then 2714 local nodie
2715 if [[ ${1} == "--nodie" ]]; then
2716 nodie="true"
2717 shift
2718 fi
2487 echo "Java QA Notice: $@" >&2 2719 echo "Java QA Notice: $@" >&2
2488 increment-qa-violations 2720 increment-qa-violations
2489 fi 2721 [[ -z "${nodie}" ]] && is-java-strict && die "${@}"
2490} 2722}
2491 2723
2492increment-qa-violations() { 2724increment-qa-violations() {
2493 let "JAVA_PKG_QA_VIOLATIONS+=1" 2725 let "JAVA_PKG_QA_VIOLATIONS+=1"
2494 export JAVA_PKG_QA_VIOLATIONS 2726 export JAVA_PKG_QA_VIOLATIONS
2497is-java-strict() { 2729is-java-strict() {
2498 [[ -n ${JAVA_PKG_STRICT} ]] 2730 [[ -n ${JAVA_PKG_STRICT} ]]
2499 return $? 2731 return $?
2500} 2732}
2501 2733
2734[[ "${EAPI}" = "2" ]] && EXPORT_FUNCTIONS src_prepare
2735
2502# ------------------------------------------------------------------------------ 2736# ------------------------------------------------------------------------------
2503# @eclass-end 2737# @eclass-end
2504# ------------------------------------------------------------------------------ 2738# ------------------------------------------------------------------------------

Legend:
Removed from v.1.81  
changed lines
  Added in v.1.113

  ViewVC Help
Powered by ViewVC 1.1.20