/[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.58 Revision 1.127
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.58 2007/02/28 10:45:20 betelgeuse Exp $ 9# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.127 2009/05/19 21:23:32 caster Exp $
10
11 10
12# ----------------------------------------------------------------------------- 11# -----------------------------------------------------------------------------
13# @eclass-begin 12# @eclass-begin
14# @eclass-shortdesc Java Utility eclass 13# @eclass-shortdesc Java Utility eclass
15# @eclass-maintainer java@gentoo.org 14# @eclass-maintainer java@gentoo.org
55# 54#
56# @seealso JAVA_PKG_FORCE_ANT_TASKS 55# @seealso JAVA_PKG_FORCE_ANT_TASKS
57# ----------------------------------------------------------------------------- 56# -----------------------------------------------------------------------------
58#WANT_ANT_TASKS 57#WANT_ANT_TASKS
59 58
59# -----------------------------------------------------------------------------
60# @variable-internal JAVA_PKG_PORTAGE_DEP 60# @variable-internal JAVA_PKG_PORTAGE_DEP
61# 61#
62# The version of portage we need to function properly. At this moment it's 62# The version of portage we need to function properly. Previously it was
63# portage with phase hooks support. 63# portage with phase hooks support but now we use a version with proper env
64# saving. For EAPI 2 we have new enough stuff so let's have cleaner deps.
64# ----------------------------------------------------------------------------- 65# -----------------------------------------------------------------------------
65JAVA_PKG_PORTAGE_DEP=">=sys-apps/portage-2.1_pre1" 66hasq "${EAPI}" 0 1 && JAVA_PKG_PORTAGE_DEP=">=sys-apps/portage-2.1.2.7"
66 67
67# ----------------------------------------------------------------------------- 68# -----------------------------------------------------------------------------
68# @variable-internal JAVA_PKG_E_DEPEND 69# @variable-internal JAVA_PKG_E_DEPEND
69# 70#
70# This is a convience variable to be used from the other java eclasses. This is 71# This is a convience variable to be used from the other java eclasses. This is
71# the version of java-config we want to use. We also need a recent version 72# the version of java-config we want to use. Usually the latest stable version
72# portage, that includes phase hooks. 73# so that ebuilds can use new features without depending on specific versions.
73# ----------------------------------------------------------------------------- 74# -----------------------------------------------------------------------------
74JAVA_PKG_E_DEPEND=">=dev-java/java-config-2.0.31 ${JAVA_PKG_PORTAGE_DEP}" 75JAVA_PKG_E_DEPEND=">=dev-java/java-config-2.1.6 ${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
370 debug-print "${jar} or ${D}${jar} not found"
322 die "${jar} does not exist" 371 die "${jar} does not exist"
323 fi 372 fi
324 done 373 done
325 374
326 java-pkg_do_write_ 375 java-pkg_do_write_
381# @param $@ - JNI libraries to install 430# @param $@ - JNI libraries to install
382# ------------------------------------------------------------------------------ 431# ------------------------------------------------------------------------------
383java-pkg_doso() { 432java-pkg_doso() {
384 debug-print-function ${FUNCNAME} $* 433 debug-print-function ${FUNCNAME} $*
385 434
386 [[ ${#} -lt 1 ]] && "At least one argument required for ${FUNCNAME}"
387 java-pkg_check-phase install 435 java-pkg_check-phase install
388 436
389 [[ ${#} -lt 1 ]] && die "At least one argument required for ${FUNCNAME}" 437 [[ ${#} -lt 1 ]] && die "${FUNCNAME} requires at least one argument"
390 438
391 java-pkg_init_paths_ 439 java-pkg_init_paths_
392 440
393 local lib 441 local lib
394 # for each lib 442 # for each lib
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 dosym "$(readlink "${lib}")" "${JAVA_PKG_LIBDEST}/${lib##*/}"
408 ln -s "$(readlink "${lib}")" \
409 "${D}${JAVA_PKG_LIBDEST}/$(basename "${lib}")"
410 debug-print "${lib} is a symlink, linking accordanly" 456 debug-print "${lib} is a symlink, linking accordantly"
411 fi 457 fi
412 # otherwise die 458 # otherwise die
413 else 459 else
414 die "${lib} does not exist" 460 die "${lib} does not exist"
415 fi 461 fi
431java-pkg_regso() { 477java-pkg_regso() {
432 debug-print-function ${FUNCNAME} $* 478 debug-print-function ${FUNCNAME} $*
433 479
434 java-pkg_check-phase install 480 java-pkg_check-phase install
435 481
436 [[ ${#} -lt 1 ]] && "at least one argument needed" 482 [[ ${#} -lt 1 ]] && die "${FUNCNAME} requires at least one argument"
437 483
438 java-pkg_init_paths_ 484 java-pkg_init_paths_
439 485
440 local lib target_dir 486 local lib target_dir
441 for lib in "$@" ; do 487 for lib in "$@" ; do
508# ------------------------------------------------------------------------------ 554# ------------------------------------------------------------------------------
509# @ebuild-function java-pkg_dojavadoc 555# @ebuild-function java-pkg_dojavadoc
510# 556#
511# Installs javadoc documentation. This should be controlled by the doc use flag. 557# Installs javadoc documentation. This should be controlled by the doc use flag.
512# 558#
559# @param $1: optional --symlink creates to symlink like this for html
560# documentation bundles.
513# @param $1: - The javadoc root directory. 561# @param $2: - The javadoc root directory.
514# 562#
515# @example: 563# @example:
516# java-pkg_dojavadoc docs/api 564# java-pkg_dojavadoc docs/api
565# java-pkg_dojavadoc --symlink apidocs docs/api
517# 566#
518# ------------------------------------------------------------------------------ 567# ------------------------------------------------------------------------------
519java-pkg_dojavadoc() { 568java-pkg_dojavadoc() {
569 debug-print-function ${FUNCNAME} $*
570
571 # For html documentation bundles that link to Javadoc
572 local symlink
573 if [[ ${1} = --symlink ]]; then
574 symlink=${2}
575 shift 2
576 fi
577
520 local dir="$1" 578 local dir="$1"
579 local dest=/usr/share/doc/${PF}/html
580
581 # QA checks
521 582
522 java-pkg_check-phase install 583 java-pkg_check-phase install
523 584
524 [[ -z "${dir}" ]] && die "Must specify a directory!" 585 [[ -z "${dir}" ]] && die "Must specify a directory!"
525 [[ ! -d "${dir}" ]] && die "${dir} does not exist, or isn't a directory!" 586 [[ ! -d "${dir}" ]] && die "${dir} does not exist, or isn't a directory!"
587 if [[ ! -e "${dir}/index.html" ]]; then
588 local msg="No index.html in javadoc directory"
589 ewarn "${msg}"
590 is-java-strict && die "${msg}"
591 fi
592
593 if [[ -e ${D}/${dest}/api ]]; then
594 eerror "${dest} already exists. Will not overwrite."
595 die "${dest}"
596 fi
597
598 # Renaming to match our directory layout
526 599
527 local dir_to_install="${dir}" 600 local dir_to_install="${dir}"
528 if [[ "$(basename "${dir}")" != "api" ]]; then 601 if [[ "$(basename "${dir}")" != "api" ]]; then
529 dir_to_install="${T}/api" 602 dir_to_install="${T}/api"
530 # TODO use doins 603 # TODO use doins
531 cp -r "${dir}" "${dir_to_install}" || die "cp failed" 604 cp -r "${dir}" "${dir_to_install}" || die "cp failed"
532 fi 605 fi
533 606
607 # Actual installation
608
534 java-pkg_dohtml -r ${dir_to_install} 609 java-pkg_dohtml -r "${dir_to_install}"
610
611 # Let's make a symlink to the directory we have everything else under
612 dosym ${dest}/api "${JAVA_PKG_SHAREPATH}/api" || die
613
614 if [[ ${symlink} ]]; then
615 debug-print "symlinking ${dest}/{api,${symlink}}"
616 dosym ${dest}/{api,${symlink}} || die
617 fi
535} 618}
536 619
537# ------------------------------------------------------------------------------ 620# ------------------------------------------------------------------------------
538# @ebuild-function java-pkg_dosrc 621# @ebuild-function java-pkg_dosrc
539# 622#
555# FIXME apparently this fails if you give it an empty directories 638# FIXME apparently this fails if you give it an empty directories
556java-pkg_dosrc() { 639java-pkg_dosrc() {
557 debug-print-function ${FUNCNAME} $* 640 debug-print-function ${FUNCNAME} $*
558 641
559 [ ${#} -lt 1 ] && die "At least one argument needed" 642 [ ${#} -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 643
564 java-pkg_check-phase install 644 java-pkg_check-phase install
565 645
566 [[ ${#} -lt 1 ]] && die "At least one argument needed" 646 [[ ${#} -lt 1 ]] && die "At least one argument needed"
647
648 if ! [[ ${DEPEND} = *app-arch/zip* ]]; then
649 local msg="${FUNCNAME} called without app-arch/zip in DEPEND"
650 java-pkg_announce-qa-violation ${msg}
651 fi
567 652
568 java-pkg_init_paths_ 653 java-pkg_init_paths_
569 654
570 local zip_name="${PN}-src.zip" 655 local zip_name="${PN}-src.zip"
571 local zip_path="${T}/${zip_name}" 656 local zip_path="${T}/${zip_name}"
765# Example: get a specific jar from xerces slot 2, and name it diffrently 850# Example: get a specific jar from xerces slot 2, and name it diffrently
766# java-pkg_jar-from xerces-2 xml-apis.jar xml.jar 851# java-pkg_jar-from xerces-2 xml-apis.jar xml.jar
767# Example: get junit.jar which is needed only for building 852# Example: get junit.jar which is needed only for building
768# java-pkg_jar-from --build-only junit junit.jar 853# java-pkg_jar-from --build-only junit junit.jar
769# 854#
770# @param $opt 855# @param $opt
771# --build-only - makes the jar(s) not added into package.env DEPEND line. 856# --build-only - makes the jar(s) not added into package.env DEPEND line.
772# (assumed automatically when called inside src_test) 857# (assumed automatically when called inside src_test)
773# --with-dependencies - get jars also from requested package's dependencies 858# --with-dependencies - get jars also from requested package's dependencies
774# transitively. 859# transitively.
860# --virtual - Packages passed to this function are to be handled as virtuals
861# and will not have individual jar dependencies recorded.
775# --into $dir - symlink jar(s) into $dir (must exist) instead of . 862# --into $dir - symlink jar(s) into $dir (must exist) instead of .
776# @param $1 - Package to get jars from. 863# @param $1 - Package to get jars from, or comma-separated list of packages in
864# case other parameters are not used.
777# @param $2 - jar from package. If not specified, all jars will be used. 865# @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 866# @param $3 - When a single jar is specified, destination filename of the
779# symlink. Defaults to the name of the jar. 867# symlink. Defaults to the name of the jar.
780# ------------------------------------------------------------------------------ 868# ------------------------------------------------------------------------------
781# TODO could probably be cleaned up a little 869# TODO could probably be cleaned up a little
783 debug-print-function ${FUNCNAME} $* 871 debug-print-function ${FUNCNAME} $*
784 872
785 local build_only="" 873 local build_only=""
786 local destdir="." 874 local destdir="."
787 local deep="" 875 local deep=""
788 876 local virtual=""
877
789 [[ "${EBUILD_PHASE}" == "test" ]] && build_only="true" 878 [[ "${EBUILD_PHASE}" == "test" ]] && build_only="build"
790 879
791 while [[ "${1}" == --* ]]; do 880 while [[ "${1}" == --* ]]; do
792 if [[ "${1}" = "--build-only" ]]; then 881 if [[ "${1}" = "--build-only" ]]; then
793 build_only="true" 882 build_only="build"
794 elif [[ "${1}" = "--with-dependencies" ]]; then 883 elif [[ "${1}" = "--with-dependencies" ]]; then
795 deep="--with-dependencies" 884 deep="--with-dependencies"
885 elif [[ "${1}" = "--virtual" ]]; then
886 virtual="true"
796 elif [[ "${1}" = "--into" ]]; then 887 elif [[ "${1}" = "--into" ]]; then
797 destdir="${2}" 888 destdir="${2}"
798 shift 889 shift
799 else 890 else
800 die "java-pkg_jar-from called with unknown parameter: ${1}" 891 die "java-pkg_jar-from called with unknown parameter: ${1}"
804 895
805 local target_pkg="${1}" target_jar="${2}" destjar="${3}" 896 local target_pkg="${1}" target_jar="${2}" destjar="${3}"
806 897
807 [[ -z ${target_pkg} ]] && die "Must specify a package" 898 [[ -z ${target_pkg} ]] && die "Must specify a package"
808 899
900 if [[ "${EAPI}" == "1" ]]; then
901 target_pkg="${target_pkg//:/-}"
902 fi
903
809 # default destjar to the target jar 904 # default destjar to the target jar
810 [[ -z "${destjar}" ]] && destjar="${target_jar}" 905 [[ -z "${destjar}" ]] && destjar="${target_jar}"
811 906
812 local error_msg="There was a problem getting the classpath for ${target_pkg}." 907 local error_msg="There was a problem getting the classpath for ${target_pkg}."
813 local classpath 908 local classpath
814 classpath="$(java-config ${deep} --classpath=${target_pkg})" 909 classpath="$(java-config ${deep} --classpath=${target_pkg})"
815 [[ $? != 0 ]] && die ${error_msg} 910 [[ $? != 0 ]] && die ${error_msg}
816 911
912 # When we have commas this functions is called to bring jars from multiple
913 # packages. This affects recording of dependencencies performed later
914 # which expects one package only, so we do it here.
915 if [[ ${target_pkg} = *,* ]]; then
916 for pkg in ${target_pkg//,/ }; do
917 java-pkg_ensure-dep "${build_only}" "${pkg}"
918 [[ -z "${build_only}" ]] && java-pkg_record-jar_ "${pkg}"
919 done
920 # setting this disables further record-jar_ calls later
921 build_only="build"
922 else
923 java-pkg_ensure-dep "${build_only}" "${target_pkg}"
924 fi
925
926 # Record the entire virtual as a dependency so that
927 # no jars are missed.
928 if [[ -z "${build_only}" && -n "${virtual}" ]]; then
929 java-pkg_record-jar_ "${target_pkg}"
930 # setting this disables further record-jars_ calls later
931 build_only="build"
932 fi
933
817 pushd ${destdir} > /dev/null \ 934 pushd ${destdir} > /dev/null \
818 || die "failed to change directory to ${destdir}" 935 || die "failed to change directory to ${destdir}"
936
819 local jar 937 local jar
820 for jar in ${classpath//:/ }; do 938 for jar in ${classpath//:/ }; do
821 local jar_name=$(basename "${jar}") 939 local jar_name=$(basename "${jar}")
822 if [[ ! -f "${jar}" ]] ; then 940 if [[ ! -f "${jar}" ]] ; then
823 debug-print "${jar} from ${target_pkg} does not exist" 941 debug-print "${jar} from ${target_pkg} does not exist"
871# Example: Get the classpath for xerces-2 and xalan, 989# Example: Get the classpath for xerces-2 and xalan,
872# java-pkg_getjars xerces-2,xalan 990# java-pkg_getjars xerces-2,xalan
873# Example Return: 991# Example Return:
874# /usr/share/xerces-2/lib/xml-apis.jar:/usr/share/xerces-2/lib/xmlParserAPIs.jar:/usr/share/xalan/lib/xalan.jar 992# /usr/share/xerces-2/lib/xml-apis.jar:/usr/share/xerces-2/lib/xmlParserAPIs.jar:/usr/share/xalan/lib/xalan.jar
875# 993#
876# @param $opt 994# @param $opt
877# --build-only - makes the jar(s) not added into package.env DEPEND line. 995# --build-only - makes the jar(s) not added into package.env DEPEND line.
878# (assumed automatically when called inside src_test) 996# (assumed automatically when called inside src_test)
879# --with-dependencies - get jars also from requested package's dependencies 997# --with-dependencies - get jars also from requested package's dependencies
880# transitively. 998# transitively.
881# @param $1 - list of packages to get jars from 999# @param $1 - list of packages to get jars from
884java-pkg_getjars() { 1002java-pkg_getjars() {
885 debug-print-function ${FUNCNAME} $* 1003 debug-print-function ${FUNCNAME} $*
886 1004
887 local build_only="" 1005 local build_only=""
888 local deep="" 1006 local deep=""
889 1007
890 [[ "${EBUILD_PHASE}" == "test" ]] && build_only="true" 1008 [[ "${EBUILD_PHASE}" == "test" ]] && build_only="build"
891 1009
892 while [[ "${1}" == --* ]]; do 1010 while [[ "${1}" == --* ]]; do
893 if [[ "${1}" = "--build-only" ]]; then 1011 if [[ "${1}" = "--build-only" ]]; then
894 build_only="true" 1012 build_only="build"
895 elif [[ "${1}" = "--with-dependencies" ]]; then 1013 elif [[ "${1}" = "--with-dependencies" ]]; then
896 deep="--with-dependencies" 1014 deep="--with-dependencies"
897 else 1015 else
898 die "java-pkg_jar-from called with unknown parameter: ${1}" 1016 die "java-pkg_jar-from called with unknown parameter: ${1}"
899 fi 1017 fi
900 shift 1018 shift
901 done 1019 done
902 1020
903 [[ ${#} -ne 1 ]] && die "${FUNCNAME} takes only one argument besides --*" 1021 [[ ${#} -ne 1 ]] && die "${FUNCNAME} takes only one argument besides --*"
904 1022
1023
905 local classpath pkgs="${1}" 1024 local pkgs="${1}"
1025
1026 if [[ "${EAPI}" == "1" ]]; then
1027 pkgs="${pkgs//:/-}"
1028 fi
1029
906 jars="$(java-config ${deep} --classpath=${pkgs})" 1030 jars="$(java-config ${deep} --classpath=${pkgs})"
907 [[ -z "${jars}" ]] && die "java-config --classpath=${pkgs} failed" 1031 [[ $? != 0 ]] && die "java-config --classpath=${pkgs} failed"
908 debug-print "${pkgs}:${jars}" 1032 debug-print "${pkgs}:${jars}"
909 1033
910 if [[ -z "${classpath}" ]]; then 1034 for pkg in ${pkgs//,/ }; do
911 classpath="${jars}" 1035 java-pkg_ensure-dep "${build_only}" "${pkg}"
912 else 1036 done
913 classpath="${classpath}:${jars}"
914 fi
915 1037
916 # Only record jars that aren't build-only 1038 # Only record jars that aren't build-only
917 if [[ -z "${build_only}" ]]; then 1039 if [[ -z "${build_only}" ]]; then
918 oldifs="${IFS}"
919 IFS=","
920 for pkg in ${pkgs}; do 1040 for pkg in ${pkgs//,/ }; do
921 java-pkg_record-jar_ "${pkg}" 1041 java-pkg_record-jar_ "${pkg}"
922 done 1042 done
923 IFS="${oldifs}"
924 fi 1043 fi
925 1044
926 echo "${classpath}" 1045 echo "${jars}"
927} 1046}
928 1047
929# ------------------------------------------------------------------------------ 1048# ------------------------------------------------------------------------------
930# @ebuild-function java-pkg_getjar 1049# @ebuild-function java-pkg_getjar
931# 1050#
940# @example-return 1059# @example-return
941# /usr/share/xerces-2/lib/xml-apis.jar 1060# /usr/share/xerces-2/lib/xml-apis.jar
942# 1061#
943# @param $opt 1062# @param $opt
944# --build-only - makes the jar not added into package.env DEPEND line. 1063# --build-only - makes the jar not added into package.env DEPEND line.
1064# --virtual - Packages passed to this function are to be handled as virtuals
1065# and will not have individual jar dependencies recorded.
945# @param $1 - package to use 1066# @param $1 - package to use
946# @param $2 - jar to get 1067# @param $2 - jar to get
947# ------------------------------------------------------------------------------ 1068# ------------------------------------------------------------------------------
948java-pkg_getjar() { 1069java-pkg_getjar() {
949 debug-print-function ${FUNCNAME} $* 1070 debug-print-function ${FUNCNAME} $*
950 1071
951 local build_only="" 1072 local build_only=""
952 1073 local virtual=""
1074
953 [[ "${EBUILD_PHASE}" == "test" ]] && build_only="true" 1075 [[ "${EBUILD_PHASE}" == "test" ]] && build_only="build"
954 1076
955 while [[ "${1}" == --* ]]; do 1077 while [[ "${1}" == --* ]]; do
956 if [[ "${1}" = "--build-only" ]]; then 1078 if [[ "${1}" = "--build-only" ]]; then
957 build_only="true" 1079 build_only="build"
1080 elif [[ "${1}" == "--virtual" ]]; then
1081 virtual="true"
958 else 1082 else
959 die "java-pkg_jar-from called with unknown parameter: ${1}" 1083 die "java-pkg_getjar called with unknown parameter: ${1}"
960 fi 1084 fi
961 shift 1085 shift
962 done 1086 done
963 1087
964 [[ ${#} -ne 2 ]] && die "${FUNCNAME} takes only two arguments besides --*" 1088 [[ ${#} -ne 2 ]] && die "${FUNCNAME} takes only two arguments besides --*"
965 1089
966 local pkg="${1}" target_jar="${2}" jar 1090 local pkg="${1}" target_jar="${2}" jar
1091
1092 if [[ "${EAPI}" == "1" ]]; then
1093 pkg="${pkg//:/-}"
1094 fi
1095
967 [[ -z ${pkg} ]] && die "Must specify package to get a jar from" 1096 [[ -z ${pkg} ]] && die "Must specify package to get a jar from"
968 [[ -z ${target_jar} ]] && die "Must specify jar to get" 1097 [[ -z ${target_jar} ]] && die "Must specify jar to get"
969 1098
970 local error_msg="Could not find classpath for ${pkg}. Are you sure its installed?" 1099 local error_msg="Could not find classpath for ${pkg}. Are you sure its installed?"
971 local classpath 1100 local classpath
972 classpath=$(java-config --classpath=${pkg}) 1101 classpath=$(java-config --classpath=${pkg})
973 [[ $? != 0 ]] && die ${error_msg} 1102 [[ $? != 0 ]] && die ${error_msg}
1103
1104 java-pkg_ensure-dep "${build_only}" "${pkg}"
1105
1106 # Record the package(Virtual) as a dependency and then set build_only
1107 # So that individual jars are not recorded.
1108 if [[ -n "${virtual}" ]]; then
1109 java-pkg_record-jar_ "${pkg}"
1110 build_only="true"
1111 fi
974 1112
975 for jar in ${classpath//:/ }; do 1113 for jar in ${classpath//:/ }; do
976 if [[ ! -f "${jar}" ]] ; then 1114 if [[ ! -f "${jar}" ]] ; then
977 die "Installation problem with jar ${jar} in ${pkg} - is it installed?" 1115 die "Installation problem with jar ${jar} in ${pkg} - is it installed?"
978 fi 1116 fi
985 fi 1123 fi
986 done 1124 done
987 1125
988 die "Could not find ${target_jar} in ${pkg}" 1126 die "Could not find ${target_jar} in ${pkg}"
989 return 1 1127 return 1
1128}
1129
1130# ------------------------------------------------------------------------------
1131# @ebuild-function java-pkg_register-dependency
1132#
1133# Registers runtime dependency on a package, list of packages, or a single jar
1134# from a package, into package.env DEPEND line. Can only be called in
1135# src_install phase.
1136# Intended for binary packages where you don't need to symlink the jars or get
1137# their classpath during build. As such, the dependencies only need to be
1138# specified in ebuild's RDEPEND, and should be omitted in DEPEND.
1139#
1140# @param $1 - comma-separated list of packages, or a single package
1141# @param $2 - if param $1 is a single package, optionally specify the jar
1142# to depend on
1143#
1144# Example: Record the dependency on whole xerces-2 and xalan,
1145# java-pkg_register-dependency xerces-2,xalan
1146# Example: Record the dependency on ant.jar from ant-core
1147# java-pkg_register-dependency ant-core ant.jar
1148#
1149# Note: Passing both list of packages as the first parameter AND specifying the
1150# jar as the second is not allowed and will cause the function to die. We assume
1151# that there's more chance one passes such combination as a mistake, than that
1152# there are more packages providing identically named jar without class
1153# collisions.
1154# ------------------------------------------------------------------------------
1155java-pkg_register-dependency() {
1156 debug-print-function ${FUNCNAME} $*
1157
1158 java-pkg_check-phase install
1159
1160 [[ ${#} -gt 2 ]] && die "${FUNCNAME} takes at most two arguments"
1161
1162 local pkgs="${1}"
1163 local jar="${2}"
1164
1165 [[ -z "${pkgs}" ]] && die "${FUNCNAME} called with no package(s) specified"
1166
1167 if [[ "${EAPI}" == "1" ]]; then
1168 pkgs="${pkgs//:/-}"
1169 fi
1170
1171 if [[ -z "${jar}" ]]; then
1172 for pkg in ${pkgs//,/ }; do
1173 java-pkg_ensure-dep runtime "${pkg}"
1174 java-pkg_record-jar_ "${pkg}"
1175 done
1176 else
1177 [[ ${pkgs} == *,* ]] && \
1178 die "${FUNCNAME} called with both package list and jar name"
1179 java-pkg_ensure-dep runtime "${pkgs}"
1180 java-pkg_record-jar_ "${pkgs}" "${jar}"
1181 fi
1182
1183 java-pkg_do_write_
1184}
1185
1186# ------------------------------------------------------------------------------
1187# @ebuild-function java-pkg_register-optional-dependency
1188#
1189# Registers optional runtime dependency on a package, list of packages, or a
1190# single jar from a package, into package.env OPTIONAL_DEPEND line. Can only be
1191# called in src_install phase.
1192# Intended for packages that can use other packages when those are in classpath.
1193# Will be put on classpath by launcher if they are installed. Typical case is
1194# JDBC implementations for various databases. It's better than having USE flag
1195# for each implementation triggering hard dependency.
1196#
1197# @param $1 - comma-separated list of packages, or a single package
1198# @param $2 - if param $1 is a single package, optionally specify the jar
1199# to depend on
1200#
1201# Example: Record the optional dependency on some jdbc providers
1202# java-pkg_register-optional-dependency jdbc-jaybird,jtds-1.2,jdbc-mysql
1203#
1204# Note: Passing both list of packages as the first parameter AND specifying the
1205# jar as the second is not allowed and will cause the function to die. We assume
1206# that there's more chance one passes such combination as a mistake, than that
1207# there are more packages providing identically named jar without class
1208# collisions.
1209# ------------------------------------------------------------------------------
1210java-pkg_register-optional-dependency() {
1211 debug-print-function ${FUNCNAME} $*
1212
1213 java-pkg_check-phase install
1214
1215 [[ ${#} -gt 2 ]] && die "${FUNCNAME} takes at most two arguments"
1216
1217 local pkgs="${1}"
1218 local jar="${2}"
1219
1220 [[ -z "${pkgs}" ]] && die "${FUNCNAME} called with no package(s) specified"
1221
1222 if [[ "${EAPI}" == "1" ]]; then
1223 pkgs="${pkgs//:/-}"
1224 fi
1225
1226 if [[ -z "${jar}" ]]; then
1227 for pkg in ${pkgs//,/ }; do
1228 java-pkg_record-jar_ --optional "${pkg}"
1229 done
1230 else
1231 [[ ${pkgs} == *,* ]] && \
1232 die "${FUNCNAME} called with both package list and jar name"
1233 java-pkg_record-jar_ --optional "${pkgs}" "${jar}"
1234 fi
1235
1236 java-pkg_do_write_
1237}
1238
1239# ------------------------------------------------------------------------------
1240# @ebuild-function java-pkg_register-environment-variable
1241#
1242# Register an arbitrary environment variable into package.env. The gjl launcher
1243# for this package or any package depending on this will export it into
1244# environement before executing java command.
1245# Must only be called in src_install phase.
1246#
1247# @param $1 - variable name
1248# @param $2 - variable value
1249# ------------------------------------------------------------------------------
1250JAVA_PKG_EXTRA_ENV="${T}/java-pkg-extra-env"
1251JAVA_PKG_EXTRA_ENV_VARS=""
1252java-pkg_register-environment-variable() {
1253 debug-print-function ${FUNCNAME} $*
1254
1255 java-pkg_check-phase install
1256
1257 [[ ${#} != 2 ]] && die "${FUNCNAME} takes two arguments"
1258
1259 echo "${1}=\"${2}\"" >> ${JAVA_PKG_EXTRA_ENV}
1260 JAVA_PKG_EXTRA_ENV_VARS="${JAVA_PKG_EXTRA_ENV_VARS} ${1}"
1261
1262 java-pkg_do_write_
990} 1263}
991 1264
992# This function reads stdin, and based on that input, figures out how to 1265# This function reads stdin, and based on that input, figures out how to
993# populate jars from the filesystem. 1266# populate jars from the filesystem.
994# Need to figure out a good way of making use of this, ie be able to use a 1267# 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} 1730 dodir /usr/share/ant/${TASKS_DIR}
1458 touch "${D}/usr/share/ant/${TASKS_DIR}/${TASK_NAME}" 1731 touch "${D}/usr/share/ant/${TASKS_DIR}/${TASK_NAME}"
1459} 1732}
1460 1733
1461# ------------------------------------------------------------------------------ 1734# ------------------------------------------------------------------------------
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 1735# @internal-function java-pkg_ant-tasks-depend
1498# 1736#
1499# Translates the WANT_ANT_TASKS variable into valid dependencies. 1737# Translates the WANT_ANT_TASKS variable into valid dependencies.
1500# ------------------------------------------------------------------------------ 1738# ------------------------------------------------------------------------------
1501java-pkg_ant-tasks-depend() { 1739java-pkg_ant-tasks-depend() {
1503 1741
1504 if [[ -n "${WANT_ANT_TASKS}" ]]; then 1742 if [[ -n "${WANT_ANT_TASKS}" ]]; then
1505 local DEP="" 1743 local DEP=""
1506 for i in ${WANT_ANT_TASKS} 1744 for i in ${WANT_ANT_TASKS}
1507 do 1745 do
1508 if [[ ${i} != ant-* ]]; then 1746 if [[ ${i} = ant-* ]]; then
1747 DEP="${DEP}dev-java/${i} "
1748 elif [[ ${i} = */*:* ]]; then
1749 DEP="${DEP}${i} "
1750 else
1509 echo "Invalid atom in WANT_ANT_TASKS: ${i}" 1751 echo "Invalid atom in WANT_ANT_TASKS: ${i}"
1510 return 1 1752 return 1
1511 fi 1753 fi
1512 DEP="${DEP}dev-java/${i} "
1513 done 1754 done
1514 echo ${DEP} 1755 echo ${DEP}
1515 return 0 1756 return 0
1516 else 1757 else
1517 return 0 1758 return 0
1518 fi 1759 fi
1519} 1760}
1520 1761
1521# ------------------------------------------------------------------------------ 1762# ------------------------------------------------------------------------------
1763# @ebuild-function ejunit
1764#
1765# Junit wrapper function. Makes it easier to run the tests and checks for
1766# dev-java/junit in DEPEND. Launches the tests using junit.textui.TestRunner.
1767#
1768# Examples:
1769# ejunit -cp build/classes org.blinkenlights.jid3.test.AllTests
1770# ejunit org.blinkenlights.jid3.test.AllTests
1771#
1772# @param $1 - -cp or -classpath
1773# @param $2 - classpath; junit and recorded dependencies get appended
1774# @param $@ - the rest of the parameters are passed to java
1775# ------------------------------------------------------------------------------
1776ejunit() {
1777 debug-print-function ${FUNCNAME} $*
1778
1779 local pkgs
1780 if [[ -f ${JAVA_PKG_DEPEND_FILE} ]]; then
1781 for atom in $(cat ${JAVA_PKG_DEPEND_FILE} | tr : ' '); do
1782 pkgs=${pkgs},$(echo ${atom} | sed -re "s/^.*@//")
1783 done
1784 fi
1785
1786 local cp=$(java-pkg_getjars --with-dependencies junit${pkgs})
1787 if [[ ${1} = -cp || ${1} = -classpath ]]; then
1788 cp="${2}:${cp}"
1789 shift 2
1790 else
1791 cp=".:${cp}"
1792 fi
1793
1794 local runner=junit.textui.TestRunner
1795 debug-print "Calling: java -cp \"${cp}\" -Djava.awt.headless=true ${runner} ${@}"
1796 java -cp "${cp}" -Djava.awt.headless=true ${runner} "${@}" || die "Running junit failed"
1797}
1798
1799# ------------------------------------------------------------------------------
1522# @section-end helper 1800# @section-end helper
1523# ------------------------------------------------------------------------------ 1801# ------------------------------------------------------------------------------
1802
1803# ------------------------------------------------------------------------------
1804# @eclass-src_prepare
1805#
1806# src_prepare Searches for bundled jars
1807# Don't call directly, but via java-pkg-2_src_prepare!
1808# ------------------------------------------------------------------------------
1809
1810java-utils-2_src_prepare() {
1811 [[ ${EBUILD_PHASE} == prepare ]] &&
1812 java-pkg_func-exists java_prepare && java_prepare
1813
1814 # Remember that eant will call this unless called via Portage
1815 if [[ ! -e "${T}/java-utils-2_src_prepare-run" ]] && is-java-strict; then
1816 echo "Searching for bundled jars:"
1817 java-pkg_find-normal-jars || echo "None found."
1818 echo "Searching for bundled classes (no output if none found):"
1819 find "${WORKDIR}" -name "*.class"
1820 echo "Search done."
1821 fi
1822 touch "${T}/java-utils-2_src_prepare-run"
1823}
1824
1825# ------------------------------------------------------------------------------
1826# @eclass-pkg_preinst
1827#
1828# pkg_preinst Searches for missing and unneeded dependencies
1829# Don't call directly, but via java-pkg-2_pkg_preinst!
1830# ------------------------------------------------------------------------------
1831
1832java-utils-2_pkg_preinst() {
1833 if is-java-strict; then
1834 if has_version dev-java/java-dep-check; then
1835 [[ -e "${JAVA_PKG_ENV}" ]] || return
1836 local output=$(GENTOO_VM= java-dep-check --image "${D}" "${JAVA_PKG_ENV}")
1837 if [[ ${output} && has_version <=dev-java/java-dep-check-0.2 ]]; then
1838 ewarn "Possibly unneeded dependencies found in package.env:"
1839 for dep in ${output}; do
1840 ewarn "\t${dep}"
1841 done
1842 fi
1843 if [[ ${output} && has_version >dev-java/java-dep-check-0.2 ]]; then
1844 ewarn "${output}"
1845 fi
1846 else
1847 eerror "Install dev-java/java-dep-check for dependency checking"
1848 fi
1849 fi
1850}
1524 1851
1525# ------------------------------------------------------------------------------ 1852# ------------------------------------------------------------------------------
1526# @section-begin build 1853# @section-begin build
1527# @section-summary Build functions 1854# @section-summary Build functions
1528# 1855#
1537# compiler. Will also set proper ANT_TASKS from the variable ANT_TASKS, 1864# compiler. Will also set proper ANT_TASKS from the variable ANT_TASKS,
1538# variables: 1865# variables:
1539# EANT_GENTOO_CLASSPATH - calls java-pkg_getjars for the value and adds to the 1866# EANT_GENTOO_CLASSPATH - calls java-pkg_getjars for the value and adds to the
1540# gentoo.classpath property. Be sure to call 1867# gentoo.classpath property. Be sure to call
1541# java-ant_rewrite-classpath in src_unpack. 1868# java-ant_rewrite-classpath in src_unpack.
1869# EANT_NEEDS_TOOLS - add tools.jar to the gentoo.classpath. Should only be used
1870# for build-time purposes, the dependency is not recorded to
1871# package.env!
1872# 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. 1873# *ANT_TASKS - used to determine ANT_TASKS before calling Ant.
1543# ------------------------------------------------------------------------------ 1874# ------------------------------------------------------------------------------
1544eant() { 1875eant() {
1545 debug-print-function ${FUNCNAME} $* 1876 debug-print-function ${FUNCNAME} $*
1546 1877
1547 # FIXME get this working 1878 if [[ ${EBUILD_PHASE} = compile ]]; then
1548# if is-java-strict && [[ ! ${DEPEND} =~ "dev-java/ant" ]]; then 1879 java-ant-2_src_configure
1549# java-pkg_announce-qa-violation \ 1880 java-utils-2_src_prepare
1550# "Using eant, but not depending on dev-java/ant or dev-java/ant-core"
1551# fi 1881 fi
1552 1882
1553 if ! hasq java-ant-2 ${INHERITED} && is-java-strict; then 1883 if ! hasq java-ant-2 ${INHERITED}; then
1554 local msg="You should inherit java-ant-2 when using eant" 1884 local msg="You should inherit java-ant-2 when using eant"
1555 java-pkg_announce-qa-violation ${msg} 1885 java-pkg_announce-qa-violation "${msg}"
1556 die ${msg}
1557 fi 1886 fi
1558 1887
1559 local antflags="-Dnoget=true -Dmaven.mode.offline=true" 1888 local antflags="-Dnoget=true -Dmaven.mode.offline=true -Dbuild.sysclasspath=ignore"
1560 1889
1561 java-pkg_init-compiler_ 1890 java-pkg_init-compiler_
1562 local compiler="${GENTOO_COMPILER}" 1891 local compiler="${GENTOO_COMPILER}"
1563 1892
1564 local compiler_env="${JAVA_PKG_COMPILER_DIR}/${compiler}" 1893 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})" 1894 local build_compiler="$(source ${compiler_env} 1>/dev/null 2>&1; echo ${ANT_BUILD_COMPILER})"
1567 if [[ "${compiler}" != "javac" && -z "${build_compiler}" ]]; then 1895 if [[ "${compiler}" != "javac" && -z "${build_compiler}" ]]; then
1568 die "ANT_BUILD_COMPILER undefined in ${compiler_env}" 1896 die "ANT_BUILD_COMPILER undefined in ${compiler_env}"
1569 fi 1897 fi
1570 1898
1576 # java-config -p 1904 # java-config -p
1577 local build_compiler_deps="$(source ${JAVA_PKG_COMPILER_DIR}/${compiler} 1>/dev/null 2>&1; echo ${ANT_BUILD_COMPILER_DEPS})" 1905 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 1906 if [[ -n ${build_compiler_deps} ]]; then
1579 antflags="${antflags} -lib $(java-config -p ${build_compiler_deps})" 1907 antflags="${antflags} -lib $(java-config -p ${build_compiler_deps})"
1580 fi 1908 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 1909 fi
1587 1910
1588 for arg in "${@}"; do 1911 for arg in "${@}"; do
1589 if [[ ${arg} = -lib ]]; then 1912 if [[ ${arg} = -lib ]]; then
1590 if is-java-strict; then 1913 if is-java-strict; then
1599 echo "more info." 1922 echo "more info."
1600 fi 1923 fi
1601 fi 1924 fi
1602 done 1925 done
1603 1926
1604 if has_version ">=dev-java/ant-core-1.7.0"; then 1927 # parse WANT_ANT_TASKS for atoms
1605 # default ANT_TASKS to WANT_ANT_TASKS, if ANT_TASKS is not set explicitly 1928 local want_ant_tasks
1606 ANT_TASKS="${ANT_TASKS:-${WANT_ANT_TASKS}}" 1929 for i in ${WANT_ANT_TASKS}; do
1607 1930 if [[ ${i} = */*:* ]]; then
1608 # override ANT_TASKS with JAVA_PKG_FORCE_ANT_TASKS if it's set 1931 i=${i#*/}
1609 ANT_TASKS="${JAVA_PKG_FORCE_ANT_TASKS:-${ANT_TASKS}}" 1932 i=${i%:0}
1610 1933 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 1934 else
1935 want_ant_tasks+="${i} "
1936 fi
1937 done
1938 # default ANT_TASKS to WANT_ANT_TASKS, if ANT_TASKS is not set explicitly
1939 ANT_TASKS="${ANT_TASKS:-${want_ant_tasks% }}"
1940
1941 # override ANT_TASKS with JAVA_PKG_FORCE_ANT_TASKS if it's set
1942 ANT_TASKS="${JAVA_PKG_FORCE_ANT_TASKS:-${ANT_TASKS}}"
1943
1617 # if ant-tasks is not set by ebuild or forced, activate all of them 1944 # if ant-tasks is not set by ebuild or forced, use none
1618 ANT_TASKS="${ANT_TASKS:-all}" 1945 ANT_TASKS="${ANT_TASKS:-none}"
1619 fi
1620 1946
1621 # at this point, ANT_TASKS should be "all", "none" or explicit list 1947 # at this point, ANT_TASKS should be "all", "none" or explicit list
1622 if [[ "${ANT_TASKS}" == "all" ]]; then 1948 if [[ "${ANT_TASKS}" == "all" ]]; then
1623 einfo "Using all available ANT_TASKS" 1949 einfo "Using all available ANT_TASKS"
1624 elif [[ "${ANT_TASKS}" == "none" ]]; then 1950 elif [[ "${ANT_TASKS}" == "none" ]]; then
1625 einfo "Disabling all optional ANT_TASKS" 1951 einfo "Disabling all optional ANT_TASKS"
1626 else 1952 else
1627 einfo "Using following ANT_TASKS: ${ANT_TASKS}" 1953 einfo "Using following ANT_TASKS: ${ANT_TASKS}"
1628 fi 1954 fi
1629 1955
1630 export ANT_TASKS 1956 export ANT_TASKS
1631 fi
1632 1957
1633 [[ -n ${JAVA_PKG_DEBUG} ]] && antflags="${antflags} --execdebug -debug" 1958 [[ -n ${JAVA_PKG_DEBUG} ]] && antflags="${antflags} --execdebug -debug"
1634 [[ -n ${PORTAGE_QUIET} ]] && antflags="${antflags} -q" 1959 [[ -n ${PORTAGE_QUIET} ]] && antflags="${antflags} -q"
1635 1960
1636 local gcp="${EANT_GENTOO_CLASSPATH}" 1961 local gcp="${EANT_GENTOO_CLASSPATH}"
1962 local getjarsarg=""
1637 1963
1638 if [[ ${EBUILD_PHASE} = "test" ]]; then 1964 if [[ ${EBUILD_PHASE} = "test" ]]; then
1639 antflags="${antflags} -DJunit.present=true" 1965 antflags="${antflags} -DJunit.present=true"
1640 [[ ${gcp} && ${ANT_TASKS} = *ant-junit* ]] && gcp="${gcp} junit" 1966 [[ ${ANT_TASKS} = *ant-junit* ]] && gcp="${gcp} junit"
1967 getjarsarg="--with-dependencies"
1641 fi 1968 fi
1642 1969
1643 local cp 1970 local cp
1644 1971
1645 for atom in ${gcp}; do 1972 for atom in ${gcp}; do
1646 cp="${cp}:$(java-pkg_getjars ${atom})" 1973 cp="${cp}:$(java-pkg_getjars ${getjarsarg} ${atom})"
1647 done 1974 done
1975
1976 [[ -n "${EANT_NEEDS_TOOLS}" ]] && cp="${cp}:$(java-config --tools)"
1648 1977
1649 if [[ ${cp} ]]; then 1978 if [[ ${cp} ]]; then
1650 # It seems ant does not like single quotes around ${cp} 1979 # It seems ant does not like single quotes around ${cp}
1980 cp=${cp#:}
1981 [[ ${EANT_GENTOO_CLASSPATH_EXTRA} ]] && \
1982 cp="${cp}:${EANT_GENTOO_CLASSPATH_EXTRA}"
1651 antflags="${antflags} -Dgentoo.classpath=\"${cp#:}\"" 1983 antflags="${antflags} -Dgentoo.classpath=\"${cp}\""
1652 fi 1984 fi
1653 1985
1654 [[ -n ${JAVA_PKG_DEBUG} ]] && echo ant ${antflags} "${@}" 1986 [[ -n ${JAVA_PKG_DEBUG} ]] && echo ant ${antflags} "${@}"
1655 debug-print "Calling ant: ${antflags} ${@}" 1987 debug-print "Calling ant (GENTOO_VM: ${GENTOO_VM}): ${antflags} ${@}"
1656 ant ${antflags} "${@}" || die "eant failed" 1988 ant ${antflags} "${@}" || die "eant failed"
1657
1658} 1989}
1659 1990
1660# ------------------------------------------------------------------------------ 1991# ------------------------------------------------------------------------------
1661# @ebuild-function ejavac 1992# @ebuild-function ejavac
1662# 1993#
1757# This shouldn't be used directly. Instead, java-pkg and java-pkg-opt will 2088# 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. 2089# call it during each of the phases of the merge process.
1759# 2090#
1760# ----------------------------------------------------------------------------- 2091# -----------------------------------------------------------------------------
1761java-pkg_init() { 2092java-pkg_init() {
2093 debug-print-function ${FUNCNAME} $*
1762 unset JAVAC 2094 unset JAVAC
1763 unset JAVA_HOME 2095 unset JAVA_HOME
2096
2097 java-config --help >/dev/null || {
2098 eerror ""
2099 eerror "Can't run java-config --help"
2100 eerror "Have you upgraded python recently but haven't"
2101 eerror "run python-updater yet?"
2102 die "Can't run java-config --help"
2103 }
2104
2105 # People do all kinds of weird things.
2106 # http://forums.gentoo.org/viewtopic-p-3943166.html
2107 local silence="${SILENCE_JAVA_OPTIONS_WARNING}"
2108 local accept="${I_WANT_GLOBAL_JAVA_OPTIONS}"
2109 if [[ -n ${_JAVA_OPTIONS} && -z ${accept} && -z ${silence} ]]; then
2110 ewarn "_JAVA_OPTIONS changes what java -version outputs at least for"
2111 ewarn "sun-jdk vms and and as such break configure scripts that"
2112 ewarn "use it (for example app-office/openoffice) so we filter it out."
2113 ewarn "Use SILENCE_JAVA_OPTIONS_WARNING=true in the environment (use"
2114 ewarn "make.conf for example) to silence this warning or"
2115 ewarn "I_WANT_GLOBAL_JAVA_OPTIONS to not filter it."
2116 fi
2117
2118 if [[ -z ${accept} ]]; then
2119 # export _JAVA_OPTIONS= doesn't work because it will show up in java
2120 # -version output
2121 unset _JAVA_OPTIONS
2122 # phase hooks make this run many times without this
2123 I_WANT_GLOBAL_JAVA_OPTIONS="true"
2124 fi
2125
2126 if java-pkg_func-exists ant_src_unpack; then
2127 java-pkg_announce-qa-violation "Using old ant_src_unpack. Should be src_unpack"
2128 fi
2129
1764 java-pkg_init_paths_ 2130 java-pkg_init_paths_
1765 java-pkg_switch-vm 2131 java-pkg_switch-vm
1766 PATH=${JAVA_HOME}/bin:${PATH} 2132 PATH=${JAVA_HOME}/bin:${PATH}
1767 2133
1768 # TODO we will probably want to set JAVAC and JAVACFLAGS 2134 # TODO we will probably want to set JAVAC and JAVACFLAGS
1769 2135
1770 # Do some QA checks 2136 # Do some QA checks
1771 java-pkg_check-jikes 2137 java-pkg_check-jikes
2138
2139 # Can't use unset here because Portage does not save the unset
2140 # see https://bugs.gentoo.org/show_bug.cgi?id=189417#c11
1772 2141
1773 # When users have crazy classpaths some packages can fail to compile. 2142 # When users have crazy classpaths some packages can fail to compile.
1774 # and everything should work with empty CLASSPATH. 2143 # and everything should work with empty CLASSPATH.
1775 # This also helps prevent unexpected dependencies on random things 2144 # This also helps prevent unexpected dependencies on random things
1776 # from the CLASSPATH. 2145 # from the CLASSPATH.
1777 unset CLASSPATH 2146 export CLASSPATH=
1778 2147
1779 # Unset external ANT_ stuff 2148 # Unset external ANT_ stuff
1780 unset ANT_TASKS 2149 export ANT_TASKS=
1781 unset ANT_OPTS 2150 export ANT_OPTS=
2151 export ANT_RESPECT_JAVA_HOME=
1782} 2152}
1783 2153
1784# ------------------------------------------------------------------------------ 2154# ------------------------------------------------------------------------------
1785# @function-internal java-pkg-init-compiler_ 2155# @function-internal java-pkg-init-compiler_
1786# 2156#
1877 done 2247 done
1878 2248
1879 # If it hasn't been defined already, default to javac 2249 # If it hasn't been defined already, default to javac
1880 if [[ -z ${GENTOO_COMPILER} ]]; then 2250 if [[ -z ${GENTOO_COMPILER} ]]; then
1881 if [[ -n ${compilers} ]]; then 2251 if [[ -n ${compilers} ]]; then
1882 einfo "No suitable compiler found: defaulting javac for compilation" 2252 einfo "No suitable compiler found: defaulting to JDK default for compilation"
1883 else 2253 else
1884 # probably don't need to notify users about the default. 2254 # probably don't need to notify users about the default.
1885 :;#einfo "Defaulting to javac for compilation" 2255 :;#einfo "Defaulting to javac for compilation"
1886 fi 2256 fi
2257 if java-config -g GENTOO_COMPILER 2> /dev/null; then
2258 export GENTOO_COMPILER=$(java-config -g GENTOO_COMPILER)
2259 else
1887 export GENTOO_COMPILER=javac 2260 export GENTOO_COMPILER=javac
2261 fi
1888 else 2262 else
1889 einfo "Using ${GENTOO_COMPILER} for compilation" 2263 einfo "Using ${GENTOO_COMPILER} for compilation"
1890 fi 2264 fi
1891 2265
1892} 2266}
1908 fi 2282 fi
1909 2283
1910 JAVA_PKG_SHAREPATH="${DESTTREE}/share/${JAVA_PKG_NAME}" 2284 JAVA_PKG_SHAREPATH="${DESTTREE}/share/${JAVA_PKG_NAME}"
1911 JAVA_PKG_SOURCESPATH="${JAVA_PKG_SHAREPATH}/sources/" 2285 JAVA_PKG_SOURCESPATH="${JAVA_PKG_SHAREPATH}/sources/"
1912 JAVA_PKG_ENV="${D}${JAVA_PKG_SHAREPATH}/package.env" 2286 JAVA_PKG_ENV="${D}${JAVA_PKG_SHAREPATH}/package.env"
2287 JAVA_PKG_VIRTUALS_PATH="${DESTTREE}/share/java-config-2/virtuals"
2288 JAVA_PKG_VIRTUAL_PROVIDER="${D}/${JAVA_PKG_VIRTUALS_PATH}/${JAVA_PKG_NAME}"
1913 2289
1914 [[ -z "${JAVA_PKG_JARDEST}" ]] && JAVA_PKG_JARDEST="${JAVA_PKG_SHAREPATH}/lib" 2290 [[ -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}" 2291 [[ -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" 2292 [[ -z "${JAVA_PKG_WARDEST}" ]] && JAVA_PKG_WARDEST="${JAVA_PKG_SHAREPATH}/webapps"
1917 2293
1930# Writes the package.env out to disk. 2306# Writes the package.env out to disk.
1931# 2307#
1932# ------------------------------------------------------------------------------ 2308# ------------------------------------------------------------------------------
1933# TODO change to do-write, to match everything else 2309# TODO change to do-write, to match everything else
1934java-pkg_do_write_() { 2310java-pkg_do_write_() {
2311 debug-print-function ${FUNCNAME} $*
1935 java-pkg_init_paths_ 2312 java-pkg_init_paths_
1936 # Create directory for package.env 2313 # Create directory for package.env
1937 dodir "${JAVA_PKG_SHAREPATH}" 2314 dodir "${JAVA_PKG_SHAREPATH}"
1938 if [[ -n "${JAVA_PKG_CLASSPATH}" || -n "${JAVA_PKG_LIBRARY}" || -f "${JAVA_PKG_DEPEND}" ]]; then 2315 if [[ -n "${JAVA_PKG_CLASSPATH}" || -n "${JAVA_PKG_LIBRARY}" || -f \
2316 "${JAVA_PKG_DEPEND_FILE}" || -f \
2317 "${JAVA_PKG_OPTIONAL_DEPEND_FILE}" ]]; then
1939 # Create package.env 2318 # Create package.env
1940 ( 2319 (
1941 echo "DESCRIPTION=\"${DESCRIPTION}\"" 2320 echo "DESCRIPTION=\"${DESCRIPTION}\""
1942 echo "GENERATION=\"2\"" 2321 echo "GENERATION=\"2\""
2322 echo "SLOT=\"${SLOT}\""
1943 2323
1944 [[ -n "${JAVA_PKG_CLASSPATH}" ]] && echo "CLASSPATH=\"${JAVA_PKG_CLASSPATH}\"" 2324 [[ -n "${JAVA_PKG_CLASSPATH}" ]] && echo "CLASSPATH=\"${JAVA_PKG_CLASSPATH}\""
1945 [[ -n "${JAVA_PKG_LIBRARY}" ]] && echo "LIBRARY_PATH=\"${JAVA_PKG_LIBRARY}\"" 2325 [[ -n "${JAVA_PKG_LIBRARY}" ]] && echo "LIBRARY_PATH=\"${JAVA_PKG_LIBRARY}\""
1946 [[ -n "${JAVA_PROVIDE}" ]] && echo "PROVIDES=\"${JAVA_PROVIDE}\"" 2326 [[ -n "${JAVA_PROVIDE}" ]] && echo "PROVIDES=\"${JAVA_PROVIDE}\""
1947 [[ -f "${JAVA_PKG_DEPEND}" ]] && echo "DEPEND=\"$(cat ${JAVA_PKG_DEPEND} | uniq | tr '\n' ':')\"" 2327 [[ -f "${JAVA_PKG_DEPEND_FILE}" ]] \
2328 && echo "DEPEND=\"$(cat "${JAVA_PKG_DEPEND_FILE}" | uniq | tr '\n' ':')\""
2329 [[ -f "${JAVA_PKG_OPTIONAL_DEPEND_FILE}" ]] \
2330 && 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 ! 2331 echo "VM=\"$(echo ${RDEPEND} ${DEPEND} | sed -e 's/ /\n/g' | sed -n -e '/virtual\/\(jre\|jdk\)/ { p;q }')\"" # TODO cleanup !
1949 ) > "${JAVA_PKG_ENV}" 2332 ) > "${JAVA_PKG_ENV}"
1950 2333
1951 # register target/source 2334 # register target/source
1952 local target="$(java-pkg_get-target)" 2335 local target="$(java-pkg_get-target)"
1963 2346
1964 2347
1965 echo "MERGE_VM=\"${GENTOO_VM}\"" >> "${JAVA_PKG_ENV}" 2348 echo "MERGE_VM=\"${GENTOO_VM}\"" >> "${JAVA_PKG_ENV}"
1966 [[ -n ${GENTOO_COMPILER} ]] && echo "MERGE_COMPILER=\"${GENTOO_COMPILER}\"" >> "${JAVA_PKG_ENV}" 2349 [[ -n ${GENTOO_COMPILER} ]] && echo "MERGE_COMPILER=\"${GENTOO_COMPILER}\"" >> "${JAVA_PKG_ENV}"
1967 2350
2351 # extra env variables
2352 if [[ -n "${JAVA_PKG_EXTRA_ENV_VARS}" ]]; then
2353 cat "${JAVA_PKG_EXTRA_ENV}" >> "${JAVA_PKG_ENV}" || die
2354 # nested echo to remove leading/trailing spaces
2355 echo "ENV_VARS=\"$(echo ${JAVA_PKG_EXTRA_ENV_VARS})\"" \
2356 >> "${JAVA_PKG_ENV}" || die
2357 fi
2358
1968 # Strip unnecessary leading and trailing colons 2359 # Strip unnecessary leading and trailing colons
1969 # TODO try to cleanup if possible 2360 # TODO try to cleanup if possible
1970 sed -e "s/=\":/=\"/" -e "s/:\"$/\"/" -i "${JAVA_PKG_ENV}" || die "Did you forget to call java_init ?" 2361 sed -e "s/=\":/=\"/" -e "s/:\"$/\"/" -i "${JAVA_PKG_ENV}" || die "Did you forget to call java_init ?"
2362 else
2363 debug-print "JAVA_PKG_CLASSPATH, JAVA_PKG_LIBRARY, JAVA_PKG_DEPEND_FILE"
2364 debug-print "or JAVA_PKG_OPTIONAL_DEPEND_FILE not defined so can't"
2365 debug-print "write package.env."
1971 fi 2366 fi
1972} 2367}
1973 2368
1974# ------------------------------------------------------------------------------ 2369# ------------------------------------------------------------------------------
1975# @internal-function java-pkg_record-jar_ 2370# @internal-function java-pkg_record-jar_
1976# 2371#
1977# Record a dependency to the package.env 2372# Record an (optional) dependency to the package.env
1978# 2373# @param --optional - record dependency as optional
2374# @param $1 - package to record
2375# @param $2 - (optional) jar of package to record
1979# ------------------------------------------------------------------------------ 2376# ------------------------------------------------------------------------------
1980JAVA_PKG_DEPEND="${T}/java-pkg-depend" 2377JAVA_PKG_DEPEND_FILE="${T}/java-pkg-depend"
2378JAVA_PKG_OPTIONAL_DEPEND_FILE="${T}/java-pkg-optional-depend"
1981 2379
1982java-pkg_record-jar_() { 2380java-pkg_record-jar_() {
1983 debug-print-function ${FUNCNAME} $* 2381 debug-print-function ${FUNCNAME} $*
2382
2383 local depend_file="${JAVA_PKG_DEPEND_FILE}"
2384 if [[ "${1}" == "--optional" ]]; then
2385 depend_file="${JAVA_PKG_OPTIONAL_DEPEND_FILE}"
2386 shift
2387 fi
1984 2388
1985 local pkg=${1} jar=${2} append 2389 local pkg=${1} jar=${2} append
1986 if [[ -z "${jar}" ]]; then 2390 if [[ -z "${jar}" ]]; then
1987 append="${pkg}" 2391 append="${pkg}"
1988 else 2392 else
1989 append="$(basename ${jar})@${pkg}" 2393 append="$(basename ${jar})@${pkg}"
1990 fi 2394 fi
1991 2395
1992 echo ${append} >> ${JAVA_PKG_DEPEND} 2396 echo "${append}" >> "${depend_file}"
1993} 2397}
1994 2398
1995# ------------------------------------------------------------------------------ 2399# ------------------------------------------------------------------------------
1996# @internal-function java-pkg_append_ 2400# @internal-function java-pkg_append_
1997# 2401#
2041# 2445#
2042# @return 0 - function is declared 2446# @return 0 - function is declared
2043# @return 1 - function is undeclared 2447# @return 1 - function is undeclared
2044# ------------------------------------------------------------------------------ 2448# ------------------------------------------------------------------------------
2045java-pkg_func-exists() { 2449java-pkg_func-exists() {
2046 if [[ -n "$(declare -f ${1})" ]]; then 2450 declare -F ${1} > /dev/null
2047 return 0
2048 else
2049 return 1
2050 fi
2051} 2451}
2052 2452
2053# ------------------------------------------------------------------------------ 2453# ------------------------------------------------------------------------------
2054# @internal-function java-pkg_setup-vm 2454# @internal-function java-pkg_setup-vm
2055# 2455#
2056# Sets up the environment for a specific VM 2456# Sets up the environment for a specific VM
2057# 2457#
2058# ------------------------------------------------------------------------------ 2458# ------------------------------------------------------------------------------
2059java-pkg_setup-vm() { 2459java-pkg_setup-vm() {
2060 debug-print-function ${FUNCNAME} $* 2460 debug-print-function ${FUNCNAME} $*
2461
2462 export LANG="C" LC_ALL="C"
2061 2463
2062 local vendor="$(java-pkg_get-vm-vendor)" 2464 local vendor="$(java-pkg_get-vm-vendor)"
2063 if [[ "${vendor}" == "sun" ]] && java-pkg_is-vm-version-ge "1.5" ; then 2465 if [[ "${vendor}" == "sun" ]] && java-pkg_is-vm-version-ge "1.5" ; then
2064 addpredict "/dev/random" 2466 addpredict "/dev/random"
2065 elif [[ "${vendor}" == "ibm" ]]; then 2467 elif [[ "${vendor}" == "ibm" ]]; then
2066 addpredict "/proc/self/maps" 2468 addpredict "/proc/self/maps"
2067 addpredict "/proc/cpuinfo" 2469 addpredict "/proc/cpuinfo"
2068 export LANG="C" LC_ALL="C"
2069 elif [[ "${vendor}" == "jrockit" ]]; then 2470 elif [[ "${vendor}" == "jrockit" ]]; then
2070 addpredict "/proc/cpuinfo" 2471 addpredict "/proc/cpuinfo"
2071 fi 2472 fi
2072} 2473}
2073 2474
2177 2578
2178 #TODO If you know a better solution let us know. 2579 #TODO If you know a better solution let us know.
2179 java-pkg_append_ LD_LIBRARY_PATH "$(java-config -g LDPATH)" 2580 java-pkg_append_ LD_LIBRARY_PATH "$(java-config -g LDPATH)"
2180 2581
2181 local tann="${T}/announced-vm" 2582 local tann="${T}/announced-vm"
2583 # With the hooks we should only get here once from pkg_setup but better safe than sorry
2584 # if people have for example modified eclasses some where
2182 if [[ -n "${JAVA_PKG_DEBUG}" ]] || [[ ! -f "${tann}" ]] ; then 2585 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)" 2586 einfo "Using: $(java-config -f)"
2188 [[ ! -f "${tann}" ]] && touch "${tann}" 2587 [[ ! -f "${tann}" ]] && touch "${tann}"
2189 fi
2190 fi 2588 fi
2191 2589
2192 else 2590 else
2193 [[ -n "${JAVA_PKG_DEBUG}" ]] && ewarn "!!! This package inherits java-pkg but doesn't depend on a JDK. -bin or broken dependency!!!" 2591 [[ -n "${JAVA_PKG_DEBUG}" ]] && ewarn "!!! This package inherits java-pkg but doesn't depend on a JDK. -bin or broken dependency!!!"
2194 fi 2592 fi
2233# not. 2631# not.
2234# @param $1 (optional) - the file to check, otherwise checks whole ${D} 2632# @param $1 (optional) - the file to check, otherwise checks whole ${D}
2235# ------------------------------------------------------------------------------ 2633# ------------------------------------------------------------------------------
2236java-pkg_verify-classes() { 2634java-pkg_verify-classes() {
2237 #$(find ${D} -type f -name '*.jar' -o -name '*.class') 2635 #$(find ${D} -type f -name '*.jar' -o -name '*.class')
2636
2637 local version_verify="/usr/bin/class-version-verify.py"
2638
2639 if [[ ! -x "${version_verify}" ]]; then
2640 version_verify="/usr/$(get_libdir)/javatoolkit/bin/class-version-verify.py"
2641 fi
2642
2643 if [[ ! -x "${version_verify}" ]]; then
2644 ewarn "Unable to perform class version checks as"
2645 ewarn "class-version-verify.py is unavailable"
2646 ewarn "Please install dev-java/javatoolkit."
2647 return
2648 fi
2649
2238 local target=$(java-pkg_get-target) 2650 local target=$(java-pkg_get-target)
2239 local result 2651 local result
2240 local log="${T}/class-version-verify.log" 2652 local log="${T}/class-version-verify.log"
2241 if [[ -n "${1}" ]]; then 2653 if [[ -n "${1}" ]]; then
2242 class-version-verify.py -v -t ${target} "${1}" > "${log}" 2654 ${version_verify} -v -t ${target} "${1}" > "${log}"
2243 result=$? 2655 result=$?
2244 else 2656 else
2245 ebegin "Verifying java class versions (target: ${target})" 2657 ebegin "Verifying java class versions (target: ${target})"
2246 class-version-verify.py -v -t ${target} -r "${D}" > "${log}" 2658 ${version_verify} -v -t ${target} -r "${D}" > "${log}"
2247 result=$? 2659 result=$?
2248 eend ${result} 2660 eend ${result}
2249 fi 2661 fi
2250 [[ -n ${JAVA_PKG_DEBUG} ]] && cat "${log}" 2662 [[ -n ${JAVA_PKG_DEBUG} ]] && cat "${log}"
2251 if [[ ${result} != 0 ]]; then 2663 if [[ ${result} != 0 ]]; then
2254 eerror "See ${log} for more details." 2666 eerror "See ${log} for more details."
2255 die "Incorrect bytecode found" 2667 die "Incorrect bytecode found"
2256 fi 2668 fi
2257} 2669}
2258 2670
2671# ----------------------------------------------------------------------------
2672# @internal-function java-pkg_ensure-dep
2673# Check that a package being used in jarfrom, getjars and getjar is contained
2674# within DEPEND or RDEPEND.
2675# @param $1 - empty - check both vars; "runtime" or "build" - check only
2676# RDEPEND, resp. DEPEND
2677# @param $2 - Package name and slot.
2678
2679java-pkg_ensure-dep() {
2680 debug-print-function ${FUNCNAME} $*
2681
2682 local limit_to="${1}"
2683 local target_pkg="${2}"
2684 local dev_error=""
2685
2686 local stripped_pkg=$(echo "${target_pkg}" | sed \
2687 's/-[0-9]*\(\.[0-9]\)*$//')
2688
2689 debug-print "Matching against: ${stripped_pkg}"
2690
2691 if [[ ${limit_to} != runtime && ! ( "${DEPEND}" =~ "$stripped_pkg" ) ]]; then
2692 dev_error="The ebuild is attempting to use ${target_pkg} that is not"
2693 dev_error="${dev_error} declared in DEPEND."
2694 if is-java-strict; then
2695 eerror "${dev_error}"
2696 die "${dev_error}"
2697 elif [[ ${BASH_SUBSHELL} = 0 ]]; then
2698 eerror "${dev_error}"
2699 elog "Because you have this package installed the package will"
2700 elog "build without problems, but please report this to"
2701 elog "http://bugs.gentoo.org"
2702 fi
2703 fi
2704
2705 if [[ ${limit_to} != build ]]; then
2706 if [[ ! ( ${RDEPEND} =~ "${stripped_pkg}" ) ]]; then
2707 if [[ ! ( ${PDEPEND} =~ "${stripped_pkg}" ) ]]; then
2708 dev_error="The ebuild is attempting to use ${target_pkg},"
2709 dev_error="${dev_error} without specifying --build-only, that is not declared in RDEPEND"
2710 dev_error="${dev_error} or PDEPEND."
2711 if is-java-strict; then
2712 eerror "${dev_error}"
2713 die "${dev_error}"
2714 elif [[ ${BASH_SUBSHELL} = 0 ]]; then
2715 eerror "${dev_error}"
2716 elog "The package will build without problems, but may fail to run"
2717 elog "if you don't have ${target_pkg} installed, so please report"
2718 elog "this to http://bugs.gentoo.org"
2719 fi
2720 fi
2721 fi
2722 fi
2723}
2724
2259# ------------------------------------------------------------------------------ 2725# ------------------------------------------------------------------------------
2260# @section-end internal 2726# @section-end internal
2261# ------------------------------------------------------------------------------ 2727# ------------------------------------------------------------------------------
2262 2728
2263java-pkg_check-phase() { 2729java-pkg_check-phase() {
2264 local phase=${1} 2730 local phase=${1}
2265 local funcname=${2} 2731 local funcname=${FUNCNAME[1]}
2266 if is-java-strict && [[ ${EBUILD_PHASE} != ${phase} ]]; then 2732 if [[ ${EBUILD_PHASE} != ${phase} ]]; then
2267 java-pkg_announce-qa-violation \
2268 "${funcname} used outside of src_${phase}" 2733 local msg="${funcname} used outside of src_${phase}"
2734 java-pkg_announce-qa-violation "${msg}"
2269 fi 2735 fi
2270} 2736}
2271 2737
2272java-pkg_check-versioned-jar() { 2738java-pkg_check-versioned-jar() {
2273 local jar=${1} 2739 local jar=${1}
2282 java-pkg_announce-qa-violation "deprecated USE flag 'jikes' in IUSE" 2748 java-pkg_announce-qa-violation "deprecated USE flag 'jikes' in IUSE"
2283 fi 2749 fi
2284} 2750}
2285 2751
2286java-pkg_announce-qa-violation() { 2752java-pkg_announce-qa-violation() {
2287 if is-java-strict; then 2753 local nodie
2754 if [[ ${1} == "--nodie" ]]; then
2755 nodie="true"
2756 shift
2757 fi
2288 echo "Java QA Notice: $@" >&2 2758 echo "Java QA Notice: $@" >&2
2289 increment-qa-violations 2759 increment-qa-violations
2290 fi 2760 [[ -z "${nodie}" ]] && is-java-strict && die "${@}"
2291} 2761}
2292 2762
2293increment-qa-violations() { 2763increment-qa-violations() {
2294 let "JAVA_PKG_QA_VIOLATIONS+=1" 2764 let "JAVA_PKG_QA_VIOLATIONS+=1"
2295 export JAVA_PKG_QA_VIOLATIONS 2765 export JAVA_PKG_QA_VIOLATIONS
2298is-java-strict() { 2768is-java-strict() {
2299 [[ -n ${JAVA_PKG_STRICT} ]] 2769 [[ -n ${JAVA_PKG_STRICT} ]]
2300 return $? 2770 return $?
2301} 2771}
2302 2772
2773
2303# ------------------------------------------------------------------------------ 2774# ------------------------------------------------------------------------------
2304# @eclass-end 2775# @eclass-end
2305# ------------------------------------------------------------------------------ 2776# ------------------------------------------------------------------------------

Legend:
Removed from v.1.58  
changed lines
  Added in v.1.127

  ViewVC Help
Powered by ViewVC 1.1.20