/[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.27 Revision 1.127
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.127 2009/05/19 21:23:32 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.6 ${JAVA_PKG_PORTAGE_DEP}"
76hasq source ${JAVA_PKG_IUSE} && JAVA_PKG_E_DEPEND="${JAVA_PKG_E_DEPEND} source? ( app-arch/zip )"
49 77
50# ----------------------------------------------------------------------------- 78# -----------------------------------------------------------------------------
51# @variable-external JAVA_PKG_ALLOW_VM_CHANGE 79# @variable-external JAVA_PKG_ALLOW_VM_CHANGE
52# @variable-default yes 80# @variable-default yes
53# 81#
127# @note This should only be used internally or for testing. 155# @note This should only be used internally or for testing.
128# @example Use jikes and javac, in that order 156# @example Use jikes and javac, in that order
129# JAVA_PKG_FORCE_COMPILER="jikes javac" 157# JAVA_PKG_FORCE_COMPILER="jikes javac"
130# ----------------------------------------------------------------------------- 158# -----------------------------------------------------------------------------
131 159
160# -----------------------------------------------------------------------------
161# @variable-external JAVA_PKG_FORCE_ANT_TASKS
162#
163# An $IFS separated list of ant tasks. Can be set in environment before calling
164# emerge/ebuild to override variables set in ebuild, mainly for testing before
165# putting the resulting (WANT_)ANT_TASKS into ebuild. Affects only ANT_TASKS in
166# eant() call, not the dependencies specified in WANT_ANT_TASKS.
167#
168# @example JAVA_PKG_FORCE_ANT_TASKS="ant-junit ant-trax" \
169# ebuild foo.ebuild compile
170#
171# @seealso WANT_ANT_TASKS
172# -----------------------------------------------------------------------------
173
132# TODO document me 174# TODO document me
133JAVA_PKG_QA_VIOLATIONS=0 175JAVA_PKG_QA_VIOLATIONS=0
134 176
135# ----------------------------------------------------------------------------- 177# -----------------------------------------------------------------------------
136# @section-end variables 178# @section-end variables
143# 185#
144# These are used to install Java-related things, such as jars, Javadocs, JNI 186# These are used to install Java-related things, such as jars, Javadocs, JNI
145# libraries, etc. 187# libraries, etc.
146# ----------------------------------------------------------------------------- 188# -----------------------------------------------------------------------------
147 189
190# -----------------------------------------------------------------------------
191# @ebuild-function java-pkg_doexamples
192#
193# Installs given arguments to /usr/share/doc/${PF}/examples
194# If you give it only one parameter and it is a directory it will install
195# everything in that directory to the examples directory.
196#
197# @example
198# java-pkg_doexamples demo
199# java-pkg_doexamples demo/* examples/*
200#
201# @param --subdir - If the examples need a certain directory structure
202# @param $* - list of files to install
203# ------------------------------------------------------------------------------
204java-pkg_doexamples() {
205 debug-print-function ${FUNCNAME} $*
206
207 [[ ${#} -lt 1 ]] && die "At least one argument needed"
208
209 java-pkg_check-phase install
210
211 local dest=/usr/share/doc/${PF}/examples
212 if [[ ${1} == --subdir ]]; then
213 local dest=${dest}/${2}
214 dodir ${dest}
215 shift 2
216 fi
217
218 if [[ ${#} = 1 && -d ${1} ]]; then
219 ( # dont want to pollute calling env
220 insinto "${dest}"
221 doins -r ${1}/*
222 ) || die "Installing examples failed"
223 else
224 ( # dont want to pollute calling env
225 insinto "${dest}"
226 doins -r "$@"
227 ) || die "Installing examples failed"
228 fi
229}
148 230
149# ----------------------------------------------------------------------------- 231# -----------------------------------------------------------------------------
150# @ebuild-function java-pkg_dojar 232# @ebuild-function java-pkg_dojar
151# 233#
152# Installs any number of jars. 234# Installs any number of jars.
171 # Create JARDEST if it doesn't exist 253 # Create JARDEST if it doesn't exist
172 dodir ${JAVA_PKG_JARDEST} 254 dodir ${JAVA_PKG_JARDEST}
173 255
174 local jar 256 local jar
175 # for each jar 257 # for each jar
176 for jar in "$@"; do 258 for jar in "${@}"; do
177 local jar_basename=$(basename "${jar}") 259 local jar_basename=$(basename "${jar}")
178 260
179 java-pkg_check-versioned-jar ${jar_basename} 261 java-pkg_check-versioned-jar ${jar_basename}
180 262
181 # check if it exists 263 # check if it exists
182 if [[ -e "${jar}" ]] ; then 264 if [[ -e "${jar}" ]] ; then
265 # Don't overwrite if jar has already been installed with the same
266 # name
267 local dest="${D}${JAVA_PKG_JARDEST}/${jar_basename}"
268 if [[ -e "${dest}" ]]; then
269 ewarn "Overwriting ${dest}"
270 fi
271
183 # install it into JARDEST if it's a non-symlink 272 # install it into JARDEST if it's a non-symlink
184 if [[ ! -L "${jar}" ]] ; then 273 if [[ ! -L "${jar}" ]] ; then
274 #but first check class version when in strict mode.
275 is-java-strict && java-pkg_verify-classes "${jar}"
276
185 INSDESTTREE="${JAVA_PKG_JARDEST}" \ 277 INSDESTTREE="${JAVA_PKG_JARDEST}" \
186 doins "${jar}" || die "failed to install ${jar}" 278 doins "${jar}" || die "failed to install ${jar}"
187 java-pkg_append_ JAVA_PKG_CLASSPATH "${JAVA_PKG_JARDEST}/${jar_basename}" 279 java-pkg_append_ JAVA_PKG_CLASSPATH "${JAVA_PKG_JARDEST}/${jar_basename}"
188 debug-print "installed ${jar} to ${D}${JAVA_PKG_JARDEST}" 280 debug-print "installed ${jar} to ${D}${JAVA_PKG_JARDEST}"
189 # make a symlink to the original jar if it's symlink 281 # make a symlink to the original jar if it's symlink
199 done 291 done
200 292
201 java-pkg_do_write_ 293 java-pkg_do_write_
202} 294}
203 295
296# ------------------------------------------------------------------------------
297# @internal-function depend-java-query
298#
299# Wrapper for the depend-java-query binary to enable passing USE in env.
300# Using env variables keeps this eclass working with java-config versions that
301# do not handle use flags.
302# ------------------------------------------------------------------------------
204 303
304depend-java-query() {
305 # Used to have a which call here but it caused endless loops for some people
306 # that had some weird bashrc voodoo for which.
307 USE="${USE}" /usr/bin/depend-java-query "${@}"
308}
205 309
206# ------------------------------------------------------------------------------ 310# ------------------------------------------------------------------------------
207# @ebuild-function java-pkg_regjar 311# @ebuild-function java-pkg_regjar
208# 312#
209# Records an already installed jar in the package.env 313# Records an already installed jar in the package.env
240 [[ ${#} -lt 1 ]] && die "at least one argument needed" 344 [[ ${#} -lt 1 ]] && die "at least one argument needed"
241 345
242 java-pkg_init_paths_ 346 java-pkg_init_paths_
243 347
244 local jar jar_dir jar_file 348 local jar jar_dir jar_file
245 for jar in "$@"; do 349 for jar in "${@}"; do
246 # TODO use java-pkg_check-versioned-jar 350 # TODO use java-pkg_check-versioned-jar
247 if [[ -e "${jar}" ]]; then 351 if [[ -e "${jar}" || -e "${D}${jar}" ]]; then
352 [[ -d "${jar}" || -d "${D}${jar}" ]] \
353 && die "Called ${FUNCNAME} on a directory $*"
354
355 #check that class version correct when in strict mode
356 is-java-strict && java-pkg_verify-classes "${jar}"
357
248 # nelchael: we should strip ${D} in this case too, here's why: 358 # nelchael: we should strip ${D} in this case too, here's why:
249 # imagine such call: 359 # imagine such call:
250 # java-pkg_regjar ${D}/opt/java/*.jar 360 # java-pkg_regjar ${D}/opt/java/*.jar
251 # such call will fall into this case (-e ${jar}) and will 361 # such call will fall into this case (-e ${jar}) and will
252 # record paths with ${D} in package.env 362 # record paths with ${D} in package.env
253 java-pkg_append_ JAVA_PKG_CLASSPATH "${jar#${D}}" 363 java-pkg_append_ JAVA_PKG_CLASSPATH "${jar#${D}}"
254 elif [[ -e "${D}${jar}" ]]; then
255 java-pkg_append_ JAVA_PKG_CLASSPATH "${jar#${D}}"
256 else 364 else
365 if [[ ${jar} = *\** ]]; then
366 eerror "The argument ${jar} to ${FUNCNAME}"
367 eerror "has * in it. If you want it to glob in"
368 eerror '${D} add ${D} to the argument.'
369 fi
370 debug-print "${jar} or ${D}${jar} not found"
257 die "${jar} does not exist" 371 die "${jar} does not exist"
258 fi 372 fi
259 done 373 done
260 374
261 java-pkg_do_write_ 375 java-pkg_do_write_
262} 376}
263
264 377
265# ------------------------------------------------------------------------------ 378# ------------------------------------------------------------------------------
266# @ebuild-function java-pkg_newjar 379# @ebuild-function java-pkg_newjar
267# 380#
268# Installs a jar with a new name 381# Installs a jar with a new name
279 local original_jar="${1}" 392 local original_jar="${1}"
280 local new_jar="${2:-${PN}.jar}" 393 local new_jar="${2:-${PN}.jar}"
281 local new_jar_dest="${T}/${new_jar}" 394 local new_jar_dest="${T}/${new_jar}"
282 395
283 [[ -z ${original_jar} ]] && die "Must specify a jar to install" 396 [[ -z ${original_jar} ]] && die "Must specify a jar to install"
284 [[ ! -f ${original_jar} ]] && die "${original_jar} does not exist!" 397 [[ ! -f ${original_jar} ]] \
398 && die "${original_jar} does not exist or is not a file!"
285 399
286 rm -f "${new_jar_dest}" || die "Failed to remove ${new_jar_dest}" 400 rm -f "${new_jar_dest}" || die "Failed to remove ${new_jar_dest}"
287 cp "${original_jar}" "${new_jar_dest}" \ 401 cp "${original_jar}" "${new_jar_dest}" \
288 || die "Failed to copy ${original_jar} to ${new_jar_dest}" 402 || die "Failed to copy ${original_jar} to ${new_jar_dest}"
289 java-pkg_dojar "${new_jar_dest}" 403 java-pkg_dojar "${new_jar_dest}"
290} 404}
291 405
292
293# ------------------------------------------------------------------------------ 406# ------------------------------------------------------------------------------
294# @ebuild-function java-pkg_addcp 407# @ebuild-function java-pkg_addcp
295# 408#
296# Add something to the package's classpath. For jars, you should use dojar, 409# Add something to the package's classpath. For jars, you should use dojar,
297# newjar, or regjar. This is typically used to add directories to the classpath. 410# newjar, or regjar. This is typically used to add directories to the classpath.
302java-pkg_addcp() { 415java-pkg_addcp() {
303 java-pkg_append_ JAVA_PKG_CLASSPATH "${@}" 416 java-pkg_append_ JAVA_PKG_CLASSPATH "${@}"
304 java-pkg_do_write_ 417 java-pkg_do_write_
305} 418}
306 419
307
308# ------------------------------------------------------------------------------ 420# ------------------------------------------------------------------------------
309# @ebuild-function java-pkg_doso 421# @ebuild-function java-pkg_doso
310# 422#
311# Installs any number of JNI libraries 423# Installs any number of JNI libraries
312# They will be installed into /usr/lib by default, but java-pkg_sointo 424# They will be installed into /usr/lib by default, but java-pkg_sointo
318# @param $@ - JNI libraries to install 430# @param $@ - JNI libraries to install
319# ------------------------------------------------------------------------------ 431# ------------------------------------------------------------------------------
320java-pkg_doso() { 432java-pkg_doso() {
321 debug-print-function ${FUNCNAME} $* 433 debug-print-function ${FUNCNAME} $*
322 434
323 [[ ${#} -lt 1 ]] && "At least one argument required for ${FUNCNAME}"
324 java-pkg_check-phase install 435 java-pkg_check-phase install
325 436
326 [[ ${#} -lt 1 ]] && die "At least one argument required for ${FUNCNAME}" 437 [[ ${#} -lt 1 ]] && die "${FUNCNAME} requires at least one argument"
327 438
328 java-pkg_init_paths_ 439 java-pkg_init_paths_
329 440
330 local lib 441 local lib
331 # for each lib 442 # for each lib
334 if [[ -e "${lib}" ]] ; then 445 if [[ -e "${lib}" ]] ; then
335 # install if it isn't a symlink 446 # install if it isn't a symlink
336 if [[ ! -L "${lib}" ]] ; then 447 if [[ ! -L "${lib}" ]] ; then
337 INSDESTTREE="${JAVA_PKG_LIBDEST}" \ 448 INSDESTTREE="${JAVA_PKG_LIBDEST}" \
338 INSOPTIONS="${LIBOPTIONS}" \ 449 INSOPTIONS="${LIBOPTIONS}" \
339 doins "${lib}" || "failed to install ${lib}" 450 doins "${lib}" || die "failed to install ${lib}"
340 java-pkg_append_ JAVA_PKG_LIBRARY "${JAVA_PKG_LIBDEST}" 451 java-pkg_append_ JAVA_PKG_LIBRARY "${JAVA_PKG_LIBDEST}"
341 debug-print "Installing ${lib} to ${JAVA_PKG_LIBDEST}" 452 debug-print "Installing ${lib} to ${JAVA_PKG_LIBDEST}"
342 # otherwise make a symlink to the symlink's origin 453 # otherwise make a symlink to the symlink's origin
343 else 454 else
344 # TODO use dosym
345 ln -s "$(readlink "${lib}")" "${D}${JAVA_PKG_LIBDEST}/$(basename "${lib}")" 455 dosym "$(readlink "${lib}")" "${JAVA_PKG_LIBDEST}/${lib##*/}"
346 debug-print "${lib} is a symlink, linking accordanly" 456 debug-print "${lib} is a symlink, linking accordantly"
347 fi 457 fi
348 # otherwise die 458 # otherwise die
349 else 459 else
350 die "${lib} does not exist" 460 die "${lib} does not exist"
351 fi 461 fi
367java-pkg_regso() { 477java-pkg_regso() {
368 debug-print-function ${FUNCNAME} $* 478 debug-print-function ${FUNCNAME} $*
369 479
370 java-pkg_check-phase install 480 java-pkg_check-phase install
371 481
372 [[ ${#} -lt 1 ]] && "at least one argument needed" 482 [[ ${#} -lt 1 ]] && die "${FUNCNAME} requires at least one argument"
373 483
374 java-pkg_init_paths_ 484 java-pkg_init_paths_
375 485
376 local lib target_dir 486 local lib target_dir
377 for lib in "$@" ; do 487 for lib in "$@" ; do
429java-pkg_dohtml() { 539java-pkg_dohtml() {
430 debug-print-function ${FUNCNAME} $* 540 debug-print-function ${FUNCNAME} $*
431 541
432 [[ ${#} -lt 1 ]] && die "At least one argument required for ${FUNCNAME}" 542 [[ ${#} -lt 1 ]] && die "At least one argument required for ${FUNCNAME}"
433 543
434 # TODO-nichoj find out what exactly -f package-list does 544 # from /usr/lib/portage/bin/dohtml -h
545 # -f Set list of allowed extensionless file names.
435 dohtml -f package-list "$@" 546 dohtml -f package-list "$@"
547
436 # this probably shouldn't be here but it provides 548 # this probably shouldn't be here but it provides
437 # a reasonable way to catch # docs for all of the 549 # a reasonable way to catch # docs for all of the
438 # old ebuilds. 550 # old ebuilds.
439 java-pkg_recordjavadoc 551 java-pkg_recordjavadoc
440} 552}
441 553
442# TODO document 554# ------------------------------------------------------------------------------
555# @ebuild-function java-pkg_dojavadoc
556#
557# Installs javadoc documentation. This should be controlled by the doc use flag.
558#
559# @param $1: optional --symlink creates to symlink like this for html
560# documentation bundles.
561# @param $2: - The javadoc root directory.
562#
563# @example:
564# java-pkg_dojavadoc docs/api
565# java-pkg_dojavadoc --symlink apidocs docs/api
566#
567# ------------------------------------------------------------------------------
443java-pkg_dojavadoc() { 568java-pkg_dojavadoc() {
569 debug-print-function ${FUNCNAME} $*
570
571 # For html documentation bundles that link to Javadoc
572 local symlink
573 if [[ ${1} = --symlink ]]; then
574 symlink=${2}
575 shift 2
576 fi
577
444 local dir="$1" 578 local dir="$1"
579 local dest=/usr/share/doc/${PF}/html
580
581 # QA checks
445 582
446 java-pkg_check-phase install 583 java-pkg_check-phase install
447 584
448 [[ -z "${dir}" ]] && die "Must specify a directory!" 585 [[ -z "${dir}" ]] && die "Must specify a directory!"
449 [[ ! -d "${dir}" ]] && die "${dir} does not exist, or isn't a directory!" 586 [[ ! -d "${dir}" ]] && die "${dir} does not exist, or isn't a directory!"
587 if [[ ! -e "${dir}/index.html" ]]; then
588 local msg="No index.html in javadoc directory"
589 ewarn "${msg}"
590 is-java-strict && die "${msg}"
591 fi
592
593 if [[ -e ${D}/${dest}/api ]]; then
594 eerror "${dest} already exists. Will not overwrite."
595 die "${dest}"
596 fi
597
598 # Renaming to match our directory layout
450 599
451 local dir_to_install="${dir}" 600 local dir_to_install="${dir}"
452 if [[ "$(basename "${dir}")" != "api" ]]; then 601 if [[ "$(basename "${dir}")" != "api" ]]; then
453 dir_to_install="${T}/api" 602 dir_to_install="${T}/api"
454 # TODO use doins 603 # TODO use doins
455 cp -r "${dir}" "${dir_to_install}" || die "cp failed" 604 cp -r "${dir}" "${dir_to_install}" || die "cp failed"
456 fi 605 fi
457 606
607 # Actual installation
608
458 java-pkg_dohtml -r ${dir_to_install} 609 java-pkg_dohtml -r "${dir_to_install}"
610
611 # Let's make a symlink to the directory we have everything else under
612 dosym ${dest}/api "${JAVA_PKG_SHAREPATH}/api" || die
613
614 if [[ ${symlink} ]]; then
615 debug-print "symlinking ${dest}/{api,${symlink}}"
616 dosym ${dest}/{api,${symlink}} || die
617 fi
459} 618}
460 619
461# ------------------------------------------------------------------------------ 620# ------------------------------------------------------------------------------
462# @ebuild-function java-pkg_dosrc 621# @ebuild-function java-pkg_dosrc
463# 622#
479# FIXME apparently this fails if you give it an empty directories 638# FIXME apparently this fails if you give it an empty directories
480java-pkg_dosrc() { 639java-pkg_dosrc() {
481 debug-print-function ${FUNCNAME} $* 640 debug-print-function ${FUNCNAME} $*
482 641
483 [ ${#} -lt 1 ] && die "At least one argument needed" 642 [ ${#} -lt 1 ] && die "At least one argument needed"
484 if ! hasq source ${IUSE}; then
485 echo "Java QA Notice: ${FUNCNAME} called without source in IUSE"
486 fi
487 643
488 java-pkg_check-phase install 644 java-pkg_check-phase install
489 645
490 [[ ${#} -lt 1 ]] && die "At least one argument needed" 646 [[ ${#} -lt 1 ]] && die "At least one argument needed"
647
648 if ! [[ ${DEPEND} = *app-arch/zip* ]]; then
649 local msg="${FUNCNAME} called without app-arch/zip in DEPEND"
650 java-pkg_announce-qa-violation ${msg}
651 fi
491 652
492 java-pkg_init_paths_ 653 java-pkg_init_paths_
493 654
494 local zip_name="${PN}-src.zip" 655 local zip_name="${PN}-src.zip"
495 local zip_path="${T}/${zip_name}" 656 local zip_path="${T}/${zip_name}"
496 local dir 657 local dir
497 for dir in ${@}; do 658 for dir in "${@}"; do
498 local dir_parent=$(dirname "${dir}") 659 local dir_parent=$(dirname "${dir}")
499 local dir_name=$(basename "${dir}") 660 local dir_name=$(basename "${dir}")
500 pushd ${dir_parent} > /dev/null || die "problem entering ${dir_parent}" 661 pushd ${dir_parent} > /dev/null || die "problem entering ${dir_parent}"
501 zip -q -r ${zip_path} ${dir_name} -i '*.java' 662 zip -q -r ${zip_path} ${dir_name} -i '*.java'
502 local result=$? 663 local result=$?
527# @param $1 - filename of launcher to create 688# @param $1 - filename of launcher to create
528# @param $2 - options, as follows: 689# @param $2 - options, as follows:
529# --main the.main.class.too.start 690# --main the.main.class.too.start
530# --jar /the/jar/too/launch.jar or just <name>.jar 691# --jar /the/jar/too/launch.jar or just <name>.jar
531# --java_args 'Extra arguments to pass to java' 692# --java_args 'Extra arguments to pass to java'
532# --pkg_args 'Extra arguments too pass to the package' 693# --pkg_args 'Extra arguments to pass to the package'
533# --pwd 694# --pwd Directory the launcher changes to before executing java
534# -into 695# -into Directory to install the launcher to, instead of /usr/bin
535# -pre 696# -pre Prepend contents of this file to the launcher
536# ------------------------------------------------------------------------------ 697# ------------------------------------------------------------------------------
537java-pkg_dolauncher() { 698java-pkg_dolauncher() {
538 debug-print-function ${FUNCNAME} $* 699 debug-print-function ${FUNCNAME} $*
539 700
540 java-pkg_check-phase install 701 java-pkg_check-phase install
552 local var_tmp="${T}/launcher_variables_tmp" 713 local var_tmp="${T}/launcher_variables_tmp"
553 local target_dir pre 714 local target_dir pre
554 715
555 # Process the other the rest of the arguments 716 # Process the other the rest of the arguments
556 while [[ -n "${1}" && -n "${2}" ]]; do 717 while [[ -n "${1}" && -n "${2}" ]]; do
557 local var=${1} value=${2} 718 local var="${1}" value="${2}"
558 if [[ "${var:0:2}" == "--" ]]; then 719 if [[ "${var:0:2}" == "--" ]]; then
559 local var=${var:2} 720 local var=${var:2}
560 echo "gjl_${var}=\"${value}\"" >> "${var_tmp}" 721 echo "gjl_${var}=\"${value}\"" >> "${var_tmp}"
561 local gjl_${var}="${value}" 722 local gjl_${var}="${value}"
562 elif [[ "${var}" == "-into" ]]; then 723 elif [[ "${var}" == "-into" ]]; then
581 fi 742 fi
582 fi 743 fi
583 744
584 # Write the actual script 745 # Write the actual script
585 echo "#!/bin/bash" > "${target}" 746 echo "#!/bin/bash" > "${target}"
586 [[ -n "${pre}" ]] && [[ -f "${pre}" ]] && cat "${pre}" >> "${target}" 747 if [[ -n "${pre}" ]]; then
748 if [[ -f "${pre}" ]]; then
749 cat "${pre}" >> "${target}"
750 else
751 die "-pre specified file '${pre}' does not exist"
752 fi
753 fi
587 echo "gjl_package=${JAVA_PKG_NAME}" >> "${target}" 754 echo "gjl_package=${JAVA_PKG_NAME}" >> "${target}"
588 cat "${var_tmp}" >> "${target}" 755 cat "${var_tmp}" >> "${target}"
589 rm -f "${var_tmp}" 756 rm -f "${var_tmp}"
590 echo "source /usr/share/java-config-2/launcher/launcher.bash" >> "${target}" 757 echo "source /usr/share/java-config-2/launcher/launcher.bash" >> "${target}"
591 758
683# Example: get a specific jar from xerces slot 2, and name it diffrently 850# Example: get a specific jar from xerces slot 2, and name it diffrently
684# java-pkg_jar-from xerces-2 xml-apis.jar xml.jar 851# java-pkg_jar-from xerces-2 xml-apis.jar xml.jar
685# Example: get junit.jar which is needed only for building 852# Example: get junit.jar which is needed only for building
686# java-pkg_jar-from --build-only junit junit.jar 853# java-pkg_jar-from --build-only junit junit.jar
687# 854#
688# @param $1 - (optional) "--build-only" makes the jar(s) not added into 855# @param $opt
689# package.env DEPEND line. 856# --build-only - makes the jar(s) not added into package.env DEPEND line.
690# @param $1 - Package to get jars from. 857# (assumed automatically when called inside src_test)
858# --with-dependencies - get jars also from requested package's dependencies
859# transitively.
860# --virtual - Packages passed to this function are to be handled as virtuals
861# and will not have individual jar dependencies recorded.
862# --into $dir - symlink jar(s) into $dir (must exist) instead of .
863# @param $1 - Package to get jars from, or comma-separated list of packages in
864# case other parameters are not used.
691# @param $2 - jar from package. If not specified, all jars will be used. 865# @param $2 - jar from package. If not specified, all jars will be used.
692# @param $3 - When a single jar is specified, destination filename of the 866# @param $3 - When a single jar is specified, destination filename of the
693# symlink. Defaults to the name of the jar. 867# symlink. Defaults to the name of the jar.
694# ------------------------------------------------------------------------------ 868# ------------------------------------------------------------------------------
695# TODO could probably be cleaned up a little 869# TODO could probably be cleaned up a little
696java-pkg_jar-from() { 870java-pkg_jar-from() {
697 debug-print-function ${FUNCNAME} $* 871 debug-print-function ${FUNCNAME} $*
698 872
699 local build_only="" 873 local build_only=""
874 local destdir="."
875 local deep=""
876 local virtual=""
700 877
878 [[ "${EBUILD_PHASE}" == "test" ]] && build_only="build"
879
880 while [[ "${1}" == --* ]]; do
701 if [[ "${1}" = "--build-only" ]]; then 881 if [[ "${1}" = "--build-only" ]]; then
702 build_only="true" 882 build_only="build"
883 elif [[ "${1}" = "--with-dependencies" ]]; then
884 deep="--with-dependencies"
885 elif [[ "${1}" = "--virtual" ]]; then
886 virtual="true"
887 elif [[ "${1}" = "--into" ]]; then
888 destdir="${2}"
889 shift
890 else
891 die "java-pkg_jar-from called with unknown parameter: ${1}"
892 fi
703 shift 893 shift
704 fi 894 done
705 895
706 local target_pkg="${1}" target_jar="${2}" destjar="${3}" 896 local target_pkg="${1}" target_jar="${2}" destjar="${3}"
707 897
708 [[ -z ${target_pkg} ]] && die "Must specify a package" 898 [[ -z ${target_pkg} ]] && die "Must specify a package"
899
900 if [[ "${EAPI}" == "1" ]]; then
901 target_pkg="${target_pkg//:/-}"
902 fi
709 903
710 # default destjar to the target jar 904 # default destjar to the target jar
711 [[ -z "${destjar}" ]] && destjar="${target_jar}" 905 [[ -z "${destjar}" ]] && destjar="${target_jar}"
712 906
713 local error_msg="There was a problem getting the classpath for ${target_pkg}." 907 local error_msg="There was a problem getting the classpath for ${target_pkg}."
714 local classpath 908 local classpath
715 classpath="$(java-config --classpath=${target_pkg})" 909 classpath="$(java-config ${deep} --classpath=${target_pkg})"
716 [[ $? != 0 ]] && die ${error_msg} 910 [[ $? != 0 ]] && die ${error_msg}
911
912 # When we have commas this functions is called to bring jars from multiple
913 # packages. This affects recording of dependencencies performed later
914 # which expects one package only, so we do it here.
915 if [[ ${target_pkg} = *,* ]]; then
916 for pkg in ${target_pkg//,/ }; do
917 java-pkg_ensure-dep "${build_only}" "${pkg}"
918 [[ -z "${build_only}" ]] && java-pkg_record-jar_ "${pkg}"
919 done
920 # setting this disables further record-jar_ calls later
921 build_only="build"
922 else
923 java-pkg_ensure-dep "${build_only}" "${target_pkg}"
924 fi
925
926 # Record the entire virtual as a dependency so that
927 # no jars are missed.
928 if [[ -z "${build_only}" && -n "${virtual}" ]]; then
929 java-pkg_record-jar_ "${target_pkg}"
930 # setting this disables further record-jars_ calls later
931 build_only="build"
932 fi
933
934 pushd ${destdir} > /dev/null \
935 || die "failed to change directory to ${destdir}"
717 936
718 local jar 937 local jar
719 for jar in ${classpath//:/ }; do 938 for jar in ${classpath//:/ }; do
720 local jar_name=$(basename "${jar}") 939 local jar_name=$(basename "${jar}")
721 if [[ ! -f "${jar}" ]] ; then 940 if [[ ! -f "${jar}" ]] ; then
732 elif [[ "${jar_name}" == "${target_jar}" ]] ; then 951 elif [[ "${jar_name}" == "${target_jar}" ]] ; then
733 [[ -f "${destjar}" ]] && rm "${destjar}" 952 [[ -f "${destjar}" ]] && rm "${destjar}"
734 ln -snf "${jar}" "${destjar}" \ 953 ln -snf "${jar}" "${destjar}" \
735 || die "Failed to make symlink from ${jar} to ${destjar}" 954 || die "Failed to make symlink from ${jar} to ${destjar}"
736 [[ -z "${build_only}" ]] && java-pkg_record-jar_ "${target_pkg}" "${jar}" 955 [[ -z "${build_only}" ]] && java-pkg_record-jar_ "${target_pkg}" "${jar}"
956 popd > /dev/null
737 return 0 957 return 0
738 fi 958 fi
739 done 959 done
960 popd > /dev/null
740 # if no target was specified, we're ok 961 # if no target was specified, we're ok
741 if [[ -z "${target_jar}" ]] ; then 962 if [[ -z "${target_jar}" ]] ; then
742 return 0 963 return 0
743 # otherwise, die bitterly 964 # otherwise, die bitterly
744 else 965 else
763# The providing packages are recorded as dependencies into package.env DEPEND 984# The providing packages are recorded as dependencies into package.env DEPEND
764# line, unless "--build-only" is passed as the very first argument, for jars 985# line, unless "--build-only" is passed as the very first argument, for jars
765# that have to be present only at build time and are not needed on runtime 986# that have to be present only at build time and are not needed on runtime
766# (junit testing etc). 987# (junit testing etc).
767# 988#
768# Example: Get the classpath for xerces-2, 989# Example: Get the classpath for xerces-2 and xalan,
769# java-pkg_getjars xerces-2 xalan 990# java-pkg_getjars xerces-2,xalan
770# Example Return: 991# Example Return:
771# /usr/share/xerces-2/lib/xml-apis.jar:/usr/share/xerces-2/lib/xmlParserAPIs.jar:/usr/share/xalan/lib/xalan.jar 992# /usr/share/xerces-2/lib/xml-apis.jar:/usr/share/xerces-2/lib/xmlParserAPIs.jar:/usr/share/xalan/lib/xalan.jar
772# 993#
773# @param $1 - (optional) "--build-only" makes the jar(s) not added into 994# @param $opt
774# package.env DEPEND line. 995# --build-only - makes the jar(s) not added into package.env DEPEND line.
996# (assumed automatically when called inside src_test)
997# --with-dependencies - get jars also from requested package's dependencies
998# transitively.
775# @param $@ - list of packages to get jars from 999# @param $1 - list of packages to get jars from
1000# (passed to java-config --classpath)
776# ------------------------------------------------------------------------------ 1001# ------------------------------------------------------------------------------
777java-pkg_getjars() { 1002java-pkg_getjars() {
778 debug-print-function ${FUNCNAME} $* 1003 debug-print-function ${FUNCNAME} $*
779 1004
780 local build_only="" 1005 local build_only=""
1006 local deep=""
781 1007
1008 [[ "${EBUILD_PHASE}" == "test" ]] && build_only="build"
1009
1010 while [[ "${1}" == --* ]]; do
782 if [[ "${1}" = "--build-only" ]]; then 1011 if [[ "${1}" = "--build-only" ]]; then
783 build_only="true" 1012 build_only="build"
1013 elif [[ "${1}" = "--with-dependencies" ]]; then
1014 deep="--with-dependencies"
1015 else
1016 die "java-pkg_jar-from called with unknown parameter: ${1}"
1017 fi
784 shift 1018 shift
785 fi
786
787 [[ ${#} -lt 1 ]] && die "At least one argument needed"
788
789 # NOTE could probably just pass $@ to java-config --classpath. and return it
790 local classpath pkg
791 for pkg in ${@//,/ }; do
792 #for pkg in $(echo "$@" | tr ',' ' '); do
793 jars="$(java-config --classpath=${pkg})"
794 [[ -z "${jars}" ]] && die "java-config --classpath=${pkg} failed"
795 debug-print "${pkg}:${jars}"
796
797 if [[ -z "${classpath}" ]]; then
798 classpath="${jars}"
799 else
800 classpath="${classpath}:${jars}"
801 fi
802 # Only record jars that aren't build-only
803 [[ -z "${build_only}" ]] && java-pkg_record-jar_ "${pkg}"
804 done 1019 done
805 echo "${classpath}" 1020
1021 [[ ${#} -ne 1 ]] && die "${FUNCNAME} takes only one argument besides --*"
1022
1023
1024 local pkgs="${1}"
1025
1026 if [[ "${EAPI}" == "1" ]]; then
1027 pkgs="${pkgs//:/-}"
1028 fi
1029
1030 jars="$(java-config ${deep} --classpath=${pkgs})"
1031 [[ $? != 0 ]] && die "java-config --classpath=${pkgs} failed"
1032 debug-print "${pkgs}:${jars}"
1033
1034 for pkg in ${pkgs//,/ }; do
1035 java-pkg_ensure-dep "${build_only}" "${pkg}"
1036 done
1037
1038 # Only record jars that aren't build-only
1039 if [[ -z "${build_only}" ]]; then
1040 for pkg in ${pkgs//,/ }; do
1041 java-pkg_record-jar_ "${pkg}"
1042 done
1043 fi
1044
1045 echo "${jars}"
806} 1046}
807 1047
808# ------------------------------------------------------------------------------ 1048# ------------------------------------------------------------------------------
809# @ebuild-function java-pkg_getjar 1049# @ebuild-function java-pkg_getjar
810# 1050#
817# @example 1057# @example
818# java-pkg_getjar xerces-2 xml-apis.jar 1058# java-pkg_getjar xerces-2 xml-apis.jar
819# @example-return 1059# @example-return
820# /usr/share/xerces-2/lib/xml-apis.jar 1060# /usr/share/xerces-2/lib/xml-apis.jar
821# 1061#
822# @param $1 - (optional) "--build-only" makes the jar not added into 1062# @param $opt
823# package.env DEPEND line. 1063# --build-only - makes the jar not added into package.env DEPEND line.
1064# --virtual - Packages passed to this function are to be handled as virtuals
1065# and will not have individual jar dependencies recorded.
824# @param $1 - package to use 1066# @param $1 - package to use
825# @param $2 - jar to get 1067# @param $2 - jar to get
826# ------------------------------------------------------------------------------ 1068# ------------------------------------------------------------------------------
827java-pkg_getjar() { 1069java-pkg_getjar() {
828 debug-print-function ${FUNCNAME} $* 1070 debug-print-function ${FUNCNAME} $*
829 1071
830 local build_only="" 1072 local build_only=""
1073 local virtual=""
831 1074
1075 [[ "${EBUILD_PHASE}" == "test" ]] && build_only="build"
1076
1077 while [[ "${1}" == --* ]]; do
832 if [[ "${1}" = "--build-only" ]]; then 1078 if [[ "${1}" = "--build-only" ]]; then
833 build_only="true" 1079 build_only="build"
1080 elif [[ "${1}" == "--virtual" ]]; then
1081 virtual="true"
1082 else
1083 die "java-pkg_getjar called with unknown parameter: ${1}"
1084 fi
834 shift 1085 shift
835 fi 1086 done
1087
1088 [[ ${#} -ne 2 ]] && die "${FUNCNAME} takes only two arguments besides --*"
836 1089
837 local pkg="${1}" target_jar="${2}" jar 1090 local pkg="${1}" target_jar="${2}" jar
1091
1092 if [[ "${EAPI}" == "1" ]]; then
1093 pkg="${pkg//:/-}"
1094 fi
1095
838 [[ -z ${pkg} ]] && die "Must specify package to get a jar from" 1096 [[ -z ${pkg} ]] && die "Must specify package to get a jar from"
839 [[ -z ${target_jar} ]] && die "Must specify jar to get" 1097 [[ -z ${target_jar} ]] && die "Must specify jar to get"
840 1098
841 local error_msg="Could not find classpath for ${pkg}. Are you sure its installed?" 1099 local error_msg="Could not find classpath for ${pkg}. Are you sure its installed?"
842 local classpath 1100 local classpath
843 classpath=$(java-config --classpath=${pkg}) 1101 classpath=$(java-config --classpath=${pkg})
844 [[ $? != 0 ]] && die ${error_msg} 1102 [[ $? != 0 ]] && die ${error_msg}
1103
1104 java-pkg_ensure-dep "${build_only}" "${pkg}"
1105
1106 # Record the package(Virtual) as a dependency and then set build_only
1107 # So that individual jars are not recorded.
1108 if [[ -n "${virtual}" ]]; then
1109 java-pkg_record-jar_ "${pkg}"
1110 build_only="true"
1111 fi
845 1112
846 for jar in ${classpath//:/ }; do 1113 for jar in ${classpath//:/ }; do
847 if [[ ! -f "${jar}" ]] ; then 1114 if [[ ! -f "${jar}" ]] ; then
848 die "Installation problem with jar ${jar} in ${pkg} - is it installed?" 1115 die "Installation problem with jar ${jar} in ${pkg} - is it installed?"
849 fi 1116 fi
856 fi 1123 fi
857 done 1124 done
858 1125
859 die "Could not find ${target_jar} in ${pkg}" 1126 die "Could not find ${target_jar} in ${pkg}"
860 return 1 1127 return 1
1128}
1129
1130# ------------------------------------------------------------------------------
1131# @ebuild-function java-pkg_register-dependency
1132#
1133# Registers runtime dependency on a package, list of packages, or a single jar
1134# from a package, into package.env DEPEND line. Can only be called in
1135# src_install phase.
1136# Intended for binary packages where you don't need to symlink the jars or get
1137# their classpath during build. As such, the dependencies only need to be
1138# specified in ebuild's RDEPEND, and should be omitted in DEPEND.
1139#
1140# @param $1 - comma-separated list of packages, or a single package
1141# @param $2 - if param $1 is a single package, optionally specify the jar
1142# to depend on
1143#
1144# Example: Record the dependency on whole xerces-2 and xalan,
1145# java-pkg_register-dependency xerces-2,xalan
1146# Example: Record the dependency on ant.jar from ant-core
1147# java-pkg_register-dependency ant-core ant.jar
1148#
1149# Note: Passing both list of packages as the first parameter AND specifying the
1150# jar as the second is not allowed and will cause the function to die. We assume
1151# that there's more chance one passes such combination as a mistake, than that
1152# there are more packages providing identically named jar without class
1153# collisions.
1154# ------------------------------------------------------------------------------
1155java-pkg_register-dependency() {
1156 debug-print-function ${FUNCNAME} $*
1157
1158 java-pkg_check-phase install
1159
1160 [[ ${#} -gt 2 ]] && die "${FUNCNAME} takes at most two arguments"
1161
1162 local pkgs="${1}"
1163 local jar="${2}"
1164
1165 [[ -z "${pkgs}" ]] && die "${FUNCNAME} called with no package(s) specified"
1166
1167 if [[ "${EAPI}" == "1" ]]; then
1168 pkgs="${pkgs//:/-}"
1169 fi
1170
1171 if [[ -z "${jar}" ]]; then
1172 for pkg in ${pkgs//,/ }; do
1173 java-pkg_ensure-dep runtime "${pkg}"
1174 java-pkg_record-jar_ "${pkg}"
1175 done
1176 else
1177 [[ ${pkgs} == *,* ]] && \
1178 die "${FUNCNAME} called with both package list and jar name"
1179 java-pkg_ensure-dep runtime "${pkgs}"
1180 java-pkg_record-jar_ "${pkgs}" "${jar}"
1181 fi
1182
1183 java-pkg_do_write_
1184}
1185
1186# ------------------------------------------------------------------------------
1187# @ebuild-function java-pkg_register-optional-dependency
1188#
1189# Registers optional runtime dependency on a package, list of packages, or a
1190# single jar from a package, into package.env OPTIONAL_DEPEND line. Can only be
1191# called in src_install phase.
1192# Intended for packages that can use other packages when those are in classpath.
1193# Will be put on classpath by launcher if they are installed. Typical case is
1194# JDBC implementations for various databases. It's better than having USE flag
1195# for each implementation triggering hard dependency.
1196#
1197# @param $1 - comma-separated list of packages, or a single package
1198# @param $2 - if param $1 is a single package, optionally specify the jar
1199# to depend on
1200#
1201# Example: Record the optional dependency on some jdbc providers
1202# java-pkg_register-optional-dependency jdbc-jaybird,jtds-1.2,jdbc-mysql
1203#
1204# Note: Passing both list of packages as the first parameter AND specifying the
1205# jar as the second is not allowed and will cause the function to die. We assume
1206# that there's more chance one passes such combination as a mistake, than that
1207# there are more packages providing identically named jar without class
1208# collisions.
1209# ------------------------------------------------------------------------------
1210java-pkg_register-optional-dependency() {
1211 debug-print-function ${FUNCNAME} $*
1212
1213 java-pkg_check-phase install
1214
1215 [[ ${#} -gt 2 ]] && die "${FUNCNAME} takes at most two arguments"
1216
1217 local pkgs="${1}"
1218 local jar="${2}"
1219
1220 [[ -z "${pkgs}" ]] && die "${FUNCNAME} called with no package(s) specified"
1221
1222 if [[ "${EAPI}" == "1" ]]; then
1223 pkgs="${pkgs//:/-}"
1224 fi
1225
1226 if [[ -z "${jar}" ]]; then
1227 for pkg in ${pkgs//,/ }; do
1228 java-pkg_record-jar_ --optional "${pkg}"
1229 done
1230 else
1231 [[ ${pkgs} == *,* ]] && \
1232 die "${FUNCNAME} called with both package list and jar name"
1233 java-pkg_record-jar_ --optional "${pkgs}" "${jar}"
1234 fi
1235
1236 java-pkg_do_write_
1237}
1238
1239# ------------------------------------------------------------------------------
1240# @ebuild-function java-pkg_register-environment-variable
1241#
1242# Register an arbitrary environment variable into package.env. The gjl launcher
1243# for this package or any package depending on this will export it into
1244# environement before executing java command.
1245# Must only be called in src_install phase.
1246#
1247# @param $1 - variable name
1248# @param $2 - variable value
1249# ------------------------------------------------------------------------------
1250JAVA_PKG_EXTRA_ENV="${T}/java-pkg-extra-env"
1251JAVA_PKG_EXTRA_ENV_VARS=""
1252java-pkg_register-environment-variable() {
1253 debug-print-function ${FUNCNAME} $*
1254
1255 java-pkg_check-phase install
1256
1257 [[ ${#} != 2 ]] && die "${FUNCNAME} takes two arguments"
1258
1259 echo "${1}=\"${2}\"" >> ${JAVA_PKG_EXTRA_ENV}
1260 JAVA_PKG_EXTRA_ENV_VARS="${JAVA_PKG_EXTRA_ENV_VARS} ${1}"
1261
1262 java-pkg_do_write_
861} 1263}
862 1264
863# This function reads stdin, and based on that input, figures out how to 1265# This function reads stdin, and based on that input, figures out how to
864# populate jars from the filesystem. 1266# populate jars from the filesystem.
865# Need to figure out a good way of making use of this, ie be able to use a 1267# Need to figure out a good way of making use of this, ie be able to use a
982# 1384#
983# export DEPEND="${DEPEND} ${depstr}" 1385# export DEPEND="${DEPEND} ${depstr}"
984# export RDEPEND="${RDEPEND} ${depstr}" 1386# export RDEPEND="${RDEPEND} ${depstr}"
985#} 1387#}
986 1388
1389# ------------------------------------------------------------------------------
1390# @ebuild-function java-pkg_find-normal-jars
1391#
1392# Find the files with suffix .jar file in the given directory or $WORKDIR
1393#
1394# @param $1 - The directory to search for jar files (default: ${WORKDIR})
1395# ------------------------------------------------------------------------------
1396java-pkg_find-normal-jars() {
1397 local dir=$1
1398 [[ "${dir}" ]] || dir="${WORKDIR}"
1399 local found
1400 for jar in $(find "${dir}" -name "*.jar" -type f); do
1401 echo "${jar}"
1402 found="true"
1403 done
1404 [[ "${found}" ]]
1405 return $?
1406}
1407
1408# ------------------------------------------------------------------------------
1409# @ebuild-function java-pkg_ensure-no-bundled-jars
1410#
1411# Try to locate bundled jar files in ${WORKDIR} and die if found.
987# This should be used after S has been populated with symlinks to jars 1412# This function should be called after WORKDIR has been populated with symlink
988# TODO document 1413# to system jar files or bundled jars removed.
1414# ------------------------------------------------------------------------------
989java-pkg_ensure-no-bundled-jars() { 1415java-pkg_ensure-no-bundled-jars() {
990 debug-print-function ${FUNCNAME} $* 1416 debug-print-function ${FUNCNAME} $*
991 pushd ${WORKDIR} >/dev/null 2>/dev/null
992 1417
993 local bundled_jars=$(find . -name "*.jar" -type f) 1418 local bundled_jars=$(java-pkg_find-normal-jars)
994 if [[ -n ${bundled_jars} ]]; then 1419 if [[ -n ${bundled_jars} ]]; then
995 echo "Bundled jars found:" 1420 echo "Bundled jars found:"
996 local jar 1421 local jar
997 for jar in ${bundled_jars}; do 1422 for jar in ${bundled_jars}; do
998 echo $(pwd)${jar/./} 1423 echo $(pwd)${jar/./}
999 done 1424 done
1000 die "Bundled jars found!" 1425 die "Bundled jars found!"
1001
1002 fi 1426 fi
1003 popd >/dev/null 2>/dev/null
1004} 1427}
1005 1428
1006# ------------------------------------------------------------------------------ 1429# ------------------------------------------------------------------------------
1007# @internal-function java-pkg_ensure-vm-version-sufficient 1430# @internal-function java-pkg_ensure-vm-version-sufficient
1008# 1431#
1157# @ebuild-function java-pkg_get-target 1580# @ebuild-function java-pkg_get-target
1158# 1581#
1159# Determines what target version should be used, for passing to -target. 1582# Determines what target version should be used, for passing to -target.
1160# If you don't care about lower versions, you can set _WANT_TARGET to the 1583# If you don't care about lower versions, you can set _WANT_TARGET to the
1161# version of your JDK. 1584# version of your JDK.
1162# Remember doing this will mostly like cause things to break.
1163# Doesn't allow it to be lower then the one in depend.
1164# Doesn't allow it to be higher then the active vm.
1165# 1585#
1166# @return string - Either the lowest possible target, or JAVA_PKG_WANT_TARGET 1586# @return string - Either the lowest possible target, or JAVA_PKG_WANT_TARGET
1167# ------------------------------------------------------------------------------ 1587# ------------------------------------------------------------------------------
1168java-pkg_get-target() { 1588java-pkg_get-target() {
1169 local min=$(depend-java-query --get-lowest "${DEPEND} ${RDEPEND}")
1170 if [[ -n "${JAVA_PKG_WANT_TARGET}" ]]; then
1171 local max="$(java-config --select-vm "${GENTOO_VM}" -g PROVIDES_VERSION)"
1172 if version_is_at_least "${min}" "${JAVA_PKG_WANT_TARGET}" && version_is_at_least "${JAVA_PKG_WANT_TARGET}" "${max}"; then
1173 echo ${JAVA_PKG_WANT_TARGET}
1174 else
1175 echo ${min}
1176 fi
1177 else
1178 echo ${min}
1179 fi
1180
1181 #echo ${JAVA_PKG_WANT_TARGET:-$(depend-java-query --get-lowest "${DEPEND}")} 1589 echo ${JAVA_PKG_WANT_TARGET:-$(depend-java-query --get-lowest "${DEPEND} ${RDEPEND}")}
1182} 1590}
1183 1591
1184java-pkg_get-javac() { 1592java-pkg_get-javac() {
1185 debug-print-function ${FUNCNAME} $* 1593 debug-print-function ${FUNCNAME} $*
1186 1594
1255 1663
1256# TODO document 1664# TODO document
1257java-pkg_get-jni-cflags() { 1665java-pkg_get-jni-cflags() {
1258 local flags="-I${JAVA_HOME}/include" 1666 local flags="-I${JAVA_HOME}/include"
1259 1667
1668 local platform="linux"
1669 use elibc_FreeBSD && platform="freebsd"
1670
1260 # TODO do a check that the directories are valid 1671 # TODO do a check that the directories are valid
1261 # TODO figure out how to cope with other things than linux...
1262 flags="${flags} -I${JAVA_HOME}/include/linux" 1672 flags="${flags} -I${JAVA_HOME}/include/${platform}"
1263 1673
1264 echo ${flags} 1674 echo ${flags}
1265} 1675}
1266 1676
1267java-pkg_ensure-gcj() { 1677java-pkg_ensure-gcj() {
1273 die "No GCJ support found!" 1683 die "No GCJ support found!"
1274 fi 1684 fi
1275} 1685}
1276 1686
1277java-pkg_ensure-test() { 1687java-pkg_ensure-test() {
1278 if hasq test ${FEATURES} && ! hasq -test ${FEATURES} && ! use test; then 1688 if hasq test ${FEATURES} && ! hasq -test ${FEATURES} \
1689 && hasq test ${IUSE} && ! use test;
1690 then
1279 eerror "You specified FEATURES=test, but USE=test is needed" 1691 eerror "You specified FEATURES=test, but USE=test is needed"
1280 eerror "to pull in the additional dependencies for testing" 1692 eerror "to pull in the additional dependencies for testing"
1281 die "Need USE=test enabled" 1693 die "Need USE=test enabled"
1282 fi 1694 fi
1283} 1695}
1284 1696
1285# ------------------------------------------------------------------------------ 1697# ------------------------------------------------------------------------------
1698# @ebuild-function java-pkg_register-ant-task
1699#
1700# Register this package as ant task, so that ant will load it when no specific
1701# ANT_TASKS are specified. Note that even without this registering, all packages
1702# specified in ANT_TASKS will be loaded. Mostly used by the actual ant tasks
1703# packages, but can be also used by other ebuilds that used to symlink their
1704# .jar into /usr/share/ant-core/lib to get autoloaded, for backwards
1705# compatibility.
1706#
1707# @param --version x.y Register only for ant version x.y (otherwise for any ant
1708# version). Used by the ant-* packages to prevent loading of mismatched
1709# ant-core ant tasks after core was updated, before the tasks are updated,
1710# without a need for blockers.
1711# @param $1 Name to register as. Defaults to JAVA_PKG_NAME ($PN[-$SLOT])
1712# ------------------------------------------------------------------------------
1713java-pkg_register-ant-task() {
1714 local TASKS_DIR="tasks"
1715
1716 # check for --version x.y parameters
1717 while [[ -n "${1}" && -n "${2}" ]]; do
1718 local var="${1#--}"
1719 local val="${2}"
1720 if [[ "${var}" == "version" ]]; then
1721 TASKS_DIR="tasks-${val}"
1722 else
1723 die "Unknown parameter passed to java-pkg_register-ant-tasks: ${1} ${2}"
1724 fi
1725 shift 2
1726 done
1727
1728 local TASK_NAME="${1:-${JAVA_PKG_NAME}}"
1729
1730 dodir /usr/share/ant/${TASKS_DIR}
1731 touch "${D}/usr/share/ant/${TASKS_DIR}/${TASK_NAME}"
1732}
1733
1734# ------------------------------------------------------------------------------
1735# @internal-function java-pkg_ant-tasks-depend
1736#
1737# Translates the WANT_ANT_TASKS variable into valid dependencies.
1738# ------------------------------------------------------------------------------
1739java-pkg_ant-tasks-depend() {
1740 debug-print-function ${FUNCNAME} ${WANT_ANT_TASKS}
1741
1742 if [[ -n "${WANT_ANT_TASKS}" ]]; then
1743 local DEP=""
1744 for i in ${WANT_ANT_TASKS}
1745 do
1746 if [[ ${i} = ant-* ]]; then
1747 DEP="${DEP}dev-java/${i} "
1748 elif [[ ${i} = */*:* ]]; then
1749 DEP="${DEP}${i} "
1750 else
1751 echo "Invalid atom in WANT_ANT_TASKS: ${i}"
1752 return 1
1753 fi
1754 done
1755 echo ${DEP}
1756 return 0
1757 else
1758 return 0
1759 fi
1760}
1761
1762# ------------------------------------------------------------------------------
1763# @ebuild-function ejunit
1764#
1765# Junit wrapper function. Makes it easier to run the tests and checks for
1766# dev-java/junit in DEPEND. Launches the tests using junit.textui.TestRunner.
1767#
1768# Examples:
1769# ejunit -cp build/classes org.blinkenlights.jid3.test.AllTests
1770# ejunit org.blinkenlights.jid3.test.AllTests
1771#
1772# @param $1 - -cp or -classpath
1773# @param $2 - classpath; junit and recorded dependencies get appended
1774# @param $@ - the rest of the parameters are passed to java
1775# ------------------------------------------------------------------------------
1776ejunit() {
1777 debug-print-function ${FUNCNAME} $*
1778
1779 local pkgs
1780 if [[ -f ${JAVA_PKG_DEPEND_FILE} ]]; then
1781 for atom in $(cat ${JAVA_PKG_DEPEND_FILE} | tr : ' '); do
1782 pkgs=${pkgs},$(echo ${atom} | sed -re "s/^.*@//")
1783 done
1784 fi
1785
1786 local cp=$(java-pkg_getjars --with-dependencies junit${pkgs})
1787 if [[ ${1} = -cp || ${1} = -classpath ]]; then
1788 cp="${2}:${cp}"
1789 shift 2
1790 else
1791 cp=".:${cp}"
1792 fi
1793
1794 local runner=junit.textui.TestRunner
1795 debug-print "Calling: java -cp \"${cp}\" -Djava.awt.headless=true ${runner} ${@}"
1796 java -cp "${cp}" -Djava.awt.headless=true ${runner} "${@}" || die "Running junit failed"
1797}
1798
1799# ------------------------------------------------------------------------------
1286# @section-end helper 1800# @section-end helper
1287# ------------------------------------------------------------------------------ 1801# ------------------------------------------------------------------------------
1802
1803# ------------------------------------------------------------------------------
1804# @eclass-src_prepare
1805#
1806# src_prepare Searches for bundled jars
1807# Don't call directly, but via java-pkg-2_src_prepare!
1808# ------------------------------------------------------------------------------
1809
1810java-utils-2_src_prepare() {
1811 [[ ${EBUILD_PHASE} == prepare ]] &&
1812 java-pkg_func-exists java_prepare && java_prepare
1813
1814 # Remember that eant will call this unless called via Portage
1815 if [[ ! -e "${T}/java-utils-2_src_prepare-run" ]] && is-java-strict; then
1816 echo "Searching for bundled jars:"
1817 java-pkg_find-normal-jars || echo "None found."
1818 echo "Searching for bundled classes (no output if none found):"
1819 find "${WORKDIR}" -name "*.class"
1820 echo "Search done."
1821 fi
1822 touch "${T}/java-utils-2_src_prepare-run"
1823}
1824
1825# ------------------------------------------------------------------------------
1826# @eclass-pkg_preinst
1827#
1828# pkg_preinst Searches for missing and unneeded dependencies
1829# Don't call directly, but via java-pkg-2_pkg_preinst!
1830# ------------------------------------------------------------------------------
1831
1832java-utils-2_pkg_preinst() {
1833 if is-java-strict; then
1834 if has_version dev-java/java-dep-check; then
1835 [[ -e "${JAVA_PKG_ENV}" ]] || return
1836 local output=$(GENTOO_VM= java-dep-check --image "${D}" "${JAVA_PKG_ENV}")
1837 if [[ ${output} && has_version <=dev-java/java-dep-check-0.2 ]]; then
1838 ewarn "Possibly unneeded dependencies found in package.env:"
1839 for dep in ${output}; do
1840 ewarn "\t${dep}"
1841 done
1842 fi
1843 if [[ ${output} && has_version >dev-java/java-dep-check-0.2 ]]; then
1844 ewarn "${output}"
1845 fi
1846 else
1847 eerror "Install dev-java/java-dep-check for dependency checking"
1848 fi
1849 fi
1850}
1288 1851
1289# ------------------------------------------------------------------------------ 1852# ------------------------------------------------------------------------------
1290# @section-begin build 1853# @section-begin build
1291# @section-summary Build functions 1854# @section-summary Build functions
1292# 1855#
1296 1859
1297# ------------------------------------------------------------------------------ 1860# ------------------------------------------------------------------------------
1298# @ebuild-function eant 1861# @ebuild-function eant
1299# 1862#
1300# Ant wrapper function. Will use the appropriate compiler, based on user-defined 1863# Ant wrapper function. Will use the appropriate compiler, based on user-defined
1301# compiler. 1864# compiler. Will also set proper ANT_TASKS from the variable ANT_TASKS,
1302# 1865# variables:
1866# EANT_GENTOO_CLASSPATH - calls java-pkg_getjars for the value and adds to the
1867# gentoo.classpath property. Be sure to call
1868# java-ant_rewrite-classpath in src_unpack.
1869# EANT_NEEDS_TOOLS - add tools.jar to the gentoo.classpath. Should only be used
1870# for build-time purposes, the dependency is not recorded to
1871# package.env!
1872# JAVA_PKG_NO_BUNDLED_SEARCH - Don't search for bundled jars or class files
1873# *ANT_TASKS - used to determine ANT_TASKS before calling Ant.
1303# ------------------------------------------------------------------------------ 1874# ------------------------------------------------------------------------------
1304eant() { 1875eant() {
1305 debug-print-function ${FUNCNAME} $* 1876 debug-print-function ${FUNCNAME} $*
1306 1877
1307 # FIXME get this working 1878 if [[ ${EBUILD_PHASE} = compile ]]; then
1308# if is-java-strict && [[ ! ${DEPEND} =~ "dev-java/ant" ]]; then 1879 java-ant-2_src_configure
1880 java-utils-2_src_prepare
1881 fi
1882
1883 if ! hasq java-ant-2 ${INHERITED}; then
1884 local msg="You should inherit java-ant-2 when using eant"
1309# java-pkg_announce-qa-violation \ 1885 java-pkg_announce-qa-violation "${msg}"
1310# "Using eant, but not depending on dev-java/ant or dev-java/ant-core"
1311# fi 1886 fi
1312 1887
1313 local antflags 1888 local antflags="-Dnoget=true -Dmaven.mode.offline=true -Dbuild.sysclasspath=ignore"
1889
1314 java-pkg_init-compiler_ 1890 java-pkg_init-compiler_
1315 local compiler="${GENTOO_COMPILER}" 1891 local compiler="${GENTOO_COMPILER}"
1316 1892
1317 local compiler_env="${JAVA_PKG_COMPILER_DIR}/${compiler}" 1893 local compiler_env="${JAVA_PKG_COMPILER_DIR}/${compiler}"
1318
1319 local build_compiler="$(source ${compiler_env} 1>/dev/null 2>&1; echo ${ANT_BUILD_COMPILER})" 1894 local build_compiler="$(source ${compiler_env} 1>/dev/null 2>&1; echo ${ANT_BUILD_COMPILER})"
1320 if [[ "${compiler}" != "javac" && -z "${build_compiler}" ]]; then 1895 if [[ "${compiler}" != "javac" && -z "${build_compiler}" ]]; then
1321 die "ANT_BUILD_COMPILER undefined in ${compiler_env}" 1896 die "ANT_BUILD_COMPILER undefined in ${compiler_env}"
1322 fi 1897 fi
1323 1898
1324 if [[ ${compiler} != "javac" ]]; then 1899 if [[ ${compiler} != "javac" ]]; then
1325 antflags="-Dbuild.compiler=${build_compiler}" 1900 antflags="${antflags} -Dbuild.compiler=${build_compiler}"
1326 # Figure out any extra stuff to put on the classpath for compilers aside 1901 # Figure out any extra stuff to put on the classpath for compilers aside
1327 # from javac 1902 # from javac
1328 # ANT_BUILD_COMPILER_DEPS should be something that could be passed to 1903 # ANT_BUILD_COMPILER_DEPS should be something that could be passed to
1329 # java-config -p 1904 # java-config -p
1330 local build_compiler_deps="$(source ${JAVA_PKG_COMPILER_DIR}/${compiler} 1>/dev/null 2>&1; echo ${ANT_BUILD_COMPILER_DEPS})" 1905 local build_compiler_deps="$(source ${JAVA_PKG_COMPILER_DIR}/${compiler} 1>/dev/null 2>&1; echo ${ANT_BUILD_COMPILER_DEPS})"
1331 if [[ -n ${build_compiler_deps} ]]; then 1906 if [[ -n ${build_compiler_deps} ]]; then
1332 antflags="${antflags} -lib $(java-config -p ${build_compiler_deps})" 1907 antflags="${antflags} -lib $(java-config -p ${build_compiler_deps})"
1333 fi 1908 fi
1334 fi 1909 fi
1335 1910
1911 for arg in "${@}"; do
1912 if [[ ${arg} = -lib ]]; then
1336 if is-java-strict; then 1913 if is-java-strict; then
1337 einfo "Disabling system classpath for ant" 1914 eerror "You should not use the -lib argument to eant because it will fail"
1338 antflags="${antflags} -Dbuild.sysclasspath=ignore" 1915 eerror "with JAVA_PKG_STRICT. Please use for example java-pkg_jar-from"
1916 eerror "or ant properties to make dependencies available."
1917 eerror "For ant tasks use WANT_ANT_TASKS or ANT_TASKS from."
1918 eerror "split ant (>=dev-java/ant-core-1.7)."
1919 die "eant -lib is deprecated/forbidden"
1920 else
1921 echo "eant -lib is deprecated. Turn JAVA_PKG_STRICT on for"
1922 echo "more info."
1923 fi
1339 fi 1924 fi
1925 done
1340 1926
1341 if [[ -n ${JAVA_PKG_DEBUG} ]]; then 1927 # parse WANT_ANT_TASKS for atoms
1342 antflags="${antflags} -debug" 1928 local want_ant_tasks
1929 for i in ${WANT_ANT_TASKS}; do
1930 if [[ ${i} = */*:* ]]; then
1931 i=${i#*/}
1932 i=${i%:0}
1933 want_ant_tasks+="${i/:/-} "
1934 else
1935 want_ant_tasks+="${i} "
1936 fi
1937 done
1938 # default ANT_TASKS to WANT_ANT_TASKS, if ANT_TASKS is not set explicitly
1939 ANT_TASKS="${ANT_TASKS:-${want_ant_tasks% }}"
1940
1941 # override ANT_TASKS with JAVA_PKG_FORCE_ANT_TASKS if it's set
1942 ANT_TASKS="${JAVA_PKG_FORCE_ANT_TASKS:-${ANT_TASKS}}"
1943
1944 # if ant-tasks is not set by ebuild or forced, use none
1945 ANT_TASKS="${ANT_TASKS:-none}"
1946
1947 # at this point, ANT_TASKS should be "all", "none" or explicit list
1948 if [[ "${ANT_TASKS}" == "all" ]]; then
1949 einfo "Using all available ANT_TASKS"
1950 elif [[ "${ANT_TASKS}" == "none" ]]; then
1951 einfo "Disabling all optional ANT_TASKS"
1952 else
1953 einfo "Using following ANT_TASKS: ${ANT_TASKS}"
1954 fi
1955
1956 export ANT_TASKS
1957
1958 [[ -n ${JAVA_PKG_DEBUG} ]] && antflags="${antflags} --execdebug -debug"
1959 [[ -n ${PORTAGE_QUIET} ]] && antflags="${antflags} -q"
1960
1961 local gcp="${EANT_GENTOO_CLASSPATH}"
1962 local getjarsarg=""
1963
1964 if [[ ${EBUILD_PHASE} = "test" ]]; then
1965 antflags="${antflags} -DJunit.present=true"
1966 [[ ${ANT_TASKS} = *ant-junit* ]] && gcp="${gcp} junit"
1967 getjarsarg="--with-dependencies"
1968 fi
1969
1970 local cp
1971
1972 for atom in ${gcp}; do
1973 cp="${cp}:$(java-pkg_getjars ${getjarsarg} ${atom})"
1974 done
1975
1976 [[ -n "${EANT_NEEDS_TOOLS}" ]] && cp="${cp}:$(java-config --tools)"
1977
1978 if [[ ${cp} ]]; then
1979 # It seems ant does not like single quotes around ${cp}
1980 cp=${cp#:}
1981 [[ ${EANT_GENTOO_CLASSPATH_EXTRA} ]] && \
1982 cp="${cp}:${EANT_GENTOO_CLASSPATH_EXTRA}"
1983 antflags="${antflags} -Dgentoo.classpath=\"${cp}\""
1343 fi 1984 fi
1344 1985
1345 [[ -n ${JAVA_PKG_DEBUG} ]] && echo ant ${antflags} "${@}" 1986 [[ -n ${JAVA_PKG_DEBUG} ]] && echo ant ${antflags} "${@}"
1987 debug-print "Calling ant (GENTOO_VM: ${GENTOO_VM}): ${antflags} ${@}"
1346 ant ${antflags} "${@}" || die "eant failed" 1988 ant ${antflags} "${@}" || die "eant failed"
1347
1348} 1989}
1349 1990
1350# ------------------------------------------------------------------------------ 1991# ------------------------------------------------------------------------------
1351# @ebuild-function ejavac 1992# @ebuild-function ejavac
1352# 1993#
1421# ------------------------------------------------------------------------------ 2062# ------------------------------------------------------------------------------
1422use_doc() { 2063use_doc() {
1423 use doc && echo ${@:-javadoc} 2064 use doc && echo ${@:-javadoc}
1424} 2065}
1425 2066
2067
1426# ------------------------------------------------------------------------------ 2068# ------------------------------------------------------------------------------
1427# @section-end build 2069# @section-end build
1428# ------------------------------------------------------------------------------ 2070# ------------------------------------------------------------------------------
1429 2071
1430# ------------------------------------------------------------------------------ 2072# ------------------------------------------------------------------------------
1446# This shouldn't be used directly. Instead, java-pkg and java-pkg-opt will 2088# This shouldn't be used directly. Instead, java-pkg and java-pkg-opt will
1447# call it during each of the phases of the merge process. 2089# call it during each of the phases of the merge process.
1448# 2090#
1449# ----------------------------------------------------------------------------- 2091# -----------------------------------------------------------------------------
1450java-pkg_init() { 2092java-pkg_init() {
2093 debug-print-function ${FUNCNAME} $*
1451 unset JAVAC 2094 unset JAVAC
1452 unset JAVA_HOME 2095 unset JAVA_HOME
2096
2097 java-config --help >/dev/null || {
2098 eerror ""
2099 eerror "Can't run java-config --help"
2100 eerror "Have you upgraded python recently but haven't"
2101 eerror "run python-updater yet?"
2102 die "Can't run java-config --help"
2103 }
2104
2105 # People do all kinds of weird things.
2106 # http://forums.gentoo.org/viewtopic-p-3943166.html
2107 local silence="${SILENCE_JAVA_OPTIONS_WARNING}"
2108 local accept="${I_WANT_GLOBAL_JAVA_OPTIONS}"
2109 if [[ -n ${_JAVA_OPTIONS} && -z ${accept} && -z ${silence} ]]; then
2110 ewarn "_JAVA_OPTIONS changes what java -version outputs at least for"
2111 ewarn "sun-jdk vms and and as such break configure scripts that"
2112 ewarn "use it (for example app-office/openoffice) so we filter it out."
2113 ewarn "Use SILENCE_JAVA_OPTIONS_WARNING=true in the environment (use"
2114 ewarn "make.conf for example) to silence this warning or"
2115 ewarn "I_WANT_GLOBAL_JAVA_OPTIONS to not filter it."
2116 fi
2117
2118 if [[ -z ${accept} ]]; then
2119 # export _JAVA_OPTIONS= doesn't work because it will show up in java
2120 # -version output
2121 unset _JAVA_OPTIONS
2122 # phase hooks make this run many times without this
2123 I_WANT_GLOBAL_JAVA_OPTIONS="true"
2124 fi
2125
2126 if java-pkg_func-exists ant_src_unpack; then
2127 java-pkg_announce-qa-violation "Using old ant_src_unpack. Should be src_unpack"
2128 fi
2129
1453 java-pkg_init_paths_ 2130 java-pkg_init_paths_
1454 java-pkg_switch-vm 2131 java-pkg_switch-vm
1455 PATH=${JAVA_HOME}/bin:${PATH} 2132 PATH=${JAVA_HOME}/bin:${PATH}
1456 2133
1457 # TODO we will probably want to set JAVAC and JAVACFLAGS 2134 # TODO we will probably want to set JAVAC and JAVACFLAGS
1458 2135
1459 # Do some QA checks 2136 # Do some QA checks
1460 java-pkg_check-jikes 2137 java-pkg_check-jikes
2138
2139 # Can't use unset here because Portage does not save the unset
2140 # see https://bugs.gentoo.org/show_bug.cgi?id=189417#c11
1461 2141
1462 # When users have crazy classpaths some packages can fail to compile. 2142 # When users have crazy classpaths some packages can fail to compile.
1463 # and everything should work with empty CLASSPATH. 2143 # and everything should work with empty CLASSPATH.
1464 # This also helps prevent unexpected dependencies on random things 2144 # This also helps prevent unexpected dependencies on random things
1465 # from the CLASSPATH. 2145 # from the CLASSPATH.
1466 unset CLASSPATH 2146 export CLASSPATH=
2147
2148 # Unset external ANT_ stuff
2149 export ANT_TASKS=
2150 export ANT_OPTS=
2151 export ANT_RESPECT_JAVA_HOME=
1467} 2152}
1468 2153
1469# ------------------------------------------------------------------------------ 2154# ------------------------------------------------------------------------------
1470# @function-internal java-pkg-init-compiler_ 2155# @function-internal java-pkg-init-compiler_
1471# 2156#
1562 done 2247 done
1563 2248
1564 # If it hasn't been defined already, default to javac 2249 # If it hasn't been defined already, default to javac
1565 if [[ -z ${GENTOO_COMPILER} ]]; then 2250 if [[ -z ${GENTOO_COMPILER} ]]; then
1566 if [[ -n ${compilers} ]]; then 2251 if [[ -n ${compilers} ]]; then
1567 einfo "No suitable compiler found: defaulting javac for compilation" 2252 einfo "No suitable compiler found: defaulting to JDK default for compilation"
1568 else 2253 else
1569 # probably don't need to notify users about the default. 2254 # probably don't need to notify users about the default.
1570 :;#einfo "Defaulting to javac for compilation" 2255 :;#einfo "Defaulting to javac for compilation"
1571 fi 2256 fi
2257 if java-config -g GENTOO_COMPILER 2> /dev/null; then
2258 export GENTOO_COMPILER=$(java-config -g GENTOO_COMPILER)
2259 else
1572 export GENTOO_COMPILER=javac 2260 export GENTOO_COMPILER=javac
2261 fi
1573 else 2262 else
1574 einfo "Using ${GENTOO_COMPILER} for compilation" 2263 einfo "Using ${GENTOO_COMPILER} for compilation"
1575 fi 2264 fi
1576 2265
1577} 2266}
1593 fi 2282 fi
1594 2283
1595 JAVA_PKG_SHAREPATH="${DESTTREE}/share/${JAVA_PKG_NAME}" 2284 JAVA_PKG_SHAREPATH="${DESTTREE}/share/${JAVA_PKG_NAME}"
1596 JAVA_PKG_SOURCESPATH="${JAVA_PKG_SHAREPATH}/sources/" 2285 JAVA_PKG_SOURCESPATH="${JAVA_PKG_SHAREPATH}/sources/"
1597 JAVA_PKG_ENV="${D}${JAVA_PKG_SHAREPATH}/package.env" 2286 JAVA_PKG_ENV="${D}${JAVA_PKG_SHAREPATH}/package.env"
2287 JAVA_PKG_VIRTUALS_PATH="${DESTTREE}/share/java-config-2/virtuals"
2288 JAVA_PKG_VIRTUAL_PROVIDER="${D}/${JAVA_PKG_VIRTUALS_PATH}/${JAVA_PKG_NAME}"
1598 2289
1599 [[ -z "${JAVA_PKG_JARDEST}" ]] && JAVA_PKG_JARDEST="${JAVA_PKG_SHAREPATH}/lib" 2290 [[ -z "${JAVA_PKG_JARDEST}" ]] && JAVA_PKG_JARDEST="${JAVA_PKG_SHAREPATH}/lib"
1600 [[ -z "${JAVA_PKG_LIBDEST}" ]] && JAVA_PKG_LIBDEST="${DESTTREE}/$(get_libdir)/${JAVA_PKG_NAME}" 2291 [[ -z "${JAVA_PKG_LIBDEST}" ]] && JAVA_PKG_LIBDEST="${DESTTREE}/$(get_libdir)/${JAVA_PKG_NAME}"
1601 [[ -z "${JAVA_PKG_WARDEST}" ]] && JAVA_PKG_WARDEST="${JAVA_PKG_SHAREPATH}/webapps" 2292 [[ -z "${JAVA_PKG_WARDEST}" ]] && JAVA_PKG_WARDEST="${JAVA_PKG_SHAREPATH}/webapps"
1602 2293
1615# Writes the package.env out to disk. 2306# Writes the package.env out to disk.
1616# 2307#
1617# ------------------------------------------------------------------------------ 2308# ------------------------------------------------------------------------------
1618# TODO change to do-write, to match everything else 2309# TODO change to do-write, to match everything else
1619java-pkg_do_write_() { 2310java-pkg_do_write_() {
2311 debug-print-function ${FUNCNAME} $*
2312 java-pkg_init_paths_
1620 # Create directory for package.env 2313 # Create directory for package.env
1621 dodir "${JAVA_PKG_SHAREPATH}" 2314 dodir "${JAVA_PKG_SHAREPATH}"
1622 if [[ -n "${JAVA_PKG_CLASSPATH}" || -n "${JAVA_PKG_LIBRARY}" || -f "${JAVA_PKG_DEPEND}" ]]; then 2315 if [[ -n "${JAVA_PKG_CLASSPATH}" || -n "${JAVA_PKG_LIBRARY}" || -f \
1623 java-pkg_init_paths_ 2316 "${JAVA_PKG_DEPEND_FILE}" || -f \
2317 "${JAVA_PKG_OPTIONAL_DEPEND_FILE}" ]]; then
1624 # Create package.env 2318 # Create package.env
1625 ( 2319 (
1626 echo "DESCRIPTION=\"${DESCRIPTION}\"" 2320 echo "DESCRIPTION=\"${DESCRIPTION}\""
1627 echo "GENERATION=\"2\"" 2321 echo "GENERATION=\"2\""
2322 echo "SLOT=\"${SLOT}\""
1628 2323
1629 [[ -n "${JAVA_PKG_CLASSPATH}" ]] && echo "CLASSPATH=\"${JAVA_PKG_CLASSPATH}\"" 2324 [[ -n "${JAVA_PKG_CLASSPATH}" ]] && echo "CLASSPATH=\"${JAVA_PKG_CLASSPATH}\""
1630 [[ -n "${JAVA_PKG_LIBRARY}" ]] && echo "LIBRARY_PATH=\"${JAVA_PKG_LIBRARY}\"" 2325 [[ -n "${JAVA_PKG_LIBRARY}" ]] && echo "LIBRARY_PATH=\"${JAVA_PKG_LIBRARY}\""
1631 [[ -n "${JAVA_PROVIDE}" ]] && echo "PROVIDES=\"${JAVA_PROVIDE}\"" 2326 [[ -n "${JAVA_PROVIDE}" ]] && echo "PROVIDES=\"${JAVA_PROVIDE}\""
1632 [[ -f "${JAVA_PKG_DEPEND}" ]] && echo "DEPEND=\"$(cat ${JAVA_PKG_DEPEND} | uniq | tr '\n' ':')\"" 2327 [[ -f "${JAVA_PKG_DEPEND_FILE}" ]] \
2328 && echo "DEPEND=\"$(cat "${JAVA_PKG_DEPEND_FILE}" | uniq | tr '\n' ':')\""
2329 [[ -f "${JAVA_PKG_OPTIONAL_DEPEND_FILE}" ]] \
2330 && echo "OPTIONAL_DEPEND=\"$(cat "${JAVA_PKG_OPTIONAL_DEPEND_FILE}" | uniq | tr '\n' ':')\""
1633 echo "VM=\"$(echo ${RDEPEND} ${DEPEND} | sed -e 's/ /\n/g' | sed -n -e '/virtual\/\(jre\|jdk\)/ { p;q }')\"" # TODO cleanup ! 2331 echo "VM=\"$(echo ${RDEPEND} ${DEPEND} | sed -e 's/ /\n/g' | sed -n -e '/virtual\/\(jre\|jdk\)/ { p;q }')\"" # TODO cleanup !
1634 ) > "${JAVA_PKG_ENV}" 2332 ) > "${JAVA_PKG_ENV}"
1635 2333
1636 # register target/source 2334 # register target/source
1637 local target="$(java-pkg_get-target)" 2335 local target="$(java-pkg_get-target)"
1648 2346
1649 2347
1650 echo "MERGE_VM=\"${GENTOO_VM}\"" >> "${JAVA_PKG_ENV}" 2348 echo "MERGE_VM=\"${GENTOO_VM}\"" >> "${JAVA_PKG_ENV}"
1651 [[ -n ${GENTOO_COMPILER} ]] && echo "MERGE_COMPILER=\"${GENTOO_COMPILER}\"" >> "${JAVA_PKG_ENV}" 2349 [[ -n ${GENTOO_COMPILER} ]] && echo "MERGE_COMPILER=\"${GENTOO_COMPILER}\"" >> "${JAVA_PKG_ENV}"
1652 2350
2351 # extra env variables
2352 if [[ -n "${JAVA_PKG_EXTRA_ENV_VARS}" ]]; then
2353 cat "${JAVA_PKG_EXTRA_ENV}" >> "${JAVA_PKG_ENV}" || die
2354 # nested echo to remove leading/trailing spaces
2355 echo "ENV_VARS=\"$(echo ${JAVA_PKG_EXTRA_ENV_VARS})\"" \
2356 >> "${JAVA_PKG_ENV}" || die
2357 fi
2358
1653 # Strip unnecessary leading and trailing colons 2359 # Strip unnecessary leading and trailing colons
1654 # TODO try to cleanup if possible 2360 # TODO try to cleanup if possible
1655 sed -e "s/=\":/=\"/" -e "s/:\"$/\"/" -i "${JAVA_PKG_ENV}" || die "Did you forget to call java_init ?" 2361 sed -e "s/=\":/=\"/" -e "s/:\"$/\"/" -i "${JAVA_PKG_ENV}" || die "Did you forget to call java_init ?"
2362 else
2363 debug-print "JAVA_PKG_CLASSPATH, JAVA_PKG_LIBRARY, JAVA_PKG_DEPEND_FILE"
2364 debug-print "or JAVA_PKG_OPTIONAL_DEPEND_FILE not defined so can't"
2365 debug-print "write package.env."
1656 fi 2366 fi
1657} 2367}
1658
1659 2368
1660# ------------------------------------------------------------------------------ 2369# ------------------------------------------------------------------------------
1661# @internal-function java-pkg_record-jar_ 2370# @internal-function java-pkg_record-jar_
1662# 2371#
1663# Record a dependency to the package.env 2372# Record an (optional) dependency to the package.env
1664# 2373# @param --optional - record dependency as optional
2374# @param $1 - package to record
2375# @param $2 - (optional) jar of package to record
1665# ------------------------------------------------------------------------------ 2376# ------------------------------------------------------------------------------
1666JAVA_PKG_DEPEND="${T}/java-pkg-depend" 2377JAVA_PKG_DEPEND_FILE="${T}/java-pkg-depend"
2378JAVA_PKG_OPTIONAL_DEPEND_FILE="${T}/java-pkg-optional-depend"
1667 2379
1668java-pkg_record-jar_() { 2380java-pkg_record-jar_() {
1669 debug-print-function ${FUNCNAME} $* 2381 debug-print-function ${FUNCNAME} $*
2382
2383 local depend_file="${JAVA_PKG_DEPEND_FILE}"
2384 if [[ "${1}" == "--optional" ]]; then
2385 depend_file="${JAVA_PKG_OPTIONAL_DEPEND_FILE}"
2386 shift
2387 fi
1670 2388
1671 local pkg=${1} jar=${2} append 2389 local pkg=${1} jar=${2} append
1672 if [[ -z "${jar}" ]]; then 2390 if [[ -z "${jar}" ]]; then
1673 append="${pkg}" 2391 append="${pkg}"
1674 else 2392 else
1675 append="$(basename ${jar})@${pkg}" 2393 append="$(basename ${jar})@${pkg}"
1676 fi 2394 fi
1677 2395
1678 echo ${append} >> ${JAVA_PKG_DEPEND} 2396 echo "${append}" >> "${depend_file}"
1679} 2397}
1680 2398
1681# ------------------------------------------------------------------------------ 2399# ------------------------------------------------------------------------------
1682# @internal-function java-pkg_append_ 2400# @internal-function java-pkg_append_
1683# 2401#
1727# 2445#
1728# @return 0 - function is declared 2446# @return 0 - function is declared
1729# @return 1 - function is undeclared 2447# @return 1 - function is undeclared
1730# ------------------------------------------------------------------------------ 2448# ------------------------------------------------------------------------------
1731java-pkg_func-exists() { 2449java-pkg_func-exists() {
1732 if [[ -n "$(declare -f ${1})" ]]; then 2450 declare -F ${1} > /dev/null
1733 return 0
1734 else
1735 return 1
1736 fi
1737} 2451}
1738 2452
1739# ------------------------------------------------------------------------------ 2453# ------------------------------------------------------------------------------
1740# @internal-function java-pkg_setup-vm 2454# @internal-function java-pkg_setup-vm
1741# 2455#
1742# Sets up the environment for a specific VM 2456# Sets up the environment for a specific VM
1743# 2457#
1744# ------------------------------------------------------------------------------ 2458# ------------------------------------------------------------------------------
1745java-pkg_setup-vm() { 2459java-pkg_setup-vm() {
1746 debug-print-function ${FUNCNAME} $* 2460 debug-print-function ${FUNCNAME} $*
2461
2462 export LANG="C" LC_ALL="C"
1747 2463
1748 local vendor="$(java-pkg_get-vm-vendor)" 2464 local vendor="$(java-pkg_get-vm-vendor)"
1749 if [[ "${vendor}" == "sun" ]] && java-pkg_is-vm-version-ge "1.5" ; then 2465 if [[ "${vendor}" == "sun" ]] && java-pkg_is-vm-version-ge "1.5" ; then
1750 addpredict "/dev/random" 2466 addpredict "/dev/random"
1751 elif [[ "${vendor}" == "ibm" ]]; then 2467 elif [[ "${vendor}" == "ibm" ]]; then
1752 addpredict "/proc/self/maps" 2468 addpredict "/proc/self/maps"
1753 addpredict "/proc/cpuinfo" 2469 addpredict "/proc/cpuinfo"
1754 export LANG="C" LC_ALL="C"
1755 elif [[ "${vendor}" == "jrockit" ]]; then 2470 elif [[ "${vendor}" == "jrockit" ]]; then
1756 addpredict "/proc/cpuinfo" 2471 addpredict "/proc/cpuinfo"
1757 fi 2472 fi
1758} 2473}
1759 2474
1814# Switch VM if we're allowed to (controlled by JAVA_PKG_ALLOW_VM_CHANGE), and 2529# Switch VM if we're allowed to (controlled by JAVA_PKG_ALLOW_VM_CHANGE), and
1815# verify that the current VM is sufficient. 2530# verify that the current VM is sufficient.
1816# Setup the environment for the VM being used. 2531# Setup the environment for the VM being used.
1817# ------------------------------------------------------------------------------ 2532# ------------------------------------------------------------------------------
1818java-pkg_switch-vm() { 2533java-pkg_switch-vm() {
2534 debug-print-function ${FUNCNAME} $*
2535
1819 if java-pkg_needs-vm; then 2536 if java-pkg_needs-vm; then
1820 # Use the VM specified by JAVA_PKG_FORCE_VM 2537 # Use the VM specified by JAVA_PKG_FORCE_VM
1821 if [[ -n ${JAVA_PKG_FORCE_VM} ]]; then 2538 if [[ -n "${JAVA_PKG_FORCE_VM}" ]]; then
1822 # If you're forcing the VM, I hope you know what your doing... 2539 # If you're forcing the VM, I hope you know what your doing...
2540 debug-print "JAVA_PKG_FORCE_VM used: ${JAVA_PKG_FORCE_VM}"
1823 export GENTOO_VM="${JAVA_PKG_FORCE_VM}" 2541 export GENTOO_VM="${JAVA_PKG_FORCE_VM}"
1824 # if we're allowed to switch the vm... 2542 # if we're allowed to switch the vm...
1825 elif [[ "${JAVA_PKG_ALLOW_VM_CHANGE}" == "yes" ]]; then 2543 elif [[ "${JAVA_PKG_ALLOW_VM_CHANGE}" == "yes" ]]; then
1826 debug-print "depend-java-query: NV_DEPEND: ${JAVA_PKG_NV_DEPEND:-${DEPEND}} VNEED: ${JAVA_PKG_VNEED}" 2544 debug-print "depend-java-query: NV_DEPEND: ${JAVA_PKG_NV_DEPEND:-${DEPEND}} VNEED: ${JAVA_PKG_VNEED}"
1827 if [[ -n ${JAVA_PKG_VNEED} ]]; then 2545 if [[ -n ${JAVA_PKG_VNEED} ]]; then
1828 GENTOO_VM="$(depend-java-query --need-virtual "${JAVA_PKG_VNEED}" --get-vm "${JAVA_PKG_NV_DEPEND:-${DEPEND}}")" 2546 GENTOO_VM="$(depend-java-query --need-virtual "${JAVA_PKG_VNEED}" --get-vm "${JAVA_PKG_NV_DEPEND:-${DEPEND}}")"
1829 else 2547 else
1830 GENTOO_VM="$(depend-java-query --get-vm "${JAVA_PKG_NV_DEPEND:-${DEPEND}}")" 2548 GENTOO_VM="$(depend-java-query --get-vm "${JAVA_PKG_NV_DEPEND:-${DEPEND}}")"
1831 fi 2549 fi
1832 if [[ -z "${GENTOO_VM}" || "${GENTOO_VM}" == "None" ]]; then 2550 if [[ -z "${GENTOO_VM}" || "${GENTOO_VM}" == "None" ]]; then
1833 eerror "Unable to determine VM for building from dependencies." 2551 eerror "Unable to determine VM for building from dependencies:"
1834 echo "NV_DEPEND: ${JAVA_PKG_NV_DEPEND:-${DEPEND}}" 2552 echo "NV_DEPEND: ${JAVA_PKG_NV_DEPEND:-${DEPEND}}"
1835 echo "VNEED: ${JAVA_PKG_VNEED}" 2553 echo "VNEED: ${JAVA_PKG_VNEED}"
2554 die "Failed to determine VM for building."
1836 else 2555 else
1837 export GENTOO_VM 2556 export GENTOO_VM
1838 fi 2557 fi
1839 # otherwise just make sure the current VM is sufficient 2558 # otherwise just make sure the current VM is sufficient
1840 else 2559 else
1859 2578
1860 #TODO If you know a better solution let us know. 2579 #TODO If you know a better solution let us know.
1861 java-pkg_append_ LD_LIBRARY_PATH "$(java-config -g LDPATH)" 2580 java-pkg_append_ LD_LIBRARY_PATH "$(java-config -g LDPATH)"
1862 2581
1863 local tann="${T}/announced-vm" 2582 local tann="${T}/announced-vm"
2583 # With the hooks we should only get here once from pkg_setup but better safe than sorry
2584 # if people have for example modified eclasses some where
1864 if [[ -n "${JAVA_PKG_DEBUG}" ]] || [[ ! -f "${tann}" ]] ; then 2585 if [[ -n "${JAVA_PKG_DEBUG}" ]] || [[ ! -f "${tann}" ]] ; then
1865 # Add a check for setup/preinst phase... to avoid duplicate outputs
1866 # for when FEATURES=buildpkg
1867 if [[ ${EBUILD_PHASE} != "setup" && ${EBUILD_PHASE} != "preinst" && ${EBUILD_PHASE} != "postinst" ]];
1868 then
1869 einfo "Using: $(java-config -f)" 2586 einfo "Using: $(java-config -f)"
1870 [[ ! -f "${tann}" ]] && touch "${tann}" 2587 [[ ! -f "${tann}" ]] && touch "${tann}"
1871 fi
1872 fi 2588 fi
1873 2589
1874 else 2590 else
1875 [[ -n "${JAVA_PKG_DEBUG}" ]] && ewarn "!!! This package inherits java-pkg but doesn't depend on a JDK. -bin or broken dependency!!!" 2591 [[ -n "${JAVA_PKG_DEBUG}" ]] && ewarn "!!! This package inherits java-pkg but doesn't depend on a JDK. -bin or broken dependency!!!"
1876 fi 2592 fi
1906 einfo "Classes" 2622 einfo "Classes"
1907 find "${S}" -type f -name '*.class' -print0 | xargs -0 -r -n 500 ls -ald | sed -e "s,${WORKDIR},\${WORKDIR}," 2623 find "${S}" -type f -name '*.class' -print0 | xargs -0 -r -n 500 ls -ald | sed -e "s,${WORKDIR},\${WORKDIR},"
1908 fi 2624 fi
1909} 2625}
1910 2626
1911# TODO document 2627# ------------------------------------------------------------------------------
2628# @internal-function java-pkg_verify-classes
2629#
1912# Verify that the classes were compiled for the right source / target 2630# Verify that the classes were compiled for the right source / target. Dies if
2631# not.
2632# @param $1 (optional) - the file to check, otherwise checks whole ${D}
2633# ------------------------------------------------------------------------------
1913java-pkg_verify-classes() { 2634java-pkg_verify-classes() {
1914 ebegin "Verifying java class versions"
1915 #$(find ${D} -type f -name '*.jar' -o -name '*.class') 2635 #$(find ${D} -type f -name '*.jar' -o -name '*.class')
1916 class-version-verify.py -t $(java-pkg_get-target) -r ${D} 2636
2637 local version_verify="/usr/bin/class-version-verify.py"
2638
2639 if [[ ! -x "${version_verify}" ]]; then
2640 version_verify="/usr/$(get_libdir)/javatoolkit/bin/class-version-verify.py"
2641 fi
2642
2643 if [[ ! -x "${version_verify}" ]]; then
2644 ewarn "Unable to perform class version checks as"
2645 ewarn "class-version-verify.py is unavailable"
2646 ewarn "Please install dev-java/javatoolkit."
2647 return
2648 fi
2649
2650 local target=$(java-pkg_get-target)
2651 local result
2652 local log="${T}/class-version-verify.log"
2653 if [[ -n "${1}" ]]; then
2654 ${version_verify} -v -t ${target} "${1}" > "${log}"
1917 result=$? 2655 result=$?
1918 eend ${result}
1919 if [[ ${result} == 0 ]]; then
1920 einfo "All good"
1921 else 2656 else
1922 ewarn "Possible problem" 2657 ebegin "Verifying java class versions (target: ${target})"
1923 die "Bad class files found" 2658 ${version_verify} -v -t ${target} -r "${D}" > "${log}"
2659 result=$?
2660 eend ${result}
2661 fi
2662 [[ -n ${JAVA_PKG_DEBUG} ]] && cat "${log}"
2663 if [[ ${result} != 0 ]]; then
2664 eerror "Incorrect bytecode version found"
2665 [[ -n "${1}" ]] && eerror "in file: ${1}"
2666 eerror "See ${log} for more details."
2667 die "Incorrect bytecode found"
2668 fi
2669}
2670
2671# ----------------------------------------------------------------------------
2672# @internal-function java-pkg_ensure-dep
2673# Check that a package being used in jarfrom, getjars and getjar is contained
2674# within DEPEND or RDEPEND.
2675# @param $1 - empty - check both vars; "runtime" or "build" - check only
2676# RDEPEND, resp. DEPEND
2677# @param $2 - Package name and slot.
2678
2679java-pkg_ensure-dep() {
2680 debug-print-function ${FUNCNAME} $*
2681
2682 local limit_to="${1}"
2683 local target_pkg="${2}"
2684 local dev_error=""
2685
2686 local stripped_pkg=$(echo "${target_pkg}" | sed \
2687 's/-[0-9]*\(\.[0-9]\)*$//')
2688
2689 debug-print "Matching against: ${stripped_pkg}"
2690
2691 if [[ ${limit_to} != runtime && ! ( "${DEPEND}" =~ "$stripped_pkg" ) ]]; then
2692 dev_error="The ebuild is attempting to use ${target_pkg} that is not"
2693 dev_error="${dev_error} declared in DEPEND."
2694 if is-java-strict; then
2695 eerror "${dev_error}"
2696 die "${dev_error}"
2697 elif [[ ${BASH_SUBSHELL} = 0 ]]; then
2698 eerror "${dev_error}"
2699 elog "Because you have this package installed the package will"
2700 elog "build without problems, but please report this to"
2701 elog "http://bugs.gentoo.org"
2702 fi
2703 fi
2704
2705 if [[ ${limit_to} != build ]]; then
2706 if [[ ! ( ${RDEPEND} =~ "${stripped_pkg}" ) ]]; then
2707 if [[ ! ( ${PDEPEND} =~ "${stripped_pkg}" ) ]]; then
2708 dev_error="The ebuild is attempting to use ${target_pkg},"
2709 dev_error="${dev_error} without specifying --build-only, that is not declared in RDEPEND"
2710 dev_error="${dev_error} or PDEPEND."
2711 if is-java-strict; then
2712 eerror "${dev_error}"
2713 die "${dev_error}"
2714 elif [[ ${BASH_SUBSHELL} = 0 ]]; then
2715 eerror "${dev_error}"
2716 elog "The package will build without problems, but may fail to run"
2717 elog "if you don't have ${target_pkg} installed, so please report"
2718 elog "this to http://bugs.gentoo.org"
2719 fi
2720 fi
2721 fi
1924 fi 2722 fi
1925} 2723}
1926 2724
1927# ------------------------------------------------------------------------------ 2725# ------------------------------------------------------------------------------
1928# @section-end internal 2726# @section-end internal
1929# ------------------------------------------------------------------------------ 2727# ------------------------------------------------------------------------------
1930 2728
1931java-pkg_check-phase() { 2729java-pkg_check-phase() {
1932 local phase=${1} 2730 local phase=${1}
1933 local funcname=${2} 2731 local funcname=${FUNCNAME[1]}
1934 if is-java-strict && [[ ${EBUILD_PHASE} != ${phase} ]]; then 2732 if [[ ${EBUILD_PHASE} != ${phase} ]]; then
1935 java-pkg_announce-qa-violation \
1936 "${funcname} used outside of src_${phase}" 2733 local msg="${funcname} used outside of src_${phase}"
2734 java-pkg_announce-qa-violation "${msg}"
1937 fi 2735 fi
1938} 2736}
1939 2737
1940java-pkg_check-versioned-jar() { 2738java-pkg_check-versioned-jar() {
1941 local jar=${1} 2739 local jar=${1}
1950 java-pkg_announce-qa-violation "deprecated USE flag 'jikes' in IUSE" 2748 java-pkg_announce-qa-violation "deprecated USE flag 'jikes' in IUSE"
1951 fi 2749 fi
1952} 2750}
1953 2751
1954java-pkg_announce-qa-violation() { 2752java-pkg_announce-qa-violation() {
1955 if is-java-strict; then 2753 local nodie
2754 if [[ ${1} == "--nodie" ]]; then
2755 nodie="true"
2756 shift
2757 fi
1956 echo "Java QA Notice: $@" >&2 2758 echo "Java QA Notice: $@" >&2
1957 increment-qa-violations 2759 increment-qa-violations
1958 fi 2760 [[ -z "${nodie}" ]] && is-java-strict && die "${@}"
1959} 2761}
1960 2762
1961increment-qa-violations() { 2763increment-qa-violations() {
1962 let "JAVA_PKG_QA_VIOLATIONS+=1" 2764 let "JAVA_PKG_QA_VIOLATIONS+=1"
1963 export JAVA_PKG_QA_VIOLATIONS 2765 export JAVA_PKG_QA_VIOLATIONS
1966is-java-strict() { 2768is-java-strict() {
1967 [[ -n ${JAVA_PKG_STRICT} ]] 2769 [[ -n ${JAVA_PKG_STRICT} ]]
1968 return $? 2770 return $?
1969} 2771}
1970 2772
2773
1971# ------------------------------------------------------------------------------ 2774# ------------------------------------------------------------------------------
1972# @eclass-end 2775# @eclass-end
1973# ------------------------------------------------------------------------------ 2776# ------------------------------------------------------------------------------

Legend:
Removed from v.1.27  
changed lines
  Added in v.1.127

  ViewVC Help
Powered by ViewVC 1.1.20