/[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.135
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.135 2010/04/28 19:40:40 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# -----------------------------------------------------------------------------
39JAVA_PKG_PORTAGE_DEP=">=sys-apps/portage-2.1_pre1" 41# @variable-external WANT_ANT_TASKS
42# @variable-default ""
43#
44# An $IFS separated list of ant tasks.
45# Ebuild can specify this variable before inheriting java-ant-2 eclass to
46# determine ANT_TASKS it needs. They will be automatically translated to
47# DEPEND variable and ANT_TASKS variable. JAVA_PKG_FORCE_ANT_TASKS can override
48# ANT_TASKS set by WANT_ANT_TASKS, but not the DEPEND due to caching.
49# Ebuilds that need to depend conditionally on certain tasks and specify them
50# differently for different eant calls can't use this simplified approach.
51# You also cannot specify version or anything else than ant-*.
52#
53# @example WANT_ANT_TASKS="ant-junit ant-trax"
54#
55# @seealso JAVA_PKG_FORCE_ANT_TASKS
56# -----------------------------------------------------------------------------
57#WANT_ANT_TASKS
58
59# -----------------------------------------------------------------------------
60# @variable-internal JAVA_PKG_PORTAGE_DEP
61#
62# The version of portage we need to function properly. Previously it was
63# portage with phase hooks support but now we use a version with proper env
64# saving. For EAPI 2 we have new enough stuff so let's have cleaner deps.
65# -----------------------------------------------------------------------------
66hasq "${EAPI}" 0 1 && JAVA_PKG_PORTAGE_DEP=">=sys-apps/portage-2.1.2.7"
40 67
41# ----------------------------------------------------------------------------- 68# -----------------------------------------------------------------------------
42# @variable-internal JAVA_PKG_E_DEPEND 69# @variable-internal JAVA_PKG_E_DEPEND
43# 70#
44# This is a convience variable to be used from the other java eclasses. This is 71# This is a convience variable to be used from the other java eclasses. This is
45# the version of java-config we want to use. We also need a recent version 72# the version of java-config we want to use. Usually the latest stable version
46# portage, that includes phase hooks. 73# so that ebuilds can use new features without depending on specific versions.
47# ----------------------------------------------------------------------------- 74# -----------------------------------------------------------------------------
48JAVA_PKG_E_DEPEND=">=dev-java/java-config-2.0.19-r1 ${JAVA_PKG_PORTAGE_DEP}" 75JAVA_PKG_E_DEPEND=">=dev-java/java-config-2.1.9-r1 ${JAVA_PKG_PORTAGE_DEP}"
76hasq source ${JAVA_PKG_IUSE} && JAVA_PKG_E_DEPEND="${JAVA_PKG_E_DEPEND} source? ( app-arch/zip )"
77
78# -----------------------------------------------------------------------------
79# @variable-preinherit JAVA_PKG_WANT_BOOTCLASSPATH
80#
81# The version of bootclasspath the package needs to work. Translates to a proper
82# dependency. The bootclasspath has to be obtained by java-ant_rewrite-bootclasspath
83# -----------------------------------------------------------------------------
84
85if [[ -n "${JAVA_PKG_WANT_BOOTCLASSPATH}" ]]; then
86 if [[ "${JAVA_PKG_WANT_BOOTCLASSPATH}" == "1.5" ]]; then
87 JAVA_PKG_E_DEPEND="${JAVA_PKG_E_DEPEND} >=dev-java/gnu-classpath-0.98-r1:0.98"
88 else
89 eerror "Unknown value of JAVA_PKG_WANT_BOOTCLASSPATH"
90 # since die in global scope doesn't work, this will make repoman fail
91 JAVA_PKG_E_DEPEND="${JAVA_PKG_E_DEPEND} BAD_JAVA_PKG_WANT_BOOTCLASSPATH"
92 fi
93fi
49 94
50# ----------------------------------------------------------------------------- 95# -----------------------------------------------------------------------------
51# @variable-external JAVA_PKG_ALLOW_VM_CHANGE 96# @variable-external JAVA_PKG_ALLOW_VM_CHANGE
52# @variable-default yes 97# @variable-default yes
53# 98#
127# @note This should only be used internally or for testing. 172# @note This should only be used internally or for testing.
128# @example Use jikes and javac, in that order 173# @example Use jikes and javac, in that order
129# JAVA_PKG_FORCE_COMPILER="jikes javac" 174# JAVA_PKG_FORCE_COMPILER="jikes javac"
130# ----------------------------------------------------------------------------- 175# -----------------------------------------------------------------------------
131 176
177# -----------------------------------------------------------------------------
178# @variable-external JAVA_PKG_FORCE_ANT_TASKS
179#
180# An $IFS separated list of ant tasks. Can be set in environment before calling
181# emerge/ebuild to override variables set in ebuild, mainly for testing before
182# putting the resulting (WANT_)ANT_TASKS into ebuild. Affects only ANT_TASKS in
183# eant() call, not the dependencies specified in WANT_ANT_TASKS.
184#
185# @example JAVA_PKG_FORCE_ANT_TASKS="ant-junit ant-trax" \
186# ebuild foo.ebuild compile
187#
188# @seealso WANT_ANT_TASKS
189# -----------------------------------------------------------------------------
190
132# TODO document me 191# TODO document me
133JAVA_PKG_QA_VIOLATIONS=0 192JAVA_PKG_QA_VIOLATIONS=0
134 193
135# ----------------------------------------------------------------------------- 194# -----------------------------------------------------------------------------
136# @section-end variables 195# @section-end variables
143# 202#
144# These are used to install Java-related things, such as jars, Javadocs, JNI 203# These are used to install Java-related things, such as jars, Javadocs, JNI
145# libraries, etc. 204# libraries, etc.
146# ----------------------------------------------------------------------------- 205# -----------------------------------------------------------------------------
147 206
207# -----------------------------------------------------------------------------
208# @ebuild-function java-pkg_doexamples
209#
210# Installs given arguments to /usr/share/doc/${PF}/examples
211# If you give it only one parameter and it is a directory it will install
212# everything in that directory to the examples directory.
213#
214# @example
215# java-pkg_doexamples demo
216# java-pkg_doexamples demo/* examples/*
217#
218# @param --subdir - If the examples need a certain directory structure
219# @param $* - list of files to install
220# ------------------------------------------------------------------------------
221java-pkg_doexamples() {
222 debug-print-function ${FUNCNAME} $*
223
224 [[ ${#} -lt 1 ]] && die "At least one argument needed"
225
226 java-pkg_check-phase install
227
228 local dest=/usr/share/doc/${PF}/examples
229 if [[ ${1} == --subdir ]]; then
230 local dest=${dest}/${2}
231 dodir ${dest}
232 shift 2
233 fi
234
235 if [[ ${#} = 1 && -d ${1} ]]; then
236 ( # dont want to pollute calling env
237 insinto "${dest}"
238 doins -r ${1}/*
239 ) || die "Installing examples failed"
240 else
241 ( # dont want to pollute calling env
242 insinto "${dest}"
243 doins -r "$@"
244 ) || die "Installing examples failed"
245 fi
246}
148 247
149# ----------------------------------------------------------------------------- 248# -----------------------------------------------------------------------------
150# @ebuild-function java-pkg_dojar 249# @ebuild-function java-pkg_dojar
151# 250#
152# Installs any number of jars. 251# Installs any number of jars.
171 # Create JARDEST if it doesn't exist 270 # Create JARDEST if it doesn't exist
172 dodir ${JAVA_PKG_JARDEST} 271 dodir ${JAVA_PKG_JARDEST}
173 272
174 local jar 273 local jar
175 # for each jar 274 # for each jar
176 for jar in "$@"; do 275 for jar in "${@}"; do
177 local jar_basename=$(basename "${jar}") 276 local jar_basename=$(basename "${jar}")
178 277
179 java-pkg_check-versioned-jar ${jar_basename} 278 java-pkg_check-versioned-jar ${jar_basename}
180 279
181 # check if it exists 280 # check if it exists
182 if [[ -e "${jar}" ]] ; then 281 if [[ -e "${jar}" ]] ; then
282 # Don't overwrite if jar has already been installed with the same
283 # name
284 local dest="${D}${JAVA_PKG_JARDEST}/${jar_basename}"
285 if [[ -e "${dest}" ]]; then
286 ewarn "Overwriting ${dest}"
287 fi
288
183 # install it into JARDEST if it's a non-symlink 289 # install it into JARDEST if it's a non-symlink
184 if [[ ! -L "${jar}" ]] ; then 290 if [[ ! -L "${jar}" ]] ; then
291 #but first check class version when in strict mode.
292 is-java-strict && java-pkg_verify-classes "${jar}"
293
185 INSDESTTREE="${JAVA_PKG_JARDEST}" \ 294 INSDESTTREE="${JAVA_PKG_JARDEST}" \
186 doins "${jar}" || die "failed to install ${jar}" 295 doins "${jar}" || die "failed to install ${jar}"
187 java-pkg_append_ JAVA_PKG_CLASSPATH "${JAVA_PKG_JARDEST}/${jar_basename}" 296 java-pkg_append_ JAVA_PKG_CLASSPATH "${JAVA_PKG_JARDEST}/${jar_basename}"
188 debug-print "installed ${jar} to ${D}${JAVA_PKG_JARDEST}" 297 debug-print "installed ${jar} to ${D}${JAVA_PKG_JARDEST}"
189 # make a symlink to the original jar if it's symlink 298 # make a symlink to the original jar if it's symlink
199 done 308 done
200 309
201 java-pkg_do_write_ 310 java-pkg_do_write_
202} 311}
203 312
313# ------------------------------------------------------------------------------
314# @internal-function depend-java-query
315#
316# Wrapper for the depend-java-query binary to enable passing USE in env.
317# Using env variables keeps this eclass working with java-config versions that
318# do not handle use flags.
319# ------------------------------------------------------------------------------
204 320
321depend-java-query() {
322 # Used to have a which call here but it caused endless loops for some people
323 # that had some weird bashrc voodoo for which.
324 USE="${USE}" /usr/bin/depend-java-query "${@}"
325}
205 326
206# ------------------------------------------------------------------------------ 327# ------------------------------------------------------------------------------
207# @ebuild-function java-pkg_regjar 328# @ebuild-function java-pkg_regjar
208# 329#
209# Records an already installed jar in the package.env 330# Records an already installed jar in the package.env
240 [[ ${#} -lt 1 ]] && die "at least one argument needed" 361 [[ ${#} -lt 1 ]] && die "at least one argument needed"
241 362
242 java-pkg_init_paths_ 363 java-pkg_init_paths_
243 364
244 local jar jar_dir jar_file 365 local jar jar_dir jar_file
245 for jar in "$@"; do 366 for jar in "${@}"; do
246 # TODO use java-pkg_check-versioned-jar 367 # TODO use java-pkg_check-versioned-jar
247 if [[ -e "${jar}" ]]; then 368 if [[ -e "${jar}" || -e "${D}${jar}" ]]; then
369 [[ -d "${jar}" || -d "${D}${jar}" ]] \
370 && die "Called ${FUNCNAME} on a directory $*"
371
372 #check that class version correct when in strict mode
373 is-java-strict && java-pkg_verify-classes "${jar}"
374
248 # nelchael: we should strip ${D} in this case too, here's why: 375 # nelchael: we should strip ${D} in this case too, here's why:
249 # imagine such call: 376 # imagine such call:
250 # java-pkg_regjar ${D}/opt/java/*.jar 377 # java-pkg_regjar ${D}/opt/java/*.jar
251 # such call will fall into this case (-e ${jar}) and will 378 # such call will fall into this case (-e ${jar}) and will
252 # record paths with ${D} in package.env 379 # record paths with ${D} in package.env
253 java-pkg_append_ JAVA_PKG_CLASSPATH "${jar#${D}}" 380 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 381 else
382 if [[ ${jar} = *\** ]]; then
383 eerror "The argument ${jar} to ${FUNCNAME}"
384 eerror "has * in it. If you want it to glob in"
385 eerror '${D} add ${D} to the argument.'
386 fi
387 debug-print "${jar} or ${D}${jar} not found"
257 die "${jar} does not exist" 388 die "${jar} does not exist"
258 fi 389 fi
259 done 390 done
260 391
261 java-pkg_do_write_ 392 java-pkg_do_write_
262} 393}
263
264 394
265# ------------------------------------------------------------------------------ 395# ------------------------------------------------------------------------------
266# @ebuild-function java-pkg_newjar 396# @ebuild-function java-pkg_newjar
267# 397#
268# Installs a jar with a new name 398# Installs a jar with a new name
279 local original_jar="${1}" 409 local original_jar="${1}"
280 local new_jar="${2:-${PN}.jar}" 410 local new_jar="${2:-${PN}.jar}"
281 local new_jar_dest="${T}/${new_jar}" 411 local new_jar_dest="${T}/${new_jar}"
282 412
283 [[ -z ${original_jar} ]] && die "Must specify a jar to install" 413 [[ -z ${original_jar} ]] && die "Must specify a jar to install"
284 [[ ! -f ${original_jar} ]] && die "${original_jar} does not exist!" 414 [[ ! -f ${original_jar} ]] \
415 && die "${original_jar} does not exist or is not a file!"
285 416
286 rm -f "${new_jar_dest}" || die "Failed to remove ${new_jar_dest}" 417 rm -f "${new_jar_dest}" || die "Failed to remove ${new_jar_dest}"
287 cp "${original_jar}" "${new_jar_dest}" \ 418 cp "${original_jar}" "${new_jar_dest}" \
288 || die "Failed to copy ${original_jar} to ${new_jar_dest}" 419 || die "Failed to copy ${original_jar} to ${new_jar_dest}"
289 java-pkg_dojar "${new_jar_dest}" 420 java-pkg_dojar "${new_jar_dest}"
290} 421}
291 422
292
293# ------------------------------------------------------------------------------ 423# ------------------------------------------------------------------------------
294# @ebuild-function java-pkg_addcp 424# @ebuild-function java-pkg_addcp
295# 425#
296# Add something to the package's classpath. For jars, you should use dojar, 426# 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. 427# newjar, or regjar. This is typically used to add directories to the classpath.
302java-pkg_addcp() { 432java-pkg_addcp() {
303 java-pkg_append_ JAVA_PKG_CLASSPATH "${@}" 433 java-pkg_append_ JAVA_PKG_CLASSPATH "${@}"
304 java-pkg_do_write_ 434 java-pkg_do_write_
305} 435}
306 436
307
308# ------------------------------------------------------------------------------ 437# ------------------------------------------------------------------------------
309# @ebuild-function java-pkg_doso 438# @ebuild-function java-pkg_doso
310# 439#
311# Installs any number of JNI libraries 440# Installs any number of JNI libraries
312# They will be installed into /usr/lib by default, but java-pkg_sointo 441# They will be installed into /usr/lib by default, but java-pkg_sointo
318# @param $@ - JNI libraries to install 447# @param $@ - JNI libraries to install
319# ------------------------------------------------------------------------------ 448# ------------------------------------------------------------------------------
320java-pkg_doso() { 449java-pkg_doso() {
321 debug-print-function ${FUNCNAME} $* 450 debug-print-function ${FUNCNAME} $*
322 451
323 [[ ${#} -lt 1 ]] && "At least one argument required for ${FUNCNAME}"
324 java-pkg_check-phase install 452 java-pkg_check-phase install
325 453
326 [[ ${#} -lt 1 ]] && die "At least one argument required for ${FUNCNAME}" 454 [[ ${#} -lt 1 ]] && die "${FUNCNAME} requires at least one argument"
327 455
328 java-pkg_init_paths_ 456 java-pkg_init_paths_
329 457
330 local lib 458 local lib
331 # for each lib 459 # for each lib
334 if [[ -e "${lib}" ]] ; then 462 if [[ -e "${lib}" ]] ; then
335 # install if it isn't a symlink 463 # install if it isn't a symlink
336 if [[ ! -L "${lib}" ]] ; then 464 if [[ ! -L "${lib}" ]] ; then
337 INSDESTTREE="${JAVA_PKG_LIBDEST}" \ 465 INSDESTTREE="${JAVA_PKG_LIBDEST}" \
338 INSOPTIONS="${LIBOPTIONS}" \ 466 INSOPTIONS="${LIBOPTIONS}" \
339 doins "${lib}" || "failed to install ${lib}" 467 doins "${lib}" || die "failed to install ${lib}"
340 java-pkg_append_ JAVA_PKG_LIBRARY "${JAVA_PKG_LIBDEST}" 468 java-pkg_append_ JAVA_PKG_LIBRARY "${JAVA_PKG_LIBDEST}"
341 debug-print "Installing ${lib} to ${JAVA_PKG_LIBDEST}" 469 debug-print "Installing ${lib} to ${JAVA_PKG_LIBDEST}"
342 # otherwise make a symlink to the symlink's origin 470 # otherwise make a symlink to the symlink's origin
343 else 471 else
344 # TODO use dosym
345 ln -s "$(readlink "${lib}")" "${D}${JAVA_PKG_LIBDEST}/$(basename "${lib}")" 472 dosym "$(readlink "${lib}")" "${JAVA_PKG_LIBDEST}/${lib##*/}"
346 debug-print "${lib} is a symlink, linking accordanly" 473 debug-print "${lib} is a symlink, linking accordantly"
347 fi 474 fi
348 # otherwise die 475 # otherwise die
349 else 476 else
350 die "${lib} does not exist" 477 die "${lib} does not exist"
351 fi 478 fi
367java-pkg_regso() { 494java-pkg_regso() {
368 debug-print-function ${FUNCNAME} $* 495 debug-print-function ${FUNCNAME} $*
369 496
370 java-pkg_check-phase install 497 java-pkg_check-phase install
371 498
372 [[ ${#} -lt 1 ]] && "at least one argument needed" 499 [[ ${#} -lt 1 ]] && die "${FUNCNAME} requires at least one argument"
373 500
374 java-pkg_init_paths_ 501 java-pkg_init_paths_
375 502
376 local lib target_dir 503 local lib target_dir
377 for lib in "$@" ; do 504 for lib in "$@" ; do
428# ------------------------------------------------------------------------------ 555# ------------------------------------------------------------------------------
429java-pkg_dohtml() { 556java-pkg_dohtml() {
430 debug-print-function ${FUNCNAME} $* 557 debug-print-function ${FUNCNAME} $*
431 558
432 [[ ${#} -lt 1 ]] && die "At least one argument required for ${FUNCNAME}" 559 [[ ${#} -lt 1 ]] && die "At least one argument required for ${FUNCNAME}"
433 # TODO-nichoj find out what exactly -f package-list does 560
561 # from /usr/lib/portage/bin/dohtml -h
562 # -f Set list of allowed extensionless file names.
434 dohtml -f package-list "$@" 563 dohtml -f package-list "$@"
564
435 # this probably shouldn't be here but it provides 565 # this probably shouldn't be here but it provides
436 # a reasonable way to catch # docs for all of the 566 # a reasonable way to catch # docs for all of the
437 # old ebuilds. 567 # old ebuilds.
438 java-pkg_recordjavadoc 568 java-pkg_recordjavadoc
439} 569}
440 570
441# TODO document 571# ------------------------------------------------------------------------------
572# @ebuild-function java-pkg_dojavadoc
573#
574# Installs javadoc documentation. This should be controlled by the doc use flag.
575#
576# @param $1: optional --symlink creates to symlink like this for html
577# documentation bundles.
578# @param $2: - The javadoc root directory.
579#
580# @example:
581# java-pkg_dojavadoc docs/api
582# java-pkg_dojavadoc --symlink apidocs docs/api
583#
584# ------------------------------------------------------------------------------
442java-pkg_dojavadoc() { 585java-pkg_dojavadoc() {
586 debug-print-function ${FUNCNAME} $*
587
588 # For html documentation bundles that link to Javadoc
589 local symlink
590 if [[ ${1} = --symlink ]]; then
591 symlink=${2}
592 shift 2
593 fi
594
443 local dir="$1" 595 local dir="$1"
596 local dest=/usr/share/doc/${PF}/html
597
598 # QA checks
444 599
445 java-pkg_check-phase install 600 java-pkg_check-phase install
446 601
447 [[ -z "${dir}" ]] && die "Must specify a directory!" 602 [[ -z "${dir}" ]] && die "Must specify a directory!"
448 [[ ! -d "${dir}" ]] && die "${dir} does not exist, or isn't a directory!" 603 [[ ! -d "${dir}" ]] && die "${dir} does not exist, or isn't a directory!"
604 if [[ ! -e "${dir}/index.html" ]]; then
605 local msg="No index.html in javadoc directory"
606 ewarn "${msg}"
607 is-java-strict && die "${msg}"
608 fi
609
610 if [[ -e ${D}/${dest}/api ]]; then
611 eerror "${dest} already exists. Will not overwrite."
612 die "${dest}"
613 fi
614
615 # Renaming to match our directory layout
449 616
450 local dir_to_install="${dir}" 617 local dir_to_install="${dir}"
451 if [[ "$(basename "${dir}")" != "api" ]]; then 618 if [[ "$(basename "${dir}")" != "api" ]]; then
452 dir_to_install="${T}/api" 619 dir_to_install="${T}/api"
453 # TODO use doins 620 # TODO use doins
454 cp -r "${dir}" "${dir_to_install}" || die "cp failed" 621 cp -r "${dir}" "${dir_to_install}" || die "cp failed"
455 fi 622 fi
456 623
624 # Actual installation
625
457 java-pkg_dohtml -r ${dir_to_install} 626 java-pkg_dohtml -r "${dir_to_install}"
627
628 # Let's make a symlink to the directory we have everything else under
629 dosym ${dest}/api "${JAVA_PKG_SHAREPATH}/api" || die
630
631 if [[ ${symlink} ]]; then
632 debug-print "symlinking ${dest}/{api,${symlink}}"
633 dosym ${dest}/{api,${symlink}} || die
634 fi
458} 635}
459 636
460# ------------------------------------------------------------------------------ 637# ------------------------------------------------------------------------------
461# @ebuild-function java-pkg_dosrc 638# @ebuild-function java-pkg_dosrc
462# 639#
478# FIXME apparently this fails if you give it an empty directories 655# FIXME apparently this fails if you give it an empty directories
479java-pkg_dosrc() { 656java-pkg_dosrc() {
480 debug-print-function ${FUNCNAME} $* 657 debug-print-function ${FUNCNAME} $*
481 658
482 [ ${#} -lt 1 ] && die "At least one argument needed" 659 [ ${#} -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 660
487 java-pkg_check-phase install 661 java-pkg_check-phase install
488 662
489 [[ ${#} -lt 1 ]] && die "At least one argument needed" 663 [[ ${#} -lt 1 ]] && die "At least one argument needed"
664
665 if ! [[ ${DEPEND} = *app-arch/zip* ]]; then
666 local msg="${FUNCNAME} called without app-arch/zip in DEPEND"
667 java-pkg_announce-qa-violation ${msg}
668 fi
490 669
491 java-pkg_init_paths_ 670 java-pkg_init_paths_
492 671
493 local zip_name="${PN}-src.zip" 672 local zip_name="${PN}-src.zip"
494 local zip_path="${T}/${zip_name}" 673 local zip_path="${T}/${zip_name}"
495 local dir 674 local dir
496 for dir in ${@}; do 675 for dir in "${@}"; do
497 local dir_parent=$(dirname "${dir}") 676 local dir_parent=$(dirname "${dir}")
498 local dir_name=$(basename "${dir}") 677 local dir_name=$(basename "${dir}")
499 pushd ${dir_parent} > /dev/null || die "problem entering ${dir_parent}" 678 pushd ${dir_parent} > /dev/null || die "problem entering ${dir_parent}"
500 zip -q -r ${zip_path} ${dir_name} -i '*.java' 679 zip -q -r ${zip_path} ${dir_name} -i '*.java'
501 local result=$? 680 local result=$?
518# @ebuild-function java-pkg_dolauncher 697# @ebuild-function java-pkg_dolauncher
519# 698#
520# Make a wrapper script to lauch/start this package 699# Make a wrapper script to lauch/start this package
521# If necessary, the wrapper will switch to the appropriate VM. 700# If necessary, the wrapper will switch to the appropriate VM.
522# 701#
702# Can be called without parameters if the package installs only one jar
703# that has the Main-class attribute set. The wrapper will be named ${PN}.
704#
523# @param $1 - filename of launcher to create 705# @param $1 - filename of launcher to create
524# @param $2 - options, as follows: 706# @param $2 - options, as follows:
525# --main the.main.class.too.start 707# --main the.main.class.too.start
526# --jar /the/jar/too/launch.jar 708# --jar /the/jar/too/launch.jar or just <name>.jar
527# --java_args 'Extra arguments to pass to java' 709# --java_args 'Extra arguments to pass to java'
528# --pkg_args 'Extra arguments too pass to the package' 710# --pkg_args 'Extra arguments to pass to the package'
529# --pwd 711# --pwd Directory the launcher changes to before executing java
530# -into 712# -into Directory to install the launcher to, instead of /usr/bin
531# -pre 713# -pre Prepend contents of this file to the launcher
532# ------------------------------------------------------------------------------ 714# ------------------------------------------------------------------------------
533java-pkg_dolauncher() { 715java-pkg_dolauncher() {
534 debug-print-function ${FUNCNAME} $* 716 debug-print-function ${FUNCNAME} $*
535 717
536 java-pkg_check-phase install 718 java-pkg_check-phase install
537
538 [[ ${#} -lt 1 ]] && die "Need at least one argument"
539
540 java-pkg_init_paths_ 719 java-pkg_init_paths_
541 720
721 if [[ ${#} = 0 ]]; then
722 local name="${PN}"
723 else
542 local name="${1}" 724 local name="${1}"
725 shift
726 fi
727
543 # TODO rename to launcher 728 # TODO rename to launcher
544 local target="${T}/${name}" 729 local target="${T}/${name}"
545 local var_tmp="${T}/launcher_variables_tmp" 730 local var_tmp="${T}/launcher_variables_tmp"
546 local target_dir pre 731 local target_dir pre
547 shift
548 732
549 # Process the other the rest of the arguments 733 # Process the other the rest of the arguments
550 while [[ -n "${1}" && -n "${2}" ]]; do 734 while [[ -n "${1}" && -n "${2}" ]]; do
551 local var=${1} value=${2} 735 local var="${1}" value="${2}"
552 if [[ "${var:0:2}" == "--" ]]; then 736 if [[ "${var:0:2}" == "--" ]]; then
737 local var=${var:2}
553 echo "gjl_${var:2}=\"${value}\"" >> "${var_tmp}" 738 echo "gjl_${var}=\"${value}\"" >> "${var_tmp}"
739 local gjl_${var}="${value}"
554 elif [[ "${var}" == "-into" ]]; then 740 elif [[ "${var}" == "-into" ]]; then
555 target_dir="${value}" 741 target_dir="${value}"
556 elif [[ "${var}" == "-pre" ]]; then 742 elif [[ "${var}" == "-pre" ]]; then
557 pre="${value}" 743 pre="${value}"
558 fi 744 fi
559 shift 2 745 shift 2
560 done 746 done
561 747
748 # Test if no --jar and --main arguments were given and
749 # in that case check if the package only installs one jar
750 # and use that jar.
751 if [[ -z "${gjl_jar}" && -z "${gjl_main}" ]]; then
752 local cp="${JAVA_PKG_CLASSPATH}"
753 if [[ "${cp/:}" = "${cp}" && "${cp%.jar}" != "${cp}" ]]; then
754 echo "gjl_jar=\"${JAVA_PKG_CLASSPATH}\"" >> "${var_tmp}"
755 else
756 local msg="Not enough information to create a launcher given."
757 msg="${msg} Please give --jar or --main argument to ${FUNCNAME}."
758 die "${msg}"
759 fi
760 fi
761
562 # Write the actual script 762 # Write the actual script
563 echo "#!/bin/bash" > "${target}" 763 echo "#!/bin/bash" > "${target}"
564 [[ -n "${pre}" ]] && [[ -f "${pre}" ]] && cat "${pre}" >> "${target}" 764 if [[ -n "${pre}" ]]; then
765 if [[ -f "${pre}" ]]; then
766 cat "${pre}" >> "${target}"
767 else
768 die "-pre specified file '${pre}' does not exist"
769 fi
770 fi
565 echo "gjl_package=${JAVA_PKG_NAME}" >> "${target}" 771 echo "gjl_package=${JAVA_PKG_NAME}" >> "${target}"
566 cat "${var_tmp}" >> "${target}" 772 cat "${var_tmp}" >> "${target}"
567 rm -f "${var_tmp}" 773 rm -f "${var_tmp}"
568 echo "source /usr/share/java-config-2/launcher/launcher.bash" >> "${target}" 774 echo "source /usr/share/java-config-2/launcher/launcher.bash" >> "${target}"
569 775
661# Example: get a specific jar from xerces slot 2, and name it diffrently 867# 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 868# java-pkg_jar-from xerces-2 xml-apis.jar xml.jar
663# Example: get junit.jar which is needed only for building 869# Example: get junit.jar which is needed only for building
664# java-pkg_jar-from --build-only junit junit.jar 870# java-pkg_jar-from --build-only junit junit.jar
665# 871#
666# @param $1 - (optional) "--build-only" makes the jar(s) not added into 872# @param $opt
667# package.env DEPEND line. 873# --build-only - makes the jar(s) not added into package.env DEPEND line.
668# @param $1 - Package to get jars from. 874# (assumed automatically when called inside src_test)
875# --with-dependencies - get jars also from requested package's dependencies
876# transitively.
877# --virtual - Packages passed to this function are to be handled as virtuals
878# and will not have individual jar dependencies recorded.
879# --into $dir - symlink jar(s) into $dir (must exist) instead of .
880# @param $1 - Package to get jars from, or comma-separated list of packages in
881# case other parameters are not used.
669# @param $2 - jar from package. If not specified, all jars will be used. 882# @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 883# @param $3 - When a single jar is specified, destination filename of the
671# symlink. Defaults to the name of the jar. 884# symlink. Defaults to the name of the jar.
672# ------------------------------------------------------------------------------ 885# ------------------------------------------------------------------------------
673# TODO could probably be cleaned up a little 886# TODO could probably be cleaned up a little
674java-pkg_jar-from() { 887java-pkg_jar-from() {
675 debug-print-function ${FUNCNAME} $* 888 debug-print-function ${FUNCNAME} $*
676 889
677 local build_only="" 890 local build_only=""
891 local destdir="."
892 local deep=""
893 local virtual=""
894 local record_jar=""
678 895
896 [[ "${EBUILD_PHASE}" == "test" ]] && build_only="build"
897
898 while [[ "${1}" == --* ]]; do
679 if [[ "${1}" = "--build-only" ]]; then 899 if [[ "${1}" = "--build-only" ]]; then
680 build_only="true" 900 build_only="build"
901 elif [[ "${1}" = "--with-dependencies" ]]; then
902 deep="--with-dependencies"
903 elif [[ "${1}" = "--virtual" ]]; then
904 virtual="true"
905 elif [[ "${1}" = "--into" ]]; then
906 destdir="${2}"
907 shift
908 else
909 die "java-pkg_jar-from called with unknown parameter: ${1}"
910 fi
681 shift 911 shift
682 fi 912 done
683 913
684 local target_pkg="${1}" target_jar="${2}" destjar="${3}" 914 local target_pkg="${1}" target_jar="${2}" destjar="${3}"
685 915
686 [[ -z ${target_pkg} ]] && die "Must specify a package" 916 [[ -z ${target_pkg} ]] && die "Must specify a package"
917
918 if [[ "${EAPI}" == "1" ]]; then
919 target_pkg="${target_pkg//:/-}"
920 fi
687 921
688 # default destjar to the target jar 922 # default destjar to the target jar
689 [[ -z "${destjar}" ]] && destjar="${target_jar}" 923 [[ -z "${destjar}" ]] && destjar="${target_jar}"
690 924
691 local error_msg="There was a problem getting the classpath for ${target_pkg}." 925 local error_msg="There was a problem getting the classpath for ${target_pkg}."
692 local classpath 926 local classpath
693 classpath="$(java-config --classpath=${target_pkg})" 927 classpath="$(java-config ${deep} --classpath=${target_pkg})"
694 [[ $? != 0 ]] && die ${error_msg} 928 [[ $? != 0 ]] && die ${error_msg}
929
930 # When we have commas this functions is called to bring jars from multiple
931 # packages. This affects recording of dependencencies performed later
932 # which expects one package only, so we do it here.
933 if [[ ${target_pkg} = *,* ]]; then
934 for pkg in ${target_pkg//,/ }; do
935 java-pkg_ensure-dep "${build_only}" "${pkg}"
936 [[ -z "${build_only}" ]] && java-pkg_record-jar_ "${pkg}"
937 done
938 # setting this disables further record-jar_ calls later
939 record_jar="true"
940 else
941 java-pkg_ensure-dep "${build_only}" "${target_pkg}"
942 fi
943
944 # Record the entire virtual as a dependency so that
945 # no jars are missed.
946 if [[ -z "${build_only}" && -n "${virtual}" ]]; then
947 java-pkg_record-jar_ "${target_pkg}"
948 # setting this disables further record-jars_ calls later
949 record_jar="true"
950 fi
951
952 pushd ${destdir} > /dev/null \
953 || die "failed to change directory to ${destdir}"
695 954
696 local jar 955 local jar
697 for jar in ${classpath//:/ }; do 956 for jar in ${classpath//:/ }; do
698 local jar_name=$(basename "${jar}") 957 local jar_name=$(basename "${jar}")
699 if [[ ! -f "${jar}" ]] ; then 958 if [[ ! -f "${jar}" ]] ; then
703 # If no specific target jar was indicated, link it 962 # If no specific target jar was indicated, link it
704 if [[ -z "${target_jar}" ]] ; then 963 if [[ -z "${target_jar}" ]] ; then
705 [[ -f "${target_jar}" ]] && rm "${target_jar}" 964 [[ -f "${target_jar}" ]] && rm "${target_jar}"
706 ln -snf "${jar}" \ 965 ln -snf "${jar}" \
707 || die "Failed to make symlink from ${jar} to ${jar_name}" 966 || die "Failed to make symlink from ${jar} to ${jar_name}"
967 if [[ -z "${record_jar}" ]]; then
968 if [[ -z "${build_only}" ]]; then
708 [[ -z "${build_only}" ]] && java-pkg_record-jar_ "${target_pkg}" "${jar}" 969 java-pkg_record-jar_ "${target_pkg}" "${jar}"
970 else
971 java-pkg_record-jar_ --build-only "${target_pkg}" "${jar}"
972 fi
973 fi
709 # otherwise, if the current jar is the target jar, link it 974 # otherwise, if the current jar is the target jar, link it
710 elif [[ "${jar_name}" == "${target_jar}" ]] ; then 975 elif [[ "${jar_name}" == "${target_jar}" ]] ; then
711 [[ -f "${destjar}" ]] && rm "${destjar}" 976 [[ -f "${destjar}" ]] && rm "${destjar}"
712 ln -snf "${jar}" "${destjar}" \ 977 ln -snf "${jar}" "${destjar}" \
713 || die "Failed to make symlink from ${jar} to ${destjar}" 978 || die "Failed to make symlink from ${jar} to ${destjar}"
979 if [[ -z "${record_jar}" ]]; then
980 if [[ -z "${build_only}" ]]; then
714 [[ -z "${build_only}" ]] && java-pkg_record-jar_ "${target_pkg}" "${jar}" 981 java-pkg_record-jar_ "${target_pkg}" "${jar}"
982 else
983 java-pkg_record-jar_ --build-only "${target_jar}" "${jar}"
984 fi
985 fi
986 popd > /dev/null
715 return 0 987 return 0
716 fi 988 fi
717 done 989 done
990 popd > /dev/null
718 # if no target was specified, we're ok 991 # if no target was specified, we're ok
719 if [[ -z "${target_jar}" ]] ; then 992 if [[ -z "${target_jar}" ]] ; then
720 return 0 993 return 0
721 # otherwise, die bitterly 994 # otherwise, die bitterly
722 else 995 else
741# The providing packages are recorded as dependencies into package.env DEPEND 1014# 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 1015# 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 1016# that have to be present only at build time and are not needed on runtime
744# (junit testing etc). 1017# (junit testing etc).
745# 1018#
746# Example: Get the classpath for xerces-2, 1019# Example: Get the classpath for xerces-2 and xalan,
747# java-pkg_getjars xerces-2 xalan 1020# java-pkg_getjars xerces-2,xalan
748# Example Return: 1021# Example Return:
749# /usr/share/xerces-2/lib/xml-apis.jar:/usr/share/xerces-2/lib/xmlParserAPIs.jar:/usr/share/xalan/lib/xalan.jar 1022# /usr/share/xerces-2/lib/xml-apis.jar:/usr/share/xerces-2/lib/xmlParserAPIs.jar:/usr/share/xalan/lib/xalan.jar
750# 1023#
751# @param $1 - (optional) "--build-only" makes the jar(s) not added into 1024# @param $opt
752# package.env DEPEND line. 1025# --build-only - makes the jar(s) not added into package.env DEPEND line.
1026# (assumed automatically when called inside src_test)
1027# --with-dependencies - get jars also from requested package's dependencies
1028# transitively.
753# @param $@ - list of packages to get jars from 1029# @param $1 - list of packages to get jars from
1030# (passed to java-config --classpath)
754# ------------------------------------------------------------------------------ 1031# ------------------------------------------------------------------------------
755java-pkg_getjars() { 1032java-pkg_getjars() {
756 debug-print-function ${FUNCNAME} $* 1033 debug-print-function ${FUNCNAME} $*
757 1034
758 local build_only="" 1035 local build_only=""
1036 local deep=""
759 1037
1038 [[ "${EBUILD_PHASE}" == "test" ]] && build_only="build"
1039
1040 while [[ "${1}" == --* ]]; do
760 if [[ "${1}" = "--build-only" ]]; then 1041 if [[ "${1}" = "--build-only" ]]; then
761 build_only="true" 1042 build_only="build"
1043 elif [[ "${1}" = "--with-dependencies" ]]; then
1044 deep="--with-dependencies"
1045 else
1046 die "java-pkg_jar-from called with unknown parameter: ${1}"
1047 fi
762 shift 1048 shift
763 fi 1049 done
764 1050
765 [[ ${#} -lt 1 ]] && die "At least one argument needed" 1051 [[ ${#} -ne 1 ]] && die "${FUNCNAME} takes only one argument besides --*"
766 1052
767 # NOTE could probably just pass $@ to java-config --classpath. and return it 1053
768 local classpath pkg 1054 local pkgs="${1}"
769 for pkg in ${@//,/ }; do 1055
770 #for pkg in $(echo "$@" | tr ',' ' '); do 1056 if [[ "${EAPI}" == "1" ]]; then
1057 pkgs="${pkgs//:/-}"
1058 fi
1059
771 jars="$(java-config --classpath=${pkg})" 1060 jars="$(java-config ${deep} --classpath=${pkgs})"
772 [[ -z "${jars}" ]] && die "java-config --classpath=${pkg} failed" 1061 [[ $? != 0 ]] && die "java-config --classpath=${pkgs} failed"
773 debug-print "${pkg}:${jars}" 1062 debug-print "${pkgs}:${jars}"
774 1063
1064 for pkg in ${pkgs//,/ }; do
1065 java-pkg_ensure-dep "${build_only}" "${pkg}"
1066 done
1067
1068 for pkg in ${pkgs//,/ }; do
775 if [[ -z "${classpath}" ]]; then 1069 if [[ -z "${build_only}" ]]; then
776 classpath="${jars}" 1070 java-pkg_record-jar_ "${pkg}"
777 else 1071 else
778 classpath="${classpath}:${jars}" 1072 java-pkg_record-jar_ --build-only "${pkg}"
779 fi 1073 fi
780 # Only record jars that aren't build-only
781 [[ -z "${build_only}" ]] && java-pkg_record-jar_ "${pkg}"
782 done 1074 done
783 echo "${classpath}" 1075
1076 echo "${jars}"
784} 1077}
785 1078
786# ------------------------------------------------------------------------------ 1079# ------------------------------------------------------------------------------
787# @ebuild-function java-pkg_getjar 1080# @ebuild-function java-pkg_getjar
788# 1081#
795# @example 1088# @example
796# java-pkg_getjar xerces-2 xml-apis.jar 1089# java-pkg_getjar xerces-2 xml-apis.jar
797# @example-return 1090# @example-return
798# /usr/share/xerces-2/lib/xml-apis.jar 1091# /usr/share/xerces-2/lib/xml-apis.jar
799# 1092#
800# @param $1 - (optional) "--build-only" makes the jar not added into 1093# @param $opt
801# package.env DEPEND line. 1094# --build-only - makes the jar not added into package.env DEPEND line.
1095# --virtual - Packages passed to this function are to be handled as virtuals
1096# and will not have individual jar dependencies recorded.
802# @param $1 - package to use 1097# @param $1 - package to use
803# @param $2 - jar to get 1098# @param $2 - jar to get
804# ------------------------------------------------------------------------------ 1099# ------------------------------------------------------------------------------
805java-pkg_getjar() { 1100java-pkg_getjar() {
806 debug-print-function ${FUNCNAME} $* 1101 debug-print-function ${FUNCNAME} $*
807 1102
808 local build_only="" 1103 local build_only=""
1104 local virtual=""
1105 local record_jar=""
809 1106
1107 [[ "${EBUILD_PHASE}" == "test" ]] && build_only="build"
1108
1109 while [[ "${1}" == --* ]]; do
810 if [[ "${1}" = "--build-only" ]]; then 1110 if [[ "${1}" = "--build-only" ]]; then
811 build_only="true" 1111 build_only="build"
1112 elif [[ "${1}" == "--virtual" ]]; then
1113 virtual="true"
1114 else
1115 die "java-pkg_getjar called with unknown parameter: ${1}"
1116 fi
812 shift 1117 shift
813 fi 1118 done
1119
1120 [[ ${#} -ne 2 ]] && die "${FUNCNAME} takes only two arguments besides --*"
814 1121
815 local pkg="${1}" target_jar="${2}" jar 1122 local pkg="${1}" target_jar="${2}" jar
1123
1124 if [[ "${EAPI}" == "1" ]]; then
1125 pkg="${pkg//:/-}"
1126 fi
1127
816 [[ -z ${pkg} ]] && die "Must specify package to get a jar from" 1128 [[ -z ${pkg} ]] && die "Must specify package to get a jar from"
817 [[ -z ${target_jar} ]] && die "Must specify jar to get" 1129 [[ -z ${target_jar} ]] && die "Must specify jar to get"
818 1130
819 local error_msg="Could not find classpath for ${pkg}. Are you sure its installed?" 1131 local error_msg="Could not find classpath for ${pkg}. Are you sure its installed?"
820 local classpath 1132 local classpath
821 classpath=$(java-config --classpath=${pkg}) 1133 classpath=$(java-config --classpath=${pkg})
822 [[ $? != 0 ]] && die ${error_msg} 1134 [[ $? != 0 ]] && die ${error_msg}
823 1135
1136 java-pkg_ensure-dep "${build_only}" "${pkg}"
1137
1138 # Record the package(Virtual) as a dependency and then set build_only
1139 # So that individual jars are not recorded.
1140 if [[ -n "${virtual}" ]]; then
1141 if [[ -z "${build_only}" ]]; then
1142 java-pkg_record-jar_ "${pkg}"
1143 else
1144 java-pkg_record-jar_ --build-only "${pkg}"
1145 fi
1146 record_jar="true"
1147 fi
1148
824 for jar in ${classpath//:/ }; do 1149 for jar in ${classpath//:/ }; do
825 if [[ ! -f "${jar}" ]] ; then 1150 if [[ ! -f "${jar}" ]] ; then
826 die "Installation problem with jar ${jar} in ${pkg} - is it installed?" 1151 die "Installation problem with jar ${jar} in ${pkg} - is it installed?"
827 fi 1152 fi
828 1153
829 if [[ "$(basename ${jar})" == "${target_jar}" ]] ; then 1154 if [[ "$(basename ${jar})" == "${target_jar}" ]] ; then
830 # Only record jars that aren't build-only 1155 # Only record jars that aren't build-only
831 [[ -z "${build_only}" ]] && java-pkg_record-jar_ "${pkg}" "${jar}" 1156 if [[ -z "${record_jar}" ]]; then
1157 if [[ -z "${build_only}" ]]; then
1158 java-pkg_record-jar_ "${pkg}" "${jar}"
1159 else
1160 java-pkg_record-jar_ --build-only "${pkg}" "${jar}"
1161 fi
1162 fi
832 echo "${jar}" 1163 echo "${jar}"
833 return 0 1164 return 0
834 fi 1165 fi
835 done 1166 done
836 1167
837 die "Could not find ${target_jar} in ${pkg}" 1168 die "Could not find ${target_jar} in ${pkg}"
838 return 1 1169 return 1
839} 1170}
1171
1172# ------------------------------------------------------------------------------
1173# @ebuild-function java-pkg_register-dependency
1174#
1175# Registers runtime dependency on a package, list of packages, or a single jar
1176# from a package, into package.env DEPEND line. Can only be called in
1177# src_install phase.
1178# Intended for binary packages where you don't need to symlink the jars or get
1179# their classpath during build. As such, the dependencies only need to be
1180# specified in ebuild's RDEPEND, and should be omitted in DEPEND.
1181#
1182# @param $1 - comma-separated list of packages, or a single package
1183# @param $2 - if param $1 is a single package, optionally specify the jar
1184# to depend on
1185#
1186# Example: Record the dependency on whole xerces-2 and xalan,
1187# java-pkg_register-dependency xerces-2,xalan
1188# Example: Record the dependency on ant.jar from ant-core
1189# java-pkg_register-dependency ant-core ant.jar
1190#
1191# Note: Passing both list of packages as the first parameter AND specifying the
1192# jar as the second is not allowed and will cause the function to die. We assume
1193# that there's more chance one passes such combination as a mistake, than that
1194# there are more packages providing identically named jar without class
1195# collisions.
1196# ------------------------------------------------------------------------------
1197java-pkg_register-dependency() {
1198 debug-print-function ${FUNCNAME} $*
1199
1200 java-pkg_check-phase install
1201
1202 [[ ${#} -gt 2 ]] && die "${FUNCNAME} takes at most two arguments"
1203
1204 local pkgs="${1}"
1205 local jar="${2}"
1206
1207 [[ -z "${pkgs}" ]] && die "${FUNCNAME} called with no package(s) specified"
1208
1209 if [[ "${EAPI}" == "1" ]]; then
1210 pkgs="${pkgs//:/-}"
1211 fi
1212
1213 if [[ -z "${jar}" ]]; then
1214 for pkg in ${pkgs//,/ }; do
1215 java-pkg_ensure-dep runtime "${pkg}"
1216 java-pkg_record-jar_ "${pkg}"
1217 done
1218 else
1219 [[ ${pkgs} == *,* ]] && \
1220 die "${FUNCNAME} called with both package list and jar name"
1221 java-pkg_ensure-dep runtime "${pkgs}"
1222 java-pkg_record-jar_ "${pkgs}" "${jar}"
1223 fi
1224
1225 java-pkg_do_write_
1226}
1227
1228# ------------------------------------------------------------------------------
1229# @ebuild-function java-pkg_register-optional-dependency
1230#
1231# Registers optional runtime dependency on a package, list of packages, or a
1232# single jar from a package, into package.env OPTIONAL_DEPEND line. Can only be
1233# called in src_install phase.
1234# Intended for packages that can use other packages when those are in classpath.
1235# Will be put on classpath by launcher if they are installed. Typical case is
1236# JDBC implementations for various databases. It's better than having USE flag
1237# for each implementation triggering hard dependency.
1238#
1239# @param $1 - comma-separated list of packages, or a single package
1240# @param $2 - if param $1 is a single package, optionally specify the jar
1241# to depend on
1242#
1243# Example: Record the optional dependency on some jdbc providers
1244# java-pkg_register-optional-dependency jdbc-jaybird,jtds-1.2,jdbc-mysql
1245#
1246# Note: Passing both list of packages as the first parameter AND specifying the
1247# jar as the second is not allowed and will cause the function to die. We assume
1248# that there's more chance one passes such combination as a mistake, than that
1249# there are more packages providing identically named jar without class
1250# collisions.
1251# ------------------------------------------------------------------------------
1252java-pkg_register-optional-dependency() {
1253 debug-print-function ${FUNCNAME} $*
1254
1255 java-pkg_check-phase install
1256
1257 [[ ${#} -gt 2 ]] && die "${FUNCNAME} takes at most two arguments"
1258
1259 local pkgs="${1}"
1260 local jar="${2}"
1261
1262 [[ -z "${pkgs}" ]] && die "${FUNCNAME} called with no package(s) specified"
1263
1264 if [[ "${EAPI}" == "1" ]]; then
1265 pkgs="${pkgs//:/-}"
1266 fi
1267
1268 if [[ -z "${jar}" ]]; then
1269 for pkg in ${pkgs//,/ }; do
1270 java-pkg_record-jar_ --optional "${pkg}"
1271 done
1272 else
1273 [[ ${pkgs} == *,* ]] && \
1274 die "${FUNCNAME} called with both package list and jar name"
1275 java-pkg_record-jar_ --optional "${pkgs}" "${jar}"
1276 fi
1277
1278 java-pkg_do_write_
1279}
1280
1281# ------------------------------------------------------------------------------
1282# @ebuild-function java-pkg_register-environment-variable
1283#
1284# Register an arbitrary environment variable into package.env. The gjl launcher
1285# for this package or any package depending on this will export it into
1286# environement before executing java command.
1287# Must only be called in src_install phase.
1288#
1289# @param $1 - variable name
1290# @param $2 - variable value
1291# ------------------------------------------------------------------------------
1292JAVA_PKG_EXTRA_ENV="${T}/java-pkg-extra-env"
1293JAVA_PKG_EXTRA_ENV_VARS=""
1294java-pkg_register-environment-variable() {
1295 debug-print-function ${FUNCNAME} $*
1296
1297 java-pkg_check-phase install
1298
1299 [[ ${#} != 2 ]] && die "${FUNCNAME} takes two arguments"
1300
1301 echo "${1}=\"${2}\"" >> ${JAVA_PKG_EXTRA_ENV}
1302 JAVA_PKG_EXTRA_ENV_VARS="${JAVA_PKG_EXTRA_ENV_VARS} ${1}"
1303
1304 java-pkg_do_write_
1305}
1306
1307# ------------------------------------------------------------------------------
1308# @ebuild-function java-pkg_get-bootclasspath
1309#
1310# Returns classpath of a given bootclasspath-providing package version.
1311#
1312# @param $1 - the version of bootclasspath (e.g. 1.5), 'auto' for bootclasspath
1313# of the current JDK
1314# ------------------------------------------------------------------------------
1315
1316java-pkg_get-bootclasspath() {
1317 local version="${1}"
1318
1319 local bcp
1320 case "${version}" in
1321 auto)
1322 bcp="$(java-config -g BOOTCLASSPATH)"
1323 ;;
1324 1.5)
1325 bcp="$(java-pkg_getjars --build-only gnu-classpath-0.98)"
1326 ;;
1327 *)
1328 eerror "unknown parameter of java-pkg_get-bootclasspath"
1329 die "unknown parameter of java-pkg_get-bootclasspath"
1330 ;;
1331 esac
1332
1333 echo "${bcp}"
1334}
1335
840 1336
841# This function reads stdin, and based on that input, figures out how to 1337# This function reads stdin, and based on that input, figures out how to
842# populate jars from the filesystem. 1338# populate jars from the filesystem.
843# Need to figure out a good way of making use of this, ie be able to use a 1339# Need to figure out a good way of making use of this, ie be able to use a
844# string that was built instead of stdin 1340# string that was built instead of stdin
884# 1380#
885# Various other functions to use from an ebuild 1381# Various other functions to use from an ebuild
886# ------------------------------------------------------------------------------ 1382# ------------------------------------------------------------------------------
887 1383
888# ------------------------------------------------------------------------------ 1384# ------------------------------------------------------------------------------
889# @ebuild-function java-pkg_need 1385# @ebuild-function java-pkg_find-normal-jars
890# 1386#
891# Adds virtual dependencies, which can optionally be controlled by a USE flag. 1387# Find the files with suffix .jar file in the given directory or $WORKDIR
892# Currently supported virtuals are:
893# javamail
894# jdbc-stdext
895# jaf
896# jdbc-rowset
897# jms
898# 1388#
899# @param $1 - Optionally indicate that the dependencies are controlled by 1389# @param $1 - The directory to search for jar files (default: ${WORKDIR})
900# a use flag by specifying '--use' Requires $2.
901# @param $2 - USE flag which will enable the dependencies.
902# @param $@ - virtual packages to add depenedencies for
903# ------------------------------------------------------------------------------ 1390# ------------------------------------------------------------------------------
904# TODO rewrite to parse a line based declaration file instead -- karltk 1391java-pkg_find-normal-jars() {
905#java-pkg_need() { 1392 local dir=$1
906# debug-print-function ${FUNCNAME} $* 1393 [[ "${dir}" ]] || dir="${WORKDIR}"
907# local useflag 1394 local found
908# if [[ ${1} == "--use" ]]; then 1395 for jar in $(find "${dir}" -name "*.jar" -type f); do
909# useflag="${2}" 1396 echo "${jar}"
910# shift 2 1397 found="true"
911# fi
912#
913# if [[ -z ${1} ]]; then
914# die "Must specify at least one virtual package."
915# fi
916#
917# local depstr newdepstr
918#
919# for virtual in ${@}; do
920# if has ${virtual} ${JAVA_PKG_VNEED}; then
921# debug-print "Already registered virtual ${virtual}"
922# continue
923# fi
924# case ${virtual} in
925# javamail)
926# debug-print "java-pkg_need: adding javamail dependencies"
927# newdepstr="|| ( dev-java/gnu-javamail dev-java/sun-javamail-bin )"
928# ;;
929# jdbc-stdext)
930# debug-print "java-pkg_need: adding jdbc-stdext dependencies"
931# newdepstr="|| ( >=virtual/jdk-1.4 dev-java/jdbc2-stdext )"
932# ;;
933# jaf)
934# debug-print "java-pkg_need: adding jaf dependencies"
935# newdepstr="|| ( dev-java/gnu-jaf dev-java/sun-jaf-bin )"
936# ;;
937# jdbc-rowset)
938# debug-print "java-pkg_need: adding jdbc-rowset dependencies"
939# newdepstr="|| ( >=virtual/jdk-1.5 dev-java/sun-jdbc-rowset )"
940# ;;
941# jms)
942# debug-print "java-pkg_need: adding jms dependencies"
943# newdepstr="|| ( dev-java/sun-jms dev-java/openjms )"
944# ;;
945# *)
946# die "Invalid virtual: ${virtual}"
947# esac
948#
949# export JAVA_PKG_VNEED="${JAVA_PKG_VNEED} ${virtual}"
950#
951# if [[ -n ${useflag} ]]; then
952# depstr="${depstr} ${useflag}? ( ${newdepstr} )"
953# else
954# depstr="${depstr} ${newdepstr}"
955# fi
956# done 1398 done
957# 1399 [[ "${found}" ]]
958# [[ -z ${JAVA_PKG_NV_DEPEND} ]] && export JAVA_PKG_NV_DEPEND="${DEPEND}" 1400 return $?
959# [[ -z ${JAVA_PKG_NV_RDEPEND} ]] && export JAVA_PKG_NV_RDEPEND="${RDEPEND}" 1401}
960#
961# export DEPEND="${DEPEND} ${depstr}"
962# export RDEPEND="${RDEPEND} ${depstr}"
963#}
964 1402
1403# ------------------------------------------------------------------------------
1404# @ebuild-function java-pkg_ensure-no-bundled-jars
1405#
1406# 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 1407# This function should be called after WORKDIR has been populated with symlink
966# TODO document 1408# to system jar files or bundled jars removed.
1409# ------------------------------------------------------------------------------
967java-pkg_ensure-no-bundled-jars() { 1410java-pkg_ensure-no-bundled-jars() {
968 debug-print-function ${FUNCNAME} $* 1411 debug-print-function ${FUNCNAME} $*
969 pushd ${WORKDIR} >/dev/null 2>/dev/null
970 1412
971 local bundled_jars=$(find . -name "*.jar" -type f) 1413 local bundled_jars=$(java-pkg_find-normal-jars)
972 if [[ -n ${bundled_jars} ]]; then 1414 if [[ -n ${bundled_jars} ]]; then
973 echo "Bundled jars found:" 1415 echo "Bundled jars found:"
974 local jar 1416 local jar
975 for jar in ${bundled_jars}; do 1417 for jar in ${bundled_jars}; do
976 echo $(pwd)${jar/./} 1418 echo $(pwd)${jar/./}
977 done 1419 done
978 die "Bundled jars found!" 1420 die "Bundled jars found!"
979
980 fi 1421 fi
981 popd >/dev/null 2>/dev/null
982} 1422}
983 1423
984# ------------------------------------------------------------------------------ 1424# ------------------------------------------------------------------------------
985# @internal-function java-pkg_ensure-vm-version-sufficient 1425# @internal-function java-pkg_ensure-vm-version-sufficient
986# 1426#
1135# @ebuild-function java-pkg_get-target 1575# @ebuild-function java-pkg_get-target
1136# 1576#
1137# Determines what target version should be used, for passing to -target. 1577# 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 1578# If you don't care about lower versions, you can set _WANT_TARGET to the
1139# version of your JDK. 1579# 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# 1580#
1144# @return string - Either the lowest possible target, or JAVA_PKG_WANT_TARGET 1581# @return string - Either the lowest possible target, or JAVA_PKG_WANT_TARGET
1145# ------------------------------------------------------------------------------ 1582# ------------------------------------------------------------------------------
1146java-pkg_get-target() { 1583java-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}")} 1584 echo ${JAVA_PKG_WANT_TARGET:-$(depend-java-query --get-lowest "${DEPEND} ${RDEPEND}")}
1160} 1585}
1161 1586
1162java-pkg_get-javac() { 1587java-pkg_get-javac() {
1163 debug-print-function ${FUNCNAME} $* 1588 debug-print-function ${FUNCNAME} $*
1164 1589
1165 java-pkg_init-compiler_ 1590
1166 local compiler="${GENTOO_COMPILER}" 1591 local compiler="${GENTOO_COMPILER}"
1167 1592
1168 local compiler_executable 1593 local compiler_executable
1169 if [[ "${compiler}" = "javac" ]]; then 1594 if [[ "${compiler}" = "javac" ]]; then
1170 # nothing fancy needs to be done for javac 1595 # nothing fancy needs to be done for javac
1178 unset JAVAC 1603 unset JAVAC
1179 # try to get value of JAVAC 1604 # try to get value of JAVAC
1180 compiler_executable="$(source ${compiler_env} 1>/dev/null 2>&1; echo ${JAVAC})" 1605 compiler_executable="$(source ${compiler_env} 1>/dev/null 2>&1; echo ${JAVAC})"
1181 export JAVAC=${old_javac} 1606 export JAVAC=${old_javac}
1182 1607
1183 [[ -z ${compiler_executable} ]] && die "JAVAC is empty or undefined in ${compiler_env}" 1608 if [[ -z ${compiler_executable} ]]; then
1609 echo "JAVAC is empty or undefined in ${compiler_env}"
1610 return 1
1611 fi
1184 1612
1185 # check that it's executable 1613 # check that it's executable
1186 if [[ ! -x ${compiler_executable} ]]; then 1614 if [[ ! -x ${compiler_executable} ]]; then
1187 eerror "Could not find ${compiler_executable}!"
1188 die "${compiler_executable} doesn't exist, or isn't executable" 1615 echo "${compiler_executable} doesn't exist, or isn't executable"
1616 return 1
1189 fi 1617 fi
1190 else 1618 else
1191 eerror "Could not find environment file for ${compiler}" 1619 echo "Could not find environment file for ${compiler}"
1192 die "Could not find ${compiler_env}" 1620 return 1
1193 fi 1621 fi
1194 fi 1622 fi
1195 echo ${compiler_executable} 1623 echo ${compiler_executable}
1196} 1624}
1197 1625
1214 1642
1215 debug-print "want source: ${want_source}" 1643 debug-print "want source: ${want_source}"
1216 debug-print "want target: ${want_target}" 1644 debug-print "want target: ${want_target}"
1217 1645
1218 if [[ -z "${want_source}" || -z "${want_target}" ]]; then 1646 if [[ -z "${want_source}" || -z "${want_target}" ]]; then
1219 debug-print "could not find valid -source/-target values" 1647 debug-print "could not find valid -source/-target values for javac"
1220 die "Could not find valid -source/-target values" 1648 echo "Could not find valid -source/-target values for javac"
1649 return 1
1221 else 1650 else
1222 if java-pkg_is-vm-version-ge "1.4"; then 1651 if java-pkg_is-vm-version-ge "1.4"; then
1223 echo "${source_str} ${target_str}" 1652 echo "${source_str} ${target_str}"
1224 else 1653 else
1225 echo "${target_str}" 1654 echo "${target_str}"
1229 1658
1230# TODO document 1659# TODO document
1231java-pkg_get-jni-cflags() { 1660java-pkg_get-jni-cflags() {
1232 local flags="-I${JAVA_HOME}/include" 1661 local flags="-I${JAVA_HOME}/include"
1233 1662
1663 local platform="linux"
1664 use elibc_FreeBSD && platform="freebsd"
1665
1234 # TODO do a check that the directories are valid 1666 # 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" 1667 flags="${flags} -I${JAVA_HOME}/include/${platform}"
1237 1668
1238 echo ${flags} 1669 echo ${flags}
1239} 1670}
1240 1671
1241java-pkg_ensure-gcj() { 1672java-pkg_ensure-gcj() {
1247 die "No GCJ support found!" 1678 die "No GCJ support found!"
1248 fi 1679 fi
1249} 1680}
1250 1681
1251java-pkg_ensure-test() { 1682java-pkg_ensure-test() {
1252 if hasq test ${FEATURES} && ! hasq -test ${FEATURES} && ! use test; then 1683 if hasq test ${FEATURES} && ! hasq -test ${FEATURES} \
1684 && hasq test ${IUSE} && ! use test;
1685 then
1253 eerror "You specified FEATURES=test, but USE=test is needed" 1686 eerror "You specified FEATURES=test, but USE=test is needed"
1254 eerror "to pull in the additional dependencies for testing" 1687 eerror "to pull in the additional dependencies for testing"
1255 die "Need USE=test enabled" 1688 die "Need USE=test enabled"
1256 fi 1689 fi
1257} 1690}
1258 1691
1259# ------------------------------------------------------------------------------ 1692# ------------------------------------------------------------------------------
1693# @ebuild-function java-pkg_register-ant-task
1694#
1695# Register this package as ant task, so that ant will load it when no specific
1696# ANT_TASKS are specified. Note that even without this registering, all packages
1697# specified in ANT_TASKS will be loaded. Mostly used by the actual ant tasks
1698# packages, but can be also used by other ebuilds that used to symlink their
1699# .jar into /usr/share/ant-core/lib to get autoloaded, for backwards
1700# compatibility.
1701#
1702# @param --version x.y Register only for ant version x.y (otherwise for any ant
1703# version). Used by the ant-* packages to prevent loading of mismatched
1704# ant-core ant tasks after core was updated, before the tasks are updated,
1705# without a need for blockers.
1706# @param $1 Name to register as. Defaults to JAVA_PKG_NAME ($PN[-$SLOT])
1707# ------------------------------------------------------------------------------
1708java-pkg_register-ant-task() {
1709 local TASKS_DIR="tasks"
1710
1711 # check for --version x.y parameters
1712 while [[ -n "${1}" && -n "${2}" ]]; do
1713 local var="${1#--}"
1714 local val="${2}"
1715 if [[ "${var}" == "version" ]]; then
1716 TASKS_DIR="tasks-${val}"
1717 else
1718 die "Unknown parameter passed to java-pkg_register-ant-tasks: ${1} ${2}"
1719 fi
1720 shift 2
1721 done
1722
1723 local TASK_NAME="${1:-${JAVA_PKG_NAME}}"
1724
1725 dodir /usr/share/ant/${TASKS_DIR}
1726 touch "${D}/usr/share/ant/${TASKS_DIR}/${TASK_NAME}"
1727}
1728
1729# ------------------------------------------------------------------------------
1730# @internal-function java-pkg_ant-tasks-depend
1731#
1732# Translates the WANT_ANT_TASKS variable into valid dependencies.
1733# ------------------------------------------------------------------------------
1734java-pkg_ant-tasks-depend() {
1735 debug-print-function ${FUNCNAME} ${WANT_ANT_TASKS}
1736
1737 if [[ -n "${WANT_ANT_TASKS}" ]]; then
1738 local DEP=""
1739 for i in ${WANT_ANT_TASKS}
1740 do
1741 if [[ ${i} = ant-* ]]; then
1742 DEP="${DEP}dev-java/${i} "
1743 elif [[ ${i} = */*:* ]]; then
1744 DEP="${DEP}${i} "
1745 else
1746 echo "Invalid atom in WANT_ANT_TASKS: ${i}"
1747 return 1
1748 fi
1749 done
1750 echo ${DEP}
1751 return 0
1752 else
1753 return 0
1754 fi
1755}
1756
1757# ------------------------------------------------------------------------------
1758# @ebuild-function ejunit
1759#
1760# Junit wrapper function. Makes it easier to run the tests and checks for
1761# dev-java/junit in DEPEND. Launches the tests using junit.textui.TestRunner.
1762#
1763# Examples:
1764# ejunit -cp build/classes org.blinkenlights.jid3.test.AllTests
1765# ejunit org.blinkenlights.jid3.test.AllTests
1766#
1767# @param $1 - -cp or -classpath
1768# @param $2 - classpath; junit and recorded dependencies get appended
1769# @param $@ - the rest of the parameters are passed to java
1770# ------------------------------------------------------------------------------
1771ejunit() {
1772 debug-print-function ${FUNCNAME} $*
1773
1774 local pkgs
1775 if [[ -f ${JAVA_PKG_DEPEND_FILE} ]]; then
1776 for atom in $(cat ${JAVA_PKG_DEPEND_FILE} | tr : ' '); do
1777 pkgs=${pkgs},$(echo ${atom} | sed -re "s/^.*@//")
1778 done
1779 fi
1780
1781 local cp=$(java-pkg_getjars --with-dependencies junit${pkgs})
1782 if [[ ${1} = -cp || ${1} = -classpath ]]; then
1783 cp="${2}:${cp}"
1784 shift 2
1785 else
1786 cp=".:${cp}"
1787 fi
1788
1789 local runner=junit.textui.TestRunner
1790 debug-print "Calling: java -cp \"${cp}\" -Djava.awt.headless=true ${runner} ${@}"
1791 java -cp "${cp}" -Djava.awt.headless=true ${runner} "${@}" || die "Running junit failed"
1792}
1793
1794# ------------------------------------------------------------------------------
1260# @section-end helper 1795# @section-end helper
1261# ------------------------------------------------------------------------------ 1796# ------------------------------------------------------------------------------
1797
1798# ------------------------------------------------------------------------------
1799# @eclass-src_prepare
1800#
1801# src_prepare Searches for bundled jars
1802# Don't call directly, but via java-pkg-2_src_prepare!
1803# ------------------------------------------------------------------------------
1804
1805java-utils-2_src_prepare() {
1806 [[ ${EBUILD_PHASE} == prepare ]] &&
1807 java-pkg_func-exists java_prepare && java_prepare
1808
1809 # Remember that eant will call this unless called via Portage
1810 if [[ ! -e "${T}/java-utils-2_src_prepare-run" ]] && is-java-strict; then
1811 echo "Searching for bundled jars:"
1812 java-pkg_find-normal-jars || echo "None found."
1813 echo "Searching for bundled classes (no output if none found):"
1814 find "${WORKDIR}" -name "*.class"
1815 echo "Search done."
1816 fi
1817 touch "${T}/java-utils-2_src_prepare-run"
1818}
1819
1820# ------------------------------------------------------------------------------
1821# @eclass-pkg_preinst
1822#
1823# pkg_preinst Searches for missing and unneeded dependencies
1824# Don't call directly, but via java-pkg-2_pkg_preinst!
1825# ------------------------------------------------------------------------------
1826
1827java-utils-2_pkg_preinst() {
1828 if is-java-strict; then
1829 if has_version dev-java/java-dep-check; then
1830 [[ -e "${JAVA_PKG_ENV}" ]] || return
1831 local output=$(GENTOO_VM= java-dep-check --image "${D}" "${JAVA_PKG_ENV}")
1832 if [[ ${output} && has_version <=dev-java/java-dep-check-0.2 ]]; then
1833 ewarn "Possibly unneeded dependencies found in package.env:"
1834 for dep in ${output}; do
1835 ewarn "\t${dep}"
1836 done
1837 fi
1838 if [[ ${output} && has_version >dev-java/java-dep-check-0.2 ]]; then
1839 ewarn "${output}"
1840 fi
1841 else
1842 eerror "Install dev-java/java-dep-check for dependency checking"
1843 fi
1844 fi
1845}
1262 1846
1263# ------------------------------------------------------------------------------ 1847# ------------------------------------------------------------------------------
1264# @section-begin build 1848# @section-begin build
1265# @section-summary Build functions 1849# @section-summary Build functions
1266# 1850#
1270 1854
1271# ------------------------------------------------------------------------------ 1855# ------------------------------------------------------------------------------
1272# @ebuild-function eant 1856# @ebuild-function eant
1273# 1857#
1274# Ant wrapper function. Will use the appropriate compiler, based on user-defined 1858# Ant wrapper function. Will use the appropriate compiler, based on user-defined
1275# compiler. 1859# compiler. Will also set proper ANT_TASKS from the variable ANT_TASKS,
1276# 1860# variables:
1861# EANT_GENTOO_CLASSPATH - calls java-pkg_getjars for the value and adds to the
1862# gentoo.classpath property. Be sure to call
1863# java-ant_rewrite-classpath in src_unpack.
1864# EANT_NEEDS_TOOLS - add tools.jar to the gentoo.classpath. Should only be used
1865# for build-time purposes, the dependency is not recorded to
1866# package.env!
1867# JAVA_PKG_NO_BUNDLED_SEARCH - Don't search for bundled jars or class files
1868# *ANT_TASKS - used to determine ANT_TASKS before calling Ant.
1277# ------------------------------------------------------------------------------ 1869# ------------------------------------------------------------------------------
1278eant() { 1870eant() {
1279 debug-print-function ${FUNCNAME} $* 1871 debug-print-function ${FUNCNAME} $*
1280 1872
1281 # FIXME get this working 1873 if [[ ${EBUILD_PHASE} = compile ]]; then
1282# if is-java-strict && [[ ! ${DEPEND} =~ "dev-java/ant" ]]; then 1874 java-ant-2_src_configure
1875 java-utils-2_src_prepare
1876 fi
1877
1878 if ! hasq java-ant-2 ${INHERITED}; then
1879 local msg="You should inherit java-ant-2 when using eant"
1283# java-pkg_announce-qa-violation \ 1880 java-pkg_announce-qa-violation "${msg}"
1284# "Using eant, but not depending on dev-java/ant or dev-java/ant-core"
1285# fi 1881 fi
1286 1882
1287 local antflags 1883 local antflags="-Dnoget=true -Dmaven.mode.offline=true -Dbuild.sysclasspath=ignore"
1884
1288 java-pkg_init-compiler_ 1885 java-pkg_init-compiler_
1289 local compiler="${GENTOO_COMPILER}" 1886 local compiler="${GENTOO_COMPILER}"
1290 1887
1291 local compiler_env="${JAVA_PKG_COMPILER_DIR}/${compiler}" 1888 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})" 1889 local build_compiler="$(source ${compiler_env} 1>/dev/null 2>&1; echo ${ANT_BUILD_COMPILER})"
1294 if [[ "${compiler}" != "javac" && -z "${build_compiler}" ]]; then 1890 if [[ "${compiler}" != "javac" && -z "${build_compiler}" ]]; then
1295 die "ANT_BUILD_COMPILER undefined in ${compiler_env}" 1891 die "ANT_BUILD_COMPILER undefined in ${compiler_env}"
1296 fi 1892 fi
1297 1893
1298 if [[ ${compiler} != "javac" ]]; then 1894 if [[ ${compiler} != "javac" ]]; then
1299 antflags="-Dbuild.compiler=${build_compiler}" 1895 antflags="${antflags} -Dbuild.compiler=${build_compiler}"
1300 # Figure out any extra stuff to put on the classpath for compilers aside 1896 # Figure out any extra stuff to put on the classpath for compilers aside
1301 # from javac 1897 # from javac
1302 # ANT_BUILD_COMPILER_DEPS should be something that could be passed to 1898 # ANT_BUILD_COMPILER_DEPS should be something that could be passed to
1303 # java-config -p 1899 # java-config -p
1304 local build_compiler_deps="$(source ${JAVA_PKG_COMPILER_DIR}/${compiler} 1>/dev/null 2>&1; echo ${ANT_BUILD_COMPILER_DEPS})" 1900 local build_compiler_deps="$(source ${JAVA_PKG_COMPILER_DIR}/${compiler} 1>/dev/null 2>&1; echo ${ANT_BUILD_COMPILER_DEPS})"
1305 if [[ -n ${build_compiler_deps} ]]; then 1901 if [[ -n ${build_compiler_deps} ]]; then
1306 antflags="${antflags} -lib $(java-config -p ${build_compiler_deps})" 1902 antflags="${antflags} -lib $(java-config -p ${build_compiler_deps})"
1307 fi 1903 fi
1308 fi 1904 fi
1309 1905
1906 for arg in "${@}"; do
1907 if [[ ${arg} = -lib ]]; then
1310 if is-java-strict; then 1908 if is-java-strict; then
1311 einfo "Disabling system classpath for ant" 1909 eerror "You should not use the -lib argument to eant because it will fail"
1312 antflags="${antflags} -Dbuild.sysclasspath=ignore" 1910 eerror "with JAVA_PKG_STRICT. Please use for example java-pkg_jar-from"
1911 eerror "or ant properties to make dependencies available."
1912 eerror "For ant tasks use WANT_ANT_TASKS or ANT_TASKS from."
1913 eerror "split ant (>=dev-java/ant-core-1.7)."
1914 die "eant -lib is deprecated/forbidden"
1915 else
1916 echo "eant -lib is deprecated. Turn JAVA_PKG_STRICT on for"
1917 echo "more info."
1918 fi
1313 fi 1919 fi
1920 done
1314 1921
1315 if [[ -n ${JAVA_PKG_DEBUG} ]]; then 1922 # parse WANT_ANT_TASKS for atoms
1316 antflags="${antflags} -debug" 1923 local want_ant_tasks
1924 for i in ${WANT_ANT_TASKS}; do
1925 if [[ ${i} = */*:* ]]; then
1926 i=${i#*/}
1927 i=${i%:0}
1928 want_ant_tasks+="${i/:/-} "
1929 else
1930 want_ant_tasks+="${i} "
1931 fi
1932 done
1933 # default ANT_TASKS to WANT_ANT_TASKS, if ANT_TASKS is not set explicitly
1934 ANT_TASKS="${ANT_TASKS:-${want_ant_tasks% }}"
1935
1936 # override ANT_TASKS with JAVA_PKG_FORCE_ANT_TASKS if it's set
1937 ANT_TASKS="${JAVA_PKG_FORCE_ANT_TASKS:-${ANT_TASKS}}"
1938
1939 # if ant-tasks is not set by ebuild or forced, use none
1940 ANT_TASKS="${ANT_TASKS:-none}"
1941
1942 # at this point, ANT_TASKS should be "all", "none" or explicit list
1943 if [[ "${ANT_TASKS}" == "all" ]]; then
1944 einfo "Using all available ANT_TASKS"
1945 elif [[ "${ANT_TASKS}" == "none" ]]; then
1946 einfo "Disabling all optional ANT_TASKS"
1947 else
1948 einfo "Using following ANT_TASKS: ${ANT_TASKS}"
1949 fi
1950
1951 export ANT_TASKS
1952
1953 [[ -n ${JAVA_PKG_DEBUG} ]] && antflags="${antflags} --execdebug -debug"
1954 [[ -n ${PORTAGE_QUIET} ]] && antflags="${antflags} -q"
1955
1956 local gcp="${EANT_GENTOO_CLASSPATH}"
1957 local getjarsarg=""
1958
1959 if [[ ${EBUILD_PHASE} = "test" ]]; then
1960 antflags="${antflags} -DJunit.present=true"
1961 [[ ${ANT_TASKS} = *ant-junit* ]] && gcp="${gcp} junit"
1962 getjarsarg="--with-dependencies"
1963 fi
1964
1965 local cp
1966
1967 for atom in ${gcp}; do
1968 cp="${cp}:$(java-pkg_getjars ${getjarsarg} ${atom})"
1969 done
1970
1971 [[ -n "${EANT_NEEDS_TOOLS}" ]] && cp="${cp}:$(java-config --tools)"
1972
1973 if [[ ${cp} ]]; then
1974 # It seems ant does not like single quotes around ${cp}
1975 cp=${cp#:}
1976 [[ ${EANT_GENTOO_CLASSPATH_EXTRA} ]] && \
1977 cp="${cp}:${EANT_GENTOO_CLASSPATH_EXTRA}"
1978 antflags="${antflags} -Dgentoo.classpath=\"${cp}\""
1317 fi 1979 fi
1318 1980
1319 [[ -n ${JAVA_PKG_DEBUG} ]] && echo ant ${antflags} "${@}" 1981 [[ -n ${JAVA_PKG_DEBUG} ]] && echo ant ${antflags} "${@}"
1982 debug-print "Calling ant (GENTOO_VM: ${GENTOO_VM}): ${antflags} ${@}"
1320 ant ${antflags} "${@}" || die "eant failed" 1983 ant ${antflags} "${@}" || die "eant failed"
1321
1322} 1984}
1323 1985
1324# ------------------------------------------------------------------------------ 1986# ------------------------------------------------------------------------------
1325# @ebuild-function ejavac 1987# @ebuild-function ejavac
1326# 1988#
1330# @param $@ - Arguments to be passed to the compiler 1992# @param $@ - Arguments to be passed to the compiler
1331# ------------------------------------------------------------------------------ 1993# ------------------------------------------------------------------------------
1332ejavac() { 1994ejavac() {
1333 debug-print-function ${FUNCNAME} $* 1995 debug-print-function ${FUNCNAME} $*
1334 1996
1335 # FIXME using get-javac ends up printing stuff with einfo 1997 java-pkg_init-compiler_
1998
1999 local compiler_executable
1336# local compiler_executable=$(java-pkg_get-javac) 2000 compiler_executable=$(java-pkg_get-javac)
1337 local compiler_executable="javac" 2001 if [[ ${?} != 0 ]]; then
2002 eerror "There was a problem determining compiler: ${compiler_executable}"
2003 die "get-javac failed"
2004 fi
1338 2005
2006 local javac_args
2007 javac_args="$(java-pkg_javac-args)"
2008 if [[ ${?} != 0 ]]; then
2009 eerror "There was a problem determining JAVACFLAGS: ${javac_args}"
2010 die "java-pkg_javac-args failed"
2011 fi
2012
1339 [[ -n ${JAVA_PKG_DEBUG} ]] && echo ${compiler_executable} $(java-pkg_javac-args) "${@}" 2013 [[ -n ${JAVA_PKG_DEBUG} ]] && echo ${compiler_executable} ${javac_args} "${@}"
1340 ${compiler_executable} $(java-pkg_javac-args) "${@}" || die "ejavac failed" 2014 ${compiler_executable} ${javac_args} "${@}" || die "ejavac failed"
1341} 2015}
1342 2016
1343# ------------------------------------------------------------------------------ 2017# ------------------------------------------------------------------------------
1344# @ebuild-function java-pkg_filter-compiler 2018# @ebuild-function java-pkg_filter-compiler
1345# 2019#
1383# ------------------------------------------------------------------------------ 2057# ------------------------------------------------------------------------------
1384use_doc() { 2058use_doc() {
1385 use doc && echo ${@:-javadoc} 2059 use doc && echo ${@:-javadoc}
1386} 2060}
1387 2061
2062
1388# ------------------------------------------------------------------------------ 2063# ------------------------------------------------------------------------------
1389# @section-end build 2064# @section-end build
1390# ------------------------------------------------------------------------------ 2065# ------------------------------------------------------------------------------
1391 2066
1392# ------------------------------------------------------------------------------ 2067# ------------------------------------------------------------------------------
1408# This shouldn't be used directly. Instead, java-pkg and java-pkg-opt will 2083# This shouldn't be used directly. Instead, java-pkg and java-pkg-opt will
1409# call it during each of the phases of the merge process. 2084# call it during each of the phases of the merge process.
1410# 2085#
1411# ----------------------------------------------------------------------------- 2086# -----------------------------------------------------------------------------
1412java-pkg_init() { 2087java-pkg_init() {
2088 debug-print-function ${FUNCNAME} $*
1413 unset JAVAC 2089 unset JAVAC
1414 unset JAVA_HOME 2090 unset JAVA_HOME
2091
2092 java-config --help >/dev/null || {
2093 eerror ""
2094 eerror "Can't run java-config --help"
2095 eerror "Have you upgraded python recently but haven't"
2096 eerror "run python-updater yet?"
2097 die "Can't run java-config --help"
2098 }
2099
2100 # People do all kinds of weird things.
2101 # http://forums.gentoo.org/viewtopic-p-3943166.html
2102 local silence="${SILENCE_JAVA_OPTIONS_WARNING}"
2103 local accept="${I_WANT_GLOBAL_JAVA_OPTIONS}"
2104 if [[ -n ${_JAVA_OPTIONS} && -z ${accept} && -z ${silence} ]]; then
2105 ewarn "_JAVA_OPTIONS changes what java -version outputs at least for"
2106 ewarn "sun-jdk vms and and as such break configure scripts that"
2107 ewarn "use it (for example app-office/openoffice) so we filter it out."
2108 ewarn "Use SILENCE_JAVA_OPTIONS_WARNING=true in the environment (use"
2109 ewarn "make.conf for example) to silence this warning or"
2110 ewarn "I_WANT_GLOBAL_JAVA_OPTIONS to not filter it."
2111 fi
2112
2113 if [[ -z ${accept} ]]; then
2114 # export _JAVA_OPTIONS= doesn't work because it will show up in java
2115 # -version output
2116 unset _JAVA_OPTIONS
2117 # phase hooks make this run many times without this
2118 I_WANT_GLOBAL_JAVA_OPTIONS="true"
2119 fi
2120
2121 if java-pkg_func-exists ant_src_unpack; then
2122 java-pkg_announce-qa-violation "Using old ant_src_unpack. Should be src_unpack"
2123 fi
2124
1415 java-pkg_init_paths_ 2125 java-pkg_init_paths_
1416 java-pkg_switch-vm 2126 java-pkg_switch-vm
1417 PATH=${JAVA_HOME}/bin:${PATH} 2127 PATH=${JAVA_HOME}/bin:${PATH}
1418 2128
1419 # TODO we will probably want to set JAVAC and JAVACFLAGS 2129 # TODO we will probably want to set JAVAC and JAVACFLAGS
1420 2130
1421 # Do some QA checks 2131 # Do some QA checks
1422 java-pkg_check-jikes 2132 java-pkg_check-jikes
2133
2134 # Can't use unset here because Portage does not save the unset
2135 # see https://bugs.gentoo.org/show_bug.cgi?id=189417#c11
1423 2136
1424 # When users have crazy classpaths some packages can fail to compile. 2137 # When users have crazy classpaths some packages can fail to compile.
1425 # and everything should work with empty CLASSPATH. 2138 # and everything should work with empty CLASSPATH.
1426 # This also helps prevent unexpected dependencies on random things 2139 # This also helps prevent unexpected dependencies on random things
1427 # from the CLASSPATH. 2140 # from the CLASSPATH.
1428 unset CLASSPATH 2141 export CLASSPATH=
2142
2143 # Unset external ANT_ stuff
2144 export ANT_TASKS=
2145 export ANT_OPTS=
2146 export ANT_RESPECT_JAVA_HOME=
1429} 2147}
1430 2148
1431# ------------------------------------------------------------------------------ 2149# ------------------------------------------------------------------------------
1432# @function-internal java-pkg-init-compiler_ 2150# @function-internal java-pkg-init-compiler_
1433# 2151#
1524 done 2242 done
1525 2243
1526 # If it hasn't been defined already, default to javac 2244 # If it hasn't been defined already, default to javac
1527 if [[ -z ${GENTOO_COMPILER} ]]; then 2245 if [[ -z ${GENTOO_COMPILER} ]]; then
1528 if [[ -n ${compilers} ]]; then 2246 if [[ -n ${compilers} ]]; then
1529 einfo "No suitable compiler found: defaulting javac for compilation" 2247 einfo "No suitable compiler found: defaulting to JDK default for compilation"
1530 else 2248 else
1531 # probably don't need to notify users about the default. 2249 # probably don't need to notify users about the default.
1532 :;#einfo "Defaulting to javac for compilation" 2250 :;#einfo "Defaulting to javac for compilation"
1533 fi 2251 fi
2252 if java-config -g GENTOO_COMPILER 2> /dev/null; then
2253 export GENTOO_COMPILER=$(java-config -g GENTOO_COMPILER)
2254 else
1534 export GENTOO_COMPILER=javac 2255 export GENTOO_COMPILER=javac
2256 fi
1535 else 2257 else
1536 einfo "Using ${GENTOO_COMPILER} for compilation" 2258 einfo "Using ${GENTOO_COMPILER} for compilation"
1537 fi 2259 fi
1538 2260
1539} 2261}
1555 fi 2277 fi
1556 2278
1557 JAVA_PKG_SHAREPATH="${DESTTREE}/share/${JAVA_PKG_NAME}" 2279 JAVA_PKG_SHAREPATH="${DESTTREE}/share/${JAVA_PKG_NAME}"
1558 JAVA_PKG_SOURCESPATH="${JAVA_PKG_SHAREPATH}/sources/" 2280 JAVA_PKG_SOURCESPATH="${JAVA_PKG_SHAREPATH}/sources/"
1559 JAVA_PKG_ENV="${D}${JAVA_PKG_SHAREPATH}/package.env" 2281 JAVA_PKG_ENV="${D}${JAVA_PKG_SHAREPATH}/package.env"
2282 JAVA_PKG_VIRTUALS_PATH="${DESTTREE}/share/java-config-2/virtuals"
2283 JAVA_PKG_VIRTUAL_PROVIDER="${D}/${JAVA_PKG_VIRTUALS_PATH}/${JAVA_PKG_NAME}"
1560 2284
1561 [[ -z "${JAVA_PKG_JARDEST}" ]] && JAVA_PKG_JARDEST="${JAVA_PKG_SHAREPATH}/lib" 2285 [[ -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}" 2286 [[ -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" 2287 [[ -z "${JAVA_PKG_WARDEST}" ]] && JAVA_PKG_WARDEST="${JAVA_PKG_SHAREPATH}/webapps"
1564 2288
1577# Writes the package.env out to disk. 2301# Writes the package.env out to disk.
1578# 2302#
1579# ------------------------------------------------------------------------------ 2303# ------------------------------------------------------------------------------
1580# TODO change to do-write, to match everything else 2304# TODO change to do-write, to match everything else
1581java-pkg_do_write_() { 2305java-pkg_do_write_() {
2306 debug-print-function ${FUNCNAME} $*
2307 java-pkg_init_paths_
1582 # Create directory for package.env 2308 # Create directory for package.env
1583 dodir "${JAVA_PKG_SHAREPATH}" 2309 dodir "${JAVA_PKG_SHAREPATH}"
1584 if [[ -n "${JAVA_PKG_CLASSPATH}" || -n "${JAVA_PKG_LIBRARY}" || -f "${JAVA_PKG_DEPEND}" ]]; then 2310 if [[ -n "${JAVA_PKG_CLASSPATH}" || -n "${JAVA_PKG_LIBRARY}" || -f \
2311 "${JAVA_PKG_DEPEND_FILE}" || -f \
2312 "${JAVA_PKG_OPTIONAL_DEPEND_FILE}" ]]; then
1585 # Create package.env 2313 # Create package.env
1586 ( 2314 (
1587 echo "DESCRIPTION=\"${DESCRIPTION}\"" 2315 echo "DESCRIPTION=\"${DESCRIPTION}\""
1588 echo "GENERATION=\"2\"" 2316 echo "GENERATION=\"2\""
2317 echo "SLOT=\"${SLOT}\""
2318 echo "CATEGORY=\"${CATEGORY}\""
2319 echo "PVR=\"${PVR}\""
1589 2320
1590 [[ -n "${JAVA_PKG_CLASSPATH}" ]] && echo "CLASSPATH=\"${JAVA_PKG_CLASSPATH}\"" 2321 [[ -n "${JAVA_PKG_CLASSPATH}" ]] && echo "CLASSPATH=\"${JAVA_PKG_CLASSPATH}\""
1591 [[ -n "${JAVA_PKG_LIBRARY}" ]] && echo "LIBRARY_PATH=\"${JAVA_PKG_LIBRARY}\"" 2322 [[ -n "${JAVA_PKG_LIBRARY}" ]] && echo "LIBRARY_PATH=\"${JAVA_PKG_LIBRARY}\""
1592 [[ -n "${JAVA_PROVIDE}" ]] && echo "PROVIDES=\"${JAVA_PROVIDE}\"" 2323 [[ -n "${JAVA_PROVIDE}" ]] && echo "PROVIDES=\"${JAVA_PROVIDE}\""
1593 [[ -f "${JAVA_PKG_DEPEND}" ]] && echo "DEPEND=\"$(cat ${JAVA_PKG_DEPEND} | uniq | tr '\n' ':')\"" 2324 [[ -f "${JAVA_PKG_DEPEND_FILE}" ]] \
2325 && echo "DEPEND=\"$(sort -u "${JAVA_PKG_DEPEND_FILE}" | tr '\n' ':')\""
2326 [[ -f "${JAVA_PKG_OPTIONAL_DEPEND_FILE}" ]] \
2327 && echo "OPTIONAL_DEPEND=\"$(sort -u "${JAVA_PKG_OPTIONAL_DEPEND_FILE}" | tr '\n' ':')\""
1594 echo "VM=\"$(echo ${RDEPEND} ${DEPEND} | sed -e 's/ /\n/g' | sed -n -e '/virtual\/\(jre\|jdk\)/ { p;q }')\"" # TODO cleanup ! 2328 echo "VM=\"$(echo ${RDEPEND} ${DEPEND} | sed -e 's/ /\n/g' | sed -n -e '/virtual\/\(jre\|jdk\)/ { p;q }')\"" # TODO cleanup !
2329 [[ -f "${JAVA_PKG_BUILD_DEPEND_FILE}" ]] \
2330 && echo "BUILD_DEPEND=\"$(sort -u "${JAVA_PKG_BUILD_DEPEND_FILE}" | tr '\n' ':')\""
1595 ) > "${JAVA_PKG_ENV}" 2331 ) > "${JAVA_PKG_ENV}"
1596 2332
1597 # register target/source 2333 # register target/source
1598 local target="$(java-pkg_get-target)" 2334 local target="$(java-pkg_get-target)"
1599 local source="$(java-pkg_get-source)" 2335 local source="$(java-pkg_get-source)"
1609 2345
1610 2346
1611 echo "MERGE_VM=\"${GENTOO_VM}\"" >> "${JAVA_PKG_ENV}" 2347 echo "MERGE_VM=\"${GENTOO_VM}\"" >> "${JAVA_PKG_ENV}"
1612 [[ -n ${GENTOO_COMPILER} ]] && echo "MERGE_COMPILER=\"${GENTOO_COMPILER}\"" >> "${JAVA_PKG_ENV}" 2348 [[ -n ${GENTOO_COMPILER} ]] && echo "MERGE_COMPILER=\"${GENTOO_COMPILER}\"" >> "${JAVA_PKG_ENV}"
1613 2349
2350 # extra env variables
2351 if [[ -n "${JAVA_PKG_EXTRA_ENV_VARS}" ]]; then
2352 cat "${JAVA_PKG_EXTRA_ENV}" >> "${JAVA_PKG_ENV}" || die
2353 # nested echo to remove leading/trailing spaces
2354 echo "ENV_VARS=\"$(echo ${JAVA_PKG_EXTRA_ENV_VARS})\"" \
2355 >> "${JAVA_PKG_ENV}" || die
2356 fi
2357
1614 # Strip unnecessary leading and trailing colons 2358 # Strip unnecessary leading and trailing colons
1615 # TODO try to cleanup if possible 2359 # TODO try to cleanup if possible
1616 sed -e "s/=\":/=\"/" -e "s/:\"$/\"/" -i "${JAVA_PKG_ENV}" || die "Did you forget to call java_init ?" 2360 sed -e "s/=\":/=\"/" -e "s/:\"$/\"/" -i "${JAVA_PKG_ENV}" || die "Did you forget to call java_init ?"
2361 else
2362 debug-print "JAVA_PKG_CLASSPATH, JAVA_PKG_LIBRARY, JAVA_PKG_DEPEND_FILE"
2363 debug-print "or JAVA_PKG_OPTIONAL_DEPEND_FILE not defined so can't"
2364 debug-print "write package.env."
1617 fi 2365 fi
1618} 2366}
1619
1620 2367
1621# ------------------------------------------------------------------------------ 2368# ------------------------------------------------------------------------------
1622# @internal-function java-pkg_record-jar_ 2369# @internal-function java-pkg_record-jar_
1623# 2370#
1624# Record a dependency to the package.env 2371# Record an (optional) dependency to the package.env
1625# 2372# @param --optional - record dependency as optional
2373# @param --build - record dependency as build_only
2374# @param $1 - package to record
2375# @param $2 - (optional) jar of package to record
1626# ------------------------------------------------------------------------------ 2376# ------------------------------------------------------------------------------
1627JAVA_PKG_DEPEND="${T}/java-pkg-depend" 2377JAVA_PKG_DEPEND_FILE="${T}/java-pkg-depend"
2378JAVA_PKG_OPTIONAL_DEPEND_FILE="${T}/java-pkg-optional-depend"
2379JAVA_PKG_BUILD_DEPEND_FILE="${T}/java-pkg-build-depend"
1628 2380
1629java-pkg_record-jar_() { 2381java-pkg_record-jar_() {
1630 debug-print-function ${FUNCNAME} $* 2382 debug-print-function ${FUNCNAME} $*
2383
2384 local depend_file="${JAVA_PKG_DEPEND_FILE}"
2385 case "${1}" in
2386 "--optional") depend_file="${JAVA_PKG_OPTIONAL_DEPEND_FILE}"; shift;;
2387 "--build-only") depend_file="${JAVA_PKG_BUILD_DEPEND_FILE}"; shift;;
2388 esac
1631 2389
1632 local pkg=${1} jar=${2} append 2390 local pkg=${1} jar=${2} append
1633 if [[ -z "${jar}" ]]; then 2391 if [[ -z "${jar}" ]]; then
1634 append="${pkg}" 2392 append="${pkg}"
1635 else 2393 else
1636 append="$(basename ${jar})@${pkg}" 2394 append="$(basename ${jar})@${pkg}"
1637 fi 2395 fi
1638 2396
1639 echo ${append} >> ${JAVA_PKG_DEPEND} 2397 echo "${append}" >> "${depend_file}"
1640} 2398}
1641 2399
1642# ------------------------------------------------------------------------------ 2400# ------------------------------------------------------------------------------
1643# @internal-function java-pkg_append_ 2401# @internal-function java-pkg_append_
1644# 2402#
1688# 2446#
1689# @return 0 - function is declared 2447# @return 0 - function is declared
1690# @return 1 - function is undeclared 2448# @return 1 - function is undeclared
1691# ------------------------------------------------------------------------------ 2449# ------------------------------------------------------------------------------
1692java-pkg_func-exists() { 2450java-pkg_func-exists() {
1693 if [[ -n "$(declare -f ${1})" ]]; then 2451 declare -F ${1} > /dev/null
1694 return 0
1695 else
1696 return 1
1697 fi
1698} 2452}
1699 2453
1700# ------------------------------------------------------------------------------ 2454# ------------------------------------------------------------------------------
1701# @internal-function java-pkg_setup-vm 2455# @internal-function java-pkg_setup-vm
1702# 2456#
1704# 2458#
1705# ------------------------------------------------------------------------------ 2459# ------------------------------------------------------------------------------
1706java-pkg_setup-vm() { 2460java-pkg_setup-vm() {
1707 debug-print-function ${FUNCNAME} $* 2461 debug-print-function ${FUNCNAME} $*
1708 2462
2463 export LANG="C" LC_ALL="C"
2464
1709 local vendor="$(java-pkg_get-vm-vendor)" 2465 local vendor="$(java-pkg_get-vm-vendor)"
1710 if [[ "${vendor}" == "sun" ]] && java-pkg_is-vm-version-ge 1 5; then 2466 if [[ "${vendor}" == "sun" ]] && java-pkg_is-vm-version-ge "1.5" ; then
1711 addpredict "/dev/random" 2467 addpredict "/dev/random"
1712 elif [[ "${vendor}" == "ibm" ]]; then 2468 elif [[ "${vendor}" == "ibm" ]]; then
1713 addpredict "/proc/self/maps" 2469 addpredict "/proc/self/maps"
1714 addpredict "/proc/cpuinfo" 2470 addpredict "/proc/cpuinfo"
1715 export LANG="C" LC_ALL="C"
1716 elif [[ "${vendor}" == "jrockit" ]]; then 2471 elif [[ "${vendor}" == "jrockit" ]]; then
1717 addpredict "/proc/cpuinfo" 2472 addpredict "/proc/cpuinfo"
1718 fi 2473 fi
1719} 2474}
1720 2475
1727# @return 1 - Package does not depend on virtual/jdk 2482# @return 1 - Package does not depend on virtual/jdk
1728# ------------------------------------------------------------------------------ 2483# ------------------------------------------------------------------------------
1729java-pkg_needs-vm() { 2484java-pkg_needs-vm() {
1730 debug-print-function ${FUNCNAME} $* 2485 debug-print-function ${FUNCNAME} $*
1731 2486
1732 if [[ -n "$(echo ${DEPEND} | sed -e '\:virtual/jdk:!d')" ]]; then 2487 if [[ -n "$(echo ${JAVA_PKG_NV_DEPEND:-${DEPEND}} | sed -e '\:virtual/jdk:!d')" ]]; then
1733 return 0 2488 return 0
1734 fi 2489 fi
1735 2490
1736 return 1 2491 return 1
1737} 2492}
1775# Switch VM if we're allowed to (controlled by JAVA_PKG_ALLOW_VM_CHANGE), and 2530# Switch VM if we're allowed to (controlled by JAVA_PKG_ALLOW_VM_CHANGE), and
1776# verify that the current VM is sufficient. 2531# verify that the current VM is sufficient.
1777# Setup the environment for the VM being used. 2532# Setup the environment for the VM being used.
1778# ------------------------------------------------------------------------------ 2533# ------------------------------------------------------------------------------
1779java-pkg_switch-vm() { 2534java-pkg_switch-vm() {
2535 debug-print-function ${FUNCNAME} $*
2536
1780 if java-pkg_needs-vm; then 2537 if java-pkg_needs-vm; then
1781 # Use the VM specified by JAVA_PKG_FORCE_VM 2538 # Use the VM specified by JAVA_PKG_FORCE_VM
1782 if [[ -n ${JAVA_PKG_FORCE_VM} ]]; then 2539 if [[ -n "${JAVA_PKG_FORCE_VM}" ]]; then
1783 # If you're forcing the VM, I hope you know what your doing... 2540 # If you're forcing the VM, I hope you know what your doing...
2541 debug-print "JAVA_PKG_FORCE_VM used: ${JAVA_PKG_FORCE_VM}"
1784 export GENTOO_VM="${JAVA_PKG_FORCE_VM}" 2542 export GENTOO_VM="${JAVA_PKG_FORCE_VM}"
1785 # if we're allowed to switch the vm... 2543 # if we're allowed to switch the vm...
1786 elif [[ "${JAVA_PKG_ALLOW_VM_CHANGE}" == "yes" ]]; then 2544 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}" 2545 debug-print "depend-java-query: NV_DEPEND: ${JAVA_PKG_NV_DEPEND:-${DEPEND}}"
1788 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}}")" 2546 GENTOO_VM="$(depend-java-query --get-vm "${JAVA_PKG_NV_DEPEND:-${DEPEND}}")"
2547 if [[ -z "${GENTOO_VM}" || "${GENTOO_VM}" == "None" ]]; then
2548 eerror "Unable to determine VM for building from dependencies:"
2549 echo "NV_DEPEND: ${JAVA_PKG_NV_DEPEND:-${DEPEND}}"
2550 die "Failed to determine VM for building."
1790 else 2551 else
1791 export GENTOO_VM="$(depend-java-query --get-vm "${JAVA_PKG_NV_DEPEND:-${DEPEND}}")" 2552 export GENTOO_VM
1792 fi 2553 fi
1793 # otherwise just make sure the current VM is sufficient 2554 # otherwise just make sure the current VM is sufficient
1794 else 2555 else
1795 java-pkg_ensure-vm-version-sufficient 2556 java-pkg_ensure-vm-version-sufficient
1796 fi 2557 fi
1798 2559
1799 java-pkg_setup-vm 2560 java-pkg_setup-vm
1800 2561
1801 export JAVA=$(java-config --java) 2562 export JAVA=$(java-config --java)
1802 export JAVAC=$(java-config --javac) 2563 export JAVAC=$(java-config --javac)
1803 export JAVACFLAGS="$(java-pkg_javac-args)" 2564 JAVACFLAGS="$(java-pkg_javac-args)"
2565 if [[ ${?} != 0 ]]; then
2566 eerror "There was a problem determining JAVACFLAGS: ${JAVACFLAGS}"
2567 die "java-pkg_javac-args failed"
2568 fi
1804 [[ -n ${JAVACFLAGS_EXTRA} ]] && export JAVACFLAGS="${JAVACFLAGS_EXTRA} ${JAVACFLAGS}" 2569 [[ -n ${JAVACFLAGS_EXTRA} ]] && JAVACFLAGS="${JAVACFLAGS_EXTRA} ${JAVACFLAGS}"
2570 export JAVACFLAGS
1805 2571
1806 export JAVA_HOME="$(java-config -g JAVA_HOME)" 2572 export JAVA_HOME="$(java-config -g JAVA_HOME)"
1807 export JDK_HOME=${JAVA_HOME} 2573 export JDK_HOME=${JAVA_HOME}
1808 2574
1809 #TODO If you know a better solution let us know. 2575 #TODO If you know a better solution let us know.
1810 java-pkg_append_ LD_LIBRARY_PATH "$(java-config -g LDPATH)" 2576 java-pkg_append_ LD_LIBRARY_PATH "$(java-config -g LDPATH)"
1811 2577
1812 local tann="${T}/announced-vm" 2578 local tann="${T}/announced-vm"
2579 # With the hooks we should only get here once from pkg_setup but better safe than sorry
2580 # if people have for example modified eclasses some where
1813 if [[ -n "${JAVA_PKG_DEBUG}" ]] || [[ ! -f "${tann}" ]] ; then 2581 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)" 2582 einfo "Using: $(java-config -f)"
1819 [[ ! -f "${tann}" ]] && touch "${tann}" 2583 [[ ! -f "${tann}" ]] && touch "${tann}"
1820 fi
1821 fi 2584 fi
1822 2585
1823 else 2586 else
1824 [[ -n "${JAVA_PKG_DEBUG}" ]] && ewarn "!!! This package inherits java-pkg but doesn't depend on a JDK. -bin or broken dependency!!!" 2587 [[ -n "${JAVA_PKG_DEBUG}" ]] && ewarn "!!! This package inherits java-pkg but doesn't depend on a JDK. -bin or broken dependency!!!"
1825 fi 2588 fi
1855 einfo "Classes" 2618 einfo "Classes"
1856 find "${S}" -type f -name '*.class' -print0 | xargs -0 -r -n 500 ls -ald | sed -e "s,${WORKDIR},\${WORKDIR}," 2619 find "${S}" -type f -name '*.class' -print0 | xargs -0 -r -n 500 ls -ald | sed -e "s,${WORKDIR},\${WORKDIR},"
1857 fi 2620 fi
1858} 2621}
1859 2622
1860# TODO document 2623# ------------------------------------------------------------------------------
2624# @internal-function java-pkg_verify-classes
2625#
1861# Verify that the classes were compiled for the right source / target 2626# Verify that the classes were compiled for the right source / target. Dies if
2627# not.
2628# @param $1 (optional) - the file to check, otherwise checks whole ${D}
2629# ------------------------------------------------------------------------------
1862java-pkg_verify-classes() { 2630java-pkg_verify-classes() {
1863 ebegin "Verifying java class versions"
1864 #$(find ${D} -type f -name '*.jar' -o -name '*.class') 2631 #$(find ${D} -type f -name '*.jar' -o -name '*.class')
1865 class-version-verify.py -t $(java-pkg_get-target) -r ${D} 2632
2633 local version_verify="/usr/bin/class-version-verify.py"
2634
2635 if [[ ! -x "${version_verify}" ]]; then
2636 version_verify="/usr/$(get_libdir)/javatoolkit/bin/class-version-verify.py"
2637 fi
2638
2639 if [[ ! -x "${version_verify}" ]]; then
2640 ewarn "Unable to perform class version checks as"
2641 ewarn "class-version-verify.py is unavailable"
2642 ewarn "Please install dev-java/javatoolkit."
2643 return
2644 fi
2645
2646 local target=$(java-pkg_get-target)
2647 local result
2648 local log="${T}/class-version-verify.log"
2649 if [[ -n "${1}" ]]; then
2650 ${version_verify} -v -t ${target} "${1}" > "${log}"
1866 result=$? 2651 result=$?
1867 eend ${result}
1868 if [[ ${result} == 0 ]]; then
1869 einfo "All good"
1870 else 2652 else
1871 ewarn "Possible problem" 2653 ebegin "Verifying java class versions (target: ${target})"
1872 die "Bad class files found" 2654 ${version_verify} -v -t ${target} -r "${D}" > "${log}"
2655 result=$?
2656 eend ${result}
2657 fi
2658 [[ -n ${JAVA_PKG_DEBUG} ]] && cat "${log}"
2659 if [[ ${result} != 0 ]]; then
2660 eerror "Incorrect bytecode version found"
2661 [[ -n "${1}" ]] && eerror "in file: ${1}"
2662 eerror "See ${log} for more details."
2663 die "Incorrect bytecode found"
2664 fi
2665}
2666
2667# ----------------------------------------------------------------------------
2668# @internal-function java-pkg_ensure-dep
2669# Check that a package being used in jarfrom, getjars and getjar is contained
2670# within DEPEND or RDEPEND.
2671# @param $1 - empty - check both vars; "runtime" or "build" - check only
2672# RDEPEND, resp. DEPEND
2673# @param $2 - Package name and slot.
2674
2675java-pkg_ensure-dep() {
2676 debug-print-function ${FUNCNAME} $*
2677
2678 local limit_to="${1}"
2679 local target_pkg="${2}"
2680 local dev_error=""
2681
2682 # remove the version specification, which may include globbing (* and [123])
2683 local stripped_pkg=$(echo "${target_pkg}" | sed \
2684 's/-\([0-9*]*\(\[[0-9]*\]\)*\)*\(\.\([0-9*]*\(\[[0-9]*\]\)*\)*\)*$//')
2685
2686 debug-print "Matching against: ${stripped_pkg}"
2687
2688 if [[ ${limit_to} != runtime && ! ( "${DEPEND}" =~ "$stripped_pkg" ) ]]; then
2689 dev_error="The ebuild is attempting to use ${target_pkg} that is not"
2690 dev_error="${dev_error} declared in DEPEND."
2691 if is-java-strict; then
2692 eerror "${dev_error}"
2693 die "${dev_error}"
2694 elif [[ ${BASH_SUBSHELL} = 0 ]]; then
2695 eerror "${dev_error}"
2696 elog "Because you have this package installed the package will"
2697 elog "build without problems, but please report this to"
2698 elog "http://bugs.gentoo.org"
1873 fi 2699 fi
1874} 2700 fi
1875 2701
2702 if [[ ${limit_to} != build ]]; then
2703 if [[ ! ( ${RDEPEND} =~ "${stripped_pkg}" ) ]]; then
2704 if [[ ! ( ${PDEPEND} =~ "${stripped_pkg}" ) ]]; then
2705 dev_error="The ebuild is attempting to use ${target_pkg},"
2706 dev_error="${dev_error} without specifying --build-only, that is not declared in RDEPEND"
2707 dev_error="${dev_error} or PDEPEND."
2708 if is-java-strict; then
2709 eerror "${dev_error}"
2710 die "${dev_error}"
2711 elif [[ ${BASH_SUBSHELL} = 0 ]]; then
2712 eerror "${dev_error}"
2713 elog "The package will build without problems, but may fail to run"
2714 elog "if you don't have ${target_pkg} installed, so please report"
2715 elog "this to http://bugs.gentoo.org"
2716 fi
2717 fi
2718 fi
2719 fi
2720}
1876 2721
1877# ------------------------------------------------------------------------------ 2722# ------------------------------------------------------------------------------
1878# @section-end internal 2723# @section-end internal
1879# ------------------------------------------------------------------------------ 2724# ------------------------------------------------------------------------------
1880 2725
1881java-pkg_check-phase() { 2726java-pkg_check-phase() {
1882 local phase=${1} 2727 local phase=${1}
1883 local funcname=${2} 2728 local funcname=${FUNCNAME[1]}
1884 if is-java-strict && [[ ${EBUILD_PHASE} != ${phase} ]]; then 2729 if [[ ${EBUILD_PHASE} != ${phase} ]]; then
1885 java-pkg_announce-qa-violation \
1886 "${funcname} used outside of src_${phase}" 2730 local msg="${funcname} used outside of src_${phase}"
2731 java-pkg_announce-qa-violation "${msg}"
1887 fi 2732 fi
1888} 2733}
1889 2734
1890java-pkg_check-versioned-jar() { 2735java-pkg_check-versioned-jar() {
1891 local jar=${1} 2736 local jar=${1}
1900 java-pkg_announce-qa-violation "deprecated USE flag 'jikes' in IUSE" 2745 java-pkg_announce-qa-violation "deprecated USE flag 'jikes' in IUSE"
1901 fi 2746 fi
1902} 2747}
1903 2748
1904java-pkg_announce-qa-violation() { 2749java-pkg_announce-qa-violation() {
1905 if is-java-strict; then 2750 local nodie
2751 if [[ ${1} == "--nodie" ]]; then
2752 nodie="true"
2753 shift
2754 fi
1906 echo "Java QA Notice: $@" >&2 2755 echo "Java QA Notice: $@" >&2
1907 increment-qa-violations 2756 increment-qa-violations
1908 fi 2757 [[ -z "${nodie}" ]] && is-java-strict && die "${@}"
1909} 2758}
1910 2759
1911increment-qa-violations() { 2760increment-qa-violations() {
1912 let "JAVA_PKG_QA_VIOLATIONS+=1" 2761 let "JAVA_PKG_QA_VIOLATIONS+=1"
1913 export JAVA_PKG_QA_VIOLATIONS 2762 export JAVA_PKG_QA_VIOLATIONS
1916is-java-strict() { 2765is-java-strict() {
1917 [[ -n ${JAVA_PKG_STRICT} ]] 2766 [[ -n ${JAVA_PKG_STRICT} ]]
1918 return $? 2767 return $?
1919} 2768}
1920 2769
2770
1921# ------------------------------------------------------------------------------ 2771# ------------------------------------------------------------------------------
1922# @eclass-end 2772# @eclass-end
1923# ------------------------------------------------------------------------------ 2773# ------------------------------------------------------------------------------

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

  ViewVC Help
Powered by ViewVC 1.1.20