/[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.67 Revision 1.107
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.67 2007/03/22 03:11:19 nichoj Exp $ 9# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.107 2008/05/03 21:28:45 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 INSDESTTREE="${dest}" doins -r ${1}/* || die "Installing examples failed" 219 ( # dont want to pollute calling env
220 insinto "${dest}"
221 doins -r ${1}/*
222 ) || die "Installing examples failed"
212 else 223 else
213 INSDESTTREE="${dest}" doins -r "${@}" || die "Installing examples failed" 224 ( # dont want to pollute calling env
225 insinto "${dest}"
226 doins -r "$@"
227 ) || die "Installing examples failed"
214 fi 228 fi
215} 229}
216 230
217# ----------------------------------------------------------------------------- 231# -----------------------------------------------------------------------------
218# @ebuild-function java-pkg_dojar 232# @ebuild-function java-pkg_dojar
277 done 291 done
278 292
279 java-pkg_do_write_ 293 java-pkg_do_write_
280} 294}
281 295
282
283# ------------------------------------------------------------------------------ 296# ------------------------------------------------------------------------------
284# @internal-function depend-java-query 297# @internal-function depend-java-query
285# 298#
286# 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.
287# 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
347 # java-pkg_regjar ${D}/opt/java/*.jar 360 # java-pkg_regjar ${D}/opt/java/*.jar
348 # such call will fall into this case (-e ${jar}) and will 361 # such call will fall into this case (-e ${jar}) and will
349 # record paths with ${D} in package.env 362 # record paths with ${D} in package.env
350 java-pkg_append_ JAVA_PKG_CLASSPATH "${jar#${D}}" 363 java-pkg_append_ JAVA_PKG_CLASSPATH "${jar#${D}}"
351 else 364 else
365 if [[ ${jar} = *\** ]]; then
366 eerror "The argument ${jar} to ${FUNCNAME}"
367 eerror "has * in it. If you want it to glob in"
368 eerror '${D} add ${D} to the argument.'
369 fi
352 die "${jar} does not exist" 370 die "${jar} does not exist"
353 fi 371 fi
354 done 372 done
355 373
356 java-pkg_do_write_ 374 java-pkg_do_write_
538# ------------------------------------------------------------------------------ 556# ------------------------------------------------------------------------------
539# @ebuild-function java-pkg_dojavadoc 557# @ebuild-function java-pkg_dojavadoc
540# 558#
541# 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.
542# 560#
561# @param $1: optional --symlink creates to symlink like this for html
562# documentation bundles.
543# @param $1: - The javadoc root directory. 563# @param $2: - The javadoc root directory.
544# 564#
545# @example: 565# @example:
546# java-pkg_dojavadoc docs/api 566# java-pkg_dojavadoc docs/api
567# java-pkg_dojavadoc --symlink apidocs docs/api
547# 568#
548# ------------------------------------------------------------------------------ 569# ------------------------------------------------------------------------------
549java-pkg_dojavadoc() { 570java-pkg_dojavadoc() {
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
550 local dir="$1" 580 local dir="$1"
581 local dest=/usr/share/doc/${PF}/html
582
583 # QA checks
551 584
552 java-pkg_check-phase install 585 java-pkg_check-phase install
553 586
554 [[ -z "${dir}" ]] && die "Must specify a directory!" 587 [[ -z "${dir}" ]] && die "Must specify a directory!"
555 [[ ! -d "${dir}" ]] && die "${dir} does not exist, or isn't a directory!" 588 [[ ! -d "${dir}" ]] && die "${dir} does not exist, or isn't a directory!"
589 if [[ ! -e "${dir}/index.html" ]]; then
590 local msg="No index.html in javadoc directory"
591 ewarn "${msg}"
592 is-java-strict && die "${msg}"
593 fi
594
595 if [[ -e ${D}/${dest}/api ]]; then
596 eerror "${dest} already exists. Will not overwrite."
597 die "${dest}"
598 fi
599
600 # Renaming to match our directory layout
556 601
557 local dir_to_install="${dir}" 602 local dir_to_install="${dir}"
558 if [[ "$(basename "${dir}")" != "api" ]]; then 603 if [[ "$(basename "${dir}")" != "api" ]]; then
559 dir_to_install="${T}/api" 604 dir_to_install="${T}/api"
560 # TODO use doins 605 # TODO use doins
561 cp -r "${dir}" "${dir_to_install}" || die "cp failed" 606 cp -r "${dir}" "${dir_to_install}" || die "cp failed"
562 fi 607 fi
563 608
609 # Actual installation
610
564 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
565} 620}
566 621
567# ------------------------------------------------------------------------------ 622# ------------------------------------------------------------------------------
568# @ebuild-function java-pkg_dosrc 623# @ebuild-function java-pkg_dosrc
569# 624#
592 647
593 [[ ${#} -lt 1 ]] && die "At least one argument needed" 648 [[ ${#} -lt 1 ]] && die "At least one argument needed"
594 649
595 if ! [[ ${DEPEND} = *app-arch/zip* ]]; then 650 if ! [[ ${DEPEND} = *app-arch/zip* ]]; then
596 local msg="${FUNCNAME} called without app-arch/zip in DEPEND" 651 local msg="${FUNCNAME} called without app-arch/zip in DEPEND"
597 if is-java-strict; then 652 java-pkg_announce-qa-violation ${msg}
598 eerror "${msg}"
599 die "${msg}"
600 else
601 echo "${msg}"
602 echo "Please report this to http://bugs.gentoo.org."
603 fi
604 fi 653 fi
605 654
606 java-pkg_init_paths_ 655 java-pkg_init_paths_
607 656
608 local zip_name="${PN}-src.zip" 657 local zip_name="${PN}-src.zip"
808# @param $opt 857# @param $opt
809# --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.
810# (assumed automatically when called inside src_test) 859# (assumed automatically when called inside src_test)
811# --with-dependencies - get jars also from requested package's dependencies 860# --with-dependencies - get jars also from requested package's dependencies
812# 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.
813# --into $dir - symlink jar(s) into $dir (must exist) instead of . 864# --into $dir - symlink jar(s) into $dir (must exist) instead of .
814# @param $1 - Package to get jars from. 865# @param $1 - Package to get jars from, or comma-separated list of packages in
866# case other parameters are not used.
815# @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.
816# @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
817# symlink. Defaults to the name of the jar. 869# symlink. Defaults to the name of the jar.
818# ------------------------------------------------------------------------------ 870# ------------------------------------------------------------------------------
819# TODO could probably be cleaned up a little 871# TODO could probably be cleaned up a little
821 debug-print-function ${FUNCNAME} $* 873 debug-print-function ${FUNCNAME} $*
822 874
823 local build_only="" 875 local build_only=""
824 local destdir="." 876 local destdir="."
825 local deep="" 877 local deep=""
878 local virtual=""
826 879
827 [[ "${EBUILD_PHASE}" == "test" ]] && build_only="true" 880 [[ "${EBUILD_PHASE}" == "test" ]] && build_only="build"
828 881
829 while [[ "${1}" == --* ]]; do 882 while [[ "${1}" == --* ]]; do
830 if [[ "${1}" = "--build-only" ]]; then 883 if [[ "${1}" = "--build-only" ]]; then
831 build_only="true" 884 build_only="build"
832 elif [[ "${1}" = "--with-dependencies" ]]; then 885 elif [[ "${1}" = "--with-dependencies" ]]; then
833 deep="--with-dependencies" 886 deep="--with-dependencies"
887 elif [[ "${1}" = "--virtual" ]]; then
888 virtual="true"
834 elif [[ "${1}" = "--into" ]]; then 889 elif [[ "${1}" = "--into" ]]; then
835 destdir="${2}" 890 destdir="${2}"
836 shift 891 shift
837 else 892 else
838 die "java-pkg_jar-from called with unknown parameter: ${1}" 893 die "java-pkg_jar-from called with unknown parameter: ${1}"
842 897
843 local target_pkg="${1}" target_jar="${2}" destjar="${3}" 898 local target_pkg="${1}" target_jar="${2}" destjar="${3}"
844 899
845 [[ -z ${target_pkg} ]] && die "Must specify a package" 900 [[ -z ${target_pkg} ]] && die "Must specify a package"
846 901
902 if [[ "${EAPI}" == "1" ]]; then
903 target_pkg="${target_pkg//:/-}"
904 fi
905
847 # default destjar to the target jar 906 # default destjar to the target jar
848 [[ -z "${destjar}" ]] && destjar="${target_jar}" 907 [[ -z "${destjar}" ]] && destjar="${target_jar}"
849 908
850 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}."
851 local classpath 910 local classpath
852 classpath="$(java-config ${deep} --classpath=${target_pkg})" 911 classpath="$(java-config ${deep} --classpath=${target_pkg})"
853 [[ $? != 0 ]] && die ${error_msg} 912 [[ $? != 0 ]] && die ${error_msg}
854 913
914 # When we have commas this functions is called to bring jars from multiple
915 # packages. This affects recording of dependencencies performed later
916 # which expects one package only, so we do it here.
917 if [[ ${target_pkg} = *,* ]]; then
918 for pkg in ${target_pkg//,/ }; do
919 java-pkg_ensure-dep "${build_only}" "${pkg}"
920 [[ -z "${build_only}" ]] && java-pkg_record-jar_ "${pkg}"
921 done
922 # setting this disables further record-jar_ calls later
923 build_only="build"
924 else
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"
934 fi
935
855 pushd ${destdir} > /dev/null \ 936 pushd ${destdir} > /dev/null \
856 || die "failed to change directory to ${destdir}" 937 || die "failed to change directory to ${destdir}"
857
858 # When we have commas this functions is called to bring jars from multiple
859 # packages. This affects recording of dependencencies because that syntax uses :
860 # if we don't change them to : gjl and java-config -d -p break
861 if [[ ${target_pkg} = *,* ]]; then
862 build_only="true"
863 java-pkg_record-jar_ ${target_pkg//,/:}
864 fi
865 938
866 local jar 939 local jar
867 for jar in ${classpath//:/ }; do 940 for jar in ${classpath//:/ }; do
868 local jar_name=$(basename "${jar}") 941 local jar_name=$(basename "${jar}")
869 if [[ ! -f "${jar}" ]] ; then 942 if [[ ! -f "${jar}" ]] ; then
932 debug-print-function ${FUNCNAME} $* 1005 debug-print-function ${FUNCNAME} $*
933 1006
934 local build_only="" 1007 local build_only=""
935 local deep="" 1008 local deep=""
936 1009
937 [[ "${EBUILD_PHASE}" == "test" ]] && build_only="true" 1010 [[ "${EBUILD_PHASE}" == "test" ]] && build_only="build"
938 1011
939 while [[ "${1}" == --* ]]; do 1012 while [[ "${1}" == --* ]]; do
940 if [[ "${1}" = "--build-only" ]]; then 1013 if [[ "${1}" = "--build-only" ]]; then
941 build_only="true" 1014 build_only="build"
942 elif [[ "${1}" = "--with-dependencies" ]]; then 1015 elif [[ "${1}" = "--with-dependencies" ]]; then
943 deep="--with-dependencies" 1016 deep="--with-dependencies"
944 else 1017 else
945 die "java-pkg_jar-from called with unknown parameter: ${1}" 1018 die "java-pkg_jar-from called with unknown parameter: ${1}"
946 fi 1019 fi
947 shift 1020 shift
948 done 1021 done
949 1022
950 [[ ${#} -ne 1 ]] && die "${FUNCNAME} takes only one argument besides --*" 1023 [[ ${#} -ne 1 ]] && die "${FUNCNAME} takes only one argument besides --*"
951 1024
1025
952 local classpath pkgs="${1}" 1026 local pkgs="${1}"
1027
1028 if [[ "${EAPI}" == "1" ]]; then
1029 pkgs="${pkgs//:/-}"
1030 fi
1031
953 jars="$(java-config ${deep} --classpath=${pkgs})" 1032 jars="$(java-config ${deep} --classpath=${pkgs})"
954 [[ -z "${jars}" ]] && die "java-config --classpath=${pkgs} failed" 1033 [[ $? != 0 ]] && die "java-config --classpath=${pkgs} failed"
955 debug-print "${pkgs}:${jars}" 1034 debug-print "${pkgs}:${jars}"
956 1035
957 if [[ -z "${classpath}" ]]; then 1036 for pkg in ${pkgs//,/ }; do
958 classpath="${jars}" 1037 java-pkg_ensure-dep "${build_only}" "${pkg}"
959 else 1038 done
960 classpath="${classpath}:${jars}"
961 fi
962 1039
963 # Only record jars that aren't build-only 1040 # Only record jars that aren't build-only
964 if [[ -z "${build_only}" ]]; then 1041 if [[ -z "${build_only}" ]]; then
965 oldifs="${IFS}"
966 IFS=","
967 for pkg in ${pkgs}; do 1042 for pkg in ${pkgs//,/ }; do
968 java-pkg_record-jar_ "${pkg}" 1043 java-pkg_record-jar_ "${pkg}"
969 done 1044 done
970 IFS="${oldifs}"
971 fi 1045 fi
972 1046
973 echo "${classpath}" 1047 echo "${jars}"
974} 1048}
975 1049
976# ------------------------------------------------------------------------------ 1050# ------------------------------------------------------------------------------
977# @ebuild-function java-pkg_getjar 1051# @ebuild-function java-pkg_getjar
978# 1052#
987# @example-return 1061# @example-return
988# /usr/share/xerces-2/lib/xml-apis.jar 1062# /usr/share/xerces-2/lib/xml-apis.jar
989# 1063#
990# @param $opt 1064# @param $opt
991# --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.
992# @param $1 - package to use 1068# @param $1 - package to use
993# @param $2 - jar to get 1069# @param $2 - jar to get
994# ------------------------------------------------------------------------------ 1070# ------------------------------------------------------------------------------
995java-pkg_getjar() { 1071java-pkg_getjar() {
996 debug-print-function ${FUNCNAME} $* 1072 debug-print-function ${FUNCNAME} $*
997 1073
998 local build_only="" 1074 local build_only=""
1075 local virtual=""
999 1076
1000 [[ "${EBUILD_PHASE}" == "test" ]] && build_only="true" 1077 [[ "${EBUILD_PHASE}" == "test" ]] && build_only="build"
1001 1078
1002 while [[ "${1}" == --* ]]; do 1079 while [[ "${1}" == --* ]]; do
1003 if [[ "${1}" = "--build-only" ]]; then 1080 if [[ "${1}" = "--build-only" ]]; then
1004 build_only="true" 1081 build_only="build"
1082 elif [[ "${1}" == "--virtual" ]]; then
1083 virtual="true"
1005 else 1084 else
1006 die "java-pkg_jar-from called with unknown parameter: ${1}" 1085 die "java-pkg_getjar called with unknown parameter: ${1}"
1007 fi 1086 fi
1008 shift 1087 shift
1009 done 1088 done
1010 1089
1011 [[ ${#} -ne 2 ]] && die "${FUNCNAME} takes only two arguments besides --*" 1090 [[ ${#} -ne 2 ]] && die "${FUNCNAME} takes only two arguments besides --*"
1012 1091
1013 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
1014 [[ -z ${pkg} ]] && die "Must specify package to get a jar from" 1098 [[ -z ${pkg} ]] && die "Must specify package to get a jar from"
1015 [[ -z ${target_jar} ]] && die "Must specify jar to get" 1099 [[ -z ${target_jar} ]] && die "Must specify jar to get"
1016 1100
1017 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?"
1018 local classpath 1102 local classpath
1019 classpath=$(java-config --classpath=${pkg}) 1103 classpath=$(java-config --classpath=${pkg})
1020 [[ $? != 0 ]] && die ${error_msg} 1104 [[ $? != 0 ]] && die ${error_msg}
1105
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
1021 1114
1022 for jar in ${classpath//:/ }; do 1115 for jar in ${classpath//:/ }; do
1023 if [[ ! -f "${jar}" ]] ; then 1116 if [[ ! -f "${jar}" ]] ; then
1024 die "Installation problem with jar ${jar} in ${pkg} - is it installed?" 1117 die "Installation problem with jar ${jar} in ${pkg} - is it installed?"
1025 fi 1118 fi
1032 fi 1125 fi
1033 done 1126 done
1034 1127
1035 die "Could not find ${target_jar} in ${pkg}" 1128 die "Could not find ${target_jar} in ${pkg}"
1036 return 1 1129 return 1
1130}
1131
1132# ------------------------------------------------------------------------------
1133# @ebuild-function java-pkg_register-dependency
1134#
1135# Registers runtime dependency on a package, list of packages, or a single jar
1136# from a package, into package.env DEPEND line. Can only be called in
1137# src_install phase.
1138# Intended for binary packages where you don't need to symlink the jars or get
1139# their classpath during build. As such, the dependencies only need to be
1140# specified in ebuild's RDEPEND, and should be omitted in DEPEND.
1141#
1142# @param $1 - comma-separated list of packages, or a single package
1143# @param $2 - if param $1 is a single package, optionally specify the jar
1144# to depend on
1145#
1146# Example: Record the dependency on whole xerces-2 and xalan,
1147# java-pkg_register-dependency xerces-2,xalan
1148# Example: Record the dependency on ant.jar from ant-core
1149# java-pkg_register-dependency ant-core ant.jar
1150#
1151# Note: Passing both list of packages as the first parameter AND specifying the
1152# jar as the second is not allowed and will cause the function to die. We assume
1153# that there's more chance one passes such combination as a mistake, than that
1154# there are more packages providing identically named jar without class
1155# collisions.
1156# ------------------------------------------------------------------------------
1157java-pkg_register-dependency() {
1158 debug-print-function ${FUNCNAME} $*
1159
1160 java-pkg_check-phase install
1161
1162 [[ ${#} -gt 2 ]] && die "${FUNCNAME} takes at most two arguments"
1163
1164 local pkgs="${1}"
1165 local jar="${2}"
1166
1167 [[ -z "${pkgs}" ]] && die "${FUNCNAME} called with no package(s) specified"
1168
1169 if [[ "${EAPI}" == "1" ]]; then
1170 pkgs="${pkgs//:/-}"
1171 fi
1172
1173 if [[ -z "${jar}" ]]; then
1174 for pkg in ${pkgs//,/ }; do
1175 java-pkg_ensure-dep runtime "${pkg}"
1176 java-pkg_record-jar_ "${pkg}"
1177 done
1178 else
1179 [[ ${pkgs} == *,* ]] && \
1180 die "${FUNCNAME} called with both package list and jar name"
1181 java-pkg_ensure-dep runtime "${pkgs}"
1182 java-pkg_record-jar_ "${pkgs}" "${jar}"
1183 fi
1184
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_
1037} 1265}
1038 1266
1039# 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
1040# populate jars from the filesystem. 1268# populate jars from the filesystem.
1041# 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
1504 dodir /usr/share/ant/${TASKS_DIR} 1732 dodir /usr/share/ant/${TASKS_DIR}
1505 touch "${D}/usr/share/ant/${TASKS_DIR}/${TASK_NAME}" 1733 touch "${D}/usr/share/ant/${TASKS_DIR}/${TASK_NAME}"
1506} 1734}
1507 1735
1508# ------------------------------------------------------------------------------ 1736# ------------------------------------------------------------------------------
1509# @internal-function java-pkg_ant-tasks-from-deps
1510#
1511# Function to determine ANT_TASKS from DEPEND variable for backwards
1512# compatibility with ebuilds that don't set ANT_TASKS before calling eant() or
1513# WANT_ANT_TASKS before inheriting java-pkg-2. If the DEPEND string contains
1514# "dev-java/ant" or "dev-java/ant-tasks", then it returns "all", otherwise
1515# "none". It's not smart enough to cope with USE flag depends but that shouldn't
1516# be a problem, the worst it can do is activace all tasks when not needed.
1517# Note that this is called only with JAVA_PKG_STRICT=1, to find ebuilds with
1518# insufficient dependencies, otherwise all available tasks are used for
1519# backwards compatilbility.
1520#
1521# @return "all" or "none"
1522# ------------------------------------------------------------------------------
1523java-pkg_ant-tasks-from-deps() {
1524 local found_ant found_ant_tasks
1525
1526 for dep in ${DEPEND}
1527 do
1528 local ant="$(awk '/(dev-java\/ant)/ { if (match($1, "(dev-java/ant)((-[0-9])+|$)", m)) print m[1] }' <<< ${dep})"
1529 [[ "${ant}" == "dev-java/ant" ]] && found_ant=true
1530 [[ "${dep}" == *"ant-tasks"* ]] && found_ant_tasks=true
1531 done
1532
1533 if [[ -n "${found_ant}" || -n "${found_ant_tasks}" ]]; then
1534 java-pkg_announce-qa-violation "The ebuild DEPENDS on deprecated ant or ant-tasks"
1535 echo "all"
1536 else
1537 # ebuild doesn't set ANT_TASKS and doesn't depend on ant-tasks or ant
1538 # so we deactivate all tasks that may be installed
1539 echo "none"
1540 fi
1541}
1542
1543# ------------------------------------------------------------------------------
1544# @internal-function java-pkg_ant-tasks-depend 1737# @internal-function java-pkg_ant-tasks-depend
1545# 1738#
1546# Translates the WANT_ANT_TASKS variable into valid dependencies. 1739# Translates the WANT_ANT_TASKS variable into valid dependencies.
1547# ------------------------------------------------------------------------------ 1740# ------------------------------------------------------------------------------
1548java-pkg_ant-tasks-depend() { 1741java-pkg_ant-tasks-depend() {
1564 return 0 1757 return 0
1565 fi 1758 fi
1566} 1759}
1567 1760
1568# ------------------------------------------------------------------------------ 1761# ------------------------------------------------------------------------------
1762# @ebuild-function ejunit
1763#
1764# Junit wrapper function. Makes it easier to run the tests and checks for
1765# dev-java/junit in DEPEND. Launches the tests using junit.textui.TestRunner.
1766#
1767# Examples:
1768# ejunit -cp build/classes org.blinkenlights.jid3.test.AllTests
1769# ejunit org.blinkenlights.jid3.test.AllTests
1770#
1771# @param $1 - -cp or -classpath
1772# @param $2 - classpath; junit and recorded dependencies get appended
1773# @param $@ - the rest of the parameters are passed to java
1774# ------------------------------------------------------------------------------
1775ejunit() {
1776 debug-print-function ${FUNCNAME} $*
1777
1778 local pkgs
1779 if [[ -f ${JAVA_PKG_DEPEND_FILE} ]]; then
1780 for atom in $(cat ${JAVA_PKG_DEPEND_FILE} | tr : ' '); do
1781 pkgs=${pkgs},$(echo ${atom} | sed -re "s/^.*@//")
1782 done
1783 fi
1784
1785 local cp=$(java-pkg_getjars --with-dependencies junit${pkgs})
1786 if [[ ${1} = -cp || ${1} = -classpath ]]; then
1787 cp="${2}:${cp}"
1788 shift 2
1789 else
1790 cp=".:${cp}"
1791 fi
1792
1793 local runner=junit.textui.TestRunner
1794 debug-print "Calling: java -cp \"${cp}\" -Djava.awt.headless=true ${runner} ${@}"
1795 java -cp "${cp}" -Djava.awt.headless=true ${runner} "${@}" || die "Running junit failed"
1796}
1797
1798# ------------------------------------------------------------------------------
1569# @section-end helper 1799# @section-end helper
1570# ------------------------------------------------------------------------------ 1800# ------------------------------------------------------------------------------
1571 1801
1572# ------------------------------------------------------------------------------ 1802# ------------------------------------------------------------------------------
1573# @section-begin build 1803# @section-begin build
1584# compiler. Will also set proper ANT_TASKS from the variable ANT_TASKS, 1814# compiler. Will also set proper ANT_TASKS from the variable ANT_TASKS,
1585# variables: 1815# variables:
1586# EANT_GENTOO_CLASSPATH - calls java-pkg_getjars for the value and adds to the 1816# EANT_GENTOO_CLASSPATH - calls java-pkg_getjars for the value and adds to the
1587# gentoo.classpath property. Be sure to call 1817# gentoo.classpath property. Be sure to call
1588# java-ant_rewrite-classpath in src_unpack. 1818# java-ant_rewrite-classpath in src_unpack.
1819# JAVA_PKG_NO_BUNDLED_SEARCH - Don't search for bundled jars or class files
1589# *ANT_TASKS - used to determine ANT_TASKS before calling Ant. 1820# *ANT_TASKS - used to determine ANT_TASKS before calling Ant.
1590# ------------------------------------------------------------------------------ 1821# ------------------------------------------------------------------------------
1591eant() { 1822eant() {
1592 debug-print-function ${FUNCNAME} $* 1823 debug-print-function ${FUNCNAME} $*
1593 1824
1594 # FIXME get this working 1825 if [[ ${EBUILD_PHASE} = compile ]]; then
1595# if is-java-strict && [[ ! ${DEPEND} =~ "dev-java/ant" ]]; then 1826 # Used to be done in hooks in java-ant-2.eclass but moved here so that we can
1596# java-pkg_announce-qa-violation \ 1827 # finally get rid of the hooks without breaking stuff
1597# "Using eant, but not depending on dev-java/ant or dev-java/ant-core" 1828
1829 [[ "${JAVA_ANT_IGNORE_SYSTEM_CLASSES}" && "${JAVA_PKG_BSFIX}" ]] \
1830 && java-ant_ignore-system-classes "${S}/build.xml"
1831
1832 if hasq java-ant-2 ${INHERITED}; then
1833 java-ant_bsfix
1834 fi
1835
1836 # eant can be called multiple times
1837 JAVA_PKG_BSFIX="off"
1838
1839 if [[ -z ${JAVA_PKG_NO_BUNDLED_SEARCH} ]] && is-java-strict; then
1840 echo "Searching for bundled jars:"
1841 java-pkg_find-normal-jars || echo "None found."
1842 echo "Searching for bundled classes (no output if none found):"
1843 find "${WORKDIR}" -name "*.class"
1844 echo "Search done."
1845 JAVA_PKG_NO_BUNDLED_SEARCH=true # eant can be called many times
1846 fi
1598# fi 1847 fi
1599 1848
1600 if ! hasq java-ant-2 ${INHERITED} && is-java-strict; then 1849 if ! hasq java-ant-2 ${INHERITED}; then
1601 local msg="You should inherit java-ant-2 when using eant" 1850 local msg="You should inherit java-ant-2 when using eant"
1602 java-pkg_announce-qa-violation ${msg} 1851 java-pkg_announce-qa-violation "${msg}"
1603 die ${msg}
1604 fi 1852 fi
1605 1853
1606 local antflags="-Dnoget=true -Dmaven.mode.offline=true" 1854 local antflags="-Dnoget=true -Dmaven.mode.offline=true -Dbuild.sysclasspath=ignore"
1607 1855
1608 java-pkg_init-compiler_ 1856 java-pkg_init-compiler_
1609 local compiler="${GENTOO_COMPILER}" 1857 local compiler="${GENTOO_COMPILER}"
1610 1858
1611 local compiler_env="${JAVA_PKG_COMPILER_DIR}/${compiler}" 1859 local compiler_env="${JAVA_PKG_COMPILER_DIR}/${compiler}"
1612
1613 local build_compiler="$(source ${compiler_env} 1>/dev/null 2>&1; echo ${ANT_BUILD_COMPILER})" 1860 local build_compiler="$(source ${compiler_env} 1>/dev/null 2>&1; echo ${ANT_BUILD_COMPILER})"
1614 if [[ "${compiler}" != "javac" && -z "${build_compiler}" ]]; then 1861 if [[ "${compiler}" != "javac" && -z "${build_compiler}" ]]; then
1615 die "ANT_BUILD_COMPILER undefined in ${compiler_env}" 1862 die "ANT_BUILD_COMPILER undefined in ${compiler_env}"
1616 fi 1863 fi
1617 1864
1623 # java-config -p 1870 # java-config -p
1624 local build_compiler_deps="$(source ${JAVA_PKG_COMPILER_DIR}/${compiler} 1>/dev/null 2>&1; echo ${ANT_BUILD_COMPILER_DEPS})" 1871 local build_compiler_deps="$(source ${JAVA_PKG_COMPILER_DIR}/${compiler} 1>/dev/null 2>&1; echo ${ANT_BUILD_COMPILER_DEPS})"
1625 if [[ -n ${build_compiler_deps} ]]; then 1872 if [[ -n ${build_compiler_deps} ]]; then
1626 antflags="${antflags} -lib $(java-config -p ${build_compiler_deps})" 1873 antflags="${antflags} -lib $(java-config -p ${build_compiler_deps})"
1627 fi 1874 fi
1628 fi
1629
1630 if is-java-strict; then
1631 einfo "Disabling system classpath for ant"
1632 antflags="${antflags} -Dbuild.sysclasspath=ignore"
1633 fi 1875 fi
1634 1876
1635 for arg in "${@}"; do 1877 for arg in "${@}"; do
1636 if [[ ${arg} = -lib ]]; then 1878 if [[ ${arg} = -lib ]]; then
1637 if is-java-strict; then 1879 if is-java-strict; then
1646 echo "more info." 1888 echo "more info."
1647 fi 1889 fi
1648 fi 1890 fi
1649 done 1891 done
1650 1892
1651 if has_version ">=dev-java/ant-core-1.7.0"; then
1652 # default ANT_TASKS to WANT_ANT_TASKS, if ANT_TASKS is not set explicitly 1893 # default ANT_TASKS to WANT_ANT_TASKS, if ANT_TASKS is not set explicitly
1653 ANT_TASKS="${ANT_TASKS:-${WANT_ANT_TASKS}}" 1894 ANT_TASKS="${ANT_TASKS:-${WANT_ANT_TASKS}}"
1654 1895
1655 # override ANT_TASKS with JAVA_PKG_FORCE_ANT_TASKS if it's set 1896 # override ANT_TASKS with JAVA_PKG_FORCE_ANT_TASKS if it's set
1656 ANT_TASKS="${JAVA_PKG_FORCE_ANT_TASKS:-${ANT_TASKS}}" 1897 ANT_TASKS="${JAVA_PKG_FORCE_ANT_TASKS:-${ANT_TASKS}}"
1657 1898
1658 if is-java-strict; then
1659 # if ant-tasks were not set by ebuild or forced, try to determine them from depends
1660 if [[ -z "${ANT_TASKS}" ]]; then
1661 ANT_TASKS="$(java-pkg_ant-tasks-from-deps)"
1662 fi
1663 else
1664 # if ant-tasks is not set by ebuild or forced, activate all of them 1899 # if ant-tasks is not set by ebuild or forced, use none
1665 ANT_TASKS="${ANT_TASKS:-all}" 1900 ANT_TASKS="${ANT_TASKS:-none}"
1666 fi
1667 1901
1668 # at this point, ANT_TASKS should be "all", "none" or explicit list 1902 # at this point, ANT_TASKS should be "all", "none" or explicit list
1669 if [[ "${ANT_TASKS}" == "all" ]]; then 1903 if [[ "${ANT_TASKS}" == "all" ]]; then
1670 einfo "Using all available ANT_TASKS" 1904 einfo "Using all available ANT_TASKS"
1671 elif [[ "${ANT_TASKS}" == "none" ]]; then 1905 elif [[ "${ANT_TASKS}" == "none" ]]; then
1672 einfo "Disabling all optional ANT_TASKS" 1906 einfo "Disabling all optional ANT_TASKS"
1673 else 1907 else
1674 einfo "Using following ANT_TASKS: ${ANT_TASKS}" 1908 einfo "Using following ANT_TASKS: ${ANT_TASKS}"
1675 fi 1909 fi
1676 1910
1677 export ANT_TASKS 1911 export ANT_TASKS
1678 fi
1679 1912
1680 [[ -n ${JAVA_PKG_DEBUG} ]] && antflags="${antflags} --execdebug -debug" 1913 [[ -n ${JAVA_PKG_DEBUG} ]] && antflags="${antflags} --execdebug -debug"
1681 [[ -n ${PORTAGE_QUIET} ]] && antflags="${antflags} -q" 1914 [[ -n ${PORTAGE_QUIET} ]] && antflags="${antflags} -q"
1682 1915
1683 local gcp="${EANT_GENTOO_CLASSPATH}" 1916 local gcp="${EANT_GENTOO_CLASSPATH}"
1917 local getjarsarg=""
1684 1918
1685 if [[ ${EBUILD_PHASE} = "test" ]]; then 1919 if [[ ${EBUILD_PHASE} = "test" ]]; then
1686 antflags="${antflags} -DJunit.present=true" 1920 antflags="${antflags} -DJunit.present=true"
1687 [[ ${gcp} && ${ANT_TASKS} = *ant-junit* ]] && gcp="${gcp} junit" 1921 [[ ${gcp} && ${ANT_TASKS} = *ant-junit* ]] && gcp="${gcp} junit"
1922 getjarsarg="--with-dependencies"
1688 fi 1923 fi
1689 1924
1690 local cp 1925 local cp
1691 1926
1692 for atom in ${gcp}; do 1927 for atom in ${gcp}; do
1693 cp="${cp}:$(java-pkg_getjars ${atom})" 1928 cp="${cp}:$(java-pkg_getjars ${getjarsarg} ${atom})"
1694 done 1929 done
1695 1930
1696 if [[ ${cp} ]]; then 1931 if [[ ${cp} ]]; then
1697 # It seems ant does not like single quotes around ${cp} 1932 # It seems ant does not like single quotes around ${cp}
1698 antflags="${antflags} -Dgentoo.classpath=\"${cp#:}\"" 1933 antflags="${antflags} -Dgentoo.classpath=\"${cp#:}\""
1699 fi 1934 fi
1700 1935
1701 [[ -n ${JAVA_PKG_DEBUG} ]] && echo ant ${antflags} "${@}" 1936 [[ -n ${JAVA_PKG_DEBUG} ]] && echo ant ${antflags} "${@}"
1702 debug-print "Calling ant: ${antflags} ${@}" 1937 debug-print "Calling ant (GENTOO_VM: ${GENTOO_VM}): ${antflags} ${@}"
1703 ant ${antflags} "${@}" || die "eant failed" 1938 ant ${antflags} "${@}" || die "eant failed"
1704
1705} 1939}
1706 1940
1707# ------------------------------------------------------------------------------ 1941# ------------------------------------------------------------------------------
1708# @ebuild-function ejavac 1942# @ebuild-function ejavac
1709# 1943#
1804# This shouldn't be used directly. Instead, java-pkg and java-pkg-opt will 2038# This shouldn't be used directly. Instead, java-pkg and java-pkg-opt will
1805# call it during each of the phases of the merge process. 2039# call it during each of the phases of the merge process.
1806# 2040#
1807# ----------------------------------------------------------------------------- 2041# -----------------------------------------------------------------------------
1808java-pkg_init() { 2042java-pkg_init() {
2043 debug-print-function ${FUNCNAME} $*
1809 unset JAVAC 2044 unset JAVAC
1810 unset JAVA_HOME 2045 unset JAVA_HOME
1811 2046
1812 # People do all kinds of weird things. 2047 # People do all kinds of weird things.
1813 # http://forums.gentoo.org/viewtopic-p-3943166.html 2048 # http://forums.gentoo.org/viewtopic-p-3943166.html
1821 ewarn "make.conf for example) to silence this warning or" 2056 ewarn "make.conf for example) to silence this warning or"
1822 ewarn "I_WANT_GLOBAL_JAVA_OPTIONS to not filter it." 2057 ewarn "I_WANT_GLOBAL_JAVA_OPTIONS to not filter it."
1823 fi 2058 fi
1824 2059
1825 if [[ -z ${accept} ]]; then 2060 if [[ -z ${accept} ]]; then
2061 # export _JAVA_OPTIONS= doesn't work because it will show up in java
2062 # -version output
1826 unset _JAVA_OPTIONS 2063 unset _JAVA_OPTIONS
1827 # phase hooks make this run many times without this 2064 # phase hooks make this run many times without this
1828 I_WANT_GLOBAL_JAVA_OPTIONS="true" 2065 I_WANT_GLOBAL_JAVA_OPTIONS="true"
1829 fi 2066 fi
1830 2067
2068 if java-pkg_func-exists ant_src_unpack; then
2069 java-pkg_announce-qa-violation "Using old ant_src_unpack. Should be src_unpack"
2070 fi
2071
1831 java-pkg_init_paths_ 2072 java-pkg_init_paths_
1832 java-pkg_switch-vm 2073 java-pkg_switch-vm
1833 PATH=${JAVA_HOME}/bin:${PATH} 2074 PATH=${JAVA_HOME}/bin:${PATH}
1834 2075
1835 # TODO we will probably want to set JAVAC and JAVACFLAGS 2076 # TODO we will probably want to set JAVAC and JAVACFLAGS
1836 2077
1837 # Do some QA checks 2078 # Do some QA checks
1838 java-pkg_check-jikes 2079 java-pkg_check-jikes
2080
2081 # Can't use unset here because Portage does not save the unset
2082 # see https://bugs.gentoo.org/show_bug.cgi?id=189417#c11
1839 2083
1840 # When users have crazy classpaths some packages can fail to compile. 2084 # When users have crazy classpaths some packages can fail to compile.
1841 # and everything should work with empty CLASSPATH. 2085 # and everything should work with empty CLASSPATH.
1842 # This also helps prevent unexpected dependencies on random things 2086 # This also helps prevent unexpected dependencies on random things
1843 # from the CLASSPATH. 2087 # from the CLASSPATH.
1844 unset CLASSPATH 2088 export CLASSPATH=
1845 2089
1846 # Unset external ANT_ stuff 2090 # Unset external ANT_ stuff
1847 unset ANT_TASKS 2091 export ANT_TASKS=
1848 unset ANT_OPTS 2092 export ANT_OPTS=
1849} 2093}
1850 2094
1851# ------------------------------------------------------------------------------ 2095# ------------------------------------------------------------------------------
1852# @function-internal java-pkg-init-compiler_ 2096# @function-internal java-pkg-init-compiler_
1853# 2097#
1944 done 2188 done
1945 2189
1946 # If it hasn't been defined already, default to javac 2190 # If it hasn't been defined already, default to javac
1947 if [[ -z ${GENTOO_COMPILER} ]]; then 2191 if [[ -z ${GENTOO_COMPILER} ]]; then
1948 if [[ -n ${compilers} ]]; then 2192 if [[ -n ${compilers} ]]; then
1949 einfo "No suitable compiler found: defaulting javac for compilation" 2193 einfo "No suitable compiler found: defaulting to JDK default for compilation"
1950 else 2194 else
1951 # probably don't need to notify users about the default. 2195 # probably don't need to notify users about the default.
1952 :;#einfo "Defaulting to javac for compilation" 2196 :;#einfo "Defaulting to javac for compilation"
1953 fi 2197 fi
2198 if java-config -g GENTOO_COMPILER 2> /dev/null; then
2199 export GENTOO_COMPILER=$(java-config -g GENTOO_COMPILER)
2200 else
1954 export GENTOO_COMPILER=javac 2201 export GENTOO_COMPILER=javac
2202 fi
1955 else 2203 else
1956 einfo "Using ${GENTOO_COMPILER} for compilation" 2204 einfo "Using ${GENTOO_COMPILER} for compilation"
1957 fi 2205 fi
1958 2206
1959} 2207}
1975 fi 2223 fi
1976 2224
1977 JAVA_PKG_SHAREPATH="${DESTTREE}/share/${JAVA_PKG_NAME}" 2225 JAVA_PKG_SHAREPATH="${DESTTREE}/share/${JAVA_PKG_NAME}"
1978 JAVA_PKG_SOURCESPATH="${JAVA_PKG_SHAREPATH}/sources/" 2226 JAVA_PKG_SOURCESPATH="${JAVA_PKG_SHAREPATH}/sources/"
1979 JAVA_PKG_ENV="${D}${JAVA_PKG_SHAREPATH}/package.env" 2227 JAVA_PKG_ENV="${D}${JAVA_PKG_SHAREPATH}/package.env"
2228 JAVA_PKG_VIRTUALS_PATH="${DESTTREE}/share/java-config-2/virtuals"
2229 JAVA_PKG_VIRTUAL_PROVIDER="${D}/${JAVA_PKG_VIRTUALS_PATH}/${JAVA_PKG_NAME}"
1980 2230
1981 [[ -z "${JAVA_PKG_JARDEST}" ]] && JAVA_PKG_JARDEST="${JAVA_PKG_SHAREPATH}/lib" 2231 [[ -z "${JAVA_PKG_JARDEST}" ]] && JAVA_PKG_JARDEST="${JAVA_PKG_SHAREPATH}/lib"
1982 [[ -z "${JAVA_PKG_LIBDEST}" ]] && JAVA_PKG_LIBDEST="${DESTTREE}/$(get_libdir)/${JAVA_PKG_NAME}" 2232 [[ -z "${JAVA_PKG_LIBDEST}" ]] && JAVA_PKG_LIBDEST="${DESTTREE}/$(get_libdir)/${JAVA_PKG_NAME}"
1983 [[ -z "${JAVA_PKG_WARDEST}" ]] && JAVA_PKG_WARDEST="${JAVA_PKG_SHAREPATH}/webapps" 2233 [[ -z "${JAVA_PKG_WARDEST}" ]] && JAVA_PKG_WARDEST="${JAVA_PKG_SHAREPATH}/webapps"
1984 2234
1997# Writes the package.env out to disk. 2247# Writes the package.env out to disk.
1998# 2248#
1999# ------------------------------------------------------------------------------ 2249# ------------------------------------------------------------------------------
2000# TODO change to do-write, to match everything else 2250# TODO change to do-write, to match everything else
2001java-pkg_do_write_() { 2251java-pkg_do_write_() {
2252 debug-print-function ${FUNCNAME} $*
2002 java-pkg_init_paths_ 2253 java-pkg_init_paths_
2003 # Create directory for package.env 2254 # Create directory for package.env
2004 dodir "${JAVA_PKG_SHAREPATH}" 2255 dodir "${JAVA_PKG_SHAREPATH}"
2005 if [[ -n "${JAVA_PKG_CLASSPATH}" || -n "${JAVA_PKG_LIBRARY}" || -f "${JAVA_PKG_DEPEND}" ]]; then 2256 if [[ -n "${JAVA_PKG_CLASSPATH}" || -n "${JAVA_PKG_LIBRARY}" || -f \
2257 "${JAVA_PKG_DEPEND_FILE}" || -f \
2258 "${JAVA_PKG_OPTIONAL_DEPEND_FILE}" ]]; then
2006 # Create package.env 2259 # Create package.env
2007 ( 2260 (
2008 echo "DESCRIPTION=\"${DESCRIPTION}\"" 2261 echo "DESCRIPTION=\"${DESCRIPTION}\""
2009 echo "GENERATION=\"2\"" 2262 echo "GENERATION=\"2\""
2263 echo "SLOT=\"${SLOT}\""
2010 2264
2011 [[ -n "${JAVA_PKG_CLASSPATH}" ]] && echo "CLASSPATH=\"${JAVA_PKG_CLASSPATH}\"" 2265 [[ -n "${JAVA_PKG_CLASSPATH}" ]] && echo "CLASSPATH=\"${JAVA_PKG_CLASSPATH}\""
2012 [[ -n "${JAVA_PKG_LIBRARY}" ]] && echo "LIBRARY_PATH=\"${JAVA_PKG_LIBRARY}\"" 2266 [[ -n "${JAVA_PKG_LIBRARY}" ]] && echo "LIBRARY_PATH=\"${JAVA_PKG_LIBRARY}\""
2013 [[ -n "${JAVA_PROVIDE}" ]] && echo "PROVIDES=\"${JAVA_PROVIDE}\"" 2267 [[ -n "${JAVA_PROVIDE}" ]] && echo "PROVIDES=\"${JAVA_PROVIDE}\""
2014 [[ -f "${JAVA_PKG_DEPEND}" ]] && echo "DEPEND=\"$(cat ${JAVA_PKG_DEPEND} | uniq | tr '\n' ':')\"" 2268 [[ -f "${JAVA_PKG_DEPEND_FILE}" ]] \
2269 && echo "DEPEND=\"$(cat "${JAVA_PKG_DEPEND_FILE}" | uniq | tr '\n' ':')\""
2270 [[ -f "${JAVA_PKG_OPTIONAL_DEPEND_FILE}" ]] \
2271 && echo "OPTIONAL_DEPEND=\"$(cat "${JAVA_PKG_OPTIONAL_DEPEND_FILE}" | uniq | tr '\n' ':')\""
2015 echo "VM=\"$(echo ${RDEPEND} ${DEPEND} | sed -e 's/ /\n/g' | sed -n -e '/virtual\/\(jre\|jdk\)/ { p;q }')\"" # TODO cleanup ! 2272 echo "VM=\"$(echo ${RDEPEND} ${DEPEND} | sed -e 's/ /\n/g' | sed -n -e '/virtual\/\(jre\|jdk\)/ { p;q }')\"" # TODO cleanup !
2016 ) > "${JAVA_PKG_ENV}" 2273 ) > "${JAVA_PKG_ENV}"
2017 2274
2018 # register target/source 2275 # register target/source
2019 local target="$(java-pkg_get-target)" 2276 local target="$(java-pkg_get-target)"
2030 2287
2031 2288
2032 echo "MERGE_VM=\"${GENTOO_VM}\"" >> "${JAVA_PKG_ENV}" 2289 echo "MERGE_VM=\"${GENTOO_VM}\"" >> "${JAVA_PKG_ENV}"
2033 [[ -n ${GENTOO_COMPILER} ]] && echo "MERGE_COMPILER=\"${GENTOO_COMPILER}\"" >> "${JAVA_PKG_ENV}" 2290 [[ -n ${GENTOO_COMPILER} ]] && echo "MERGE_COMPILER=\"${GENTOO_COMPILER}\"" >> "${JAVA_PKG_ENV}"
2034 2291
2292 # extra env variables
2293 if [[ -n "${JAVA_PKG_EXTRA_ENV_VARS}" ]]; then
2294 cat "${JAVA_PKG_EXTRA_ENV}" >> "${JAVA_PKG_ENV}" || die
2295 # nested echo to remove leading/trailing spaces
2296 echo "ENV_VARS=\"$(echo ${JAVA_PKG_EXTRA_ENV_VARS})\"" \
2297 >> "${JAVA_PKG_ENV}" || die
2298 fi
2299
2035 # Strip unnecessary leading and trailing colons 2300 # Strip unnecessary leading and trailing colons
2036 # TODO try to cleanup if possible 2301 # TODO try to cleanup if possible
2037 sed -e "s/=\":/=\"/" -e "s/:\"$/\"/" -i "${JAVA_PKG_ENV}" || die "Did you forget to call java_init ?" 2302 sed -e "s/=\":/=\"/" -e "s/:\"$/\"/" -i "${JAVA_PKG_ENV}" || die "Did you forget to call java_init ?"
2303 else
2304 debug-print "JAVA_PKG_CLASSPATH, JAVA_PKG_LIBRARY, JAVA_PKG_DEPEND_FILE"
2305 debug-print "or JAVA_PKG_OPTIONAL_DEPEND_FILE not defined so can't"
2306 debug-print "write package.env."
2038 fi 2307 fi
2039} 2308}
2040 2309
2041# ------------------------------------------------------------------------------ 2310# ------------------------------------------------------------------------------
2042# @internal-function java-pkg_record-jar_ 2311# @internal-function java-pkg_record-jar_
2043# 2312#
2044# Record a dependency to the package.env 2313# Record an (optional) dependency to the package.env
2045# 2314# @param --optional - record dependency as optional
2315# @param $1 - package to record
2316# @param $2 - (optional) jar of package to record
2046# ------------------------------------------------------------------------------ 2317# ------------------------------------------------------------------------------
2047JAVA_PKG_DEPEND="${T}/java-pkg-depend" 2318JAVA_PKG_DEPEND_FILE="${T}/java-pkg-depend"
2319JAVA_PKG_OPTIONAL_DEPEND_FILE="${T}/java-pkg-optional-depend"
2048 2320
2049java-pkg_record-jar_() { 2321java-pkg_record-jar_() {
2050 debug-print-function ${FUNCNAME} $* 2322 debug-print-function ${FUNCNAME} $*
2323
2324 local depend_file="${JAVA_PKG_DEPEND_FILE}"
2325 if [[ "${1}" == "--optional" ]]; then
2326 depend_file="${JAVA_PKG_OPTIONAL_DEPEND_FILE}"
2327 shift
2328 fi
2051 2329
2052 local pkg=${1} jar=${2} append 2330 local pkg=${1} jar=${2} append
2053 if [[ -z "${jar}" ]]; then 2331 if [[ -z "${jar}" ]]; then
2054 append="${pkg}" 2332 append="${pkg}"
2055 else 2333 else
2056 append="$(basename ${jar})@${pkg}" 2334 append="$(basename ${jar})@${pkg}"
2057 fi 2335 fi
2058 2336
2059 echo ${append} >> ${JAVA_PKG_DEPEND} 2337 echo "${append}" >> "${depend_file}"
2060} 2338}
2061 2339
2062# ------------------------------------------------------------------------------ 2340# ------------------------------------------------------------------------------
2063# @internal-function java-pkg_append_ 2341# @internal-function java-pkg_append_
2064# 2342#
2124# 2402#
2125# ------------------------------------------------------------------------------ 2403# ------------------------------------------------------------------------------
2126java-pkg_setup-vm() { 2404java-pkg_setup-vm() {
2127 debug-print-function ${FUNCNAME} $* 2405 debug-print-function ${FUNCNAME} $*
2128 2406
2407 export LANG="C" LC_ALL="C"
2408
2129 local vendor="$(java-pkg_get-vm-vendor)" 2409 local vendor="$(java-pkg_get-vm-vendor)"
2130 if [[ "${vendor}" == "sun" ]] && java-pkg_is-vm-version-ge "1.5" ; then 2410 if [[ "${vendor}" == "sun" ]] && java-pkg_is-vm-version-ge "1.5" ; then
2131 addpredict "/dev/random" 2411 addpredict "/dev/random"
2132 elif [[ "${vendor}" == "ibm" ]]; then 2412 elif [[ "${vendor}" == "ibm" ]]; then
2133 addpredict "/proc/self/maps" 2413 addpredict "/proc/self/maps"
2134 addpredict "/proc/cpuinfo" 2414 addpredict "/proc/cpuinfo"
2135 export LANG="C" LC_ALL="C"
2136 elif [[ "${vendor}" == "jrockit" ]]; then 2415 elif [[ "${vendor}" == "jrockit" ]]; then
2137 addpredict "/proc/cpuinfo" 2416 addpredict "/proc/cpuinfo"
2138 fi 2417 fi
2139} 2418}
2140 2419
2244 2523
2245 #TODO If you know a better solution let us know. 2524 #TODO If you know a better solution let us know.
2246 java-pkg_append_ LD_LIBRARY_PATH "$(java-config -g LDPATH)" 2525 java-pkg_append_ LD_LIBRARY_PATH "$(java-config -g LDPATH)"
2247 2526
2248 local tann="${T}/announced-vm" 2527 local tann="${T}/announced-vm"
2528 # With the hooks we should only get here once from pkg_setup but better safe than sorry
2529 # if people have for example modified eclasses some where
2249 if [[ -n "${JAVA_PKG_DEBUG}" ]] || [[ ! -f "${tann}" ]] ; then 2530 if [[ -n "${JAVA_PKG_DEBUG}" ]] || [[ ! -f "${tann}" ]] ; then
2250 # Add a check for setup/preinst phase... to avoid duplicate outputs
2251 # for when FEATURES=buildpkg
2252 if [[ ${EBUILD_PHASE} != "setup" && ${EBUILD_PHASE} != "preinst" && ${EBUILD_PHASE} != "postinst" ]];
2253 then
2254 einfo "Using: $(java-config -f)" 2531 einfo "Using: $(java-config -f)"
2255 [[ ! -f "${tann}" ]] && touch "${tann}" 2532 [[ ! -f "${tann}" ]] && touch "${tann}"
2256 fi
2257 fi 2533 fi
2258 2534
2259 else 2535 else
2260 [[ -n "${JAVA_PKG_DEBUG}" ]] && ewarn "!!! This package inherits java-pkg but doesn't depend on a JDK. -bin or broken dependency!!!" 2536 [[ -n "${JAVA_PKG_DEBUG}" ]] && ewarn "!!! This package inherits java-pkg but doesn't depend on a JDK. -bin or broken dependency!!!"
2261 fi 2537 fi
2321 eerror "See ${log} for more details." 2597 eerror "See ${log} for more details."
2322 die "Incorrect bytecode found" 2598 die "Incorrect bytecode found"
2323 fi 2599 fi
2324} 2600}
2325 2601
2602# ----------------------------------------------------------------------------
2603# @internal-function java-pkg_ensure-dep
2604# Check that a package being used in jarfrom, getjars and getjar is contained
2605# within DEPEND or RDEPEND.
2606# @param $1 - empty - check both vars; "runtime" or "build" - check only
2607# RDEPEND, resp. DEPEND
2608# @param $2 - Package name and slot.
2609
2610java-pkg_ensure-dep() {
2611 debug-print-function ${FUNCNAME} $*
2612
2613 local limit_to="${1}"
2614 local target_pkg="${2}"
2615 local dev_error=""
2616
2617 local stripped_pkg=$(echo "${target_pkg}" | sed \
2618 's/-[0-9]*\(\.[0-9]\)*$//')
2619
2620 debug-print "Matching against: ${stripped_pkg}"
2621
2622 if [[ ${limit_to} != runtime && ! ( "${DEPEND}" =~ "$stripped_pkg" ) ]]; then
2623 dev_error="The ebuild is attempting to use ${target_pkg} that is not"
2624 dev_error="${dev_error} declared in DEPEND."
2625 if is-java-strict; then
2626 eerror "${dev_error}"
2627 die "${dev_error}"
2628 elif [[ ${BASH_SUBSHELL} = 0 ]]; then
2629 eerror "${dev_error}"
2630 elog "Because you have this package installed the package will"
2631 elog "build without problems, but please report this to"
2632 elog "http://bugs.gentoo.org"
2633 fi
2634 fi
2635
2636 if [[ ${limit_to} != build ]]; then
2637 if [[ ! ( ${RDEPEND} =~ "${stripped_pkg}" ) ]]; then
2638 if [[ ! ( ${PDEPEND} =~ "${stripped_pkg}" ) ]]; then
2639 dev_error="The ebuild is attempting to use ${target_pkg},"
2640 dev_error="${dev_error} without specifying --build-only, that is not declared in RDEPEND"
2641 dev_error="${dev_error} or PDEPEND."
2642 if is-java-strict; then
2643 eerror "${dev_error}"
2644 die "${dev_error}"
2645 elif [[ ${BASH_SUBSHELL} = 0 ]]; then
2646 eerror "${dev_error}"
2647 elog "The package will build without problems, but may fail to run"
2648 elog "if you don't have ${target_pkg} installed, so please report"
2649 elog "this to http://bugs.gentoo.org"
2650 fi
2651 fi
2652 fi
2653 fi
2654}
2655
2326# ------------------------------------------------------------------------------ 2656# ------------------------------------------------------------------------------
2327# @section-end internal 2657# @section-end internal
2328# ------------------------------------------------------------------------------ 2658# ------------------------------------------------------------------------------
2329 2659
2330java-pkg_check-phase() { 2660java-pkg_check-phase() {
2331 local phase=${1} 2661 local phase=${1}
2332 local funcname=${2} 2662 local funcname=${FUNCNAME[1]}
2333 if is-java-strict && [[ ${EBUILD_PHASE} != ${phase} ]]; then 2663 if [[ ${EBUILD_PHASE} != ${phase} ]]; then
2334 java-pkg_announce-qa-violation \
2335 "${funcname} used outside of src_${phase}" 2664 local msg="${funcname} used outside of src_${phase}"
2665 java-pkg_announce-qa-violation "${msg}"
2336 fi 2666 fi
2337} 2667}
2338 2668
2339java-pkg_check-versioned-jar() { 2669java-pkg_check-versioned-jar() {
2340 local jar=${1} 2670 local jar=${1}
2349 java-pkg_announce-qa-violation "deprecated USE flag 'jikes' in IUSE" 2679 java-pkg_announce-qa-violation "deprecated USE flag 'jikes' in IUSE"
2350 fi 2680 fi
2351} 2681}
2352 2682
2353java-pkg_announce-qa-violation() { 2683java-pkg_announce-qa-violation() {
2354 if is-java-strict; then 2684 local nodie
2685 if [[ ${1} == "--nodie" ]]; then
2686 nodie="true"
2687 shift
2688 fi
2355 echo "Java QA Notice: $@" >&2 2689 echo "Java QA Notice: $@" >&2
2356 increment-qa-violations 2690 increment-qa-violations
2357 fi 2691 [[ -z "${nodie}" ]] && is-java-strict && die "${@}"
2358} 2692}
2359 2693
2360increment-qa-violations() { 2694increment-qa-violations() {
2361 let "JAVA_PKG_QA_VIOLATIONS+=1" 2695 let "JAVA_PKG_QA_VIOLATIONS+=1"
2362 export JAVA_PKG_QA_VIOLATIONS 2696 export JAVA_PKG_QA_VIOLATIONS

Legend:
Removed from v.1.67  
changed lines
  Added in v.1.107

  ViewVC Help
Powered by ViewVC 1.1.20