/[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.20 Revision 1.102
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.102 2008/01/12 15:04:26 caster 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: optional --symlink creates to symlink like this for html
563# documentation bundles.
564# @param $2: - The javadoc root directory.
565#
566# @example:
567# java-pkg_dojavadoc docs/api
568# java-pkg_dojavadoc --symlink apidocs docs/api
569#
570# ------------------------------------------------------------------------------
442java-pkg_dojavadoc() { 571java-pkg_dojavadoc() {
572 debug-print-function ${FUNCNAME} $*
573
574 # For html documentation bundles that link to Javadoc
575 local symlink
576 if [[ ${1} = --symlink ]]; then
577 symlink=${2}
578 shift 2
579 fi
580
443 local dir="$1" 581 local dir="$1"
582 local dest=/usr/share/doc/${PF}/html
583
584 # QA checks
444 585
445 java-pkg_check-phase install 586 java-pkg_check-phase install
446 587
447 [[ -z "${dir}" ]] && die "Must specify a directory!" 588 [[ -z "${dir}" ]] && die "Must specify a directory!"
448 [[ ! -d "${dir}" ]] && die "${dir} does not exist, or isn't a directory!" 589 [[ ! -d "${dir}" ]] && die "${dir} does not exist, or isn't a directory!"
590 if [[ ! -e "${dir}/index.html" ]]; then
591 local msg="No index.html in javadoc directory"
592 ewarn "${msg}"
593 is-java-strict && die "${msg}"
594 fi
595
596 if [[ -e ${D}/${dest}/api ]]; then
597 eerror "${dest} already exists. Will not overwrite."
598 die "${dest}"
599 fi
600
601 # Renaming to match our directory layout
449 602
450 local dir_to_install="${dir}" 603 local dir_to_install="${dir}"
451 if [[ "$(basename "${dir}")" != "api" ]]; then 604 if [[ "$(basename "${dir}")" != "api" ]]; then
452 dir_to_install="${T}/api" 605 dir_to_install="${T}/api"
453 # TODO use doins 606 # TODO use doins
454 cp -r "${dir}" "${dir_to_install}" || die "cp failed" 607 cp -r "${dir}" "${dir_to_install}" || die "cp failed"
455 fi 608 fi
456 609
610 # Actual installation
611
457 java-pkg_dohtml -r ${dir_to_install} 612 java-pkg_dohtml -r "${dir_to_install}"
613
614 # Let's make a symlink to the directory we have everything else under
615 dosym ${dest}/api "${JAVA_PKG_SHAREPATH}/api" || die
616
617 if [[ ${symlink} ]]; then
618 dosym ${dest}/{api,${symlink}} || die
619 fi
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 if is-java-strict; then
653 eerror "${msg}"
654 die "${msg}"
655 else
656 echo "${msg}"
657 echo "Please report this to http://bugs.gentoo.org."
658 fi
659 fi
490 660
491 java-pkg_init_paths_ 661 java-pkg_init_paths_
492 662
493 local zip_name="${PN}-src.zip" 663 local zip_name="${PN}-src.zip"
494 local zip_path="${T}/${zip_name}" 664 local zip_path="${T}/${zip_name}"
495 local dir 665 local dir
496 for dir in ${@}; do 666 for dir in "${@}"; do
497 local dir_parent=$(dirname "${dir}") 667 local dir_parent=$(dirname "${dir}")
498 local dir_name=$(basename "${dir}") 668 local dir_name=$(basename "${dir}")
499 pushd ${dir_parent} > /dev/null || die "problem entering ${dir_parent}" 669 pushd ${dir_parent} > /dev/null || die "problem entering ${dir_parent}"
500 zip -q -r ${zip_path} ${dir_name} -i '*.java' 670 zip -q -r ${zip_path} ${dir_name} -i '*.java'
501 local result=$? 671 local result=$?
518# @ebuild-function java-pkg_dolauncher 688# @ebuild-function java-pkg_dolauncher
519# 689#
520# Make a wrapper script to lauch/start this package 690# Make a wrapper script to lauch/start this package
521# If necessary, the wrapper will switch to the appropriate VM. 691# If necessary, the wrapper will switch to the appropriate VM.
522# 692#
693# Can be called without parameters if the package installs only one jar
694# that has the Main-class attribute set. The wrapper will be named ${PN}.
695#
523# @param $1 - filename of launcher to create 696# @param $1 - filename of launcher to create
524# @param $2 - options, as follows: 697# @param $2 - options, as follows:
525# --main the.main.class.too.start 698# --main the.main.class.too.start
526# --jar /the/jar/too/launch.jar 699# --jar /the/jar/too/launch.jar or just <name>.jar
527# --java_args 'Extra arguments to pass to java' 700# --java_args 'Extra arguments to pass to java'
528# --pkg_args 'Extra arguments too pass to the package' 701# --pkg_args 'Extra arguments to pass to the package'
529# --pwd 702# --pwd Directory the launcher changes to before executing java
530# -into 703# -into Directory to install the launcher to, instead of /usr/bin
531# -pre 704# -pre Prepend contents of this file to the launcher
532# ------------------------------------------------------------------------------ 705# ------------------------------------------------------------------------------
533java-pkg_dolauncher() { 706java-pkg_dolauncher() {
534 debug-print-function ${FUNCNAME} $* 707 debug-print-function ${FUNCNAME} $*
535 708
536 java-pkg_check-phase install 709 java-pkg_check-phase install
537
538 [[ ${#} -lt 1 ]] && die "Need at least one argument"
539
540 java-pkg_init_paths_ 710 java-pkg_init_paths_
541 711
712 if [[ ${#} = 0 ]]; then
713 local name="${PN}"
714 else
542 local name="${1}" 715 local name="${1}"
716 shift
717 fi
718
543 # TODO rename to launcher 719 # TODO rename to launcher
544 local target="${T}/${name}" 720 local target="${T}/${name}"
545 local var_tmp="${T}/launcher_variables_tmp" 721 local var_tmp="${T}/launcher_variables_tmp"
546 local target_dir pre 722 local target_dir pre
547 shift
548 723
549 # Process the other the rest of the arguments 724 # Process the other the rest of the arguments
550 while [[ -n "${1}" && -n "${2}" ]]; do 725 while [[ -n "${1}" && -n "${2}" ]]; do
551 local var=${1} value=${2} 726 local var="${1}" value="${2}"
552 if [[ "${var:0:2}" == "--" ]]; then 727 if [[ "${var:0:2}" == "--" ]]; then
728 local var=${var:2}
553 echo "gjl_${var:2}=\"${value}\"" >> "${var_tmp}" 729 echo "gjl_${var}=\"${value}\"" >> "${var_tmp}"
730 local gjl_${var}="${value}"
554 elif [[ "${var}" == "-into" ]]; then 731 elif [[ "${var}" == "-into" ]]; then
555 target_dir="${value}" 732 target_dir="${value}"
556 elif [[ "${var}" == "-pre" ]]; then 733 elif [[ "${var}" == "-pre" ]]; then
557 pre="${value}" 734 pre="${value}"
558 fi 735 fi
559 shift 2 736 shift 2
560 done 737 done
561 738
739 # Test if no --jar and --main arguments were given and
740 # in that case check if the package only installs one jar
741 # and use that jar.
742 if [[ -z "${gjl_jar}" && -z "${gjl_main}" ]]; then
743 local cp="${JAVA_PKG_CLASSPATH}"
744 if [[ "${cp/:}" = "${cp}" && "${cp%.jar}" != "${cp}" ]]; then
745 echo "gjl_jar=\"${JAVA_PKG_CLASSPATH}\"" >> "${var_tmp}"
746 else
747 local msg="Not enough information to create a launcher given."
748 msg="${msg} Please give --jar or --main argument to ${FUNCNAME}."
749 die "${msg}"
750 fi
751 fi
752
562 # Write the actual script 753 # Write the actual script
563 echo "#!/bin/bash" > "${target}" 754 echo "#!/bin/bash" > "${target}"
564 [[ -n "${pre}" ]] && [[ -f "${pre}" ]] && cat "${pre}" >> "${target}" 755 if [[ -n "${pre}" ]]; then
756 if [[ -f "${pre}" ]]; then
757 cat "${pre}" >> "${target}"
758 else
759 die "-pre specified file '${pre}' does not exist"
760 fi
761 fi
565 echo "gjl_package=${JAVA_PKG_NAME}" >> "${target}" 762 echo "gjl_package=${JAVA_PKG_NAME}" >> "${target}"
566 cat "${var_tmp}" >> "${target}" 763 cat "${var_tmp}" >> "${target}"
764 rm -f "${var_tmp}"
567 echo "source /usr/share/java-config-2/launcher/launcher.bash" >> "${target}" 765 echo "source /usr/share/java-config-2/launcher/launcher.bash" >> "${target}"
568 766
569 if [[ -n "${target_dir}" ]]; then 767 if [[ -n "${target_dir}" ]]; then
570 DESTTREE="${target_dir}" dobin "${target}" 768 DESTTREE="${target_dir}" dobin "${target}"
571 local ret=$? 769 local ret=$?
660# Example: get a specific jar from xerces slot 2, and name it diffrently 858# Example: get a specific jar from xerces slot 2, and name it diffrently
661# java-pkg_jar-from xerces-2 xml-apis.jar xml.jar 859# java-pkg_jar-from xerces-2 xml-apis.jar xml.jar
662# Example: get junit.jar which is needed only for building 860# Example: get junit.jar which is needed only for building
663# java-pkg_jar-from --build-only junit junit.jar 861# java-pkg_jar-from --build-only junit junit.jar
664# 862#
665# @param $1 - (optional) "--build-only" makes the jar(s) not added into 863# @param $opt
666# package.env DEPEND line. 864# --build-only - makes the jar(s) not added into package.env DEPEND line.
667# @param $1 - Package to get jars from. 865# (assumed automatically when called inside src_test)
866# --with-dependencies - get jars also from requested package's dependencies
867# transitively.
868# --virtual - Packages passed to this function are to be handled as virtuals
869# and will not have individual jar dependencies recorded.
870# --into $dir - symlink jar(s) into $dir (must exist) instead of .
871# @param $1 - Package to get jars from, or comma-separated list of packages in
872# case other parameters are not used.
668# @param $2 - jar from package. If not specified, all jars will be used. 873# @param $2 - jar from package. If not specified, all jars will be used.
669# @param $3 - When a single jar is specified, destination filename of the 874# @param $3 - When a single jar is specified, destination filename of the
670# symlink. Defaults to the name of the jar. 875# symlink. Defaults to the name of the jar.
671# ------------------------------------------------------------------------------ 876# ------------------------------------------------------------------------------
672# TODO could probably be cleaned up a little 877# TODO could probably be cleaned up a little
673java-pkg_jar-from() { 878java-pkg_jar-from() {
674 debug-print-function ${FUNCNAME} $* 879 debug-print-function ${FUNCNAME} $*
675 880
676 local build_only="" 881 local build_only=""
882 local destdir="."
883 local deep=""
884 local virtual=""
677 885
886 [[ "${EBUILD_PHASE}" == "test" ]] && build_only="build"
887
888 while [[ "${1}" == --* ]]; do
678 if [[ "${1}" = "--build-only" ]]; then 889 if [[ "${1}" = "--build-only" ]]; then
679 build_only="true" 890 build_only="build"
891 elif [[ "${1}" = "--with-dependencies" ]]; then
892 deep="--with-dependencies"
893 elif [[ "${1}" = "--virtual" ]]; then
894 virtual="true"
895 elif [[ "${1}" = "--into" ]]; then
896 destdir="${2}"
897 shift
898 else
899 die "java-pkg_jar-from called with unknown parameter: ${1}"
900 fi
680 shift 901 shift
681 fi 902 done
682 903
683 local target_pkg="${1}" target_jar="${2}" destjar="${3}" 904 local target_pkg="${1}" target_jar="${2}" destjar="${3}"
684 905
685 [[ -z ${target_pkg} ]] && die "Must specify a package" 906 [[ -z ${target_pkg} ]] && die "Must specify a package"
686 907
687 # default destjar to the target jar 908 # default destjar to the target jar
688 [[ -z "${destjar}" ]] && destjar="${target_jar}" 909 [[ -z "${destjar}" ]] && destjar="${target_jar}"
689 910
690 local error_msg="There was a problem getting the classpath for ${target_pkg}." 911 local error_msg="There was a problem getting the classpath for ${target_pkg}."
691 local classpath 912 local classpath
692 classpath="$(java-config --classpath=${target_pkg})" 913 classpath="$(java-config ${deep} --classpath=${target_pkg})"
693 [[ $? != 0 ]] && die ${error_msg} 914 [[ $? != 0 ]] && die ${error_msg}
915
916 # When we have commas this functions is called to bring jars from multiple
917 # packages. This affects recording of dependencencies performed later
918 # which expects one package only, so we do it here.
919 if [[ ${target_pkg} = *,* ]]; then
920 for pkg in ${target_pkg//,/ }; do
921 java-pkg_ensure-dep "${build_only}" "${pkg}"
922 [[ -z "${build_only}" ]] && java-pkg_record-jar_ "${pkg}"
923 done
924 # setting this disables further record-jar_ calls later
925 build_only="build"
926 else
927 java-pkg_ensure-dep "${build_only}" "${target_pkg}"
928 fi
929
930 # Record the entire virtual as a dependency so that
931 # no jars are missed.
932 if [[ -z "${build_only}" && -n "${virtual}" ]]; then
933 java-pkg_record-jar_ "${target_pkg}"
934 # setting this disables further record-jars_ calls later
935 build_only="build"
936 fi
937
938 pushd ${destdir} > /dev/null \
939 || die "failed to change directory to ${destdir}"
694 940
695 local jar 941 local jar
696 for jar in ${classpath//:/ }; do 942 for jar in ${classpath//:/ }; do
697 local jar_name=$(basename "${jar}") 943 local jar_name=$(basename "${jar}")
698 if [[ ! -f "${jar}" ]] ; then 944 if [[ ! -f "${jar}" ]] ; then
709 elif [[ "${jar_name}" == "${target_jar}" ]] ; then 955 elif [[ "${jar_name}" == "${target_jar}" ]] ; then
710 [[ -f "${destjar}" ]] && rm "${destjar}" 956 [[ -f "${destjar}" ]] && rm "${destjar}"
711 ln -snf "${jar}" "${destjar}" \ 957 ln -snf "${jar}" "${destjar}" \
712 || die "Failed to make symlink from ${jar} to ${destjar}" 958 || die "Failed to make symlink from ${jar} to ${destjar}"
713 [[ -z "${build_only}" ]] && java-pkg_record-jar_ "${target_pkg}" "${jar}" 959 [[ -z "${build_only}" ]] && java-pkg_record-jar_ "${target_pkg}" "${jar}"
960 popd > /dev/null
714 return 0 961 return 0
715 fi 962 fi
716 done 963 done
964 popd > /dev/null
717 # if no target was specified, we're ok 965 # if no target was specified, we're ok
718 if [[ -z "${target_jar}" ]] ; then 966 if [[ -z "${target_jar}" ]] ; then
719 return 0 967 return 0
720 # otherwise, die bitterly 968 # otherwise, die bitterly
721 else 969 else
740# The providing packages are recorded as dependencies into package.env DEPEND 988# The providing packages are recorded as dependencies into package.env DEPEND
741# line, unless "--build-only" is passed as the very first argument, for jars 989# line, unless "--build-only" is passed as the very first argument, for jars
742# that have to be present only at build time and are not needed on runtime 990# that have to be present only at build time and are not needed on runtime
743# (junit testing etc). 991# (junit testing etc).
744# 992#
745# Example: Get the classpath for xerces-2, 993# Example: Get the classpath for xerces-2 and xalan,
746# java-pkg_getjars xerces-2 xalan 994# java-pkg_getjars xerces-2,xalan
747# Example Return: 995# Example Return:
748# /usr/share/xerces-2/lib/xml-apis.jar:/usr/share/xerces-2/lib/xmlParserAPIs.jar:/usr/share/xalan/lib/xalan.jar 996# /usr/share/xerces-2/lib/xml-apis.jar:/usr/share/xerces-2/lib/xmlParserAPIs.jar:/usr/share/xalan/lib/xalan.jar
749# 997#
750# @param $1 - (optional) "--build-only" makes the jar(s) not added into 998# @param $opt
751# package.env DEPEND line. 999# --build-only - makes the jar(s) not added into package.env DEPEND line.
1000# (assumed automatically when called inside src_test)
1001# --with-dependencies - get jars also from requested package's dependencies
1002# transitively.
752# @param $@ - list of packages to get jars from 1003# @param $1 - list of packages to get jars from
1004# (passed to java-config --classpath)
753# ------------------------------------------------------------------------------ 1005# ------------------------------------------------------------------------------
754java-pkg_getjars() { 1006java-pkg_getjars() {
755 debug-print-function ${FUNCNAME} $* 1007 debug-print-function ${FUNCNAME} $*
756 1008
757 local build_only="" 1009 local build_only=""
1010 local deep=""
758 1011
1012 [[ "${EBUILD_PHASE}" == "test" ]] && build_only="build"
1013
1014 while [[ "${1}" == --* ]]; do
759 if [[ "${1}" = "--build-only" ]]; then 1015 if [[ "${1}" = "--build-only" ]]; then
760 build_only="true" 1016 build_only="build"
1017 elif [[ "${1}" = "--with-dependencies" ]]; then
1018 deep="--with-dependencies"
1019 else
1020 die "java-pkg_jar-from called with unknown parameter: ${1}"
1021 fi
761 shift 1022 shift
762 fi
763
764 [[ ${#} -lt 1 ]] && die "At least one argument needed"
765
766 # NOTE could probably just pass $@ to java-config --classpath. and return it
767 local classpath pkg
768 for pkg in ${@//,/ }; do
769 #for pkg in $(echo "$@" | tr ',' ' '); do
770 jars="$(java-config --classpath=${pkg})"
771 [[ -z "${jars}" ]] && die "java-config --classpath=${pkg} failed"
772 debug-print "${pkg}:${jars}"
773
774 if [[ -z "${classpath}" ]]; then
775 classpath="${jars}"
776 else
777 classpath="${classpath}:${jars}"
778 fi
779 # Only record jars that aren't build-only
780 [[ -z "${build_only}" ]] && java-pkg_record-jar_ "${pkg}"
781 done 1023 done
1024
1025 [[ ${#} -ne 1 ]] && die "${FUNCNAME} takes only one argument besides --*"
1026
1027
1028 local classpath pkgs="${1}"
1029 jars="$(java-config ${deep} --classpath=${pkgs})"
1030 [[ $? != 0 || -z "${jars}" ]] && die "java-config --classpath=${pkgs} failed"
1031 debug-print "${pkgs}:${jars}"
1032
1033 for pkg in ${pkgs//,/ }; do
1034 java-pkg_ensure-dep "${build_only}" "${pkg}"
1035 done
1036
1037 if [[ -z "${classpath}" ]]; then
1038 classpath="${jars}"
1039 else
1040 classpath="${classpath}:${jars}"
1041 fi
1042
1043 # Only record jars that aren't build-only
1044 if [[ -z "${build_only}" ]]; then
1045 for pkg in ${pkgs//,/ }; do
1046 java-pkg_record-jar_ "${pkg}"
1047 done
1048 fi
1049
782 echo "${classpath}" 1050 echo "${classpath}"
783} 1051}
784 1052
785# ------------------------------------------------------------------------------ 1053# ------------------------------------------------------------------------------
786# @ebuild-function java-pkg_getjar 1054# @ebuild-function java-pkg_getjar
794# @example 1062# @example
795# java-pkg_getjar xerces-2 xml-apis.jar 1063# java-pkg_getjar xerces-2 xml-apis.jar
796# @example-return 1064# @example-return
797# /usr/share/xerces-2/lib/xml-apis.jar 1065# /usr/share/xerces-2/lib/xml-apis.jar
798# 1066#
799# @param $1 - (optional) "--build-only" makes the jar not added into 1067# @param $opt
800# package.env DEPEND line. 1068# --build-only - makes the jar not added into package.env DEPEND line.
1069# --virtual - Packages passed to this function are to be handled as virtuals
1070# and will not have individual jar dependencies recorded.
801# @param $1 - package to use 1071# @param $1 - package to use
802# @param $2 - jar to get 1072# @param $2 - jar to get
803# ------------------------------------------------------------------------------ 1073# ------------------------------------------------------------------------------
804java-pkg_getjar() { 1074java-pkg_getjar() {
805 debug-print-function ${FUNCNAME} $* 1075 debug-print-function ${FUNCNAME} $*
806 1076
807 local build_only="" 1077 local build_only=""
1078 local virtual=""
808 1079
1080 [[ "${EBUILD_PHASE}" == "test" ]] && build_only="build"
1081
1082 while [[ "${1}" == --* ]]; do
809 if [[ "${1}" = "--build-only" ]]; then 1083 if [[ "${1}" = "--build-only" ]]; then
810 build_only="true" 1084 build_only="build"
1085 elif [[ "${1}" == "--virtual" ]]; then
1086 virtual="true"
1087 else
1088 die "java-pkg_getjar called with unknown parameter: ${1}"
1089 fi
811 shift 1090 shift
812 fi 1091 done
1092
1093 [[ ${#} -ne 2 ]] && die "${FUNCNAME} takes only two arguments besides --*"
813 1094
814 local pkg="${1}" target_jar="${2}" jar 1095 local pkg="${1}" target_jar="${2}" jar
815 [[ -z ${pkg} ]] && die "Must specify package to get a jar from" 1096 [[ -z ${pkg} ]] && die "Must specify package to get a jar from"
816 [[ -z ${target_jar} ]] && die "Must specify jar to get" 1097 [[ -z ${target_jar} ]] && die "Must specify jar to get"
817 1098
818 local error_msg="Could not find classpath for ${pkg}. Are you sure its installed?" 1099 local error_msg="Could not find classpath for ${pkg}. Are you sure its installed?"
819 local classpath 1100 local classpath
820 classpath=$(java-config --classpath=${pkg}) 1101 classpath=$(java-config --classpath=${pkg})
821 [[ $? != 0 ]] && die ${error_msg} 1102 [[ $? != 0 ]] && die ${error_msg}
1103
1104 java-pkg_ensure-dep "${build_only}" "${pkg}"
1105
1106 # Record the package(Virtual) as a dependency and then set build_only
1107 # So that individual jars are not recorded.
1108 if [[ -n "${virtual}" ]]; then
1109 java-pkg_record-jar_ "${pkg}"
1110 build_only="true"
1111 fi
822 1112
823 for jar in ${classpath//:/ }; do 1113 for jar in ${classpath//:/ }; do
824 if [[ ! -f "${jar}" ]] ; then 1114 if [[ ! -f "${jar}" ]] ; then
825 die "Installation problem with jar ${jar} in ${pkg} - is it installed?" 1115 die "Installation problem with jar ${jar} in ${pkg} - is it installed?"
826 fi 1116 fi
833 fi 1123 fi
834 done 1124 done
835 1125
836 die "Could not find ${target_jar} in ${pkg}" 1126 die "Could not find ${target_jar} in ${pkg}"
837 return 1 1127 return 1
1128}
1129
1130# ------------------------------------------------------------------------------
1131# @ebuild-function java-pkg_register-dependency
1132#
1133# Registers runtime dependency on a package, list of packages, or a single jar
1134# from a package, into package.env DEPEND line. Can only be called in
1135# src_install phase.
1136# Intended for binary packages where you don't need to symlink the jars or get
1137# their classpath during build. As such, the dependencies only need to be
1138# specified in ebuild's RDEPEND, and should be omitted in DEPEND.
1139#
1140# @param $1 - comma-separated list of packages, or a single package
1141# @param $2 - if param $1 is a single package, optionally specify the jar
1142# to depend on
1143#
1144# Example: Record the dependency on whole xerces-2 and xalan,
1145# java-pkg_register-dependency xerces-2,xalan
1146# Example: Record the dependency on ant.jar from ant-core
1147# java-pkg_register-dependency ant-core ant.jar
1148#
1149# Note: Passing both list of packages as the first parameter AND specifying the
1150# jar as the second is not allowed and will cause the function to die. We assume
1151# that there's more chance one passes such combination as a mistake, than that
1152# there are more packages providing identically named jar without class
1153# collisions.
1154# ------------------------------------------------------------------------------
1155java-pkg_register-dependency() {
1156 debug-print-function ${FUNCNAME} $*
1157
1158 java-pkg_check-phase install
1159
1160 [[ ${#} -gt 2 ]] && die "${FUNCNAME} takes at most two arguments"
1161
1162 local pkgs="${1}"
1163 local jar="${2}"
1164
1165 [[ -z "${pkgs}" ]] && die "${FUNCNAME} called with no package(s) specified"
1166
1167 if [[ -z "${jar}" ]]; then
1168 for pkg in ${pkgs//,/ }; do
1169 java-pkg_ensure-dep runtime "${pkg}"
1170 java-pkg_record-jar_ "${pkg}"
1171 done
1172 else
1173 [[ ${pkgs} == *,* ]] && \
1174 die "${FUNCNAME} called with both package list and jar name"
1175 java-pkg_ensure-dep runtime "${pkgs}"
1176 java-pkg_record-jar_ "${pkgs}" "${jar}"
1177 fi
1178
1179 java-pkg_do_write_
1180}
1181
1182# ------------------------------------------------------------------------------
1183# @ebuild-function java-pkg_register-optional-dependency
1184#
1185# Registers optional runtime dependency on a package, list of packages, or a
1186# single jar from a package, into package.env OPTIONAL_DEPEND line. Can only be
1187# called in src_install phase.
1188# Intended for packages that can use other packages when those are in classpath.
1189# Will be put on classpath by launcher if they are installed. Typical case is
1190# JDBC implementations for various databases. It's better than having USE flag
1191# for each implementation triggering hard dependency.
1192#
1193# @param $1 - comma-separated list of packages, or a single package
1194# @param $2 - if param $1 is a single package, optionally specify the jar
1195# to depend on
1196#
1197# Example: Record the optional dependency on some jdbc providers
1198# java-pkg_register-optional-dependency jdbc-jaybird,jtds-1.2,jdbc-mysql
1199#
1200# Note: Passing both list of packages as the first parameter AND specifying the
1201# jar as the second is not allowed and will cause the function to die. We assume
1202# that there's more chance one passes such combination as a mistake, than that
1203# there are more packages providing identically named jar without class
1204# collisions.
1205# ------------------------------------------------------------------------------
1206java-pkg_register-optional-dependency() {
1207 debug-print-function ${FUNCNAME} $*
1208
1209 java-pkg_check-phase install
1210
1211 [[ ${#} -gt 2 ]] && die "${FUNCNAME} takes at most two arguments"
1212
1213 local pkgs="${1}"
1214 local jar="${2}"
1215
1216 [[ -z "${pkgs}" ]] && die "${FUNCNAME} called with no package(s) specified"
1217
1218 if [[ -z "${jar}" ]]; then
1219 for pkg in ${pkgs//,/ }; do
1220 java-pkg_record-jar_ --optional "${pkg}"
1221 done
1222 else
1223 [[ ${pkgs} == *,* ]] && \
1224 die "${FUNCNAME} called with both package list and jar name"
1225 java-pkg_record-jar_ --optional "${pkgs}" "${jar}"
1226 fi
1227
1228 java-pkg_do_write_
1229}
1230
1231# ------------------------------------------------------------------------------
1232# @ebuild-function java-pkg_register-environment-variable
1233#
1234# Register an arbitrary environment variable into package.env. The gjl launcher
1235# for this package or any package depending on this will export it into
1236# environement before executing java command.
1237# Must only be called in src_install phase.
1238#
1239# @param $1 - variable name
1240# @param $2 - variable value
1241# ------------------------------------------------------------------------------
1242JAVA_PKG_EXTRA_ENV="${T}/java-pkg-extra-env"
1243JAVA_PKG_EXTRA_ENV_VARS=""
1244java-pkg_register-environment-variable() {
1245 debug-print-function ${FUNCNAME} $*
1246
1247 java-pkg_check-phase install
1248
1249 [[ ${#} != 2 ]] && die "${FUNCNAME} takes two arguments"
1250
1251 echo "${1}=\"${2}\"" >> ${JAVA_PKG_EXTRA_ENV}
1252 JAVA_PKG_EXTRA_ENV_VARS="${JAVA_PKG_EXTRA_ENV_VARS} ${1}"
1253
1254 java-pkg_do_write_
838} 1255}
839 1256
840# This function reads stdin, and based on that input, figures out how to 1257# This function reads stdin, and based on that input, figures out how to
841# populate jars from the filesystem. 1258# populate jars from the filesystem.
842# Need to figure out a good way of making use of this, ie be able to use a 1259# Need to figure out a good way of making use of this, ie be able to use a
959# 1376#
960# export DEPEND="${DEPEND} ${depstr}" 1377# export DEPEND="${DEPEND} ${depstr}"
961# export RDEPEND="${RDEPEND} ${depstr}" 1378# export RDEPEND="${RDEPEND} ${depstr}"
962#} 1379#}
963 1380
1381# ------------------------------------------------------------------------------
1382# @ebuild-function java-pkg_find-normal-jars
1383#
1384# Find the files with suffix .jar file in the given directory or $WORKDIR
1385#
1386# @param $1 - The directory to search for jar files (default: ${WORKDIR})
1387# ------------------------------------------------------------------------------
1388java-pkg_find-normal-jars() {
1389 local dir=$1
1390 [[ "${dir}" ]] || dir="${WORKDIR}"
1391 local found
1392 for jar in $(find "${dir}" -name "*.jar" -type f); do
1393 echo "${jar}"
1394 found="true"
1395 done
1396 [[ "${found}" ]]
1397 return $?
1398}
1399
1400# ------------------------------------------------------------------------------
1401# @ebuild-function java-pkg_ensure-no-bundled-jars
1402#
1403# Try to locate bundled jar files in ${WORKDIR} and die if found.
964# This should be used after S has been populated with symlinks to jars 1404# This function should be called after WORKDIR has been populated with symlink
965# TODO document 1405# to system jar files or bundled jars removed.
1406# ------------------------------------------------------------------------------
966java-pkg_ensure-no-bundled-jars() { 1407java-pkg_ensure-no-bundled-jars() {
967 debug-print-function ${FUNCNAME} $* 1408 debug-print-function ${FUNCNAME} $*
968 pushd ${WORKDIR} >/dev/null 2>/dev/null
969 1409
970 local bundled_jars=$(find . -name "*.jar" -type f) 1410 local bundled_jars=$(java-pkg_find-normal-jars)
971 if [[ -n ${bundled_jars} ]]; then 1411 if [[ -n ${bundled_jars} ]]; then
972 echo "Bundled jars found:" 1412 echo "Bundled jars found:"
973 local jar 1413 local jar
974 for jar in ${bundled_jars}; do 1414 for jar in ${bundled_jars}; do
975 echo $(pwd)${jar/./} 1415 echo $(pwd)${jar/./}
976 done 1416 done
977 die "Bundled jars found!" 1417 die "Bundled jars found!"
978
979 fi 1418 fi
980 popd >/dev/null 2>/dev/null
981} 1419}
982 1420
983# ------------------------------------------------------------------------------ 1421# ------------------------------------------------------------------------------
984# @internal-function java-pkg_ensure-vm-version-sufficient 1422# @internal-function java-pkg_ensure-vm-version-sufficient
985# 1423#
1134# @ebuild-function java-pkg_get-target 1572# @ebuild-function java-pkg_get-target
1135# 1573#
1136# Determines what target version should be used, for passing to -target. 1574# Determines what target version should be used, for passing to -target.
1137# If you don't care about lower versions, you can set _WANT_TARGET to the 1575# If you don't care about lower versions, you can set _WANT_TARGET to the
1138# version of your JDK. 1576# version of your JDK.
1139# Remember doing this will mostly like cause things to break.
1140# Doesn't allow it to be lower then the one in depend.
1141# Doesn't allow it to be higher then the active vm.
1142# 1577#
1143# @return string - Either the lowest possible target, or JAVA_PKG_WANT_TARGET 1578# @return string - Either the lowest possible target, or JAVA_PKG_WANT_TARGET
1144# ------------------------------------------------------------------------------ 1579# ------------------------------------------------------------------------------
1145java-pkg_get-target() { 1580java-pkg_get-target() {
1146 local min=$(depend-java-query --get-lowest "${DEPEND} ${RDEPEND}")
1147 if [[ -n "${JAVA_PKG_WANT_TARGET}" ]]; then
1148 local max="$(java-config --select-vm "${GENTOO_VM}" -g PROVIDES_VERSION)"
1149 if version_is_at_least "${min}" "${JAVA_PKG_WANT_TARGET}" && version_is_at_least "${JAVA_PKG_WANT_TARGET}" "${max}"; then
1150 echo ${JAVA_PKG_WANT_TARGET}
1151 else
1152 echo ${min}
1153 fi
1154 else
1155 echo ${min}
1156 fi
1157
1158 #echo ${JAVA_PKG_WANT_TARGET:-$(depend-java-query --get-lowest "${DEPEND}")} 1581 echo ${JAVA_PKG_WANT_TARGET:-$(depend-java-query --get-lowest "${DEPEND} ${RDEPEND}")}
1159} 1582}
1160 1583
1161java-pkg_get-javac() { 1584java-pkg_get-javac() {
1162 debug-print-function ${FUNCNAME} $* 1585 debug-print-function ${FUNCNAME} $*
1163 1586
1164 java-pkg_init-compiler_ 1587
1165 local compiler="${GENTOO_COMPILER}" 1588 local compiler="${GENTOO_COMPILER}"
1166 1589
1167 local compiler_executable 1590 local compiler_executable
1168 if [[ "${compiler}" = "javac" ]]; then 1591 if [[ "${compiler}" = "javac" ]]; then
1169 # nothing fancy needs to be done for javac 1592 # nothing fancy needs to be done for javac
1177 unset JAVAC 1600 unset JAVAC
1178 # try to get value of JAVAC 1601 # try to get value of JAVAC
1179 compiler_executable="$(source ${compiler_env} 1>/dev/null 2>&1; echo ${JAVAC})" 1602 compiler_executable="$(source ${compiler_env} 1>/dev/null 2>&1; echo ${JAVAC})"
1180 export JAVAC=${old_javac} 1603 export JAVAC=${old_javac}
1181 1604
1182 [[ -z ${compiler_executable} ]] && die "JAVAC is empty or undefined in ${compiler_env}" 1605 if [[ -z ${compiler_executable} ]]; then
1606 echo "JAVAC is empty or undefined in ${compiler_env}"
1607 return 1
1608 fi
1183 1609
1184 # check that it's executable 1610 # check that it's executable
1185 if [[ ! -x ${compiler_executable} ]]; then 1611 if [[ ! -x ${compiler_executable} ]]; then
1186 eerror "Could not find ${compiler_executable}!"
1187 die "${compiler_executable} doesn't exist, or isn't executable" 1612 echo "${compiler_executable} doesn't exist, or isn't executable"
1613 return 1
1188 fi 1614 fi
1189 else 1615 else
1190 eerror "Could not find environment file for ${compiler}" 1616 echo "Could not find environment file for ${compiler}"
1191 die "Could not find ${compiler_env}" 1617 return 1
1192 fi 1618 fi
1193 fi 1619 fi
1194 echo ${compiler_executable} 1620 echo ${compiler_executable}
1195} 1621}
1196 1622
1213 1639
1214 debug-print "want source: ${want_source}" 1640 debug-print "want source: ${want_source}"
1215 debug-print "want target: ${want_target}" 1641 debug-print "want target: ${want_target}"
1216 1642
1217 if [[ -z "${want_source}" || -z "${want_target}" ]]; then 1643 if [[ -z "${want_source}" || -z "${want_target}" ]]; then
1218 debug-print "could not find valid -source/-target values" 1644 debug-print "could not find valid -source/-target values for javac"
1219 die "Could not find valid -source/-target values" 1645 echo "Could not find valid -source/-target values for javac"
1646 return 1
1220 else 1647 else
1221 if java-pkg_is-vm-version-ge "1.4"; then 1648 if java-pkg_is-vm-version-ge "1.4"; then
1222 echo "${source_str} ${target_str}" 1649 echo "${source_str} ${target_str}"
1223 else 1650 else
1224 echo "${target_str}" 1651 echo "${target_str}"
1228 1655
1229# TODO document 1656# TODO document
1230java-pkg_get-jni-cflags() { 1657java-pkg_get-jni-cflags() {
1231 local flags="-I${JAVA_HOME}/include" 1658 local flags="-I${JAVA_HOME}/include"
1232 1659
1660 local platform="linux"
1661 use elibc_FreeBSD && platform="freebsd"
1662
1233 # TODO do a check that the directories are valid 1663 # TODO do a check that the directories are valid
1234 # TODO figure out how to cope with other things than linux...
1235 flags="${flags} -I${JAVA_HOME}/include/linux" 1664 flags="${flags} -I${JAVA_HOME}/include/${platform}"
1236 1665
1237 echo ${flags} 1666 echo ${flags}
1238} 1667}
1239 1668
1240java-pkg_ensure-gcj() { 1669java-pkg_ensure-gcj() {
1246 die "No GCJ support found!" 1675 die "No GCJ support found!"
1247 fi 1676 fi
1248} 1677}
1249 1678
1250java-pkg_ensure-test() { 1679java-pkg_ensure-test() {
1251 if hasq test ${FEATURES} && ! hasq -test ${FEATURES} && ! use test; then 1680 if hasq test ${FEATURES} && ! hasq -test ${FEATURES} \
1681 && hasq test ${IUSE} && ! use test;
1682 then
1252 eerror "You specified FEATURES=test, but USE=test is needed" 1683 eerror "You specified FEATURES=test, but USE=test is needed"
1253 eerror "to pull in the additional dependencies for testing" 1684 eerror "to pull in the additional dependencies for testing"
1254 die "Need USE=test enabled" 1685 die "Need USE=test enabled"
1255 fi 1686 fi
1256} 1687}
1257 1688
1258# ------------------------------------------------------------------------------ 1689# ------------------------------------------------------------------------------
1690# @ebuild-function java-pkg_register-ant-task
1691#
1692# Register this package as ant task, so that ant will load it when no specific
1693# ANT_TASKS are specified. Note that even without this registering, all packages
1694# specified in ANT_TASKS will be loaded. Mostly used by the actual ant tasks
1695# packages, but can be also used by other ebuilds that used to symlink their
1696# .jar into /usr/share/ant-core/lib to get autoloaded, for backwards
1697# compatibility.
1698#
1699# @param --version x.y Register only for ant version x.y (otherwise for any ant
1700# version). Used by the ant-* packages to prevent loading of mismatched
1701# ant-core ant tasks after core was updated, before the tasks are updated,
1702# without a need for blockers.
1703# @param $1 Name to register as. Defaults to JAVA_PKG_NAME ($PN[-$SLOT])
1704# ------------------------------------------------------------------------------
1705java-pkg_register-ant-task() {
1706 local TASKS_DIR="tasks"
1707
1708 # check for --version x.y parameters
1709 while [[ -n "${1}" && -n "${2}" ]]; do
1710 local var="${1#--}"
1711 local val="${2}"
1712 if [[ "${var}" == "version" ]]; then
1713 TASKS_DIR="tasks-${val}"
1714 else
1715 die "Unknown parameter passed to java-pkg_register-ant-tasks: ${1} ${2}"
1716 fi
1717 shift 2
1718 done
1719
1720 local TASK_NAME="${1:-${JAVA_PKG_NAME}}"
1721
1722 dodir /usr/share/ant/${TASKS_DIR}
1723 touch "${D}/usr/share/ant/${TASKS_DIR}/${TASK_NAME}"
1724}
1725
1726# ------------------------------------------------------------------------------
1727# @internal-function java-pkg_ant-tasks-from-deps
1728#
1729# Function to determine ANT_TASKS from DEPEND variable for backwards
1730# compatibility with ebuilds that don't set ANT_TASKS before calling eant() or
1731# WANT_ANT_TASKS before inheriting java-pkg-2. If the DEPEND string contains
1732# "dev-java/ant" or "dev-java/ant-tasks", then it returns "all", otherwise
1733# "none". It's not smart enough to cope with USE flag depends but that shouldn't
1734# be a problem, the worst it can do is activace all tasks when not needed.
1735# Note that this is called only with JAVA_PKG_STRICT=1, to find ebuilds with
1736# insufficient dependencies, otherwise all available tasks are used for
1737# backwards compatilbility.
1738#
1739# @return "all" or "none"
1740# ------------------------------------------------------------------------------
1741java-pkg_ant-tasks-from-deps() {
1742 local found_ant found_ant_tasks
1743
1744 for dep in ${DEPEND}
1745 do
1746 local ant="$(awk '/(dev-java\/ant)/ { if (match($1, "(dev-java/ant)((-[0-9])+|$)", m)) print m[1] }' <<< ${dep})"
1747 [[ "${ant}" == "dev-java/ant" ]] && found_ant=true
1748 [[ "${dep}" == *"ant-tasks"* ]] && found_ant_tasks=true
1749 done
1750
1751 if [[ -n "${found_ant}" || -n "${found_ant_tasks}" ]]; then
1752 java-pkg_announce-qa-violation --nodie "The ebuild DEPENDS on deprecated ant or ant-tasks"
1753 echo "all"
1754 else
1755 # ebuild doesn't set ANT_TASKS and doesn't depend on ant-tasks or ant
1756 # so we deactivate all tasks that may be installed
1757 echo "none"
1758 fi
1759}
1760
1761# ------------------------------------------------------------------------------
1762# @internal-function java-pkg_ant-tasks-depend
1763#
1764# Translates the WANT_ANT_TASKS variable into valid dependencies.
1765# ------------------------------------------------------------------------------
1766java-pkg_ant-tasks-depend() {
1767 debug-print-function ${FUNCNAME} ${WANT_ANT_TASKS}
1768
1769 if [[ -n "${WANT_ANT_TASKS}" ]]; then
1770 local DEP=""
1771 for i in ${WANT_ANT_TASKS}
1772 do
1773 if [[ ${i} != ant-* ]]; then
1774 echo "Invalid atom in WANT_ANT_TASKS: ${i}"
1775 return 1
1776 fi
1777 DEP="${DEP}dev-java/${i} "
1778 done
1779 echo ${DEP}
1780 return 0
1781 else
1782 return 0
1783 fi
1784}
1785
1786# ------------------------------------------------------------------------------
1787# @ebuild-function ejunit
1788#
1789# Junit wrapper function. Makes it easier to run the tests and checks for
1790# dev-java/junit in DEPEND. Launches the tests using junit.textui.TestRunner.
1791#
1792# Examples:
1793# ejunit -cp build/classes org.blinkenlights.jid3.test.AllTests
1794# ejunit org.blinkenlights.jid3.test.AllTests
1795#
1796# @param $1 - -cp or -classpath
1797# @param $2 - classpath; junit and recorded dependencies get appended
1798# @param $@ - the rest of the parameters are passed to java
1799# ------------------------------------------------------------------------------
1800ejunit() {
1801 debug-print-function ${FUNCNAME} $*
1802
1803 local pkgs
1804 for atom in $(cat ${JAVA_PKG_DEPEND_FILE} | tr : ' '); do
1805 pkgs=${pkgs},$(echo ${atom} | sed -re "s/^.*@//")
1806 done
1807
1808 local cp=$(java-pkg_getjars --with-dependencies junit${pkgs})
1809 if [[ ${1} = -cp || ${1} = -classpath ]]; then
1810 cp="${2}:${cp}"
1811 shift 2
1812 else
1813 cp=".:${cp}"
1814 fi
1815
1816 local runner=junit.textui.TestRunner
1817 debug-print "Calling: java -cp \"${cp}\" -Djava.awt.headless=true ${runner} ${@}"
1818 java -cp "${cp}" -Djava.awt.headless=true ${runner} "${@}" || die "Running junit failed"
1819}
1820
1821# ------------------------------------------------------------------------------
1259# @section-end helper 1822# @section-end helper
1260# ------------------------------------------------------------------------------ 1823# ------------------------------------------------------------------------------
1261 1824
1262# ------------------------------------------------------------------------------ 1825# ------------------------------------------------------------------------------
1263# @section-begin build 1826# @section-begin build
1269 1832
1270# ------------------------------------------------------------------------------ 1833# ------------------------------------------------------------------------------
1271# @ebuild-function eant 1834# @ebuild-function eant
1272# 1835#
1273# Ant wrapper function. Will use the appropriate compiler, based on user-defined 1836# Ant wrapper function. Will use the appropriate compiler, based on user-defined
1274# compiler. 1837# compiler. Will also set proper ANT_TASKS from the variable ANT_TASKS,
1275# 1838# variables:
1839# EANT_GENTOO_CLASSPATH - calls java-pkg_getjars for the value and adds to the
1840# gentoo.classpath property. Be sure to call
1841# java-ant_rewrite-classpath in src_unpack.
1842# JAVA_PKG_NO_BUNDLED_SEARCH - Don't search for bundled jars or class files
1843# *ANT_TASKS - used to determine ANT_TASKS before calling Ant.
1276# ------------------------------------------------------------------------------ 1844# ------------------------------------------------------------------------------
1277eant() { 1845eant() {
1278 debug-print-function ${FUNCNAME} $* 1846 debug-print-function ${FUNCNAME} $*
1279 1847
1280 # FIXME get this working 1848 if [[ ${EBUILD_PHASE} = compile ]]; then
1281# if is-java-strict && [[ ! ${DEPEND} =~ "dev-java/ant" ]]; then 1849 # Used to be done in hooks in java-ant-2.eclass but moved here so that we can
1850 # finally get rid of the hooks without breaking stuff
1851
1852 [[ "${JAVA_ANT_IGNORE_SYSTEM_CLASSES}" && "${JAVA_PKG_BSFIX}" ]] \
1853 && java-ant_ignore-system-classes "${S}/build.xml"
1854
1855 if hasq java-ant-2 ${INHERITED}; then
1856 java-ant_bsfix
1857 fi
1858
1859 # eant can be called multiple times
1860 JAVA_PKG_BSFIX="off"
1861
1862 if [[ -z ${JAVA_PKG_NO_BUNDLED_SEARCH} ]] && is-java-strict; then
1863 echo "Searching for bundled jars:"
1864 java-pkg_find-normal-jars || echo "None found."
1865 echo "Searching for bundled classes (no output if none found):"
1866 find "${WORKDIR}" -name "*.class"
1867 echo "Search done."
1868 JAVA_PKG_NO_BUNDLED_SEARCH=true # eant can be called many times
1869 fi
1870 fi
1871
1872 if ! hasq java-ant-2 ${INHERITED}; then
1873 local msg="You should inherit java-ant-2 when using eant"
1282# java-pkg_announce-qa-violation \ 1874 java-pkg_announce-qa-violation "${msg}"
1283# "Using eant, but not depending on dev-java/ant or dev-java/ant-core"
1284# fi 1875 fi
1285 1876
1286 local antflags 1877 local antflags="-Dnoget=true -Dmaven.mode.offline=true -Dbuild.sysclasspath=ignore"
1878
1287 java-pkg_init-compiler_ 1879 java-pkg_init-compiler_
1288 local compiler="${GENTOO_COMPILER}" 1880 local compiler="${GENTOO_COMPILER}"
1289 1881
1290 local compiler_env="${JAVA_PKG_COMPILER_DIR}/${compiler}" 1882 local compiler_env="${JAVA_PKG_COMPILER_DIR}/${compiler}"
1291
1292 local build_compiler="$(source ${compiler_env} 1>/dev/null 2>&1; echo ${ANT_BUILD_COMPILER})" 1883 local build_compiler="$(source ${compiler_env} 1>/dev/null 2>&1; echo ${ANT_BUILD_COMPILER})"
1293 if [[ "${compiler}" != "javac" && -z "${build_compiler}" ]]; then 1884 if [[ "${compiler}" != "javac" && -z "${build_compiler}" ]]; then
1294 die "ANT_BUILD_COMPILER undefined in ${compiler_env}" 1885 die "ANT_BUILD_COMPILER undefined in ${compiler_env}"
1295 fi 1886 fi
1296 1887
1297 if [[ ${compiler} != "javac" ]]; then 1888 if [[ ${compiler} != "javac" ]]; then
1298 antflags="-Dbuild.compiler=${build_compiler}" 1889 antflags="${antflags} -Dbuild.compiler=${build_compiler}"
1299 # Figure out any extra stuff to put on the classpath for compilers aside 1890 # Figure out any extra stuff to put on the classpath for compilers aside
1300 # from javac 1891 # from javac
1301 # ANT_BUILD_COMPILER_DEPS should be something that could be passed to 1892 # ANT_BUILD_COMPILER_DEPS should be something that could be passed to
1302 # java-config -p 1893 # java-config -p
1303 local build_compiler_deps="$(source ${JAVA_PKG_COMPILER_DIR}/${compiler} 1>/dev/null 2>&1; echo ${ANT_BUILD_COMPILER_DEPS})" 1894 local build_compiler_deps="$(source ${JAVA_PKG_COMPILER_DIR}/${compiler} 1>/dev/null 2>&1; echo ${ANT_BUILD_COMPILER_DEPS})"
1304 if [[ -n ${build_compiler_deps} ]]; then 1895 if [[ -n ${build_compiler_deps} ]]; then
1305 antflags="${antflags} -lib $(java-config -p ${build_compiler_deps})" 1896 antflags="${antflags} -lib $(java-config -p ${build_compiler_deps})"
1306 fi 1897 fi
1307 fi 1898 fi
1308 1899
1900 for arg in "${@}"; do
1901 if [[ ${arg} = -lib ]]; then
1902 if is-java-strict; then
1903 eerror "You should not use the -lib argument to eant because it will fail"
1904 eerror "with JAVA_PKG_STRICT. Please use for example java-pkg_jar-from"
1905 eerror "or ant properties to make dependencies available."
1906 eerror "For ant tasks use WANT_ANT_TASKS or ANT_TASKS from."
1907 eerror "split ant (>=dev-java/ant-core-1.7)."
1908 die "eant -lib is deprecated/forbidden"
1909 else
1910 echo "eant -lib is deprecated. Turn JAVA_PKG_STRICT on for"
1911 echo "more info."
1912 fi
1913 fi
1914 done
1915
1916 # we use this in src_* so we run ant from /
1917 if ROOT=/ has_version ">=dev-java/ant-core-1.7.0"; then
1918 # default ANT_TASKS to WANT_ANT_TASKS, if ANT_TASKS is not set explicitly
1919 ANT_TASKS="${ANT_TASKS:-${WANT_ANT_TASKS}}"
1920
1921 # override ANT_TASKS with JAVA_PKG_FORCE_ANT_TASKS if it's set
1922 ANT_TASKS="${JAVA_PKG_FORCE_ANT_TASKS:-${ANT_TASKS}}"
1923
1309 if is-java-strict; then 1924 if is-java-strict; then
1310 einfo "Disabling system classpath for ant" 1925 # if ant-tasks were not set by ebuild or forced, try to determine them from depends
1311 antflags="${antflags} -Dbuild.sysclasspath=ignore" 1926 if [[ -z "${ANT_TASKS}" ]]; then
1927 ANT_TASKS="$(java-pkg_ant-tasks-from-deps)"
1928 fi
1929 else
1930 # if ant-tasks is not set by ebuild or forced, activate all of them
1931 ANT_TASKS="${ANT_TASKS:-all}"
1312 fi 1932 fi
1313 1933
1314 if [[ -n ${JAVA_PKG_DEBUG} ]]; then 1934 # at this point, ANT_TASKS should be "all", "none" or explicit list
1315 antflags="${antflags} -debug" 1935 if [[ "${ANT_TASKS}" == "all" ]]; then
1936 einfo "Using all available ANT_TASKS"
1937 elif [[ "${ANT_TASKS}" == "none" ]]; then
1938 einfo "Disabling all optional ANT_TASKS"
1939 else
1940 einfo "Using following ANT_TASKS: ${ANT_TASKS}"
1941 fi
1942
1943 export ANT_TASKS
1944 fi
1945
1946 [[ -n ${JAVA_PKG_DEBUG} ]] && antflags="${antflags} --execdebug -debug"
1947 [[ -n ${PORTAGE_QUIET} ]] && antflags="${antflags} -q"
1948
1949 local gcp="${EANT_GENTOO_CLASSPATH}"
1950 local getjarsarg=""
1951
1952 if [[ ${EBUILD_PHASE} = "test" ]]; then
1953 antflags="${antflags} -DJunit.present=true"
1954 [[ ${gcp} && ${ANT_TASKS} = *ant-junit* ]] && gcp="${gcp} junit"
1955 getjarsarg="--with-dependencies"
1956 fi
1957
1958 local cp
1959
1960 for atom in ${gcp}; do
1961 cp="${cp}:$(java-pkg_getjars ${getjarsarg} ${atom})"
1962 done
1963
1964 if [[ ${cp} ]]; then
1965 # It seems ant does not like single quotes around ${cp}
1966 antflags="${antflags} -Dgentoo.classpath=\"${cp#:}\""
1316 fi 1967 fi
1317 1968
1318 [[ -n ${JAVA_PKG_DEBUG} ]] && echo ant ${antflags} "${@}" 1969 [[ -n ${JAVA_PKG_DEBUG} ]] && echo ant ${antflags} "${@}"
1970 debug-print "Calling ant (GENTOO_VM: ${GENTOO_VM}): ${antflags} ${@}"
1319 ant ${antflags} "${@}" || die "eant failed" 1971 ant ${antflags} "${@}" || die "eant failed"
1320
1321} 1972}
1322 1973
1323# ------------------------------------------------------------------------------ 1974# ------------------------------------------------------------------------------
1324# @ebuild-function ejavac 1975# @ebuild-function ejavac
1325# 1976#
1329# @param $@ - Arguments to be passed to the compiler 1980# @param $@ - Arguments to be passed to the compiler
1330# ------------------------------------------------------------------------------ 1981# ------------------------------------------------------------------------------
1331ejavac() { 1982ejavac() {
1332 debug-print-function ${FUNCNAME} $* 1983 debug-print-function ${FUNCNAME} $*
1333 1984
1334 # FIXME using get-javac ends up printing stuff with einfo 1985 java-pkg_init-compiler_
1986
1987 local compiler_executable
1335# local compiler_executable=$(java-pkg_get-javac) 1988 compiler_executable=$(java-pkg_get-javac)
1336 local compiler_executable="javac" 1989 if [[ ${?} != 0 ]]; then
1990 eerror "There was a problem determining compiler: ${compiler_executable}"
1991 die "get-javac failed"
1992 fi
1337 1993
1994 local javac_args
1995 javac_args="$(java-pkg_javac-args)"
1996 if [[ ${?} != 0 ]]; then
1997 eerror "There was a problem determining JAVACFLAGS: ${javac_args}"
1998 die "java-pkg_javac-args failed"
1999 fi
2000
1338 [[ -n ${JAVA_PKG_DEBUG} ]] && echo ${compiler_executable} $(java-pkg_javac-args) "${@}" 2001 [[ -n ${JAVA_PKG_DEBUG} ]] && echo ${compiler_executable} ${javac_args} "${@}"
1339 ${compiler_executable} $(java-pkg_javac-args) "${@}" || die "ejavac failed" 2002 ${compiler_executable} ${javac_args} "${@}" || die "ejavac failed"
1340} 2003}
1341 2004
1342# ------------------------------------------------------------------------------ 2005# ------------------------------------------------------------------------------
1343# @ebuild-function java-pkg_filter-compiler 2006# @ebuild-function java-pkg_filter-compiler
1344# 2007#
1382# ------------------------------------------------------------------------------ 2045# ------------------------------------------------------------------------------
1383use_doc() { 2046use_doc() {
1384 use doc && echo ${@:-javadoc} 2047 use doc && echo ${@:-javadoc}
1385} 2048}
1386 2049
2050
1387# ------------------------------------------------------------------------------ 2051# ------------------------------------------------------------------------------
1388# @section-end build 2052# @section-end build
1389# ------------------------------------------------------------------------------ 2053# ------------------------------------------------------------------------------
1390 2054
1391# ------------------------------------------------------------------------------ 2055# ------------------------------------------------------------------------------
1407# This shouldn't be used directly. Instead, java-pkg and java-pkg-opt will 2071# This shouldn't be used directly. Instead, java-pkg and java-pkg-opt will
1408# call it during each of the phases of the merge process. 2072# call it during each of the phases of the merge process.
1409# 2073#
1410# ----------------------------------------------------------------------------- 2074# -----------------------------------------------------------------------------
1411java-pkg_init() { 2075java-pkg_init() {
2076 debug-print-function ${FUNCNAME} $*
1412 unset JAVAC 2077 unset JAVAC
1413 unset JAVA_HOME 2078 unset JAVA_HOME
2079
2080 # People do all kinds of weird things.
2081 # http://forums.gentoo.org/viewtopic-p-3943166.html
2082 local silence="${SILENCE_JAVA_OPTIONS_WARNING}"
2083 local accept="${I_WANT_GLOBAL_JAVA_OPTIONS}"
2084 if [[ -n ${_JAVA_OPTIONS} && -z ${accept} && -z ${silence} ]]; then
2085 ewarn "_JAVA_OPTIONS changes what java -version outputs at least for"
2086 ewarn "sun-jdk vms and and as such break configure scripts that"
2087 ewarn "use it (for example app-office/openoffice) so we filter it out."
2088 ewarn "Use SILENCE_JAVA_OPTIONS_WARNING=true in the environment (use"
2089 ewarn "make.conf for example) to silence this warning or"
2090 ewarn "I_WANT_GLOBAL_JAVA_OPTIONS to not filter it."
2091 fi
2092
2093 if [[ -z ${accept} ]]; then
2094 # export _JAVA_OPTIONS= doesn't work because it will show up in java
2095 # -version output
2096 unset _JAVA_OPTIONS
2097 # phase hooks make this run many times without this
2098 I_WANT_GLOBAL_JAVA_OPTIONS="true"
2099 fi
2100
2101 if java-pkg_func-exists ant_src_unpack; then
2102 java-pkg_announce-qa-violation "Using old ant_src_unpack. Should be src_unpack"
2103 fi
2104
1414 java-pkg_init_paths_ 2105 java-pkg_init_paths_
1415 java-pkg_switch-vm 2106 java-pkg_switch-vm
1416 PATH=${JAVA_HOME}/bin:${PATH} 2107 PATH=${JAVA_HOME}/bin:${PATH}
1417 2108
1418 # TODO we will probably want to set JAVAC and JAVACFLAGS 2109 # TODO we will probably want to set JAVAC and JAVACFLAGS
1419 2110
1420 # Do some QA checks 2111 # Do some QA checks
1421 java-pkg_check-jikes 2112 java-pkg_check-jikes
2113
2114 # Can't use unset here because Portage does not save the unset
2115 # see https://bugs.gentoo.org/show_bug.cgi?id=189417#c11
1422 2116
1423 # When users have crazy classpaths some packages can fail to compile. 2117 # When users have crazy classpaths some packages can fail to compile.
1424 # and everything should work with empty CLASSPATH. 2118 # and everything should work with empty CLASSPATH.
1425 # This also helps prevent unexpected dependencies on random things 2119 # This also helps prevent unexpected dependencies on random things
1426 # from the CLASSPATH. 2120 # from the CLASSPATH.
1427 unset CLASSPATH 2121 export CLASSPATH=
2122
2123 # Unset external ANT_ stuff
2124 export ANT_TASKS=
2125 export ANT_OPTS=
1428} 2126}
1429 2127
1430# ------------------------------------------------------------------------------ 2128# ------------------------------------------------------------------------------
1431# @function-internal java-pkg-init-compiler_ 2129# @function-internal java-pkg-init-compiler_
1432# 2130#
1554 fi 2252 fi
1555 2253
1556 JAVA_PKG_SHAREPATH="${DESTTREE}/share/${JAVA_PKG_NAME}" 2254 JAVA_PKG_SHAREPATH="${DESTTREE}/share/${JAVA_PKG_NAME}"
1557 JAVA_PKG_SOURCESPATH="${JAVA_PKG_SHAREPATH}/sources/" 2255 JAVA_PKG_SOURCESPATH="${JAVA_PKG_SHAREPATH}/sources/"
1558 JAVA_PKG_ENV="${D}${JAVA_PKG_SHAREPATH}/package.env" 2256 JAVA_PKG_ENV="${D}${JAVA_PKG_SHAREPATH}/package.env"
2257 JAVA_PKG_VIRTUALS_PATH="${DESTTREE}/share/java-config-2/virtuals"
2258 JAVA_PKG_VIRTUAL_PROVIDER="${D}/${JAVA_PKG_VIRTUALS_PATH}/${JAVA_PKG_NAME}"
1559 2259
1560 [[ -z "${JAVA_PKG_JARDEST}" ]] && JAVA_PKG_JARDEST="${JAVA_PKG_SHAREPATH}/lib" 2260 [[ -z "${JAVA_PKG_JARDEST}" ]] && JAVA_PKG_JARDEST="${JAVA_PKG_SHAREPATH}/lib"
1561 [[ -z "${JAVA_PKG_LIBDEST}" ]] && JAVA_PKG_LIBDEST="${DESTTREE}/$(get_libdir)/${JAVA_PKG_NAME}" 2261 [[ -z "${JAVA_PKG_LIBDEST}" ]] && JAVA_PKG_LIBDEST="${DESTTREE}/$(get_libdir)/${JAVA_PKG_NAME}"
1562 [[ -z "${JAVA_PKG_WARDEST}" ]] && JAVA_PKG_WARDEST="${JAVA_PKG_SHAREPATH}/webapps" 2262 [[ -z "${JAVA_PKG_WARDEST}" ]] && JAVA_PKG_WARDEST="${JAVA_PKG_SHAREPATH}/webapps"
1563 2263
1576# Writes the package.env out to disk. 2276# Writes the package.env out to disk.
1577# 2277#
1578# ------------------------------------------------------------------------------ 2278# ------------------------------------------------------------------------------
1579# TODO change to do-write, to match everything else 2279# TODO change to do-write, to match everything else
1580java-pkg_do_write_() { 2280java-pkg_do_write_() {
2281 debug-print-function ${FUNCNAME} $*
2282 java-pkg_init_paths_
1581 # Create directory for package.env 2283 # Create directory for package.env
1582 dodir "${JAVA_PKG_SHAREPATH}" 2284 dodir "${JAVA_PKG_SHAREPATH}"
1583 if [[ -n "${JAVA_PKG_CLASSPATH}" || -n "${JAVA_PKG_LIBRARY}" || -f "${JAVA_PKG_DEPEND}" ]]; then 2285 if [[ -n "${JAVA_PKG_CLASSPATH}" || -n "${JAVA_PKG_LIBRARY}" || -f \
2286 "${JAVA_PKG_DEPEND_FILE}" || -f \
2287 "${JAVA_PKG_OPTIONAL_DEPEND_FILE}" ]]; then
1584 # Create package.env 2288 # Create package.env
1585 ( 2289 (
1586 echo "DESCRIPTION=\"${DESCRIPTION}\"" 2290 echo "DESCRIPTION=\"${DESCRIPTION}\""
1587 echo "GENERATION=\"2\"" 2291 echo "GENERATION=\"2\""
1588 2292
1589 [[ -n "${JAVA_PKG_CLASSPATH}" ]] && echo "CLASSPATH=\"${JAVA_PKG_CLASSPATH}\"" 2293 [[ -n "${JAVA_PKG_CLASSPATH}" ]] && echo "CLASSPATH=\"${JAVA_PKG_CLASSPATH}\""
1590 [[ -n "${JAVA_PKG_LIBRARY}" ]] && echo "LIBRARY_PATH=\"${JAVA_PKG_LIBRARY}\"" 2294 [[ -n "${JAVA_PKG_LIBRARY}" ]] && echo "LIBRARY_PATH=\"${JAVA_PKG_LIBRARY}\""
1591 [[ -n "${JAVA_PROVIDE}" ]] && echo "PROVIDES=\"${JAVA_PROVIDE}\"" 2295 [[ -n "${JAVA_PROVIDE}" ]] && echo "PROVIDES=\"${JAVA_PROVIDE}\""
1592 [[ -f "${JAVA_PKG_DEPEND}" ]] && echo "DEPEND=\"$(cat ${JAVA_PKG_DEPEND} | uniq | tr '\n' ':')\"" 2296 [[ -f "${JAVA_PKG_DEPEND_FILE}" ]] \
2297 && echo "DEPEND=\"$(cat "${JAVA_PKG_DEPEND_FILE}" | uniq | tr '\n' ':')\""
2298 [[ -f "${JAVA_PKG_OPTIONAL_DEPEND_FILE}" ]] \
2299 && echo "OPTIONAL_DEPEND=\"$(cat "${JAVA_PKG_OPTIONAL_DEPEND_FILE}" | uniq | tr '\n' ':')\""
1593 echo "VM=\"$(echo ${RDEPEND} ${DEPEND} | sed -e 's/ /\n/g' | sed -n -e '/virtual\/\(jre\|jdk\)/ { p;q }')\"" # TODO cleanup ! 2300 echo "VM=\"$(echo ${RDEPEND} ${DEPEND} | sed -e 's/ /\n/g' | sed -n -e '/virtual\/\(jre\|jdk\)/ { p;q }')\"" # TODO cleanup !
1594 ) > "${JAVA_PKG_ENV}" 2301 ) > "${JAVA_PKG_ENV}"
1595 2302
1596 # register target/source 2303 # register target/source
1597 local target="$(java-pkg_get-target)" 2304 local target="$(java-pkg_get-target)"
1608 2315
1609 2316
1610 echo "MERGE_VM=\"${GENTOO_VM}\"" >> "${JAVA_PKG_ENV}" 2317 echo "MERGE_VM=\"${GENTOO_VM}\"" >> "${JAVA_PKG_ENV}"
1611 [[ -n ${GENTOO_COMPILER} ]] && echo "MERGE_COMPILER=\"${GENTOO_COMPILER}\"" >> "${JAVA_PKG_ENV}" 2318 [[ -n ${GENTOO_COMPILER} ]] && echo "MERGE_COMPILER=\"${GENTOO_COMPILER}\"" >> "${JAVA_PKG_ENV}"
1612 2319
2320 # extra env variables
2321 if [[ -n "${JAVA_PKG_EXTRA_ENV_VARS}" ]]; then
2322 cat "${JAVA_PKG_EXTRA_ENV}" >> "${JAVA_PKG_ENV}" || die
2323 # nested echo to remove leading/trailing spaces
2324 echo "ENV_VARS=\"$(echo ${JAVA_PKG_EXTRA_ENV_VARS})\"" \
2325 >> "${JAVA_PKG_ENV}" || die
2326 fi
2327
1613 # Strip unnecessary leading and trailing colons 2328 # Strip unnecessary leading and trailing colons
1614 # TODO try to cleanup if possible 2329 # TODO try to cleanup if possible
1615 sed -e "s/=\":/=\"/" -e "s/:\"$/\"/" -i "${JAVA_PKG_ENV}" || die "Did you forget to call java_init ?" 2330 sed -e "s/=\":/=\"/" -e "s/:\"$/\"/" -i "${JAVA_PKG_ENV}" || die "Did you forget to call java_init ?"
2331 else
2332 debug-print "JAVA_PKG_CLASSPATH, JAVA_PKG_LIBRARY, JAVA_PKG_DEPEND_FILE"
2333 debug-print "or JAVA_PKG_OPTIONAL_DEPEND_FILE not defined so can't"
2334 debug-print "write package.env."
1616 fi 2335 fi
1617} 2336}
1618
1619 2337
1620# ------------------------------------------------------------------------------ 2338# ------------------------------------------------------------------------------
1621# @internal-function java-pkg_record-jar_ 2339# @internal-function java-pkg_record-jar_
1622# 2340#
1623# Record a dependency to the package.env 2341# Record an (optional) dependency to the package.env
1624# 2342# @param --optional - record dependency as optional
2343# @param $1 - package to record
2344# @param $2 - (optional) jar of package to record
1625# ------------------------------------------------------------------------------ 2345# ------------------------------------------------------------------------------
1626JAVA_PKG_DEPEND="${T}/java-pkg-depend" 2346JAVA_PKG_DEPEND_FILE="${T}/java-pkg-depend"
2347JAVA_PKG_OPTIONAL_DEPEND_FILE="${T}/java-pkg-optional-depend"
1627 2348
1628java-pkg_record-jar_() { 2349java-pkg_record-jar_() {
1629 debug-print-function ${FUNCNAME} $* 2350 debug-print-function ${FUNCNAME} $*
2351
2352 local depend_file="${JAVA_PKG_DEPEND_FILE}"
2353 if [[ "${1}" == "--optional" ]]; then
2354 depend_file="${JAVA_PKG_OPTIONAL_DEPEND_FILE}"
2355 shift
2356 fi
1630 2357
1631 local pkg=${1} jar=${2} append 2358 local pkg=${1} jar=${2} append
1632 if [[ -z "${jar}" ]]; then 2359 if [[ -z "${jar}" ]]; then
1633 append="${pkg}" 2360 append="${pkg}"
1634 else 2361 else
1635 append="$(basename ${jar})@${pkg}" 2362 append="$(basename ${jar})@${pkg}"
1636 fi 2363 fi
1637 2364
1638 echo ${append} >> ${JAVA_PKG_DEPEND} 2365 echo "${append}" >> "${depend_file}"
1639} 2366}
1640 2367
1641# ------------------------------------------------------------------------------ 2368# ------------------------------------------------------------------------------
1642# @internal-function java-pkg_append_ 2369# @internal-function java-pkg_append_
1643# 2370#
1703# 2430#
1704# ------------------------------------------------------------------------------ 2431# ------------------------------------------------------------------------------
1705java-pkg_setup-vm() { 2432java-pkg_setup-vm() {
1706 debug-print-function ${FUNCNAME} $* 2433 debug-print-function ${FUNCNAME} $*
1707 2434
2435 export LANG="C" LC_ALL="C"
2436
1708 local vendor="$(java-pkg_get-vm-vendor)" 2437 local vendor="$(java-pkg_get-vm-vendor)"
1709 if [[ "${vendor}" == "sun" ]] && java-pkg_is-vm-version-ge 1 5; then 2438 if [[ "${vendor}" == "sun" ]] && java-pkg_is-vm-version-ge "1.5" ; then
1710 addpredict "/dev/random" 2439 addpredict "/dev/random"
1711 elif [[ "${vendor}" == "ibm" ]]; then 2440 elif [[ "${vendor}" == "ibm" ]]; then
1712 addpredict "/proc/self/maps" 2441 addpredict "/proc/self/maps"
1713 addpredict "/proc/cpuinfo" 2442 addpredict "/proc/cpuinfo"
1714 export LANG="C" LC_ALL="C"
1715 elif [[ "${vendor}" == "jrockit" ]]; then 2443 elif [[ "${vendor}" == "jrockit" ]]; then
1716 addpredict "/proc/cpuinfo" 2444 addpredict "/proc/cpuinfo"
1717 fi 2445 fi
1718} 2446}
1719 2447
1763# @return - The version of the current VM 2491# @return - The version of the current VM
1764# ------------------------------------------------------------------------------ 2492# ------------------------------------------------------------------------------
1765java-pkg_get-vm-version() { 2493java-pkg_get-vm-version() {
1766 debug-print-function ${FUNCNAME} $* 2494 debug-print-function ${FUNCNAME} $*
1767 2495
1768 java-pkg_get-current-vm | sed -e "s/.*-\([0-9.]\+\).*/\1/" 2496 java-config -g PROVIDES_VERSION
1769} 2497}
1770 2498
1771# ------------------------------------------------------------------------------ 2499# ------------------------------------------------------------------------------
1772# @internal-function java-pkg_switch-vm 2500# @internal-function java-pkg_switch-vm
1773# 2501#
1774# Switch VM if we're allowed to (controlled by JAVA_PKG_ALLOW_VM_CHANGE), and 2502# Switch VM if we're allowed to (controlled by JAVA_PKG_ALLOW_VM_CHANGE), and
1775# verify that the current VM is sufficient. 2503# verify that the current VM is sufficient.
1776# Setup the environment for the VM being used. 2504# Setup the environment for the VM being used.
1777# ------------------------------------------------------------------------------ 2505# ------------------------------------------------------------------------------
1778java-pkg_switch-vm() { 2506java-pkg_switch-vm() {
2507 debug-print-function ${FUNCNAME} $*
2508
1779 if java-pkg_needs-vm; then 2509 if java-pkg_needs-vm; then
1780 # Use the VM specified by JAVA_PKG_FORCE_VM 2510 # Use the VM specified by JAVA_PKG_FORCE_VM
1781 if [[ -n ${JAVA_PKG_FORCE_VM} ]]; then 2511 if [[ -n "${JAVA_PKG_FORCE_VM}" ]]; then
1782 # If you're forcing the VM, I hope you know what your doing... 2512 # If you're forcing the VM, I hope you know what your doing...
2513 debug-print "JAVA_PKG_FORCE_VM used: ${JAVA_PKG_FORCE_VM}"
1783 export GENTOO_VM="${JAVA_PKG_FORCE_VM}" 2514 export GENTOO_VM="${JAVA_PKG_FORCE_VM}"
1784 # if we're allowed to switch the vm... 2515 # if we're allowed to switch the vm...
1785 elif [[ "${JAVA_PKG_ALLOW_VM_CHANGE}" == "yes" ]]; then 2516 elif [[ "${JAVA_PKG_ALLOW_VM_CHANGE}" == "yes" ]]; then
1786 debug-print "depend-java-query: NV_DEPEND: ${JAVA_PKG_NV_DEPEND:-${DEPEND}} VNEED: ${JAVA_PKG_VNEED}" 2517 debug-print "depend-java-query: NV_DEPEND: ${JAVA_PKG_NV_DEPEND:-${DEPEND}} VNEED: ${JAVA_PKG_VNEED}"
1787 if [[ -n ${JAVA_PKG_VNEED} ]]; then 2518 if [[ -n ${JAVA_PKG_VNEED} ]]; then
1788 export GENTOO_VM="$(depend-java-query --need-virtual "${JAVA_PKG_VNEED}" --get-vm "${JAVA_PKG_NV_DEPEND:-${DEPEND}}")" 2519 GENTOO_VM="$(depend-java-query --need-virtual "${JAVA_PKG_VNEED}" --get-vm "${JAVA_PKG_NV_DEPEND:-${DEPEND}}")"
1789 else 2520 else
1790 export GENTOO_VM="$(depend-java-query --get-vm "${JAVA_PKG_NV_DEPEND:-${DEPEND}}")" 2521 GENTOO_VM="$(depend-java-query --get-vm "${JAVA_PKG_NV_DEPEND:-${DEPEND}}")"
2522 fi
2523 if [[ -z "${GENTOO_VM}" || "${GENTOO_VM}" == "None" ]]; then
2524 eerror "Unable to determine VM for building from dependencies:"
2525 echo "NV_DEPEND: ${JAVA_PKG_NV_DEPEND:-${DEPEND}}"
2526 echo "VNEED: ${JAVA_PKG_VNEED}"
2527 die "Failed to determine VM for building."
2528 else
2529 export GENTOO_VM
1791 fi 2530 fi
1792 # otherwise just make sure the current VM is sufficient 2531 # otherwise just make sure the current VM is sufficient
1793 else 2532 else
1794 java-pkg_ensure-vm-version-sufficient 2533 java-pkg_ensure-vm-version-sufficient
1795 fi 2534 fi
1797 2536
1798 java-pkg_setup-vm 2537 java-pkg_setup-vm
1799 2538
1800 export JAVA=$(java-config --java) 2539 export JAVA=$(java-config --java)
1801 export JAVAC=$(java-config --javac) 2540 export JAVAC=$(java-config --javac)
1802 export JAVACFLAGS="$(java-pkg_javac-args)" 2541 JAVACFLAGS="$(java-pkg_javac-args)"
2542 if [[ ${?} != 0 ]]; then
2543 eerror "There was a problem determining JAVACFLAGS: ${JAVACFLAGS}"
2544 die "java-pkg_javac-args failed"
2545 fi
1803 [[ -n ${JAVACFLAGS_EXTRA} ]] && export JAVACFLAGS="${JAVACFLAGS_EXTRA} ${JAVACFLAGS}" 2546 [[ -n ${JAVACFLAGS_EXTRA} ]] && JAVACFLAGS="${JAVACFLAGS_EXTRA} ${JAVACFLAGS}"
2547 export JAVACFLAGS
1804 2548
1805 export JAVA_HOME="$(java-config -g JAVA_HOME)" 2549 export JAVA_HOME="$(java-config -g JAVA_HOME)"
1806 export JDK_HOME=${JAVA_HOME} 2550 export JDK_HOME=${JAVA_HOME}
1807 2551
1808 #TODO If you know a better solution let us know. 2552 #TODO If you know a better solution let us know.
1809 java-pkg_append_ LD_LIBRARY_PATH "$(java-config -g LDPATH)" 2553 java-pkg_append_ LD_LIBRARY_PATH "$(java-config -g LDPATH)"
1810 2554
1811 local tann="${T}/announced-vm" 2555 local tann="${T}/announced-vm"
2556 # With the hooks we should only get here once from pkg_setup but better safe than sorry
2557 # if people have for example modified eclasses some where
1812 if [[ -n "${JAVA_PKG_DEBUG}" ]] || [[ ! -f "${tann}" ]] ; then 2558 if [[ -n "${JAVA_PKG_DEBUG}" ]] || [[ ! -f "${tann}" ]] ; then
1813 # Add a check for setup/preinst phase... to avoid duplicate outputs
1814 # for when FEATURES=buildpkg
1815 if [[ ${EBUILD_PHASE} != "setup" && ${EBUILD_PHASE} != "preinst" && ${EBUILD_PHASE} != "postinst" ]];
1816 then
1817 einfo "Using: $(java-config -f)" 2559 einfo "Using: $(java-config -f)"
1818 [[ ! -f "${tann}" ]] && touch "${tann}" 2560 [[ ! -f "${tann}" ]] && touch "${tann}"
1819 fi
1820 fi 2561 fi
1821 2562
1822 else 2563 else
1823 [[ -n "${JAVA_PKG_DEBUG}" ]] && ewarn "!!! This package inherits java-pkg but doesn't depend on a JDK. -bin or broken dependency!!!" 2564 [[ -n "${JAVA_PKG_DEBUG}" ]] && ewarn "!!! This package inherits java-pkg but doesn't depend on a JDK. -bin or broken dependency!!!"
1824 fi 2565 fi
1854 einfo "Classes" 2595 einfo "Classes"
1855 find "${S}" -type f -name '*.class' -print0 | xargs -0 -r -n 500 ls -ald | sed -e "s,${WORKDIR},\${WORKDIR}," 2596 find "${S}" -type f -name '*.class' -print0 | xargs -0 -r -n 500 ls -ald | sed -e "s,${WORKDIR},\${WORKDIR},"
1856 fi 2597 fi
1857} 2598}
1858 2599
1859# TODO document 2600# ------------------------------------------------------------------------------
2601# @internal-function java-pkg_verify-classes
2602#
1860# Verify that the classes were compiled for the right source / target 2603# Verify that the classes were compiled for the right source / target. Dies if
2604# not.
2605# @param $1 (optional) - the file to check, otherwise checks whole ${D}
2606# ------------------------------------------------------------------------------
1861java-pkg_verify-classes() { 2607java-pkg_verify-classes() {
1862 ebegin "Verifying java class versions"
1863 #$(find ${D} -type f -name '*.jar' -o -name '*.class') 2608 #$(find ${D} -type f -name '*.jar' -o -name '*.class')
1864 class-version-verify.py -t $(java-pkg_get-target) -r ${D} 2609 local target=$(java-pkg_get-target)
2610 local result
2611 local log="${T}/class-version-verify.log"
2612 if [[ -n "${1}" ]]; then
2613 class-version-verify.py -v -t ${target} "${1}" > "${log}"
1865 result=$? 2614 result=$?
1866 eend ${result}
1867 if [[ ${result} == 0 ]]; then
1868 einfo "All good"
1869 else 2615 else
1870 ewarn "Possible problem" 2616 ebegin "Verifying java class versions (target: ${target})"
1871 die "Bad class files found" 2617 class-version-verify.py -v -t ${target} -r "${D}" > "${log}"
2618 result=$?
2619 eend ${result}
2620 fi
2621 [[ -n ${JAVA_PKG_DEBUG} ]] && cat "${log}"
2622 if [[ ${result} != 0 ]]; then
2623 eerror "Incorrect bytecode version found"
2624 [[ -n "${1}" ]] && eerror "in file: ${1}"
2625 eerror "See ${log} for more details."
2626 die "Incorrect bytecode found"
2627 fi
2628}
2629
2630# ----------------------------------------------------------------------------
2631# @internal-function java-pkg_ensure-dep
2632# Check that a package being used in jarfrom, getjars and getjar is contained
2633# within DEPEND or RDEPEND.
2634# @param $1 - empty - check both vars; "runtime" or "build" - check only
2635# RDEPEND, resp. DEPEND
2636# @param $2 - Package name and slot.
2637
2638java-pkg_ensure-dep() {
2639 debug-print-function ${FUNCNAME} $*
2640
2641 local limit_to="${1}"
2642 local target_pkg="${2}"
2643 local dev_error=""
2644
2645 local stripped_pkg=$(echo "${target_pkg}" | sed \
2646 's/-[0-9]*\(\.[0-9]\)*$//')
2647
2648 debug-print "Matching against: ${stripped_pkg}"
2649
2650 if [[ ${limit_to} != runtime && ! ( "${DEPEND}" =~ "$stripped_pkg" ) ]]; then
2651 dev_error="The ebuild is attempting to use ${target_pkg} that is not"
2652 dev_error="${dev_error} declared in DEPEND."
2653 if is-java-strict; then
2654 eerror "${dev_error}"
2655 die "${dev_error}"
2656 elif [[ ${BASH_SUBSHELL} = 0 ]]; then
2657 eerror "${dev_error}"
2658 elog "Because you have this package installed the package will"
2659 elog "build without problems, but please report this to"
2660 elog "http://bugs.gentoo.org"
1872 fi 2661 fi
1873} 2662 fi
1874 2663
2664 if [[ ${limit_to} != build ]]; then
2665 if [[ ! ( ${RDEPEND} =~ "${stripped_pkg}" ) ]]; then
2666 if [[ ! ( ${PDEPEND} =~ "${stripped_pkg}" ) ]]; then
2667 dev_error="The ebuild is attempting to use ${target_pkg},"
2668 dev_error="${dev_error} without specifying --build-only, that is not declared in RDEPEND"
2669 dev_error="${dev_error} or PDEPEND."
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 "The package will build without problems, but may fail to run"
2676 elog "if you don't have ${target_pkg} installed, so please report"
2677 elog "this to http://bugs.gentoo.org"
2678 fi
2679 fi
2680 fi
2681 fi
2682}
1875 2683
1876# ------------------------------------------------------------------------------ 2684# ------------------------------------------------------------------------------
1877# @section-end internal 2685# @section-end internal
1878# ------------------------------------------------------------------------------ 2686# ------------------------------------------------------------------------------
1879 2687
1880java-pkg_check-phase() { 2688java-pkg_check-phase() {
1881 local phase=${1} 2689 local phase=${1}
1882 local funcname=${2} 2690 local funcname=${FUNCNAME[1]}
1883 if is-java-strict && [[ ${EBUILD_PHASE} != ${phase} ]]; then 2691 if [[ ${EBUILD_PHASE} != ${phase} ]]; then
1884 java-pkg_announce-qa-violation \
1885 "${funcname} used outside of src_${phase}" 2692 local msg="${funcname} used outside of src_${phase}"
2693 java-pkg_announce-qa-violation "${msg}"
1886 fi 2694 fi
1887} 2695}
1888 2696
1889java-pkg_check-versioned-jar() { 2697java-pkg_check-versioned-jar() {
1890 local jar=${1} 2698 local jar=${1}
1899 java-pkg_announce-qa-violation "deprecated USE flag 'jikes' in IUSE" 2707 java-pkg_announce-qa-violation "deprecated USE flag 'jikes' in IUSE"
1900 fi 2708 fi
1901} 2709}
1902 2710
1903java-pkg_announce-qa-violation() { 2711java-pkg_announce-qa-violation() {
1904 if is-java-strict; then 2712 local nodie
2713 if [[ ${1} == "--nodie" ]]; then
2714 nodie="true"
2715 shift
2716 fi
1905 echo "Java QA Notice: $@" >&2 2717 echo "Java QA Notice: $@" >&2
1906 increment-qa-violations 2718 increment-qa-violations
1907 fi 2719 [[ -z "${nodie}" ]] && is-java-strict && die "${@}"
1908} 2720}
1909 2721
1910increment-qa-violations() { 2722increment-qa-violations() {
1911 let "JAVA_PKG_QA_VIOLATIONS+=1" 2723 let "JAVA_PKG_QA_VIOLATIONS+=1"
1912 export JAVA_PKG_QA_VIOLATIONS 2724 export JAVA_PKG_QA_VIOLATIONS

Legend:
Removed from v.1.20  
changed lines
  Added in v.1.102

  ViewVC Help
Powered by ViewVC 1.1.20