/[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.103
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.103 2008/01/12 15:08:47 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
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"
445# ------------------------------------------------------------------------------ 557# ------------------------------------------------------------------------------
446# @ebuild-function java-pkg_dojavadoc 558# @ebuild-function java-pkg_dojavadoc
447# 559#
448# Installs javadoc documentation. This should be controlled by the doc use flag. 560# Installs javadoc documentation. This should be controlled by the doc use flag.
449# 561#
562# @param $1: optional --symlink creates to symlink like this for html
563# documentation bundles.
450# @param $1: - The javadoc root directory. 564# @param $2: - The javadoc root directory.
451# 565#
452# @example: 566# @example:
453# java-pkg_dojavadoc docs/api 567# java-pkg_dojavadoc docs/api
568# java-pkg_dojavadoc --symlink apidocs docs/api
454# 569#
455# ------------------------------------------------------------------------------ 570# ------------------------------------------------------------------------------
456java-pkg_dojavadoc() { 571java-pkg_dojavadoc() {
572 debug-print-function ${FUNCNAME} $*
573
574 # For html documentation bundles that link to Javadoc
575 local symlink
576 if [[ ${1} = --symlink ]]; then
577 symlink=${2}
578 shift 2
579 fi
580
457 local dir="$1" 581 local dir="$1"
582 local dest=/usr/share/doc/${PF}/html
583
584 # QA checks
458 585
459 java-pkg_check-phase install 586 java-pkg_check-phase install
460 587
461 [[ -z "${dir}" ]] && die "Must specify a directory!" 588 [[ -z "${dir}" ]] && die "Must specify a directory!"
462 [[ ! -d "${dir}" ]] && die "${dir} does not exist, or isn't a directory!" 589 [[ ! -d "${dir}" ]] && die "${dir} does not exist, or isn't a directory!"
590 if [[ ! -e "${dir}/index.html" ]]; then
591 local msg="No index.html in javadoc directory"
592 ewarn "${msg}"
593 is-java-strict && die "${msg}"
594 fi
595
596 if [[ -e ${D}/${dest}/api ]]; then
597 eerror "${dest} already exists. Will not overwrite."
598 die "${dest}"
599 fi
600
601 # Renaming to match our directory layout
463 602
464 local dir_to_install="${dir}" 603 local dir_to_install="${dir}"
465 if [[ "$(basename "${dir}")" != "api" ]]; then 604 if [[ "$(basename "${dir}")" != "api" ]]; then
466 dir_to_install="${T}/api" 605 dir_to_install="${T}/api"
467 # TODO use doins 606 # TODO use doins
468 cp -r "${dir}" "${dir_to_install}" || die "cp failed" 607 cp -r "${dir}" "${dir_to_install}" || die "cp failed"
469 fi 608 fi
470 609
610 # Actual installation
611
471 java-pkg_dohtml -r ${dir_to_install} 612 java-pkg_dohtml -r "${dir_to_install}"
613
614 # Let's make a symlink to the directory we have everything else under
615 dosym ${dest}/api "${JAVA_PKG_SHAREPATH}/api" || die
616
617 if [[ ${symlink} ]]; then
618 dosym ${dest}/{api,${symlink}} || die
619 fi
472} 620}
473 621
474# ------------------------------------------------------------------------------ 622# ------------------------------------------------------------------------------
475# @ebuild-function java-pkg_dosrc 623# @ebuild-function java-pkg_dosrc
476# 624#
492# FIXME apparently this fails if you give it an empty directories 640# FIXME apparently this fails if you give it an empty directories
493java-pkg_dosrc() { 641java-pkg_dosrc() {
494 debug-print-function ${FUNCNAME} $* 642 debug-print-function ${FUNCNAME} $*
495 643
496 [ ${#} -lt 1 ] && die "At least one argument needed" 644 [ ${#} -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 645
501 java-pkg_check-phase install 646 java-pkg_check-phase install
502 647
503 [[ ${#} -lt 1 ]] && die "At least one argument needed" 648 [[ ${#} -lt 1 ]] && die "At least one argument needed"
649
650 if ! [[ ${DEPEND} = *app-arch/zip* ]]; then
651 local msg="${FUNCNAME} called without app-arch/zip in DEPEND"
652 if is-java-strict; then
653 eerror "${msg}"
654 die "${msg}"
655 else
656 echo "${msg}"
657 echo "Please report this to http://bugs.gentoo.org."
658 fi
659 fi
504 660
505 java-pkg_init_paths_ 661 java-pkg_init_paths_
506 662
507 local zip_name="${PN}-src.zip" 663 local zip_name="${PN}-src.zip"
508 local zip_path="${T}/${zip_name}" 664 local zip_path="${T}/${zip_name}"
509 local dir 665 local dir
510 for dir in ${@}; do 666 for dir in "${@}"; do
511 local dir_parent=$(dirname "${dir}") 667 local dir_parent=$(dirname "${dir}")
512 local dir_name=$(basename "${dir}") 668 local dir_name=$(basename "${dir}")
513 pushd ${dir_parent} > /dev/null || die "problem entering ${dir_parent}" 669 pushd ${dir_parent} > /dev/null || die "problem entering ${dir_parent}"
514 zip -q -r ${zip_path} ${dir_name} -i '*.java' 670 zip -q -r ${zip_path} ${dir_name} -i '*.java'
515 local result=$? 671 local result=$?
540# @param $1 - filename of launcher to create 696# @param $1 - filename of launcher to create
541# @param $2 - options, as follows: 697# @param $2 - options, as follows:
542# --main the.main.class.too.start 698# --main the.main.class.too.start
543# --jar /the/jar/too/launch.jar or just <name>.jar 699# --jar /the/jar/too/launch.jar or just <name>.jar
544# --java_args 'Extra arguments to pass to java' 700# --java_args 'Extra arguments to pass to java'
545# --pkg_args 'Extra arguments too pass to the package' 701# --pkg_args 'Extra arguments to pass to the package'
546# --pwd 702# --pwd Directory the launcher changes to before executing java
547# -into 703# -into Directory to install the launcher to, instead of /usr/bin
548# -pre 704# -pre Prepend contents of this file to the launcher
549# ------------------------------------------------------------------------------ 705# ------------------------------------------------------------------------------
550java-pkg_dolauncher() { 706java-pkg_dolauncher() {
551 debug-print-function ${FUNCNAME} $* 707 debug-print-function ${FUNCNAME} $*
552 708
553 java-pkg_check-phase install 709 java-pkg_check-phase install
565 local var_tmp="${T}/launcher_variables_tmp" 721 local var_tmp="${T}/launcher_variables_tmp"
566 local target_dir pre 722 local target_dir pre
567 723
568 # Process the other the rest of the arguments 724 # Process the other the rest of the arguments
569 while [[ -n "${1}" && -n "${2}" ]]; do 725 while [[ -n "${1}" && -n "${2}" ]]; do
570 local var=${1} value=${2} 726 local var="${1}" value="${2}"
571 if [[ "${var:0:2}" == "--" ]]; then 727 if [[ "${var:0:2}" == "--" ]]; then
572 local var=${var:2} 728 local var=${var:2}
573 echo "gjl_${var}=\"${value}\"" >> "${var_tmp}" 729 echo "gjl_${var}=\"${value}\"" >> "${var_tmp}"
574 local gjl_${var}="${value}" 730 local gjl_${var}="${value}"
575 elif [[ "${var}" == "-into" ]]; then 731 elif [[ "${var}" == "-into" ]]; then
594 fi 750 fi
595 fi 751 fi
596 752
597 # Write the actual script 753 # Write the actual script
598 echo "#!/bin/bash" > "${target}" 754 echo "#!/bin/bash" > "${target}"
599 [[ -n "${pre}" ]] && [[ -f "${pre}" ]] && cat "${pre}" >> "${target}" 755 if [[ -n "${pre}" ]]; then
756 if [[ -f "${pre}" ]]; then
757 cat "${pre}" >> "${target}"
758 else
759 die "-pre specified file '${pre}' does not exist"
760 fi
761 fi
600 echo "gjl_package=${JAVA_PKG_NAME}" >> "${target}" 762 echo "gjl_package=${JAVA_PKG_NAME}" >> "${target}"
601 cat "${var_tmp}" >> "${target}" 763 cat "${var_tmp}" >> "${target}"
602 rm -f "${var_tmp}" 764 rm -f "${var_tmp}"
603 echo "source /usr/share/java-config-2/launcher/launcher.bash" >> "${target}" 765 echo "source /usr/share/java-config-2/launcher/launcher.bash" >> "${target}"
604 766
696# Example: get a specific jar from xerces slot 2, and name it diffrently 858# 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 859# java-pkg_jar-from xerces-2 xml-apis.jar xml.jar
698# Example: get junit.jar which is needed only for building 860# Example: get junit.jar which is needed only for building
699# java-pkg_jar-from --build-only junit junit.jar 861# java-pkg_jar-from --build-only junit junit.jar
700# 862#
701# @param $1 - (optional) "--build-only" makes the jar(s) not added into 863# @param $opt
702# package.env DEPEND line. 864# --build-only - makes the jar(s) not added into package.env DEPEND line.
703# @param $1 - Package to get jars from. 865# (assumed automatically when called inside src_test)
866# --with-dependencies - get jars also from requested package's dependencies
867# transitively.
868# --virtual - Packages passed to this function are to be handled as virtuals
869# and will not have individual jar dependencies recorded.
870# --into $dir - symlink jar(s) into $dir (must exist) instead of .
871# @param $1 - Package to get jars from, or comma-separated list of packages in
872# case other parameters are not used.
704# @param $2 - jar from package. If not specified, all jars will be used. 873# @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 874# @param $3 - When a single jar is specified, destination filename of the
706# symlink. Defaults to the name of the jar. 875# symlink. Defaults to the name of the jar.
707# ------------------------------------------------------------------------------ 876# ------------------------------------------------------------------------------
708# TODO could probably be cleaned up a little 877# TODO could probably be cleaned up a little
709java-pkg_jar-from() { 878java-pkg_jar-from() {
710 debug-print-function ${FUNCNAME} $* 879 debug-print-function ${FUNCNAME} $*
711 880
712 local build_only="" 881 local build_only=""
882 local destdir="."
883 local deep=""
884 local virtual=""
713 885
886 [[ "${EBUILD_PHASE}" == "test" ]] && build_only="build"
887
888 while [[ "${1}" == --* ]]; do
714 if [[ "${1}" = "--build-only" ]]; then 889 if [[ "${1}" = "--build-only" ]]; then
715 build_only="true" 890 build_only="build"
891 elif [[ "${1}" = "--with-dependencies" ]]; then
892 deep="--with-dependencies"
893 elif [[ "${1}" = "--virtual" ]]; then
894 virtual="true"
895 elif [[ "${1}" = "--into" ]]; then
896 destdir="${2}"
897 shift
898 else
899 die "java-pkg_jar-from called with unknown parameter: ${1}"
900 fi
716 shift 901 shift
717 fi 902 done
718 903
719 local target_pkg="${1}" target_jar="${2}" destjar="${3}" 904 local target_pkg="${1}" target_jar="${2}" destjar="${3}"
720 905
721 [[ -z ${target_pkg} ]] && die "Must specify a package" 906 [[ -z ${target_pkg} ]] && die "Must specify a package"
722 907
723 # default destjar to the target jar 908 # default destjar to the target jar
724 [[ -z "${destjar}" ]] && destjar="${target_jar}" 909 [[ -z "${destjar}" ]] && destjar="${target_jar}"
725 910
726 local error_msg="There was a problem getting the classpath for ${target_pkg}." 911 local error_msg="There was a problem getting the classpath for ${target_pkg}."
727 local classpath 912 local classpath
728 classpath="$(java-config --classpath=${target_pkg})" 913 classpath="$(java-config ${deep} --classpath=${target_pkg})"
729 [[ $? != 0 ]] && die ${error_msg} 914 [[ $? != 0 ]] && die ${error_msg}
915
916 # When we have commas this functions is called to bring jars from multiple
917 # packages. This affects recording of dependencencies performed later
918 # which expects one package only, so we do it here.
919 if [[ ${target_pkg} = *,* ]]; then
920 for pkg in ${target_pkg//,/ }; do
921 java-pkg_ensure-dep "${build_only}" "${pkg}"
922 [[ -z "${build_only}" ]] && java-pkg_record-jar_ "${pkg}"
923 done
924 # setting this disables further record-jar_ calls later
925 build_only="build"
926 else
927 java-pkg_ensure-dep "${build_only}" "${target_pkg}"
928 fi
929
930 # Record the entire virtual as a dependency so that
931 # no jars are missed.
932 if [[ -z "${build_only}" && -n "${virtual}" ]]; then
933 java-pkg_record-jar_ "${target_pkg}"
934 # setting this disables further record-jars_ calls later
935 build_only="build"
936 fi
937
938 pushd ${destdir} > /dev/null \
939 || die "failed to change directory to ${destdir}"
730 940
731 local jar 941 local jar
732 for jar in ${classpath//:/ }; do 942 for jar in ${classpath//:/ }; do
733 local jar_name=$(basename "${jar}") 943 local jar_name=$(basename "${jar}")
734 if [[ ! -f "${jar}" ]] ; then 944 if [[ ! -f "${jar}" ]] ; then
745 elif [[ "${jar_name}" == "${target_jar}" ]] ; then 955 elif [[ "${jar_name}" == "${target_jar}" ]] ; then
746 [[ -f "${destjar}" ]] && rm "${destjar}" 956 [[ -f "${destjar}" ]] && rm "${destjar}"
747 ln -snf "${jar}" "${destjar}" \ 957 ln -snf "${jar}" "${destjar}" \
748 || die "Failed to make symlink from ${jar} to ${destjar}" 958 || die "Failed to make symlink from ${jar} to ${destjar}"
749 [[ -z "${build_only}" ]] && java-pkg_record-jar_ "${target_pkg}" "${jar}" 959 [[ -z "${build_only}" ]] && java-pkg_record-jar_ "${target_pkg}" "${jar}"
960 popd > /dev/null
750 return 0 961 return 0
751 fi 962 fi
752 done 963 done
964 popd > /dev/null
753 # if no target was specified, we're ok 965 # if no target was specified, we're ok
754 if [[ -z "${target_jar}" ]] ; then 966 if [[ -z "${target_jar}" ]] ; then
755 return 0 967 return 0
756 # otherwise, die bitterly 968 # otherwise, die bitterly
757 else 969 else
781# Example: Get the classpath for xerces-2 and xalan, 993# Example: Get the classpath for xerces-2 and xalan,
782# java-pkg_getjars xerces-2,xalan 994# java-pkg_getjars xerces-2,xalan
783# Example Return: 995# Example Return:
784# /usr/share/xerces-2/lib/xml-apis.jar:/usr/share/xerces-2/lib/xmlParserAPIs.jar:/usr/share/xalan/lib/xalan.jar 996# /usr/share/xerces-2/lib/xml-apis.jar:/usr/share/xerces-2/lib/xmlParserAPIs.jar:/usr/share/xalan/lib/xalan.jar
785# 997#
786# @param $1 - (optional) "--build-only" makes the jar(s) not added into 998# @param $opt
787# package.env DEPEND line. 999# --build-only - makes the jar(s) not added into package.env DEPEND line.
1000# (assumed automatically when called inside src_test)
1001# --with-dependencies - get jars also from requested package's dependencies
1002# transitively.
788# @param $2 - list of packages to get jars from 1003# @param $1 - list of packages to get jars from
789# (passed to java-config --classpath) 1004# (passed to java-config --classpath)
790# ------------------------------------------------------------------------------ 1005# ------------------------------------------------------------------------------
791java-pkg_getjars() { 1006java-pkg_getjars() {
792 debug-print-function ${FUNCNAME} $* 1007 debug-print-function ${FUNCNAME} $*
793 1008
794 [[ ${#} -lt 1 || ${#} -gt 2 ]] && die "${FUNCNAME} takes only one or two arguments" 1009 local build_only=""
1010 local deep=""
795 1011
1012 [[ "${EBUILD_PHASE}" == "test" ]] && build_only="build"
1013
1014 while [[ "${1}" == --* ]]; do
796 if [[ "${1}" = "--build-only" ]]; then 1015 if [[ "${1}" = "--build-only" ]]; then
797 local build_only="true" 1016 build_only="build"
1017 elif [[ "${1}" = "--with-dependencies" ]]; then
1018 deep="--with-dependencies"
1019 else
1020 die "java-pkg_jar-from called with unknown parameter: ${1}"
1021 fi
798 shift 1022 shift
799 fi 1023 done
1024
1025 [[ ${#} -ne 1 ]] && die "${FUNCNAME} takes only one argument besides --*"
1026
800 1027
801 local classpath pkgs="${1}" 1028 local classpath pkgs="${1}"
802 jars="$(java-config --classpath=${pkgs})" 1029 jars="$(java-config ${deep} --classpath=${pkgs})"
803 [[ -z "${jars}" ]] && die "java-config --classpath=${pkgs} failed" 1030 [[ $? != 0 || -z "${jars}" ]] && die "java-config --classpath=${pkgs} failed"
804 debug-print "${pkgs}:${jars}" 1031 debug-print "${pkgs}:${jars}"
1032
1033 for pkg in ${pkgs//,/ }; do
1034 java-pkg_ensure-dep "${build_only}" "${pkg}"
1035 done
805 1036
806 if [[ -z "${classpath}" ]]; then 1037 if [[ -z "${classpath}" ]]; then
807 classpath="${jars}" 1038 classpath="${jars}"
808 else 1039 else
809 classpath="${classpath}:${jars}" 1040 classpath="${classpath}:${jars}"
810 fi 1041 fi
811 1042
812 # Only record jars that aren't build-only 1043 # Only record jars that aren't build-only
813 if [[ -z "${build_only}" ]]; then 1044 if [[ -z "${build_only}" ]]; then
814 oldifs="${IFS}"
815 IFS=","
816 for pkg in ${pkgs}; do 1045 for pkg in ${pkgs//,/ }; do
817 java-pkg_record-jar_ "${pkg}" 1046 java-pkg_record-jar_ "${pkg}"
818 done 1047 done
819 IFS="${oldifs}"
820 fi 1048 fi
821 1049
822 echo "${classpath}" 1050 echo "${classpath}"
823} 1051}
824 1052
834# @example 1062# @example
835# java-pkg_getjar xerces-2 xml-apis.jar 1063# java-pkg_getjar xerces-2 xml-apis.jar
836# @example-return 1064# @example-return
837# /usr/share/xerces-2/lib/xml-apis.jar 1065# /usr/share/xerces-2/lib/xml-apis.jar
838# 1066#
839# @param $1 - (optional) "--build-only" makes the jar not added into 1067# @param $opt
840# package.env DEPEND line. 1068# --build-only - makes the jar not added into package.env DEPEND line.
1069# --virtual - Packages passed to this function are to be handled as virtuals
1070# and will not have individual jar dependencies recorded.
841# @param $1 - package to use 1071# @param $1 - package to use
842# @param $2 - jar to get 1072# @param $2 - jar to get
843# ------------------------------------------------------------------------------ 1073# ------------------------------------------------------------------------------
844java-pkg_getjar() { 1074java-pkg_getjar() {
845 debug-print-function ${FUNCNAME} $* 1075 debug-print-function ${FUNCNAME} $*
846 1076
847 local build_only="" 1077 local build_only=""
1078 local virtual=""
848 1079
1080 [[ "${EBUILD_PHASE}" == "test" ]] && build_only="build"
1081
1082 while [[ "${1}" == --* ]]; do
849 if [[ "${1}" = "--build-only" ]]; then 1083 if [[ "${1}" = "--build-only" ]]; then
850 build_only="true" 1084 build_only="build"
1085 elif [[ "${1}" == "--virtual" ]]; then
1086 virtual="true"
1087 else
1088 die "java-pkg_getjar called with unknown parameter: ${1}"
1089 fi
851 shift 1090 shift
852 fi 1091 done
1092
1093 [[ ${#} -ne 2 ]] && die "${FUNCNAME} takes only two arguments besides --*"
853 1094
854 local pkg="${1}" target_jar="${2}" jar 1095 local pkg="${1}" target_jar="${2}" jar
855 [[ -z ${pkg} ]] && die "Must specify package to get a jar from" 1096 [[ -z ${pkg} ]] && die "Must specify package to get a jar from"
856 [[ -z ${target_jar} ]] && die "Must specify jar to get" 1097 [[ -z ${target_jar} ]] && die "Must specify jar to get"
857 1098
858 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?"
859 local classpath 1100 local classpath
860 classpath=$(java-config --classpath=${pkg}) 1101 classpath=$(java-config --classpath=${pkg})
861 [[ $? != 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
862 1112
863 for jar in ${classpath//:/ }; do 1113 for jar in ${classpath//:/ }; do
864 if [[ ! -f "${jar}" ]] ; then 1114 if [[ ! -f "${jar}" ]] ; then
865 die "Installation problem with jar ${jar} in ${pkg} - is it installed?" 1115 die "Installation problem with jar ${jar} in ${pkg} - is it installed?"
866 fi 1116 fi
873 fi 1123 fi
874 done 1124 done
875 1125
876 die "Could not find ${target_jar} in ${pkg}" 1126 die "Could not find ${target_jar} in ${pkg}"
877 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 [[ -z "${jar}" ]]; then
1168 for pkg in ${pkgs//,/ }; do
1169 java-pkg_ensure-dep runtime "${pkg}"
1170 java-pkg_record-jar_ "${pkg}"
1171 done
1172 else
1173 [[ ${pkgs} == *,* ]] && \
1174 die "${FUNCNAME} called with both package list and jar name"
1175 java-pkg_ensure-dep runtime "${pkgs}"
1176 java-pkg_record-jar_ "${pkgs}" "${jar}"
1177 fi
1178
1179 java-pkg_do_write_
1180}
1181
1182# ------------------------------------------------------------------------------
1183# @ebuild-function java-pkg_register-optional-dependency
1184#
1185# Registers optional runtime dependency on a package, list of packages, or a
1186# single jar from a package, into package.env OPTIONAL_DEPEND line. Can only be
1187# called in src_install phase.
1188# Intended for packages that can use other packages when those are in classpath.
1189# Will be put on classpath by launcher if they are installed. Typical case is
1190# JDBC implementations for various databases. It's better than having USE flag
1191# for each implementation triggering hard dependency.
1192#
1193# @param $1 - comma-separated list of packages, or a single package
1194# @param $2 - if param $1 is a single package, optionally specify the jar
1195# to depend on
1196#
1197# Example: Record the optional dependency on some jdbc providers
1198# java-pkg_register-optional-dependency jdbc-jaybird,jtds-1.2,jdbc-mysql
1199#
1200# Note: Passing both list of packages as the first parameter AND specifying the
1201# jar as the second is not allowed and will cause the function to die. We assume
1202# that there's more chance one passes such combination as a mistake, than that
1203# there are more packages providing identically named jar without class
1204# collisions.
1205# ------------------------------------------------------------------------------
1206java-pkg_register-optional-dependency() {
1207 debug-print-function ${FUNCNAME} $*
1208
1209 java-pkg_check-phase install
1210
1211 [[ ${#} -gt 2 ]] && die "${FUNCNAME} takes at most two arguments"
1212
1213 local pkgs="${1}"
1214 local jar="${2}"
1215
1216 [[ -z "${pkgs}" ]] && die "${FUNCNAME} called with no package(s) specified"
1217
1218 if [[ -z "${jar}" ]]; then
1219 for pkg in ${pkgs//,/ }; do
1220 java-pkg_record-jar_ --optional "${pkg}"
1221 done
1222 else
1223 [[ ${pkgs} == *,* ]] && \
1224 die "${FUNCNAME} called with both package list and jar name"
1225 java-pkg_record-jar_ --optional "${pkgs}" "${jar}"
1226 fi
1227
1228 java-pkg_do_write_
1229}
1230
1231# ------------------------------------------------------------------------------
1232# @ebuild-function java-pkg_register-environment-variable
1233#
1234# Register an arbitrary environment variable into package.env. The gjl launcher
1235# for this package or any package depending on this will export it into
1236# environement before executing java command.
1237# Must only be called in src_install phase.
1238#
1239# @param $1 - variable name
1240# @param $2 - variable value
1241# ------------------------------------------------------------------------------
1242JAVA_PKG_EXTRA_ENV="${T}/java-pkg-extra-env"
1243JAVA_PKG_EXTRA_ENV_VARS=""
1244java-pkg_register-environment-variable() {
1245 debug-print-function ${FUNCNAME} $*
1246
1247 java-pkg_check-phase install
1248
1249 [[ ${#} != 2 ]] && die "${FUNCNAME} takes two arguments"
1250
1251 echo "${1}=\"${2}\"" >> ${JAVA_PKG_EXTRA_ENV}
1252 JAVA_PKG_EXTRA_ENV_VARS="${JAVA_PKG_EXTRA_ENV_VARS} ${1}"
1253
1254 java-pkg_do_write_
878} 1255}
879 1256
880# This function reads stdin, and based on that input, figures out how to 1257# This function reads stdin, and based on that input, figures out how to
881# populate jars from the filesystem. 1258# populate jars from the filesystem.
882# Need to figure out a good way of making use of this, ie be able to use a 1259# Need to figure out a good way of making use of this, ie be able to use a
999# 1376#
1000# export DEPEND="${DEPEND} ${depstr}" 1377# export DEPEND="${DEPEND} ${depstr}"
1001# export RDEPEND="${RDEPEND} ${depstr}" 1378# export RDEPEND="${RDEPEND} ${depstr}"
1002#} 1379#}
1003 1380
1381# ------------------------------------------------------------------------------
1382# @ebuild-function java-pkg_find-normal-jars
1383#
1384# Find the files with suffix .jar file in the given directory or $WORKDIR
1385#
1386# @param $1 - The directory to search for jar files (default: ${WORKDIR})
1387# ------------------------------------------------------------------------------
1388java-pkg_find-normal-jars() {
1389 local dir=$1
1390 [[ "${dir}" ]] || dir="${WORKDIR}"
1391 local found
1392 for jar in $(find "${dir}" -name "*.jar" -type f); do
1393 echo "${jar}"
1394 found="true"
1395 done
1396 [[ "${found}" ]]
1397 return $?
1398}
1399
1400# ------------------------------------------------------------------------------
1401# @ebuild-function java-pkg_ensure-no-bundled-jars
1402#
1403# 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 1404# This function should be called after WORKDIR has been populated with symlink
1005# TODO document 1405# to system jar files or bundled jars removed.
1406# ------------------------------------------------------------------------------
1006java-pkg_ensure-no-bundled-jars() { 1407java-pkg_ensure-no-bundled-jars() {
1007 debug-print-function ${FUNCNAME} $* 1408 debug-print-function ${FUNCNAME} $*
1008 pushd ${WORKDIR} >/dev/null 2>/dev/null
1009 1409
1010 local bundled_jars=$(find . -name "*.jar" -type f) 1410 local bundled_jars=$(java-pkg_find-normal-jars)
1011 if [[ -n ${bundled_jars} ]]; then 1411 if [[ -n ${bundled_jars} ]]; then
1012 echo "Bundled jars found:" 1412 echo "Bundled jars found:"
1013 local jar 1413 local jar
1014 for jar in ${bundled_jars}; do 1414 for jar in ${bundled_jars}; do
1015 echo $(pwd)${jar/./} 1415 echo $(pwd)${jar/./}
1016 done 1416 done
1017 die "Bundled jars found!" 1417 die "Bundled jars found!"
1018
1019 fi 1418 fi
1020 popd >/dev/null 2>/dev/null
1021} 1419}
1022 1420
1023# ------------------------------------------------------------------------------ 1421# ------------------------------------------------------------------------------
1024# @internal-function java-pkg_ensure-vm-version-sufficient 1422# @internal-function java-pkg_ensure-vm-version-sufficient
1025# 1423#
1174# @ebuild-function java-pkg_get-target 1572# @ebuild-function java-pkg_get-target
1175# 1573#
1176# Determines what target version should be used, for passing to -target. 1574# 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 1575# If you don't care about lower versions, you can set _WANT_TARGET to the
1178# version of your JDK. 1576# 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# 1577#
1183# @return string - Either the lowest possible target, or JAVA_PKG_WANT_TARGET 1578# @return string - Either the lowest possible target, or JAVA_PKG_WANT_TARGET
1184# ------------------------------------------------------------------------------ 1579# ------------------------------------------------------------------------------
1185java-pkg_get-target() { 1580java-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}")} 1581 echo ${JAVA_PKG_WANT_TARGET:-$(depend-java-query --get-lowest "${DEPEND} ${RDEPEND}")}
1199} 1582}
1200 1583
1201java-pkg_get-javac() { 1584java-pkg_get-javac() {
1202 debug-print-function ${FUNCNAME} $* 1585 debug-print-function ${FUNCNAME} $*
1203 1586
1292 die "No GCJ support found!" 1675 die "No GCJ support found!"
1293 fi 1676 fi
1294} 1677}
1295 1678
1296java-pkg_ensure-test() { 1679java-pkg_ensure-test() {
1297 if hasq test ${FEATURES} && ! hasq -test ${FEATURES} && ! use test; then 1680 if hasq test ${FEATURES} && ! hasq -test ${FEATURES} \
1681 && hasq test ${IUSE} && ! use test;
1682 then
1298 eerror "You specified FEATURES=test, but USE=test is needed" 1683 eerror "You specified FEATURES=test, but USE=test is needed"
1299 eerror "to pull in the additional dependencies for testing" 1684 eerror "to pull in the additional dependencies for testing"
1300 die "Need USE=test enabled" 1685 die "Need USE=test enabled"
1301 fi 1686 fi
1302} 1687}
1303 1688
1304# ------------------------------------------------------------------------------ 1689# ------------------------------------------------------------------------------
1690# @ebuild-function java-pkg_register-ant-task
1691#
1692# Register this package as ant task, so that ant will load it when no specific
1693# ANT_TASKS are specified. Note that even without this registering, all packages
1694# specified in ANT_TASKS will be loaded. Mostly used by the actual ant tasks
1695# packages, but can be also used by other ebuilds that used to symlink their
1696# .jar into /usr/share/ant-core/lib to get autoloaded, for backwards
1697# compatibility.
1698#
1699# @param --version x.y Register only for ant version x.y (otherwise for any ant
1700# version). Used by the ant-* packages to prevent loading of mismatched
1701# ant-core ant tasks after core was updated, before the tasks are updated,
1702# without a need for blockers.
1703# @param $1 Name to register as. Defaults to JAVA_PKG_NAME ($PN[-$SLOT])
1704# ------------------------------------------------------------------------------
1705java-pkg_register-ant-task() {
1706 local TASKS_DIR="tasks"
1707
1708 # check for --version x.y parameters
1709 while [[ -n "${1}" && -n "${2}" ]]; do
1710 local var="${1#--}"
1711 local val="${2}"
1712 if [[ "${var}" == "version" ]]; then
1713 TASKS_DIR="tasks-${val}"
1714 else
1715 die "Unknown parameter passed to java-pkg_register-ant-tasks: ${1} ${2}"
1716 fi
1717 shift 2
1718 done
1719
1720 local TASK_NAME="${1:-${JAVA_PKG_NAME}}"
1721
1722 dodir /usr/share/ant/${TASKS_DIR}
1723 touch "${D}/usr/share/ant/${TASKS_DIR}/${TASK_NAME}"
1724}
1725
1726# ------------------------------------------------------------------------------
1727# @internal-function java-pkg_ant-tasks-depend
1728#
1729# Translates the WANT_ANT_TASKS variable into valid dependencies.
1730# ------------------------------------------------------------------------------
1731java-pkg_ant-tasks-depend() {
1732 debug-print-function ${FUNCNAME} ${WANT_ANT_TASKS}
1733
1734 if [[ -n "${WANT_ANT_TASKS}" ]]; then
1735 local DEP=""
1736 for i in ${WANT_ANT_TASKS}
1737 do
1738 if [[ ${i} != ant-* ]]; then
1739 echo "Invalid atom in WANT_ANT_TASKS: ${i}"
1740 return 1
1741 fi
1742 DEP="${DEP}dev-java/${i} "
1743 done
1744 echo ${DEP}
1745 return 0
1746 else
1747 return 0
1748 fi
1749}
1750
1751# ------------------------------------------------------------------------------
1752# @ebuild-function ejunit
1753#
1754# Junit wrapper function. Makes it easier to run the tests and checks for
1755# dev-java/junit in DEPEND. Launches the tests using junit.textui.TestRunner.
1756#
1757# Examples:
1758# ejunit -cp build/classes org.blinkenlights.jid3.test.AllTests
1759# ejunit org.blinkenlights.jid3.test.AllTests
1760#
1761# @param $1 - -cp or -classpath
1762# @param $2 - classpath; junit and recorded dependencies get appended
1763# @param $@ - the rest of the parameters are passed to java
1764# ------------------------------------------------------------------------------
1765ejunit() {
1766 debug-print-function ${FUNCNAME} $*
1767
1768 local pkgs
1769 for atom in $(cat ${JAVA_PKG_DEPEND_FILE} | tr : ' '); do
1770 pkgs=${pkgs},$(echo ${atom} | sed -re "s/^.*@//")
1771 done
1772
1773 local cp=$(java-pkg_getjars --with-dependencies junit${pkgs})
1774 if [[ ${1} = -cp || ${1} = -classpath ]]; then
1775 cp="${2}:${cp}"
1776 shift 2
1777 else
1778 cp=".:${cp}"
1779 fi
1780
1781 local runner=junit.textui.TestRunner
1782 debug-print "Calling: java -cp \"${cp}\" -Djava.awt.headless=true ${runner} ${@}"
1783 java -cp "${cp}" -Djava.awt.headless=true ${runner} "${@}" || die "Running junit failed"
1784}
1785
1786# ------------------------------------------------------------------------------
1305# @section-end helper 1787# @section-end helper
1306# ------------------------------------------------------------------------------ 1788# ------------------------------------------------------------------------------
1307 1789
1308# ------------------------------------------------------------------------------ 1790# ------------------------------------------------------------------------------
1309# @section-begin build 1791# @section-begin build
1315 1797
1316# ------------------------------------------------------------------------------ 1798# ------------------------------------------------------------------------------
1317# @ebuild-function eant 1799# @ebuild-function eant
1318# 1800#
1319# Ant wrapper function. Will use the appropriate compiler, based on user-defined 1801# Ant wrapper function. Will use the appropriate compiler, based on user-defined
1320# compiler. 1802# compiler. Will also set proper ANT_TASKS from the variable ANT_TASKS,
1321# 1803# variables:
1804# EANT_GENTOO_CLASSPATH - calls java-pkg_getjars for the value and adds to the
1805# gentoo.classpath property. Be sure to call
1806# java-ant_rewrite-classpath in src_unpack.
1807# JAVA_PKG_NO_BUNDLED_SEARCH - Don't search for bundled jars or class files
1808# *ANT_TASKS - used to determine ANT_TASKS before calling Ant.
1322# ------------------------------------------------------------------------------ 1809# ------------------------------------------------------------------------------
1323eant() { 1810eant() {
1324 debug-print-function ${FUNCNAME} $* 1811 debug-print-function ${FUNCNAME} $*
1325 1812
1326 # FIXME get this working 1813 if [[ ${EBUILD_PHASE} = compile ]]; then
1327# if is-java-strict && [[ ! ${DEPEND} =~ "dev-java/ant" ]]; then 1814 # Used to be done in hooks in java-ant-2.eclass but moved here so that we can
1815 # finally get rid of the hooks without breaking stuff
1816
1817 [[ "${JAVA_ANT_IGNORE_SYSTEM_CLASSES}" && "${JAVA_PKG_BSFIX}" ]] \
1818 && java-ant_ignore-system-classes "${S}/build.xml"
1819
1820 if hasq java-ant-2 ${INHERITED}; then
1821 java-ant_bsfix
1822 fi
1823
1824 # eant can be called multiple times
1825 JAVA_PKG_BSFIX="off"
1826
1827 if [[ -z ${JAVA_PKG_NO_BUNDLED_SEARCH} ]] && is-java-strict; then
1828 echo "Searching for bundled jars:"
1829 java-pkg_find-normal-jars || echo "None found."
1830 echo "Searching for bundled classes (no output if none found):"
1831 find "${WORKDIR}" -name "*.class"
1832 echo "Search done."
1833 JAVA_PKG_NO_BUNDLED_SEARCH=true # eant can be called many times
1834 fi
1835 fi
1836
1837 if ! hasq java-ant-2 ${INHERITED}; then
1838 local msg="You should inherit java-ant-2 when using eant"
1328# java-pkg_announce-qa-violation \ 1839 java-pkg_announce-qa-violation "${msg}"
1329# "Using eant, but not depending on dev-java/ant or dev-java/ant-core"
1330# fi 1840 fi
1331 1841
1332 local antflags 1842 local antflags="-Dnoget=true -Dmaven.mode.offline=true -Dbuild.sysclasspath=ignore"
1843
1333 java-pkg_init-compiler_ 1844 java-pkg_init-compiler_
1334 local compiler="${GENTOO_COMPILER}" 1845 local compiler="${GENTOO_COMPILER}"
1335 1846
1336 local compiler_env="${JAVA_PKG_COMPILER_DIR}/${compiler}" 1847 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})" 1848 local build_compiler="$(source ${compiler_env} 1>/dev/null 2>&1; echo ${ANT_BUILD_COMPILER})"
1339 if [[ "${compiler}" != "javac" && -z "${build_compiler}" ]]; then 1849 if [[ "${compiler}" != "javac" && -z "${build_compiler}" ]]; then
1340 die "ANT_BUILD_COMPILER undefined in ${compiler_env}" 1850 die "ANT_BUILD_COMPILER undefined in ${compiler_env}"
1341 fi 1851 fi
1342 1852
1343 if [[ ${compiler} != "javac" ]]; then 1853 if [[ ${compiler} != "javac" ]]; then
1344 antflags="-Dbuild.compiler=${build_compiler}" 1854 antflags="${antflags} -Dbuild.compiler=${build_compiler}"
1345 # Figure out any extra stuff to put on the classpath for compilers aside 1855 # Figure out any extra stuff to put on the classpath for compilers aside
1346 # from javac 1856 # from javac
1347 # ANT_BUILD_COMPILER_DEPS should be something that could be passed to 1857 # ANT_BUILD_COMPILER_DEPS should be something that could be passed to
1348 # java-config -p 1858 # java-config -p
1349 local build_compiler_deps="$(source ${JAVA_PKG_COMPILER_DIR}/${compiler} 1>/dev/null 2>&1; echo ${ANT_BUILD_COMPILER_DEPS})" 1859 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 1860 if [[ -n ${build_compiler_deps} ]]; then
1351 antflags="${antflags} -lib $(java-config -p ${build_compiler_deps})" 1861 antflags="${antflags} -lib $(java-config -p ${build_compiler_deps})"
1352 fi 1862 fi
1353 fi 1863 fi
1354 1864
1865 for arg in "${@}"; do
1866 if [[ ${arg} = -lib ]]; then
1355 if is-java-strict; then 1867 if is-java-strict; then
1356 einfo "Disabling system classpath for ant" 1868 eerror "You should not use the -lib argument to eant because it will fail"
1357 antflags="${antflags} -Dbuild.sysclasspath=ignore" 1869 eerror "with JAVA_PKG_STRICT. Please use for example java-pkg_jar-from"
1870 eerror "or ant properties to make dependencies available."
1871 eerror "For ant tasks use WANT_ANT_TASKS or ANT_TASKS from."
1872 eerror "split ant (>=dev-java/ant-core-1.7)."
1873 die "eant -lib is deprecated/forbidden"
1874 else
1875 echo "eant -lib is deprecated. Turn JAVA_PKG_STRICT on for"
1876 echo "more info."
1877 fi
1358 fi 1878 fi
1879 done
1359 1880
1360 if [[ -n ${JAVA_PKG_DEBUG} ]]; then 1881 # default ANT_TASKS to WANT_ANT_TASKS, if ANT_TASKS is not set explicitly
1361 antflags="${antflags} -debug" 1882 ANT_TASKS="${ANT_TASKS:-${WANT_ANT_TASKS}}"
1883
1884 # override ANT_TASKS with JAVA_PKG_FORCE_ANT_TASKS if it's set
1885 ANT_TASKS="${JAVA_PKG_FORCE_ANT_TASKS:-${ANT_TASKS}}"
1886
1887 # if ant-tasks is not set by ebuild or forced, use none
1888 ANT_TASKS="${ANT_TASKS:-none}"
1889
1890 # at this point, ANT_TASKS should be "all", "none" or explicit list
1891 if [[ "${ANT_TASKS}" == "all" ]]; then
1892 einfo "Using all available ANT_TASKS"
1893 elif [[ "${ANT_TASKS}" == "none" ]]; then
1894 einfo "Disabling all optional ANT_TASKS"
1895 else
1896 einfo "Using following ANT_TASKS: ${ANT_TASKS}"
1897 fi
1898
1899 export ANT_TASKS
1900
1901 [[ -n ${JAVA_PKG_DEBUG} ]] && antflags="${antflags} --execdebug -debug"
1902 [[ -n ${PORTAGE_QUIET} ]] && antflags="${antflags} -q"
1903
1904 local gcp="${EANT_GENTOO_CLASSPATH}"
1905 local getjarsarg=""
1906
1907 if [[ ${EBUILD_PHASE} = "test" ]]; then
1908 antflags="${antflags} -DJunit.present=true"
1909 [[ ${gcp} && ${ANT_TASKS} = *ant-junit* ]] && gcp="${gcp} junit"
1910 getjarsarg="--with-dependencies"
1911 fi
1912
1913 local cp
1914
1915 for atom in ${gcp}; do
1916 cp="${cp}:$(java-pkg_getjars ${getjarsarg} ${atom})"
1917 done
1918
1919 if [[ ${cp} ]]; then
1920 # It seems ant does not like single quotes around ${cp}
1921 antflags="${antflags} -Dgentoo.classpath=\"${cp#:}\""
1362 fi 1922 fi
1363 1923
1364 [[ -n ${JAVA_PKG_DEBUG} ]] && echo ant ${antflags} "${@}" 1924 [[ -n ${JAVA_PKG_DEBUG} ]] && echo ant ${antflags} "${@}"
1925 debug-print "Calling ant (GENTOO_VM: ${GENTOO_VM}): ${antflags} ${@}"
1365 ant ${antflags} "${@}" || die "eant failed" 1926 ant ${antflags} "${@}" || die "eant failed"
1366
1367} 1927}
1368 1928
1369# ------------------------------------------------------------------------------ 1929# ------------------------------------------------------------------------------
1370# @ebuild-function ejavac 1930# @ebuild-function ejavac
1371# 1931#
1440# ------------------------------------------------------------------------------ 2000# ------------------------------------------------------------------------------
1441use_doc() { 2001use_doc() {
1442 use doc && echo ${@:-javadoc} 2002 use doc && echo ${@:-javadoc}
1443} 2003}
1444 2004
2005
1445# ------------------------------------------------------------------------------ 2006# ------------------------------------------------------------------------------
1446# @section-end build 2007# @section-end build
1447# ------------------------------------------------------------------------------ 2008# ------------------------------------------------------------------------------
1448 2009
1449# ------------------------------------------------------------------------------ 2010# ------------------------------------------------------------------------------
1465# This shouldn't be used directly. Instead, java-pkg and java-pkg-opt will 2026# 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. 2027# call it during each of the phases of the merge process.
1467# 2028#
1468# ----------------------------------------------------------------------------- 2029# -----------------------------------------------------------------------------
1469java-pkg_init() { 2030java-pkg_init() {
2031 debug-print-function ${FUNCNAME} $*
1470 unset JAVAC 2032 unset JAVAC
1471 unset JAVA_HOME 2033 unset JAVA_HOME
2034
2035 # People do all kinds of weird things.
2036 # http://forums.gentoo.org/viewtopic-p-3943166.html
2037 local silence="${SILENCE_JAVA_OPTIONS_WARNING}"
2038 local accept="${I_WANT_GLOBAL_JAVA_OPTIONS}"
2039 if [[ -n ${_JAVA_OPTIONS} && -z ${accept} && -z ${silence} ]]; then
2040 ewarn "_JAVA_OPTIONS changes what java -version outputs at least for"
2041 ewarn "sun-jdk vms and and as such break configure scripts that"
2042 ewarn "use it (for example app-office/openoffice) so we filter it out."
2043 ewarn "Use SILENCE_JAVA_OPTIONS_WARNING=true in the environment (use"
2044 ewarn "make.conf for example) to silence this warning or"
2045 ewarn "I_WANT_GLOBAL_JAVA_OPTIONS to not filter it."
2046 fi
2047
2048 if [[ -z ${accept} ]]; then
2049 # export _JAVA_OPTIONS= doesn't work because it will show up in java
2050 # -version output
2051 unset _JAVA_OPTIONS
2052 # phase hooks make this run many times without this
2053 I_WANT_GLOBAL_JAVA_OPTIONS="true"
2054 fi
2055
2056 if java-pkg_func-exists ant_src_unpack; then
2057 java-pkg_announce-qa-violation "Using old ant_src_unpack. Should be src_unpack"
2058 fi
2059
1472 java-pkg_init_paths_ 2060 java-pkg_init_paths_
1473 java-pkg_switch-vm 2061 java-pkg_switch-vm
1474 PATH=${JAVA_HOME}/bin:${PATH} 2062 PATH=${JAVA_HOME}/bin:${PATH}
1475 2063
1476 # TODO we will probably want to set JAVAC and JAVACFLAGS 2064 # TODO we will probably want to set JAVAC and JAVACFLAGS
1477 2065
1478 # Do some QA checks 2066 # Do some QA checks
1479 java-pkg_check-jikes 2067 java-pkg_check-jikes
2068
2069 # Can't use unset here because Portage does not save the unset
2070 # see https://bugs.gentoo.org/show_bug.cgi?id=189417#c11
1480 2071
1481 # When users have crazy classpaths some packages can fail to compile. 2072 # When users have crazy classpaths some packages can fail to compile.
1482 # and everything should work with empty CLASSPATH. 2073 # and everything should work with empty CLASSPATH.
1483 # This also helps prevent unexpected dependencies on random things 2074 # This also helps prevent unexpected dependencies on random things
1484 # from the CLASSPATH. 2075 # from the CLASSPATH.
1485 unset CLASSPATH 2076 export CLASSPATH=
2077
2078 # Unset external ANT_ stuff
2079 export ANT_TASKS=
2080 export ANT_OPTS=
1486} 2081}
1487 2082
1488# ------------------------------------------------------------------------------ 2083# ------------------------------------------------------------------------------
1489# @function-internal java-pkg-init-compiler_ 2084# @function-internal java-pkg-init-compiler_
1490# 2085#
1612 fi 2207 fi
1613 2208
1614 JAVA_PKG_SHAREPATH="${DESTTREE}/share/${JAVA_PKG_NAME}" 2209 JAVA_PKG_SHAREPATH="${DESTTREE}/share/${JAVA_PKG_NAME}"
1615 JAVA_PKG_SOURCESPATH="${JAVA_PKG_SHAREPATH}/sources/" 2210 JAVA_PKG_SOURCESPATH="${JAVA_PKG_SHAREPATH}/sources/"
1616 JAVA_PKG_ENV="${D}${JAVA_PKG_SHAREPATH}/package.env" 2211 JAVA_PKG_ENV="${D}${JAVA_PKG_SHAREPATH}/package.env"
2212 JAVA_PKG_VIRTUALS_PATH="${DESTTREE}/share/java-config-2/virtuals"
2213 JAVA_PKG_VIRTUAL_PROVIDER="${D}/${JAVA_PKG_VIRTUALS_PATH}/${JAVA_PKG_NAME}"
1617 2214
1618 [[ -z "${JAVA_PKG_JARDEST}" ]] && JAVA_PKG_JARDEST="${JAVA_PKG_SHAREPATH}/lib" 2215 [[ -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}" 2216 [[ -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" 2217 [[ -z "${JAVA_PKG_WARDEST}" ]] && JAVA_PKG_WARDEST="${JAVA_PKG_SHAREPATH}/webapps"
1621 2218
1634# Writes the package.env out to disk. 2231# Writes the package.env out to disk.
1635# 2232#
1636# ------------------------------------------------------------------------------ 2233# ------------------------------------------------------------------------------
1637# TODO change to do-write, to match everything else 2234# TODO change to do-write, to match everything else
1638java-pkg_do_write_() { 2235java-pkg_do_write_() {
2236 debug-print-function ${FUNCNAME} $*
1639 java-pkg_init_paths_ 2237 java-pkg_init_paths_
1640 # Create directory for package.env 2238 # Create directory for package.env
1641 dodir "${JAVA_PKG_SHAREPATH}" 2239 dodir "${JAVA_PKG_SHAREPATH}"
1642 if [[ -n "${JAVA_PKG_CLASSPATH}" || -n "${JAVA_PKG_LIBRARY}" || -f "${JAVA_PKG_DEPEND}" ]]; then 2240 if [[ -n "${JAVA_PKG_CLASSPATH}" || -n "${JAVA_PKG_LIBRARY}" || -f \
2241 "${JAVA_PKG_DEPEND_FILE}" || -f \
2242 "${JAVA_PKG_OPTIONAL_DEPEND_FILE}" ]]; then
1643 # Create package.env 2243 # Create package.env
1644 ( 2244 (
1645 echo "DESCRIPTION=\"${DESCRIPTION}\"" 2245 echo "DESCRIPTION=\"${DESCRIPTION}\""
1646 echo "GENERATION=\"2\"" 2246 echo "GENERATION=\"2\""
1647 2247
1648 [[ -n "${JAVA_PKG_CLASSPATH}" ]] && echo "CLASSPATH=\"${JAVA_PKG_CLASSPATH}\"" 2248 [[ -n "${JAVA_PKG_CLASSPATH}" ]] && echo "CLASSPATH=\"${JAVA_PKG_CLASSPATH}\""
1649 [[ -n "${JAVA_PKG_LIBRARY}" ]] && echo "LIBRARY_PATH=\"${JAVA_PKG_LIBRARY}\"" 2249 [[ -n "${JAVA_PKG_LIBRARY}" ]] && echo "LIBRARY_PATH=\"${JAVA_PKG_LIBRARY}\""
1650 [[ -n "${JAVA_PROVIDE}" ]] && echo "PROVIDES=\"${JAVA_PROVIDE}\"" 2250 [[ -n "${JAVA_PROVIDE}" ]] && echo "PROVIDES=\"${JAVA_PROVIDE}\""
1651 [[ -f "${JAVA_PKG_DEPEND}" ]] && echo "DEPEND=\"$(cat ${JAVA_PKG_DEPEND} | uniq | tr '\n' ':')\"" 2251 [[ -f "${JAVA_PKG_DEPEND_FILE}" ]] \
2252 && echo "DEPEND=\"$(cat "${JAVA_PKG_DEPEND_FILE}" | uniq | tr '\n' ':')\""
2253 [[ -f "${JAVA_PKG_OPTIONAL_DEPEND_FILE}" ]] \
2254 && 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 ! 2255 echo "VM=\"$(echo ${RDEPEND} ${DEPEND} | sed -e 's/ /\n/g' | sed -n -e '/virtual\/\(jre\|jdk\)/ { p;q }')\"" # TODO cleanup !
1653 ) > "${JAVA_PKG_ENV}" 2256 ) > "${JAVA_PKG_ENV}"
1654 2257
1655 # register target/source 2258 # register target/source
1656 local target="$(java-pkg_get-target)" 2259 local target="$(java-pkg_get-target)"
1667 2270
1668 2271
1669 echo "MERGE_VM=\"${GENTOO_VM}\"" >> "${JAVA_PKG_ENV}" 2272 echo "MERGE_VM=\"${GENTOO_VM}\"" >> "${JAVA_PKG_ENV}"
1670 [[ -n ${GENTOO_COMPILER} ]] && echo "MERGE_COMPILER=\"${GENTOO_COMPILER}\"" >> "${JAVA_PKG_ENV}" 2273 [[ -n ${GENTOO_COMPILER} ]] && echo "MERGE_COMPILER=\"${GENTOO_COMPILER}\"" >> "${JAVA_PKG_ENV}"
1671 2274
2275 # extra env variables
2276 if [[ -n "${JAVA_PKG_EXTRA_ENV_VARS}" ]]; then
2277 cat "${JAVA_PKG_EXTRA_ENV}" >> "${JAVA_PKG_ENV}" || die
2278 # nested echo to remove leading/trailing spaces
2279 echo "ENV_VARS=\"$(echo ${JAVA_PKG_EXTRA_ENV_VARS})\"" \
2280 >> "${JAVA_PKG_ENV}" || die
2281 fi
2282
1672 # Strip unnecessary leading and trailing colons 2283 # Strip unnecessary leading and trailing colons
1673 # TODO try to cleanup if possible 2284 # TODO try to cleanup if possible
1674 sed -e "s/=\":/=\"/" -e "s/:\"$/\"/" -i "${JAVA_PKG_ENV}" || die "Did you forget to call java_init ?" 2285 sed -e "s/=\":/=\"/" -e "s/:\"$/\"/" -i "${JAVA_PKG_ENV}" || die "Did you forget to call java_init ?"
2286 else
2287 debug-print "JAVA_PKG_CLASSPATH, JAVA_PKG_LIBRARY, JAVA_PKG_DEPEND_FILE"
2288 debug-print "or JAVA_PKG_OPTIONAL_DEPEND_FILE not defined so can't"
2289 debug-print "write package.env."
1675 fi 2290 fi
1676} 2291}
1677 2292
1678# ------------------------------------------------------------------------------ 2293# ------------------------------------------------------------------------------
1679# @internal-function java-pkg_record-jar_ 2294# @internal-function java-pkg_record-jar_
1680# 2295#
1681# Record a dependency to the package.env 2296# Record an (optional) dependency to the package.env
1682# 2297# @param --optional - record dependency as optional
2298# @param $1 - package to record
2299# @param $2 - (optional) jar of package to record
1683# ------------------------------------------------------------------------------ 2300# ------------------------------------------------------------------------------
1684JAVA_PKG_DEPEND="${T}/java-pkg-depend" 2301JAVA_PKG_DEPEND_FILE="${T}/java-pkg-depend"
2302JAVA_PKG_OPTIONAL_DEPEND_FILE="${T}/java-pkg-optional-depend"
1685 2303
1686java-pkg_record-jar_() { 2304java-pkg_record-jar_() {
1687 debug-print-function ${FUNCNAME} $* 2305 debug-print-function ${FUNCNAME} $*
2306
2307 local depend_file="${JAVA_PKG_DEPEND_FILE}"
2308 if [[ "${1}" == "--optional" ]]; then
2309 depend_file="${JAVA_PKG_OPTIONAL_DEPEND_FILE}"
2310 shift
2311 fi
1688 2312
1689 local pkg=${1} jar=${2} append 2313 local pkg=${1} jar=${2} append
1690 if [[ -z "${jar}" ]]; then 2314 if [[ -z "${jar}" ]]; then
1691 append="${pkg}" 2315 append="${pkg}"
1692 else 2316 else
1693 append="$(basename ${jar})@${pkg}" 2317 append="$(basename ${jar})@${pkg}"
1694 fi 2318 fi
1695 2319
1696 echo ${append} >> ${JAVA_PKG_DEPEND} 2320 echo "${append}" >> "${depend_file}"
1697} 2321}
1698 2322
1699# ------------------------------------------------------------------------------ 2323# ------------------------------------------------------------------------------
1700# @internal-function java-pkg_append_ 2324# @internal-function java-pkg_append_
1701# 2325#
1761# 2385#
1762# ------------------------------------------------------------------------------ 2386# ------------------------------------------------------------------------------
1763java-pkg_setup-vm() { 2387java-pkg_setup-vm() {
1764 debug-print-function ${FUNCNAME} $* 2388 debug-print-function ${FUNCNAME} $*
1765 2389
2390 export LANG="C" LC_ALL="C"
2391
1766 local vendor="$(java-pkg_get-vm-vendor)" 2392 local vendor="$(java-pkg_get-vm-vendor)"
1767 if [[ "${vendor}" == "sun" ]] && java-pkg_is-vm-version-ge "1.5" ; then 2393 if [[ "${vendor}" == "sun" ]] && java-pkg_is-vm-version-ge "1.5" ; then
1768 addpredict "/dev/random" 2394 addpredict "/dev/random"
1769 elif [[ "${vendor}" == "ibm" ]]; then 2395 elif [[ "${vendor}" == "ibm" ]]; then
1770 addpredict "/proc/self/maps" 2396 addpredict "/proc/self/maps"
1771 addpredict "/proc/cpuinfo" 2397 addpredict "/proc/cpuinfo"
1772 export LANG="C" LC_ALL="C"
1773 elif [[ "${vendor}" == "jrockit" ]]; then 2398 elif [[ "${vendor}" == "jrockit" ]]; then
1774 addpredict "/proc/cpuinfo" 2399 addpredict "/proc/cpuinfo"
1775 fi 2400 fi
1776} 2401}
1777 2402
1832# Switch VM if we're allowed to (controlled by JAVA_PKG_ALLOW_VM_CHANGE), and 2457# Switch VM if we're allowed to (controlled by JAVA_PKG_ALLOW_VM_CHANGE), and
1833# verify that the current VM is sufficient. 2458# verify that the current VM is sufficient.
1834# Setup the environment for the VM being used. 2459# Setup the environment for the VM being used.
1835# ------------------------------------------------------------------------------ 2460# ------------------------------------------------------------------------------
1836java-pkg_switch-vm() { 2461java-pkg_switch-vm() {
2462 debug-print-function ${FUNCNAME} $*
2463
1837 if java-pkg_needs-vm; then 2464 if java-pkg_needs-vm; then
1838 # Use the VM specified by JAVA_PKG_FORCE_VM 2465 # Use the VM specified by JAVA_PKG_FORCE_VM
1839 if [[ -n ${JAVA_PKG_FORCE_VM} ]]; then 2466 if [[ -n "${JAVA_PKG_FORCE_VM}" ]]; then
1840 # If you're forcing the VM, I hope you know what your doing... 2467 # If you're forcing the VM, I hope you know what your doing...
2468 debug-print "JAVA_PKG_FORCE_VM used: ${JAVA_PKG_FORCE_VM}"
1841 export GENTOO_VM="${JAVA_PKG_FORCE_VM}" 2469 export GENTOO_VM="${JAVA_PKG_FORCE_VM}"
1842 # if we're allowed to switch the vm... 2470 # if we're allowed to switch the vm...
1843 elif [[ "${JAVA_PKG_ALLOW_VM_CHANGE}" == "yes" ]]; then 2471 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}" 2472 debug-print "depend-java-query: NV_DEPEND: ${JAVA_PKG_NV_DEPEND:-${DEPEND}} VNEED: ${JAVA_PKG_VNEED}"
1845 if [[ -n ${JAVA_PKG_VNEED} ]]; then 2473 if [[ -n ${JAVA_PKG_VNEED} ]]; then
1878 2506
1879 #TODO If you know a better solution let us know. 2507 #TODO If you know a better solution let us know.
1880 java-pkg_append_ LD_LIBRARY_PATH "$(java-config -g LDPATH)" 2508 java-pkg_append_ LD_LIBRARY_PATH "$(java-config -g LDPATH)"
1881 2509
1882 local tann="${T}/announced-vm" 2510 local tann="${T}/announced-vm"
2511 # With the hooks we should only get here once from pkg_setup but better safe than sorry
2512 # if people have for example modified eclasses some where
1883 if [[ -n "${JAVA_PKG_DEBUG}" ]] || [[ ! -f "${tann}" ]] ; then 2513 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)" 2514 einfo "Using: $(java-config -f)"
1889 [[ ! -f "${tann}" ]] && touch "${tann}" 2515 [[ ! -f "${tann}" ]] && touch "${tann}"
1890 fi
1891 fi 2516 fi
1892 2517
1893 else 2518 else
1894 [[ -n "${JAVA_PKG_DEBUG}" ]] && ewarn "!!! This package inherits java-pkg but doesn't depend on a JDK. -bin or broken dependency!!!" 2519 [[ -n "${JAVA_PKG_DEBUG}" ]] && ewarn "!!! This package inherits java-pkg but doesn't depend on a JDK. -bin or broken dependency!!!"
1895 fi 2520 fi
1925 einfo "Classes" 2550 einfo "Classes"
1926 find "${S}" -type f -name '*.class' -print0 | xargs -0 -r -n 500 ls -ald | sed -e "s,${WORKDIR},\${WORKDIR}," 2551 find "${S}" -type f -name '*.class' -print0 | xargs -0 -r -n 500 ls -ald | sed -e "s,${WORKDIR},\${WORKDIR},"
1927 fi 2552 fi
1928} 2553}
1929 2554
1930# TODO document 2555# ------------------------------------------------------------------------------
2556# @internal-function java-pkg_verify-classes
2557#
1931# Verify that the classes were compiled for the right source / target 2558# Verify that the classes were compiled for the right source / target. Dies if
2559# not.
2560# @param $1 (optional) - the file to check, otherwise checks whole ${D}
2561# ------------------------------------------------------------------------------
1932java-pkg_verify-classes() { 2562java-pkg_verify-classes() {
1933 ebegin "Verifying java class versions"
1934 #$(find ${D} -type f -name '*.jar' -o -name '*.class') 2563 #$(find ${D} -type f -name '*.jar' -o -name '*.class')
1935 class-version-verify.py -t $(java-pkg_get-target) -r ${D} 2564 local target=$(java-pkg_get-target)
2565 local result
2566 local log="${T}/class-version-verify.log"
2567 if [[ -n "${1}" ]]; then
2568 class-version-verify.py -v -t ${target} "${1}" > "${log}"
1936 result=$? 2569 result=$?
1937 eend ${result}
1938 if [[ ${result} == 0 ]]; then
1939 einfo "All good"
1940 else 2570 else
1941 ewarn "Possible problem" 2571 ebegin "Verifying java class versions (target: ${target})"
1942 die "Bad class files found" 2572 class-version-verify.py -v -t ${target} -r "${D}" > "${log}"
2573 result=$?
2574 eend ${result}
2575 fi
2576 [[ -n ${JAVA_PKG_DEBUG} ]] && cat "${log}"
2577 if [[ ${result} != 0 ]]; then
2578 eerror "Incorrect bytecode version found"
2579 [[ -n "${1}" ]] && eerror "in file: ${1}"
2580 eerror "See ${log} for more details."
2581 die "Incorrect bytecode found"
2582 fi
2583}
2584
2585# ----------------------------------------------------------------------------
2586# @internal-function java-pkg_ensure-dep
2587# Check that a package being used in jarfrom, getjars and getjar is contained
2588# within DEPEND or RDEPEND.
2589# @param $1 - empty - check both vars; "runtime" or "build" - check only
2590# RDEPEND, resp. DEPEND
2591# @param $2 - Package name and slot.
2592
2593java-pkg_ensure-dep() {
2594 debug-print-function ${FUNCNAME} $*
2595
2596 local limit_to="${1}"
2597 local target_pkg="${2}"
2598 local dev_error=""
2599
2600 local stripped_pkg=$(echo "${target_pkg}" | sed \
2601 's/-[0-9]*\(\.[0-9]\)*$//')
2602
2603 debug-print "Matching against: ${stripped_pkg}"
2604
2605 if [[ ${limit_to} != runtime && ! ( "${DEPEND}" =~ "$stripped_pkg" ) ]]; then
2606 dev_error="The ebuild is attempting to use ${target_pkg} that is not"
2607 dev_error="${dev_error} declared in DEPEND."
2608 if is-java-strict; then
2609 eerror "${dev_error}"
2610 die "${dev_error}"
2611 elif [[ ${BASH_SUBSHELL} = 0 ]]; then
2612 eerror "${dev_error}"
2613 elog "Because you have this package installed the package will"
2614 elog "build without problems, but please report this to"
2615 elog "http://bugs.gentoo.org"
2616 fi
2617 fi
2618
2619 if [[ ${limit_to} != build ]]; then
2620 if [[ ! ( ${RDEPEND} =~ "${stripped_pkg}" ) ]]; then
2621 if [[ ! ( ${PDEPEND} =~ "${stripped_pkg}" ) ]]; then
2622 dev_error="The ebuild is attempting to use ${target_pkg},"
2623 dev_error="${dev_error} without specifying --build-only, that is not declared in RDEPEND"
2624 dev_error="${dev_error} or PDEPEND."
2625 if is-java-strict; then
2626 eerror "${dev_error}"
2627 die "${dev_error}"
2628 elif [[ ${BASH_SUBSHELL} = 0 ]]; then
2629 eerror "${dev_error}"
2630 elog "The package will build without problems, but may fail to run"
2631 elog "if you don't have ${target_pkg} installed, so please report"
2632 elog "this to http://bugs.gentoo.org"
2633 fi
2634 fi
2635 fi
1943 fi 2636 fi
1944} 2637}
1945 2638
1946# ------------------------------------------------------------------------------ 2639# ------------------------------------------------------------------------------
1947# @section-end internal 2640# @section-end internal
1948# ------------------------------------------------------------------------------ 2641# ------------------------------------------------------------------------------
1949 2642
1950java-pkg_check-phase() { 2643java-pkg_check-phase() {
1951 local phase=${1} 2644 local phase=${1}
1952 local funcname=${2} 2645 local funcname=${FUNCNAME[1]}
1953 if is-java-strict && [[ ${EBUILD_PHASE} != ${phase} ]]; then 2646 if [[ ${EBUILD_PHASE} != ${phase} ]]; then
1954 java-pkg_announce-qa-violation \
1955 "${funcname} used outside of src_${phase}" 2647 local msg="${funcname} used outside of src_${phase}"
2648 java-pkg_announce-qa-violation "${msg}"
1956 fi 2649 fi
1957} 2650}
1958 2651
1959java-pkg_check-versioned-jar() { 2652java-pkg_check-versioned-jar() {
1960 local jar=${1} 2653 local jar=${1}
1969 java-pkg_announce-qa-violation "deprecated USE flag 'jikes' in IUSE" 2662 java-pkg_announce-qa-violation "deprecated USE flag 'jikes' in IUSE"
1970 fi 2663 fi
1971} 2664}
1972 2665
1973java-pkg_announce-qa-violation() { 2666java-pkg_announce-qa-violation() {
1974 if is-java-strict; then 2667 local nodie
2668 if [[ ${1} == "--nodie" ]]; then
2669 nodie="true"
2670 shift
2671 fi
1975 echo "Java QA Notice: $@" >&2 2672 echo "Java QA Notice: $@" >&2
1976 increment-qa-violations 2673 increment-qa-violations
1977 fi 2674 [[ -z "${nodie}" ]] && is-java-strict && die "${@}"
1978} 2675}
1979 2676
1980increment-qa-violations() { 2677increment-qa-violations() {
1981 let "JAVA_PKG_QA_VIOLATIONS+=1" 2678 let "JAVA_PKG_QA_VIOLATIONS+=1"
1982 export JAVA_PKG_QA_VIOLATIONS 2679 export JAVA_PKG_QA_VIOLATIONS

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

  ViewVC Help
Powered by ViewVC 1.1.20