/[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.122
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.122 2009/02/19 05:10:37 serkan 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# -----------------------------------------------------------------------------
42JAVA_PKG_PORTAGE_DEP=">=sys-apps/portage-2.1_pre1" 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. For EAPI 2 we have new enough stuff so let's have cleaner deps.
65# -----------------------------------------------------------------------------
66hasq "${EAPI}" 0 1 && JAVA_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.1.6 ${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
202 done 291 done
203 292
204 java-pkg_do_write_ 293 java-pkg_do_write_
205} 294}
206 295
296# ------------------------------------------------------------------------------
297# @internal-function depend-java-query
298#
299# Wrapper for the depend-java-query binary to enable passing USE in env.
300# Using env variables keeps this eclass working with java-config versions that
301# do not handle use flags.
302# ------------------------------------------------------------------------------
207 303
304depend-java-query() {
305 # Used to have a which call here but it caused endless loops for some people
306 # that had some weird bashrc voodoo for which.
307 USE="${USE}" /usr/bin/depend-java-query "${@}"
308}
208 309
209# ------------------------------------------------------------------------------ 310# ------------------------------------------------------------------------------
210# @ebuild-function java-pkg_regjar 311# @ebuild-function java-pkg_regjar
211# 312#
212# Records an already installed jar in the package.env 313# Records an already installed jar in the package.env
243 [[ ${#} -lt 1 ]] && die "at least one argument needed" 344 [[ ${#} -lt 1 ]] && die "at least one argument needed"
244 345
245 java-pkg_init_paths_ 346 java-pkg_init_paths_
246 347
247 local jar jar_dir jar_file 348 local jar jar_dir jar_file
248 for jar in "$@"; do 349 for jar in "${@}"; do
249 # TODO use java-pkg_check-versioned-jar 350 # TODO use java-pkg_check-versioned-jar
250 if [[ -e "${jar}" ]]; then 351 if [[ -e "${jar}" || -e "${D}${jar}" ]]; then
352 [[ -d "${jar}" || -d "${D}${jar}" ]] \
353 && die "Called ${FUNCNAME} on a directory $*"
354
355 #check that class version correct when in strict mode
356 is-java-strict && java-pkg_verify-classes "${jar}"
357
251 # nelchael: we should strip ${D} in this case too, here's why: 358 # nelchael: we should strip ${D} in this case too, here's why:
252 # imagine such call: 359 # imagine such call:
253 # java-pkg_regjar ${D}/opt/java/*.jar 360 # java-pkg_regjar ${D}/opt/java/*.jar
254 # such call will fall into this case (-e ${jar}) and will 361 # such call will fall into this case (-e ${jar}) and will
255 # record paths with ${D} in package.env 362 # record paths with ${D} in package.env
256 java-pkg_append_ JAVA_PKG_CLASSPATH "${jar#${D}}" 363 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 364 else
365 if [[ ${jar} = *\** ]]; then
366 eerror "The argument ${jar} to ${FUNCNAME}"
367 eerror "has * in it. If you want it to glob in"
368 eerror '${D} add ${D} to the argument.'
369 fi
260 die "${jar} does not exist" 370 die "${jar} does not exist"
261 fi 371 fi
262 done 372 done
263 373
264 java-pkg_do_write_ 374 java-pkg_do_write_
265} 375}
266
267 376
268# ------------------------------------------------------------------------------ 377# ------------------------------------------------------------------------------
269# @ebuild-function java-pkg_newjar 378# @ebuild-function java-pkg_newjar
270# 379#
271# Installs a jar with a new name 380# Installs a jar with a new name
282 local original_jar="${1}" 391 local original_jar="${1}"
283 local new_jar="${2:-${PN}.jar}" 392 local new_jar="${2:-${PN}.jar}"
284 local new_jar_dest="${T}/${new_jar}" 393 local new_jar_dest="${T}/${new_jar}"
285 394
286 [[ -z ${original_jar} ]] && die "Must specify a jar to install" 395 [[ -z ${original_jar} ]] && die "Must specify a jar to install"
287 [[ ! -f ${original_jar} ]] && die "${original_jar} does not exist!" 396 [[ ! -f ${original_jar} ]] \
397 && die "${original_jar} does not exist or is not a file!"
288 398
289 rm -f "${new_jar_dest}" || die "Failed to remove ${new_jar_dest}" 399 rm -f "${new_jar_dest}" || die "Failed to remove ${new_jar_dest}"
290 cp "${original_jar}" "${new_jar_dest}" \ 400 cp "${original_jar}" "${new_jar_dest}" \
291 || die "Failed to copy ${original_jar} to ${new_jar_dest}" 401 || die "Failed to copy ${original_jar} to ${new_jar_dest}"
292 java-pkg_dojar "${new_jar_dest}" 402 java-pkg_dojar "${new_jar_dest}"
335 if [[ -e "${lib}" ]] ; then 445 if [[ -e "${lib}" ]] ; then
336 # install if it isn't a symlink 446 # install if it isn't a symlink
337 if [[ ! -L "${lib}" ]] ; then 447 if [[ ! -L "${lib}" ]] ; then
338 INSDESTTREE="${JAVA_PKG_LIBDEST}" \ 448 INSDESTTREE="${JAVA_PKG_LIBDEST}" \
339 INSOPTIONS="${LIBOPTIONS}" \ 449 INSOPTIONS="${LIBOPTIONS}" \
340 doins "${lib}" || "failed to install ${lib}" 450 doins "${lib}" || die "failed to install ${lib}"
341 java-pkg_append_ JAVA_PKG_LIBRARY "${JAVA_PKG_LIBDEST}" 451 java-pkg_append_ JAVA_PKG_LIBRARY "${JAVA_PKG_LIBDEST}"
342 debug-print "Installing ${lib} to ${JAVA_PKG_LIBDEST}" 452 debug-print "Installing ${lib} to ${JAVA_PKG_LIBDEST}"
343 # otherwise make a symlink to the symlink's origin 453 # otherwise make a symlink to the symlink's origin
344 else 454 else
345 # TODO use dosym 455 # TODO use dosym
456 ln -s "$(readlink "${lib}")" \
346 ln -s "$(readlink "${lib}")" "${D}${JAVA_PKG_LIBDEST}/$(basename "${lib}")" 457 "${D}${JAVA_PKG_LIBDEST}/$(basename "${lib}")"
347 debug-print "${lib} is a symlink, linking accordanly" 458 debug-print "${lib} is a symlink, linking accordanly"
348 fi 459 fi
349 # otherwise die 460 # otherwise die
350 else 461 else
351 die "${lib} does not exist" 462 die "${lib} does not exist"
445# ------------------------------------------------------------------------------ 556# ------------------------------------------------------------------------------
446# @ebuild-function java-pkg_dojavadoc 557# @ebuild-function java-pkg_dojavadoc
447# 558#
448# Installs javadoc documentation. This should be controlled by the doc use flag. 559# Installs javadoc documentation. This should be controlled by the doc use flag.
449# 560#
561# @param $1: optional --symlink creates to symlink like this for html
562# documentation bundles.
450# @param $1: - The javadoc root directory. 563# @param $2: - The javadoc root directory.
451# 564#
452# @example: 565# @example:
453# java-pkg_dojavadoc docs/api 566# java-pkg_dojavadoc docs/api
567# java-pkg_dojavadoc --symlink apidocs docs/api
454# 568#
455# ------------------------------------------------------------------------------ 569# ------------------------------------------------------------------------------
456java-pkg_dojavadoc() { 570java-pkg_dojavadoc() {
571 debug-print-function ${FUNCNAME} $*
572
573 # For html documentation bundles that link to Javadoc
574 local symlink
575 if [[ ${1} = --symlink ]]; then
576 symlink=${2}
577 shift 2
578 fi
579
457 local dir="$1" 580 local dir="$1"
581 local dest=/usr/share/doc/${PF}/html
582
583 # QA checks
458 584
459 java-pkg_check-phase install 585 java-pkg_check-phase install
460 586
461 [[ -z "${dir}" ]] && die "Must specify a directory!" 587 [[ -z "${dir}" ]] && die "Must specify a directory!"
462 [[ ! -d "${dir}" ]] && die "${dir} does not exist, or isn't a directory!" 588 [[ ! -d "${dir}" ]] && die "${dir} does not exist, or isn't a directory!"
589 if [[ ! -e "${dir}/index.html" ]]; then
590 local msg="No index.html in javadoc directory"
591 ewarn "${msg}"
592 is-java-strict && die "${msg}"
593 fi
594
595 if [[ -e ${D}/${dest}/api ]]; then
596 eerror "${dest} already exists. Will not overwrite."
597 die "${dest}"
598 fi
599
600 # Renaming to match our directory layout
463 601
464 local dir_to_install="${dir}" 602 local dir_to_install="${dir}"
465 if [[ "$(basename "${dir}")" != "api" ]]; then 603 if [[ "$(basename "${dir}")" != "api" ]]; then
466 dir_to_install="${T}/api" 604 dir_to_install="${T}/api"
467 # TODO use doins 605 # TODO use doins
468 cp -r "${dir}" "${dir_to_install}" || die "cp failed" 606 cp -r "${dir}" "${dir_to_install}" || die "cp failed"
469 fi 607 fi
470 608
609 # Actual installation
610
471 java-pkg_dohtml -r ${dir_to_install} 611 java-pkg_dohtml -r "${dir_to_install}"
612
613 # Let's make a symlink to the directory we have everything else under
614 dosym ${dest}/api "${JAVA_PKG_SHAREPATH}/api" || die
615
616 if [[ ${symlink} ]]; then
617 debug-print "symlinking ${dest}/{api,${symlink}}"
618 dosym ${dest}/{api,${symlink}} || die
619 fi
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 java-pkg_announce-qa-violation ${msg}
653 fi
504 654
505 java-pkg_init_paths_ 655 java-pkg_init_paths_
506 656
507 local zip_name="${PN}-src.zip" 657 local zip_name="${PN}-src.zip"
508 local zip_path="${T}/${zip_name}" 658 local zip_path="${T}/${zip_name}"
509 local dir 659 local dir
510 for dir in ${@}; do 660 for dir in "${@}"; do
511 local dir_parent=$(dirname "${dir}") 661 local dir_parent=$(dirname "${dir}")
512 local dir_name=$(basename "${dir}") 662 local dir_name=$(basename "${dir}")
513 pushd ${dir_parent} > /dev/null || die "problem entering ${dir_parent}" 663 pushd ${dir_parent} > /dev/null || die "problem entering ${dir_parent}"
514 zip -q -r ${zip_path} ${dir_name} -i '*.java' 664 zip -q -r ${zip_path} ${dir_name} -i '*.java'
515 local result=$? 665 local result=$?
540# @param $1 - filename of launcher to create 690# @param $1 - filename of launcher to create
541# @param $2 - options, as follows: 691# @param $2 - options, as follows:
542# --main the.main.class.too.start 692# --main the.main.class.too.start
543# --jar /the/jar/too/launch.jar or just <name>.jar 693# --jar /the/jar/too/launch.jar or just <name>.jar
544# --java_args 'Extra arguments to pass to java' 694# --java_args 'Extra arguments to pass to java'
545# --pkg_args 'Extra arguments too pass to the package' 695# --pkg_args 'Extra arguments to pass to the package'
546# --pwd 696# --pwd Directory the launcher changes to before executing java
547# -into 697# -into Directory to install the launcher to, instead of /usr/bin
548# -pre 698# -pre Prepend contents of this file to the launcher
549# ------------------------------------------------------------------------------ 699# ------------------------------------------------------------------------------
550java-pkg_dolauncher() { 700java-pkg_dolauncher() {
551 debug-print-function ${FUNCNAME} $* 701 debug-print-function ${FUNCNAME} $*
552 702
553 java-pkg_check-phase install 703 java-pkg_check-phase install
565 local var_tmp="${T}/launcher_variables_tmp" 715 local var_tmp="${T}/launcher_variables_tmp"
566 local target_dir pre 716 local target_dir pre
567 717
568 # Process the other the rest of the arguments 718 # Process the other the rest of the arguments
569 while [[ -n "${1}" && -n "${2}" ]]; do 719 while [[ -n "${1}" && -n "${2}" ]]; do
570 local var=${1} value=${2} 720 local var="${1}" value="${2}"
571 if [[ "${var:0:2}" == "--" ]]; then 721 if [[ "${var:0:2}" == "--" ]]; then
572 local var=${var:2} 722 local var=${var:2}
573 echo "gjl_${var}=\"${value}\"" >> "${var_tmp}" 723 echo "gjl_${var}=\"${value}\"" >> "${var_tmp}"
574 local gjl_${var}="${value}" 724 local gjl_${var}="${value}"
575 elif [[ "${var}" == "-into" ]]; then 725 elif [[ "${var}" == "-into" ]]; then
594 fi 744 fi
595 fi 745 fi
596 746
597 # Write the actual script 747 # Write the actual script
598 echo "#!/bin/bash" > "${target}" 748 echo "#!/bin/bash" > "${target}"
599 [[ -n "${pre}" ]] && [[ -f "${pre}" ]] && cat "${pre}" >> "${target}" 749 if [[ -n "${pre}" ]]; then
750 if [[ -f "${pre}" ]]; then
751 cat "${pre}" >> "${target}"
752 else
753 die "-pre specified file '${pre}' does not exist"
754 fi
755 fi
600 echo "gjl_package=${JAVA_PKG_NAME}" >> "${target}" 756 echo "gjl_package=${JAVA_PKG_NAME}" >> "${target}"
601 cat "${var_tmp}" >> "${target}" 757 cat "${var_tmp}" >> "${target}"
602 rm -f "${var_tmp}" 758 rm -f "${var_tmp}"
603 echo "source /usr/share/java-config-2/launcher/launcher.bash" >> "${target}" 759 echo "source /usr/share/java-config-2/launcher/launcher.bash" >> "${target}"
604 760
696# Example: get a specific jar from xerces slot 2, and name it diffrently 852# 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 853# java-pkg_jar-from xerces-2 xml-apis.jar xml.jar
698# Example: get junit.jar which is needed only for building 854# Example: get junit.jar which is needed only for building
699# java-pkg_jar-from --build-only junit junit.jar 855# java-pkg_jar-from --build-only junit junit.jar
700# 856#
701# @param $1 - (optional) "--build-only" makes the jar(s) not added into 857# @param $opt
702# package.env DEPEND line. 858# --build-only - makes the jar(s) not added into package.env DEPEND line.
703# @param $1 - Package to get jars from. 859# (assumed automatically when called inside src_test)
860# --with-dependencies - get jars also from requested package's dependencies
861# transitively.
862# --virtual - Packages passed to this function are to be handled as virtuals
863# and will not have individual jar dependencies recorded.
864# --into $dir - symlink jar(s) into $dir (must exist) instead of .
865# @param $1 - Package to get jars from, or comma-separated list of packages in
866# case other parameters are not used.
704# @param $2 - jar from package. If not specified, all jars will be used. 867# @param $2 - jar from package. If not specified, all jars will be used.
705# @param $3 - When a single jar is specified, destination filename of the 868# @param $3 - When a single jar is specified, destination filename of the
706# symlink. Defaults to the name of the jar. 869# symlink. Defaults to the name of the jar.
707# ------------------------------------------------------------------------------ 870# ------------------------------------------------------------------------------
708# TODO could probably be cleaned up a little 871# TODO could probably be cleaned up a little
709java-pkg_jar-from() { 872java-pkg_jar-from() {
710 debug-print-function ${FUNCNAME} $* 873 debug-print-function ${FUNCNAME} $*
711 874
712 local build_only="" 875 local build_only=""
876 local destdir="."
877 local deep=""
878 local virtual=""
713 879
880 [[ "${EBUILD_PHASE}" == "test" ]] && build_only="build"
881
882 while [[ "${1}" == --* ]]; do
714 if [[ "${1}" = "--build-only" ]]; then 883 if [[ "${1}" = "--build-only" ]]; then
715 build_only="true" 884 build_only="build"
885 elif [[ "${1}" = "--with-dependencies" ]]; then
886 deep="--with-dependencies"
887 elif [[ "${1}" = "--virtual" ]]; then
888 virtual="true"
889 elif [[ "${1}" = "--into" ]]; then
890 destdir="${2}"
891 shift
892 else
893 die "java-pkg_jar-from called with unknown parameter: ${1}"
894 fi
716 shift 895 shift
717 fi 896 done
718 897
719 local target_pkg="${1}" target_jar="${2}" destjar="${3}" 898 local target_pkg="${1}" target_jar="${2}" destjar="${3}"
720 899
721 [[ -z ${target_pkg} ]] && die "Must specify a package" 900 [[ -z ${target_pkg} ]] && die "Must specify a package"
901
902 if [[ "${EAPI}" == "1" ]]; then
903 target_pkg="${target_pkg//:/-}"
904 fi
722 905
723 # default destjar to the target jar 906 # default destjar to the target jar
724 [[ -z "${destjar}" ]] && destjar="${target_jar}" 907 [[ -z "${destjar}" ]] && destjar="${target_jar}"
725 908
726 local error_msg="There was a problem getting the classpath for ${target_pkg}." 909 local error_msg="There was a problem getting the classpath for ${target_pkg}."
727 local classpath 910 local classpath
728 classpath="$(java-config --classpath=${target_pkg})" 911 classpath="$(java-config ${deep} --classpath=${target_pkg})"
729 [[ $? != 0 ]] && die ${error_msg} 912 [[ $? != 0 ]] && die ${error_msg}
913
914 # When we have commas this functions is called to bring jars from multiple
915 # packages. This affects recording of dependencencies performed later
916 # which expects one package only, so we do it here.
917 if [[ ${target_pkg} = *,* ]]; then
918 for pkg in ${target_pkg//,/ }; do
919 java-pkg_ensure-dep "${build_only}" "${pkg}"
920 [[ -z "${build_only}" ]] && java-pkg_record-jar_ "${pkg}"
921 done
922 # setting this disables further record-jar_ calls later
923 build_only="build"
924 else
925 java-pkg_ensure-dep "${build_only}" "${target_pkg}"
926 fi
927
928 # Record the entire virtual as a dependency so that
929 # no jars are missed.
930 if [[ -z "${build_only}" && -n "${virtual}" ]]; then
931 java-pkg_record-jar_ "${target_pkg}"
932 # setting this disables further record-jars_ calls later
933 build_only="build"
934 fi
935
936 pushd ${destdir} > /dev/null \
937 || die "failed to change directory to ${destdir}"
730 938
731 local jar 939 local jar
732 for jar in ${classpath//:/ }; do 940 for jar in ${classpath//:/ }; do
733 local jar_name=$(basename "${jar}") 941 local jar_name=$(basename "${jar}")
734 if [[ ! -f "${jar}" ]] ; then 942 if [[ ! -f "${jar}" ]] ; then
745 elif [[ "${jar_name}" == "${target_jar}" ]] ; then 953 elif [[ "${jar_name}" == "${target_jar}" ]] ; then
746 [[ -f "${destjar}" ]] && rm "${destjar}" 954 [[ -f "${destjar}" ]] && rm "${destjar}"
747 ln -snf "${jar}" "${destjar}" \ 955 ln -snf "${jar}" "${destjar}" \
748 || die "Failed to make symlink from ${jar} to ${destjar}" 956 || die "Failed to make symlink from ${jar} to ${destjar}"
749 [[ -z "${build_only}" ]] && java-pkg_record-jar_ "${target_pkg}" "${jar}" 957 [[ -z "${build_only}" ]] && java-pkg_record-jar_ "${target_pkg}" "${jar}"
958 popd > /dev/null
750 return 0 959 return 0
751 fi 960 fi
752 done 961 done
962 popd > /dev/null
753 # if no target was specified, we're ok 963 # if no target was specified, we're ok
754 if [[ -z "${target_jar}" ]] ; then 964 if [[ -z "${target_jar}" ]] ; then
755 return 0 965 return 0
756 # otherwise, die bitterly 966 # otherwise, die bitterly
757 else 967 else
781# Example: Get the classpath for xerces-2 and xalan, 991# Example: Get the classpath for xerces-2 and xalan,
782# java-pkg_getjars xerces-2,xalan 992# java-pkg_getjars xerces-2,xalan
783# Example Return: 993# Example Return:
784# /usr/share/xerces-2/lib/xml-apis.jar:/usr/share/xerces-2/lib/xmlParserAPIs.jar:/usr/share/xalan/lib/xalan.jar 994# /usr/share/xerces-2/lib/xml-apis.jar:/usr/share/xerces-2/lib/xmlParserAPIs.jar:/usr/share/xalan/lib/xalan.jar
785# 995#
786# @param $1 - (optional) "--build-only" makes the jar(s) not added into 996# @param $opt
787# package.env DEPEND line. 997# --build-only - makes the jar(s) not added into package.env DEPEND line.
998# (assumed automatically when called inside src_test)
999# --with-dependencies - get jars also from requested package's dependencies
1000# transitively.
788# @param $2 - list of packages to get jars from 1001# @param $1 - list of packages to get jars from
789# (passed to java-config --classpath) 1002# (passed to java-config --classpath)
790# ------------------------------------------------------------------------------ 1003# ------------------------------------------------------------------------------
791java-pkg_getjars() { 1004java-pkg_getjars() {
792 debug-print-function ${FUNCNAME} $* 1005 debug-print-function ${FUNCNAME} $*
793 1006
794 [[ ${#} -lt 1 || ${#} -gt 2 ]] && die "${FUNCNAME} takes only one or two arguments" 1007 local build_only=""
1008 local deep=""
795 1009
1010 [[ "${EBUILD_PHASE}" == "test" ]] && build_only="build"
1011
1012 while [[ "${1}" == --* ]]; do
796 if [[ "${1}" = "--build-only" ]]; then 1013 if [[ "${1}" = "--build-only" ]]; then
797 local build_only="true" 1014 build_only="build"
1015 elif [[ "${1}" = "--with-dependencies" ]]; then
1016 deep="--with-dependencies"
1017 else
1018 die "java-pkg_jar-from called with unknown parameter: ${1}"
1019 fi
798 shift 1020 shift
799 fi 1021 done
800 1022
1023 [[ ${#} -ne 1 ]] && die "${FUNCNAME} takes only one argument besides --*"
1024
1025
801 local classpath pkgs="${1}" 1026 local pkgs="${1}"
1027
1028 if [[ "${EAPI}" == "1" ]]; then
1029 pkgs="${pkgs//:/-}"
1030 fi
1031
802 jars="$(java-config --classpath=${pkgs})" 1032 jars="$(java-config ${deep} --classpath=${pkgs})"
803 [[ -z "${jars}" ]] && die "java-config --classpath=${pkgs} failed" 1033 [[ $? != 0 ]] && die "java-config --classpath=${pkgs} failed"
804 debug-print "${pkgs}:${jars}" 1034 debug-print "${pkgs}:${jars}"
805 1035
806 if [[ -z "${classpath}" ]]; then 1036 for pkg in ${pkgs//,/ }; do
807 classpath="${jars}" 1037 java-pkg_ensure-dep "${build_only}" "${pkg}"
808 else 1038 done
809 classpath="${classpath}:${jars}"
810 fi
811 1039
812 # Only record jars that aren't build-only 1040 # Only record jars that aren't build-only
813 if [[ -z "${build_only}" ]]; then 1041 if [[ -z "${build_only}" ]]; then
814 oldifs="${IFS}"
815 IFS=","
816 for pkg in ${pkgs}; do 1042 for pkg in ${pkgs//,/ }; do
817 java-pkg_record-jar_ "${pkg}" 1043 java-pkg_record-jar_ "${pkg}"
818 done 1044 done
819 IFS="${oldifs}"
820 fi 1045 fi
821 1046
822 echo "${classpath}" 1047 echo "${jars}"
823} 1048}
824 1049
825# ------------------------------------------------------------------------------ 1050# ------------------------------------------------------------------------------
826# @ebuild-function java-pkg_getjar 1051# @ebuild-function java-pkg_getjar
827# 1052#
834# @example 1059# @example
835# java-pkg_getjar xerces-2 xml-apis.jar 1060# java-pkg_getjar xerces-2 xml-apis.jar
836# @example-return 1061# @example-return
837# /usr/share/xerces-2/lib/xml-apis.jar 1062# /usr/share/xerces-2/lib/xml-apis.jar
838# 1063#
839# @param $1 - (optional) "--build-only" makes the jar not added into 1064# @param $opt
840# package.env DEPEND line. 1065# --build-only - makes the jar not added into package.env DEPEND line.
1066# --virtual - Packages passed to this function are to be handled as virtuals
1067# and will not have individual jar dependencies recorded.
841# @param $1 - package to use 1068# @param $1 - package to use
842# @param $2 - jar to get 1069# @param $2 - jar to get
843# ------------------------------------------------------------------------------ 1070# ------------------------------------------------------------------------------
844java-pkg_getjar() { 1071java-pkg_getjar() {
845 debug-print-function ${FUNCNAME} $* 1072 debug-print-function ${FUNCNAME} $*
846 1073
847 local build_only="" 1074 local build_only=""
1075 local virtual=""
848 1076
1077 [[ "${EBUILD_PHASE}" == "test" ]] && build_only="build"
1078
1079 while [[ "${1}" == --* ]]; do
849 if [[ "${1}" = "--build-only" ]]; then 1080 if [[ "${1}" = "--build-only" ]]; then
850 build_only="true" 1081 build_only="build"
1082 elif [[ "${1}" == "--virtual" ]]; then
1083 virtual="true"
1084 else
1085 die "java-pkg_getjar called with unknown parameter: ${1}"
1086 fi
851 shift 1087 shift
852 fi 1088 done
1089
1090 [[ ${#} -ne 2 ]] && die "${FUNCNAME} takes only two arguments besides --*"
853 1091
854 local pkg="${1}" target_jar="${2}" jar 1092 local pkg="${1}" target_jar="${2}" jar
1093
1094 if [[ "${EAPI}" == "1" ]]; then
1095 pkg="${pkg//:/-}"
1096 fi
1097
855 [[ -z ${pkg} ]] && die "Must specify package to get a jar from" 1098 [[ -z ${pkg} ]] && die "Must specify package to get a jar from"
856 [[ -z ${target_jar} ]] && die "Must specify jar to get" 1099 [[ -z ${target_jar} ]] && die "Must specify jar to get"
857 1100
858 local error_msg="Could not find classpath for ${pkg}. Are you sure its installed?" 1101 local error_msg="Could not find classpath for ${pkg}. Are you sure its installed?"
859 local classpath 1102 local classpath
860 classpath=$(java-config --classpath=${pkg}) 1103 classpath=$(java-config --classpath=${pkg})
861 [[ $? != 0 ]] && die ${error_msg} 1104 [[ $? != 0 ]] && die ${error_msg}
1105
1106 java-pkg_ensure-dep "${build_only}" "${pkg}"
1107
1108 # Record the package(Virtual) as a dependency and then set build_only
1109 # So that individual jars are not recorded.
1110 if [[ -n "${virtual}" ]]; then
1111 java-pkg_record-jar_ "${pkg}"
1112 build_only="true"
1113 fi
862 1114
863 for jar in ${classpath//:/ }; do 1115 for jar in ${classpath//:/ }; do
864 if [[ ! -f "${jar}" ]] ; then 1116 if [[ ! -f "${jar}" ]] ; then
865 die "Installation problem with jar ${jar} in ${pkg} - is it installed?" 1117 die "Installation problem with jar ${jar} in ${pkg} - is it installed?"
866 fi 1118 fi
873 fi 1125 fi
874 done 1126 done
875 1127
876 die "Could not find ${target_jar} in ${pkg}" 1128 die "Could not find ${target_jar} in ${pkg}"
877 return 1 1129 return 1
1130}
1131
1132# ------------------------------------------------------------------------------
1133# @ebuild-function java-pkg_register-dependency
1134#
1135# Registers runtime dependency on a package, list of packages, or a single jar
1136# from a package, into package.env DEPEND line. Can only be called in
1137# src_install phase.
1138# Intended for binary packages where you don't need to symlink the jars or get
1139# their classpath during build. As such, the dependencies only need to be
1140# specified in ebuild's RDEPEND, and should be omitted in DEPEND.
1141#
1142# @param $1 - comma-separated list of packages, or a single package
1143# @param $2 - if param $1 is a single package, optionally specify the jar
1144# to depend on
1145#
1146# Example: Record the dependency on whole xerces-2 and xalan,
1147# java-pkg_register-dependency xerces-2,xalan
1148# Example: Record the dependency on ant.jar from ant-core
1149# java-pkg_register-dependency ant-core ant.jar
1150#
1151# Note: Passing both list of packages as the first parameter AND specifying the
1152# jar as the second is not allowed and will cause the function to die. We assume
1153# that there's more chance one passes such combination as a mistake, than that
1154# there are more packages providing identically named jar without class
1155# collisions.
1156# ------------------------------------------------------------------------------
1157java-pkg_register-dependency() {
1158 debug-print-function ${FUNCNAME} $*
1159
1160 java-pkg_check-phase install
1161
1162 [[ ${#} -gt 2 ]] && die "${FUNCNAME} takes at most two arguments"
1163
1164 local pkgs="${1}"
1165 local jar="${2}"
1166
1167 [[ -z "${pkgs}" ]] && die "${FUNCNAME} called with no package(s) specified"
1168
1169 if [[ "${EAPI}" == "1" ]]; then
1170 pkgs="${pkgs//:/-}"
1171 fi
1172
1173 if [[ -z "${jar}" ]]; then
1174 for pkg in ${pkgs//,/ }; do
1175 java-pkg_ensure-dep runtime "${pkg}"
1176 java-pkg_record-jar_ "${pkg}"
1177 done
1178 else
1179 [[ ${pkgs} == *,* ]] && \
1180 die "${FUNCNAME} called with both package list and jar name"
1181 java-pkg_ensure-dep runtime "${pkgs}"
1182 java-pkg_record-jar_ "${pkgs}" "${jar}"
1183 fi
1184
1185 java-pkg_do_write_
1186}
1187
1188# ------------------------------------------------------------------------------
1189# @ebuild-function java-pkg_register-optional-dependency
1190#
1191# Registers optional runtime dependency on a package, list of packages, or a
1192# single jar from a package, into package.env OPTIONAL_DEPEND line. Can only be
1193# called in src_install phase.
1194# Intended for packages that can use other packages when those are in classpath.
1195# Will be put on classpath by launcher if they are installed. Typical case is
1196# JDBC implementations for various databases. It's better than having USE flag
1197# for each implementation triggering hard dependency.
1198#
1199# @param $1 - comma-separated list of packages, or a single package
1200# @param $2 - if param $1 is a single package, optionally specify the jar
1201# to depend on
1202#
1203# Example: Record the optional dependency on some jdbc providers
1204# java-pkg_register-optional-dependency jdbc-jaybird,jtds-1.2,jdbc-mysql
1205#
1206# Note: Passing both list of packages as the first parameter AND specifying the
1207# jar as the second is not allowed and will cause the function to die. We assume
1208# that there's more chance one passes such combination as a mistake, than that
1209# there are more packages providing identically named jar without class
1210# collisions.
1211# ------------------------------------------------------------------------------
1212java-pkg_register-optional-dependency() {
1213 debug-print-function ${FUNCNAME} $*
1214
1215 java-pkg_check-phase install
1216
1217 [[ ${#} -gt 2 ]] && die "${FUNCNAME} takes at most two arguments"
1218
1219 local pkgs="${1}"
1220 local jar="${2}"
1221
1222 [[ -z "${pkgs}" ]] && die "${FUNCNAME} called with no package(s) specified"
1223
1224 if [[ "${EAPI}" == "1" ]]; then
1225 pkgs="${pkgs//:/-}"
1226 fi
1227
1228 if [[ -z "${jar}" ]]; then
1229 for pkg in ${pkgs//,/ }; do
1230 java-pkg_record-jar_ --optional "${pkg}"
1231 done
1232 else
1233 [[ ${pkgs} == *,* ]] && \
1234 die "${FUNCNAME} called with both package list and jar name"
1235 java-pkg_record-jar_ --optional "${pkgs}" "${jar}"
1236 fi
1237
1238 java-pkg_do_write_
1239}
1240
1241# ------------------------------------------------------------------------------
1242# @ebuild-function java-pkg_register-environment-variable
1243#
1244# Register an arbitrary environment variable into package.env. The gjl launcher
1245# for this package or any package depending on this will export it into
1246# environement before executing java command.
1247# Must only be called in src_install phase.
1248#
1249# @param $1 - variable name
1250# @param $2 - variable value
1251# ------------------------------------------------------------------------------
1252JAVA_PKG_EXTRA_ENV="${T}/java-pkg-extra-env"
1253JAVA_PKG_EXTRA_ENV_VARS=""
1254java-pkg_register-environment-variable() {
1255 debug-print-function ${FUNCNAME} $*
1256
1257 java-pkg_check-phase install
1258
1259 [[ ${#} != 2 ]] && die "${FUNCNAME} takes two arguments"
1260
1261 echo "${1}=\"${2}\"" >> ${JAVA_PKG_EXTRA_ENV}
1262 JAVA_PKG_EXTRA_ENV_VARS="${JAVA_PKG_EXTRA_ENV_VARS} ${1}"
1263
1264 java-pkg_do_write_
878} 1265}
879 1266
880# This function reads stdin, and based on that input, figures out how to 1267# This function reads stdin, and based on that input, figures out how to
881# populate jars from the filesystem. 1268# populate jars from the filesystem.
882# Need to figure out a good way of making use of this, ie be able to use a 1269# Need to figure out a good way of making use of this, ie be able to use a
999# 1386#
1000# export DEPEND="${DEPEND} ${depstr}" 1387# export DEPEND="${DEPEND} ${depstr}"
1001# export RDEPEND="${RDEPEND} ${depstr}" 1388# export RDEPEND="${RDEPEND} ${depstr}"
1002#} 1389#}
1003 1390
1391# ------------------------------------------------------------------------------
1392# @ebuild-function java-pkg_find-normal-jars
1393#
1394# Find the files with suffix .jar file in the given directory or $WORKDIR
1395#
1396# @param $1 - The directory to search for jar files (default: ${WORKDIR})
1397# ------------------------------------------------------------------------------
1398java-pkg_find-normal-jars() {
1399 local dir=$1
1400 [[ "${dir}" ]] || dir="${WORKDIR}"
1401 local found
1402 for jar in $(find "${dir}" -name "*.jar" -type f); do
1403 echo "${jar}"
1404 found="true"
1405 done
1406 [[ "${found}" ]]
1407 return $?
1408}
1409
1410# ------------------------------------------------------------------------------
1411# @ebuild-function java-pkg_ensure-no-bundled-jars
1412#
1413# 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 1414# This function should be called after WORKDIR has been populated with symlink
1005# TODO document 1415# to system jar files or bundled jars removed.
1416# ------------------------------------------------------------------------------
1006java-pkg_ensure-no-bundled-jars() { 1417java-pkg_ensure-no-bundled-jars() {
1007 debug-print-function ${FUNCNAME} $* 1418 debug-print-function ${FUNCNAME} $*
1008 pushd ${WORKDIR} >/dev/null 2>/dev/null
1009 1419
1010 local bundled_jars=$(find . -name "*.jar" -type f) 1420 local bundled_jars=$(java-pkg_find-normal-jars)
1011 if [[ -n ${bundled_jars} ]]; then 1421 if [[ -n ${bundled_jars} ]]; then
1012 echo "Bundled jars found:" 1422 echo "Bundled jars found:"
1013 local jar 1423 local jar
1014 for jar in ${bundled_jars}; do 1424 for jar in ${bundled_jars}; do
1015 echo $(pwd)${jar/./} 1425 echo $(pwd)${jar/./}
1016 done 1426 done
1017 die "Bundled jars found!" 1427 die "Bundled jars found!"
1018
1019 fi 1428 fi
1020 popd >/dev/null 2>/dev/null
1021} 1429}
1022 1430
1023# ------------------------------------------------------------------------------ 1431# ------------------------------------------------------------------------------
1024# @internal-function java-pkg_ensure-vm-version-sufficient 1432# @internal-function java-pkg_ensure-vm-version-sufficient
1025# 1433#
1174# @ebuild-function java-pkg_get-target 1582# @ebuild-function java-pkg_get-target
1175# 1583#
1176# Determines what target version should be used, for passing to -target. 1584# 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 1585# If you don't care about lower versions, you can set _WANT_TARGET to the
1178# version of your JDK. 1586# 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# 1587#
1183# @return string - Either the lowest possible target, or JAVA_PKG_WANT_TARGET 1588# @return string - Either the lowest possible target, or JAVA_PKG_WANT_TARGET
1184# ------------------------------------------------------------------------------ 1589# ------------------------------------------------------------------------------
1185java-pkg_get-target() { 1590java-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}")} 1591 echo ${JAVA_PKG_WANT_TARGET:-$(depend-java-query --get-lowest "${DEPEND} ${RDEPEND}")}
1199} 1592}
1200 1593
1201java-pkg_get-javac() { 1594java-pkg_get-javac() {
1202 debug-print-function ${FUNCNAME} $* 1595 debug-print-function ${FUNCNAME} $*
1203 1596
1292 die "No GCJ support found!" 1685 die "No GCJ support found!"
1293 fi 1686 fi
1294} 1687}
1295 1688
1296java-pkg_ensure-test() { 1689java-pkg_ensure-test() {
1297 if hasq test ${FEATURES} && ! hasq -test ${FEATURES} && ! use test; then 1690 if hasq test ${FEATURES} && ! hasq -test ${FEATURES} \
1691 && hasq test ${IUSE} && ! use test;
1692 then
1298 eerror "You specified FEATURES=test, but USE=test is needed" 1693 eerror "You specified FEATURES=test, but USE=test is needed"
1299 eerror "to pull in the additional dependencies for testing" 1694 eerror "to pull in the additional dependencies for testing"
1300 die "Need USE=test enabled" 1695 die "Need USE=test enabled"
1301 fi 1696 fi
1302} 1697}
1303 1698
1304# ------------------------------------------------------------------------------ 1699# ------------------------------------------------------------------------------
1700# @ebuild-function java-pkg_register-ant-task
1701#
1702# Register this package as ant task, so that ant will load it when no specific
1703# ANT_TASKS are specified. Note that even without this registering, all packages
1704# specified in ANT_TASKS will be loaded. Mostly used by the actual ant tasks
1705# packages, but can be also used by other ebuilds that used to symlink their
1706# .jar into /usr/share/ant-core/lib to get autoloaded, for backwards
1707# compatibility.
1708#
1709# @param --version x.y Register only for ant version x.y (otherwise for any ant
1710# version). Used by the ant-* packages to prevent loading of mismatched
1711# ant-core ant tasks after core was updated, before the tasks are updated,
1712# without a need for blockers.
1713# @param $1 Name to register as. Defaults to JAVA_PKG_NAME ($PN[-$SLOT])
1714# ------------------------------------------------------------------------------
1715java-pkg_register-ant-task() {
1716 local TASKS_DIR="tasks"
1717
1718 # check for --version x.y parameters
1719 while [[ -n "${1}" && -n "${2}" ]]; do
1720 local var="${1#--}"
1721 local val="${2}"
1722 if [[ "${var}" == "version" ]]; then
1723 TASKS_DIR="tasks-${val}"
1724 else
1725 die "Unknown parameter passed to java-pkg_register-ant-tasks: ${1} ${2}"
1726 fi
1727 shift 2
1728 done
1729
1730 local TASK_NAME="${1:-${JAVA_PKG_NAME}}"
1731
1732 dodir /usr/share/ant/${TASKS_DIR}
1733 touch "${D}/usr/share/ant/${TASKS_DIR}/${TASK_NAME}"
1734}
1735
1736# ------------------------------------------------------------------------------
1737# @internal-function java-pkg_ant-tasks-depend
1738#
1739# Translates the WANT_ANT_TASKS variable into valid dependencies.
1740# ------------------------------------------------------------------------------
1741java-pkg_ant-tasks-depend() {
1742 debug-print-function ${FUNCNAME} ${WANT_ANT_TASKS}
1743
1744 if [[ -n "${WANT_ANT_TASKS}" ]]; then
1745 local DEP=""
1746 for i in ${WANT_ANT_TASKS}
1747 do
1748 if [[ ${i} = ant-* ]]; then
1749 DEP="${DEP}dev-java/${i} "
1750 elif [[ ${i} = */*:* ]]; then
1751 DEP="${DEP}${i} "
1752 else
1753 echo "Invalid atom in WANT_ANT_TASKS: ${i}"
1754 return 1
1755 fi
1756 done
1757 echo ${DEP}
1758 return 0
1759 else
1760 return 0
1761 fi
1762}
1763
1764# ------------------------------------------------------------------------------
1765# @ebuild-function ejunit
1766#
1767# Junit wrapper function. Makes it easier to run the tests and checks for
1768# dev-java/junit in DEPEND. Launches the tests using junit.textui.TestRunner.
1769#
1770# Examples:
1771# ejunit -cp build/classes org.blinkenlights.jid3.test.AllTests
1772# ejunit org.blinkenlights.jid3.test.AllTests
1773#
1774# @param $1 - -cp or -classpath
1775# @param $2 - classpath; junit and recorded dependencies get appended
1776# @param $@ - the rest of the parameters are passed to java
1777# ------------------------------------------------------------------------------
1778ejunit() {
1779 debug-print-function ${FUNCNAME} $*
1780
1781 local pkgs
1782 if [[ -f ${JAVA_PKG_DEPEND_FILE} ]]; then
1783 for atom in $(cat ${JAVA_PKG_DEPEND_FILE} | tr : ' '); do
1784 pkgs=${pkgs},$(echo ${atom} | sed -re "s/^.*@//")
1785 done
1786 fi
1787
1788 local cp=$(java-pkg_getjars --with-dependencies junit${pkgs})
1789 if [[ ${1} = -cp || ${1} = -classpath ]]; then
1790 cp="${2}:${cp}"
1791 shift 2
1792 else
1793 cp=".:${cp}"
1794 fi
1795
1796 local runner=junit.textui.TestRunner
1797 debug-print "Calling: java -cp \"${cp}\" -Djava.awt.headless=true ${runner} ${@}"
1798 java -cp "${cp}" -Djava.awt.headless=true ${runner} "${@}" || die "Running junit failed"
1799}
1800
1801# ------------------------------------------------------------------------------
1305# @section-end helper 1802# @section-end helper
1306# ------------------------------------------------------------------------------ 1803# ------------------------------------------------------------------------------
1804
1805# ------------------------------------------------------------------------------
1806# @eclass-src_prepare
1807#
1808# src_prepare Searches for bundled jars
1809# Don't call directly, but via java-pkg-2_src_prepare!
1810# ------------------------------------------------------------------------------
1811
1812java-utils-2_src_prepare() {
1813 # Remember that eant will call this unless called via Portage
1814 if [[ ! -e "${T}/java-utils-2_src_prepare-run" ]] && is-java-strict; then
1815 echo "Searching for bundled jars:"
1816 java-pkg_find-normal-jars || echo "None found."
1817 echo "Searching for bundled classes (no output if none found):"
1818 find "${WORKDIR}" -name "*.class"
1819 echo "Search done."
1820 fi
1821 touch "${T}/java-utils-2_src_prepare-run"
1822}
1823
1824# ------------------------------------------------------------------------------
1825# @eclass-pkg_preinst
1826#
1827# pkg_preinst Searches for missing and unneeded dependencies
1828# Don't call directly, but via java-pkg-2_pkg_preinst!
1829# ------------------------------------------------------------------------------
1830
1831java-utils-2_pkg_preinst() {
1832 if is-java-strict; then
1833 if has_version dev-java/java-dep-check; then
1834 [[ -e "${JAVA_PKG_ENV}" ]] || return
1835 local output=$(GENTOO_VM= java-dep-check --image "${D}" "${JAVA_PKG_ENV}")
1836 if [[ ${output} && has_version <=dev-java/java-dep-check-0.2 ]]; then
1837 ewarn "Possibly unneeded dependencies found in package.env:"
1838 for dep in ${output}; do
1839 ewarn "\t${dep}"
1840 done
1841 fi
1842 if [[ ${output} && has_version >dev-java/java-dep-check-0.2 ]]; then
1843 ewarn "${output}"
1844 fi
1845 else
1846 eerror "Install dev-java/java-dep-check for dependency checking"
1847 fi
1848 fi
1849}
1307 1850
1308# ------------------------------------------------------------------------------ 1851# ------------------------------------------------------------------------------
1309# @section-begin build 1852# @section-begin build
1310# @section-summary Build functions 1853# @section-summary Build functions
1311# 1854#
1315 1858
1316# ------------------------------------------------------------------------------ 1859# ------------------------------------------------------------------------------
1317# @ebuild-function eant 1860# @ebuild-function eant
1318# 1861#
1319# Ant wrapper function. Will use the appropriate compiler, based on user-defined 1862# Ant wrapper function. Will use the appropriate compiler, based on user-defined
1320# compiler. 1863# compiler. Will also set proper ANT_TASKS from the variable ANT_TASKS,
1321# 1864# variables:
1865# EANT_GENTOO_CLASSPATH - calls java-pkg_getjars for the value and adds to the
1866# gentoo.classpath property. Be sure to call
1867# java-ant_rewrite-classpath in src_unpack.
1868# EANT_NEEDS_TOOLS - add tools.jar to the gentoo.classpath. Should only be used
1869# for build-time purposes, the dependency is not recorded to
1870# package.env!
1871# JAVA_PKG_NO_BUNDLED_SEARCH - Don't search for bundled jars or class files
1872# *ANT_TASKS - used to determine ANT_TASKS before calling Ant.
1322# ------------------------------------------------------------------------------ 1873# ------------------------------------------------------------------------------
1323eant() { 1874eant() {
1324 debug-print-function ${FUNCNAME} $* 1875 debug-print-function ${FUNCNAME} $*
1325 1876
1326 # FIXME get this working 1877 if [[ ${EBUILD_PHASE} = compile ]]; then
1327# if is-java-strict && [[ ! ${DEPEND} =~ "dev-java/ant" ]]; then 1878 java-ant-2_src_configure
1879 java-utils-2_src_prepare
1880 fi
1881
1882 if ! hasq java-ant-2 ${INHERITED}; then
1883 local msg="You should inherit java-ant-2 when using eant"
1328# java-pkg_announce-qa-violation \ 1884 java-pkg_announce-qa-violation "${msg}"
1329# "Using eant, but not depending on dev-java/ant or dev-java/ant-core"
1330# fi 1885 fi
1331 1886
1332 local antflags 1887 local antflags="-Dnoget=true -Dmaven.mode.offline=true -Dbuild.sysclasspath=ignore"
1888
1333 java-pkg_init-compiler_ 1889 java-pkg_init-compiler_
1334 local compiler="${GENTOO_COMPILER}" 1890 local compiler="${GENTOO_COMPILER}"
1335 1891
1336 local compiler_env="${JAVA_PKG_COMPILER_DIR}/${compiler}" 1892 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})" 1893 local build_compiler="$(source ${compiler_env} 1>/dev/null 2>&1; echo ${ANT_BUILD_COMPILER})"
1339 if [[ "${compiler}" != "javac" && -z "${build_compiler}" ]]; then 1894 if [[ "${compiler}" != "javac" && -z "${build_compiler}" ]]; then
1340 die "ANT_BUILD_COMPILER undefined in ${compiler_env}" 1895 die "ANT_BUILD_COMPILER undefined in ${compiler_env}"
1341 fi 1896 fi
1342 1897
1343 if [[ ${compiler} != "javac" ]]; then 1898 if [[ ${compiler} != "javac" ]]; then
1344 antflags="-Dbuild.compiler=${build_compiler}" 1899 antflags="${antflags} -Dbuild.compiler=${build_compiler}"
1345 # Figure out any extra stuff to put on the classpath for compilers aside 1900 # Figure out any extra stuff to put on the classpath for compilers aside
1346 # from javac 1901 # from javac
1347 # ANT_BUILD_COMPILER_DEPS should be something that could be passed to 1902 # ANT_BUILD_COMPILER_DEPS should be something that could be passed to
1348 # java-config -p 1903 # java-config -p
1349 local build_compiler_deps="$(source ${JAVA_PKG_COMPILER_DIR}/${compiler} 1>/dev/null 2>&1; echo ${ANT_BUILD_COMPILER_DEPS})" 1904 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 1905 if [[ -n ${build_compiler_deps} ]]; then
1351 antflags="${antflags} -lib $(java-config -p ${build_compiler_deps})" 1906 antflags="${antflags} -lib $(java-config -p ${build_compiler_deps})"
1352 fi 1907 fi
1353 fi 1908 fi
1354 1909
1910 for arg in "${@}"; do
1911 if [[ ${arg} = -lib ]]; then
1355 if is-java-strict; then 1912 if is-java-strict; then
1356 einfo "Disabling system classpath for ant" 1913 eerror "You should not use the -lib argument to eant because it will fail"
1357 antflags="${antflags} -Dbuild.sysclasspath=ignore" 1914 eerror "with JAVA_PKG_STRICT. Please use for example java-pkg_jar-from"
1915 eerror "or ant properties to make dependencies available."
1916 eerror "For ant tasks use WANT_ANT_TASKS or ANT_TASKS from."
1917 eerror "split ant (>=dev-java/ant-core-1.7)."
1918 die "eant -lib is deprecated/forbidden"
1919 else
1920 echo "eant -lib is deprecated. Turn JAVA_PKG_STRICT on for"
1921 echo "more info."
1922 fi
1358 fi 1923 fi
1924 done
1359 1925
1360 if [[ -n ${JAVA_PKG_DEBUG} ]]; then 1926 # parse WANT_ANT_TASKS for atoms
1361 antflags="${antflags} -debug" 1927 local want_ant_tasks
1928 for i in ${WANT_ANT_TASKS}; do
1929 if [[ ${i} = */*:* ]]; then
1930 i=${i#*/}
1931 i=${i%:0}
1932 want_ant_tasks+="${i/:/-} "
1933 else
1934 want_ant_tasks+="${i} "
1935 fi
1936 done
1937 # default ANT_TASKS to WANT_ANT_TASKS, if ANT_TASKS is not set explicitly
1938 ANT_TASKS="${ANT_TASKS:-${want_ant_tasks% }}"
1939
1940 # override ANT_TASKS with JAVA_PKG_FORCE_ANT_TASKS if it's set
1941 ANT_TASKS="${JAVA_PKG_FORCE_ANT_TASKS:-${ANT_TASKS}}"
1942
1943 # if ant-tasks is not set by ebuild or forced, use none
1944 ANT_TASKS="${ANT_TASKS:-none}"
1945
1946 # at this point, ANT_TASKS should be "all", "none" or explicit list
1947 if [[ "${ANT_TASKS}" == "all" ]]; then
1948 einfo "Using all available ANT_TASKS"
1949 elif [[ "${ANT_TASKS}" == "none" ]]; then
1950 einfo "Disabling all optional ANT_TASKS"
1951 else
1952 einfo "Using following ANT_TASKS: ${ANT_TASKS}"
1953 fi
1954
1955 export ANT_TASKS
1956
1957 [[ -n ${JAVA_PKG_DEBUG} ]] && antflags="${antflags} --execdebug -debug"
1958 [[ -n ${PORTAGE_QUIET} ]] && antflags="${antflags} -q"
1959
1960 local gcp="${EANT_GENTOO_CLASSPATH}"
1961 local getjarsarg=""
1962
1963 if [[ ${EBUILD_PHASE} = "test" ]]; then
1964 antflags="${antflags} -DJunit.present=true"
1965 [[ ${ANT_TASKS} = *ant-junit* ]] && gcp="${gcp} junit"
1966 getjarsarg="--with-dependencies"
1967 fi
1968
1969 local cp
1970
1971 for atom in ${gcp}; do
1972 cp="${cp}:$(java-pkg_getjars ${getjarsarg} ${atom})"
1973 done
1974
1975 [[ -n "${EANT_NEEDS_TOOLS}" ]] && cp="${cp}:$(java-config --tools)"
1976
1977 if [[ ${cp} ]]; then
1978 # It seems ant does not like single quotes around ${cp}
1979 cp=${cp#:}
1980 [[ ${EANT_GENTOO_CLASSPATH_EXTRA} ]] && \
1981 cp="${cp}:${EANT_GENTOO_CLASSPATH_EXTRA}"
1982 antflags="${antflags} -Dgentoo.classpath=\"${cp}\""
1362 fi 1983 fi
1363 1984
1364 [[ -n ${JAVA_PKG_DEBUG} ]] && echo ant ${antflags} "${@}" 1985 [[ -n ${JAVA_PKG_DEBUG} ]] && echo ant ${antflags} "${@}"
1986 debug-print "Calling ant (GENTOO_VM: ${GENTOO_VM}): ${antflags} ${@}"
1365 ant ${antflags} "${@}" || die "eant failed" 1987 ant ${antflags} "${@}" || die "eant failed"
1366
1367} 1988}
1368 1989
1369# ------------------------------------------------------------------------------ 1990# ------------------------------------------------------------------------------
1370# @ebuild-function ejavac 1991# @ebuild-function ejavac
1371# 1992#
1440# ------------------------------------------------------------------------------ 2061# ------------------------------------------------------------------------------
1441use_doc() { 2062use_doc() {
1442 use doc && echo ${@:-javadoc} 2063 use doc && echo ${@:-javadoc}
1443} 2064}
1444 2065
2066
1445# ------------------------------------------------------------------------------ 2067# ------------------------------------------------------------------------------
1446# @section-end build 2068# @section-end build
1447# ------------------------------------------------------------------------------ 2069# ------------------------------------------------------------------------------
1448 2070
1449# ------------------------------------------------------------------------------ 2071# ------------------------------------------------------------------------------
1465# This shouldn't be used directly. Instead, java-pkg and java-pkg-opt will 2087# 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. 2088# call it during each of the phases of the merge process.
1467# 2089#
1468# ----------------------------------------------------------------------------- 2090# -----------------------------------------------------------------------------
1469java-pkg_init() { 2091java-pkg_init() {
2092 debug-print-function ${FUNCNAME} $*
1470 unset JAVAC 2093 unset JAVAC
1471 unset JAVA_HOME 2094 unset JAVA_HOME
2095
2096 java-config --help >/dev/null || {
2097 eerror ""
2098 eerror "Can't run java-config --help"
2099 eerror "Have you upgraded python recently but haven't"
2100 eerror "run python-updater yet?"
2101 die "Can't run java-config --help"
2102 }
2103
2104 # People do all kinds of weird things.
2105 # http://forums.gentoo.org/viewtopic-p-3943166.html
2106 local silence="${SILENCE_JAVA_OPTIONS_WARNING}"
2107 local accept="${I_WANT_GLOBAL_JAVA_OPTIONS}"
2108 if [[ -n ${_JAVA_OPTIONS} && -z ${accept} && -z ${silence} ]]; then
2109 ewarn "_JAVA_OPTIONS changes what java -version outputs at least for"
2110 ewarn "sun-jdk vms and and as such break configure scripts that"
2111 ewarn "use it (for example app-office/openoffice) so we filter it out."
2112 ewarn "Use SILENCE_JAVA_OPTIONS_WARNING=true in the environment (use"
2113 ewarn "make.conf for example) to silence this warning or"
2114 ewarn "I_WANT_GLOBAL_JAVA_OPTIONS to not filter it."
2115 fi
2116
2117 if [[ -z ${accept} ]]; then
2118 # export _JAVA_OPTIONS= doesn't work because it will show up in java
2119 # -version output
2120 unset _JAVA_OPTIONS
2121 # phase hooks make this run many times without this
2122 I_WANT_GLOBAL_JAVA_OPTIONS="true"
2123 fi
2124
2125 if java-pkg_func-exists ant_src_unpack; then
2126 java-pkg_announce-qa-violation "Using old ant_src_unpack. Should be src_unpack"
2127 fi
2128
1472 java-pkg_init_paths_ 2129 java-pkg_init_paths_
1473 java-pkg_switch-vm 2130 java-pkg_switch-vm
1474 PATH=${JAVA_HOME}/bin:${PATH} 2131 PATH=${JAVA_HOME}/bin:${PATH}
1475 2132
1476 # TODO we will probably want to set JAVAC and JAVACFLAGS 2133 # TODO we will probably want to set JAVAC and JAVACFLAGS
1477 2134
1478 # Do some QA checks 2135 # Do some QA checks
1479 java-pkg_check-jikes 2136 java-pkg_check-jikes
2137
2138 # Can't use unset here because Portage does not save the unset
2139 # see https://bugs.gentoo.org/show_bug.cgi?id=189417#c11
1480 2140
1481 # When users have crazy classpaths some packages can fail to compile. 2141 # When users have crazy classpaths some packages can fail to compile.
1482 # and everything should work with empty CLASSPATH. 2142 # and everything should work with empty CLASSPATH.
1483 # This also helps prevent unexpected dependencies on random things 2143 # This also helps prevent unexpected dependencies on random things
1484 # from the CLASSPATH. 2144 # from the CLASSPATH.
1485 unset CLASSPATH 2145 export CLASSPATH=
2146
2147 # Unset external ANT_ stuff
2148 export ANT_TASKS=
2149 export ANT_OPTS=
2150 export ANT_RESPECT_JAVA_HOME=
1486} 2151}
1487 2152
1488# ------------------------------------------------------------------------------ 2153# ------------------------------------------------------------------------------
1489# @function-internal java-pkg-init-compiler_ 2154# @function-internal java-pkg-init-compiler_
1490# 2155#
1581 done 2246 done
1582 2247
1583 # If it hasn't been defined already, default to javac 2248 # If it hasn't been defined already, default to javac
1584 if [[ -z ${GENTOO_COMPILER} ]]; then 2249 if [[ -z ${GENTOO_COMPILER} ]]; then
1585 if [[ -n ${compilers} ]]; then 2250 if [[ -n ${compilers} ]]; then
1586 einfo "No suitable compiler found: defaulting javac for compilation" 2251 einfo "No suitable compiler found: defaulting to JDK default for compilation"
1587 else 2252 else
1588 # probably don't need to notify users about the default. 2253 # probably don't need to notify users about the default.
1589 :;#einfo "Defaulting to javac for compilation" 2254 :;#einfo "Defaulting to javac for compilation"
1590 fi 2255 fi
2256 if java-config -g GENTOO_COMPILER 2> /dev/null; then
2257 export GENTOO_COMPILER=$(java-config -g GENTOO_COMPILER)
2258 else
1591 export GENTOO_COMPILER=javac 2259 export GENTOO_COMPILER=javac
2260 fi
1592 else 2261 else
1593 einfo "Using ${GENTOO_COMPILER} for compilation" 2262 einfo "Using ${GENTOO_COMPILER} for compilation"
1594 fi 2263 fi
1595 2264
1596} 2265}
1612 fi 2281 fi
1613 2282
1614 JAVA_PKG_SHAREPATH="${DESTTREE}/share/${JAVA_PKG_NAME}" 2283 JAVA_PKG_SHAREPATH="${DESTTREE}/share/${JAVA_PKG_NAME}"
1615 JAVA_PKG_SOURCESPATH="${JAVA_PKG_SHAREPATH}/sources/" 2284 JAVA_PKG_SOURCESPATH="${JAVA_PKG_SHAREPATH}/sources/"
1616 JAVA_PKG_ENV="${D}${JAVA_PKG_SHAREPATH}/package.env" 2285 JAVA_PKG_ENV="${D}${JAVA_PKG_SHAREPATH}/package.env"
2286 JAVA_PKG_VIRTUALS_PATH="${DESTTREE}/share/java-config-2/virtuals"
2287 JAVA_PKG_VIRTUAL_PROVIDER="${D}/${JAVA_PKG_VIRTUALS_PATH}/${JAVA_PKG_NAME}"
1617 2288
1618 [[ -z "${JAVA_PKG_JARDEST}" ]] && JAVA_PKG_JARDEST="${JAVA_PKG_SHAREPATH}/lib" 2289 [[ -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}" 2290 [[ -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" 2291 [[ -z "${JAVA_PKG_WARDEST}" ]] && JAVA_PKG_WARDEST="${JAVA_PKG_SHAREPATH}/webapps"
1621 2292
1634# Writes the package.env out to disk. 2305# Writes the package.env out to disk.
1635# 2306#
1636# ------------------------------------------------------------------------------ 2307# ------------------------------------------------------------------------------
1637# TODO change to do-write, to match everything else 2308# TODO change to do-write, to match everything else
1638java-pkg_do_write_() { 2309java-pkg_do_write_() {
2310 debug-print-function ${FUNCNAME} $*
1639 java-pkg_init_paths_ 2311 java-pkg_init_paths_
1640 # Create directory for package.env 2312 # Create directory for package.env
1641 dodir "${JAVA_PKG_SHAREPATH}" 2313 dodir "${JAVA_PKG_SHAREPATH}"
1642 if [[ -n "${JAVA_PKG_CLASSPATH}" || -n "${JAVA_PKG_LIBRARY}" || -f "${JAVA_PKG_DEPEND}" ]]; then 2314 if [[ -n "${JAVA_PKG_CLASSPATH}" || -n "${JAVA_PKG_LIBRARY}" || -f \
2315 "${JAVA_PKG_DEPEND_FILE}" || -f \
2316 "${JAVA_PKG_OPTIONAL_DEPEND_FILE}" ]]; then
1643 # Create package.env 2317 # Create package.env
1644 ( 2318 (
1645 echo "DESCRIPTION=\"${DESCRIPTION}\"" 2319 echo "DESCRIPTION=\"${DESCRIPTION}\""
1646 echo "GENERATION=\"2\"" 2320 echo "GENERATION=\"2\""
2321 echo "SLOT=\"${SLOT}\""
1647 2322
1648 [[ -n "${JAVA_PKG_CLASSPATH}" ]] && echo "CLASSPATH=\"${JAVA_PKG_CLASSPATH}\"" 2323 [[ -n "${JAVA_PKG_CLASSPATH}" ]] && echo "CLASSPATH=\"${JAVA_PKG_CLASSPATH}\""
1649 [[ -n "${JAVA_PKG_LIBRARY}" ]] && echo "LIBRARY_PATH=\"${JAVA_PKG_LIBRARY}\"" 2324 [[ -n "${JAVA_PKG_LIBRARY}" ]] && echo "LIBRARY_PATH=\"${JAVA_PKG_LIBRARY}\""
1650 [[ -n "${JAVA_PROVIDE}" ]] && echo "PROVIDES=\"${JAVA_PROVIDE}\"" 2325 [[ -n "${JAVA_PROVIDE}" ]] && echo "PROVIDES=\"${JAVA_PROVIDE}\""
1651 [[ -f "${JAVA_PKG_DEPEND}" ]] && echo "DEPEND=\"$(cat ${JAVA_PKG_DEPEND} | uniq | tr '\n' ':')\"" 2326 [[ -f "${JAVA_PKG_DEPEND_FILE}" ]] \
2327 && echo "DEPEND=\"$(cat "${JAVA_PKG_DEPEND_FILE}" | uniq | tr '\n' ':')\""
2328 [[ -f "${JAVA_PKG_OPTIONAL_DEPEND_FILE}" ]] \
2329 && 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 ! 2330 echo "VM=\"$(echo ${RDEPEND} ${DEPEND} | sed -e 's/ /\n/g' | sed -n -e '/virtual\/\(jre\|jdk\)/ { p;q }')\"" # TODO cleanup !
1653 ) > "${JAVA_PKG_ENV}" 2331 ) > "${JAVA_PKG_ENV}"
1654 2332
1655 # register target/source 2333 # register target/source
1656 local target="$(java-pkg_get-target)" 2334 local target="$(java-pkg_get-target)"
1667 2345
1668 2346
1669 echo "MERGE_VM=\"${GENTOO_VM}\"" >> "${JAVA_PKG_ENV}" 2347 echo "MERGE_VM=\"${GENTOO_VM}\"" >> "${JAVA_PKG_ENV}"
1670 [[ -n ${GENTOO_COMPILER} ]] && echo "MERGE_COMPILER=\"${GENTOO_COMPILER}\"" >> "${JAVA_PKG_ENV}" 2348 [[ -n ${GENTOO_COMPILER} ]] && echo "MERGE_COMPILER=\"${GENTOO_COMPILER}\"" >> "${JAVA_PKG_ENV}"
1671 2349
2350 # extra env variables
2351 if [[ -n "${JAVA_PKG_EXTRA_ENV_VARS}" ]]; then
2352 cat "${JAVA_PKG_EXTRA_ENV}" >> "${JAVA_PKG_ENV}" || die
2353 # nested echo to remove leading/trailing spaces
2354 echo "ENV_VARS=\"$(echo ${JAVA_PKG_EXTRA_ENV_VARS})\"" \
2355 >> "${JAVA_PKG_ENV}" || die
2356 fi
2357
1672 # Strip unnecessary leading and trailing colons 2358 # Strip unnecessary leading and trailing colons
1673 # TODO try to cleanup if possible 2359 # TODO try to cleanup if possible
1674 sed -e "s/=\":/=\"/" -e "s/:\"$/\"/" -i "${JAVA_PKG_ENV}" || die "Did you forget to call java_init ?" 2360 sed -e "s/=\":/=\"/" -e "s/:\"$/\"/" -i "${JAVA_PKG_ENV}" || die "Did you forget to call java_init ?"
2361 else
2362 debug-print "JAVA_PKG_CLASSPATH, JAVA_PKG_LIBRARY, JAVA_PKG_DEPEND_FILE"
2363 debug-print "or JAVA_PKG_OPTIONAL_DEPEND_FILE not defined so can't"
2364 debug-print "write package.env."
1675 fi 2365 fi
1676} 2366}
1677 2367
1678# ------------------------------------------------------------------------------ 2368# ------------------------------------------------------------------------------
1679# @internal-function java-pkg_record-jar_ 2369# @internal-function java-pkg_record-jar_
1680# 2370#
1681# Record a dependency to the package.env 2371# Record an (optional) dependency to the package.env
1682# 2372# @param --optional - record dependency as optional
2373# @param $1 - package to record
2374# @param $2 - (optional) jar of package to record
1683# ------------------------------------------------------------------------------ 2375# ------------------------------------------------------------------------------
1684JAVA_PKG_DEPEND="${T}/java-pkg-depend" 2376JAVA_PKG_DEPEND_FILE="${T}/java-pkg-depend"
2377JAVA_PKG_OPTIONAL_DEPEND_FILE="${T}/java-pkg-optional-depend"
1685 2378
1686java-pkg_record-jar_() { 2379java-pkg_record-jar_() {
1687 debug-print-function ${FUNCNAME} $* 2380 debug-print-function ${FUNCNAME} $*
2381
2382 local depend_file="${JAVA_PKG_DEPEND_FILE}"
2383 if [[ "${1}" == "--optional" ]]; then
2384 depend_file="${JAVA_PKG_OPTIONAL_DEPEND_FILE}"
2385 shift
2386 fi
1688 2387
1689 local pkg=${1} jar=${2} append 2388 local pkg=${1} jar=${2} append
1690 if [[ -z "${jar}" ]]; then 2389 if [[ -z "${jar}" ]]; then
1691 append="${pkg}" 2390 append="${pkg}"
1692 else 2391 else
1693 append="$(basename ${jar})@${pkg}" 2392 append="$(basename ${jar})@${pkg}"
1694 fi 2393 fi
1695 2394
1696 echo ${append} >> ${JAVA_PKG_DEPEND} 2395 echo "${append}" >> "${depend_file}"
1697} 2396}
1698 2397
1699# ------------------------------------------------------------------------------ 2398# ------------------------------------------------------------------------------
1700# @internal-function java-pkg_append_ 2399# @internal-function java-pkg_append_
1701# 2400#
1761# 2460#
1762# ------------------------------------------------------------------------------ 2461# ------------------------------------------------------------------------------
1763java-pkg_setup-vm() { 2462java-pkg_setup-vm() {
1764 debug-print-function ${FUNCNAME} $* 2463 debug-print-function ${FUNCNAME} $*
1765 2464
2465 export LANG="C" LC_ALL="C"
2466
1766 local vendor="$(java-pkg_get-vm-vendor)" 2467 local vendor="$(java-pkg_get-vm-vendor)"
1767 if [[ "${vendor}" == "sun" ]] && java-pkg_is-vm-version-ge "1.5" ; then 2468 if [[ "${vendor}" == "sun" ]] && java-pkg_is-vm-version-ge "1.5" ; then
1768 addpredict "/dev/random" 2469 addpredict "/dev/random"
1769 elif [[ "${vendor}" == "ibm" ]]; then 2470 elif [[ "${vendor}" == "ibm" ]]; then
1770 addpredict "/proc/self/maps" 2471 addpredict "/proc/self/maps"
1771 addpredict "/proc/cpuinfo" 2472 addpredict "/proc/cpuinfo"
1772 export LANG="C" LC_ALL="C"
1773 elif [[ "${vendor}" == "jrockit" ]]; then 2473 elif [[ "${vendor}" == "jrockit" ]]; then
1774 addpredict "/proc/cpuinfo" 2474 addpredict "/proc/cpuinfo"
1775 fi 2475 fi
1776} 2476}
1777 2477
1832# Switch VM if we're allowed to (controlled by JAVA_PKG_ALLOW_VM_CHANGE), and 2532# Switch VM if we're allowed to (controlled by JAVA_PKG_ALLOW_VM_CHANGE), and
1833# verify that the current VM is sufficient. 2533# verify that the current VM is sufficient.
1834# Setup the environment for the VM being used. 2534# Setup the environment for the VM being used.
1835# ------------------------------------------------------------------------------ 2535# ------------------------------------------------------------------------------
1836java-pkg_switch-vm() { 2536java-pkg_switch-vm() {
2537 debug-print-function ${FUNCNAME} $*
2538
1837 if java-pkg_needs-vm; then 2539 if java-pkg_needs-vm; then
1838 # Use the VM specified by JAVA_PKG_FORCE_VM 2540 # Use the VM specified by JAVA_PKG_FORCE_VM
1839 if [[ -n ${JAVA_PKG_FORCE_VM} ]]; then 2541 if [[ -n "${JAVA_PKG_FORCE_VM}" ]]; then
1840 # If you're forcing the VM, I hope you know what your doing... 2542 # If you're forcing the VM, I hope you know what your doing...
2543 debug-print "JAVA_PKG_FORCE_VM used: ${JAVA_PKG_FORCE_VM}"
1841 export GENTOO_VM="${JAVA_PKG_FORCE_VM}" 2544 export GENTOO_VM="${JAVA_PKG_FORCE_VM}"
1842 # if we're allowed to switch the vm... 2545 # if we're allowed to switch the vm...
1843 elif [[ "${JAVA_PKG_ALLOW_VM_CHANGE}" == "yes" ]]; then 2546 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}" 2547 debug-print "depend-java-query: NV_DEPEND: ${JAVA_PKG_NV_DEPEND:-${DEPEND}} VNEED: ${JAVA_PKG_VNEED}"
1845 if [[ -n ${JAVA_PKG_VNEED} ]]; then 2548 if [[ -n ${JAVA_PKG_VNEED} ]]; then
1878 2581
1879 #TODO If you know a better solution let us know. 2582 #TODO If you know a better solution let us know.
1880 java-pkg_append_ LD_LIBRARY_PATH "$(java-config -g LDPATH)" 2583 java-pkg_append_ LD_LIBRARY_PATH "$(java-config -g LDPATH)"
1881 2584
1882 local tann="${T}/announced-vm" 2585 local tann="${T}/announced-vm"
2586 # With the hooks we should only get here once from pkg_setup but better safe than sorry
2587 # if people have for example modified eclasses some where
1883 if [[ -n "${JAVA_PKG_DEBUG}" ]] || [[ ! -f "${tann}" ]] ; then 2588 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)" 2589 einfo "Using: $(java-config -f)"
1889 [[ ! -f "${tann}" ]] && touch "${tann}" 2590 [[ ! -f "${tann}" ]] && touch "${tann}"
1890 fi
1891 fi 2591 fi
1892 2592
1893 else 2593 else
1894 [[ -n "${JAVA_PKG_DEBUG}" ]] && ewarn "!!! This package inherits java-pkg but doesn't depend on a JDK. -bin or broken dependency!!!" 2594 [[ -n "${JAVA_PKG_DEBUG}" ]] && ewarn "!!! This package inherits java-pkg but doesn't depend on a JDK. -bin or broken dependency!!!"
1895 fi 2595 fi
1925 einfo "Classes" 2625 einfo "Classes"
1926 find "${S}" -type f -name '*.class' -print0 | xargs -0 -r -n 500 ls -ald | sed -e "s,${WORKDIR},\${WORKDIR}," 2626 find "${S}" -type f -name '*.class' -print0 | xargs -0 -r -n 500 ls -ald | sed -e "s,${WORKDIR},\${WORKDIR},"
1927 fi 2627 fi
1928} 2628}
1929 2629
1930# TODO document 2630# ------------------------------------------------------------------------------
2631# @internal-function java-pkg_verify-classes
2632#
1931# Verify that the classes were compiled for the right source / target 2633# Verify that the classes were compiled for the right source / target. Dies if
2634# not.
2635# @param $1 (optional) - the file to check, otherwise checks whole ${D}
2636# ------------------------------------------------------------------------------
1932java-pkg_verify-classes() { 2637java-pkg_verify-classes() {
1933 ebegin "Verifying java class versions"
1934 #$(find ${D} -type f -name '*.jar' -o -name '*.class') 2638 #$(find ${D} -type f -name '*.jar' -o -name '*.class')
1935 class-version-verify.py -t $(java-pkg_get-target) -r ${D} 2639
2640 local version_verify="/usr/bin/class-version-verify.py"
2641
2642 if [[ ! -x "${version_verify}" ]]; then
2643 version_verify="/usr/$(get_libdir)/javatoolkit/bin/class-version-verify.py"
2644 fi
2645
2646 if [[ ! -x "${version_verify}" ]]; then
2647 ewarn "Unable to perform class version checks as"
2648 ewarn "class-version-verify.py is unavailable"
2649 ewarn "Please install dev-java/javatoolkit."
2650 return
2651 fi
2652
2653 local target=$(java-pkg_get-target)
2654 local result
2655 local log="${T}/class-version-verify.log"
2656 if [[ -n "${1}" ]]; then
2657 ${version_verify} -v -t ${target} "${1}" > "${log}"
1936 result=$? 2658 result=$?
1937 eend ${result}
1938 if [[ ${result} == 0 ]]; then
1939 einfo "All good"
1940 else 2659 else
1941 ewarn "Possible problem" 2660 ebegin "Verifying java class versions (target: ${target})"
1942 die "Bad class files found" 2661 ${version_verify} -v -t ${target} -r "${D}" > "${log}"
2662 result=$?
2663 eend ${result}
2664 fi
2665 [[ -n ${JAVA_PKG_DEBUG} ]] && cat "${log}"
2666 if [[ ${result} != 0 ]]; then
2667 eerror "Incorrect bytecode version found"
2668 [[ -n "${1}" ]] && eerror "in file: ${1}"
2669 eerror "See ${log} for more details."
2670 die "Incorrect bytecode found"
2671 fi
2672}
2673
2674# ----------------------------------------------------------------------------
2675# @internal-function java-pkg_ensure-dep
2676# Check that a package being used in jarfrom, getjars and getjar is contained
2677# within DEPEND or RDEPEND.
2678# @param $1 - empty - check both vars; "runtime" or "build" - check only
2679# RDEPEND, resp. DEPEND
2680# @param $2 - Package name and slot.
2681
2682java-pkg_ensure-dep() {
2683 debug-print-function ${FUNCNAME} $*
2684
2685 local limit_to="${1}"
2686 local target_pkg="${2}"
2687 local dev_error=""
2688
2689 local stripped_pkg=$(echo "${target_pkg}" | sed \
2690 's/-[0-9]*\(\.[0-9]\)*$//')
2691
2692 debug-print "Matching against: ${stripped_pkg}"
2693
2694 if [[ ${limit_to} != runtime && ! ( "${DEPEND}" =~ "$stripped_pkg" ) ]]; then
2695 dev_error="The ebuild is attempting to use ${target_pkg} that is not"
2696 dev_error="${dev_error} declared in DEPEND."
2697 if is-java-strict; then
2698 eerror "${dev_error}"
2699 die "${dev_error}"
2700 elif [[ ${BASH_SUBSHELL} = 0 ]]; then
2701 eerror "${dev_error}"
2702 elog "Because you have this package installed the package will"
2703 elog "build without problems, but please report this to"
2704 elog "http://bugs.gentoo.org"
2705 fi
2706 fi
2707
2708 if [[ ${limit_to} != build ]]; then
2709 if [[ ! ( ${RDEPEND} =~ "${stripped_pkg}" ) ]]; then
2710 if [[ ! ( ${PDEPEND} =~ "${stripped_pkg}" ) ]]; then
2711 dev_error="The ebuild is attempting to use ${target_pkg},"
2712 dev_error="${dev_error} without specifying --build-only, that is not declared in RDEPEND"
2713 dev_error="${dev_error} or PDEPEND."
2714 if is-java-strict; then
2715 eerror "${dev_error}"
2716 die "${dev_error}"
2717 elif [[ ${BASH_SUBSHELL} = 0 ]]; then
2718 eerror "${dev_error}"
2719 elog "The package will build without problems, but may fail to run"
2720 elog "if you don't have ${target_pkg} installed, so please report"
2721 elog "this to http://bugs.gentoo.org"
2722 fi
2723 fi
2724 fi
1943 fi 2725 fi
1944} 2726}
1945 2727
1946# ------------------------------------------------------------------------------ 2728# ------------------------------------------------------------------------------
1947# @section-end internal 2729# @section-end internal
1948# ------------------------------------------------------------------------------ 2730# ------------------------------------------------------------------------------
1949 2731
1950java-pkg_check-phase() { 2732java-pkg_check-phase() {
1951 local phase=${1} 2733 local phase=${1}
1952 local funcname=${2} 2734 local funcname=${FUNCNAME[1]}
1953 if is-java-strict && [[ ${EBUILD_PHASE} != ${phase} ]]; then 2735 if [[ ${EBUILD_PHASE} != ${phase} ]]; then
1954 java-pkg_announce-qa-violation \
1955 "${funcname} used outside of src_${phase}" 2736 local msg="${funcname} used outside of src_${phase}"
2737 java-pkg_announce-qa-violation "${msg}"
1956 fi 2738 fi
1957} 2739}
1958 2740
1959java-pkg_check-versioned-jar() { 2741java-pkg_check-versioned-jar() {
1960 local jar=${1} 2742 local jar=${1}
1969 java-pkg_announce-qa-violation "deprecated USE flag 'jikes' in IUSE" 2751 java-pkg_announce-qa-violation "deprecated USE flag 'jikes' in IUSE"
1970 fi 2752 fi
1971} 2753}
1972 2754
1973java-pkg_announce-qa-violation() { 2755java-pkg_announce-qa-violation() {
1974 if is-java-strict; then 2756 local nodie
2757 if [[ ${1} == "--nodie" ]]; then
2758 nodie="true"
2759 shift
2760 fi
1975 echo "Java QA Notice: $@" >&2 2761 echo "Java QA Notice: $@" >&2
1976 increment-qa-violations 2762 increment-qa-violations
1977 fi 2763 [[ -z "${nodie}" ]] && is-java-strict && die "${@}"
1978} 2764}
1979 2765
1980increment-qa-violations() { 2766increment-qa-violations() {
1981 let "JAVA_PKG_QA_VIOLATIONS+=1" 2767 let "JAVA_PKG_QA_VIOLATIONS+=1"
1982 export JAVA_PKG_QA_VIOLATIONS 2768 export JAVA_PKG_QA_VIOLATIONS
1985is-java-strict() { 2771is-java-strict() {
1986 [[ -n ${JAVA_PKG_STRICT} ]] 2772 [[ -n ${JAVA_PKG_STRICT} ]]
1987 return $? 2773 return $?
1988} 2774}
1989 2775
2776
1990# ------------------------------------------------------------------------------ 2777# ------------------------------------------------------------------------------
1991# @eclass-end 2778# @eclass-end
1992# ------------------------------------------------------------------------------ 2779# ------------------------------------------------------------------------------

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

  ViewVC Help
Powered by ViewVC 1.1.20