/[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.22 Revision 1.121
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 9# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.121 2009/02/11 16:13:38 betelgeuse Exp $
10 10
11# ----------------------------------------------------------------------------- 11# -----------------------------------------------------------------------------
12# @eclass-begin 12# @eclass-begin
13# @eclass-shortdesc Java Utility eclass 13# @eclass-shortdesc Java Utility eclass
14# @eclass-maintainer java@gentoo.org 14# @eclass-maintainer java@gentoo.org
23# 23#
24# ----------------------------------------------------------------------------- 24# -----------------------------------------------------------------------------
25 25
26inherit eutils versionator multilib 26inherit eutils versionator multilib
27 27
28IUSE="elibc_FreeBSD"
29
28# ----------------------------------------------------------------------------- 30# -----------------------------------------------------------------------------
29# @section-begin variables 31# @section-begin variables
30# @section-title Variables 32# @section-title Variables
31# 33#
32# Summary of variables which control the behavior of building Java packges. 34# Summary of variables which control the behavior of building Java packges.
33# ----------------------------------------------------------------------------- 35# -----------------------------------------------------------------------------
34 36
35# Make sure we use java-config-2 37# Make sure we use java-config-2
36export WANT_JAVA_CONFIG="2" 38export WANT_JAVA_CONFIG="2"
37 39
38# TODO document 40# -----------------------------------------------------------------------------
39JAVA_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"
40 67
41# ----------------------------------------------------------------------------- 68# -----------------------------------------------------------------------------
42# @variable-internal JAVA_PKG_E_DEPEND 69# @variable-internal JAVA_PKG_E_DEPEND
43# 70#
44# 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
45# 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
46# portage, that includes phase hooks. 73# so that ebuilds can use new features without depending on specific versions.
47# ----------------------------------------------------------------------------- 74# -----------------------------------------------------------------------------
48JAVA_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 )"
49 77
50# ----------------------------------------------------------------------------- 78# -----------------------------------------------------------------------------
51# @variable-external JAVA_PKG_ALLOW_VM_CHANGE 79# @variable-external JAVA_PKG_ALLOW_VM_CHANGE
52# @variable-default yes 80# @variable-default yes
53# 81#
127# @note This should only be used internally or for testing. 155# @note This should only be used internally or for testing.
128# @example Use jikes and javac, in that order 156# @example Use jikes and javac, in that order
129# JAVA_PKG_FORCE_COMPILER="jikes javac" 157# JAVA_PKG_FORCE_COMPILER="jikes javac"
130# ----------------------------------------------------------------------------- 158# -----------------------------------------------------------------------------
131 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
132# TODO document me 174# TODO document me
133JAVA_PKG_QA_VIOLATIONS=0 175JAVA_PKG_QA_VIOLATIONS=0
134 176
135# ----------------------------------------------------------------------------- 177# -----------------------------------------------------------------------------
136# @section-end variables 178# @section-end variables
143# 185#
144# 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
145# libraries, etc. 187# libraries, etc.
146# ----------------------------------------------------------------------------- 188# -----------------------------------------------------------------------------
147 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}
148 230
149# ----------------------------------------------------------------------------- 231# -----------------------------------------------------------------------------
150# @ebuild-function java-pkg_dojar 232# @ebuild-function java-pkg_dojar
151# 233#
152# Installs any number of jars. 234# Installs any number of jars.
171 # Create JARDEST if it doesn't exist 253 # Create JARDEST if it doesn't exist
172 dodir ${JAVA_PKG_JARDEST} 254 dodir ${JAVA_PKG_JARDEST}
173 255
174 local jar 256 local jar
175 # for each jar 257 # for each jar
176 for jar in "$@"; do 258 for jar in "${@}"; do
177 local jar_basename=$(basename "${jar}") 259 local jar_basename=$(basename "${jar}")
178 260
179 java-pkg_check-versioned-jar ${jar_basename} 261 java-pkg_check-versioned-jar ${jar_basename}
180 262
181 # check if it exists 263 # check if it exists
182 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
183 # install it into JARDEST if it's a non-symlink 272 # install it into JARDEST if it's a non-symlink
184 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
185 INSDESTTREE="${JAVA_PKG_JARDEST}" \ 277 INSDESTTREE="${JAVA_PKG_JARDEST}" \
186 doins "${jar}" || die "failed to install ${jar}" 278 doins "${jar}" || die "failed to install ${jar}"
187 java-pkg_append_ JAVA_PKG_CLASSPATH "${JAVA_PKG_JARDEST}/${jar_basename}" 279 java-pkg_append_ JAVA_PKG_CLASSPATH "${JAVA_PKG_JARDEST}/${jar_basename}"
188 debug-print "installed ${jar} to ${D}${JAVA_PKG_JARDEST}" 280 debug-print "installed ${jar} to ${D}${JAVA_PKG_JARDEST}"
189 # make a symlink to the original jar if it's symlink 281 # make a symlink to the original jar if it's symlink
199 done 291 done
200 292
201 java-pkg_do_write_ 293 java-pkg_do_write_
202} 294}
203 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# ------------------------------------------------------------------------------
204 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}
205 309
206# ------------------------------------------------------------------------------ 310# ------------------------------------------------------------------------------
207# @ebuild-function java-pkg_regjar 311# @ebuild-function java-pkg_regjar
208# 312#
209# Records an already installed jar in the package.env 313# Records an already installed jar in the package.env
240 [[ ${#} -lt 1 ]] && die "at least one argument needed" 344 [[ ${#} -lt 1 ]] && die "at least one argument needed"
241 345
242 java-pkg_init_paths_ 346 java-pkg_init_paths_
243 347
244 local jar jar_dir jar_file 348 local jar jar_dir jar_file
245 for jar in "$@"; do 349 for jar in "${@}"; do
246 # TODO use java-pkg_check-versioned-jar 350 # TODO use java-pkg_check-versioned-jar
247 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
248 # 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:
249 # imagine such call: 359 # imagine such call:
250 # java-pkg_regjar ${D}/opt/java/*.jar 360 # java-pkg_regjar ${D}/opt/java/*.jar
251 # such call will fall into this case (-e ${jar}) and will 361 # such call will fall into this case (-e ${jar}) and will
252 # record paths with ${D} in package.env 362 # record paths with ${D} in package.env
253 java-pkg_append_ JAVA_PKG_CLASSPATH "${jar#${D}}" 363 java-pkg_append_ JAVA_PKG_CLASSPATH "${jar#${D}}"
254 elif [[ -e "${D}${jar}" ]]; then
255 java-pkg_append_ JAVA_PKG_CLASSPATH "${jar#${D}}"
256 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
257 die "${jar} does not exist" 370 die "${jar} does not exist"
258 fi 371 fi
259 done 372 done
260 373
261 java-pkg_do_write_ 374 java-pkg_do_write_
262} 375}
263
264 376
265# ------------------------------------------------------------------------------ 377# ------------------------------------------------------------------------------
266# @ebuild-function java-pkg_newjar 378# @ebuild-function java-pkg_newjar
267# 379#
268# Installs a jar with a new name 380# Installs a jar with a new name
279 local original_jar="${1}" 391 local original_jar="${1}"
280 local new_jar="${2:-${PN}.jar}" 392 local new_jar="${2:-${PN}.jar}"
281 local new_jar_dest="${T}/${new_jar}" 393 local new_jar_dest="${T}/${new_jar}"
282 394
283 [[ -z ${original_jar} ]] && die "Must specify a jar to install" 395 [[ -z ${original_jar} ]] && die "Must specify a jar to install"
284 [[ ! -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!"
285 398
286 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}"
287 cp "${original_jar}" "${new_jar_dest}" \ 400 cp "${original_jar}" "${new_jar_dest}" \
288 || die "Failed to copy ${original_jar} to ${new_jar_dest}" 401 || die "Failed to copy ${original_jar} to ${new_jar_dest}"
289 java-pkg_dojar "${new_jar_dest}" 402 java-pkg_dojar "${new_jar_dest}"
290} 403}
291 404
292
293# ------------------------------------------------------------------------------ 405# ------------------------------------------------------------------------------
294# @ebuild-function java-pkg_addcp 406# @ebuild-function java-pkg_addcp
295# 407#
296# Add something to the package's classpath. For jars, you should use dojar, 408# Add something to the package's classpath. For jars, you should use dojar,
297# newjar, or regjar. This is typically used to add directories to the classpath. 409# newjar, or regjar. This is typically used to add directories to the classpath.
301# ------------------------------------------------------------------------------ 413# ------------------------------------------------------------------------------
302java-pkg_addcp() { 414java-pkg_addcp() {
303 java-pkg_append_ JAVA_PKG_CLASSPATH "${@}" 415 java-pkg_append_ JAVA_PKG_CLASSPATH "${@}"
304 java-pkg_do_write_ 416 java-pkg_do_write_
305} 417}
306
307 418
308# ------------------------------------------------------------------------------ 419# ------------------------------------------------------------------------------
309# @ebuild-function java-pkg_doso 420# @ebuild-function java-pkg_doso
310# 421#
311# Installs any number of JNI libraries 422# Installs any number of JNI libraries
334 if [[ -e "${lib}" ]] ; then 445 if [[ -e "${lib}" ]] ; then
335 # install if it isn't a symlink 446 # install if it isn't a symlink
336 if [[ ! -L "${lib}" ]] ; then 447 if [[ ! -L "${lib}" ]] ; then
337 INSDESTTREE="${JAVA_PKG_LIBDEST}" \ 448 INSDESTTREE="${JAVA_PKG_LIBDEST}" \
338 INSOPTIONS="${LIBOPTIONS}" \ 449 INSOPTIONS="${LIBOPTIONS}" \
339 doins "${lib}" || "failed to install ${lib}" 450 doins "${lib}" || die "failed to install ${lib}"
340 java-pkg_append_ JAVA_PKG_LIBRARY "${JAVA_PKG_LIBDEST}" 451 java-pkg_append_ JAVA_PKG_LIBRARY "${JAVA_PKG_LIBDEST}"
341 debug-print "Installing ${lib} to ${JAVA_PKG_LIBDEST}" 452 debug-print "Installing ${lib} to ${JAVA_PKG_LIBDEST}"
342 # otherwise make a symlink to the symlink's origin 453 # otherwise make a symlink to the symlink's origin
343 else 454 else
344 # TODO use dosym 455 # TODO use dosym
456 ln -s "$(readlink "${lib}")" \
345 ln -s "$(readlink "${lib}")" "${D}${JAVA_PKG_LIBDEST}/$(basename "${lib}")" 457 "${D}${JAVA_PKG_LIBDEST}/$(basename "${lib}")"
346 debug-print "${lib} is a symlink, linking accordanly" 458 debug-print "${lib} is a symlink, linking accordanly"
347 fi 459 fi
348 # otherwise die 460 # otherwise die
349 else 461 else
350 die "${lib} does not exist" 462 die "${lib} does not exist"
428# ------------------------------------------------------------------------------ 540# ------------------------------------------------------------------------------
429java-pkg_dohtml() { 541java-pkg_dohtml() {
430 debug-print-function ${FUNCNAME} $* 542 debug-print-function ${FUNCNAME} $*
431 543
432 [[ ${#} -lt 1 ]] && die "At least one argument required for ${FUNCNAME}" 544 [[ ${#} -lt 1 ]] && die "At least one argument required for ${FUNCNAME}"
433 # TODO-nichoj find out what exactly -f package-list does 545
546 # from /usr/lib/portage/bin/dohtml -h
547 # -f Set list of allowed extensionless file names.
434 dohtml -f package-list "$@" 548 dohtml -f package-list "$@"
549
435 # this probably shouldn't be here but it provides 550 # this probably shouldn't be here but it provides
436 # a reasonable way to catch # docs for all of the 551 # a reasonable way to catch # docs for all of the
437 # old ebuilds. 552 # old ebuilds.
438 java-pkg_recordjavadoc 553 java-pkg_recordjavadoc
439} 554}
440 555
441# TODO document 556# ------------------------------------------------------------------------------
557# @ebuild-function java-pkg_dojavadoc
558#
559# Installs javadoc documentation. This should be controlled by the doc use flag.
560#
561# @param $1: optional --symlink creates to symlink like this for html
562# documentation bundles.
563# @param $2: - The javadoc root directory.
564#
565# @example:
566# java-pkg_dojavadoc docs/api
567# java-pkg_dojavadoc --symlink apidocs docs/api
568#
569# ------------------------------------------------------------------------------
442java-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
443 local dir="$1" 580 local dir="$1"
581 local dest=/usr/share/doc/${PF}/html
582
583 # QA checks
444 584
445 java-pkg_check-phase install 585 java-pkg_check-phase install
446 586
447 [[ -z "${dir}" ]] && die "Must specify a directory!" 587 [[ -z "${dir}" ]] && die "Must specify a directory!"
448 [[ ! -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
449 601
450 local dir_to_install="${dir}" 602 local dir_to_install="${dir}"
451 if [[ "$(basename "${dir}")" != "api" ]]; then 603 if [[ "$(basename "${dir}")" != "api" ]]; then
452 dir_to_install="${T}/api" 604 dir_to_install="${T}/api"
453 # TODO use doins 605 # TODO use doins
454 cp -r "${dir}" "${dir_to_install}" || die "cp failed" 606 cp -r "${dir}" "${dir_to_install}" || die "cp failed"
455 fi 607 fi
456 608
609 # Actual installation
610
457 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
458} 620}
459 621
460# ------------------------------------------------------------------------------ 622# ------------------------------------------------------------------------------
461# @ebuild-function java-pkg_dosrc 623# @ebuild-function java-pkg_dosrc
462# 624#
478# FIXME apparently this fails if you give it an empty directories 640# FIXME apparently this fails if you give it an empty directories
479java-pkg_dosrc() { 641java-pkg_dosrc() {
480 debug-print-function ${FUNCNAME} $* 642 debug-print-function ${FUNCNAME} $*
481 643
482 [ ${#} -lt 1 ] && die "At least one argument needed" 644 [ ${#} -lt 1 ] && die "At least one argument needed"
483 if ! hasq source ${IUSE}; then
484 echo "Java QA Notice: ${FUNCNAME} called without source in IUSE"
485 fi
486 645
487 java-pkg_check-phase install 646 java-pkg_check-phase install
488 647
489 [[ ${#} -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
490 654
491 java-pkg_init_paths_ 655 java-pkg_init_paths_
492 656
493 local zip_name="${PN}-src.zip" 657 local zip_name="${PN}-src.zip"
494 local zip_path="${T}/${zip_name}" 658 local zip_path="${T}/${zip_name}"
495 local dir 659 local dir
496 for dir in ${@}; do 660 for dir in "${@}"; do
497 local dir_parent=$(dirname "${dir}") 661 local dir_parent=$(dirname "${dir}")
498 local dir_name=$(basename "${dir}") 662 local dir_name=$(basename "${dir}")
499 pushd ${dir_parent} > /dev/null || die "problem entering ${dir_parent}" 663 pushd ${dir_parent} > /dev/null || die "problem entering ${dir_parent}"
500 zip -q -r ${zip_path} ${dir_name} -i '*.java' 664 zip -q -r ${zip_path} ${dir_name} -i '*.java'
501 local result=$? 665 local result=$?
518# @ebuild-function java-pkg_dolauncher 682# @ebuild-function java-pkg_dolauncher
519# 683#
520# Make a wrapper script to lauch/start this package 684# Make a wrapper script to lauch/start this package
521# If necessary, the wrapper will switch to the appropriate VM. 685# If necessary, the wrapper will switch to the appropriate VM.
522# 686#
687# Can be called without parameters if the package installs only one jar
688# that has the Main-class attribute set. The wrapper will be named ${PN}.
689#
523# @param $1 - filename of launcher to create 690# @param $1 - filename of launcher to create
524# @param $2 - options, as follows: 691# @param $2 - options, as follows:
525# --main the.main.class.too.start 692# --main the.main.class.too.start
526# --jar /the/jar/too/launch.jar 693# --jar /the/jar/too/launch.jar or just <name>.jar
527# --java_args 'Extra arguments to pass to java' 694# --java_args 'Extra arguments to pass to java'
528# --pkg_args 'Extra arguments too pass to the package' 695# --pkg_args 'Extra arguments to pass to the package'
529# --pwd 696# --pwd Directory the launcher changes to before executing java
530# -into 697# -into Directory to install the launcher to, instead of /usr/bin
531# -pre 698# -pre Prepend contents of this file to the launcher
532# ------------------------------------------------------------------------------ 699# ------------------------------------------------------------------------------
533java-pkg_dolauncher() { 700java-pkg_dolauncher() {
534 debug-print-function ${FUNCNAME} $* 701 debug-print-function ${FUNCNAME} $*
535 702
536 java-pkg_check-phase install 703 java-pkg_check-phase install
537
538 [[ ${#} -lt 1 ]] && die "Need at least one argument"
539
540 java-pkg_init_paths_ 704 java-pkg_init_paths_
541 705
706 if [[ ${#} = 0 ]]; then
707 local name="${PN}"
708 else
542 local name="${1}" 709 local name="${1}"
710 shift
711 fi
712
543 # TODO rename to launcher 713 # TODO rename to launcher
544 local target="${T}/${name}" 714 local target="${T}/${name}"
545 local var_tmp="${T}/launcher_variables_tmp" 715 local var_tmp="${T}/launcher_variables_tmp"
546 local target_dir pre 716 local target_dir pre
547 shift
548 717
549 # Process the other the rest of the arguments 718 # Process the other the rest of the arguments
550 while [[ -n "${1}" && -n "${2}" ]]; do 719 while [[ -n "${1}" && -n "${2}" ]]; do
551 local var=${1} value=${2} 720 local var="${1}" value="${2}"
552 if [[ "${var:0:2}" == "--" ]]; then 721 if [[ "${var:0:2}" == "--" ]]; then
722 local var=${var:2}
553 echo "gjl_${var:2}=\"${value}\"" >> "${var_tmp}" 723 echo "gjl_${var}=\"${value}\"" >> "${var_tmp}"
724 local gjl_${var}="${value}"
554 elif [[ "${var}" == "-into" ]]; then 725 elif [[ "${var}" == "-into" ]]; then
555 target_dir="${value}" 726 target_dir="${value}"
556 elif [[ "${var}" == "-pre" ]]; then 727 elif [[ "${var}" == "-pre" ]]; then
557 pre="${value}" 728 pre="${value}"
558 fi 729 fi
559 shift 2 730 shift 2
560 done 731 done
561 732
733 # Test if no --jar and --main arguments were given and
734 # in that case check if the package only installs one jar
735 # and use that jar.
736 if [[ -z "${gjl_jar}" && -z "${gjl_main}" ]]; then
737 local cp="${JAVA_PKG_CLASSPATH}"
738 if [[ "${cp/:}" = "${cp}" && "${cp%.jar}" != "${cp}" ]]; then
739 echo "gjl_jar=\"${JAVA_PKG_CLASSPATH}\"" >> "${var_tmp}"
740 else
741 local msg="Not enough information to create a launcher given."
742 msg="${msg} Please give --jar or --main argument to ${FUNCNAME}."
743 die "${msg}"
744 fi
745 fi
746
562 # Write the actual script 747 # Write the actual script
563 echo "#!/bin/bash" > "${target}" 748 echo "#!/bin/bash" > "${target}"
564 [[ -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
565 echo "gjl_package=${JAVA_PKG_NAME}" >> "${target}" 756 echo "gjl_package=${JAVA_PKG_NAME}" >> "${target}"
566 cat "${var_tmp}" >> "${target}" 757 cat "${var_tmp}" >> "${target}"
567 rm -f "${var_tmp}" 758 rm -f "${var_tmp}"
568 echo "source /usr/share/java-config-2/launcher/launcher.bash" >> "${target}" 759 echo "source /usr/share/java-config-2/launcher/launcher.bash" >> "${target}"
569 760
661# 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
662# java-pkg_jar-from xerces-2 xml-apis.jar xml.jar 853# java-pkg_jar-from xerces-2 xml-apis.jar xml.jar
663# Example: get junit.jar which is needed only for building 854# Example: get junit.jar which is needed only for building
664# java-pkg_jar-from --build-only junit junit.jar 855# java-pkg_jar-from --build-only junit junit.jar
665# 856#
666# @param $1 - (optional) "--build-only" makes the jar(s) not added into 857# @param $opt
667# package.env DEPEND line. 858# --build-only - makes the jar(s) not added into package.env DEPEND line.
668# @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.
669# @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.
670# @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
671# symlink. Defaults to the name of the jar. 869# symlink. Defaults to the name of the jar.
672# ------------------------------------------------------------------------------ 870# ------------------------------------------------------------------------------
673# TODO could probably be cleaned up a little 871# TODO could probably be cleaned up a little
674java-pkg_jar-from() { 872java-pkg_jar-from() {
675 debug-print-function ${FUNCNAME} $* 873 debug-print-function ${FUNCNAME} $*
676 874
677 local build_only="" 875 local build_only=""
876 local destdir="."
877 local deep=""
878 local virtual=""
678 879
880 [[ "${EBUILD_PHASE}" == "test" ]] && build_only="build"
881
882 while [[ "${1}" == --* ]]; do
679 if [[ "${1}" = "--build-only" ]]; then 883 if [[ "${1}" = "--build-only" ]]; then
680 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
681 shift 895 shift
682 fi 896 done
683 897
684 local target_pkg="${1}" target_jar="${2}" destjar="${3}" 898 local target_pkg="${1}" target_jar="${2}" destjar="${3}"
685 899
686 [[ -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
687 905
688 # default destjar to the target jar 906 # default destjar to the target jar
689 [[ -z "${destjar}" ]] && destjar="${target_jar}" 907 [[ -z "${destjar}" ]] && destjar="${target_jar}"
690 908
691 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}."
692 local classpath 910 local classpath
693 classpath="$(java-config --classpath=${target_pkg})" 911 classpath="$(java-config ${deep} --classpath=${target_pkg})"
694 [[ $? != 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}"
695 938
696 local jar 939 local jar
697 for jar in ${classpath//:/ }; do 940 for jar in ${classpath//:/ }; do
698 local jar_name=$(basename "${jar}") 941 local jar_name=$(basename "${jar}")
699 if [[ ! -f "${jar}" ]] ; then 942 if [[ ! -f "${jar}" ]] ; then
710 elif [[ "${jar_name}" == "${target_jar}" ]] ; then 953 elif [[ "${jar_name}" == "${target_jar}" ]] ; then
711 [[ -f "${destjar}" ]] && rm "${destjar}" 954 [[ -f "${destjar}" ]] && rm "${destjar}"
712 ln -snf "${jar}" "${destjar}" \ 955 ln -snf "${jar}" "${destjar}" \
713 || die "Failed to make symlink from ${jar} to ${destjar}" 956 || die "Failed to make symlink from ${jar} to ${destjar}"
714 [[ -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
715 return 0 959 return 0
716 fi 960 fi
717 done 961 done
962 popd > /dev/null
718 # if no target was specified, we're ok 963 # if no target was specified, we're ok
719 if [[ -z "${target_jar}" ]] ; then 964 if [[ -z "${target_jar}" ]] ; then
720 return 0 965 return 0
721 # otherwise, die bitterly 966 # otherwise, die bitterly
722 else 967 else
741# The providing packages are recorded as dependencies into package.env DEPEND 986# The providing packages are recorded as dependencies into package.env DEPEND
742# line, unless "--build-only" is passed as the very first argument, for jars 987# line, unless "--build-only" is passed as the very first argument, for jars
743# that have to be present only at build time and are not needed on runtime 988# that have to be present only at build time and are not needed on runtime
744# (junit testing etc). 989# (junit testing etc).
745# 990#
746# Example: Get the classpath for xerces-2, 991# Example: Get the classpath for xerces-2 and xalan,
747# java-pkg_getjars xerces-2 xalan 992# java-pkg_getjars xerces-2,xalan
748# Example Return: 993# Example Return:
749# /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
750# 995#
751# @param $1 - (optional) "--build-only" makes the jar(s) not added into 996# @param $opt
752# 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.
753# @param $@ - list of packages to get jars from 1001# @param $1 - list of packages to get jars from
1002# (passed to java-config --classpath)
754# ------------------------------------------------------------------------------ 1003# ------------------------------------------------------------------------------
755java-pkg_getjars() { 1004java-pkg_getjars() {
756 debug-print-function ${FUNCNAME} $* 1005 debug-print-function ${FUNCNAME} $*
757 1006
758 local build_only="" 1007 local build_only=""
1008 local deep=""
759 1009
1010 [[ "${EBUILD_PHASE}" == "test" ]] && build_only="build"
1011
1012 while [[ "${1}" == --* ]]; do
760 if [[ "${1}" = "--build-only" ]]; then 1013 if [[ "${1}" = "--build-only" ]]; then
761 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
762 shift 1020 shift
763 fi
764
765 [[ ${#} -lt 1 ]] && die "At least one argument needed"
766
767 # NOTE could probably just pass $@ to java-config --classpath. and return it
768 local classpath pkg
769 for pkg in ${@//,/ }; do
770 #for pkg in $(echo "$@" | tr ',' ' '); do
771 jars="$(java-config --classpath=${pkg})"
772 [[ -z "${jars}" ]] && die "java-config --classpath=${pkg} failed"
773 debug-print "${pkg}:${jars}"
774
775 if [[ -z "${classpath}" ]]; then
776 classpath="${jars}"
777 else
778 classpath="${classpath}:${jars}"
779 fi
780 # Only record jars that aren't build-only
781 [[ -z "${build_only}" ]] && java-pkg_record-jar_ "${pkg}"
782 done 1021 done
783 echo "${classpath}" 1022
1023 [[ ${#} -ne 1 ]] && die "${FUNCNAME} takes only one argument besides --*"
1024
1025
1026 local pkgs="${1}"
1027
1028 if [[ "${EAPI}" == "1" ]]; then
1029 pkgs="${pkgs//:/-}"
1030 fi
1031
1032 jars="$(java-config ${deep} --classpath=${pkgs})"
1033 [[ $? != 0 ]] && die "java-config --classpath=${pkgs} failed"
1034 debug-print "${pkgs}:${jars}"
1035
1036 for pkg in ${pkgs//,/ }; do
1037 java-pkg_ensure-dep "${build_only}" "${pkg}"
1038 done
1039
1040 # Only record jars that aren't build-only
1041 if [[ -z "${build_only}" ]]; then
1042 for pkg in ${pkgs//,/ }; do
1043 java-pkg_record-jar_ "${pkg}"
1044 done
1045 fi
1046
1047 echo "${jars}"
784} 1048}
785 1049
786# ------------------------------------------------------------------------------ 1050# ------------------------------------------------------------------------------
787# @ebuild-function java-pkg_getjar 1051# @ebuild-function java-pkg_getjar
788# 1052#
795# @example 1059# @example
796# java-pkg_getjar xerces-2 xml-apis.jar 1060# java-pkg_getjar xerces-2 xml-apis.jar
797# @example-return 1061# @example-return
798# /usr/share/xerces-2/lib/xml-apis.jar 1062# /usr/share/xerces-2/lib/xml-apis.jar
799# 1063#
800# @param $1 - (optional) "--build-only" makes the jar not added into 1064# @param $opt
801# 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.
802# @param $1 - package to use 1068# @param $1 - package to use
803# @param $2 - jar to get 1069# @param $2 - jar to get
804# ------------------------------------------------------------------------------ 1070# ------------------------------------------------------------------------------
805java-pkg_getjar() { 1071java-pkg_getjar() {
806 debug-print-function ${FUNCNAME} $* 1072 debug-print-function ${FUNCNAME} $*
807 1073
808 local build_only="" 1074 local build_only=""
1075 local virtual=""
809 1076
1077 [[ "${EBUILD_PHASE}" == "test" ]] && build_only="build"
1078
1079 while [[ "${1}" == --* ]]; do
810 if [[ "${1}" = "--build-only" ]]; then 1080 if [[ "${1}" = "--build-only" ]]; then
811 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
812 shift 1087 shift
813 fi 1088 done
1089
1090 [[ ${#} -ne 2 ]] && die "${FUNCNAME} takes only two arguments besides --*"
814 1091
815 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
816 [[ -z ${pkg} ]] && die "Must specify package to get a jar from" 1098 [[ -z ${pkg} ]] && die "Must specify package to get a jar from"
817 [[ -z ${target_jar} ]] && die "Must specify jar to get" 1099 [[ -z ${target_jar} ]] && die "Must specify jar to get"
818 1100
819 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?"
820 local classpath 1102 local classpath
821 classpath=$(java-config --classpath=${pkg}) 1103 classpath=$(java-config --classpath=${pkg})
822 [[ $? != 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
823 1114
824 for jar in ${classpath//:/ }; do 1115 for jar in ${classpath//:/ }; do
825 if [[ ! -f "${jar}" ]] ; then 1116 if [[ ! -f "${jar}" ]] ; then
826 die "Installation problem with jar ${jar} in ${pkg} - is it installed?" 1117 die "Installation problem with jar ${jar} in ${pkg} - is it installed?"
827 fi 1118 fi
834 fi 1125 fi
835 done 1126 done
836 1127
837 die "Could not find ${target_jar} in ${pkg}" 1128 die "Could not find ${target_jar} in ${pkg}"
838 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_
839} 1265}
840 1266
841# 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
842# populate jars from the filesystem. 1268# populate jars from the filesystem.
843# 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
960# 1386#
961# export DEPEND="${DEPEND} ${depstr}" 1387# export DEPEND="${DEPEND} ${depstr}"
962# export RDEPEND="${RDEPEND} ${depstr}" 1388# export RDEPEND="${RDEPEND} ${depstr}"
963#} 1389#}
964 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.
965# 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
966# TODO document 1415# to system jar files or bundled jars removed.
1416# ------------------------------------------------------------------------------
967java-pkg_ensure-no-bundled-jars() { 1417java-pkg_ensure-no-bundled-jars() {
968 debug-print-function ${FUNCNAME} $* 1418 debug-print-function ${FUNCNAME} $*
969 pushd ${WORKDIR} >/dev/null 2>/dev/null
970 1419
971 local bundled_jars=$(find . -name "*.jar" -type f) 1420 local bundled_jars=$(java-pkg_find-normal-jars)
972 if [[ -n ${bundled_jars} ]]; then 1421 if [[ -n ${bundled_jars} ]]; then
973 echo "Bundled jars found:" 1422 echo "Bundled jars found:"
974 local jar 1423 local jar
975 for jar in ${bundled_jars}; do 1424 for jar in ${bundled_jars}; do
976 echo $(pwd)${jar/./} 1425 echo $(pwd)${jar/./}
977 done 1426 done
978 die "Bundled jars found!" 1427 die "Bundled jars found!"
979
980 fi 1428 fi
981 popd >/dev/null 2>/dev/null
982} 1429}
983 1430
984# ------------------------------------------------------------------------------ 1431# ------------------------------------------------------------------------------
985# @internal-function java-pkg_ensure-vm-version-sufficient 1432# @internal-function java-pkg_ensure-vm-version-sufficient
986# 1433#
1135# @ebuild-function java-pkg_get-target 1582# @ebuild-function java-pkg_get-target
1136# 1583#
1137# Determines what target version should be used, for passing to -target. 1584# Determines what target version should be used, for passing to -target.
1138# 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
1139# version of your JDK. 1586# version of your JDK.
1140# Remember doing this will mostly like cause things to break.
1141# Doesn't allow it to be lower then the one in depend.
1142# Doesn't allow it to be higher then the active vm.
1143# 1587#
1144# @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
1145# ------------------------------------------------------------------------------ 1589# ------------------------------------------------------------------------------
1146java-pkg_get-target() { 1590java-pkg_get-target() {
1147 local min=$(depend-java-query --get-lowest "${DEPEND} ${RDEPEND}")
1148 if [[ -n "${JAVA_PKG_WANT_TARGET}" ]]; then
1149 local max="$(java-config --select-vm "${GENTOO_VM}" -g PROVIDES_VERSION)"
1150 if version_is_at_least "${min}" "${JAVA_PKG_WANT_TARGET}" && version_is_at_least "${JAVA_PKG_WANT_TARGET}" "${max}"; then
1151 echo ${JAVA_PKG_WANT_TARGET}
1152 else
1153 echo ${min}
1154 fi
1155 else
1156 echo ${min}
1157 fi
1158
1159 #echo ${JAVA_PKG_WANT_TARGET:-$(depend-java-query --get-lowest "${DEPEND}")} 1591 echo ${JAVA_PKG_WANT_TARGET:-$(depend-java-query --get-lowest "${DEPEND} ${RDEPEND}")}
1160} 1592}
1161 1593
1162java-pkg_get-javac() { 1594java-pkg_get-javac() {
1163 debug-print-function ${FUNCNAME} $* 1595 debug-print-function ${FUNCNAME} $*
1164 1596
1165 java-pkg_init-compiler_ 1597
1166 local compiler="${GENTOO_COMPILER}" 1598 local compiler="${GENTOO_COMPILER}"
1167 1599
1168 local compiler_executable 1600 local compiler_executable
1169 if [[ "${compiler}" = "javac" ]]; then 1601 if [[ "${compiler}" = "javac" ]]; then
1170 # nothing fancy needs to be done for javac 1602 # nothing fancy needs to be done for javac
1178 unset JAVAC 1610 unset JAVAC
1179 # try to get value of JAVAC 1611 # try to get value of JAVAC
1180 compiler_executable="$(source ${compiler_env} 1>/dev/null 2>&1; echo ${JAVAC})" 1612 compiler_executable="$(source ${compiler_env} 1>/dev/null 2>&1; echo ${JAVAC})"
1181 export JAVAC=${old_javac} 1613 export JAVAC=${old_javac}
1182 1614
1183 [[ -z ${compiler_executable} ]] && die "JAVAC is empty or undefined in ${compiler_env}" 1615 if [[ -z ${compiler_executable} ]]; then
1616 echo "JAVAC is empty or undefined in ${compiler_env}"
1617 return 1
1618 fi
1184 1619
1185 # check that it's executable 1620 # check that it's executable
1186 if [[ ! -x ${compiler_executable} ]]; then 1621 if [[ ! -x ${compiler_executable} ]]; then
1187 eerror "Could not find ${compiler_executable}!"
1188 die "${compiler_executable} doesn't exist, or isn't executable" 1622 echo "${compiler_executable} doesn't exist, or isn't executable"
1623 return 1
1189 fi 1624 fi
1190 else 1625 else
1191 eerror "Could not find environment file for ${compiler}" 1626 echo "Could not find environment file for ${compiler}"
1192 die "Could not find ${compiler_env}" 1627 return 1
1193 fi 1628 fi
1194 fi 1629 fi
1195 echo ${compiler_executable} 1630 echo ${compiler_executable}
1196} 1631}
1197 1632
1214 1649
1215 debug-print "want source: ${want_source}" 1650 debug-print "want source: ${want_source}"
1216 debug-print "want target: ${want_target}" 1651 debug-print "want target: ${want_target}"
1217 1652
1218 if [[ -z "${want_source}" || -z "${want_target}" ]]; then 1653 if [[ -z "${want_source}" || -z "${want_target}" ]]; then
1219 debug-print "could not find valid -source/-target values" 1654 debug-print "could not find valid -source/-target values for javac"
1220 die "Could not find valid -source/-target values" 1655 echo "Could not find valid -source/-target values for javac"
1656 return 1
1221 else 1657 else
1222 if java-pkg_is-vm-version-ge "1.4"; then 1658 if java-pkg_is-vm-version-ge "1.4"; then
1223 echo "${source_str} ${target_str}" 1659 echo "${source_str} ${target_str}"
1224 else 1660 else
1225 echo "${target_str}" 1661 echo "${target_str}"
1229 1665
1230# TODO document 1666# TODO document
1231java-pkg_get-jni-cflags() { 1667java-pkg_get-jni-cflags() {
1232 local flags="-I${JAVA_HOME}/include" 1668 local flags="-I${JAVA_HOME}/include"
1233 1669
1670 local platform="linux"
1671 use elibc_FreeBSD && platform="freebsd"
1672
1234 # TODO do a check that the directories are valid 1673 # TODO do a check that the directories are valid
1235 # TODO figure out how to cope with other things than linux...
1236 flags="${flags} -I${JAVA_HOME}/include/linux" 1674 flags="${flags} -I${JAVA_HOME}/include/${platform}"
1237 1675
1238 echo ${flags} 1676 echo ${flags}
1239} 1677}
1240 1678
1241java-pkg_ensure-gcj() { 1679java-pkg_ensure-gcj() {
1247 die "No GCJ support found!" 1685 die "No GCJ support found!"
1248 fi 1686 fi
1249} 1687}
1250 1688
1251java-pkg_ensure-test() { 1689java-pkg_ensure-test() {
1252 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
1253 eerror "You specified FEATURES=test, but USE=test is needed" 1693 eerror "You specified FEATURES=test, but USE=test is needed"
1254 eerror "to pull in the additional dependencies for testing" 1694 eerror "to pull in the additional dependencies for testing"
1255 die "Need USE=test enabled" 1695 die "Need USE=test enabled"
1256 fi 1696 fi
1257} 1697}
1258 1698
1259# ------------------------------------------------------------------------------ 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# ------------------------------------------------------------------------------
1260# @section-end helper 1802# @section-end helper
1261# ------------------------------------------------------------------------------ 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}
1262 1823
1263# ------------------------------------------------------------------------------ 1824# ------------------------------------------------------------------------------
1264# @section-begin build 1825# @section-begin build
1265# @section-summary Build functions 1826# @section-summary Build functions
1266# 1827#
1270 1831
1271# ------------------------------------------------------------------------------ 1832# ------------------------------------------------------------------------------
1272# @ebuild-function eant 1833# @ebuild-function eant
1273# 1834#
1274# Ant wrapper function. Will use the appropriate compiler, based on user-defined 1835# Ant wrapper function. Will use the appropriate compiler, based on user-defined
1275# compiler. 1836# compiler. Will also set proper ANT_TASKS from the variable ANT_TASKS,
1276# 1837# variables:
1838# EANT_GENTOO_CLASSPATH - calls java-pkg_getjars for the value and adds to the
1839# gentoo.classpath property. Be sure to call
1840# java-ant_rewrite-classpath in src_unpack.
1841# EANT_NEEDS_TOOLS - add tools.jar to the gentoo.classpath. Should only be used
1842# for build-time purposes, the dependency is not recorded to
1843# package.env!
1844# JAVA_PKG_NO_BUNDLED_SEARCH - Don't search for bundled jars or class files
1845# *ANT_TASKS - used to determine ANT_TASKS before calling Ant.
1277# ------------------------------------------------------------------------------ 1846# ------------------------------------------------------------------------------
1278eant() { 1847eant() {
1279 debug-print-function ${FUNCNAME} $* 1848 debug-print-function ${FUNCNAME} $*
1280 1849
1281 # FIXME get this working 1850 if [[ ${EBUILD_PHASE} = compile ]]; then
1282# if is-java-strict && [[ ! ${DEPEND} =~ "dev-java/ant" ]]; then 1851 java-ant-2_src_configure
1852 java-utils-2_src_prepare
1853 fi
1854
1855 if ! hasq java-ant-2 ${INHERITED}; then
1856 local msg="You should inherit java-ant-2 when using eant"
1283# java-pkg_announce-qa-violation \ 1857 java-pkg_announce-qa-violation "${msg}"
1284# "Using eant, but not depending on dev-java/ant or dev-java/ant-core"
1285# fi 1858 fi
1286 1859
1287 local antflags 1860 local antflags="-Dnoget=true -Dmaven.mode.offline=true -Dbuild.sysclasspath=ignore"
1861
1288 java-pkg_init-compiler_ 1862 java-pkg_init-compiler_
1289 local compiler="${GENTOO_COMPILER}" 1863 local compiler="${GENTOO_COMPILER}"
1290 1864
1291 local compiler_env="${JAVA_PKG_COMPILER_DIR}/${compiler}" 1865 local compiler_env="${JAVA_PKG_COMPILER_DIR}/${compiler}"
1292
1293 local build_compiler="$(source ${compiler_env} 1>/dev/null 2>&1; echo ${ANT_BUILD_COMPILER})" 1866 local build_compiler="$(source ${compiler_env} 1>/dev/null 2>&1; echo ${ANT_BUILD_COMPILER})"
1294 if [[ "${compiler}" != "javac" && -z "${build_compiler}" ]]; then 1867 if [[ "${compiler}" != "javac" && -z "${build_compiler}" ]]; then
1295 die "ANT_BUILD_COMPILER undefined in ${compiler_env}" 1868 die "ANT_BUILD_COMPILER undefined in ${compiler_env}"
1296 fi 1869 fi
1297 1870
1298 if [[ ${compiler} != "javac" ]]; then 1871 if [[ ${compiler} != "javac" ]]; then
1299 antflags="-Dbuild.compiler=${build_compiler}" 1872 antflags="${antflags} -Dbuild.compiler=${build_compiler}"
1300 # Figure out any extra stuff to put on the classpath for compilers aside 1873 # Figure out any extra stuff to put on the classpath for compilers aside
1301 # from javac 1874 # from javac
1302 # ANT_BUILD_COMPILER_DEPS should be something that could be passed to 1875 # ANT_BUILD_COMPILER_DEPS should be something that could be passed to
1303 # java-config -p 1876 # java-config -p
1304 local build_compiler_deps="$(source ${JAVA_PKG_COMPILER_DIR}/${compiler} 1>/dev/null 2>&1; echo ${ANT_BUILD_COMPILER_DEPS})" 1877 local build_compiler_deps="$(source ${JAVA_PKG_COMPILER_DIR}/${compiler} 1>/dev/null 2>&1; echo ${ANT_BUILD_COMPILER_DEPS})"
1305 if [[ -n ${build_compiler_deps} ]]; then 1878 if [[ -n ${build_compiler_deps} ]]; then
1306 antflags="${antflags} -lib $(java-config -p ${build_compiler_deps})" 1879 antflags="${antflags} -lib $(java-config -p ${build_compiler_deps})"
1307 fi 1880 fi
1308 fi 1881 fi
1309 1882
1883 for arg in "${@}"; do
1884 if [[ ${arg} = -lib ]]; then
1310 if is-java-strict; then 1885 if is-java-strict; then
1311 einfo "Disabling system classpath for ant" 1886 eerror "You should not use the -lib argument to eant because it will fail"
1312 antflags="${antflags} -Dbuild.sysclasspath=ignore" 1887 eerror "with JAVA_PKG_STRICT. Please use for example java-pkg_jar-from"
1888 eerror "or ant properties to make dependencies available."
1889 eerror "For ant tasks use WANT_ANT_TASKS or ANT_TASKS from."
1890 eerror "split ant (>=dev-java/ant-core-1.7)."
1891 die "eant -lib is deprecated/forbidden"
1892 else
1893 echo "eant -lib is deprecated. Turn JAVA_PKG_STRICT on for"
1894 echo "more info."
1895 fi
1313 fi 1896 fi
1897 done
1314 1898
1315 if [[ -n ${JAVA_PKG_DEBUG} ]]; then 1899 # parse WANT_ANT_TASKS for atoms
1316 antflags="${antflags} -debug" 1900 local want_ant_tasks
1901 for i in ${WANT_ANT_TASKS}; do
1902 if [[ ${i} = */*:* ]]; then
1903 i=${i#*/}
1904 i=${i%:0}
1905 want_ant_tasks+="${i/:/-} "
1906 else
1907 want_ant_tasks+="${i} "
1908 fi
1909 done
1910 # default ANT_TASKS to WANT_ANT_TASKS, if ANT_TASKS is not set explicitly
1911 ANT_TASKS="${ANT_TASKS:-${want_ant_tasks% }}"
1912
1913 # override ANT_TASKS with JAVA_PKG_FORCE_ANT_TASKS if it's set
1914 ANT_TASKS="${JAVA_PKG_FORCE_ANT_TASKS:-${ANT_TASKS}}"
1915
1916 # if ant-tasks is not set by ebuild or forced, use none
1917 ANT_TASKS="${ANT_TASKS:-none}"
1918
1919 # at this point, ANT_TASKS should be "all", "none" or explicit list
1920 if [[ "${ANT_TASKS}" == "all" ]]; then
1921 einfo "Using all available ANT_TASKS"
1922 elif [[ "${ANT_TASKS}" == "none" ]]; then
1923 einfo "Disabling all optional ANT_TASKS"
1924 else
1925 einfo "Using following ANT_TASKS: ${ANT_TASKS}"
1926 fi
1927
1928 export ANT_TASKS
1929
1930 [[ -n ${JAVA_PKG_DEBUG} ]] && antflags="${antflags} --execdebug -debug"
1931 [[ -n ${PORTAGE_QUIET} ]] && antflags="${antflags} -q"
1932
1933 local gcp="${EANT_GENTOO_CLASSPATH}"
1934 local getjarsarg=""
1935
1936 if [[ ${EBUILD_PHASE} = "test" ]]; then
1937 antflags="${antflags} -DJunit.present=true"
1938 [[ ${ANT_TASKS} = *ant-junit* ]] && gcp="${gcp} junit"
1939 getjarsarg="--with-dependencies"
1940 fi
1941
1942 local cp
1943
1944 for atom in ${gcp}; do
1945 cp="${cp}:$(java-pkg_getjars ${getjarsarg} ${atom})"
1946 done
1947
1948 [[ -n "${EANT_NEEDS_TOOLS}" ]] && cp="${cp}:$(java-config --tools)"
1949
1950 if [[ ${cp} ]]; then
1951 # It seems ant does not like single quotes around ${cp}
1952 cp=${cp#:}
1953 [[ ${EANT_GENTOO_CLASSPATH_EXTRA} ]] && \
1954 cp="${cp}:${EANT_GENTOO_CLASSPATH_EXTRA}"
1955 antflags="${antflags} -Dgentoo.classpath=\"${cp}\""
1317 fi 1956 fi
1318 1957
1319 [[ -n ${JAVA_PKG_DEBUG} ]] && echo ant ${antflags} "${@}" 1958 [[ -n ${JAVA_PKG_DEBUG} ]] && echo ant ${antflags} "${@}"
1959 debug-print "Calling ant (GENTOO_VM: ${GENTOO_VM}): ${antflags} ${@}"
1320 ant ${antflags} "${@}" || die "eant failed" 1960 ant ${antflags} "${@}" || die "eant failed"
1321
1322} 1961}
1323 1962
1324# ------------------------------------------------------------------------------ 1963# ------------------------------------------------------------------------------
1325# @ebuild-function ejavac 1964# @ebuild-function ejavac
1326# 1965#
1330# @param $@ - Arguments to be passed to the compiler 1969# @param $@ - Arguments to be passed to the compiler
1331# ------------------------------------------------------------------------------ 1970# ------------------------------------------------------------------------------
1332ejavac() { 1971ejavac() {
1333 debug-print-function ${FUNCNAME} $* 1972 debug-print-function ${FUNCNAME} $*
1334 1973
1335 # FIXME using get-javac ends up printing stuff with einfo 1974 java-pkg_init-compiler_
1975
1976 local compiler_executable
1336# local compiler_executable=$(java-pkg_get-javac) 1977 compiler_executable=$(java-pkg_get-javac)
1337 local compiler_executable="javac" 1978 if [[ ${?} != 0 ]]; then
1979 eerror "There was a problem determining compiler: ${compiler_executable}"
1980 die "get-javac failed"
1981 fi
1338 1982
1983 local javac_args
1984 javac_args="$(java-pkg_javac-args)"
1985 if [[ ${?} != 0 ]]; then
1986 eerror "There was a problem determining JAVACFLAGS: ${javac_args}"
1987 die "java-pkg_javac-args failed"
1988 fi
1989
1339 [[ -n ${JAVA_PKG_DEBUG} ]] && echo ${compiler_executable} $(java-pkg_javac-args) "${@}" 1990 [[ -n ${JAVA_PKG_DEBUG} ]] && echo ${compiler_executable} ${javac_args} "${@}"
1340 ${compiler_executable} $(java-pkg_javac-args) "${@}" || die "ejavac failed" 1991 ${compiler_executable} ${javac_args} "${@}" || die "ejavac failed"
1341} 1992}
1342 1993
1343# ------------------------------------------------------------------------------ 1994# ------------------------------------------------------------------------------
1344# @ebuild-function java-pkg_filter-compiler 1995# @ebuild-function java-pkg_filter-compiler
1345# 1996#
1383# ------------------------------------------------------------------------------ 2034# ------------------------------------------------------------------------------
1384use_doc() { 2035use_doc() {
1385 use doc && echo ${@:-javadoc} 2036 use doc && echo ${@:-javadoc}
1386} 2037}
1387 2038
2039
1388# ------------------------------------------------------------------------------ 2040# ------------------------------------------------------------------------------
1389# @section-end build 2041# @section-end build
1390# ------------------------------------------------------------------------------ 2042# ------------------------------------------------------------------------------
1391 2043
1392# ------------------------------------------------------------------------------ 2044# ------------------------------------------------------------------------------
1408# This shouldn't be used directly. Instead, java-pkg and java-pkg-opt will 2060# This shouldn't be used directly. Instead, java-pkg and java-pkg-opt will
1409# call it during each of the phases of the merge process. 2061# call it during each of the phases of the merge process.
1410# 2062#
1411# ----------------------------------------------------------------------------- 2063# -----------------------------------------------------------------------------
1412java-pkg_init() { 2064java-pkg_init() {
2065 debug-print-function ${FUNCNAME} $*
1413 unset JAVAC 2066 unset JAVAC
1414 unset JAVA_HOME 2067 unset JAVA_HOME
2068
2069 java-config --help >/dev/null || {
2070 eerror ""
2071 eerror "Can't run java-config --help"
2072 eerror "Have you upgraded python recently but haven't"
2073 eerror "run python-updater yet?"
2074 die "Can't run java-config --help"
2075 }
2076
2077 # People do all kinds of weird things.
2078 # http://forums.gentoo.org/viewtopic-p-3943166.html
2079 local silence="${SILENCE_JAVA_OPTIONS_WARNING}"
2080 local accept="${I_WANT_GLOBAL_JAVA_OPTIONS}"
2081 if [[ -n ${_JAVA_OPTIONS} && -z ${accept} && -z ${silence} ]]; then
2082 ewarn "_JAVA_OPTIONS changes what java -version outputs at least for"
2083 ewarn "sun-jdk vms and and as such break configure scripts that"
2084 ewarn "use it (for example app-office/openoffice) so we filter it out."
2085 ewarn "Use SILENCE_JAVA_OPTIONS_WARNING=true in the environment (use"
2086 ewarn "make.conf for example) to silence this warning or"
2087 ewarn "I_WANT_GLOBAL_JAVA_OPTIONS to not filter it."
2088 fi
2089
2090 if [[ -z ${accept} ]]; then
2091 # export _JAVA_OPTIONS= doesn't work because it will show up in java
2092 # -version output
2093 unset _JAVA_OPTIONS
2094 # phase hooks make this run many times without this
2095 I_WANT_GLOBAL_JAVA_OPTIONS="true"
2096 fi
2097
2098 if java-pkg_func-exists ant_src_unpack; then
2099 java-pkg_announce-qa-violation "Using old ant_src_unpack. Should be src_unpack"
2100 fi
2101
1415 java-pkg_init_paths_ 2102 java-pkg_init_paths_
1416 java-pkg_switch-vm 2103 java-pkg_switch-vm
1417 PATH=${JAVA_HOME}/bin:${PATH} 2104 PATH=${JAVA_HOME}/bin:${PATH}
1418 2105
1419 # TODO we will probably want to set JAVAC and JAVACFLAGS 2106 # TODO we will probably want to set JAVAC and JAVACFLAGS
1420 2107
1421 # Do some QA checks 2108 # Do some QA checks
1422 java-pkg_check-jikes 2109 java-pkg_check-jikes
2110
2111 # Can't use unset here because Portage does not save the unset
2112 # see https://bugs.gentoo.org/show_bug.cgi?id=189417#c11
1423 2113
1424 # When users have crazy classpaths some packages can fail to compile. 2114 # When users have crazy classpaths some packages can fail to compile.
1425 # and everything should work with empty CLASSPATH. 2115 # and everything should work with empty CLASSPATH.
1426 # This also helps prevent unexpected dependencies on random things 2116 # This also helps prevent unexpected dependencies on random things
1427 # from the CLASSPATH. 2117 # from the CLASSPATH.
1428 unset CLASSPATH 2118 export CLASSPATH=
2119
2120 # Unset external ANT_ stuff
2121 export ANT_TASKS=
2122 export ANT_OPTS=
2123 export ANT_RESPECT_JAVA_HOME=
1429} 2124}
1430 2125
1431# ------------------------------------------------------------------------------ 2126# ------------------------------------------------------------------------------
1432# @function-internal java-pkg-init-compiler_ 2127# @function-internal java-pkg-init-compiler_
1433# 2128#
1524 done 2219 done
1525 2220
1526 # If it hasn't been defined already, default to javac 2221 # If it hasn't been defined already, default to javac
1527 if [[ -z ${GENTOO_COMPILER} ]]; then 2222 if [[ -z ${GENTOO_COMPILER} ]]; then
1528 if [[ -n ${compilers} ]]; then 2223 if [[ -n ${compilers} ]]; then
1529 einfo "No suitable compiler found: defaulting javac for compilation" 2224 einfo "No suitable compiler found: defaulting to JDK default for compilation"
1530 else 2225 else
1531 # probably don't need to notify users about the default. 2226 # probably don't need to notify users about the default.
1532 :;#einfo "Defaulting to javac for compilation" 2227 :;#einfo "Defaulting to javac for compilation"
1533 fi 2228 fi
2229 if java-config -g GENTOO_COMPILER 2> /dev/null; then
2230 export GENTOO_COMPILER=$(java-config -g GENTOO_COMPILER)
2231 else
1534 export GENTOO_COMPILER=javac 2232 export GENTOO_COMPILER=javac
2233 fi
1535 else 2234 else
1536 einfo "Using ${GENTOO_COMPILER} for compilation" 2235 einfo "Using ${GENTOO_COMPILER} for compilation"
1537 fi 2236 fi
1538 2237
1539} 2238}
1555 fi 2254 fi
1556 2255
1557 JAVA_PKG_SHAREPATH="${DESTTREE}/share/${JAVA_PKG_NAME}" 2256 JAVA_PKG_SHAREPATH="${DESTTREE}/share/${JAVA_PKG_NAME}"
1558 JAVA_PKG_SOURCESPATH="${JAVA_PKG_SHAREPATH}/sources/" 2257 JAVA_PKG_SOURCESPATH="${JAVA_PKG_SHAREPATH}/sources/"
1559 JAVA_PKG_ENV="${D}${JAVA_PKG_SHAREPATH}/package.env" 2258 JAVA_PKG_ENV="${D}${JAVA_PKG_SHAREPATH}/package.env"
2259 JAVA_PKG_VIRTUALS_PATH="${DESTTREE}/share/java-config-2/virtuals"
2260 JAVA_PKG_VIRTUAL_PROVIDER="${D}/${JAVA_PKG_VIRTUALS_PATH}/${JAVA_PKG_NAME}"
1560 2261
1561 [[ -z "${JAVA_PKG_JARDEST}" ]] && JAVA_PKG_JARDEST="${JAVA_PKG_SHAREPATH}/lib" 2262 [[ -z "${JAVA_PKG_JARDEST}" ]] && JAVA_PKG_JARDEST="${JAVA_PKG_SHAREPATH}/lib"
1562 [[ -z "${JAVA_PKG_LIBDEST}" ]] && JAVA_PKG_LIBDEST="${DESTTREE}/$(get_libdir)/${JAVA_PKG_NAME}" 2263 [[ -z "${JAVA_PKG_LIBDEST}" ]] && JAVA_PKG_LIBDEST="${DESTTREE}/$(get_libdir)/${JAVA_PKG_NAME}"
1563 [[ -z "${JAVA_PKG_WARDEST}" ]] && JAVA_PKG_WARDEST="${JAVA_PKG_SHAREPATH}/webapps" 2264 [[ -z "${JAVA_PKG_WARDEST}" ]] && JAVA_PKG_WARDEST="${JAVA_PKG_SHAREPATH}/webapps"
1564 2265
1577# Writes the package.env out to disk. 2278# Writes the package.env out to disk.
1578# 2279#
1579# ------------------------------------------------------------------------------ 2280# ------------------------------------------------------------------------------
1580# TODO change to do-write, to match everything else 2281# TODO change to do-write, to match everything else
1581java-pkg_do_write_() { 2282java-pkg_do_write_() {
2283 debug-print-function ${FUNCNAME} $*
2284 java-pkg_init_paths_
1582 # Create directory for package.env 2285 # Create directory for package.env
1583 dodir "${JAVA_PKG_SHAREPATH}" 2286 dodir "${JAVA_PKG_SHAREPATH}"
1584 if [[ -n "${JAVA_PKG_CLASSPATH}" || -n "${JAVA_PKG_LIBRARY}" || -f "${JAVA_PKG_DEPEND}" ]]; then 2287 if [[ -n "${JAVA_PKG_CLASSPATH}" || -n "${JAVA_PKG_LIBRARY}" || -f \
2288 "${JAVA_PKG_DEPEND_FILE}" || -f \
2289 "${JAVA_PKG_OPTIONAL_DEPEND_FILE}" ]]; then
1585 # Create package.env 2290 # Create package.env
1586 ( 2291 (
1587 echo "DESCRIPTION=\"${DESCRIPTION}\"" 2292 echo "DESCRIPTION=\"${DESCRIPTION}\""
1588 echo "GENERATION=\"2\"" 2293 echo "GENERATION=\"2\""
2294 echo "SLOT=\"${SLOT}\""
1589 2295
1590 [[ -n "${JAVA_PKG_CLASSPATH}" ]] && echo "CLASSPATH=\"${JAVA_PKG_CLASSPATH}\"" 2296 [[ -n "${JAVA_PKG_CLASSPATH}" ]] && echo "CLASSPATH=\"${JAVA_PKG_CLASSPATH}\""
1591 [[ -n "${JAVA_PKG_LIBRARY}" ]] && echo "LIBRARY_PATH=\"${JAVA_PKG_LIBRARY}\"" 2297 [[ -n "${JAVA_PKG_LIBRARY}" ]] && echo "LIBRARY_PATH=\"${JAVA_PKG_LIBRARY}\""
1592 [[ -n "${JAVA_PROVIDE}" ]] && echo "PROVIDES=\"${JAVA_PROVIDE}\"" 2298 [[ -n "${JAVA_PROVIDE}" ]] && echo "PROVIDES=\"${JAVA_PROVIDE}\""
1593 [[ -f "${JAVA_PKG_DEPEND}" ]] && echo "DEPEND=\"$(cat ${JAVA_PKG_DEPEND} | uniq | tr '\n' ':')\"" 2299 [[ -f "${JAVA_PKG_DEPEND_FILE}" ]] \
2300 && echo "DEPEND=\"$(cat "${JAVA_PKG_DEPEND_FILE}" | uniq | tr '\n' ':')\""
2301 [[ -f "${JAVA_PKG_OPTIONAL_DEPEND_FILE}" ]] \
2302 && echo "OPTIONAL_DEPEND=\"$(cat "${JAVA_PKG_OPTIONAL_DEPEND_FILE}" | uniq | tr '\n' ':')\""
1594 echo "VM=\"$(echo ${RDEPEND} ${DEPEND} | sed -e 's/ /\n/g' | sed -n -e '/virtual\/\(jre\|jdk\)/ { p;q }')\"" # TODO cleanup ! 2303 echo "VM=\"$(echo ${RDEPEND} ${DEPEND} | sed -e 's/ /\n/g' | sed -n -e '/virtual\/\(jre\|jdk\)/ { p;q }')\"" # TODO cleanup !
1595 ) > "${JAVA_PKG_ENV}" 2304 ) > "${JAVA_PKG_ENV}"
1596 2305
1597 # register target/source 2306 # register target/source
1598 local target="$(java-pkg_get-target)" 2307 local target="$(java-pkg_get-target)"
1609 2318
1610 2319
1611 echo "MERGE_VM=\"${GENTOO_VM}\"" >> "${JAVA_PKG_ENV}" 2320 echo "MERGE_VM=\"${GENTOO_VM}\"" >> "${JAVA_PKG_ENV}"
1612 [[ -n ${GENTOO_COMPILER} ]] && echo "MERGE_COMPILER=\"${GENTOO_COMPILER}\"" >> "${JAVA_PKG_ENV}" 2321 [[ -n ${GENTOO_COMPILER} ]] && echo "MERGE_COMPILER=\"${GENTOO_COMPILER}\"" >> "${JAVA_PKG_ENV}"
1613 2322
2323 # extra env variables
2324 if [[ -n "${JAVA_PKG_EXTRA_ENV_VARS}" ]]; then
2325 cat "${JAVA_PKG_EXTRA_ENV}" >> "${JAVA_PKG_ENV}" || die
2326 # nested echo to remove leading/trailing spaces
2327 echo "ENV_VARS=\"$(echo ${JAVA_PKG_EXTRA_ENV_VARS})\"" \
2328 >> "${JAVA_PKG_ENV}" || die
2329 fi
2330
1614 # Strip unnecessary leading and trailing colons 2331 # Strip unnecessary leading and trailing colons
1615 # TODO try to cleanup if possible 2332 # TODO try to cleanup if possible
1616 sed -e "s/=\":/=\"/" -e "s/:\"$/\"/" -i "${JAVA_PKG_ENV}" || die "Did you forget to call java_init ?" 2333 sed -e "s/=\":/=\"/" -e "s/:\"$/\"/" -i "${JAVA_PKG_ENV}" || die "Did you forget to call java_init ?"
2334 else
2335 debug-print "JAVA_PKG_CLASSPATH, JAVA_PKG_LIBRARY, JAVA_PKG_DEPEND_FILE"
2336 debug-print "or JAVA_PKG_OPTIONAL_DEPEND_FILE not defined so can't"
2337 debug-print "write package.env."
1617 fi 2338 fi
1618} 2339}
1619
1620 2340
1621# ------------------------------------------------------------------------------ 2341# ------------------------------------------------------------------------------
1622# @internal-function java-pkg_record-jar_ 2342# @internal-function java-pkg_record-jar_
1623# 2343#
1624# Record a dependency to the package.env 2344# Record an (optional) dependency to the package.env
1625# 2345# @param --optional - record dependency as optional
2346# @param $1 - package to record
2347# @param $2 - (optional) jar of package to record
1626# ------------------------------------------------------------------------------ 2348# ------------------------------------------------------------------------------
1627JAVA_PKG_DEPEND="${T}/java-pkg-depend" 2349JAVA_PKG_DEPEND_FILE="${T}/java-pkg-depend"
2350JAVA_PKG_OPTIONAL_DEPEND_FILE="${T}/java-pkg-optional-depend"
1628 2351
1629java-pkg_record-jar_() { 2352java-pkg_record-jar_() {
1630 debug-print-function ${FUNCNAME} $* 2353 debug-print-function ${FUNCNAME} $*
2354
2355 local depend_file="${JAVA_PKG_DEPEND_FILE}"
2356 if [[ "${1}" == "--optional" ]]; then
2357 depend_file="${JAVA_PKG_OPTIONAL_DEPEND_FILE}"
2358 shift
2359 fi
1631 2360
1632 local pkg=${1} jar=${2} append 2361 local pkg=${1} jar=${2} append
1633 if [[ -z "${jar}" ]]; then 2362 if [[ -z "${jar}" ]]; then
1634 append="${pkg}" 2363 append="${pkg}"
1635 else 2364 else
1636 append="$(basename ${jar})@${pkg}" 2365 append="$(basename ${jar})@${pkg}"
1637 fi 2366 fi
1638 2367
1639 echo ${append} >> ${JAVA_PKG_DEPEND} 2368 echo "${append}" >> "${depend_file}"
1640} 2369}
1641 2370
1642# ------------------------------------------------------------------------------ 2371# ------------------------------------------------------------------------------
1643# @internal-function java-pkg_append_ 2372# @internal-function java-pkg_append_
1644# 2373#
1704# 2433#
1705# ------------------------------------------------------------------------------ 2434# ------------------------------------------------------------------------------
1706java-pkg_setup-vm() { 2435java-pkg_setup-vm() {
1707 debug-print-function ${FUNCNAME} $* 2436 debug-print-function ${FUNCNAME} $*
1708 2437
2438 export LANG="C" LC_ALL="C"
2439
1709 local vendor="$(java-pkg_get-vm-vendor)" 2440 local vendor="$(java-pkg_get-vm-vendor)"
1710 if [[ "${vendor}" == "sun" ]] && java-pkg_is-vm-version-ge 1 5; then 2441 if [[ "${vendor}" == "sun" ]] && java-pkg_is-vm-version-ge "1.5" ; then
1711 addpredict "/dev/random" 2442 addpredict "/dev/random"
1712 elif [[ "${vendor}" == "ibm" ]]; then 2443 elif [[ "${vendor}" == "ibm" ]]; then
1713 addpredict "/proc/self/maps" 2444 addpredict "/proc/self/maps"
1714 addpredict "/proc/cpuinfo" 2445 addpredict "/proc/cpuinfo"
1715 export LANG="C" LC_ALL="C"
1716 elif [[ "${vendor}" == "jrockit" ]]; then 2446 elif [[ "${vendor}" == "jrockit" ]]; then
1717 addpredict "/proc/cpuinfo" 2447 addpredict "/proc/cpuinfo"
1718 fi 2448 fi
1719} 2449}
1720 2450
1775# Switch VM if we're allowed to (controlled by JAVA_PKG_ALLOW_VM_CHANGE), and 2505# Switch VM if we're allowed to (controlled by JAVA_PKG_ALLOW_VM_CHANGE), and
1776# verify that the current VM is sufficient. 2506# verify that the current VM is sufficient.
1777# Setup the environment for the VM being used. 2507# Setup the environment for the VM being used.
1778# ------------------------------------------------------------------------------ 2508# ------------------------------------------------------------------------------
1779java-pkg_switch-vm() { 2509java-pkg_switch-vm() {
2510 debug-print-function ${FUNCNAME} $*
2511
1780 if java-pkg_needs-vm; then 2512 if java-pkg_needs-vm; then
1781 # Use the VM specified by JAVA_PKG_FORCE_VM 2513 # Use the VM specified by JAVA_PKG_FORCE_VM
1782 if [[ -n ${JAVA_PKG_FORCE_VM} ]]; then 2514 if [[ -n "${JAVA_PKG_FORCE_VM}" ]]; then
1783 # If you're forcing the VM, I hope you know what your doing... 2515 # If you're forcing the VM, I hope you know what your doing...
2516 debug-print "JAVA_PKG_FORCE_VM used: ${JAVA_PKG_FORCE_VM}"
1784 export GENTOO_VM="${JAVA_PKG_FORCE_VM}" 2517 export GENTOO_VM="${JAVA_PKG_FORCE_VM}"
1785 # if we're allowed to switch the vm... 2518 # if we're allowed to switch the vm...
1786 elif [[ "${JAVA_PKG_ALLOW_VM_CHANGE}" == "yes" ]]; then 2519 elif [[ "${JAVA_PKG_ALLOW_VM_CHANGE}" == "yes" ]]; then
1787 debug-print "depend-java-query: NV_DEPEND: ${JAVA_PKG_NV_DEPEND:-${DEPEND}} VNEED: ${JAVA_PKG_VNEED}" 2520 debug-print "depend-java-query: NV_DEPEND: ${JAVA_PKG_NV_DEPEND:-${DEPEND}} VNEED: ${JAVA_PKG_VNEED}"
1788 if [[ -n ${JAVA_PKG_VNEED} ]]; then 2521 if [[ -n ${JAVA_PKG_VNEED} ]]; then
1789 export GENTOO_VM="$(depend-java-query --need-virtual "${JAVA_PKG_VNEED}" --get-vm "${JAVA_PKG_NV_DEPEND:-${DEPEND}}")" 2522 GENTOO_VM="$(depend-java-query --need-virtual "${JAVA_PKG_VNEED}" --get-vm "${JAVA_PKG_NV_DEPEND:-${DEPEND}}")"
1790 else 2523 else
1791 export GENTOO_VM="$(depend-java-query --get-vm "${JAVA_PKG_NV_DEPEND:-${DEPEND}}")" 2524 GENTOO_VM="$(depend-java-query --get-vm "${JAVA_PKG_NV_DEPEND:-${DEPEND}}")"
2525 fi
2526 if [[ -z "${GENTOO_VM}" || "${GENTOO_VM}" == "None" ]]; then
2527 eerror "Unable to determine VM for building from dependencies:"
2528 echo "NV_DEPEND: ${JAVA_PKG_NV_DEPEND:-${DEPEND}}"
2529 echo "VNEED: ${JAVA_PKG_VNEED}"
2530 die "Failed to determine VM for building."
2531 else
2532 export GENTOO_VM
1792 fi 2533 fi
1793 # otherwise just make sure the current VM is sufficient 2534 # otherwise just make sure the current VM is sufficient
1794 else 2535 else
1795 java-pkg_ensure-vm-version-sufficient 2536 java-pkg_ensure-vm-version-sufficient
1796 fi 2537 fi
1798 2539
1799 java-pkg_setup-vm 2540 java-pkg_setup-vm
1800 2541
1801 export JAVA=$(java-config --java) 2542 export JAVA=$(java-config --java)
1802 export JAVAC=$(java-config --javac) 2543 export JAVAC=$(java-config --javac)
1803 export JAVACFLAGS="$(java-pkg_javac-args)" 2544 JAVACFLAGS="$(java-pkg_javac-args)"
2545 if [[ ${?} != 0 ]]; then
2546 eerror "There was a problem determining JAVACFLAGS: ${JAVACFLAGS}"
2547 die "java-pkg_javac-args failed"
2548 fi
1804 [[ -n ${JAVACFLAGS_EXTRA} ]] && export JAVACFLAGS="${JAVACFLAGS_EXTRA} ${JAVACFLAGS}" 2549 [[ -n ${JAVACFLAGS_EXTRA} ]] && JAVACFLAGS="${JAVACFLAGS_EXTRA} ${JAVACFLAGS}"
2550 export JAVACFLAGS
1805 2551
1806 export JAVA_HOME="$(java-config -g JAVA_HOME)" 2552 export JAVA_HOME="$(java-config -g JAVA_HOME)"
1807 export JDK_HOME=${JAVA_HOME} 2553 export JDK_HOME=${JAVA_HOME}
1808 2554
1809 #TODO If you know a better solution let us know. 2555 #TODO If you know a better solution let us know.
1810 java-pkg_append_ LD_LIBRARY_PATH "$(java-config -g LDPATH)" 2556 java-pkg_append_ LD_LIBRARY_PATH "$(java-config -g LDPATH)"
1811 2557
1812 local tann="${T}/announced-vm" 2558 local tann="${T}/announced-vm"
2559 # With the hooks we should only get here once from pkg_setup but better safe than sorry
2560 # if people have for example modified eclasses some where
1813 if [[ -n "${JAVA_PKG_DEBUG}" ]] || [[ ! -f "${tann}" ]] ; then 2561 if [[ -n "${JAVA_PKG_DEBUG}" ]] || [[ ! -f "${tann}" ]] ; then
1814 # Add a check for setup/preinst phase... to avoid duplicate outputs
1815 # for when FEATURES=buildpkg
1816 if [[ ${EBUILD_PHASE} != "setup" && ${EBUILD_PHASE} != "preinst" && ${EBUILD_PHASE} != "postinst" ]];
1817 then
1818 einfo "Using: $(java-config -f)" 2562 einfo "Using: $(java-config -f)"
1819 [[ ! -f "${tann}" ]] && touch "${tann}" 2563 [[ ! -f "${tann}" ]] && touch "${tann}"
1820 fi
1821 fi 2564 fi
1822 2565
1823 else 2566 else
1824 [[ -n "${JAVA_PKG_DEBUG}" ]] && ewarn "!!! This package inherits java-pkg but doesn't depend on a JDK. -bin or broken dependency!!!" 2567 [[ -n "${JAVA_PKG_DEBUG}" ]] && ewarn "!!! This package inherits java-pkg but doesn't depend on a JDK. -bin or broken dependency!!!"
1825 fi 2568 fi
1855 einfo "Classes" 2598 einfo "Classes"
1856 find "${S}" -type f -name '*.class' -print0 | xargs -0 -r -n 500 ls -ald | sed -e "s,${WORKDIR},\${WORKDIR}," 2599 find "${S}" -type f -name '*.class' -print0 | xargs -0 -r -n 500 ls -ald | sed -e "s,${WORKDIR},\${WORKDIR},"
1857 fi 2600 fi
1858} 2601}
1859 2602
1860# TODO document 2603# ------------------------------------------------------------------------------
2604# @internal-function java-pkg_verify-classes
2605#
1861# Verify that the classes were compiled for the right source / target 2606# Verify that the classes were compiled for the right source / target. Dies if
2607# not.
2608# @param $1 (optional) - the file to check, otherwise checks whole ${D}
2609# ------------------------------------------------------------------------------
1862java-pkg_verify-classes() { 2610java-pkg_verify-classes() {
1863 ebegin "Verifying java class versions"
1864 #$(find ${D} -type f -name '*.jar' -o -name '*.class') 2611 #$(find ${D} -type f -name '*.jar' -o -name '*.class')
1865 class-version-verify.py -t $(java-pkg_get-target) -r ${D} 2612
2613 local version_verify="/usr/bin/class-version-verify.py"
2614
2615 if [[ ! -x "${version_verify}" ]]; then
2616 version_verify="/usr/$(get_libdir)/javatoolkit/bin/class-version-verify.py"
2617 fi
2618
2619 if [[ ! -x "${version_verify}" ]]; then
2620 ewarn "Unable to perform class version checks as"
2621 ewarn "class-version-verify.py is unavailable"
2622 ewarn "Please install dev-java/javatoolkit."
2623 return
2624 fi
2625
2626 local target=$(java-pkg_get-target)
2627 local result
2628 local log="${T}/class-version-verify.log"
2629 if [[ -n "${1}" ]]; then
2630 ${version_verify} -v -t ${target} "${1}" > "${log}"
1866 result=$? 2631 result=$?
1867 eend ${result}
1868 if [[ ${result} == 0 ]]; then
1869 einfo "All good"
1870 else 2632 else
1871 ewarn "Possible problem" 2633 ebegin "Verifying java class versions (target: ${target})"
1872 die "Bad class files found" 2634 ${version_verify} -v -t ${target} -r "${D}" > "${log}"
2635 result=$?
2636 eend ${result}
2637 fi
2638 [[ -n ${JAVA_PKG_DEBUG} ]] && cat "${log}"
2639 if [[ ${result} != 0 ]]; then
2640 eerror "Incorrect bytecode version found"
2641 [[ -n "${1}" ]] && eerror "in file: ${1}"
2642 eerror "See ${log} for more details."
2643 die "Incorrect bytecode found"
2644 fi
2645}
2646
2647# ----------------------------------------------------------------------------
2648# @internal-function java-pkg_ensure-dep
2649# Check that a package being used in jarfrom, getjars and getjar is contained
2650# within DEPEND or RDEPEND.
2651# @param $1 - empty - check both vars; "runtime" or "build" - check only
2652# RDEPEND, resp. DEPEND
2653# @param $2 - Package name and slot.
2654
2655java-pkg_ensure-dep() {
2656 debug-print-function ${FUNCNAME} $*
2657
2658 local limit_to="${1}"
2659 local target_pkg="${2}"
2660 local dev_error=""
2661
2662 local stripped_pkg=$(echo "${target_pkg}" | sed \
2663 's/-[0-9]*\(\.[0-9]\)*$//')
2664
2665 debug-print "Matching against: ${stripped_pkg}"
2666
2667 if [[ ${limit_to} != runtime && ! ( "${DEPEND}" =~ "$stripped_pkg" ) ]]; then
2668 dev_error="The ebuild is attempting to use ${target_pkg} that is not"
2669 dev_error="${dev_error} declared in DEPEND."
2670 if is-java-strict; then
2671 eerror "${dev_error}"
2672 die "${dev_error}"
2673 elif [[ ${BASH_SUBSHELL} = 0 ]]; then
2674 eerror "${dev_error}"
2675 elog "Because you have this package installed the package will"
2676 elog "build without problems, but please report this to"
2677 elog "http://bugs.gentoo.org"
1873 fi 2678 fi
1874} 2679 fi
1875 2680
2681 if [[ ${limit_to} != build ]]; then
2682 if [[ ! ( ${RDEPEND} =~ "${stripped_pkg}" ) ]]; then
2683 if [[ ! ( ${PDEPEND} =~ "${stripped_pkg}" ) ]]; then
2684 dev_error="The ebuild is attempting to use ${target_pkg},"
2685 dev_error="${dev_error} without specifying --build-only, that is not declared in RDEPEND"
2686 dev_error="${dev_error} or PDEPEND."
2687 if is-java-strict; then
2688 eerror "${dev_error}"
2689 die "${dev_error}"
2690 elif [[ ${BASH_SUBSHELL} = 0 ]]; then
2691 eerror "${dev_error}"
2692 elog "The package will build without problems, but may fail to run"
2693 elog "if you don't have ${target_pkg} installed, so please report"
2694 elog "this to http://bugs.gentoo.org"
2695 fi
2696 fi
2697 fi
2698 fi
2699}
1876 2700
1877# ------------------------------------------------------------------------------ 2701# ------------------------------------------------------------------------------
1878# @section-end internal 2702# @section-end internal
1879# ------------------------------------------------------------------------------ 2703# ------------------------------------------------------------------------------
1880 2704
1881java-pkg_check-phase() { 2705java-pkg_check-phase() {
1882 local phase=${1} 2706 local phase=${1}
1883 local funcname=${2} 2707 local funcname=${FUNCNAME[1]}
1884 if is-java-strict && [[ ${EBUILD_PHASE} != ${phase} ]]; then 2708 if [[ ${EBUILD_PHASE} != ${phase} ]]; then
1885 java-pkg_announce-qa-violation \
1886 "${funcname} used outside of src_${phase}" 2709 local msg="${funcname} used outside of src_${phase}"
2710 java-pkg_announce-qa-violation "${msg}"
1887 fi 2711 fi
1888} 2712}
1889 2713
1890java-pkg_check-versioned-jar() { 2714java-pkg_check-versioned-jar() {
1891 local jar=${1} 2715 local jar=${1}
1900 java-pkg_announce-qa-violation "deprecated USE flag 'jikes' in IUSE" 2724 java-pkg_announce-qa-violation "deprecated USE flag 'jikes' in IUSE"
1901 fi 2725 fi
1902} 2726}
1903 2727
1904java-pkg_announce-qa-violation() { 2728java-pkg_announce-qa-violation() {
1905 if is-java-strict; then 2729 local nodie
2730 if [[ ${1} == "--nodie" ]]; then
2731 nodie="true"
2732 shift
2733 fi
1906 echo "Java QA Notice: $@" >&2 2734 echo "Java QA Notice: $@" >&2
1907 increment-qa-violations 2735 increment-qa-violations
1908 fi 2736 [[ -z "${nodie}" ]] && is-java-strict && die "${@}"
1909} 2737}
1910 2738
1911increment-qa-violations() { 2739increment-qa-violations() {
1912 let "JAVA_PKG_QA_VIOLATIONS+=1" 2740 let "JAVA_PKG_QA_VIOLATIONS+=1"
1913 export JAVA_PKG_QA_VIOLATIONS 2741 export JAVA_PKG_QA_VIOLATIONS
1916is-java-strict() { 2744is-java-strict() {
1917 [[ -n ${JAVA_PKG_STRICT} ]] 2745 [[ -n ${JAVA_PKG_STRICT} ]]
1918 return $? 2746 return $?
1919} 2747}
1920 2748
2749
1921# ------------------------------------------------------------------------------ 2750# ------------------------------------------------------------------------------
1922# @eclass-end 2751# @eclass-end
1923# ------------------------------------------------------------------------------ 2752# ------------------------------------------------------------------------------

Legend:
Removed from v.1.22  
changed lines
  Added in v.1.121

  ViewVC Help
Powered by ViewVC 1.1.20