/[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.59 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.59 2007/03/01 12:53:38 betelgeuse 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
55# 54#
56# @seealso JAVA_PKG_FORCE_ANT_TASKS 55# @seealso JAVA_PKG_FORCE_ANT_TASKS
57# ----------------------------------------------------------------------------- 56# -----------------------------------------------------------------------------
58#WANT_ANT_TASKS 57#WANT_ANT_TASKS
59 58
59# -----------------------------------------------------------------------------
60# @variable-internal JAVA_PKG_PORTAGE_DEP 60# @variable-internal JAVA_PKG_PORTAGE_DEP
61# 61#
62# The version of portage we need to function properly. At this moment it's 62# The version of portage we need to function properly. Previously it was
63# portage with phase hooks support. 63# portage with phase hooks support but now we use a version with proper env
64# saving.
64# ----------------------------------------------------------------------------- 65# -----------------------------------------------------------------------------
65JAVA_PKG_PORTAGE_DEP=">=sys-apps/portage-2.1_pre1" 66JAVA_PKG_PORTAGE_DEP=">=sys-apps/portage-2.1.2.7"
66 67
67# ----------------------------------------------------------------------------- 68# -----------------------------------------------------------------------------
68# @variable-internal JAVA_PKG_E_DEPEND 69# @variable-internal JAVA_PKG_E_DEPEND
69# 70#
70# This is a convience variable to be used from the other java eclasses. This is 71# This is a convience variable to be used from the other java eclasses. This is
71# the version of java-config we want to use. We also need a recent version 72# the version of java-config we want to use. Usually the latest stable version
72# portage, that includes phase hooks. 73# so that ebuilds can use new features without depending on specific versions.
73# ----------------------------------------------------------------------------- 74# -----------------------------------------------------------------------------
74JAVA_PKG_E_DEPEND=">=dev-java/java-config-2.0.31 ${JAVA_PKG_PORTAGE_DEP}" 75JAVA_PKG_E_DEPEND=">=dev-java/java-config-2.0.33-r1 ${JAVA_PKG_PORTAGE_DEP}"
76hasq source ${JAVA_PKG_IUSE} && JAVA_PKG_E_DEPEND="${JAVA_PKG_E_DEPEND} source? ( app-arch/zip )"
75 77
76# ----------------------------------------------------------------------------- 78# -----------------------------------------------------------------------------
77# @variable-external JAVA_PKG_ALLOW_VM_CHANGE 79# @variable-external JAVA_PKG_ALLOW_VM_CHANGE
78# @variable-default yes 80# @variable-default yes
79# 81#
183# 185#
184# These are used to install Java-related things, such as jars, Javadocs, JNI 186# These are used to install Java-related things, such as jars, Javadocs, JNI
185# libraries, etc. 187# libraries, etc.
186# ----------------------------------------------------------------------------- 188# -----------------------------------------------------------------------------
187 189
190# -----------------------------------------------------------------------------
191# @ebuild-function java-pkg_doexamples
192#
193# Installs given arguments to /usr/share/doc/${PF}/examples
194# If you give it only one parameter and it is a directory it will install
195# everything in that directory to the examples directory.
196#
197# @example
198# java-pkg_doexamples demo
199# java-pkg_doexamples demo/* examples/*
200#
201# @param --subdir - If the examples need a certain directory structure
202# @param $* - list of files to install
203# ------------------------------------------------------------------------------
204java-pkg_doexamples() {
205 debug-print-function ${FUNCNAME} $*
206
207 [[ ${#} -lt 1 ]] && die "At least one argument needed"
208
209 java-pkg_check-phase install
210
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
218 if [[ ${#} = 1 && -d ${1} ]]; then
219 ( # dont want to pollute calling env
220 insinto "${dest}"
221 doins -r ${1}/*
222 ) || die "Installing examples failed"
223 else
224 ( # dont want to pollute calling env
225 insinto "${dest}"
226 doins -r "$@"
227 ) || die "Installing examples failed"
228 fi
229}
188 230
189# ----------------------------------------------------------------------------- 231# -----------------------------------------------------------------------------
190# @ebuild-function java-pkg_dojar 232# @ebuild-function java-pkg_dojar
191# 233#
192# Installs any number of jars. 234# Installs any number of jars.
249 done 291 done
250 292
251 java-pkg_do_write_ 293 java-pkg_do_write_
252} 294}
253 295
254
255# ------------------------------------------------------------------------------ 296# ------------------------------------------------------------------------------
256# @internal-function depend-java-query 297# @internal-function depend-java-query
257# 298#
258# 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.
259# 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
260# do not handle use flags. 301# do not handle use flags.
261# ------------------------------------------------------------------------------ 302# ------------------------------------------------------------------------------
262 303
263depend-java-query() { 304depend-java-query() {
305 # Used to have a which call here but it caused endless loops for some people
306 # that had some weird bashrc voodoo for which.
264 USE="${USE}" $(which depend-java-query) "${@}" 307 USE="${USE}" /usr/bin/depend-java-query "${@}"
265} 308}
266 309
267# ------------------------------------------------------------------------------ 310# ------------------------------------------------------------------------------
268# @ebuild-function java-pkg_regjar 311# @ebuild-function java-pkg_regjar
269# 312#
317 # java-pkg_regjar ${D}/opt/java/*.jar 360 # java-pkg_regjar ${D}/opt/java/*.jar
318 # such call will fall into this case (-e ${jar}) and will 361 # such call will fall into this case (-e ${jar}) and will
319 # record paths with ${D} in package.env 362 # record paths with ${D} in package.env
320 java-pkg_append_ JAVA_PKG_CLASSPATH "${jar#${D}}" 363 java-pkg_append_ JAVA_PKG_CLASSPATH "${jar#${D}}"
321 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
322 die "${jar} does not exist" 370 die "${jar} does not exist"
323 fi 371 fi
324 done 372 done
325 373
326 java-pkg_do_write_ 374 java-pkg_do_write_
397 if [[ -e "${lib}" ]] ; then 445 if [[ -e "${lib}" ]] ; then
398 # install if it isn't a symlink 446 # install if it isn't a symlink
399 if [[ ! -L "${lib}" ]] ; then 447 if [[ ! -L "${lib}" ]] ; then
400 INSDESTTREE="${JAVA_PKG_LIBDEST}" \ 448 INSDESTTREE="${JAVA_PKG_LIBDEST}" \
401 INSOPTIONS="${LIBOPTIONS}" \ 449 INSOPTIONS="${LIBOPTIONS}" \
402 doins "${lib}" || "failed to install ${lib}" 450 doins "${lib}" || die "failed to install ${lib}"
403 java-pkg_append_ JAVA_PKG_LIBRARY "${JAVA_PKG_LIBDEST}" 451 java-pkg_append_ JAVA_PKG_LIBRARY "${JAVA_PKG_LIBDEST}"
404 debug-print "Installing ${lib} to ${JAVA_PKG_LIBDEST}" 452 debug-print "Installing ${lib} to ${JAVA_PKG_LIBDEST}"
405 # otherwise make a symlink to the symlink's origin 453 # otherwise make a symlink to the symlink's origin
406 else 454 else
407 # TODO use dosym 455 # TODO use dosym
508# ------------------------------------------------------------------------------ 556# ------------------------------------------------------------------------------
509# @ebuild-function java-pkg_dojavadoc 557# @ebuild-function java-pkg_dojavadoc
510# 558#
511# 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.
512# 560#
561# @param $1: optional --symlink creates to symlink like this for html
562# documentation bundles.
513# @param $1: - The javadoc root directory. 563# @param $2: - The javadoc root directory.
514# 564#
515# @example: 565# @example:
516# java-pkg_dojavadoc docs/api 566# java-pkg_dojavadoc docs/api
567# java-pkg_dojavadoc --symlink apidocs docs/api
517# 568#
518# ------------------------------------------------------------------------------ 569# ------------------------------------------------------------------------------
519java-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
520 local dir="$1" 580 local dir="$1"
581 local dest=/usr/share/doc/${PF}/html
582
583 # QA checks
521 584
522 java-pkg_check-phase install 585 java-pkg_check-phase install
523 586
524 [[ -z "${dir}" ]] && die "Must specify a directory!" 587 [[ -z "${dir}" ]] && die "Must specify a directory!"
525 [[ ! -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
526 601
527 local dir_to_install="${dir}" 602 local dir_to_install="${dir}"
528 if [[ "$(basename "${dir}")" != "api" ]]; then 603 if [[ "$(basename "${dir}")" != "api" ]]; then
529 dir_to_install="${T}/api" 604 dir_to_install="${T}/api"
530 # TODO use doins 605 # TODO use doins
531 cp -r "${dir}" "${dir_to_install}" || die "cp failed" 606 cp -r "${dir}" "${dir_to_install}" || die "cp failed"
532 fi 607 fi
533 608
609 # Actual installation
610
534 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
535} 620}
536 621
537# ------------------------------------------------------------------------------ 622# ------------------------------------------------------------------------------
538# @ebuild-function java-pkg_dosrc 623# @ebuild-function java-pkg_dosrc
539# 624#
555# FIXME apparently this fails if you give it an empty directories 640# FIXME apparently this fails if you give it an empty directories
556java-pkg_dosrc() { 641java-pkg_dosrc() {
557 debug-print-function ${FUNCNAME} $* 642 debug-print-function ${FUNCNAME} $*
558 643
559 [ ${#} -lt 1 ] && die "At least one argument needed" 644 [ ${#} -lt 1 ] && die "At least one argument needed"
560 if ! hasq source ${IUSE}; then
561 echo "Java QA Notice: ${FUNCNAME} called without source in IUSE"
562 fi
563 645
564 java-pkg_check-phase install 646 java-pkg_check-phase install
565 647
566 [[ ${#} -lt 1 ]] && die "At least one argument needed" 648 [[ ${#} -lt 1 ]] && die "At least one argument needed"
649
650 if ! [[ ${DEPEND} = *app-arch/zip* ]]; then
651 local msg="${FUNCNAME} called without app-arch/zip in DEPEND"
652 java-pkg_announce-qa-violation ${msg}
653 fi
567 654
568 java-pkg_init_paths_ 655 java-pkg_init_paths_
569 656
570 local zip_name="${PN}-src.zip" 657 local zip_name="${PN}-src.zip"
571 local zip_path="${T}/${zip_name}" 658 local zip_path="${T}/${zip_name}"
770# @param $opt 857# @param $opt
771# --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.
772# (assumed automatically when called inside src_test) 859# (assumed automatically when called inside src_test)
773# --with-dependencies - get jars also from requested package's dependencies 860# --with-dependencies - get jars also from requested package's dependencies
774# 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.
775# --into $dir - symlink jar(s) into $dir (must exist) instead of . 864# --into $dir - symlink jar(s) into $dir (must exist) instead of .
776# @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.
777# @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.
778# @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
779# symlink. Defaults to the name of the jar. 869# symlink. Defaults to the name of the jar.
780# ------------------------------------------------------------------------------ 870# ------------------------------------------------------------------------------
781# TODO could probably be cleaned up a little 871# TODO could probably be cleaned up a little
783 debug-print-function ${FUNCNAME} $* 873 debug-print-function ${FUNCNAME} $*
784 874
785 local build_only="" 875 local build_only=""
786 local destdir="." 876 local destdir="."
787 local deep="" 877 local deep=""
878 local virtual=""
788 879
789 [[ "${EBUILD_PHASE}" == "test" ]] && build_only="true" 880 [[ "${EBUILD_PHASE}" == "test" ]] && build_only="build"
790 881
791 while [[ "${1}" == --* ]]; do 882 while [[ "${1}" == --* ]]; do
792 if [[ "${1}" = "--build-only" ]]; then 883 if [[ "${1}" = "--build-only" ]]; then
793 build_only="true" 884 build_only="build"
794 elif [[ "${1}" = "--with-dependencies" ]]; then 885 elif [[ "${1}" = "--with-dependencies" ]]; then
795 deep="--with-dependencies" 886 deep="--with-dependencies"
887 elif [[ "${1}" = "--virtual" ]]; then
888 virtual="true"
796 elif [[ "${1}" = "--into" ]]; then 889 elif [[ "${1}" = "--into" ]]; then
797 destdir="${2}" 890 destdir="${2}"
798 shift 891 shift
799 else 892 else
800 die "java-pkg_jar-from called with unknown parameter: ${1}" 893 die "java-pkg_jar-from called with unknown parameter: ${1}"
804 897
805 local target_pkg="${1}" target_jar="${2}" destjar="${3}" 898 local target_pkg="${1}" target_jar="${2}" destjar="${3}"
806 899
807 [[ -z ${target_pkg} ]] && die "Must specify a package" 900 [[ -z ${target_pkg} ]] && die "Must specify a package"
808 901
902 if [[ "${EAPI}" == "1" ]]; then
903 target_pkg="${target_pkg//:/-}"
904 fi
905
809 # default destjar to the target jar 906 # default destjar to the target jar
810 [[ -z "${destjar}" ]] && destjar="${target_jar}" 907 [[ -z "${destjar}" ]] && destjar="${target_jar}"
811 908
812 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}."
813 local classpath 910 local classpath
814 classpath="$(java-config ${deep} --classpath=${target_pkg})" 911 classpath="$(java-config ${deep} --classpath=${target_pkg})"
815 [[ $? != 0 ]] && die ${error_msg} 912 [[ $? != 0 ]] && die ${error_msg}
816 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
817 pushd ${destdir} > /dev/null \ 936 pushd ${destdir} > /dev/null \
818 || die "failed to change directory to ${destdir}" 937 || die "failed to change directory to ${destdir}"
938
819 local jar 939 local jar
820 for jar in ${classpath//:/ }; do 940 for jar in ${classpath//:/ }; do
821 local jar_name=$(basename "${jar}") 941 local jar_name=$(basename "${jar}")
822 if [[ ! -f "${jar}" ]] ; then 942 if [[ ! -f "${jar}" ]] ; then
823 debug-print "${jar} from ${target_pkg} does not exist" 943 debug-print "${jar} from ${target_pkg} does not exist"
885 debug-print-function ${FUNCNAME} $* 1005 debug-print-function ${FUNCNAME} $*
886 1006
887 local build_only="" 1007 local build_only=""
888 local deep="" 1008 local deep=""
889 1009
890 [[ "${EBUILD_PHASE}" == "test" ]] && build_only="true" 1010 [[ "${EBUILD_PHASE}" == "test" ]] && build_only="build"
891 1011
892 while [[ "${1}" == --* ]]; do 1012 while [[ "${1}" == --* ]]; do
893 if [[ "${1}" = "--build-only" ]]; then 1013 if [[ "${1}" = "--build-only" ]]; then
894 build_only="true" 1014 build_only="build"
895 elif [[ "${1}" = "--with-dependencies" ]]; then 1015 elif [[ "${1}" = "--with-dependencies" ]]; then
896 deep="--with-dependencies" 1016 deep="--with-dependencies"
897 else 1017 else
898 die "java-pkg_jar-from called with unknown parameter: ${1}" 1018 die "java-pkg_jar-from called with unknown parameter: ${1}"
899 fi 1019 fi
900 shift 1020 shift
901 done 1021 done
902 1022
903 [[ ${#} -ne 1 ]] && die "${FUNCNAME} takes only one argument besides --*" 1023 [[ ${#} -ne 1 ]] && die "${FUNCNAME} takes only one argument besides --*"
904 1024
1025
905 local classpath pkgs="${1}" 1026 local pkgs="${1}"
1027
1028 if [[ "${EAPI}" == "1" ]]; then
1029 pkgs="${pkgs//:/-}"
1030 fi
1031
906 jars="$(java-config ${deep} --classpath=${pkgs})" 1032 jars="$(java-config ${deep} --classpath=${pkgs})"
907 [[ -z "${jars}" ]] && die "java-config --classpath=${pkgs} failed" 1033 [[ $? != 0 ]] && die "java-config --classpath=${pkgs} failed"
908 debug-print "${pkgs}:${jars}" 1034 debug-print "${pkgs}:${jars}"
909 1035
910 if [[ -z "${classpath}" ]]; then 1036 for pkg in ${pkgs//,/ }; do
911 classpath="${jars}" 1037 java-pkg_ensure-dep "${build_only}" "${pkg}"
912 else 1038 done
913 classpath="${classpath}:${jars}"
914 fi
915 1039
916 # Only record jars that aren't build-only 1040 # Only record jars that aren't build-only
917 if [[ -z "${build_only}" ]]; then 1041 if [[ -z "${build_only}" ]]; then
918 oldifs="${IFS}"
919 IFS=","
920 for pkg in ${pkgs}; do 1042 for pkg in ${pkgs//,/ }; do
921 java-pkg_record-jar_ "${pkg}" 1043 java-pkg_record-jar_ "${pkg}"
922 done 1044 done
923 IFS="${oldifs}"
924 fi 1045 fi
925 1046
926 echo "${classpath}" 1047 echo "${jars}"
927} 1048}
928 1049
929# ------------------------------------------------------------------------------ 1050# ------------------------------------------------------------------------------
930# @ebuild-function java-pkg_getjar 1051# @ebuild-function java-pkg_getjar
931# 1052#
940# @example-return 1061# @example-return
941# /usr/share/xerces-2/lib/xml-apis.jar 1062# /usr/share/xerces-2/lib/xml-apis.jar
942# 1063#
943# @param $opt 1064# @param $opt
944# --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.
945# @param $1 - package to use 1068# @param $1 - package to use
946# @param $2 - jar to get 1069# @param $2 - jar to get
947# ------------------------------------------------------------------------------ 1070# ------------------------------------------------------------------------------
948java-pkg_getjar() { 1071java-pkg_getjar() {
949 debug-print-function ${FUNCNAME} $* 1072 debug-print-function ${FUNCNAME} $*
950 1073
951 local build_only="" 1074 local build_only=""
1075 local virtual=""
952 1076
953 [[ "${EBUILD_PHASE}" == "test" ]] && build_only="true" 1077 [[ "${EBUILD_PHASE}" == "test" ]] && build_only="build"
954 1078
955 while [[ "${1}" == --* ]]; do 1079 while [[ "${1}" == --* ]]; do
956 if [[ "${1}" = "--build-only" ]]; then 1080 if [[ "${1}" = "--build-only" ]]; then
957 build_only="true" 1081 build_only="build"
1082 elif [[ "${1}" == "--virtual" ]]; then
1083 virtual="true"
958 else 1084 else
959 die "java-pkg_jar-from called with unknown parameter: ${1}" 1085 die "java-pkg_getjar called with unknown parameter: ${1}"
960 fi 1086 fi
961 shift 1087 shift
962 done 1088 done
963 1089
964 [[ ${#} -ne 2 ]] && die "${FUNCNAME} takes only two arguments besides --*" 1090 [[ ${#} -ne 2 ]] && die "${FUNCNAME} takes only two arguments besides --*"
965 1091
966 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
967 [[ -z ${pkg} ]] && die "Must specify package to get a jar from" 1098 [[ -z ${pkg} ]] && die "Must specify package to get a jar from"
968 [[ -z ${target_jar} ]] && die "Must specify jar to get" 1099 [[ -z ${target_jar} ]] && die "Must specify jar to get"
969 1100
970 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?"
971 local classpath 1102 local classpath
972 classpath=$(java-config --classpath=${pkg}) 1103 classpath=$(java-config --classpath=${pkg})
973 [[ $? != 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
974 1114
975 for jar in ${classpath//:/ }; do 1115 for jar in ${classpath//:/ }; do
976 if [[ ! -f "${jar}" ]] ; then 1116 if [[ ! -f "${jar}" ]] ; then
977 die "Installation problem with jar ${jar} in ${pkg} - is it installed?" 1117 die "Installation problem with jar ${jar} in ${pkg} - is it installed?"
978 fi 1118 fi
985 fi 1125 fi
986 done 1126 done
987 1127
988 die "Could not find ${target_jar} in ${pkg}" 1128 die "Could not find ${target_jar} in ${pkg}"
989 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_
990} 1265}
991 1266
992# 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
993# populate jars from the filesystem. 1268# populate jars from the filesystem.
994# 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
1457 dodir /usr/share/ant/${TASKS_DIR} 1732 dodir /usr/share/ant/${TASKS_DIR}
1458 touch "${D}/usr/share/ant/${TASKS_DIR}/${TASK_NAME}" 1733 touch "${D}/usr/share/ant/${TASKS_DIR}/${TASK_NAME}"
1459} 1734}
1460 1735
1461# ------------------------------------------------------------------------------ 1736# ------------------------------------------------------------------------------
1462# @internal-function java-pkg_ant-tasks-from-deps
1463#
1464# Function to determine ANT_TASKS from DEPEND variable for backwards
1465# compatibility with ebuilds that don't set ANT_TASKS before calling eant() or
1466# WANT_ANT_TASKS before inheriting java-pkg-2. If the DEPEND string contains
1467# "dev-java/ant" or "dev-java/ant-tasks", then it returns "all", otherwise
1468# "none". It's not smart enough to cope with USE flag depends but that shouldn't
1469# be a problem, the worst it can do is activace all tasks when not needed.
1470# Note that this is called only with JAVA_PKG_STRICT=1, to find ebuilds with
1471# insufficient dependencies, otherwise all available tasks are used for
1472# backwards compatilbility.
1473#
1474# @return "all" or "none"
1475# ------------------------------------------------------------------------------
1476java-pkg_ant-tasks-from-deps() {
1477 local found_ant found_ant_tasks
1478
1479 for dep in ${DEPEND}
1480 do
1481 local ant="$(awk '/(dev-java\/ant)/ { if (match($1, "(dev-java/ant)((-[0-9])+|$)", m)) print m[1] }' <<< ${dep})"
1482 [[ "${ant}" == "dev-java/ant" ]] && found_ant=true
1483 [[ "${dep}" == *"ant-tasks"* ]] && found_ant_tasks=true
1484 done
1485
1486 if [[ -n "${found_ant}" || -n "${found_ant_tasks}" ]]; then
1487 java-pkg_announce-qa-violation "The ebuild DEPENDS on deprecated ant or ant-tasks"
1488 echo "all"
1489 else
1490 # ebuild doesn't set ANT_TASKS and doesn't depend on ant-tasks or ant
1491 # so we deactivate all tasks that may be installed
1492 echo "none"
1493 fi
1494}
1495
1496# ------------------------------------------------------------------------------
1497# @internal-function java-pkg_ant-tasks-depend 1737# @internal-function java-pkg_ant-tasks-depend
1498# 1738#
1499# Translates the WANT_ANT_TASKS variable into valid dependencies. 1739# Translates the WANT_ANT_TASKS variable into valid dependencies.
1500# ------------------------------------------------------------------------------ 1740# ------------------------------------------------------------------------------
1501java-pkg_ant-tasks-depend() { 1741java-pkg_ant-tasks-depend() {
1503 1743
1504 if [[ -n "${WANT_ANT_TASKS}" ]]; then 1744 if [[ -n "${WANT_ANT_TASKS}" ]]; then
1505 local DEP="" 1745 local DEP=""
1506 for i in ${WANT_ANT_TASKS} 1746 for i in ${WANT_ANT_TASKS}
1507 do 1747 do
1508 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
1509 echo "Invalid atom in WANT_ANT_TASKS: ${i}" 1753 echo "Invalid atom in WANT_ANT_TASKS: ${i}"
1510 return 1 1754 return 1
1511 fi 1755 fi
1512 DEP="${DEP}dev-java/${i} "
1513 done 1756 done
1514 echo ${DEP} 1757 echo ${DEP}
1515 return 0 1758 return 0
1516 else 1759 else
1517 return 0 1760 return 0
1518 fi 1761 fi
1519} 1762}
1520 1763
1521# ------------------------------------------------------------------------------ 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# ------------------------------------------------------------------------------
1522# @section-end helper 1802# @section-end helper
1523# ------------------------------------------------------------------------------ 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}
1524 1822
1525# ------------------------------------------------------------------------------ 1823# ------------------------------------------------------------------------------
1526# @section-begin build 1824# @section-begin build
1527# @section-summary Build functions 1825# @section-summary Build functions
1528# 1826#
1537# 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,
1538# variables: 1836# variables:
1539# 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
1540# gentoo.classpath property. Be sure to call 1838# gentoo.classpath property. Be sure to call
1541# 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
1542# *ANT_TASKS - used to determine ANT_TASKS before calling Ant. 1841# *ANT_TASKS - used to determine ANT_TASKS before calling Ant.
1543# ------------------------------------------------------------------------------ 1842# ------------------------------------------------------------------------------
1544eant() { 1843eant() {
1545 debug-print-function ${FUNCNAME} $* 1844 debug-print-function ${FUNCNAME} $*
1546 1845
1547 # FIXME get this working 1846 if [[ ${EBUILD_PHASE} = compile ]]; then
1548# if is-java-strict && [[ ! ${DEPEND} =~ "dev-java/ant" ]]; then 1847 java-ant-2_src_configure
1549# java-pkg_announce-qa-violation \ 1848 java-utils-2_src_prepare
1550# "Using eant, but not depending on dev-java/ant or dev-java/ant-core"
1551# fi 1849 fi
1552 1850
1553 if ! hasq java-ant-2 ${INHERITED} && is-java-strict; then 1851 if ! hasq java-ant-2 ${INHERITED}; then
1554 local msg="You should inherit java-ant-2 when using eant" 1852 local msg="You should inherit java-ant-2 when using eant"
1555 java-pkg_announce-qa-violation ${msg} 1853 java-pkg_announce-qa-violation "${msg}"
1556 die ${msg}
1557 fi 1854 fi
1558 1855
1559 local antflags="-Dnoget=true -Dmaven.mode.offline=true" 1856 local antflags="-Dnoget=true -Dmaven.mode.offline=true -Dbuild.sysclasspath=ignore"
1560 1857
1561 java-pkg_init-compiler_ 1858 java-pkg_init-compiler_
1562 local compiler="${GENTOO_COMPILER}" 1859 local compiler="${GENTOO_COMPILER}"
1563 1860
1564 local compiler_env="${JAVA_PKG_COMPILER_DIR}/${compiler}" 1861 local compiler_env="${JAVA_PKG_COMPILER_DIR}/${compiler}"
1565
1566 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})"
1567 if [[ "${compiler}" != "javac" && -z "${build_compiler}" ]]; then 1863 if [[ "${compiler}" != "javac" && -z "${build_compiler}" ]]; then
1568 die "ANT_BUILD_COMPILER undefined in ${compiler_env}" 1864 die "ANT_BUILD_COMPILER undefined in ${compiler_env}"
1569 fi 1865 fi
1570 1866
1576 # java-config -p 1872 # java-config -p
1577 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})"
1578 if [[ -n ${build_compiler_deps} ]]; then 1874 if [[ -n ${build_compiler_deps} ]]; then
1579 antflags="${antflags} -lib $(java-config -p ${build_compiler_deps})" 1875 antflags="${antflags} -lib $(java-config -p ${build_compiler_deps})"
1580 fi 1876 fi
1581 fi
1582
1583 if is-java-strict; then
1584 einfo "Disabling system classpath for ant"
1585 antflags="${antflags} -Dbuild.sysclasspath=ignore"
1586 fi 1877 fi
1587 1878
1588 for arg in "${@}"; do 1879 for arg in "${@}"; do
1589 if [[ ${arg} = -lib ]]; then 1880 if [[ ${arg} = -lib ]]; then
1590 if is-java-strict; then 1881 if is-java-strict; then
1599 echo "more info." 1890 echo "more info."
1600 fi 1891 fi
1601 fi 1892 fi
1602 done 1893 done
1603 1894
1604 if has_version ">=dev-java/ant-core-1.7.0"; then 1895 # parse WANT_ANT_TASKS for atoms
1605 # default ANT_TASKS to WANT_ANT_TASKS, if ANT_TASKS is not set explicitly 1896 local want_ant_tasks
1606 ANT_TASKS="${ANT_TASKS:-${WANT_ANT_TASKS}}" 1897 for i in ${WANT_ANT_TASKS}; do
1607 1898 if [[ ${i} = */*:* ]]; then
1608 # override ANT_TASKS with JAVA_PKG_FORCE_ANT_TASKS if it's set 1899 i=${i#*/}
1609 ANT_TASKS="${JAVA_PKG_FORCE_ANT_TASKS:-${ANT_TASKS}}" 1900 i=${i%:0}
1610 1901 want_ant_tasks+="${i/:/-} "
1611 if is-java-strict; then
1612 # if ant-tasks were not set by ebuild or forced, try to determine them from depends
1613 if [[ -z "${ANT_TASKS}" ]]; then
1614 ANT_TASKS="$(java-pkg_ant-tasks-from-deps)"
1615 fi
1616 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
1617 # 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
1618 ANT_TASKS="${ANT_TASKS:-all}" 1913 ANT_TASKS="${ANT_TASKS:-none}"
1619 fi
1620 1914
1621 # 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
1622 if [[ "${ANT_TASKS}" == "all" ]]; then 1916 if [[ "${ANT_TASKS}" == "all" ]]; then
1623 einfo "Using all available ANT_TASKS" 1917 einfo "Using all available ANT_TASKS"
1624 elif [[ "${ANT_TASKS}" == "none" ]]; then 1918 elif [[ "${ANT_TASKS}" == "none" ]]; then
1625 einfo "Disabling all optional ANT_TASKS" 1919 einfo "Disabling all optional ANT_TASKS"
1626 else 1920 else
1627 einfo "Using following ANT_TASKS: ${ANT_TASKS}" 1921 einfo "Using following ANT_TASKS: ${ANT_TASKS}"
1628 fi 1922 fi
1629 1923
1630 export ANT_TASKS 1924 export ANT_TASKS
1631 fi
1632 1925
1633 [[ -n ${JAVA_PKG_DEBUG} ]] && antflags="${antflags} --execdebug -debug" 1926 [[ -n ${JAVA_PKG_DEBUG} ]] && antflags="${antflags} --execdebug -debug"
1634 [[ -n ${PORTAGE_QUIET} ]] && antflags="${antflags} -q" 1927 [[ -n ${PORTAGE_QUIET} ]] && antflags="${antflags} -q"
1635 1928
1636 local gcp="${EANT_GENTOO_CLASSPATH}" 1929 local gcp="${EANT_GENTOO_CLASSPATH}"
1930 local getjarsarg=""
1637 1931
1638 if [[ ${EBUILD_PHASE} = "test" ]]; then 1932 if [[ ${EBUILD_PHASE} = "test" ]]; then
1639 antflags="${antflags} -DJunit.present=true" 1933 antflags="${antflags} -DJunit.present=true"
1640 [[ ${gcp} && ${ANT_TASKS} = *ant-junit* ]] && gcp="${gcp} junit" 1934 [[ ${ANT_TASKS} = *ant-junit* ]] && gcp="${gcp} junit"
1935 getjarsarg="--with-dependencies"
1641 fi 1936 fi
1642 1937
1643 local cp 1938 local cp
1644 1939
1645 for atom in ${gcp}; do 1940 for atom in ${gcp}; do
1646 cp="${cp}:$(java-pkg_getjars ${atom})" 1941 cp="${cp}:$(java-pkg_getjars ${getjarsarg} ${atom})"
1647 done 1942 done
1648 1943
1649 if [[ ${cp} ]]; then 1944 if [[ ${cp} ]]; then
1650 # 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}"
1651 antflags="${antflags} -Dgentoo.classpath=\"${cp#:}\"" 1949 antflags="${antflags} -Dgentoo.classpath=\"${cp}\""
1652 fi 1950 fi
1653 1951
1654 [[ -n ${JAVA_PKG_DEBUG} ]] && echo ant ${antflags} "${@}" 1952 [[ -n ${JAVA_PKG_DEBUG} ]] && echo ant ${antflags} "${@}"
1655 debug-print "Calling ant: ${antflags} ${@}" 1953 debug-print "Calling ant (GENTOO_VM: ${GENTOO_VM}): ${antflags} ${@}"
1656 ant ${antflags} "${@}" || die "eant failed" 1954 ant ${antflags} "${@}" || die "eant failed"
1657
1658} 1955}
1659 1956
1660# ------------------------------------------------------------------------------ 1957# ------------------------------------------------------------------------------
1661# @ebuild-function ejavac 1958# @ebuild-function ejavac
1662# 1959#
1757# 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
1758# call it during each of the phases of the merge process. 2055# call it during each of the phases of the merge process.
1759# 2056#
1760# ----------------------------------------------------------------------------- 2057# -----------------------------------------------------------------------------
1761java-pkg_init() { 2058java-pkg_init() {
2059 debug-print-function ${FUNCNAME} $*
1762 unset JAVAC 2060 unset JAVAC
1763 unset JAVA_HOME 2061 unset JAVA_HOME
2062
2063 # People do all kinds of weird things.
2064 # http://forums.gentoo.org/viewtopic-p-3943166.html
2065 local silence="${SILENCE_JAVA_OPTIONS_WARNING}"
2066 local accept="${I_WANT_GLOBAL_JAVA_OPTIONS}"
2067 if [[ -n ${_JAVA_OPTIONS} && -z ${accept} && -z ${silence} ]]; then
2068 ewarn "_JAVA_OPTIONS changes what java -version outputs at least for"
2069 ewarn "sun-jdk vms and and as such break configure scripts that"
2070 ewarn "use it (for example app-office/openoffice) so we filter it out."
2071 ewarn "Use SILENCE_JAVA_OPTIONS_WARNING=true in the environment (use"
2072 ewarn "make.conf for example) to silence this warning or"
2073 ewarn "I_WANT_GLOBAL_JAVA_OPTIONS to not filter it."
2074 fi
2075
2076 if [[ -z ${accept} ]]; then
2077 # export _JAVA_OPTIONS= doesn't work because it will show up in java
2078 # -version output
2079 unset _JAVA_OPTIONS
2080 # phase hooks make this run many times without this
2081 I_WANT_GLOBAL_JAVA_OPTIONS="true"
2082 fi
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
1764 java-pkg_init_paths_ 2088 java-pkg_init_paths_
1765 java-pkg_switch-vm 2089 java-pkg_switch-vm
1766 PATH=${JAVA_HOME}/bin:${PATH} 2090 PATH=${JAVA_HOME}/bin:${PATH}
1767 2091
1768 # TODO we will probably want to set JAVAC and JAVACFLAGS 2092 # TODO we will probably want to set JAVAC and JAVACFLAGS
1769 2093
1770 # Do some QA checks 2094 # Do some QA checks
1771 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
1772 2099
1773 # When users have crazy classpaths some packages can fail to compile. 2100 # When users have crazy classpaths some packages can fail to compile.
1774 # and everything should work with empty CLASSPATH. 2101 # and everything should work with empty CLASSPATH.
1775 # This also helps prevent unexpected dependencies on random things 2102 # This also helps prevent unexpected dependencies on random things
1776 # from the CLASSPATH. 2103 # from the CLASSPATH.
1777 unset CLASSPATH 2104 export CLASSPATH=
1778 2105
1779 # Unset external ANT_ stuff 2106 # Unset external ANT_ stuff
1780 unset ANT_TASKS 2107 export ANT_TASKS=
1781 unset ANT_OPTS 2108 export ANT_OPTS=
1782} 2109}
1783 2110
1784# ------------------------------------------------------------------------------ 2111# ------------------------------------------------------------------------------
1785# @function-internal java-pkg-init-compiler_ 2112# @function-internal java-pkg-init-compiler_
1786# 2113#
1877 done 2204 done
1878 2205
1879 # If it hasn't been defined already, default to javac 2206 # If it hasn't been defined already, default to javac
1880 if [[ -z ${GENTOO_COMPILER} ]]; then 2207 if [[ -z ${GENTOO_COMPILER} ]]; then
1881 if [[ -n ${compilers} ]]; then 2208 if [[ -n ${compilers} ]]; then
1882 einfo "No suitable compiler found: defaulting javac for compilation" 2209 einfo "No suitable compiler found: defaulting to JDK default for compilation"
1883 else 2210 else
1884 # probably don't need to notify users about the default. 2211 # probably don't need to notify users about the default.
1885 :;#einfo "Defaulting to javac for compilation" 2212 :;#einfo "Defaulting to javac for compilation"
1886 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
1887 export GENTOO_COMPILER=javac 2217 export GENTOO_COMPILER=javac
2218 fi
1888 else 2219 else
1889 einfo "Using ${GENTOO_COMPILER} for compilation" 2220 einfo "Using ${GENTOO_COMPILER} for compilation"
1890 fi 2221 fi
1891 2222
1892} 2223}
1908 fi 2239 fi
1909 2240
1910 JAVA_PKG_SHAREPATH="${DESTTREE}/share/${JAVA_PKG_NAME}" 2241 JAVA_PKG_SHAREPATH="${DESTTREE}/share/${JAVA_PKG_NAME}"
1911 JAVA_PKG_SOURCESPATH="${JAVA_PKG_SHAREPATH}/sources/" 2242 JAVA_PKG_SOURCESPATH="${JAVA_PKG_SHAREPATH}/sources/"
1912 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}"
1913 2246
1914 [[ -z "${JAVA_PKG_JARDEST}" ]] && JAVA_PKG_JARDEST="${JAVA_PKG_SHAREPATH}/lib" 2247 [[ -z "${JAVA_PKG_JARDEST}" ]] && JAVA_PKG_JARDEST="${JAVA_PKG_SHAREPATH}/lib"
1915 [[ -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}"
1916 [[ -z "${JAVA_PKG_WARDEST}" ]] && JAVA_PKG_WARDEST="${JAVA_PKG_SHAREPATH}/webapps" 2249 [[ -z "${JAVA_PKG_WARDEST}" ]] && JAVA_PKG_WARDEST="${JAVA_PKG_SHAREPATH}/webapps"
1917 2250
1930# Writes the package.env out to disk. 2263# Writes the package.env out to disk.
1931# 2264#
1932# ------------------------------------------------------------------------------ 2265# ------------------------------------------------------------------------------
1933# TODO change to do-write, to match everything else 2266# TODO change to do-write, to match everything else
1934java-pkg_do_write_() { 2267java-pkg_do_write_() {
2268 debug-print-function ${FUNCNAME} $*
1935 java-pkg_init_paths_ 2269 java-pkg_init_paths_
1936 # Create directory for package.env 2270 # Create directory for package.env
1937 dodir "${JAVA_PKG_SHAREPATH}" 2271 dodir "${JAVA_PKG_SHAREPATH}"
1938 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
1939 # Create package.env 2275 # Create package.env
1940 ( 2276 (
1941 echo "DESCRIPTION=\"${DESCRIPTION}\"" 2277 echo "DESCRIPTION=\"${DESCRIPTION}\""
1942 echo "GENERATION=\"2\"" 2278 echo "GENERATION=\"2\""
2279 echo "SLOT=\"${SLOT}\""
1943 2280
1944 [[ -n "${JAVA_PKG_CLASSPATH}" ]] && echo "CLASSPATH=\"${JAVA_PKG_CLASSPATH}\"" 2281 [[ -n "${JAVA_PKG_CLASSPATH}" ]] && echo "CLASSPATH=\"${JAVA_PKG_CLASSPATH}\""
1945 [[ -n "${JAVA_PKG_LIBRARY}" ]] && echo "LIBRARY_PATH=\"${JAVA_PKG_LIBRARY}\"" 2282 [[ -n "${JAVA_PKG_LIBRARY}" ]] && echo "LIBRARY_PATH=\"${JAVA_PKG_LIBRARY}\""
1946 [[ -n "${JAVA_PROVIDE}" ]] && echo "PROVIDES=\"${JAVA_PROVIDE}\"" 2283 [[ -n "${JAVA_PROVIDE}" ]] && echo "PROVIDES=\"${JAVA_PROVIDE}\""
1947 [[ -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' ':')\""
1948 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 !
1949 ) > "${JAVA_PKG_ENV}" 2289 ) > "${JAVA_PKG_ENV}"
1950 2290
1951 # register target/source 2291 # register target/source
1952 local target="$(java-pkg_get-target)" 2292 local target="$(java-pkg_get-target)"
1963 2303
1964 2304
1965 echo "MERGE_VM=\"${GENTOO_VM}\"" >> "${JAVA_PKG_ENV}" 2305 echo "MERGE_VM=\"${GENTOO_VM}\"" >> "${JAVA_PKG_ENV}"
1966 [[ -n ${GENTOO_COMPILER} ]] && echo "MERGE_COMPILER=\"${GENTOO_COMPILER}\"" >> "${JAVA_PKG_ENV}" 2306 [[ -n ${GENTOO_COMPILER} ]] && echo "MERGE_COMPILER=\"${GENTOO_COMPILER}\"" >> "${JAVA_PKG_ENV}"
1967 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
1968 # Strip unnecessary leading and trailing colons 2316 # Strip unnecessary leading and trailing colons
1969 # TODO try to cleanup if possible 2317 # TODO try to cleanup if possible
1970 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."
1971 fi 2323 fi
1972} 2324}
1973 2325
1974# ------------------------------------------------------------------------------ 2326# ------------------------------------------------------------------------------
1975# @internal-function java-pkg_record-jar_ 2327# @internal-function java-pkg_record-jar_
1976# 2328#
1977# Record a dependency to the package.env 2329# Record an (optional) dependency to the package.env
1978# 2330# @param --optional - record dependency as optional
2331# @param $1 - package to record
2332# @param $2 - (optional) jar of package to record
1979# ------------------------------------------------------------------------------ 2333# ------------------------------------------------------------------------------
1980JAVA_PKG_DEPEND="${T}/java-pkg-depend" 2334JAVA_PKG_DEPEND_FILE="${T}/java-pkg-depend"
2335JAVA_PKG_OPTIONAL_DEPEND_FILE="${T}/java-pkg-optional-depend"
1981 2336
1982java-pkg_record-jar_() { 2337java-pkg_record-jar_() {
1983 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
1984 2345
1985 local pkg=${1} jar=${2} append 2346 local pkg=${1} jar=${2} append
1986 if [[ -z "${jar}" ]]; then 2347 if [[ -z "${jar}" ]]; then
1987 append="${pkg}" 2348 append="${pkg}"
1988 else 2349 else
1989 append="$(basename ${jar})@${pkg}" 2350 append="$(basename ${jar})@${pkg}"
1990 fi 2351 fi
1991 2352
1992 echo ${append} >> ${JAVA_PKG_DEPEND} 2353 echo "${append}" >> "${depend_file}"
1993} 2354}
1994 2355
1995# ------------------------------------------------------------------------------ 2356# ------------------------------------------------------------------------------
1996# @internal-function java-pkg_append_ 2357# @internal-function java-pkg_append_
1997# 2358#
2057# 2418#
2058# ------------------------------------------------------------------------------ 2419# ------------------------------------------------------------------------------
2059java-pkg_setup-vm() { 2420java-pkg_setup-vm() {
2060 debug-print-function ${FUNCNAME} $* 2421 debug-print-function ${FUNCNAME} $*
2061 2422
2423 export LANG="C" LC_ALL="C"
2424
2062 local vendor="$(java-pkg_get-vm-vendor)" 2425 local vendor="$(java-pkg_get-vm-vendor)"
2063 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
2064 addpredict "/dev/random" 2427 addpredict "/dev/random"
2065 elif [[ "${vendor}" == "ibm" ]]; then 2428 elif [[ "${vendor}" == "ibm" ]]; then
2066 addpredict "/proc/self/maps" 2429 addpredict "/proc/self/maps"
2067 addpredict "/proc/cpuinfo" 2430 addpredict "/proc/cpuinfo"
2068 export LANG="C" LC_ALL="C"
2069 elif [[ "${vendor}" == "jrockit" ]]; then 2431 elif [[ "${vendor}" == "jrockit" ]]; then
2070 addpredict "/proc/cpuinfo" 2432 addpredict "/proc/cpuinfo"
2071 fi 2433 fi
2072} 2434}
2073 2435
2177 2539
2178 #TODO If you know a better solution let us know. 2540 #TODO If you know a better solution let us know.
2179 java-pkg_append_ LD_LIBRARY_PATH "$(java-config -g LDPATH)" 2541 java-pkg_append_ LD_LIBRARY_PATH "$(java-config -g LDPATH)"
2180 2542
2181 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
2182 if [[ -n "${JAVA_PKG_DEBUG}" ]] || [[ ! -f "${tann}" ]] ; then 2546 if [[ -n "${JAVA_PKG_DEBUG}" ]] || [[ ! -f "${tann}" ]] ; then
2183 # Add a check for setup/preinst phase... to avoid duplicate outputs
2184 # for when FEATURES=buildpkg
2185 if [[ ${EBUILD_PHASE} != "setup" && ${EBUILD_PHASE} != "preinst" && ${EBUILD_PHASE} != "postinst" ]];
2186 then
2187 einfo "Using: $(java-config -f)" 2547 einfo "Using: $(java-config -f)"
2188 [[ ! -f "${tann}" ]] && touch "${tann}" 2548 [[ ! -f "${tann}" ]] && touch "${tann}"
2189 fi
2190 fi 2549 fi
2191 2550
2192 else 2551 else
2193 [[ -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!!!"
2194 fi 2553 fi
2233# not. 2592# not.
2234# @param $1 (optional) - the file to check, otherwise checks whole ${D} 2593# @param $1 (optional) - the file to check, otherwise checks whole ${D}
2235# ------------------------------------------------------------------------------ 2594# ------------------------------------------------------------------------------
2236java-pkg_verify-classes() { 2595java-pkg_verify-classes() {
2237 #$(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
2238 local target=$(java-pkg_get-target) 2611 local target=$(java-pkg_get-target)
2239 local result 2612 local result
2240 local log="${T}/class-version-verify.log" 2613 local log="${T}/class-version-verify.log"
2241 if [[ -n "${1}" ]]; then 2614 if [[ -n "${1}" ]]; then
2242 class-version-verify.py -v -t ${target} "${1}" > "${log}" 2615 ${version_verify} -v -t ${target} "${1}" > "${log}"
2243 result=$? 2616 result=$?
2244 else 2617 else
2245 ebegin "Verifying java class versions (target: ${target})" 2618 ebegin "Verifying java class versions (target: ${target})"
2246 class-version-verify.py -v -t ${target} -r "${D}" > "${log}" 2619 ${version_verify} -v -t ${target} -r "${D}" > "${log}"
2247 result=$? 2620 result=$?
2248 eend ${result} 2621 eend ${result}
2249 fi 2622 fi
2250 [[ -n ${JAVA_PKG_DEBUG} ]] && cat "${log}" 2623 [[ -n ${JAVA_PKG_DEBUG} ]] && cat "${log}"
2251 if [[ ${result} != 0 ]]; then 2624 if [[ ${result} != 0 ]]; then
2254 eerror "See ${log} for more details." 2627 eerror "See ${log} for more details."
2255 die "Incorrect bytecode found" 2628 die "Incorrect bytecode found"
2256 fi 2629 fi
2257} 2630}
2258 2631
2632# ----------------------------------------------------------------------------
2633# @internal-function java-pkg_ensure-dep
2634# Check that a package being used in jarfrom, getjars and getjar is contained
2635# within DEPEND or RDEPEND.
2636# @param $1 - empty - check both vars; "runtime" or "build" - check only
2637# RDEPEND, resp. DEPEND
2638# @param $2 - Package name and slot.
2639
2640java-pkg_ensure-dep() {
2641 debug-print-function ${FUNCNAME} $*
2642
2643 local limit_to="${1}"
2644 local target_pkg="${2}"
2645 local dev_error=""
2646
2647 local stripped_pkg=$(echo "${target_pkg}" | sed \
2648 's/-[0-9]*\(\.[0-9]\)*$//')
2649
2650 debug-print "Matching against: ${stripped_pkg}"
2651
2652 if [[ ${limit_to} != runtime && ! ( "${DEPEND}" =~ "$stripped_pkg" ) ]]; then
2653 dev_error="The ebuild is attempting to use ${target_pkg} that is not"
2654 dev_error="${dev_error} declared in DEPEND."
2655 if is-java-strict; then
2656 eerror "${dev_error}"
2657 die "${dev_error}"
2658 elif [[ ${BASH_SUBSHELL} = 0 ]]; then
2659 eerror "${dev_error}"
2660 elog "Because you have this package installed the package will"
2661 elog "build without problems, but please report this to"
2662 elog "http://bugs.gentoo.org"
2663 fi
2664 fi
2665
2666 if [[ ${limit_to} != build ]]; then
2667 if [[ ! ( ${RDEPEND} =~ "${stripped_pkg}" ) ]]; then
2668 if [[ ! ( ${PDEPEND} =~ "${stripped_pkg}" ) ]]; then
2669 dev_error="The ebuild is attempting to use ${target_pkg},"
2670 dev_error="${dev_error} without specifying --build-only, that is not declared in RDEPEND"
2671 dev_error="${dev_error} or PDEPEND."
2672 if is-java-strict; then
2673 eerror "${dev_error}"
2674 die "${dev_error}"
2675 elif [[ ${BASH_SUBSHELL} = 0 ]]; then
2676 eerror "${dev_error}"
2677 elog "The package will build without problems, but may fail to run"
2678 elog "if you don't have ${target_pkg} installed, so please report"
2679 elog "this to http://bugs.gentoo.org"
2680 fi
2681 fi
2682 fi
2683 fi
2684}
2685
2259# ------------------------------------------------------------------------------ 2686# ------------------------------------------------------------------------------
2260# @section-end internal 2687# @section-end internal
2261# ------------------------------------------------------------------------------ 2688# ------------------------------------------------------------------------------
2262 2689
2263java-pkg_check-phase() { 2690java-pkg_check-phase() {
2264 local phase=${1} 2691 local phase=${1}
2265 local funcname=${2} 2692 local funcname=${FUNCNAME[1]}
2266 if is-java-strict && [[ ${EBUILD_PHASE} != ${phase} ]]; then 2693 if [[ ${EBUILD_PHASE} != ${phase} ]]; then
2267 java-pkg_announce-qa-violation \
2268 "${funcname} used outside of src_${phase}" 2694 local msg="${funcname} used outside of src_${phase}"
2695 java-pkg_announce-qa-violation "${msg}"
2269 fi 2696 fi
2270} 2697}
2271 2698
2272java-pkg_check-versioned-jar() { 2699java-pkg_check-versioned-jar() {
2273 local jar=${1} 2700 local jar=${1}
2282 java-pkg_announce-qa-violation "deprecated USE flag 'jikes' in IUSE" 2709 java-pkg_announce-qa-violation "deprecated USE flag 'jikes' in IUSE"
2283 fi 2710 fi
2284} 2711}
2285 2712
2286java-pkg_announce-qa-violation() { 2713java-pkg_announce-qa-violation() {
2287 if is-java-strict; then 2714 local nodie
2715 if [[ ${1} == "--nodie" ]]; then
2716 nodie="true"
2717 shift
2718 fi
2288 echo "Java QA Notice: $@" >&2 2719 echo "Java QA Notice: $@" >&2
2289 increment-qa-violations 2720 increment-qa-violations
2290 fi 2721 [[ -z "${nodie}" ]] && is-java-strict && die "${@}"
2291} 2722}
2292 2723
2293increment-qa-violations() { 2724increment-qa-violations() {
2294 let "JAVA_PKG_QA_VIOLATIONS+=1" 2725 let "JAVA_PKG_QA_VIOLATIONS+=1"
2295 export JAVA_PKG_QA_VIOLATIONS 2726 export JAVA_PKG_QA_VIOLATIONS
2298is-java-strict() { 2729is-java-strict() {
2299 [[ -n ${JAVA_PKG_STRICT} ]] 2730 [[ -n ${JAVA_PKG_STRICT} ]]
2300 return $? 2731 return $?
2301} 2732}
2302 2733
2734[[ "${EAPI}" = "2" ]] && EXPORT_FUNCTIONS src_prepare
2735
2303# ------------------------------------------------------------------------------ 2736# ------------------------------------------------------------------------------
2304# @eclass-end 2737# @eclass-end
2305# ------------------------------------------------------------------------------ 2738# ------------------------------------------------------------------------------

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

  ViewVC Help
Powered by ViewVC 1.1.20