/[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.33 Revision 1.98
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.33 2006/12/07 02:27:22 flameeyes Exp $ 9# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.98 2007/11/26 21:00:59 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
36# ----------------------------------------------------------------------------- 35# -----------------------------------------------------------------------------
37 36
38# Make sure we use java-config-2 37# Make sure we use java-config-2
39export WANT_JAVA_CONFIG="2" 38export WANT_JAVA_CONFIG="2"
40 39
41# TODO document 40# -----------------------------------------------------------------------------
41# @variable-external WANT_ANT_TASKS
42# @variable-default ""
43#
44# An $IFS separated list of ant tasks.
45# Ebuild can specify this variable before inheriting java-ant-2 eclass to
46# determine ANT_TASKS it needs. They will be automatically translated to
47# DEPEND variable and ANT_TASKS variable. JAVA_PKG_FORCE_ANT_TASKS can override
48# ANT_TASKS set by WANT_ANT_TASKS, but not the DEPEND due to caching.
49# Ebuilds that need to depend conditionally on certain tasks and specify them
50# differently for different eant calls can't use this simplified approach.
51# You also cannot specify version or anything else than ant-*.
52#
53# @example WANT_ANT_TASKS="ant-junit ant-trax"
54#
55# @seealso JAVA_PKG_FORCE_ANT_TASKS
56# -----------------------------------------------------------------------------
57#WANT_ANT_TASKS
58
59# -----------------------------------------------------------------------------
60# @variable-internal JAVA_PKG_PORTAGE_DEP
61#
62# The version of portage we need to function properly. Previously it was
63# portage with phase hooks support but now we use a version with proper env
64# saving.
65# -----------------------------------------------------------------------------
42JAVA_PKG_PORTAGE_DEP=">=sys-apps/portage-2.1_pre1" 66JAVA_PKG_PORTAGE_DEP=">=sys-apps/portage-2.1.2.7"
43 67
44# ----------------------------------------------------------------------------- 68# -----------------------------------------------------------------------------
45# @variable-internal JAVA_PKG_E_DEPEND 69# @variable-internal JAVA_PKG_E_DEPEND
46# 70#
47# 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
48# 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
49# portage, that includes phase hooks. 73# so that ebuilds can use new features without depending on specific versions.
50# ----------------------------------------------------------------------------- 74# -----------------------------------------------------------------------------
51JAVA_PKG_E_DEPEND=">=dev-java/java-config-2.0.19-r1 ${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 )"
52 77
53# ----------------------------------------------------------------------------- 78# -----------------------------------------------------------------------------
54# @variable-external JAVA_PKG_ALLOW_VM_CHANGE 79# @variable-external JAVA_PKG_ALLOW_VM_CHANGE
55# @variable-default yes 80# @variable-default yes
56# 81#
130# @note This should only be used internally or for testing. 155# @note This should only be used internally or for testing.
131# @example Use jikes and javac, in that order 156# @example Use jikes and javac, in that order
132# JAVA_PKG_FORCE_COMPILER="jikes javac" 157# JAVA_PKG_FORCE_COMPILER="jikes javac"
133# ----------------------------------------------------------------------------- 158# -----------------------------------------------------------------------------
134 159
160# -----------------------------------------------------------------------------
161# @variable-external JAVA_PKG_FORCE_ANT_TASKS
162#
163# An $IFS separated list of ant tasks. Can be set in environment before calling
164# emerge/ebuild to override variables set in ebuild, mainly for testing before
165# putting the resulting (WANT_)ANT_TASKS into ebuild. Affects only ANT_TASKS in
166# eant() call, not the dependencies specified in WANT_ANT_TASKS.
167#
168# @example JAVA_PKG_FORCE_ANT_TASKS="ant-junit ant-trax" \
169# ebuild foo.ebuild compile
170#
171# @seealso WANT_ANT_TASKS
172# -----------------------------------------------------------------------------
173
135# TODO document me 174# TODO document me
136JAVA_PKG_QA_VIOLATIONS=0 175JAVA_PKG_QA_VIOLATIONS=0
137 176
138# ----------------------------------------------------------------------------- 177# -----------------------------------------------------------------------------
139# @section-end variables 178# @section-end variables
146# 185#
147# 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
148# libraries, etc. 187# libraries, etc.
149# ----------------------------------------------------------------------------- 188# -----------------------------------------------------------------------------
150 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}
151 230
152# ----------------------------------------------------------------------------- 231# -----------------------------------------------------------------------------
153# @ebuild-function java-pkg_dojar 232# @ebuild-function java-pkg_dojar
154# 233#
155# Installs any number of jars. 234# Installs any number of jars.
174 # Create JARDEST if it doesn't exist 253 # Create JARDEST if it doesn't exist
175 dodir ${JAVA_PKG_JARDEST} 254 dodir ${JAVA_PKG_JARDEST}
176 255
177 local jar 256 local jar
178 # for each jar 257 # for each jar
179 for jar in "$@"; do 258 for jar in "${@}"; do
180 local jar_basename=$(basename "${jar}") 259 local jar_basename=$(basename "${jar}")
181 260
182 java-pkg_check-versioned-jar ${jar_basename} 261 java-pkg_check-versioned-jar ${jar_basename}
183 262
184 # check if it exists 263 # check if it exists
185 if [[ -e "${jar}" ]] ; then 264 if [[ -e "${jar}" ]] ; then
265 # Don't overwrite if jar has already been installed with the same
266 # name
267 local dest="${D}${JAVA_PKG_JARDEST}/${jar_basename}"
268 if [[ -e "${dest}" ]]; then
269 ewarn "Overwriting ${dest}"
270 fi
271
186 # install it into JARDEST if it's a non-symlink 272 # install it into JARDEST if it's a non-symlink
187 if [[ ! -L "${jar}" ]] ; then 273 if [[ ! -L "${jar}" ]] ; then
274 #but first check class version when in strict mode.
275 is-java-strict && java-pkg_verify-classes "${jar}"
276
188 INSDESTTREE="${JAVA_PKG_JARDEST}" \ 277 INSDESTTREE="${JAVA_PKG_JARDEST}" \
189 doins "${jar}" || die "failed to install ${jar}" 278 doins "${jar}" || die "failed to install ${jar}"
190 java-pkg_append_ JAVA_PKG_CLASSPATH "${JAVA_PKG_JARDEST}/${jar_basename}" 279 java-pkg_append_ JAVA_PKG_CLASSPATH "${JAVA_PKG_JARDEST}/${jar_basename}"
191 debug-print "installed ${jar} to ${D}${JAVA_PKG_JARDEST}" 280 debug-print "installed ${jar} to ${D}${JAVA_PKG_JARDEST}"
192 # make a symlink to the original jar if it's symlink 281 # make a symlink to the original jar if it's symlink
203 292
204 java-pkg_do_write_ 293 java-pkg_do_write_
205} 294}
206 295
207 296
297# ------------------------------------------------------------------------------
298# @internal-function depend-java-query
299#
300# Wrapper for the depend-java-query binary to enable passing USE in env.
301# Using env variables keeps this eclass working with java-config versions that
302# do not handle use flags.
303# ------------------------------------------------------------------------------
304
305depend-java-query() {
306 # Used to have a which call here but it caused endless loops for some people
307 # that had some weird bashrc voodoo for which.
308 USE="${USE}" /usr/bin/depend-java-query "${@}"
309}
208 310
209# ------------------------------------------------------------------------------ 311# ------------------------------------------------------------------------------
210# @ebuild-function java-pkg_regjar 312# @ebuild-function java-pkg_regjar
211# 313#
212# Records an already installed jar in the package.env 314# Records an already installed jar in the package.env
243 [[ ${#} -lt 1 ]] && die "at least one argument needed" 345 [[ ${#} -lt 1 ]] && die "at least one argument needed"
244 346
245 java-pkg_init_paths_ 347 java-pkg_init_paths_
246 348
247 local jar jar_dir jar_file 349 local jar jar_dir jar_file
248 for jar in "$@"; do 350 for jar in "${@}"; do
249 # TODO use java-pkg_check-versioned-jar 351 # TODO use java-pkg_check-versioned-jar
250 if [[ -e "${jar}" ]]; then 352 if [[ -e "${jar}" || -e "${D}${jar}" ]]; then
353 [[ -d "${jar}" || -d "${D}${jar}" ]] \
354 && die "Called ${FUNCNAME} on a directory $*"
355
356 #check that class version correct when in strict mode
357 is-java-strict && java-pkg_verify-classes "${jar}"
358
251 # nelchael: we should strip ${D} in this case too, here's why: 359 # nelchael: we should strip ${D} in this case too, here's why:
252 # imagine such call: 360 # imagine such call:
253 # java-pkg_regjar ${D}/opt/java/*.jar 361 # java-pkg_regjar ${D}/opt/java/*.jar
254 # such call will fall into this case (-e ${jar}) and will 362 # such call will fall into this case (-e ${jar}) and will
255 # record paths with ${D} in package.env 363 # record paths with ${D} in package.env
256 java-pkg_append_ JAVA_PKG_CLASSPATH "${jar#${D}}" 364 java-pkg_append_ JAVA_PKG_CLASSPATH "${jar#${D}}"
257 elif [[ -e "${D}${jar}" ]]; then
258 java-pkg_append_ JAVA_PKG_CLASSPATH "${jar#${D}}"
259 else 365 else
366 if [[ ${jar} = *\** ]]; then
367 eerror "The argument ${jar} to ${FUNCNAME}"
368 eerror "has * in it. If you want it to glob in"
369 eerror '${D} add ${D} to the argument.'
370 fi
260 die "${jar} does not exist" 371 die "${jar} does not exist"
261 fi 372 fi
262 done 373 done
263 374
264 java-pkg_do_write_ 375 java-pkg_do_write_
265} 376}
266
267 377
268# ------------------------------------------------------------------------------ 378# ------------------------------------------------------------------------------
269# @ebuild-function java-pkg_newjar 379# @ebuild-function java-pkg_newjar
270# 380#
271# Installs a jar with a new name 381# Installs a jar with a new name
282 local original_jar="${1}" 392 local original_jar="${1}"
283 local new_jar="${2:-${PN}.jar}" 393 local new_jar="${2:-${PN}.jar}"
284 local new_jar_dest="${T}/${new_jar}" 394 local new_jar_dest="${T}/${new_jar}"
285 395
286 [[ -z ${original_jar} ]] && die "Must specify a jar to install" 396 [[ -z ${original_jar} ]] && die "Must specify a jar to install"
287 [[ ! -f ${original_jar} ]] && die "${original_jar} does not exist!" 397 [[ ! -f ${original_jar} ]] \
398 && die "${original_jar} does not exist or is not a file!"
288 399
289 rm -f "${new_jar_dest}" || die "Failed to remove ${new_jar_dest}" 400 rm -f "${new_jar_dest}" || die "Failed to remove ${new_jar_dest}"
290 cp "${original_jar}" "${new_jar_dest}" \ 401 cp "${original_jar}" "${new_jar_dest}" \
291 || die "Failed to copy ${original_jar} to ${new_jar_dest}" 402 || die "Failed to copy ${original_jar} to ${new_jar_dest}"
292 java-pkg_dojar "${new_jar_dest}" 403 java-pkg_dojar "${new_jar_dest}"
341 java-pkg_append_ JAVA_PKG_LIBRARY "${JAVA_PKG_LIBDEST}" 452 java-pkg_append_ JAVA_PKG_LIBRARY "${JAVA_PKG_LIBDEST}"
342 debug-print "Installing ${lib} to ${JAVA_PKG_LIBDEST}" 453 debug-print "Installing ${lib} to ${JAVA_PKG_LIBDEST}"
343 # otherwise make a symlink to the symlink's origin 454 # otherwise make a symlink to the symlink's origin
344 else 455 else
345 # TODO use dosym 456 # TODO use dosym
457 ln -s "$(readlink "${lib}")" \
346 ln -s "$(readlink "${lib}")" "${D}${JAVA_PKG_LIBDEST}/$(basename "${lib}")" 458 "${D}${JAVA_PKG_LIBDEST}/$(basename "${lib}")"
347 debug-print "${lib} is a symlink, linking accordanly" 459 debug-print "${lib} is a symlink, linking accordanly"
348 fi 460 fi
349 # otherwise die 461 # otherwise die
350 else 462 else
351 die "${lib} does not exist" 463 die "${lib} does not exist"
452# @example: 564# @example:
453# java-pkg_dojavadoc docs/api 565# java-pkg_dojavadoc docs/api
454# 566#
455# ------------------------------------------------------------------------------ 567# ------------------------------------------------------------------------------
456java-pkg_dojavadoc() { 568java-pkg_dojavadoc() {
569 debug-print-function ${FUNCNAME} $*
457 local dir="$1" 570 local dir="$1"
571
572 # QA checks
458 573
459 java-pkg_check-phase install 574 java-pkg_check-phase install
460 575
461 [[ -z "${dir}" ]] && die "Must specify a directory!" 576 [[ -z "${dir}" ]] && die "Must specify a directory!"
462 [[ ! -d "${dir}" ]] && die "${dir} does not exist, or isn't a directory!" 577 [[ ! -d "${dir}" ]] && die "${dir} does not exist, or isn't a directory!"
578 if [[ ! -e "${dir}/index.html" ]]; then
579 local msg="No index.html in javadoc directory"
580 ewarn "${msg}"
581 is-java-strict && die "${msg}"
582 fi
583
584 # Renaming to match our directory layout
463 585
464 local dir_to_install="${dir}" 586 local dir_to_install="${dir}"
465 if [[ "$(basename "${dir}")" != "api" ]]; then 587 if [[ "$(basename "${dir}")" != "api" ]]; then
466 dir_to_install="${T}/api" 588 dir_to_install="${T}/api"
467 # TODO use doins 589 # TODO use doins
468 cp -r "${dir}" "${dir_to_install}" || die "cp failed" 590 cp -r "${dir}" "${dir_to_install}" || die "cp failed"
469 fi 591 fi
592
593 # Actual installation
470 594
471 java-pkg_dohtml -r ${dir_to_install} 595 java-pkg_dohtml -r ${dir_to_install}
472} 596}
473 597
474# ------------------------------------------------------------------------------ 598# ------------------------------------------------------------------------------
492# FIXME apparently this fails if you give it an empty directories 616# FIXME apparently this fails if you give it an empty directories
493java-pkg_dosrc() { 617java-pkg_dosrc() {
494 debug-print-function ${FUNCNAME} $* 618 debug-print-function ${FUNCNAME} $*
495 619
496 [ ${#} -lt 1 ] && die "At least one argument needed" 620 [ ${#} -lt 1 ] && die "At least one argument needed"
497 if ! hasq source ${IUSE}; then
498 echo "Java QA Notice: ${FUNCNAME} called without source in IUSE"
499 fi
500 621
501 java-pkg_check-phase install 622 java-pkg_check-phase install
502 623
503 [[ ${#} -lt 1 ]] && die "At least one argument needed" 624 [[ ${#} -lt 1 ]] && die "At least one argument needed"
625
626 if ! [[ ${DEPEND} = *app-arch/zip* ]]; then
627 local msg="${FUNCNAME} called without app-arch/zip in DEPEND"
628 if is-java-strict; then
629 eerror "${msg}"
630 die "${msg}"
631 else
632 echo "${msg}"
633 echo "Please report this to http://bugs.gentoo.org."
634 fi
635 fi
504 636
505 java-pkg_init_paths_ 637 java-pkg_init_paths_
506 638
507 local zip_name="${PN}-src.zip" 639 local zip_name="${PN}-src.zip"
508 local zip_path="${T}/${zip_name}" 640 local zip_path="${T}/${zip_name}"
509 local dir 641 local dir
510 for dir in ${@}; do 642 for dir in "${@}"; do
511 local dir_parent=$(dirname "${dir}") 643 local dir_parent=$(dirname "${dir}")
512 local dir_name=$(basename "${dir}") 644 local dir_name=$(basename "${dir}")
513 pushd ${dir_parent} > /dev/null || die "problem entering ${dir_parent}" 645 pushd ${dir_parent} > /dev/null || die "problem entering ${dir_parent}"
514 zip -q -r ${zip_path} ${dir_name} -i '*.java' 646 zip -q -r ${zip_path} ${dir_name} -i '*.java'
515 local result=$? 647 local result=$?
540# @param $1 - filename of launcher to create 672# @param $1 - filename of launcher to create
541# @param $2 - options, as follows: 673# @param $2 - options, as follows:
542# --main the.main.class.too.start 674# --main the.main.class.too.start
543# --jar /the/jar/too/launch.jar or just <name>.jar 675# --jar /the/jar/too/launch.jar or just <name>.jar
544# --java_args 'Extra arguments to pass to java' 676# --java_args 'Extra arguments to pass to java'
545# --pkg_args 'Extra arguments too pass to the package' 677# --pkg_args 'Extra arguments to pass to the package'
546# --pwd 678# --pwd Directory the launcher changes to before executing java
547# -into 679# -into Directory to install the launcher to, instead of /usr/bin
548# -pre 680# -pre Prepend contents of this file to the launcher
549# ------------------------------------------------------------------------------ 681# ------------------------------------------------------------------------------
550java-pkg_dolauncher() { 682java-pkg_dolauncher() {
551 debug-print-function ${FUNCNAME} $* 683 debug-print-function ${FUNCNAME} $*
552 684
553 java-pkg_check-phase install 685 java-pkg_check-phase install
565 local var_tmp="${T}/launcher_variables_tmp" 697 local var_tmp="${T}/launcher_variables_tmp"
566 local target_dir pre 698 local target_dir pre
567 699
568 # Process the other the rest of the arguments 700 # Process the other the rest of the arguments
569 while [[ -n "${1}" && -n "${2}" ]]; do 701 while [[ -n "${1}" && -n "${2}" ]]; do
570 local var=${1} value=${2} 702 local var="${1}" value="${2}"
571 if [[ "${var:0:2}" == "--" ]]; then 703 if [[ "${var:0:2}" == "--" ]]; then
572 local var=${var:2} 704 local var=${var:2}
573 echo "gjl_${var}=\"${value}\"" >> "${var_tmp}" 705 echo "gjl_${var}=\"${value}\"" >> "${var_tmp}"
574 local gjl_${var}="${value}" 706 local gjl_${var}="${value}"
575 elif [[ "${var}" == "-into" ]]; then 707 elif [[ "${var}" == "-into" ]]; then
594 fi 726 fi
595 fi 727 fi
596 728
597 # Write the actual script 729 # Write the actual script
598 echo "#!/bin/bash" > "${target}" 730 echo "#!/bin/bash" > "${target}"
599 [[ -n "${pre}" ]] && [[ -f "${pre}" ]] && cat "${pre}" >> "${target}" 731 if [[ -n "${pre}" ]]; then
732 if [[ -f "${pre}" ]]; then
733 cat "${pre}" >> "${target}"
734 else
735 die "-pre specified file '${pre}' does not exist"
736 fi
737 fi
600 echo "gjl_package=${JAVA_PKG_NAME}" >> "${target}" 738 echo "gjl_package=${JAVA_PKG_NAME}" >> "${target}"
601 cat "${var_tmp}" >> "${target}" 739 cat "${var_tmp}" >> "${target}"
602 rm -f "${var_tmp}" 740 rm -f "${var_tmp}"
603 echo "source /usr/share/java-config-2/launcher/launcher.bash" >> "${target}" 741 echo "source /usr/share/java-config-2/launcher/launcher.bash" >> "${target}"
604 742
696# Example: get a specific jar from xerces slot 2, and name it diffrently 834# Example: get a specific jar from xerces slot 2, and name it diffrently
697# java-pkg_jar-from xerces-2 xml-apis.jar xml.jar 835# java-pkg_jar-from xerces-2 xml-apis.jar xml.jar
698# Example: get junit.jar which is needed only for building 836# Example: get junit.jar which is needed only for building
699# java-pkg_jar-from --build-only junit junit.jar 837# java-pkg_jar-from --build-only junit junit.jar
700# 838#
701# @param $1 - (optional) "--build-only" makes the jar(s) not added into 839# @param $opt
702# package.env DEPEND line. 840# --build-only - makes the jar(s) not added into package.env DEPEND line.
703# @param $1 - Package to get jars from. 841# (assumed automatically when called inside src_test)
842# --with-dependencies - get jars also from requested package's dependencies
843# transitively.
844# --virtual - Packages passed to this function are to be handled as virtuals
845# and will not have individual jar dependencies recorded.
846# --into $dir - symlink jar(s) into $dir (must exist) instead of .
847# @param $1 - Package to get jars from, or comma-separated list of packages in
848# case other parameters are not used.
704# @param $2 - jar from package. If not specified, all jars will be used. 849# @param $2 - jar from package. If not specified, all jars will be used.
705# @param $3 - When a single jar is specified, destination filename of the 850# @param $3 - When a single jar is specified, destination filename of the
706# symlink. Defaults to the name of the jar. 851# symlink. Defaults to the name of the jar.
707# ------------------------------------------------------------------------------ 852# ------------------------------------------------------------------------------
708# TODO could probably be cleaned up a little 853# TODO could probably be cleaned up a little
709java-pkg_jar-from() { 854java-pkg_jar-from() {
710 debug-print-function ${FUNCNAME} $* 855 debug-print-function ${FUNCNAME} $*
711 856
712 local build_only="" 857 local build_only=""
858 local destdir="."
859 local deep=""
860 local virtual=""
713 861
862 [[ "${EBUILD_PHASE}" == "test" ]] && build_only="build"
863
864 while [[ "${1}" == --* ]]; do
714 if [[ "${1}" = "--build-only" ]]; then 865 if [[ "${1}" = "--build-only" ]]; then
715 build_only="true" 866 build_only="build"
867 elif [[ "${1}" = "--with-dependencies" ]]; then
868 deep="--with-dependencies"
869 elif [[ "${1}" = "--virtual" ]]; then
870 virtual="true"
871 elif [[ "${1}" = "--into" ]]; then
872 destdir="${2}"
873 shift
874 else
875 die "java-pkg_jar-from called with unknown parameter: ${1}"
876 fi
716 shift 877 shift
717 fi 878 done
718 879
719 local target_pkg="${1}" target_jar="${2}" destjar="${3}" 880 local target_pkg="${1}" target_jar="${2}" destjar="${3}"
720 881
721 [[ -z ${target_pkg} ]] && die "Must specify a package" 882 [[ -z ${target_pkg} ]] && die "Must specify a package"
722 883
723 # default destjar to the target jar 884 # default destjar to the target jar
724 [[ -z "${destjar}" ]] && destjar="${target_jar}" 885 [[ -z "${destjar}" ]] && destjar="${target_jar}"
725 886
726 local error_msg="There was a problem getting the classpath for ${target_pkg}." 887 local error_msg="There was a problem getting the classpath for ${target_pkg}."
727 local classpath 888 local classpath
728 classpath="$(java-config --classpath=${target_pkg})" 889 classpath="$(java-config ${deep} --classpath=${target_pkg})"
729 [[ $? != 0 ]] && die ${error_msg} 890 [[ $? != 0 ]] && die ${error_msg}
891
892 # When we have commas this functions is called to bring jars from multiple
893 # packages. This affects recording of dependencencies performed later
894 # which expects one package only, so we do it here.
895 if [[ ${target_pkg} = *,* ]]; then
896 for pkg in ${target_pkg//,/ }; do
897 java-pkg_ensure-dep "${build_only}" "${pkg}"
898 [[ -z "${build_only}" ]] && java-pkg_record-jar_ "${pkg}"
899 done
900 # setting this disables further record-jar_ calls later
901 build_only="build"
902 else
903 java-pkg_ensure-dep "${build_only}" "${target_pkg}"
904 fi
905
906 # Record the entire virtual as a dependency so that
907 # no jars are missed.
908 if [[ -z "${build_only}" && -n "${virtual}" ]]; then
909 java-pkg_record-jar_ "${target_pkg}"
910 # setting this disables further record-jars_ calls later
911 build_only="build"
912 fi
913
914 pushd ${destdir} > /dev/null \
915 || die "failed to change directory to ${destdir}"
730 916
731 local jar 917 local jar
732 for jar in ${classpath//:/ }; do 918 for jar in ${classpath//:/ }; do
733 local jar_name=$(basename "${jar}") 919 local jar_name=$(basename "${jar}")
734 if [[ ! -f "${jar}" ]] ; then 920 if [[ ! -f "${jar}" ]] ; then
745 elif [[ "${jar_name}" == "${target_jar}" ]] ; then 931 elif [[ "${jar_name}" == "${target_jar}" ]] ; then
746 [[ -f "${destjar}" ]] && rm "${destjar}" 932 [[ -f "${destjar}" ]] && rm "${destjar}"
747 ln -snf "${jar}" "${destjar}" \ 933 ln -snf "${jar}" "${destjar}" \
748 || die "Failed to make symlink from ${jar} to ${destjar}" 934 || die "Failed to make symlink from ${jar} to ${destjar}"
749 [[ -z "${build_only}" ]] && java-pkg_record-jar_ "${target_pkg}" "${jar}" 935 [[ -z "${build_only}" ]] && java-pkg_record-jar_ "${target_pkg}" "${jar}"
936 popd > /dev/null
750 return 0 937 return 0
751 fi 938 fi
752 done 939 done
940 popd > /dev/null
753 # if no target was specified, we're ok 941 # if no target was specified, we're ok
754 if [[ -z "${target_jar}" ]] ; then 942 if [[ -z "${target_jar}" ]] ; then
755 return 0 943 return 0
756 # otherwise, die bitterly 944 # otherwise, die bitterly
757 else 945 else
781# Example: Get the classpath for xerces-2 and xalan, 969# Example: Get the classpath for xerces-2 and xalan,
782# java-pkg_getjars xerces-2,xalan 970# java-pkg_getjars xerces-2,xalan
783# Example Return: 971# Example Return:
784# /usr/share/xerces-2/lib/xml-apis.jar:/usr/share/xerces-2/lib/xmlParserAPIs.jar:/usr/share/xalan/lib/xalan.jar 972# /usr/share/xerces-2/lib/xml-apis.jar:/usr/share/xerces-2/lib/xmlParserAPIs.jar:/usr/share/xalan/lib/xalan.jar
785# 973#
786# @param $1 - (optional) "--build-only" makes the jar(s) not added into 974# @param $opt
787# package.env DEPEND line. 975# --build-only - makes the jar(s) not added into package.env DEPEND line.
976# (assumed automatically when called inside src_test)
977# --with-dependencies - get jars also from requested package's dependencies
978# transitively.
788# @param $2 - list of packages to get jars from 979# @param $1 - list of packages to get jars from
789# (passed to java-config --classpath) 980# (passed to java-config --classpath)
790# ------------------------------------------------------------------------------ 981# ------------------------------------------------------------------------------
791java-pkg_getjars() { 982java-pkg_getjars() {
792 debug-print-function ${FUNCNAME} $* 983 debug-print-function ${FUNCNAME} $*
793 984
794 [[ ${#} -lt 1 || ${#} -gt 2 ]] && die "${FUNCNAME} takes only one or two arguments" 985 local build_only=""
986 local deep=""
795 987
988 [[ "${EBUILD_PHASE}" == "test" ]] && build_only="build"
989
990 while [[ "${1}" == --* ]]; do
796 if [[ "${1}" = "--build-only" ]]; then 991 if [[ "${1}" = "--build-only" ]]; then
797 local build_only="true" 992 build_only="build"
993 elif [[ "${1}" = "--with-dependencies" ]]; then
994 deep="--with-dependencies"
995 else
996 die "java-pkg_jar-from called with unknown parameter: ${1}"
997 fi
798 shift 998 shift
799 fi 999 done
1000
1001 [[ ${#} -ne 1 ]] && die "${FUNCNAME} takes only one argument besides --*"
1002
800 1003
801 local classpath pkgs="${1}" 1004 local classpath pkgs="${1}"
802 jars="$(java-config --classpath=${pkgs})" 1005 jars="$(java-config ${deep} --classpath=${pkgs})"
803 [[ -z "${jars}" ]] && die "java-config --classpath=${pkgs} failed" 1006 [[ $? != 0 || -z "${jars}" ]] && die "java-config --classpath=${pkgs} failed"
804 debug-print "${pkgs}:${jars}" 1007 debug-print "${pkgs}:${jars}"
1008
1009 for pkg in ${pkgs//,/ }; do
1010 java-pkg_ensure-dep "${build_only}" "${pkg}"
1011 done
805 1012
806 if [[ -z "${classpath}" ]]; then 1013 if [[ -z "${classpath}" ]]; then
807 classpath="${jars}" 1014 classpath="${jars}"
808 else 1015 else
809 classpath="${classpath}:${jars}" 1016 classpath="${classpath}:${jars}"
810 fi 1017 fi
811 1018
812 # Only record jars that aren't build-only 1019 # Only record jars that aren't build-only
813 if [[ -z "${build_only}" ]]; then 1020 if [[ -z "${build_only}" ]]; then
814 oldifs="${IFS}"
815 IFS=","
816 for pkg in ${pkgs}; do 1021 for pkg in ${pkgs//,/ }; do
817 java-pkg_record-jar_ "${pkg}" 1022 java-pkg_record-jar_ "${pkg}"
818 done 1023 done
819 IFS="${oldifs}"
820 fi 1024 fi
821 1025
822 echo "${classpath}" 1026 echo "${classpath}"
823} 1027}
824 1028
834# @example 1038# @example
835# java-pkg_getjar xerces-2 xml-apis.jar 1039# java-pkg_getjar xerces-2 xml-apis.jar
836# @example-return 1040# @example-return
837# /usr/share/xerces-2/lib/xml-apis.jar 1041# /usr/share/xerces-2/lib/xml-apis.jar
838# 1042#
839# @param $1 - (optional) "--build-only" makes the jar not added into 1043# @param $opt
840# package.env DEPEND line. 1044# --build-only - makes the jar not added into package.env DEPEND line.
1045# --virtual - Packages passed to this function are to be handled as virtuals
1046# and will not have individual jar dependencies recorded.
841# @param $1 - package to use 1047# @param $1 - package to use
842# @param $2 - jar to get 1048# @param $2 - jar to get
843# ------------------------------------------------------------------------------ 1049# ------------------------------------------------------------------------------
844java-pkg_getjar() { 1050java-pkg_getjar() {
845 debug-print-function ${FUNCNAME} $* 1051 debug-print-function ${FUNCNAME} $*
846 1052
847 local build_only="" 1053 local build_only=""
1054 local virtual=""
848 1055
1056 [[ "${EBUILD_PHASE}" == "test" ]] && build_only="build"
1057
1058 while [[ "${1}" == --* ]]; do
849 if [[ "${1}" = "--build-only" ]]; then 1059 if [[ "${1}" = "--build-only" ]]; then
850 build_only="true" 1060 build_only="build"
1061 elif [[ "${1}" == --* ]]; then
1062 virtual="true"
1063 else
1064 die "java-pkg_jar-from called with unknown parameter: ${1}"
1065 fi
851 shift 1066 shift
852 fi 1067 done
1068
1069 [[ ${#} -ne 2 ]] && die "${FUNCNAME} takes only two arguments besides --*"
853 1070
854 local pkg="${1}" target_jar="${2}" jar 1071 local pkg="${1}" target_jar="${2}" jar
855 [[ -z ${pkg} ]] && die "Must specify package to get a jar from" 1072 [[ -z ${pkg} ]] && die "Must specify package to get a jar from"
856 [[ -z ${target_jar} ]] && die "Must specify jar to get" 1073 [[ -z ${target_jar} ]] && die "Must specify jar to get"
857 1074
858 local error_msg="Could not find classpath for ${pkg}. Are you sure its installed?" 1075 local error_msg="Could not find classpath for ${pkg}. Are you sure its installed?"
859 local classpath 1076 local classpath
860 classpath=$(java-config --classpath=${pkg}) 1077 classpath=$(java-config --classpath=${pkg})
861 [[ $? != 0 ]] && die ${error_msg} 1078 [[ $? != 0 ]] && die ${error_msg}
1079
1080 java-pkg_ensure-dep "${build_only}" "${pkg}"
1081
1082 # Record the package(Virtual) as a dependency and then set build_only
1083 # So that individual jars are not recorded.
1084 if [[ -n "${virtual}" ]]; then
1085 java-pkg_record-jar_ "${pkg}"
1086 build_only="true"
1087 fi
862 1088
863 for jar in ${classpath//:/ }; do 1089 for jar in ${classpath//:/ }; do
864 if [[ ! -f "${jar}" ]] ; then 1090 if [[ ! -f "${jar}" ]] ; then
865 die "Installation problem with jar ${jar} in ${pkg} - is it installed?" 1091 die "Installation problem with jar ${jar} in ${pkg} - is it installed?"
866 fi 1092 fi
873 fi 1099 fi
874 done 1100 done
875 1101
876 die "Could not find ${target_jar} in ${pkg}" 1102 die "Could not find ${target_jar} in ${pkg}"
877 return 1 1103 return 1
1104}
1105
1106# ------------------------------------------------------------------------------
1107# @ebuild-function java-pkg_register-dependency
1108#
1109# Registers runtime dependency on a package, list of packages, or a single jar
1110# from a package, into package.env DEPEND line. Can only be called in
1111# src_install phase.
1112# Intended for binary packages where you don't need to symlink the jars or get
1113# their classpath during build. As such, the dependencies only need to be
1114# specified in ebuild's RDEPEND, and should be omitted in DEPEND.
1115#
1116# @param $1 - comma-separated list of packages, or a single package
1117# @param $2 - if param $1 is a single package, optionally specify the jar
1118# to depend on
1119#
1120# Example: Record the dependency on whole xerces-2 and xalan,
1121# java-pkg_register-dependency xerces-2,xalan
1122# Example: Record the dependency on ant.jar from ant-core
1123# java-pkg_register-dependency ant-core ant.jar
1124#
1125# Note: Passing both list of packages as the first parameter AND specifying the
1126# jar as the second is not allowed and will cause the function to die. We assume
1127# that there's more chance one passes such combination as a mistake, than that
1128# there are more packages providing identically named jar without class
1129# collisions.
1130# ------------------------------------------------------------------------------
1131java-pkg_register-dependency() {
1132 debug-print-function ${FUNCNAME} $*
1133
1134 java-pkg_check-phase install
1135
1136 [[ ${#} -gt 2 ]] && die "${FUNCNAME} takes at most two arguments"
1137
1138 local pkgs="${1}"
1139 local jar="${2}"
1140
1141 [[ -z "${pkgs}" ]] && die "${FUNCNAME} called with no package(s) specified"
1142
1143 if [[ -z "${jar}" ]]; then
1144 for pkg in ${pkgs//,/ }; do
1145 java-pkg_ensure-dep runtime "${pkg}"
1146 java-pkg_record-jar_ "${pkg}"
1147 done
1148 else
1149 [[ ${pkgs} == *,* ]] && \
1150 die "${FUNCNAME} called with both package list and jar name"
1151 java-pkg_ensure-dep runtime "${pkgs}"
1152 java-pkg_record-jar_ "${pkgs}" "${jar}"
1153 fi
1154
1155 java-pkg_do_write_
1156}
1157
1158# ------------------------------------------------------------------------------
1159# @ebuild-function java-pkg_register-optional-dependency
1160#
1161# Registers optional runtime dependency on a package, list of packages, or a
1162# single jar from a package, into package.env OPTIONAL_DEPEND line. Can only be
1163# called in src_install phase.
1164# Intended for packages that can use other packages when those are in classpath.
1165# Will be put on classpath by launcher if they are installed. Typical case is
1166# JDBC implementations for various databases. It's better than having USE flag
1167# for each implementation triggering hard dependency.
1168#
1169# @param $1 - comma-separated list of packages, or a single package
1170# @param $2 - if param $1 is a single package, optionally specify the jar
1171# to depend on
1172#
1173# Example: Record the optional dependency on some jdbc providers
1174# java-pkg_register-optional-dependency jdbc-jaybird,jtds-1.2,jdbc-mysql
1175#
1176# Note: Passing both list of packages as the first parameter AND specifying the
1177# jar as the second is not allowed and will cause the function to die. We assume
1178# that there's more chance one passes such combination as a mistake, than that
1179# there are more packages providing identically named jar without class
1180# collisions.
1181# ------------------------------------------------------------------------------
1182java-pkg_register-optional-dependency() {
1183 debug-print-function ${FUNCNAME} $*
1184
1185 java-pkg_check-phase install
1186
1187 [[ ${#} -gt 2 ]] && die "${FUNCNAME} takes at most two arguments"
1188
1189 local pkgs="${1}"
1190 local jar="${2}"
1191
1192 [[ -z "${pkgs}" ]] && die "${FUNCNAME} called with no package(s) specified"
1193
1194 if [[ -z "${jar}" ]]; then
1195 for pkg in ${pkgs//,/ }; do
1196 java-pkg_record-jar_ --optional "${pkg}"
1197 done
1198 else
1199 [[ ${pkgs} == *,* ]] && \
1200 die "${FUNCNAME} called with both package list and jar name"
1201 java-pkg_record-jar_ --optional "${pkgs}" "${jar}"
1202 fi
1203
1204 java-pkg_do_write_
1205}
1206
1207# ------------------------------------------------------------------------------
1208# @ebuild-function java-pkg_register-environment-variable
1209#
1210# Register an arbitrary environment variable into package.env. The gjl launcher
1211# for this package or any package depending on this will export it into
1212# environement before executing java command.
1213# Must only be called in src_install phase.
1214#
1215# @param $1 - variable name
1216# @param $2 - variable value
1217# ------------------------------------------------------------------------------
1218JAVA_PKG_EXTRA_ENV="${T}/java-pkg-extra-env"
1219JAVA_PKG_EXTRA_ENV_VARS=""
1220java-pkg_register-environment-variable() {
1221 debug-print-function ${FUNCNAME} $*
1222
1223 java-pkg_check-phase install
1224
1225 [[ ${#} != 2 ]] && die "${FUNCNAME} takes two arguments"
1226
1227 echo "${1}=\"${2}\"" >> ${JAVA_PKG_EXTRA_ENV}
1228 JAVA_PKG_EXTRA_ENV_VARS="${JAVA_PKG_EXTRA_ENV_VARS} ${1}"
1229
1230 java-pkg_do_write_
878} 1231}
879 1232
880# This function reads stdin, and based on that input, figures out how to 1233# This function reads stdin, and based on that input, figures out how to
881# populate jars from the filesystem. 1234# populate jars from the filesystem.
882# Need to figure out a good way of making use of this, ie be able to use a 1235# Need to figure out a good way of making use of this, ie be able to use a
999# 1352#
1000# export DEPEND="${DEPEND} ${depstr}" 1353# export DEPEND="${DEPEND} ${depstr}"
1001# export RDEPEND="${RDEPEND} ${depstr}" 1354# export RDEPEND="${RDEPEND} ${depstr}"
1002#} 1355#}
1003 1356
1357# ------------------------------------------------------------------------------
1358# @ebuild-function java-pkg_find-normal-jars
1359#
1360# Find the files with suffix .jar file in the given directory or $WORKDIR
1361#
1362# @param $1 - The directory to search for jar files (default: ${WORKDIR})
1363# ------------------------------------------------------------------------------
1364java-pkg_find-normal-jars() {
1365 local dir=$1
1366 [[ "${dir}" ]] || dir="${WORKDIR}"
1367 local found
1368 for jar in $(find "${dir}" -name "*.jar" -type f); do
1369 echo "${jar}"
1370 found="true"
1371 done
1372 [[ "${found}" ]]
1373 return $?
1374}
1375
1376# ------------------------------------------------------------------------------
1377# @ebuild-function java-pkg_ensure-no-bundled-jars
1378#
1379# Try to locate bundled jar files in ${WORKDIR} and die if found.
1004# This should be used after S has been populated with symlinks to jars 1380# This function should be called after WORKDIR has been populated with symlink
1005# TODO document 1381# to system jar files or bundled jars removed.
1382# ------------------------------------------------------------------------------
1006java-pkg_ensure-no-bundled-jars() { 1383java-pkg_ensure-no-bundled-jars() {
1007 debug-print-function ${FUNCNAME} $* 1384 debug-print-function ${FUNCNAME} $*
1008 pushd ${WORKDIR} >/dev/null 2>/dev/null
1009 1385
1010 local bundled_jars=$(find . -name "*.jar" -type f) 1386 local bundled_jars=$(java-pkg_find-normal-jars)
1011 if [[ -n ${bundled_jars} ]]; then 1387 if [[ -n ${bundled_jars} ]]; then
1012 echo "Bundled jars found:" 1388 echo "Bundled jars found:"
1013 local jar 1389 local jar
1014 for jar in ${bundled_jars}; do 1390 for jar in ${bundled_jars}; do
1015 echo $(pwd)${jar/./} 1391 echo $(pwd)${jar/./}
1016 done 1392 done
1017 die "Bundled jars found!" 1393 die "Bundled jars found!"
1018
1019 fi 1394 fi
1020 popd >/dev/null 2>/dev/null
1021} 1395}
1022 1396
1023# ------------------------------------------------------------------------------ 1397# ------------------------------------------------------------------------------
1024# @internal-function java-pkg_ensure-vm-version-sufficient 1398# @internal-function java-pkg_ensure-vm-version-sufficient
1025# 1399#
1174# @ebuild-function java-pkg_get-target 1548# @ebuild-function java-pkg_get-target
1175# 1549#
1176# Determines what target version should be used, for passing to -target. 1550# Determines what target version should be used, for passing to -target.
1177# If you don't care about lower versions, you can set _WANT_TARGET to the 1551# If you don't care about lower versions, you can set _WANT_TARGET to the
1178# version of your JDK. 1552# version of your JDK.
1179# Remember doing this will mostly like cause things to break.
1180# Doesn't allow it to be lower then the one in depend.
1181# Doesn't allow it to be higher then the active vm.
1182# 1553#
1183# @return string - Either the lowest possible target, or JAVA_PKG_WANT_TARGET 1554# @return string - Either the lowest possible target, or JAVA_PKG_WANT_TARGET
1184# ------------------------------------------------------------------------------ 1555# ------------------------------------------------------------------------------
1185java-pkg_get-target() { 1556java-pkg_get-target() {
1186 local min=$(depend-java-query --get-lowest "${DEPEND} ${RDEPEND}")
1187 if [[ -n "${JAVA_PKG_WANT_TARGET}" ]]; then
1188 local max="$(java-config --select-vm "${GENTOO_VM}" -g PROVIDES_VERSION)"
1189 if version_is_at_least "${min}" "${JAVA_PKG_WANT_TARGET}" && version_is_at_least "${JAVA_PKG_WANT_TARGET}" "${max}"; then
1190 echo ${JAVA_PKG_WANT_TARGET}
1191 else
1192 echo ${min}
1193 fi
1194 else
1195 echo ${min}
1196 fi
1197
1198 #echo ${JAVA_PKG_WANT_TARGET:-$(depend-java-query --get-lowest "${DEPEND}")} 1557 echo ${JAVA_PKG_WANT_TARGET:-$(depend-java-query --get-lowest "${DEPEND} ${RDEPEND}")}
1199} 1558}
1200 1559
1201java-pkg_get-javac() { 1560java-pkg_get-javac() {
1202 debug-print-function ${FUNCNAME} $* 1561 debug-print-function ${FUNCNAME} $*
1203 1562
1292 die "No GCJ support found!" 1651 die "No GCJ support found!"
1293 fi 1652 fi
1294} 1653}
1295 1654
1296java-pkg_ensure-test() { 1655java-pkg_ensure-test() {
1297 if hasq test ${FEATURES} && ! hasq -test ${FEATURES} && ! use test; then 1656 if hasq test ${FEATURES} && ! hasq -test ${FEATURES} \
1657 && hasq test ${IUSE} && ! use test;
1658 then
1298 eerror "You specified FEATURES=test, but USE=test is needed" 1659 eerror "You specified FEATURES=test, but USE=test is needed"
1299 eerror "to pull in the additional dependencies for testing" 1660 eerror "to pull in the additional dependencies for testing"
1300 die "Need USE=test enabled" 1661 die "Need USE=test enabled"
1301 fi 1662 fi
1302} 1663}
1303 1664
1304# ------------------------------------------------------------------------------ 1665# ------------------------------------------------------------------------------
1666# @ebuild-function java-pkg_register-ant-task
1667#
1668# Register this package as ant task, so that ant will load it when no specific
1669# ANT_TASKS are specified. Note that even without this registering, all packages
1670# specified in ANT_TASKS will be loaded. Mostly used by the actual ant tasks
1671# packages, but can be also used by other ebuilds that used to symlink their
1672# .jar into /usr/share/ant-core/lib to get autoloaded, for backwards
1673# compatibility.
1674#
1675# @param --version x.y Register only for ant version x.y (otherwise for any ant
1676# version). Used by the ant-* packages to prevent loading of mismatched
1677# ant-core ant tasks after core was updated, before the tasks are updated,
1678# without a need for blockers.
1679# @param $1 Name to register as. Defaults to JAVA_PKG_NAME ($PN[-$SLOT])
1680# ------------------------------------------------------------------------------
1681java-pkg_register-ant-task() {
1682 local TASKS_DIR="tasks"
1683
1684 # check for --version x.y parameters
1685 while [[ -n "${1}" && -n "${2}" ]]; do
1686 local var="${1#--}"
1687 local val="${2}"
1688 if [[ "${var}" == "version" ]]; then
1689 TASKS_DIR="tasks-${val}"
1690 else
1691 die "Unknown parameter passed to java-pkg_register-ant-tasks: ${1} ${2}"
1692 fi
1693 shift 2
1694 done
1695
1696 local TASK_NAME="${1:-${JAVA_PKG_NAME}}"
1697
1698 dodir /usr/share/ant/${TASKS_DIR}
1699 touch "${D}/usr/share/ant/${TASKS_DIR}/${TASK_NAME}"
1700}
1701
1702# ------------------------------------------------------------------------------
1703# @internal-function java-pkg_ant-tasks-from-deps
1704#
1705# Function to determine ANT_TASKS from DEPEND variable for backwards
1706# compatibility with ebuilds that don't set ANT_TASKS before calling eant() or
1707# WANT_ANT_TASKS before inheriting java-pkg-2. If the DEPEND string contains
1708# "dev-java/ant" or "dev-java/ant-tasks", then it returns "all", otherwise
1709# "none". It's not smart enough to cope with USE flag depends but that shouldn't
1710# be a problem, the worst it can do is activace all tasks when not needed.
1711# Note that this is called only with JAVA_PKG_STRICT=1, to find ebuilds with
1712# insufficient dependencies, otherwise all available tasks are used for
1713# backwards compatilbility.
1714#
1715# @return "all" or "none"
1716# ------------------------------------------------------------------------------
1717java-pkg_ant-tasks-from-deps() {
1718 local found_ant found_ant_tasks
1719
1720 for dep in ${DEPEND}
1721 do
1722 local ant="$(awk '/(dev-java\/ant)/ { if (match($1, "(dev-java/ant)((-[0-9])+|$)", m)) print m[1] }' <<< ${dep})"
1723 [[ "${ant}" == "dev-java/ant" ]] && found_ant=true
1724 [[ "${dep}" == *"ant-tasks"* ]] && found_ant_tasks=true
1725 done
1726
1727 if [[ -n "${found_ant}" || -n "${found_ant_tasks}" ]]; then
1728 java-pkg_announce-qa-violation --nodie "The ebuild DEPENDS on deprecated ant or ant-tasks"
1729 echo "all"
1730 else
1731 # ebuild doesn't set ANT_TASKS and doesn't depend on ant-tasks or ant
1732 # so we deactivate all tasks that may be installed
1733 echo "none"
1734 fi
1735}
1736
1737# ------------------------------------------------------------------------------
1738# @internal-function java-pkg_ant-tasks-depend
1739#
1740# Translates the WANT_ANT_TASKS variable into valid dependencies.
1741# ------------------------------------------------------------------------------
1742java-pkg_ant-tasks-depend() {
1743 debug-print-function ${FUNCNAME} ${WANT_ANT_TASKS}
1744
1745 if [[ -n "${WANT_ANT_TASKS}" ]]; then
1746 local DEP=""
1747 for i in ${WANT_ANT_TASKS}
1748 do
1749 if [[ ${i} != ant-* ]]; then
1750 echo "Invalid atom in WANT_ANT_TASKS: ${i}"
1751 return 1
1752 fi
1753 DEP="${DEP}dev-java/${i} "
1754 done
1755 echo ${DEP}
1756 return 0
1757 else
1758 return 0
1759 fi
1760}
1761
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 for atom in $(cat ${JAVA_PKG_DEPEND_FILE} | tr : ' '); do
1781 pkgs=${pkgs},$(echo ${atom} | sed -re "s/^.*@//")
1782 done
1783
1784 local cp=$(java-pkg_getjars --with-dependencies junit${pkgs})
1785 if [[ ${1} = -cp || ${1} = -classpath ]]; then
1786 cp="${2}:${cp}"
1787 shift 2
1788 else
1789 cp=".:${cp}"
1790 fi
1791
1792 local runner=junit.textui.TestRunner
1793 debug-print "Calling: java -cp \"${cp}\" -Djava.awt.headless=true ${runner} ${@}"
1794 java -cp "${cp}" -Djava.awt.headless=true ${runner} "${@}" || die "Running junit failed"
1795}
1796
1797# ------------------------------------------------------------------------------
1305# @section-end helper 1798# @section-end helper
1306# ------------------------------------------------------------------------------ 1799# ------------------------------------------------------------------------------
1307 1800
1308# ------------------------------------------------------------------------------ 1801# ------------------------------------------------------------------------------
1309# @section-begin build 1802# @section-begin build
1315 1808
1316# ------------------------------------------------------------------------------ 1809# ------------------------------------------------------------------------------
1317# @ebuild-function eant 1810# @ebuild-function eant
1318# 1811#
1319# Ant wrapper function. Will use the appropriate compiler, based on user-defined 1812# Ant wrapper function. Will use the appropriate compiler, based on user-defined
1320# compiler. 1813# compiler. Will also set proper ANT_TASKS from the variable ANT_TASKS,
1321# 1814# variables:
1815# EANT_GENTOO_CLASSPATH - calls java-pkg_getjars for the value and adds to the
1816# gentoo.classpath property. Be sure to call
1817# java-ant_rewrite-classpath in src_unpack.
1818# JAVA_PKG_NO_BUNDLED_SEARCH - Don't search for bundled jars or class files
1819# *ANT_TASKS - used to determine ANT_TASKS before calling Ant.
1322# ------------------------------------------------------------------------------ 1820# ------------------------------------------------------------------------------
1323eant() { 1821eant() {
1324 debug-print-function ${FUNCNAME} $* 1822 debug-print-function ${FUNCNAME} $*
1325 1823
1326 # FIXME get this working 1824 if [[ ${EBUILD_PHASE} = compile ]]; then
1327# if is-java-strict && [[ ! ${DEPEND} =~ "dev-java/ant" ]]; then 1825 # Used to be done in hooks in java-ant-2.eclass but moved here so that we can
1826 # finally get rid of the hooks without breaking stuff
1827
1828 [[ "${JAVA_ANT_IGNORE_SYSTEM_CLASSES}" && "${JAVA_PKG_BSFIX}" ]] \
1829 && java-ant_ignore-system-classes "${S}/build.xml"
1830
1831 if hasq java-ant-2 ${INHERITED}; then
1832 java-ant_bsfix
1833 fi
1834
1835 # eant can be called multiple times
1836 JAVA_PKG_BSFIX="off"
1837
1838 if [[ -z ${JAVA_PKG_NO_BUNDLED_SEARCH} ]] && is-java-strict; then
1839 echo "Searching for bundled jars:"
1840 java-pkg_find-normal-jars || echo "None found."
1841 echo "Searching for bundled classes (no output if none found):"
1842 find "${WORKDIR}" -name "*.class"
1843 echo "Search done."
1844 JAVA_PKG_NO_BUNDLED_SEARCH=true # eant can be called many times
1845 fi
1846 fi
1847
1848 if ! hasq java-ant-2 ${INHERITED}; then
1849 local msg="You should inherit java-ant-2 when using eant"
1328# java-pkg_announce-qa-violation \ 1850 java-pkg_announce-qa-violation "${msg}"
1329# "Using eant, but not depending on dev-java/ant or dev-java/ant-core"
1330# fi 1851 fi
1331 1852
1332 local antflags 1853 local antflags="-Dnoget=true -Dmaven.mode.offline=true -Dbuild.sysclasspath=ignore"
1854
1333 java-pkg_init-compiler_ 1855 java-pkg_init-compiler_
1334 local compiler="${GENTOO_COMPILER}" 1856 local compiler="${GENTOO_COMPILER}"
1335 1857
1336 local compiler_env="${JAVA_PKG_COMPILER_DIR}/${compiler}" 1858 local compiler_env="${JAVA_PKG_COMPILER_DIR}/${compiler}"
1337
1338 local build_compiler="$(source ${compiler_env} 1>/dev/null 2>&1; echo ${ANT_BUILD_COMPILER})" 1859 local build_compiler="$(source ${compiler_env} 1>/dev/null 2>&1; echo ${ANT_BUILD_COMPILER})"
1339 if [[ "${compiler}" != "javac" && -z "${build_compiler}" ]]; then 1860 if [[ "${compiler}" != "javac" && -z "${build_compiler}" ]]; then
1340 die "ANT_BUILD_COMPILER undefined in ${compiler_env}" 1861 die "ANT_BUILD_COMPILER undefined in ${compiler_env}"
1341 fi 1862 fi
1342 1863
1343 if [[ ${compiler} != "javac" ]]; then 1864 if [[ ${compiler} != "javac" ]]; then
1344 antflags="-Dbuild.compiler=${build_compiler}" 1865 antflags="${antflags} -Dbuild.compiler=${build_compiler}"
1345 # Figure out any extra stuff to put on the classpath for compilers aside 1866 # Figure out any extra stuff to put on the classpath for compilers aside
1346 # from javac 1867 # from javac
1347 # ANT_BUILD_COMPILER_DEPS should be something that could be passed to 1868 # ANT_BUILD_COMPILER_DEPS should be something that could be passed to
1348 # java-config -p 1869 # java-config -p
1349 local build_compiler_deps="$(source ${JAVA_PKG_COMPILER_DIR}/${compiler} 1>/dev/null 2>&1; echo ${ANT_BUILD_COMPILER_DEPS})" 1870 local build_compiler_deps="$(source ${JAVA_PKG_COMPILER_DIR}/${compiler} 1>/dev/null 2>&1; echo ${ANT_BUILD_COMPILER_DEPS})"
1350 if [[ -n ${build_compiler_deps} ]]; then 1871 if [[ -n ${build_compiler_deps} ]]; then
1351 antflags="${antflags} -lib $(java-config -p ${build_compiler_deps})" 1872 antflags="${antflags} -lib $(java-config -p ${build_compiler_deps})"
1352 fi 1873 fi
1353 fi 1874 fi
1354 1875
1876 for arg in "${@}"; do
1877 if [[ ${arg} = -lib ]]; then
1878 if is-java-strict; then
1879 eerror "You should not use the -lib argument to eant because it will fail"
1880 eerror "with JAVA_PKG_STRICT. Please use for example java-pkg_jar-from"
1881 eerror "or ant properties to make dependencies available."
1882 eerror "For ant tasks use WANT_ANT_TASKS or ANT_TASKS from."
1883 eerror "split ant (>=dev-java/ant-core-1.7)."
1884 die "eant -lib is deprecated/forbidden"
1885 else
1886 echo "eant -lib is deprecated. Turn JAVA_PKG_STRICT on for"
1887 echo "more info."
1888 fi
1889 fi
1890 done
1891
1892 # we use this in src_* so we run ant from /
1893 if ROOT=/ has_version ">=dev-java/ant-core-1.7.0"; then
1894 # default ANT_TASKS to WANT_ANT_TASKS, if ANT_TASKS is not set explicitly
1895 ANT_TASKS="${ANT_TASKS:-${WANT_ANT_TASKS}}"
1896
1897 # override ANT_TASKS with JAVA_PKG_FORCE_ANT_TASKS if it's set
1898 ANT_TASKS="${JAVA_PKG_FORCE_ANT_TASKS:-${ANT_TASKS}}"
1899
1355 if is-java-strict; then 1900 if is-java-strict; then
1356 einfo "Disabling system classpath for ant" 1901 # if ant-tasks were not set by ebuild or forced, try to determine them from depends
1357 antflags="${antflags} -Dbuild.sysclasspath=ignore" 1902 if [[ -z "${ANT_TASKS}" ]]; then
1903 ANT_TASKS="$(java-pkg_ant-tasks-from-deps)"
1904 fi
1905 else
1906 # if ant-tasks is not set by ebuild or forced, activate all of them
1907 ANT_TASKS="${ANT_TASKS:-all}"
1358 fi 1908 fi
1359 1909
1360 if [[ -n ${JAVA_PKG_DEBUG} ]]; then 1910 # at this point, ANT_TASKS should be "all", "none" or explicit list
1361 antflags="${antflags} -debug" 1911 if [[ "${ANT_TASKS}" == "all" ]]; then
1912 einfo "Using all available ANT_TASKS"
1913 elif [[ "${ANT_TASKS}" == "none" ]]; then
1914 einfo "Disabling all optional ANT_TASKS"
1915 else
1916 einfo "Using following ANT_TASKS: ${ANT_TASKS}"
1917 fi
1918
1919 export ANT_TASKS
1920 fi
1921
1922 [[ -n ${JAVA_PKG_DEBUG} ]] && antflags="${antflags} --execdebug -debug"
1923 [[ -n ${PORTAGE_QUIET} ]] && antflags="${antflags} -q"
1924
1925 local gcp="${EANT_GENTOO_CLASSPATH}"
1926 local getjarsarg=""
1927
1928 if [[ ${EBUILD_PHASE} = "test" ]]; then
1929 antflags="${antflags} -DJunit.present=true"
1930 [[ ${gcp} && ${ANT_TASKS} = *ant-junit* ]] && gcp="${gcp} junit"
1931 getjarsarg="--with-dependencies"
1932 fi
1933
1934 local cp
1935
1936 for atom in ${gcp}; do
1937 cp="${cp}:$(java-pkg_getjars ${getjarsarg} ${atom})"
1938 done
1939
1940 if [[ ${cp} ]]; then
1941 # It seems ant does not like single quotes around ${cp}
1942 antflags="${antflags} -Dgentoo.classpath=\"${cp#:}\""
1362 fi 1943 fi
1363 1944
1364 [[ -n ${JAVA_PKG_DEBUG} ]] && echo ant ${antflags} "${@}" 1945 [[ -n ${JAVA_PKG_DEBUG} ]] && echo ant ${antflags} "${@}"
1946 debug-print "Calling ant (GENTOO_VM: ${GENTOO_VM}): ${antflags} ${@}"
1365 ant ${antflags} "${@}" || die "eant failed" 1947 ant ${antflags} "${@}" || die "eant failed"
1366
1367} 1948}
1368 1949
1369# ------------------------------------------------------------------------------ 1950# ------------------------------------------------------------------------------
1370# @ebuild-function ejavac 1951# @ebuild-function ejavac
1371# 1952#
1440# ------------------------------------------------------------------------------ 2021# ------------------------------------------------------------------------------
1441use_doc() { 2022use_doc() {
1442 use doc && echo ${@:-javadoc} 2023 use doc && echo ${@:-javadoc}
1443} 2024}
1444 2025
2026
1445# ------------------------------------------------------------------------------ 2027# ------------------------------------------------------------------------------
1446# @section-end build 2028# @section-end build
1447# ------------------------------------------------------------------------------ 2029# ------------------------------------------------------------------------------
1448 2030
1449# ------------------------------------------------------------------------------ 2031# ------------------------------------------------------------------------------
1465# This shouldn't be used directly. Instead, java-pkg and java-pkg-opt will 2047# This shouldn't be used directly. Instead, java-pkg and java-pkg-opt will
1466# call it during each of the phases of the merge process. 2048# call it during each of the phases of the merge process.
1467# 2049#
1468# ----------------------------------------------------------------------------- 2050# -----------------------------------------------------------------------------
1469java-pkg_init() { 2051java-pkg_init() {
2052 debug-print-function ${FUNCNAME} $*
1470 unset JAVAC 2053 unset JAVAC
1471 unset JAVA_HOME 2054 unset JAVA_HOME
2055
2056 # People do all kinds of weird things.
2057 # http://forums.gentoo.org/viewtopic-p-3943166.html
2058 local silence="${SILENCE_JAVA_OPTIONS_WARNING}"
2059 local accept="${I_WANT_GLOBAL_JAVA_OPTIONS}"
2060 if [[ -n ${_JAVA_OPTIONS} && -z ${accept} && -z ${silence} ]]; then
2061 ewarn "_JAVA_OPTIONS changes what java -version outputs at least for"
2062 ewarn "sun-jdk vms and and as such break configure scripts that"
2063 ewarn "use it (for example app-office/openoffice) so we filter it out."
2064 ewarn "Use SILENCE_JAVA_OPTIONS_WARNING=true in the environment (use"
2065 ewarn "make.conf for example) to silence this warning or"
2066 ewarn "I_WANT_GLOBAL_JAVA_OPTIONS to not filter it."
2067 fi
2068
2069 if [[ -z ${accept} ]]; then
2070 # export _JAVA_OPTIONS= doesn't work because it will show up in java
2071 # -version output
2072 unset _JAVA_OPTIONS
2073 # phase hooks make this run many times without this
2074 I_WANT_GLOBAL_JAVA_OPTIONS="true"
2075 fi
2076
2077 if java-pkg_func-exists ant_src_unpack; then
2078 java-pkg_announce-qa-violation "Using old ant_src_unpack. Should be src_unpack"
2079 fi
2080
1472 java-pkg_init_paths_ 2081 java-pkg_init_paths_
1473 java-pkg_switch-vm 2082 java-pkg_switch-vm
1474 PATH=${JAVA_HOME}/bin:${PATH} 2083 PATH=${JAVA_HOME}/bin:${PATH}
1475 2084
1476 # TODO we will probably want to set JAVAC and JAVACFLAGS 2085 # TODO we will probably want to set JAVAC and JAVACFLAGS
1477 2086
1478 # Do some QA checks 2087 # Do some QA checks
1479 java-pkg_check-jikes 2088 java-pkg_check-jikes
2089
2090 # Can't use unset here because Portage does not save the unset
2091 # see https://bugs.gentoo.org/show_bug.cgi?id=189417#c11
1480 2092
1481 # When users have crazy classpaths some packages can fail to compile. 2093 # When users have crazy classpaths some packages can fail to compile.
1482 # and everything should work with empty CLASSPATH. 2094 # and everything should work with empty CLASSPATH.
1483 # This also helps prevent unexpected dependencies on random things 2095 # This also helps prevent unexpected dependencies on random things
1484 # from the CLASSPATH. 2096 # from the CLASSPATH.
1485 unset CLASSPATH 2097 export CLASSPATH=
2098
2099 # Unset external ANT_ stuff
2100 export ANT_TASKS=
2101 export ANT_OPTS=
1486} 2102}
1487 2103
1488# ------------------------------------------------------------------------------ 2104# ------------------------------------------------------------------------------
1489# @function-internal java-pkg-init-compiler_ 2105# @function-internal java-pkg-init-compiler_
1490# 2106#
1612 fi 2228 fi
1613 2229
1614 JAVA_PKG_SHAREPATH="${DESTTREE}/share/${JAVA_PKG_NAME}" 2230 JAVA_PKG_SHAREPATH="${DESTTREE}/share/${JAVA_PKG_NAME}"
1615 JAVA_PKG_SOURCESPATH="${JAVA_PKG_SHAREPATH}/sources/" 2231 JAVA_PKG_SOURCESPATH="${JAVA_PKG_SHAREPATH}/sources/"
1616 JAVA_PKG_ENV="${D}${JAVA_PKG_SHAREPATH}/package.env" 2232 JAVA_PKG_ENV="${D}${JAVA_PKG_SHAREPATH}/package.env"
2233 JAVA_PKG_VIRTUALS_PATH="${DESTTREE}/share/java-config-2/virtuals"
2234 JAVA_PKG_VIRTUAL_PROVIDER="${D}/${JAVA_PKG_VIRTUALS_PATH}/${JAVA_PKG_NAME}"
1617 2235
1618 [[ -z "${JAVA_PKG_JARDEST}" ]] && JAVA_PKG_JARDEST="${JAVA_PKG_SHAREPATH}/lib" 2236 [[ -z "${JAVA_PKG_JARDEST}" ]] && JAVA_PKG_JARDEST="${JAVA_PKG_SHAREPATH}/lib"
1619 [[ -z "${JAVA_PKG_LIBDEST}" ]] && JAVA_PKG_LIBDEST="${DESTTREE}/$(get_libdir)/${JAVA_PKG_NAME}" 2237 [[ -z "${JAVA_PKG_LIBDEST}" ]] && JAVA_PKG_LIBDEST="${DESTTREE}/$(get_libdir)/${JAVA_PKG_NAME}"
1620 [[ -z "${JAVA_PKG_WARDEST}" ]] && JAVA_PKG_WARDEST="${JAVA_PKG_SHAREPATH}/webapps" 2238 [[ -z "${JAVA_PKG_WARDEST}" ]] && JAVA_PKG_WARDEST="${JAVA_PKG_SHAREPATH}/webapps"
1621 2239
1634# Writes the package.env out to disk. 2252# Writes the package.env out to disk.
1635# 2253#
1636# ------------------------------------------------------------------------------ 2254# ------------------------------------------------------------------------------
1637# TODO change to do-write, to match everything else 2255# TODO change to do-write, to match everything else
1638java-pkg_do_write_() { 2256java-pkg_do_write_() {
2257 debug-print-function ${FUNCNAME} $*
1639 java-pkg_init_paths_ 2258 java-pkg_init_paths_
1640 # Create directory for package.env 2259 # Create directory for package.env
1641 dodir "${JAVA_PKG_SHAREPATH}" 2260 dodir "${JAVA_PKG_SHAREPATH}"
1642 if [[ -n "${JAVA_PKG_CLASSPATH}" || -n "${JAVA_PKG_LIBRARY}" || -f "${JAVA_PKG_DEPEND}" ]]; then 2261 if [[ -n "${JAVA_PKG_CLASSPATH}" || -n "${JAVA_PKG_LIBRARY}" || -f \
2262 "${JAVA_PKG_DEPEND_FILE}" || -f \
2263 "${JAVA_PKG_OPTIONAL_DEPEND_FILE}" ]]; then
1643 # Create package.env 2264 # Create package.env
1644 ( 2265 (
1645 echo "DESCRIPTION=\"${DESCRIPTION}\"" 2266 echo "DESCRIPTION=\"${DESCRIPTION}\""
1646 echo "GENERATION=\"2\"" 2267 echo "GENERATION=\"2\""
1647 2268
1648 [[ -n "${JAVA_PKG_CLASSPATH}" ]] && echo "CLASSPATH=\"${JAVA_PKG_CLASSPATH}\"" 2269 [[ -n "${JAVA_PKG_CLASSPATH}" ]] && echo "CLASSPATH=\"${JAVA_PKG_CLASSPATH}\""
1649 [[ -n "${JAVA_PKG_LIBRARY}" ]] && echo "LIBRARY_PATH=\"${JAVA_PKG_LIBRARY}\"" 2270 [[ -n "${JAVA_PKG_LIBRARY}" ]] && echo "LIBRARY_PATH=\"${JAVA_PKG_LIBRARY}\""
1650 [[ -n "${JAVA_PROVIDE}" ]] && echo "PROVIDES=\"${JAVA_PROVIDE}\"" 2271 [[ -n "${JAVA_PROVIDE}" ]] && echo "PROVIDES=\"${JAVA_PROVIDE}\""
1651 [[ -f "${JAVA_PKG_DEPEND}" ]] && echo "DEPEND=\"$(cat ${JAVA_PKG_DEPEND} | uniq | tr '\n' ':')\"" 2272 [[ -f "${JAVA_PKG_DEPEND_FILE}" ]] \
2273 && echo "DEPEND=\"$(cat "${JAVA_PKG_DEPEND_FILE}" | uniq | tr '\n' ':')\""
2274 [[ -f "${JAVA_PKG_OPTIONAL_DEPEND_FILE}" ]] \
2275 && echo "OPTIONAL_DEPEND=\"$(cat "${JAVA_PKG_OPTIONAL_DEPEND_FILE}" | uniq | tr '\n' ':')\""
1652 echo "VM=\"$(echo ${RDEPEND} ${DEPEND} | sed -e 's/ /\n/g' | sed -n -e '/virtual\/\(jre\|jdk\)/ { p;q }')\"" # TODO cleanup ! 2276 echo "VM=\"$(echo ${RDEPEND} ${DEPEND} | sed -e 's/ /\n/g' | sed -n -e '/virtual\/\(jre\|jdk\)/ { p;q }')\"" # TODO cleanup !
1653 ) > "${JAVA_PKG_ENV}" 2277 ) > "${JAVA_PKG_ENV}"
1654 2278
1655 # register target/source 2279 # register target/source
1656 local target="$(java-pkg_get-target)" 2280 local target="$(java-pkg_get-target)"
1667 2291
1668 2292
1669 echo "MERGE_VM=\"${GENTOO_VM}\"" >> "${JAVA_PKG_ENV}" 2293 echo "MERGE_VM=\"${GENTOO_VM}\"" >> "${JAVA_PKG_ENV}"
1670 [[ -n ${GENTOO_COMPILER} ]] && echo "MERGE_COMPILER=\"${GENTOO_COMPILER}\"" >> "${JAVA_PKG_ENV}" 2294 [[ -n ${GENTOO_COMPILER} ]] && echo "MERGE_COMPILER=\"${GENTOO_COMPILER}\"" >> "${JAVA_PKG_ENV}"
1671 2295
2296 # extra env variables
2297 if [[ -n "${JAVA_PKG_EXTRA_ENV_VARS}" ]]; then
2298 cat "${JAVA_PKG_EXTRA_ENV}" >> "${JAVA_PKG_ENV}" || die
2299 # nested echo to remove leading/trailing spaces
2300 echo "ENV_VARS=\"$(echo ${JAVA_PKG_EXTRA_ENV_VARS})\"" \
2301 >> "${JAVA_PKG_ENV}" || die
2302 fi
2303
1672 # Strip unnecessary leading and trailing colons 2304 # Strip unnecessary leading and trailing colons
1673 # TODO try to cleanup if possible 2305 # TODO try to cleanup if possible
1674 sed -e "s/=\":/=\"/" -e "s/:\"$/\"/" -i "${JAVA_PKG_ENV}" || die "Did you forget to call java_init ?" 2306 sed -e "s/=\":/=\"/" -e "s/:\"$/\"/" -i "${JAVA_PKG_ENV}" || die "Did you forget to call java_init ?"
2307 else
2308 debug-print "JAVA_PKG_CLASSPATH, JAVA_PKG_LIBRARY, JAVA_PKG_DEPEND_FILE"
2309 debug-print "or JAVA_PKG_OPTIONAL_DEPEND_FILE not defined so can't"
2310 debug-print "write package.env."
1675 fi 2311 fi
1676} 2312}
1677 2313
1678# ------------------------------------------------------------------------------ 2314# ------------------------------------------------------------------------------
1679# @internal-function java-pkg_record-jar_ 2315# @internal-function java-pkg_record-jar_
1680# 2316#
1681# Record a dependency to the package.env 2317# Record an (optional) dependency to the package.env
1682# 2318# @param --optional - record dependency as optional
2319# @param $1 - package to record
2320# @param $2 - (optional) jar of package to record
1683# ------------------------------------------------------------------------------ 2321# ------------------------------------------------------------------------------
1684JAVA_PKG_DEPEND="${T}/java-pkg-depend" 2322JAVA_PKG_DEPEND_FILE="${T}/java-pkg-depend"
2323JAVA_PKG_OPTIONAL_DEPEND_FILE="${T}/java-pkg-optional-depend"
1685 2324
1686java-pkg_record-jar_() { 2325java-pkg_record-jar_() {
1687 debug-print-function ${FUNCNAME} $* 2326 debug-print-function ${FUNCNAME} $*
2327
2328 local depend_file="${JAVA_PKG_DEPEND_FILE}"
2329 if [[ "${1}" == "--optional" ]]; then
2330 depend_file="${JAVA_PKG_OPTIONAL_DEPEND_FILE}"
2331 shift
2332 fi
1688 2333
1689 local pkg=${1} jar=${2} append 2334 local pkg=${1} jar=${2} append
1690 if [[ -z "${jar}" ]]; then 2335 if [[ -z "${jar}" ]]; then
1691 append="${pkg}" 2336 append="${pkg}"
1692 else 2337 else
1693 append="$(basename ${jar})@${pkg}" 2338 append="$(basename ${jar})@${pkg}"
1694 fi 2339 fi
1695 2340
1696 echo ${append} >> ${JAVA_PKG_DEPEND} 2341 echo "${append}" >> "${depend_file}"
1697} 2342}
1698 2343
1699# ------------------------------------------------------------------------------ 2344# ------------------------------------------------------------------------------
1700# @internal-function java-pkg_append_ 2345# @internal-function java-pkg_append_
1701# 2346#
1761# 2406#
1762# ------------------------------------------------------------------------------ 2407# ------------------------------------------------------------------------------
1763java-pkg_setup-vm() { 2408java-pkg_setup-vm() {
1764 debug-print-function ${FUNCNAME} $* 2409 debug-print-function ${FUNCNAME} $*
1765 2410
2411 export LANG="C" LC_ALL="C"
2412
1766 local vendor="$(java-pkg_get-vm-vendor)" 2413 local vendor="$(java-pkg_get-vm-vendor)"
1767 if [[ "${vendor}" == "sun" ]] && java-pkg_is-vm-version-ge "1.5" ; then 2414 if [[ "${vendor}" == "sun" ]] && java-pkg_is-vm-version-ge "1.5" ; then
1768 addpredict "/dev/random" 2415 addpredict "/dev/random"
1769 elif [[ "${vendor}" == "ibm" ]]; then 2416 elif [[ "${vendor}" == "ibm" ]]; then
1770 addpredict "/proc/self/maps" 2417 addpredict "/proc/self/maps"
1771 addpredict "/proc/cpuinfo" 2418 addpredict "/proc/cpuinfo"
1772 export LANG="C" LC_ALL="C"
1773 elif [[ "${vendor}" == "jrockit" ]]; then 2419 elif [[ "${vendor}" == "jrockit" ]]; then
1774 addpredict "/proc/cpuinfo" 2420 addpredict "/proc/cpuinfo"
1775 fi 2421 fi
1776} 2422}
1777 2423
1832# Switch VM if we're allowed to (controlled by JAVA_PKG_ALLOW_VM_CHANGE), and 2478# Switch VM if we're allowed to (controlled by JAVA_PKG_ALLOW_VM_CHANGE), and
1833# verify that the current VM is sufficient. 2479# verify that the current VM is sufficient.
1834# Setup the environment for the VM being used. 2480# Setup the environment for the VM being used.
1835# ------------------------------------------------------------------------------ 2481# ------------------------------------------------------------------------------
1836java-pkg_switch-vm() { 2482java-pkg_switch-vm() {
2483 debug-print-function ${FUNCNAME} $*
2484
1837 if java-pkg_needs-vm; then 2485 if java-pkg_needs-vm; then
1838 # Use the VM specified by JAVA_PKG_FORCE_VM 2486 # Use the VM specified by JAVA_PKG_FORCE_VM
1839 if [[ -n ${JAVA_PKG_FORCE_VM} ]]; then 2487 if [[ -n "${JAVA_PKG_FORCE_VM}" ]]; then
1840 # If you're forcing the VM, I hope you know what your doing... 2488 # If you're forcing the VM, I hope you know what your doing...
2489 debug-print "JAVA_PKG_FORCE_VM used: ${JAVA_PKG_FORCE_VM}"
1841 export GENTOO_VM="${JAVA_PKG_FORCE_VM}" 2490 export GENTOO_VM="${JAVA_PKG_FORCE_VM}"
1842 # if we're allowed to switch the vm... 2491 # if we're allowed to switch the vm...
1843 elif [[ "${JAVA_PKG_ALLOW_VM_CHANGE}" == "yes" ]]; then 2492 elif [[ "${JAVA_PKG_ALLOW_VM_CHANGE}" == "yes" ]]; then
1844 debug-print "depend-java-query: NV_DEPEND: ${JAVA_PKG_NV_DEPEND:-${DEPEND}} VNEED: ${JAVA_PKG_VNEED}" 2493 debug-print "depend-java-query: NV_DEPEND: ${JAVA_PKG_NV_DEPEND:-${DEPEND}} VNEED: ${JAVA_PKG_VNEED}"
1845 if [[ -n ${JAVA_PKG_VNEED} ]]; then 2494 if [[ -n ${JAVA_PKG_VNEED} ]]; then
1878 2527
1879 #TODO If you know a better solution let us know. 2528 #TODO If you know a better solution let us know.
1880 java-pkg_append_ LD_LIBRARY_PATH "$(java-config -g LDPATH)" 2529 java-pkg_append_ LD_LIBRARY_PATH "$(java-config -g LDPATH)"
1881 2530
1882 local tann="${T}/announced-vm" 2531 local tann="${T}/announced-vm"
2532 # With the hooks we should only get here once from pkg_setup but better safe than sorry
2533 # if people have for example modified eclasses some where
1883 if [[ -n "${JAVA_PKG_DEBUG}" ]] || [[ ! -f "${tann}" ]] ; then 2534 if [[ -n "${JAVA_PKG_DEBUG}" ]] || [[ ! -f "${tann}" ]] ; then
1884 # Add a check for setup/preinst phase... to avoid duplicate outputs
1885 # for when FEATURES=buildpkg
1886 if [[ ${EBUILD_PHASE} != "setup" && ${EBUILD_PHASE} != "preinst" && ${EBUILD_PHASE} != "postinst" ]];
1887 then
1888 einfo "Using: $(java-config -f)" 2535 einfo "Using: $(java-config -f)"
1889 [[ ! -f "${tann}" ]] && touch "${tann}" 2536 [[ ! -f "${tann}" ]] && touch "${tann}"
1890 fi
1891 fi 2537 fi
1892 2538
1893 else 2539 else
1894 [[ -n "${JAVA_PKG_DEBUG}" ]] && ewarn "!!! This package inherits java-pkg but doesn't depend on a JDK. -bin or broken dependency!!!" 2540 [[ -n "${JAVA_PKG_DEBUG}" ]] && ewarn "!!! This package inherits java-pkg but doesn't depend on a JDK. -bin or broken dependency!!!"
1895 fi 2541 fi
1925 einfo "Classes" 2571 einfo "Classes"
1926 find "${S}" -type f -name '*.class' -print0 | xargs -0 -r -n 500 ls -ald | sed -e "s,${WORKDIR},\${WORKDIR}," 2572 find "${S}" -type f -name '*.class' -print0 | xargs -0 -r -n 500 ls -ald | sed -e "s,${WORKDIR},\${WORKDIR},"
1927 fi 2573 fi
1928} 2574}
1929 2575
1930# TODO document 2576# ------------------------------------------------------------------------------
2577# @internal-function java-pkg_verify-classes
2578#
1931# Verify that the classes were compiled for the right source / target 2579# Verify that the classes were compiled for the right source / target. Dies if
2580# not.
2581# @param $1 (optional) - the file to check, otherwise checks whole ${D}
2582# ------------------------------------------------------------------------------
1932java-pkg_verify-classes() { 2583java-pkg_verify-classes() {
1933 ebegin "Verifying java class versions"
1934 #$(find ${D} -type f -name '*.jar' -o -name '*.class') 2584 #$(find ${D} -type f -name '*.jar' -o -name '*.class')
1935 class-version-verify.py -t $(java-pkg_get-target) -r ${D} 2585 local target=$(java-pkg_get-target)
2586 local result
2587 local log="${T}/class-version-verify.log"
2588 if [[ -n "${1}" ]]; then
2589 class-version-verify.py -v -t ${target} "${1}" > "${log}"
1936 result=$? 2590 result=$?
1937 eend ${result}
1938 if [[ ${result} == 0 ]]; then
1939 einfo "All good"
1940 else 2591 else
1941 ewarn "Possible problem" 2592 ebegin "Verifying java class versions (target: ${target})"
1942 die "Bad class files found" 2593 class-version-verify.py -v -t ${target} -r "${D}" > "${log}"
2594 result=$?
2595 eend ${result}
2596 fi
2597 [[ -n ${JAVA_PKG_DEBUG} ]] && cat "${log}"
2598 if [[ ${result} != 0 ]]; then
2599 eerror "Incorrect bytecode version found"
2600 [[ -n "${1}" ]] && eerror "in file: ${1}"
2601 eerror "See ${log} for more details."
2602 die "Incorrect bytecode found"
2603 fi
2604}
2605
2606# ----------------------------------------------------------------------------
2607# @internal-function java-pkg_ensure-dep
2608# Check that a package being used in jarfrom, getjars and getjar is contained
2609# within DEPEND or RDEPEND.
2610# @param $1 - empty - check both vars; "runtime" or "build" - check only
2611# RDEPEND, resp. DEPEND
2612# @param $2 - Package name and slot.
2613
2614java-pkg_ensure-dep() {
2615 debug-print-function ${FUNCNAME} $*
2616
2617 local limit_to="${1}"
2618 local target_pkg="${2}"
2619 local dev_error=""
2620
2621 local stripped_pkg=$(echo "${target_pkg}" | sed \
2622 's/-[0-9]*\(\.[0-9]\)*$//')
2623
2624 debug-print "Matching against: ${stripped_pkg}"
2625
2626 if [[ ${limit_to} != runtime && ! ( "${DEPEND}" =~ "$stripped_pkg" ) ]]; then
2627 dev_error="The ebuild is attempting to use ${target_pkg} that is not"
2628 dev_error="${dev_error} declared in DEPEND."
2629 if is-java-strict; then
2630 eerror "${dev_error}"
2631 die "${dev_error}"
2632 elif [[ ${BASH_SUBSHELL} = 0 ]]; then
2633 eerror "${dev_error}"
2634 elog "Because you have this package installed the package will"
2635 elog "build without problems, but please report this to"
2636 elog "http://bugs.gentoo.org"
2637 fi
2638 fi
2639
2640 if [[ ${limit_to} != build ]]; then
2641 if [[ ! ( ${RDEPEND} =~ "${stripped_pkg}" ) ]]; then
2642 if [[ ! ( ${PDEPEND} =~ "${stripped_pkg}" ) ]]; then
2643 dev_error="The ebuild is attempting to use ${target_pkg},"
2644 dev_error="${dev_error} without specifying --build-only, that is not declared in RDEPEND"
2645 dev_error="${dev_error} or PDEPEND."
2646 if is-java-strict; then
2647 eerror "${dev_error}"
2648 die "${dev_error}"
2649 elif [[ ${BASH_SUBSHELL} = 0 ]]; then
2650 eerror "${dev_error}"
2651 elog "The package will build without problems, but may fail to run"
2652 elog "if you don't have ${target_pkg} installed, so please report"
2653 elog "this to http://bugs.gentoo.org"
2654 fi
2655 fi
2656 fi
1943 fi 2657 fi
1944} 2658}
1945 2659
1946# ------------------------------------------------------------------------------ 2660# ------------------------------------------------------------------------------
1947# @section-end internal 2661# @section-end internal
1948# ------------------------------------------------------------------------------ 2662# ------------------------------------------------------------------------------
1949 2663
1950java-pkg_check-phase() { 2664java-pkg_check-phase() {
1951 local phase=${1} 2665 local phase=${1}
1952 local funcname=${2} 2666 local funcname=${FUNCNAME[1]}
1953 if is-java-strict && [[ ${EBUILD_PHASE} != ${phase} ]]; then 2667 if [[ ${EBUILD_PHASE} != ${phase} ]]; then
1954 java-pkg_announce-qa-violation \
1955 "${funcname} used outside of src_${phase}" 2668 local msg="${funcname} used outside of src_${phase}"
2669 java-pkg_announce-qa-violation "${msg}"
1956 fi 2670 fi
1957} 2671}
1958 2672
1959java-pkg_check-versioned-jar() { 2673java-pkg_check-versioned-jar() {
1960 local jar=${1} 2674 local jar=${1}
1969 java-pkg_announce-qa-violation "deprecated USE flag 'jikes' in IUSE" 2683 java-pkg_announce-qa-violation "deprecated USE flag 'jikes' in IUSE"
1970 fi 2684 fi
1971} 2685}
1972 2686
1973java-pkg_announce-qa-violation() { 2687java-pkg_announce-qa-violation() {
1974 if is-java-strict; then 2688 local nodie
2689 if [[ ${1} == "--nodie" ]]; then
2690 nodie="true"
2691 shift
2692 fi
1975 echo "Java QA Notice: $@" >&2 2693 echo "Java QA Notice: $@" >&2
1976 increment-qa-violations 2694 increment-qa-violations
1977 fi 2695 [[ -z "${nodie}" ]] && is-java-strict && die "${@}"
1978} 2696}
1979 2697
1980increment-qa-violations() { 2698increment-qa-violations() {
1981 let "JAVA_PKG_QA_VIOLATIONS+=1" 2699 let "JAVA_PKG_QA_VIOLATIONS+=1"
1982 export JAVA_PKG_QA_VIOLATIONS 2700 export JAVA_PKG_QA_VIOLATIONS

Legend:
Removed from v.1.33  
changed lines
  Added in v.1.98

  ViewVC Help
Powered by ViewVC 1.1.20