/[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.95
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.95 2007/11/13 19:36:50 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# -----------------------------------------------------------------------------
41# @variable-external WANT_ANT_TASKS
42# @variable-default ""
43#
44# An $IFS separated list of ant tasks.
45# Ebuild can specify this variable before inheriting java-ant-2 eclass to
46# determine ANT_TASKS it needs. They will be automatically translated to
47# DEPEND variable and ANT_TASKS variable. JAVA_PKG_FORCE_ANT_TASKS can override
48# ANT_TASKS set by WANT_ANT_TASKS, but not the DEPEND due to caching.
49# Ebuilds that need to depend conditionally on certain tasks and specify them
50# differently for different eant calls can't use this simplified approach.
51# You also cannot specify version or anything else than ant-*.
52#
53# @example WANT_ANT_TASKS="ant-junit ant-trax"
54#
55# @seealso JAVA_PKG_FORCE_ANT_TASKS
56# -----------------------------------------------------------------------------
57#WANT_ANT_TASKS
58
59# -----------------------------------------------------------------------------
60# @variable-internal JAVA_PKG_PORTAGE_DEP
61#
62# The version of portage we need to function properly. Previously it was
63# portage with phase hooks support but now we use a version with proper env
64# saving.
65# -----------------------------------------------------------------------------
39JAVA_PKG_PORTAGE_DEP=">=sys-apps/portage-2.1_pre1" 66JAVA_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.0.33-r1 ${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
200 292
201 java-pkg_do_write_ 293 java-pkg_do_write_
202} 294}
203 295
204 296
297# ------------------------------------------------------------------------------
298# @internal-function depend-java-query
299#
300# Wrapper for the depend-java-query binary to enable passing USE in env.
301# Using env variables keeps this eclass working with java-config versions that
302# do not handle use flags.
303# ------------------------------------------------------------------------------
304
305depend-java-query() {
306 # Used to have a which call here but it caused endless loops for some people
307 # that had some weird bashrc voodoo for which.
308 USE="${USE}" /usr/bin/depend-java-query "${@}"
309}
205 310
206# ------------------------------------------------------------------------------ 311# ------------------------------------------------------------------------------
207# @ebuild-function java-pkg_regjar 312# @ebuild-function java-pkg_regjar
208# 313#
209# Records an already installed jar in the package.env 314# Records an already installed jar in the package.env
240 [[ ${#} -lt 1 ]] && die "at least one argument needed" 345 [[ ${#} -lt 1 ]] && die "at least one argument needed"
241 346
242 java-pkg_init_paths_ 347 java-pkg_init_paths_
243 348
244 local jar jar_dir jar_file 349 local jar jar_dir jar_file
245 for jar in "$@"; do 350 for jar in "${@}"; do
246 # TODO use java-pkg_check-versioned-jar 351 # TODO use java-pkg_check-versioned-jar
247 if [[ -e "${jar}" ]]; then 352 if [[ -e "${jar}" || -e "${D}${jar}" ]]; then
353 [[ -d "${jar}" || -d "${D}${jar}" ]] \
354 && die "Called ${FUNCNAME} on a directory $*"
355
356 #check that class version correct when in strict mode
357 is-java-strict && java-pkg_verify-classes "${jar}"
358
248 # nelchael: we should strip ${D} in this case too, here's why: 359 # nelchael: we should strip ${D} in this case too, here's why:
249 # imagine such call: 360 # imagine such call:
250 # java-pkg_regjar ${D}/opt/java/*.jar 361 # java-pkg_regjar ${D}/opt/java/*.jar
251 # such call will fall into this case (-e ${jar}) and will 362 # such call will fall into this case (-e ${jar}) and will
252 # record paths with ${D} in package.env 363 # record paths with ${D} in package.env
253 java-pkg_append_ JAVA_PKG_CLASSPATH "${jar#${D}}" 364 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 365 else
366 if [[ ${jar} = *\** ]]; then
367 eerror "The argument ${jar} to ${FUNCNAME}"
368 eerror "has * in it. If you want it to glob in"
369 eerror '${D} add ${D} to the argument.'
370 fi
257 die "${jar} does not exist" 371 die "${jar} does not exist"
258 fi 372 fi
259 done 373 done
260 374
261 java-pkg_do_write_ 375 java-pkg_do_write_
262} 376}
263
264 377
265# ------------------------------------------------------------------------------ 378# ------------------------------------------------------------------------------
266# @ebuild-function java-pkg_newjar 379# @ebuild-function java-pkg_newjar
267# 380#
268# Installs a jar with a new name 381# Installs a jar with a new name
279 local original_jar="${1}" 392 local original_jar="${1}"
280 local new_jar="${2:-${PN}.jar}" 393 local new_jar="${2:-${PN}.jar}"
281 local new_jar_dest="${T}/${new_jar}" 394 local new_jar_dest="${T}/${new_jar}"
282 395
283 [[ -z ${original_jar} ]] && die "Must specify a jar to install" 396 [[ -z ${original_jar} ]] && die "Must specify a jar to install"
284 [[ ! -f ${original_jar} ]] && die "${original_jar} does not exist!" 397 [[ ! -f ${original_jar} ]] \
398 && die "${original_jar} does not exist or is not a file!"
285 399
286 rm -f "${new_jar_dest}" || die "Failed to remove ${new_jar_dest}" 400 rm -f "${new_jar_dest}" || die "Failed to remove ${new_jar_dest}"
287 cp "${original_jar}" "${new_jar_dest}" \ 401 cp "${original_jar}" "${new_jar_dest}" \
288 || die "Failed to copy ${original_jar} to ${new_jar_dest}" 402 || die "Failed to copy ${original_jar} to ${new_jar_dest}"
289 java-pkg_dojar "${new_jar_dest}" 403 java-pkg_dojar "${new_jar_dest}"
290} 404}
291 405
292
293# ------------------------------------------------------------------------------ 406# ------------------------------------------------------------------------------
294# @ebuild-function java-pkg_addcp 407# @ebuild-function java-pkg_addcp
295# 408#
296# Add something to the package's classpath. For jars, you should use dojar, 409# 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. 410# newjar, or regjar. This is typically used to add directories to the classpath.
301# ------------------------------------------------------------------------------ 414# ------------------------------------------------------------------------------
302java-pkg_addcp() { 415java-pkg_addcp() {
303 java-pkg_append_ JAVA_PKG_CLASSPATH "${@}" 416 java-pkg_append_ JAVA_PKG_CLASSPATH "${@}"
304 java-pkg_do_write_ 417 java-pkg_do_write_
305} 418}
306
307 419
308# ------------------------------------------------------------------------------ 420# ------------------------------------------------------------------------------
309# @ebuild-function java-pkg_doso 421# @ebuild-function java-pkg_doso
310# 422#
311# Installs any number of JNI libraries 423# Installs any number of JNI libraries
340 java-pkg_append_ JAVA_PKG_LIBRARY "${JAVA_PKG_LIBDEST}" 452 java-pkg_append_ JAVA_PKG_LIBRARY "${JAVA_PKG_LIBDEST}"
341 debug-print "Installing ${lib} to ${JAVA_PKG_LIBDEST}" 453 debug-print "Installing ${lib} to ${JAVA_PKG_LIBDEST}"
342 # otherwise make a symlink to the symlink's origin 454 # otherwise make a symlink to the symlink's origin
343 else 455 else
344 # TODO use dosym 456 # TODO use dosym
457 ln -s "$(readlink "${lib}")" \
345 ln -s "$(readlink "${lib}")" "${D}${JAVA_PKG_LIBDEST}/$(basename "${lib}")" 458 "${D}${JAVA_PKG_LIBDEST}/$(basename "${lib}")"
346 debug-print "${lib} is a symlink, linking accordanly" 459 debug-print "${lib} is a symlink, linking accordanly"
347 fi 460 fi
348 # otherwise die 461 # otherwise die
349 else 462 else
350 die "${lib} does not exist" 463 die "${lib} does not exist"
428# ------------------------------------------------------------------------------ 541# ------------------------------------------------------------------------------
429java-pkg_dohtml() { 542java-pkg_dohtml() {
430 debug-print-function ${FUNCNAME} $* 543 debug-print-function ${FUNCNAME} $*
431 544
432 [[ ${#} -lt 1 ]] && die "At least one argument required for ${FUNCNAME}" 545 [[ ${#} -lt 1 ]] && die "At least one argument required for ${FUNCNAME}"
433 # TODO-nichoj find out what exactly -f package-list does 546
547 # from /usr/lib/portage/bin/dohtml -h
548 # -f Set list of allowed extensionless file names.
434 dohtml -f package-list "$@" 549 dohtml -f package-list "$@"
550
435 # this probably shouldn't be here but it provides 551 # this probably shouldn't be here but it provides
436 # a reasonable way to catch # docs for all of the 552 # a reasonable way to catch # docs for all of the
437 # old ebuilds. 553 # old ebuilds.
438 java-pkg_recordjavadoc 554 java-pkg_recordjavadoc
439} 555}
440 556
441# TODO document 557# ------------------------------------------------------------------------------
558# @ebuild-function java-pkg_dojavadoc
559#
560# Installs javadoc documentation. This should be controlled by the doc use flag.
561#
562# @param $1: - The javadoc root directory.
563#
564# @example:
565# java-pkg_dojavadoc docs/api
566#
567# ------------------------------------------------------------------------------
442java-pkg_dojavadoc() { 568java-pkg_dojavadoc() {
569 debug-print-function ${FUNCNAME} $*
443 local dir="$1" 570 local dir="$1"
571
572 # QA checks
444 573
445 java-pkg_check-phase install 574 java-pkg_check-phase install
446 575
447 [[ -z "${dir}" ]] && die "Must specify a directory!" 576 [[ -z "${dir}" ]] && die "Must specify a directory!"
448 [[ ! -d "${dir}" ]] && die "${dir} does not exist, or isn't a directory!" 577 [[ ! -d "${dir}" ]] && die "${dir} does not exist, or isn't a directory!"
578 if [[ ! -e "${dir}/index.html" ]]; then
579 local msg="No index.html in javadoc directory"
580 ewarn "${msg}"
581 is-java-strict && die "${msg}"
582 fi
583
584 # Renaming to match our directory layout
449 585
450 local dir_to_install="${dir}" 586 local dir_to_install="${dir}"
451 if [[ "$(basename "${dir}")" != "api" ]]; then 587 if [[ "$(basename "${dir}")" != "api" ]]; then
452 dir_to_install="${T}/api" 588 dir_to_install="${T}/api"
453 # TODO use doins 589 # TODO use doins
454 cp -r "${dir}" "${dir_to_install}" || die "cp failed" 590 cp -r "${dir}" "${dir_to_install}" || die "cp failed"
455 fi 591 fi
592
593 # Actual installation
456 594
457 java-pkg_dohtml -r ${dir_to_install} 595 java-pkg_dohtml -r ${dir_to_install}
458} 596}
459 597
460# ------------------------------------------------------------------------------ 598# ------------------------------------------------------------------------------
478# FIXME apparently this fails if you give it an empty directories 616# FIXME apparently this fails if you give it an empty directories
479java-pkg_dosrc() { 617java-pkg_dosrc() {
480 debug-print-function ${FUNCNAME} $* 618 debug-print-function ${FUNCNAME} $*
481 619
482 [ ${#} -lt 1 ] && die "At least one argument needed" 620 [ ${#} -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 621
487 java-pkg_check-phase install 622 java-pkg_check-phase install
488 623
489 [[ ${#} -lt 1 ]] && die "At least one argument needed" 624 [[ ${#} -lt 1 ]] && die "At least one argument needed"
625
626 if ! [[ ${DEPEND} = *app-arch/zip* ]]; then
627 local msg="${FUNCNAME} called without app-arch/zip in DEPEND"
628 if is-java-strict; then
629 eerror "${msg}"
630 die "${msg}"
631 else
632 echo "${msg}"
633 echo "Please report this to http://bugs.gentoo.org."
634 fi
635 fi
490 636
491 java-pkg_init_paths_ 637 java-pkg_init_paths_
492 638
493 local zip_name="${PN}-src.zip" 639 local zip_name="${PN}-src.zip"
494 local zip_path="${T}/${zip_name}" 640 local zip_path="${T}/${zip_name}"
495 local dir 641 local dir
496 for dir in ${@}; do 642 for dir in "${@}"; do
497 local dir_parent=$(dirname "${dir}") 643 local dir_parent=$(dirname "${dir}")
498 local dir_name=$(basename "${dir}") 644 local dir_name=$(basename "${dir}")
499 pushd ${dir_parent} > /dev/null || die "problem entering ${dir_parent}" 645 pushd ${dir_parent} > /dev/null || die "problem entering ${dir_parent}"
500 zip -q -r ${zip_path} ${dir_name} -i '*.java' 646 zip -q -r ${zip_path} ${dir_name} -i '*.java'
501 local result=$? 647 local result=$?
518# @ebuild-function java-pkg_dolauncher 664# @ebuild-function java-pkg_dolauncher
519# 665#
520# Make a wrapper script to lauch/start this package 666# Make a wrapper script to lauch/start this package
521# If necessary, the wrapper will switch to the appropriate VM. 667# If necessary, the wrapper will switch to the appropriate VM.
522# 668#
669# Can be called without parameters if the package installs only one jar
670# that has the Main-class attribute set. The wrapper will be named ${PN}.
671#
523# @param $1 - filename of launcher to create 672# @param $1 - filename of launcher to create
524# @param $2 - options, as follows: 673# @param $2 - options, as follows:
525# --main the.main.class.too.start 674# --main the.main.class.too.start
526# --jar /the/jar/too/launch.jar 675# --jar /the/jar/too/launch.jar or just <name>.jar
527# --java_args 'Extra arguments to pass to java' 676# --java_args 'Extra arguments to pass to java'
528# --pkg_args 'Extra arguments too pass to the package' 677# --pkg_args 'Extra arguments to pass to the package'
529# --pwd 678# --pwd Directory the launcher changes to before executing java
530# -into 679# -into Directory to install the launcher to, instead of /usr/bin
531# -pre 680# -pre Prepend contents of this file to the launcher
532# ------------------------------------------------------------------------------ 681# ------------------------------------------------------------------------------
533java-pkg_dolauncher() { 682java-pkg_dolauncher() {
534 debug-print-function ${FUNCNAME} $* 683 debug-print-function ${FUNCNAME} $*
535 684
536 java-pkg_check-phase install 685 java-pkg_check-phase install
537
538 [[ ${#} -lt 1 ]] && die "Need at least one argument"
539
540 java-pkg_init_paths_ 686 java-pkg_init_paths_
541 687
688 if [[ ${#} = 0 ]]; then
689 local name="${PN}"
690 else
542 local name="${1}" 691 local name="${1}"
692 shift
693 fi
694
543 # TODO rename to launcher 695 # TODO rename to launcher
544 local target="${T}/${name}" 696 local target="${T}/${name}"
545 local var_tmp="${T}/launcher_variables_tmp" 697 local var_tmp="${T}/launcher_variables_tmp"
546 local target_dir pre 698 local target_dir pre
547 shift
548 699
549 # Process the other the rest of the arguments 700 # Process the other the rest of the arguments
550 while [[ -n "${1}" && -n "${2}" ]]; do 701 while [[ -n "${1}" && -n "${2}" ]]; do
551 local var=${1} value=${2} 702 local var="${1}" value="${2}"
552 if [[ "${var:0:2}" == "--" ]]; then 703 if [[ "${var:0:2}" == "--" ]]; then
704 local var=${var:2}
553 echo "gjl_${var:2}=\"${value}\"" >> "${var_tmp}" 705 echo "gjl_${var}=\"${value}\"" >> "${var_tmp}"
706 local gjl_${var}="${value}"
554 elif [[ "${var}" == "-into" ]]; then 707 elif [[ "${var}" == "-into" ]]; then
555 target_dir="${value}" 708 target_dir="${value}"
556 elif [[ "${var}" == "-pre" ]]; then 709 elif [[ "${var}" == "-pre" ]]; then
557 pre="${value}" 710 pre="${value}"
558 fi 711 fi
559 shift 2 712 shift 2
560 done 713 done
561 714
715 # Test if no --jar and --main arguments were given and
716 # in that case check if the package only installs one jar
717 # and use that jar.
718 if [[ -z "${gjl_jar}" && -z "${gjl_main}" ]]; then
719 local cp="${JAVA_PKG_CLASSPATH}"
720 if [[ "${cp/:}" = "${cp}" && "${cp%.jar}" != "${cp}" ]]; then
721 echo "gjl_jar=\"${JAVA_PKG_CLASSPATH}\"" >> "${var_tmp}"
722 else
723 local msg="Not enough information to create a launcher given."
724 msg="${msg} Please give --jar or --main argument to ${FUNCNAME}."
725 die "${msg}"
726 fi
727 fi
728
562 # Write the actual script 729 # Write the actual script
563 echo "#!/bin/bash" > "${target}" 730 echo "#!/bin/bash" > "${target}"
564 [[ -n "${pre}" ]] && [[ -f "${pre}" ]] && cat "${pre}" >> "${target}" 731 if [[ -n "${pre}" ]]; then
732 if [[ -f "${pre}" ]]; then
733 cat "${pre}" >> "${target}"
734 else
735 die "-pre specified file '${pre}' does not exist"
736 fi
737 fi
565 echo "gjl_package=${JAVA_PKG_NAME}" >> "${target}" 738 echo "gjl_package=${JAVA_PKG_NAME}" >> "${target}"
566 cat "${var_tmp}" >> "${target}" 739 cat "${var_tmp}" >> "${target}"
567 rm -f "${var_tmp}" 740 rm -f "${var_tmp}"
568 echo "source /usr/share/java-config-2/launcher/launcher.bash" >> "${target}" 741 echo "source /usr/share/java-config-2/launcher/launcher.bash" >> "${target}"
569 742
661# Example: get a specific jar from xerces slot 2, and name it diffrently 834# Example: get a specific jar from xerces slot 2, and name it diffrently
662# java-pkg_jar-from xerces-2 xml-apis.jar xml.jar 835# java-pkg_jar-from xerces-2 xml-apis.jar xml.jar
663# Example: get junit.jar which is needed only for building 836# Example: get junit.jar which is needed only for building
664# java-pkg_jar-from --build-only junit junit.jar 837# java-pkg_jar-from --build-only junit junit.jar
665# 838#
666# @param $1 - (optional) "--build-only" makes the jar(s) not added into 839# @param $opt
667# package.env DEPEND line. 840# --build-only - makes the jar(s) not added into package.env DEPEND line.
668# @param $1 - Package to get jars from. 841# (assumed automatically when called inside src_test)
842# --with-dependencies - get jars also from requested package's dependencies
843# transitively.
844# --virtual - Packages passed to this function are to be handled as virtuals
845# and will not have individual jar dependencies recorded.
846# --into $dir - symlink jar(s) into $dir (must exist) instead of .
847# @param $1 - Package to get jars from, or comma-separated list of packages in
848# case other parameters are not used.
669# @param $2 - jar from package. If not specified, all jars will be used. 849# @param $2 - jar from package. If not specified, all jars will be used.
670# @param $3 - When a single jar is specified, destination filename of the 850# @param $3 - When a single jar is specified, destination filename of the
671# symlink. Defaults to the name of the jar. 851# symlink. Defaults to the name of the jar.
672# ------------------------------------------------------------------------------ 852# ------------------------------------------------------------------------------
673# TODO could probably be cleaned up a little 853# TODO could probably be cleaned up a little
674java-pkg_jar-from() { 854java-pkg_jar-from() {
675 debug-print-function ${FUNCNAME} $* 855 debug-print-function ${FUNCNAME} $*
676 856
677 local build_only="" 857 local build_only=""
858 local destdir="."
859 local deep=""
860 local virtual=""
678 861
862 [[ "${EBUILD_PHASE}" == "test" ]] && build_only="build"
863
864 while [[ "${1}" == --* ]]; do
679 if [[ "${1}" = "--build-only" ]]; then 865 if [[ "${1}" = "--build-only" ]]; then
680 build_only="true" 866 build_only="build"
867 elif [[ "${1}" = "--with-dependencies" ]]; then
868 deep="--with-dependencies"
869 elif [[ "${1}" = "--virtual" ]]; then
870 virtual="true"
871 elif [[ "${1}" = "--into" ]]; then
872 destdir="${2}"
873 shift
874 else
875 die "java-pkg_jar-from called with unknown parameter: ${1}"
876 fi
681 shift 877 shift
682 fi 878 done
683 879
684 local target_pkg="${1}" target_jar="${2}" destjar="${3}" 880 local target_pkg="${1}" target_jar="${2}" destjar="${3}"
685 881
686 [[ -z ${target_pkg} ]] && die "Must specify a package" 882 [[ -z ${target_pkg} ]] && die "Must specify a package"
687 883
688 # default destjar to the target jar 884 # default destjar to the target jar
689 [[ -z "${destjar}" ]] && destjar="${target_jar}" 885 [[ -z "${destjar}" ]] && destjar="${target_jar}"
690 886
691 local error_msg="There was a problem getting the classpath for ${target_pkg}." 887 local error_msg="There was a problem getting the classpath for ${target_pkg}."
692 local classpath 888 local classpath
693 classpath="$(java-config --classpath=${target_pkg})" 889 classpath="$(java-config ${deep} --classpath=${target_pkg})"
694 [[ $? != 0 ]] && die ${error_msg} 890 [[ $? != 0 ]] && die ${error_msg}
891
892 # When we have commas this functions is called to bring jars from multiple
893 # packages. This affects recording of dependencencies performed later
894 # which expects one package only, so we do it here.
895 if [[ ${target_pkg} = *,* ]]; then
896 for pkg in ${target_pkg//,/ }; do
897 java-pkg_ensure-dep "${build_only}" "${pkg}"
898 [[ -z "${build_only}" ]] && java-pkg_record-jar_ "${pkg}"
899 done
900 # setting this disables further record-jar_ calls later
901 build_only="build"
902 else
903 java-pkg_ensure-dep "${build_only}" "${target_pkg}"
904 fi
905
906 # Record the entire virtual as a dependency so that
907 # no jars are missed.
908 if [[ -z "${build_only}" && -n "${virtual}" ]]; then
909 java-pkg_record-jar_ "${target_pkg}"
910 # setting this disables further record-jars_ calls later
911 build_only="build"
912 fi
913
914 pushd ${destdir} > /dev/null \
915 || die "failed to change directory to ${destdir}"
695 916
696 local jar 917 local jar
697 for jar in ${classpath//:/ }; do 918 for jar in ${classpath//:/ }; do
698 local jar_name=$(basename "${jar}") 919 local jar_name=$(basename "${jar}")
699 if [[ ! -f "${jar}" ]] ; then 920 if [[ ! -f "${jar}" ]] ; then
710 elif [[ "${jar_name}" == "${target_jar}" ]] ; then 931 elif [[ "${jar_name}" == "${target_jar}" ]] ; then
711 [[ -f "${destjar}" ]] && rm "${destjar}" 932 [[ -f "${destjar}" ]] && rm "${destjar}"
712 ln -snf "${jar}" "${destjar}" \ 933 ln -snf "${jar}" "${destjar}" \
713 || die "Failed to make symlink from ${jar} to ${destjar}" 934 || die "Failed to make symlink from ${jar} to ${destjar}"
714 [[ -z "${build_only}" ]] && java-pkg_record-jar_ "${target_pkg}" "${jar}" 935 [[ -z "${build_only}" ]] && java-pkg_record-jar_ "${target_pkg}" "${jar}"
936 popd > /dev/null
715 return 0 937 return 0
716 fi 938 fi
717 done 939 done
940 popd > /dev/null
718 # if no target was specified, we're ok 941 # if no target was specified, we're ok
719 if [[ -z "${target_jar}" ]] ; then 942 if [[ -z "${target_jar}" ]] ; then
720 return 0 943 return 0
721 # otherwise, die bitterly 944 # otherwise, die bitterly
722 else 945 else
741# The providing packages are recorded as dependencies into package.env DEPEND 964# 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 965# 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 966# that have to be present only at build time and are not needed on runtime
744# (junit testing etc). 967# (junit testing etc).
745# 968#
746# Example: Get the classpath for xerces-2, 969# Example: Get the classpath for xerces-2 and xalan,
747# java-pkg_getjars xerces-2 xalan 970# java-pkg_getjars xerces-2,xalan
748# Example Return: 971# Example Return:
749# /usr/share/xerces-2/lib/xml-apis.jar:/usr/share/xerces-2/lib/xmlParserAPIs.jar:/usr/share/xalan/lib/xalan.jar 972# /usr/share/xerces-2/lib/xml-apis.jar:/usr/share/xerces-2/lib/xmlParserAPIs.jar:/usr/share/xalan/lib/xalan.jar
750# 973#
751# @param $1 - (optional) "--build-only" makes the jar(s) not added into 974# @param $opt
752# package.env DEPEND line. 975# --build-only - makes the jar(s) not added into package.env DEPEND line.
976# (assumed automatically when called inside src_test)
977# --with-dependencies - get jars also from requested package's dependencies
978# transitively.
753# @param $@ - list of packages to get jars from 979# @param $1 - list of packages to get jars from
980# (passed to java-config --classpath)
754# ------------------------------------------------------------------------------ 981# ------------------------------------------------------------------------------
755java-pkg_getjars() { 982java-pkg_getjars() {
756 debug-print-function ${FUNCNAME} $* 983 debug-print-function ${FUNCNAME} $*
757 984
758 local build_only="" 985 local build_only=""
986 local deep=""
759 987
988 [[ "${EBUILD_PHASE}" == "test" ]] && build_only="build"
989
990 while [[ "${1}" == --* ]]; do
760 if [[ "${1}" = "--build-only" ]]; then 991 if [[ "${1}" = "--build-only" ]]; then
761 build_only="true" 992 build_only="build"
993 elif [[ "${1}" = "--with-dependencies" ]]; then
994 deep="--with-dependencies"
995 else
996 die "java-pkg_jar-from called with unknown parameter: ${1}"
997 fi
762 shift 998 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 999 done
1000
1001 [[ ${#} -ne 1 ]] && die "${FUNCNAME} takes only one argument besides --*"
1002
1003
1004 local classpath pkgs="${1}"
1005 jars="$(java-config ${deep} --classpath=${pkgs})"
1006 [[ $? != 0 || -z "${jars}" ]] && die "java-config --classpath=${pkgs} failed"
1007 debug-print "${pkgs}:${jars}"
1008
1009 for pkg in ${pkgs//,/ }; do
1010 java-pkg_ensure-dep "${build_only}" "${pkg}"
1011 done
1012
1013 if [[ -z "${classpath}" ]]; then
1014 classpath="${jars}"
1015 else
1016 classpath="${classpath}:${jars}"
1017 fi
1018
1019 # Only record jars that aren't build-only
1020 if [[ -z "${build_only}" ]]; then
1021 for pkg in ${pkgs//,/ }; do
1022 java-pkg_record-jar_ "${pkg}"
1023 done
1024 fi
1025
783 echo "${classpath}" 1026 echo "${classpath}"
784} 1027}
785 1028
786# ------------------------------------------------------------------------------ 1029# ------------------------------------------------------------------------------
787# @ebuild-function java-pkg_getjar 1030# @ebuild-function java-pkg_getjar
795# @example 1038# @example
796# java-pkg_getjar xerces-2 xml-apis.jar 1039# java-pkg_getjar xerces-2 xml-apis.jar
797# @example-return 1040# @example-return
798# /usr/share/xerces-2/lib/xml-apis.jar 1041# /usr/share/xerces-2/lib/xml-apis.jar
799# 1042#
800# @param $1 - (optional) "--build-only" makes the jar not added into 1043# @param $opt
801# package.env DEPEND line. 1044# --build-only - makes the jar not added into package.env DEPEND line.
1045# --virtual - Packages passed to this function are to be handled as virtuals
1046# and will not have individual jar dependencies recorded.
802# @param $1 - package to use 1047# @param $1 - package to use
803# @param $2 - jar to get 1048# @param $2 - jar to get
804# ------------------------------------------------------------------------------ 1049# ------------------------------------------------------------------------------
805java-pkg_getjar() { 1050java-pkg_getjar() {
806 debug-print-function ${FUNCNAME} $* 1051 debug-print-function ${FUNCNAME} $*
807 1052
808 local build_only="" 1053 local build_only=""
1054 local virtual=""
809 1055
1056 [[ "${EBUILD_PHASE}" == "test" ]] && build_only="build"
1057
1058 while [[ "${1}" == --* ]]; do
810 if [[ "${1}" = "--build-only" ]]; then 1059 if [[ "${1}" = "--build-only" ]]; then
811 build_only="true" 1060 build_only="build"
1061 elif [[ "${1}" == --* ]]; then
1062 virtual="true"
1063 else
1064 die "java-pkg_jar-from called with unknown parameter: ${1}"
1065 fi
812 shift 1066 shift
813 fi 1067 done
1068
1069 [[ ${#} -ne 2 ]] && die "${FUNCNAME} takes only two arguments besides --*"
814 1070
815 local pkg="${1}" target_jar="${2}" jar 1071 local pkg="${1}" target_jar="${2}" jar
816 [[ -z ${pkg} ]] && die "Must specify package to get a jar from" 1072 [[ -z ${pkg} ]] && die "Must specify package to get a jar from"
817 [[ -z ${target_jar} ]] && die "Must specify jar to get" 1073 [[ -z ${target_jar} ]] && die "Must specify jar to get"
818 1074
819 local error_msg="Could not find classpath for ${pkg}. Are you sure its installed?" 1075 local error_msg="Could not find classpath for ${pkg}. Are you sure its installed?"
820 local classpath 1076 local classpath
821 classpath=$(java-config --classpath=${pkg}) 1077 classpath=$(java-config --classpath=${pkg})
822 [[ $? != 0 ]] && die ${error_msg} 1078 [[ $? != 0 ]] && die ${error_msg}
1079
1080 java-pkg_ensure-dep "${build_only}" "${pkg}"
1081
1082 # Record the package(Virtual) as a dependency and then set build_only
1083 # So that individual jars are not recorded.
1084 if [[ -n "${virtual}" ]]; then
1085 java-pkg_record-jar_ "${pkg}"
1086 build_only="true"
1087 fi
823 1088
824 for jar in ${classpath//:/ }; do 1089 for jar in ${classpath//:/ }; do
825 if [[ ! -f "${jar}" ]] ; then 1090 if [[ ! -f "${jar}" ]] ; then
826 die "Installation problem with jar ${jar} in ${pkg} - is it installed?" 1091 die "Installation problem with jar ${jar} in ${pkg} - is it installed?"
827 fi 1092 fi
834 fi 1099 fi
835 done 1100 done
836 1101
837 die "Could not find ${target_jar} in ${pkg}" 1102 die "Could not find ${target_jar} in ${pkg}"
838 return 1 1103 return 1
1104}
1105
1106# ------------------------------------------------------------------------------
1107# @ebuild-function java-pkg_register-dependency
1108#
1109# Registers runtime dependency on a package, list of packages, or a single jar
1110# from a package, into package.env DEPEND line. Can only be called in
1111# src_install phase.
1112# Intended for binary packages where you don't need to symlink the jars or get
1113# their classpath during build. As such, the dependencies only need to be
1114# specified in ebuild's RDEPEND, and should be omitted in DEPEND.
1115#
1116# @param $1 - comma-separated list of packages, or a single package
1117# @param $2 - if param $1 is a single package, optionally specify the jar
1118# to depend on
1119#
1120# Example: Record the dependency on whole xerces-2 and xalan,
1121# java-pkg_register-dependency xerces-2,xalan
1122# Example: Record the dependency on ant.jar from ant-core
1123# java-pkg_register-dependency ant-core ant.jar
1124#
1125# Note: Passing both list of packages as the first parameter AND specifying the
1126# jar as the second is not allowed and will cause the function to die. We assume
1127# that there's more chance one passes such combination as a mistake, than that
1128# there are more packages providing identically named jar without class
1129# collisions.
1130# ------------------------------------------------------------------------------
1131java-pkg_register-dependency() {
1132 debug-print-function ${FUNCNAME} $*
1133
1134 java-pkg_check-phase install
1135
1136 [[ ${#} -gt 2 ]] && die "${FUNCNAME} takes at most two arguments"
1137
1138 local pkgs="${1}"
1139 local jar="${2}"
1140
1141 [[ -z "${pkgs}" ]] && die "${FUNCNAME} called with no package(s) specified"
1142
1143 if [[ -z "${jar}" ]]; then
1144 for pkg in ${pkgs//,/ }; do
1145 java-pkg_ensure-dep runtime "${pkg}"
1146 java-pkg_record-jar_ "${pkg}"
1147 done
1148 else
1149 [[ ${pkgs} == *,* ]] && \
1150 die "${FUNCNAME} called with both package list and jar name"
1151 java-pkg_ensure-dep runtime "${pkgs}"
1152 java-pkg_record-jar_ "${pkgs}" "${jar}"
1153 fi
1154
1155 java-pkg_do_write_
1156}
1157
1158# ------------------------------------------------------------------------------
1159# @ebuild-function java-pkg_register-optional-dependency
1160#
1161# Registers optional runtime dependency on a package, list of packages, or a
1162# single jar from a package, into package.env OPTIONAL_DEPEND line. Can only be
1163# called in src_install phase.
1164# Intended for packages that can use other packages when those are in classpath.
1165# Will be put on classpath by launcher if they are installed. Typical case is
1166# JDBC implementations for various databases. It's better than having USE flag
1167# for each implementation triggering hard dependency.
1168#
1169# @param $1 - comma-separated list of packages, or a single package
1170# @param $2 - if param $1 is a single package, optionally specify the jar
1171# to depend on
1172#
1173# Example: Record the optional dependency on some jdbc providers
1174# java-pkg_register-optional-dependency jdbc-jaybird,jtds-1.2,jdbc-mysql
1175#
1176# Note: Passing both list of packages as the first parameter AND specifying the
1177# jar as the second is not allowed and will cause the function to die. We assume
1178# that there's more chance one passes such combination as a mistake, than that
1179# there are more packages providing identically named jar without class
1180# collisions.
1181# ------------------------------------------------------------------------------
1182java-pkg_register-optional-dependency() {
1183 debug-print-function ${FUNCNAME} $*
1184
1185 java-pkg_check-phase install
1186
1187 [[ ${#} -gt 2 ]] && die "${FUNCNAME} takes at most two arguments"
1188
1189 local pkgs="${1}"
1190 local jar="${2}"
1191
1192 [[ -z "${pkgs}" ]] && die "${FUNCNAME} called with no package(s) specified"
1193
1194 if [[ -z "${jar}" ]]; then
1195 for pkg in ${pkgs//,/ }; do
1196 java-pkg_record-jar_ --optional "${pkg}"
1197 done
1198 else
1199 [[ ${pkgs} == *,* ]] && \
1200 die "${FUNCNAME} called with both package list and jar name"
1201 java-pkg_record-jar_ --optional "${pkgs}" "${jar}"
1202 fi
1203
1204 java-pkg_do_write_
1205}
1206
1207# ------------------------------------------------------------------------------
1208# @ebuild-function java-pkg_register-environment-variable
1209#
1210# Register an arbitrary environment variable into package.env. The gjl launcher
1211# for this package or any package depending on this will export it into
1212# environement before executing java command.
1213# Must only be called in src_install phase.
1214#
1215# @param $1 - variable name
1216# @param $2 - variable value
1217# ------------------------------------------------------------------------------
1218JAVA_PKG_EXTRA_ENV="${T}/java-pkg-extra-env"
1219JAVA_PKG_EXTRA_ENV_VARS=""
1220java-pkg_register-environment-variable() {
1221 debug-print-function ${FUNCNAME} $*
1222
1223 java-pkg_check-phase install
1224
1225 [[ ${#} != 2 ]] && die "${FUNCNAME} takes two arguments"
1226
1227 echo "${1}=\"${2}\"" >> ${JAVA_PKG_EXTRA_ENV}
1228 JAVA_PKG_EXTRA_ENV_VARS="${JAVA_PKG_EXTRA_ENV_VARS} ${1}"
1229
1230 java-pkg_do_write_
839} 1231}
840 1232
841# This function reads stdin, and based on that input, figures out how to 1233# This function reads stdin, and based on that input, figures out how to
842# populate jars from the filesystem. 1234# populate jars from the filesystem.
843# Need to figure out a good way of making use of this, ie be able to use a 1235# Need to figure out a good way of making use of this, ie be able to use a
960# 1352#
961# export DEPEND="${DEPEND} ${depstr}" 1353# export DEPEND="${DEPEND} ${depstr}"
962# export RDEPEND="${RDEPEND} ${depstr}" 1354# export RDEPEND="${RDEPEND} ${depstr}"
963#} 1355#}
964 1356
1357# ------------------------------------------------------------------------------
1358# @ebuild-function java-pkg_find-normal-jars
1359#
1360# Find the files with suffix .jar file in the given directory or $WORKDIR
1361#
1362# @param $1 - The directory to search for jar files (default: ${WORKDIR})
1363# ------------------------------------------------------------------------------
1364java-pkg_find-normal-jars() {
1365 local dir=$1
1366 [[ "${dir}" ]] || dir="${WORKDIR}"
1367 local found
1368 for jar in $(find "${dir}" -name "*.jar" -type f); do
1369 echo "${jar}"
1370 found="true"
1371 done
1372 [[ "${found}" ]]
1373 return $?
1374}
1375
1376# ------------------------------------------------------------------------------
1377# @ebuild-function java-pkg_ensure-no-bundled-jars
1378#
1379# Try to locate bundled jar files in ${WORKDIR} and die if found.
965# This should be used after S has been populated with symlinks to jars 1380# This function should be called after WORKDIR has been populated with symlink
966# TODO document 1381# to system jar files or bundled jars removed.
1382# ------------------------------------------------------------------------------
967java-pkg_ensure-no-bundled-jars() { 1383java-pkg_ensure-no-bundled-jars() {
968 debug-print-function ${FUNCNAME} $* 1384 debug-print-function ${FUNCNAME} $*
969 pushd ${WORKDIR} >/dev/null 2>/dev/null
970 1385
971 local bundled_jars=$(find . -name "*.jar" -type f) 1386 local bundled_jars=$(java-pkg_find-normal-jars)
972 if [[ -n ${bundled_jars} ]]; then 1387 if [[ -n ${bundled_jars} ]]; then
973 echo "Bundled jars found:" 1388 echo "Bundled jars found:"
974 local jar 1389 local jar
975 for jar in ${bundled_jars}; do 1390 for jar in ${bundled_jars}; do
976 echo $(pwd)${jar/./} 1391 echo $(pwd)${jar/./}
977 done 1392 done
978 die "Bundled jars found!" 1393 die "Bundled jars found!"
979
980 fi 1394 fi
981 popd >/dev/null 2>/dev/null
982} 1395}
983 1396
984# ------------------------------------------------------------------------------ 1397# ------------------------------------------------------------------------------
985# @internal-function java-pkg_ensure-vm-version-sufficient 1398# @internal-function java-pkg_ensure-vm-version-sufficient
986# 1399#
1135# @ebuild-function java-pkg_get-target 1548# @ebuild-function java-pkg_get-target
1136# 1549#
1137# Determines what target version should be used, for passing to -target. 1550# 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 1551# If you don't care about lower versions, you can set _WANT_TARGET to the
1139# version of your JDK. 1552# 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# 1553#
1144# @return string - Either the lowest possible target, or JAVA_PKG_WANT_TARGET 1554# @return string - Either the lowest possible target, or JAVA_PKG_WANT_TARGET
1145# ------------------------------------------------------------------------------ 1555# ------------------------------------------------------------------------------
1146java-pkg_get-target() { 1556java-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}")} 1557 echo ${JAVA_PKG_WANT_TARGET:-$(depend-java-query --get-lowest "${DEPEND} ${RDEPEND}")}
1160} 1558}
1161 1559
1162java-pkg_get-javac() { 1560java-pkg_get-javac() {
1163 debug-print-function ${FUNCNAME} $* 1561 debug-print-function ${FUNCNAME} $*
1164 1562
1165 java-pkg_init-compiler_ 1563
1166 local compiler="${GENTOO_COMPILER}" 1564 local compiler="${GENTOO_COMPILER}"
1167 1565
1168 local compiler_executable 1566 local compiler_executable
1169 if [[ "${compiler}" = "javac" ]]; then 1567 if [[ "${compiler}" = "javac" ]]; then
1170 # nothing fancy needs to be done for javac 1568 # nothing fancy needs to be done for javac
1178 unset JAVAC 1576 unset JAVAC
1179 # try to get value of JAVAC 1577 # try to get value of JAVAC
1180 compiler_executable="$(source ${compiler_env} 1>/dev/null 2>&1; echo ${JAVAC})" 1578 compiler_executable="$(source ${compiler_env} 1>/dev/null 2>&1; echo ${JAVAC})"
1181 export JAVAC=${old_javac} 1579 export JAVAC=${old_javac}
1182 1580
1183 [[ -z ${compiler_executable} ]] && die "JAVAC is empty or undefined in ${compiler_env}" 1581 if [[ -z ${compiler_executable} ]]; then
1582 echo "JAVAC is empty or undefined in ${compiler_env}"
1583 return 1
1584 fi
1184 1585
1185 # check that it's executable 1586 # check that it's executable
1186 if [[ ! -x ${compiler_executable} ]]; then 1587 if [[ ! -x ${compiler_executable} ]]; then
1187 eerror "Could not find ${compiler_executable}!"
1188 die "${compiler_executable} doesn't exist, or isn't executable" 1588 echo "${compiler_executable} doesn't exist, or isn't executable"
1589 return 1
1189 fi 1590 fi
1190 else 1591 else
1191 eerror "Could not find environment file for ${compiler}" 1592 echo "Could not find environment file for ${compiler}"
1192 die "Could not find ${compiler_env}" 1593 return 1
1193 fi 1594 fi
1194 fi 1595 fi
1195 echo ${compiler_executable} 1596 echo ${compiler_executable}
1196} 1597}
1197 1598
1214 1615
1215 debug-print "want source: ${want_source}" 1616 debug-print "want source: ${want_source}"
1216 debug-print "want target: ${want_target}" 1617 debug-print "want target: ${want_target}"
1217 1618
1218 if [[ -z "${want_source}" || -z "${want_target}" ]]; then 1619 if [[ -z "${want_source}" || -z "${want_target}" ]]; then
1219 debug-print "could not find valid -source/-target values" 1620 debug-print "could not find valid -source/-target values for javac"
1220 die "Could not find valid -source/-target values" 1621 echo "Could not find valid -source/-target values for javac"
1622 return 1
1221 else 1623 else
1222 if java-pkg_is-vm-version-ge "1.4"; then 1624 if java-pkg_is-vm-version-ge "1.4"; then
1223 echo "${source_str} ${target_str}" 1625 echo "${source_str} ${target_str}"
1224 else 1626 else
1225 echo "${target_str}" 1627 echo "${target_str}"
1229 1631
1230# TODO document 1632# TODO document
1231java-pkg_get-jni-cflags() { 1633java-pkg_get-jni-cflags() {
1232 local flags="-I${JAVA_HOME}/include" 1634 local flags="-I${JAVA_HOME}/include"
1233 1635
1636 local platform="linux"
1637 use elibc_FreeBSD && platform="freebsd"
1638
1234 # TODO do a check that the directories are valid 1639 # 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" 1640 flags="${flags} -I${JAVA_HOME}/include/${platform}"
1237 1641
1238 echo ${flags} 1642 echo ${flags}
1239} 1643}
1240 1644
1241java-pkg_ensure-gcj() { 1645java-pkg_ensure-gcj() {
1247 die "No GCJ support found!" 1651 die "No GCJ support found!"
1248 fi 1652 fi
1249} 1653}
1250 1654
1251java-pkg_ensure-test() { 1655java-pkg_ensure-test() {
1252 if hasq test ${FEATURES} && ! hasq -test ${FEATURES} && ! use test; then 1656 if hasq test ${FEATURES} && ! hasq -test ${FEATURES} \
1657 && hasq test ${IUSE} && ! use test;
1658 then
1253 eerror "You specified FEATURES=test, but USE=test is needed" 1659 eerror "You specified FEATURES=test, but USE=test is needed"
1254 eerror "to pull in the additional dependencies for testing" 1660 eerror "to pull in the additional dependencies for testing"
1255 die "Need USE=test enabled" 1661 die "Need USE=test enabled"
1256 fi 1662 fi
1257} 1663}
1258 1664
1259# ------------------------------------------------------------------------------ 1665# ------------------------------------------------------------------------------
1666# @ebuild-function java-pkg_register-ant-task
1667#
1668# Register this package as ant task, so that ant will load it when no specific
1669# ANT_TASKS are specified. Note that even without this registering, all packages
1670# specified in ANT_TASKS will be loaded. Mostly used by the actual ant tasks
1671# packages, but can be also used by other ebuilds that used to symlink their
1672# .jar into /usr/share/ant-core/lib to get autoloaded, for backwards
1673# compatibility.
1674#
1675# @param --version x.y Register only for ant version x.y (otherwise for any ant
1676# version). Used by the ant-* packages to prevent loading of mismatched
1677# ant-core ant tasks after core was updated, before the tasks are updated,
1678# without a need for blockers.
1679# @param $1 Name to register as. Defaults to JAVA_PKG_NAME ($PN[-$SLOT])
1680# ------------------------------------------------------------------------------
1681java-pkg_register-ant-task() {
1682 local TASKS_DIR="tasks"
1683
1684 # check for --version x.y parameters
1685 while [[ -n "${1}" && -n "${2}" ]]; do
1686 local var="${1#--}"
1687 local val="${2}"
1688 if [[ "${var}" == "version" ]]; then
1689 TASKS_DIR="tasks-${val}"
1690 else
1691 die "Unknown parameter passed to java-pkg_register-ant-tasks: ${1} ${2}"
1692 fi
1693 shift 2
1694 done
1695
1696 local TASK_NAME="${1:-${JAVA_PKG_NAME}}"
1697
1698 dodir /usr/share/ant/${TASKS_DIR}
1699 touch "${D}/usr/share/ant/${TASKS_DIR}/${TASK_NAME}"
1700}
1701
1702# ------------------------------------------------------------------------------
1703# @internal-function java-pkg_ant-tasks-from-deps
1704#
1705# Function to determine ANT_TASKS from DEPEND variable for backwards
1706# compatibility with ebuilds that don't set ANT_TASKS before calling eant() or
1707# WANT_ANT_TASKS before inheriting java-pkg-2. If the DEPEND string contains
1708# "dev-java/ant" or "dev-java/ant-tasks", then it returns "all", otherwise
1709# "none". It's not smart enough to cope with USE flag depends but that shouldn't
1710# be a problem, the worst it can do is activace all tasks when not needed.
1711# Note that this is called only with JAVA_PKG_STRICT=1, to find ebuilds with
1712# insufficient dependencies, otherwise all available tasks are used for
1713# backwards compatilbility.
1714#
1715# @return "all" or "none"
1716# ------------------------------------------------------------------------------
1717java-pkg_ant-tasks-from-deps() {
1718 local found_ant found_ant_tasks
1719
1720 for dep in ${DEPEND}
1721 do
1722 local ant="$(awk '/(dev-java\/ant)/ { if (match($1, "(dev-java/ant)((-[0-9])+|$)", m)) print m[1] }' <<< ${dep})"
1723 [[ "${ant}" == "dev-java/ant" ]] && found_ant=true
1724 [[ "${dep}" == *"ant-tasks"* ]] && found_ant_tasks=true
1725 done
1726
1727 if [[ -n "${found_ant}" || -n "${found_ant_tasks}" ]]; then
1728 java-pkg_announce-qa-violation --nodie "The ebuild DEPENDS on deprecated ant or ant-tasks"
1729 echo "all"
1730 else
1731 # ebuild doesn't set ANT_TASKS and doesn't depend on ant-tasks or ant
1732 # so we deactivate all tasks that may be installed
1733 echo "none"
1734 fi
1735}
1736
1737# ------------------------------------------------------------------------------
1738# @internal-function java-pkg_ant-tasks-depend
1739#
1740# Translates the WANT_ANT_TASKS variable into valid dependencies.
1741# ------------------------------------------------------------------------------
1742java-pkg_ant-tasks-depend() {
1743 debug-print-function ${FUNCNAME} ${WANT_ANT_TASKS}
1744
1745 if [[ -n "${WANT_ANT_TASKS}" ]]; then
1746 local DEP=""
1747 for i in ${WANT_ANT_TASKS}
1748 do
1749 if [[ ${i} != ant-* ]]; then
1750 echo "Invalid atom in WANT_ANT_TASKS: ${i}"
1751 return 1
1752 fi
1753 DEP="${DEP}dev-java/${i} "
1754 done
1755 echo ${DEP}
1756 return 0
1757 else
1758 return 0
1759 fi
1760}
1761
1762# ------------------------------------------------------------------------------
1763# @ebuild-function ejunit
1764#
1765# Junit wrapper function. Makes it easier to run the tests and checks for
1766# dev-java/junit in DEPEND. Launches the tests using junit.textui.TestRunner.
1767#
1768# Examples:
1769# ejunit -cp build/classes org.blinkenlights.jid3.test.AllTests
1770# ejunit org.blinkenlights.jid3.test.AllTests
1771#
1772# @param $1 - -cp or -classpath
1773# @param $2 - classpath; junit and recorded dependencies get appended
1774# @param $@ - the rest of the parameters are passed to java
1775# ------------------------------------------------------------------------------
1776ejunit() {
1777 debug-print-function ${FUNCNAME} $*
1778
1779 local pkgs
1780 for atom in $(cat ${JAVA_PKG_DEPEND_FILE} | tr : ' '); do
1781 pkgs=${pkgs},$(echo ${atom} | sed -re "s/^.*@//")
1782 done
1783
1784 local cp=$(java-pkg_getjars --with-dependencies junit${pkgs})
1785 if [[ ${1} = -cp || ${1} = -classpath ]]; then
1786 cp="${2}:${cp}"
1787 shift 2
1788 else
1789 cp=".:${cp}"
1790 fi
1791
1792 local runner=junit.textui.TestRunner
1793 debug-print "Calling: java -cp \"${cp}\" -Djava.awt.headless=true ${runner} ${@}"
1794 java -cp "${cp}" -Djava.awt.headless=true ${runner} "${@}" || die "Running junit failed"
1795}
1796
1797# ------------------------------------------------------------------------------
1260# @section-end helper 1798# @section-end helper
1261# ------------------------------------------------------------------------------ 1799# ------------------------------------------------------------------------------
1262 1800
1263# ------------------------------------------------------------------------------ 1801# ------------------------------------------------------------------------------
1264# @section-begin build 1802# @section-begin build
1270 1808
1271# ------------------------------------------------------------------------------ 1809# ------------------------------------------------------------------------------
1272# @ebuild-function eant 1810# @ebuild-function eant
1273# 1811#
1274# Ant wrapper function. Will use the appropriate compiler, based on user-defined 1812# Ant wrapper function. Will use the appropriate compiler, based on user-defined
1275# compiler. 1813# compiler. Will also set proper ANT_TASKS from the variable ANT_TASKS,
1276# 1814# variables:
1815# EANT_GENTOO_CLASSPATH - calls java-pkg_getjars for the value and adds to the
1816# gentoo.classpath property. Be sure to call
1817# java-ant_rewrite-classpath in src_unpack.
1818# JAVA_PKG_NO_BUNDLED_SEARCH - Don't search for bundled jars or class files
1819# *ANT_TASKS - used to determine ANT_TASKS before calling Ant.
1277# ------------------------------------------------------------------------------ 1820# ------------------------------------------------------------------------------
1278eant() { 1821eant() {
1279 debug-print-function ${FUNCNAME} $* 1822 debug-print-function ${FUNCNAME} $*
1280 1823
1281 # FIXME get this working 1824 if [[ ${EBUILD_PHASE} = compile ]]; then
1282# if is-java-strict && [[ ! ${DEPEND} =~ "dev-java/ant" ]]; then 1825 # Used to be done in hooks in java-ant-2.eclass but moved here so that we can
1826 # finally get rid of the hooks without breaking stuff
1827
1828 [[ "${JAVA_ANT_IGNORE_SYSTEM_CLASSES}" && "${JAVA_PKG_BSFIX}" ]] \
1829 && java-ant_ignore-system-classes "${S}/build.xml"
1830
1831 if hasq java-ant-2 ${INHERITED}; then
1832 java-ant_bsfix
1833 fi
1834
1835 # eant can be called multiple times
1836 JAVA_PKG_BSFIX="off"
1837
1838 if [[ -z ${JAVA_PKG_NO_BUNDLED_SEARCH} ]] && is-java-strict; then
1839 echo "Searching for bundled jars:"
1840 java-pkg_find-normal-jars || echo "None found."
1841 echo "Searching for bundled classes (no output if none found):"
1842 find "${WORKDIR}" -name "*.class"
1843 echo "Search done."
1844 JAVA_PKG_NO_BUNDLED_SEARCH=true # eant can be called many times
1845 fi
1846 fi
1847
1848 if ! hasq java-ant-2 ${INHERITED}; then
1849 local msg="You should inherit java-ant-2 when using eant"
1283# java-pkg_announce-qa-violation \ 1850 java-pkg_announce-qa-violation "${msg}"
1284# "Using eant, but not depending on dev-java/ant or dev-java/ant-core"
1285# fi 1851 fi
1286 1852
1287 local antflags 1853 local antflags="-Dnoget=true -Dmaven.mode.offline=true"
1854
1288 java-pkg_init-compiler_ 1855 java-pkg_init-compiler_
1289 local compiler="${GENTOO_COMPILER}" 1856 local compiler="${GENTOO_COMPILER}"
1290 1857
1291 local compiler_env="${JAVA_PKG_COMPILER_DIR}/${compiler}" 1858 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})" 1859 local build_compiler="$(source ${compiler_env} 1>/dev/null 2>&1; echo ${ANT_BUILD_COMPILER})"
1294 if [[ "${compiler}" != "javac" && -z "${build_compiler}" ]]; then 1860 if [[ "${compiler}" != "javac" && -z "${build_compiler}" ]]; then
1295 die "ANT_BUILD_COMPILER undefined in ${compiler_env}" 1861 die "ANT_BUILD_COMPILER undefined in ${compiler_env}"
1296 fi 1862 fi
1297 1863
1298 if [[ ${compiler} != "javac" ]]; then 1864 if [[ ${compiler} != "javac" ]]; then
1299 antflags="-Dbuild.compiler=${build_compiler}" 1865 antflags="${antflags} -Dbuild.compiler=${build_compiler}"
1300 # Figure out any extra stuff to put on the classpath for compilers aside 1866 # Figure out any extra stuff to put on the classpath for compilers aside
1301 # from javac 1867 # from javac
1302 # ANT_BUILD_COMPILER_DEPS should be something that could be passed to 1868 # ANT_BUILD_COMPILER_DEPS should be something that could be passed to
1303 # java-config -p 1869 # java-config -p
1304 local build_compiler_deps="$(source ${JAVA_PKG_COMPILER_DIR}/${compiler} 1>/dev/null 2>&1; echo ${ANT_BUILD_COMPILER_DEPS})" 1870 local build_compiler_deps="$(source ${JAVA_PKG_COMPILER_DIR}/${compiler} 1>/dev/null 2>&1; echo ${ANT_BUILD_COMPILER_DEPS})"
1310 if is-java-strict; then 1876 if is-java-strict; then
1311 einfo "Disabling system classpath for ant" 1877 einfo "Disabling system classpath for ant"
1312 antflags="${antflags} -Dbuild.sysclasspath=ignore" 1878 antflags="${antflags} -Dbuild.sysclasspath=ignore"
1313 fi 1879 fi
1314 1880
1315 if [[ -n ${JAVA_PKG_DEBUG} ]]; then 1881 for arg in "${@}"; do
1316 antflags="${antflags} -debug" 1882 if [[ ${arg} = -lib ]]; then
1883 if is-java-strict; then
1884 eerror "You should not use the -lib argument to eant because it will fail"
1885 eerror "with JAVA_PKG_STRICT. Please use for example java-pkg_jar-from"
1886 eerror "or ant properties to make dependencies available."
1887 eerror "For ant tasks use WANT_ANT_TASKS or ANT_TASKS from."
1888 eerror "split ant (>=dev-java/ant-core-1.7)."
1889 die "eant -lib is deprecated/forbidden"
1890 else
1891 echo "eant -lib is deprecated. Turn JAVA_PKG_STRICT on for"
1892 echo "more info."
1893 fi
1894 fi
1895 done
1896
1897 # we use this in src_* so we run ant from /
1898 if ROOT=/ has_version ">=dev-java/ant-core-1.7.0"; then
1899 # default ANT_TASKS to WANT_ANT_TASKS, if ANT_TASKS is not set explicitly
1900 ANT_TASKS="${ANT_TASKS:-${WANT_ANT_TASKS}}"
1901
1902 # override ANT_TASKS with JAVA_PKG_FORCE_ANT_TASKS if it's set
1903 ANT_TASKS="${JAVA_PKG_FORCE_ANT_TASKS:-${ANT_TASKS}}"
1904
1905 if is-java-strict; then
1906 # if ant-tasks were not set by ebuild or forced, try to determine them from depends
1907 if [[ -z "${ANT_TASKS}" ]]; then
1908 ANT_TASKS="$(java-pkg_ant-tasks-from-deps)"
1909 fi
1910 else
1911 # if ant-tasks is not set by ebuild or forced, activate all of them
1912 ANT_TASKS="${ANT_TASKS:-all}"
1913 fi
1914
1915 # at this point, ANT_TASKS should be "all", "none" or explicit list
1916 if [[ "${ANT_TASKS}" == "all" ]]; then
1917 einfo "Using all available ANT_TASKS"
1918 elif [[ "${ANT_TASKS}" == "none" ]]; then
1919 einfo "Disabling all optional ANT_TASKS"
1920 else
1921 einfo "Using following ANT_TASKS: ${ANT_TASKS}"
1922 fi
1923
1924 export ANT_TASKS
1925 fi
1926
1927 [[ -n ${JAVA_PKG_DEBUG} ]] && antflags="${antflags} --execdebug -debug"
1928 [[ -n ${PORTAGE_QUIET} ]] && antflags="${antflags} -q"
1929
1930 local gcp="${EANT_GENTOO_CLASSPATH}"
1931 local getjarsarg=""
1932
1933 if [[ ${EBUILD_PHASE} = "test" ]]; then
1934 antflags="${antflags} -DJunit.present=true"
1935 [[ ${gcp} && ${ANT_TASKS} = *ant-junit* ]] && gcp="${gcp} junit"
1936 getjarsarg="--with-dependencies"
1937 fi
1938
1939 local cp
1940
1941 for atom in ${gcp}; do
1942 cp="${cp}:$(java-pkg_getjars ${getjarsarg} ${atom})"
1943 done
1944
1945 if [[ ${cp} ]]; then
1946 # It seems ant does not like single quotes around ${cp}
1947 antflags="${antflags} -Dgentoo.classpath=\"${cp#:}\""
1317 fi 1948 fi
1318 1949
1319 [[ -n ${JAVA_PKG_DEBUG} ]] && echo ant ${antflags} "${@}" 1950 [[ -n ${JAVA_PKG_DEBUG} ]] && echo ant ${antflags} "${@}"
1951 debug-print "Calling ant (GENTOO_VM: ${GENTOO_VM}): ${antflags} ${@}"
1320 ant ${antflags} "${@}" || die "eant failed" 1952 ant ${antflags} "${@}" || die "eant failed"
1321
1322} 1953}
1323 1954
1324# ------------------------------------------------------------------------------ 1955# ------------------------------------------------------------------------------
1325# @ebuild-function ejavac 1956# @ebuild-function ejavac
1326# 1957#
1330# @param $@ - Arguments to be passed to the compiler 1961# @param $@ - Arguments to be passed to the compiler
1331# ------------------------------------------------------------------------------ 1962# ------------------------------------------------------------------------------
1332ejavac() { 1963ejavac() {
1333 debug-print-function ${FUNCNAME} $* 1964 debug-print-function ${FUNCNAME} $*
1334 1965
1335 # FIXME using get-javac ends up printing stuff with einfo 1966 java-pkg_init-compiler_
1967
1968 local compiler_executable
1336# local compiler_executable=$(java-pkg_get-javac) 1969 compiler_executable=$(java-pkg_get-javac)
1337 local compiler_executable="javac" 1970 if [[ ${?} != 0 ]]; then
1971 eerror "There was a problem determining compiler: ${compiler_executable}"
1972 die "get-javac failed"
1973 fi
1338 1974
1975 local javac_args
1976 javac_args="$(java-pkg_javac-args)"
1977 if [[ ${?} != 0 ]]; then
1978 eerror "There was a problem determining JAVACFLAGS: ${javac_args}"
1979 die "java-pkg_javac-args failed"
1980 fi
1981
1339 [[ -n ${JAVA_PKG_DEBUG} ]] && echo ${compiler_executable} $(java-pkg_javac-args) "${@}" 1982 [[ -n ${JAVA_PKG_DEBUG} ]] && echo ${compiler_executable} ${javac_args} "${@}"
1340 ${compiler_executable} $(java-pkg_javac-args) "${@}" || die "ejavac failed" 1983 ${compiler_executable} ${javac_args} "${@}" || die "ejavac failed"
1341} 1984}
1342 1985
1343# ------------------------------------------------------------------------------ 1986# ------------------------------------------------------------------------------
1344# @ebuild-function java-pkg_filter-compiler 1987# @ebuild-function java-pkg_filter-compiler
1345# 1988#
1383# ------------------------------------------------------------------------------ 2026# ------------------------------------------------------------------------------
1384use_doc() { 2027use_doc() {
1385 use doc && echo ${@:-javadoc} 2028 use doc && echo ${@:-javadoc}
1386} 2029}
1387 2030
2031
1388# ------------------------------------------------------------------------------ 2032# ------------------------------------------------------------------------------
1389# @section-end build 2033# @section-end build
1390# ------------------------------------------------------------------------------ 2034# ------------------------------------------------------------------------------
1391 2035
1392# ------------------------------------------------------------------------------ 2036# ------------------------------------------------------------------------------
1410# 2054#
1411# ----------------------------------------------------------------------------- 2055# -----------------------------------------------------------------------------
1412java-pkg_init() { 2056java-pkg_init() {
1413 unset JAVAC 2057 unset JAVAC
1414 unset JAVA_HOME 2058 unset JAVA_HOME
2059
2060 # People do all kinds of weird things.
2061 # http://forums.gentoo.org/viewtopic-p-3943166.html
2062 local silence="${SILENCE_JAVA_OPTIONS_WARNING}"
2063 local accept="${I_WANT_GLOBAL_JAVA_OPTIONS}"
2064 if [[ -n ${_JAVA_OPTIONS} && -z ${accept} && -z ${silence} ]]; then
2065 ewarn "_JAVA_OPTIONS changes what java -version outputs at least for"
2066 ewarn "sun-jdk vms and and as such break configure scripts that"
2067 ewarn "use it (for example app-office/openoffice) so we filter it out."
2068 ewarn "Use SILENCE_JAVA_OPTIONS_WARNING=true in the environment (use"
2069 ewarn "make.conf for example) to silence this warning or"
2070 ewarn "I_WANT_GLOBAL_JAVA_OPTIONS to not filter it."
2071 fi
2072
2073 if [[ -z ${accept} ]]; then
2074 unset _JAVA_OPTIONS
2075 # phase hooks make this run many times without this
2076 I_WANT_GLOBAL_JAVA_OPTIONS="true"
2077 fi
2078
2079 if java-pkg_func-exists ant_src_unpack; then
2080 java-pkg_announce-qa-violation "Using old ant_src_unpack. Should be src_unpack"
2081 fi
2082
1415 java-pkg_init_paths_ 2083 java-pkg_init_paths_
1416 java-pkg_switch-vm 2084 java-pkg_switch-vm
1417 PATH=${JAVA_HOME}/bin:${PATH} 2085 PATH=${JAVA_HOME}/bin:${PATH}
1418 2086
1419 # TODO we will probably want to set JAVAC and JAVACFLAGS 2087 # TODO we will probably want to set JAVAC and JAVACFLAGS
1424 # When users have crazy classpaths some packages can fail to compile. 2092 # When users have crazy classpaths some packages can fail to compile.
1425 # and everything should work with empty CLASSPATH. 2093 # and everything should work with empty CLASSPATH.
1426 # This also helps prevent unexpected dependencies on random things 2094 # This also helps prevent unexpected dependencies on random things
1427 # from the CLASSPATH. 2095 # from the CLASSPATH.
1428 unset CLASSPATH 2096 unset CLASSPATH
2097
2098 # Unset external ANT_ stuff
2099 unset ANT_TASKS
2100 unset ANT_OPTS
1429} 2101}
1430 2102
1431# ------------------------------------------------------------------------------ 2103# ------------------------------------------------------------------------------
1432# @function-internal java-pkg-init-compiler_ 2104# @function-internal java-pkg-init-compiler_
1433# 2105#
1555 fi 2227 fi
1556 2228
1557 JAVA_PKG_SHAREPATH="${DESTTREE}/share/${JAVA_PKG_NAME}" 2229 JAVA_PKG_SHAREPATH="${DESTTREE}/share/${JAVA_PKG_NAME}"
1558 JAVA_PKG_SOURCESPATH="${JAVA_PKG_SHAREPATH}/sources/" 2230 JAVA_PKG_SOURCESPATH="${JAVA_PKG_SHAREPATH}/sources/"
1559 JAVA_PKG_ENV="${D}${JAVA_PKG_SHAREPATH}/package.env" 2231 JAVA_PKG_ENV="${D}${JAVA_PKG_SHAREPATH}/package.env"
2232 JAVA_PKG_VIRTUALS_PATH="${DESTTREE}/share/java-config-2/virtuals"
2233 JAVA_PKG_VIRTUAL_PROVIDER="${D}/${JAVA_PKG_VIRTUALS_PATH}/${JAVA_PKG_NAME}"
1560 2234
1561 [[ -z "${JAVA_PKG_JARDEST}" ]] && JAVA_PKG_JARDEST="${JAVA_PKG_SHAREPATH}/lib" 2235 [[ -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}" 2236 [[ -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" 2237 [[ -z "${JAVA_PKG_WARDEST}" ]] && JAVA_PKG_WARDEST="${JAVA_PKG_SHAREPATH}/webapps"
1564 2238
1577# Writes the package.env out to disk. 2251# Writes the package.env out to disk.
1578# 2252#
1579# ------------------------------------------------------------------------------ 2253# ------------------------------------------------------------------------------
1580# TODO change to do-write, to match everything else 2254# TODO change to do-write, to match everything else
1581java-pkg_do_write_() { 2255java-pkg_do_write_() {
2256 debug-print-function ${FUNCNAME} $*
2257 java-pkg_init_paths_
1582 # Create directory for package.env 2258 # Create directory for package.env
1583 dodir "${JAVA_PKG_SHAREPATH}" 2259 dodir "${JAVA_PKG_SHAREPATH}"
1584 if [[ -n "${JAVA_PKG_CLASSPATH}" || -n "${JAVA_PKG_LIBRARY}" || -f "${JAVA_PKG_DEPEND}" ]]; then 2260 if [[ -n "${JAVA_PKG_CLASSPATH}" || -n "${JAVA_PKG_LIBRARY}" || -f \
2261 "${JAVA_PKG_DEPEND_FILE}" || -f \
2262 "${JAVA_PKG_OPTIONAL_DEPEND_FILE}" ]]; then
1585 # Create package.env 2263 # Create package.env
1586 ( 2264 (
1587 echo "DESCRIPTION=\"${DESCRIPTION}\"" 2265 echo "DESCRIPTION=\"${DESCRIPTION}\""
1588 echo "GENERATION=\"2\"" 2266 echo "GENERATION=\"2\""
1589 2267
1590 [[ -n "${JAVA_PKG_CLASSPATH}" ]] && echo "CLASSPATH=\"${JAVA_PKG_CLASSPATH}\"" 2268 [[ -n "${JAVA_PKG_CLASSPATH}" ]] && echo "CLASSPATH=\"${JAVA_PKG_CLASSPATH}\""
1591 [[ -n "${JAVA_PKG_LIBRARY}" ]] && echo "LIBRARY_PATH=\"${JAVA_PKG_LIBRARY}\"" 2269 [[ -n "${JAVA_PKG_LIBRARY}" ]] && echo "LIBRARY_PATH=\"${JAVA_PKG_LIBRARY}\""
1592 [[ -n "${JAVA_PROVIDE}" ]] && echo "PROVIDES=\"${JAVA_PROVIDE}\"" 2270 [[ -n "${JAVA_PROVIDE}" ]] && echo "PROVIDES=\"${JAVA_PROVIDE}\""
1593 [[ -f "${JAVA_PKG_DEPEND}" ]] && echo "DEPEND=\"$(cat ${JAVA_PKG_DEPEND} | uniq | tr '\n' ':')\"" 2271 [[ -f "${JAVA_PKG_DEPEND_FILE}" ]] \
2272 && echo "DEPEND=\"$(cat "${JAVA_PKG_DEPEND_FILE}" | uniq | tr '\n' ':')\""
2273 [[ -f "${JAVA_PKG_OPTIONAL_DEPEND_FILE}" ]] \
2274 && 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 ! 2275 echo "VM=\"$(echo ${RDEPEND} ${DEPEND} | sed -e 's/ /\n/g' | sed -n -e '/virtual\/\(jre\|jdk\)/ { p;q }')\"" # TODO cleanup !
1595 ) > "${JAVA_PKG_ENV}" 2276 ) > "${JAVA_PKG_ENV}"
1596 2277
1597 # register target/source 2278 # register target/source
1598 local target="$(java-pkg_get-target)" 2279 local target="$(java-pkg_get-target)"
1609 2290
1610 2291
1611 echo "MERGE_VM=\"${GENTOO_VM}\"" >> "${JAVA_PKG_ENV}" 2292 echo "MERGE_VM=\"${GENTOO_VM}\"" >> "${JAVA_PKG_ENV}"
1612 [[ -n ${GENTOO_COMPILER} ]] && echo "MERGE_COMPILER=\"${GENTOO_COMPILER}\"" >> "${JAVA_PKG_ENV}" 2293 [[ -n ${GENTOO_COMPILER} ]] && echo "MERGE_COMPILER=\"${GENTOO_COMPILER}\"" >> "${JAVA_PKG_ENV}"
1613 2294
2295 # extra env variables
2296 if [[ -n "${JAVA_PKG_EXTRA_ENV_VARS}" ]]; then
2297 cat "${JAVA_PKG_EXTRA_ENV}" >> "${JAVA_PKG_ENV}" || die
2298 # nested echo to remove leading/trailing spaces
2299 echo "ENV_VARS=\"$(echo ${JAVA_PKG_EXTRA_ENV_VARS})\"" \
2300 >> "${JAVA_PKG_ENV}" || die
2301 fi
2302
1614 # Strip unnecessary leading and trailing colons 2303 # Strip unnecessary leading and trailing colons
1615 # TODO try to cleanup if possible 2304 # TODO try to cleanup if possible
1616 sed -e "s/=\":/=\"/" -e "s/:\"$/\"/" -i "${JAVA_PKG_ENV}" || die "Did you forget to call java_init ?" 2305 sed -e "s/=\":/=\"/" -e "s/:\"$/\"/" -i "${JAVA_PKG_ENV}" || die "Did you forget to call java_init ?"
2306 else
2307 debug-print "JAVA_PKG_CLASSPATH, JAVA_PKG_LIBRARY, JAVA_PKG_DEPEND_FILE"
2308 debug-print "or JAVA_PKG_OPTIONAL_DEPEND_FILE not defined so can't"
2309 debug-print "write package.env."
1617 fi 2310 fi
1618} 2311}
1619
1620 2312
1621# ------------------------------------------------------------------------------ 2313# ------------------------------------------------------------------------------
1622# @internal-function java-pkg_record-jar_ 2314# @internal-function java-pkg_record-jar_
1623# 2315#
1624# Record a dependency to the package.env 2316# Record an (optional) dependency to the package.env
1625# 2317# @param --optional - record dependency as optional
2318# @param $1 - package to record
2319# @param $2 - (optional) jar of package to record
1626# ------------------------------------------------------------------------------ 2320# ------------------------------------------------------------------------------
1627JAVA_PKG_DEPEND="${T}/java-pkg-depend" 2321JAVA_PKG_DEPEND_FILE="${T}/java-pkg-depend"
2322JAVA_PKG_OPTIONAL_DEPEND_FILE="${T}/java-pkg-optional-depend"
1628 2323
1629java-pkg_record-jar_() { 2324java-pkg_record-jar_() {
1630 debug-print-function ${FUNCNAME} $* 2325 debug-print-function ${FUNCNAME} $*
2326
2327 local depend_file="${JAVA_PKG_DEPEND_FILE}"
2328 if [[ "${1}" == "--optional" ]]; then
2329 depend_file="${JAVA_PKG_OPTIONAL_DEPEND_FILE}"
2330 shift
2331 fi
1631 2332
1632 local pkg=${1} jar=${2} append 2333 local pkg=${1} jar=${2} append
1633 if [[ -z "${jar}" ]]; then 2334 if [[ -z "${jar}" ]]; then
1634 append="${pkg}" 2335 append="${pkg}"
1635 else 2336 else
1636 append="$(basename ${jar})@${pkg}" 2337 append="$(basename ${jar})@${pkg}"
1637 fi 2338 fi
1638 2339
1639 echo ${append} >> ${JAVA_PKG_DEPEND} 2340 echo "${append}" >> "${depend_file}"
1640} 2341}
1641 2342
1642# ------------------------------------------------------------------------------ 2343# ------------------------------------------------------------------------------
1643# @internal-function java-pkg_append_ 2344# @internal-function java-pkg_append_
1644# 2345#
1704# 2405#
1705# ------------------------------------------------------------------------------ 2406# ------------------------------------------------------------------------------
1706java-pkg_setup-vm() { 2407java-pkg_setup-vm() {
1707 debug-print-function ${FUNCNAME} $* 2408 debug-print-function ${FUNCNAME} $*
1708 2409
2410 export LANG="C" LC_ALL="C"
2411
1709 local vendor="$(java-pkg_get-vm-vendor)" 2412 local vendor="$(java-pkg_get-vm-vendor)"
1710 if [[ "${vendor}" == "sun" ]] && java-pkg_is-vm-version-ge 1 5; then 2413 if [[ "${vendor}" == "sun" ]] && java-pkg_is-vm-version-ge "1.5" ; then
1711 addpredict "/dev/random" 2414 addpredict "/dev/random"
1712 elif [[ "${vendor}" == "ibm" ]]; then 2415 elif [[ "${vendor}" == "ibm" ]]; then
1713 addpredict "/proc/self/maps" 2416 addpredict "/proc/self/maps"
1714 addpredict "/proc/cpuinfo" 2417 addpredict "/proc/cpuinfo"
1715 export LANG="C" LC_ALL="C"
1716 elif [[ "${vendor}" == "jrockit" ]]; then 2418 elif [[ "${vendor}" == "jrockit" ]]; then
1717 addpredict "/proc/cpuinfo" 2419 addpredict "/proc/cpuinfo"
1718 fi 2420 fi
1719} 2421}
1720 2422
1775# Switch VM if we're allowed to (controlled by JAVA_PKG_ALLOW_VM_CHANGE), and 2477# Switch VM if we're allowed to (controlled by JAVA_PKG_ALLOW_VM_CHANGE), and
1776# verify that the current VM is sufficient. 2478# verify that the current VM is sufficient.
1777# Setup the environment for the VM being used. 2479# Setup the environment for the VM being used.
1778# ------------------------------------------------------------------------------ 2480# ------------------------------------------------------------------------------
1779java-pkg_switch-vm() { 2481java-pkg_switch-vm() {
2482 debug-print-function ${FUNCNAME} $*
2483
1780 if java-pkg_needs-vm; then 2484 if java-pkg_needs-vm; then
1781 # Use the VM specified by JAVA_PKG_FORCE_VM 2485 # Use the VM specified by JAVA_PKG_FORCE_VM
1782 if [[ -n ${JAVA_PKG_FORCE_VM} ]]; then 2486 if [[ -n "${JAVA_PKG_FORCE_VM}" ]]; then
1783 # If you're forcing the VM, I hope you know what your doing... 2487 # If you're forcing the VM, I hope you know what your doing...
2488 debug-print "JAVA_PKG_FORCE_VM used: ${JAVA_PKG_FORCE_VM}"
1784 export GENTOO_VM="${JAVA_PKG_FORCE_VM}" 2489 export GENTOO_VM="${JAVA_PKG_FORCE_VM}"
1785 # if we're allowed to switch the vm... 2490 # if we're allowed to switch the vm...
1786 elif [[ "${JAVA_PKG_ALLOW_VM_CHANGE}" == "yes" ]]; then 2491 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}" 2492 debug-print "depend-java-query: NV_DEPEND: ${JAVA_PKG_NV_DEPEND:-${DEPEND}} VNEED: ${JAVA_PKG_VNEED}"
1788 if [[ -n ${JAVA_PKG_VNEED} ]]; then 2493 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}}")" 2494 GENTOO_VM="$(depend-java-query --need-virtual "${JAVA_PKG_VNEED}" --get-vm "${JAVA_PKG_NV_DEPEND:-${DEPEND}}")"
1790 else 2495 else
1791 export GENTOO_VM="$(depend-java-query --get-vm "${JAVA_PKG_NV_DEPEND:-${DEPEND}}")" 2496 GENTOO_VM="$(depend-java-query --get-vm "${JAVA_PKG_NV_DEPEND:-${DEPEND}}")"
2497 fi
2498 if [[ -z "${GENTOO_VM}" || "${GENTOO_VM}" == "None" ]]; then
2499 eerror "Unable to determine VM for building from dependencies:"
2500 echo "NV_DEPEND: ${JAVA_PKG_NV_DEPEND:-${DEPEND}}"
2501 echo "VNEED: ${JAVA_PKG_VNEED}"
2502 die "Failed to determine VM for building."
2503 else
2504 export GENTOO_VM
1792 fi 2505 fi
1793 # otherwise just make sure the current VM is sufficient 2506 # otherwise just make sure the current VM is sufficient
1794 else 2507 else
1795 java-pkg_ensure-vm-version-sufficient 2508 java-pkg_ensure-vm-version-sufficient
1796 fi 2509 fi
1798 2511
1799 java-pkg_setup-vm 2512 java-pkg_setup-vm
1800 2513
1801 export JAVA=$(java-config --java) 2514 export JAVA=$(java-config --java)
1802 export JAVAC=$(java-config --javac) 2515 export JAVAC=$(java-config --javac)
1803 export JAVACFLAGS="$(java-pkg_javac-args)" 2516 JAVACFLAGS="$(java-pkg_javac-args)"
2517 if [[ ${?} != 0 ]]; then
2518 eerror "There was a problem determining JAVACFLAGS: ${JAVACFLAGS}"
2519 die "java-pkg_javac-args failed"
2520 fi
1804 [[ -n ${JAVACFLAGS_EXTRA} ]] && export JAVACFLAGS="${JAVACFLAGS_EXTRA} ${JAVACFLAGS}" 2521 [[ -n ${JAVACFLAGS_EXTRA} ]] && JAVACFLAGS="${JAVACFLAGS_EXTRA} ${JAVACFLAGS}"
2522 export JAVACFLAGS
1805 2523
1806 export JAVA_HOME="$(java-config -g JAVA_HOME)" 2524 export JAVA_HOME="$(java-config -g JAVA_HOME)"
1807 export JDK_HOME=${JAVA_HOME} 2525 export JDK_HOME=${JAVA_HOME}
1808 2526
1809 #TODO If you know a better solution let us know. 2527 #TODO If you know a better solution let us know.
1810 java-pkg_append_ LD_LIBRARY_PATH "$(java-config -g LDPATH)" 2528 java-pkg_append_ LD_LIBRARY_PATH "$(java-config -g LDPATH)"
1811 2529
1812 local tann="${T}/announced-vm" 2530 local tann="${T}/announced-vm"
2531 # With the hooks we should only get here once from pkg_setup but better safe than sorry
2532 # if people have for example modified eclasses some where
1813 if [[ -n "${JAVA_PKG_DEBUG}" ]] || [[ ! -f "${tann}" ]] ; then 2533 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)" 2534 einfo "Using: $(java-config -f)"
1819 [[ ! -f "${tann}" ]] && touch "${tann}" 2535 [[ ! -f "${tann}" ]] && touch "${tann}"
1820 fi
1821 fi 2536 fi
1822 2537
1823 else 2538 else
1824 [[ -n "${JAVA_PKG_DEBUG}" ]] && ewarn "!!! This package inherits java-pkg but doesn't depend on a JDK. -bin or broken dependency!!!" 2539 [[ -n "${JAVA_PKG_DEBUG}" ]] && ewarn "!!! This package inherits java-pkg but doesn't depend on a JDK. -bin or broken dependency!!!"
1825 fi 2540 fi
1855 einfo "Classes" 2570 einfo "Classes"
1856 find "${S}" -type f -name '*.class' -print0 | xargs -0 -r -n 500 ls -ald | sed -e "s,${WORKDIR},\${WORKDIR}," 2571 find "${S}" -type f -name '*.class' -print0 | xargs -0 -r -n 500 ls -ald | sed -e "s,${WORKDIR},\${WORKDIR},"
1857 fi 2572 fi
1858} 2573}
1859 2574
1860# TODO document 2575# ------------------------------------------------------------------------------
2576# @internal-function java-pkg_verify-classes
2577#
1861# Verify that the classes were compiled for the right source / target 2578# Verify that the classes were compiled for the right source / target. Dies if
2579# not.
2580# @param $1 (optional) - the file to check, otherwise checks whole ${D}
2581# ------------------------------------------------------------------------------
1862java-pkg_verify-classes() { 2582java-pkg_verify-classes() {
1863 ebegin "Verifying java class versions"
1864 #$(find ${D} -type f -name '*.jar' -o -name '*.class') 2583 #$(find ${D} -type f -name '*.jar' -o -name '*.class')
1865 class-version-verify.py -t $(java-pkg_get-target) -r ${D} 2584 local target=$(java-pkg_get-target)
2585 local result
2586 local log="${T}/class-version-verify.log"
2587 if [[ -n "${1}" ]]; then
2588 class-version-verify.py -v -t ${target} "${1}" > "${log}"
1866 result=$? 2589 result=$?
1867 eend ${result}
1868 if [[ ${result} == 0 ]]; then
1869 einfo "All good"
1870 else 2590 else
1871 ewarn "Possible problem" 2591 ebegin "Verifying java class versions (target: ${target})"
1872 die "Bad class files found" 2592 class-version-verify.py -v -t ${target} -r "${D}" > "${log}"
2593 result=$?
2594 eend ${result}
2595 fi
2596 [[ -n ${JAVA_PKG_DEBUG} ]] && cat "${log}"
2597 if [[ ${result} != 0 ]]; then
2598 eerror "Incorrect bytecode version found"
2599 [[ -n "${1}" ]] && eerror "in file: ${1}"
2600 eerror "See ${log} for more details."
2601 die "Incorrect bytecode found"
2602 fi
2603}
2604
2605# ----------------------------------------------------------------------------
2606# @internal-function java-pkg_ensure-dep
2607# Check that a package being used in jarfrom, getjars and getjar is contained
2608# within DEPEND or RDEPEND.
2609# @param $1 - empty - check both vars; "runtime" or "build" - check only
2610# RDEPEND, resp. DEPEND
2611# @param $2 - Package name and slot.
2612
2613java-pkg_ensure-dep() {
2614 debug-print-function ${FUNCNAME} $*
2615
2616 local limit_to="${1}"
2617 local target_pkg="${2}"
2618 local dev_error=""
2619
2620 local stripped_pkg=$(echo "${target_pkg}" | sed \
2621 's/-[0-9]*\(\.[0-9]\)*$//')
2622
2623 debug-print "Matching against: ${stripped_pkg}"
2624
2625 if [[ ${limit_to} != runtime && ! ( "${DEPEND}" =~ "$stripped_pkg" ) ]]; then
2626 dev_error="The ebuild is attempting to use ${target_pkg} that is not"
2627 dev_error="${dev_error} declared in DEPEND."
2628 if is-java-strict; then
2629 eerror "${dev_error}"
2630 die "${dev_error}"
2631 elif [[ ${BASH_SUBSHELL} = 0 ]]; then
2632 eerror "${dev_error}"
2633 elog "Because you have this package installed the package will"
2634 elog "build without problems, but please report this to"
2635 elog "http://bugs.gentoo.org"
1873 fi 2636 fi
1874} 2637 fi
1875 2638
2639 if [[ ${limit_to} != build ]]; then
2640 if [[ ! ( ${RDEPEND} =~ "${stripped_pkg}" ) ]]; then
2641 if [[ ! ( ${PDEPEND} =~ "${stripped_pkg}" ) ]]; then
2642 dev_error="The ebuild is attempting to use ${target_pkg},"
2643 dev_error="${dev_error} without specifying --build-only, that is not declared in RDEPEND"
2644 dev_error="${dev_error} or PDEPEND."
2645 if is-java-strict; then
2646 eerror "${dev_error}"
2647 die "${dev_error}"
2648 elif [[ ${BASH_SUBSHELL} = 0 ]]; then
2649 eerror "${dev_error}"
2650 elog "The package will build without problems, but may fail to run"
2651 elog "if you don't have ${target_pkg} installed, so please report"
2652 elog "this to http://bugs.gentoo.org"
2653 fi
2654 fi
2655 fi
2656 fi
2657}
1876 2658
1877# ------------------------------------------------------------------------------ 2659# ------------------------------------------------------------------------------
1878# @section-end internal 2660# @section-end internal
1879# ------------------------------------------------------------------------------ 2661# ------------------------------------------------------------------------------
1880 2662
1881java-pkg_check-phase() { 2663java-pkg_check-phase() {
1882 local phase=${1} 2664 local phase=${1}
1883 local funcname=${2} 2665 local funcname=${FUNCNAME[1]}
1884 if is-java-strict && [[ ${EBUILD_PHASE} != ${phase} ]]; then 2666 if [[ ${EBUILD_PHASE} != ${phase} ]]; then
1885 java-pkg_announce-qa-violation \
1886 "${funcname} used outside of src_${phase}" 2667 local msg="${funcname} used outside of src_${phase}"
2668 java-pkg_announce-qa-violation "${msg}"
1887 fi 2669 fi
1888} 2670}
1889 2671
1890java-pkg_check-versioned-jar() { 2672java-pkg_check-versioned-jar() {
1891 local jar=${1} 2673 local jar=${1}
1900 java-pkg_announce-qa-violation "deprecated USE flag 'jikes' in IUSE" 2682 java-pkg_announce-qa-violation "deprecated USE flag 'jikes' in IUSE"
1901 fi 2683 fi
1902} 2684}
1903 2685
1904java-pkg_announce-qa-violation() { 2686java-pkg_announce-qa-violation() {
1905 if is-java-strict; then 2687 local nodie
2688 if [[ ${1} == "--nodie" ]]; then
2689 nodie="true"
2690 shift
2691 fi
1906 echo "Java QA Notice: $@" >&2 2692 echo "Java QA Notice: $@" >&2
1907 increment-qa-violations 2693 increment-qa-violations
1908 fi 2694 [[ -z "${nodie}" ]] && is-java-strict && die "${@}"
1909} 2695}
1910 2696
1911increment-qa-violations() { 2697increment-qa-violations() {
1912 let "JAVA_PKG_QA_VIOLATIONS+=1" 2698 let "JAVA_PKG_QA_VIOLATIONS+=1"
1913 export JAVA_PKG_QA_VIOLATIONS 2699 export JAVA_PKG_QA_VIOLATIONS

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

  ViewVC Help
Powered by ViewVC 1.1.20