/[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.33 Revision 1.128
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# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.33 2006/12/07 02:27:22 flameeyes Exp $ 9# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.128 2009/06/02 07:02:01 ali_bush Exp $
10
11 10
12# ----------------------------------------------------------------------------- 11# -----------------------------------------------------------------------------
13# @eclass-begin 12# @eclass-begin
14# @eclass-shortdesc Java Utility eclass 13# @eclass-shortdesc Java Utility eclass
15# @eclass-maintainer java@gentoo.org 14# @eclass-maintainer java@gentoo.org
36# ----------------------------------------------------------------------------- 35# -----------------------------------------------------------------------------
37 36
38# Make sure we use java-config-2 37# Make sure we use java-config-2
39export WANT_JAVA_CONFIG="2" 38export WANT_JAVA_CONFIG="2"
40 39
41# TODO document 40# -----------------------------------------------------------------------------
42JAVA_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"
43 67
44# ----------------------------------------------------------------------------- 68# -----------------------------------------------------------------------------
45# @variable-internal JAVA_PKG_E_DEPEND 69# @variable-internal JAVA_PKG_E_DEPEND
46# 70#
47# 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
48# 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
49# portage, that includes phase hooks. 73# so that ebuilds can use new features without depending on specific versions.
50# ----------------------------------------------------------------------------- 74# -----------------------------------------------------------------------------
51JAVA_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 )"
52 77
53# ----------------------------------------------------------------------------- 78# -----------------------------------------------------------------------------
54# @variable-external JAVA_PKG_ALLOW_VM_CHANGE 79# @variable-external JAVA_PKG_ALLOW_VM_CHANGE
55# @variable-default yes 80# @variable-default yes
56# 81#
130# @note This should only be used internally or for testing. 155# @note This should only be used internally or for testing.
131# @example Use jikes and javac, in that order 156# @example Use jikes and javac, in that order
132# JAVA_PKG_FORCE_COMPILER="jikes javac" 157# JAVA_PKG_FORCE_COMPILER="jikes javac"
133# ----------------------------------------------------------------------------- 158# -----------------------------------------------------------------------------
134 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
135# TODO document me 174# TODO document me
136JAVA_PKG_QA_VIOLATIONS=0 175JAVA_PKG_QA_VIOLATIONS=0
137 176
138# ----------------------------------------------------------------------------- 177# -----------------------------------------------------------------------------
139# @section-end variables 178# @section-end variables
146# 185#
147# 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
148# libraries, etc. 187# libraries, etc.
149# ----------------------------------------------------------------------------- 188# -----------------------------------------------------------------------------
150 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}
151 230
152# ----------------------------------------------------------------------------- 231# -----------------------------------------------------------------------------
153# @ebuild-function java-pkg_dojar 232# @ebuild-function java-pkg_dojar
154# 233#
155# Installs any number of jars. 234# Installs any number of jars.
174 # Create JARDEST if it doesn't exist 253 # Create JARDEST if it doesn't exist
175 dodir ${JAVA_PKG_JARDEST} 254 dodir ${JAVA_PKG_JARDEST}
176 255
177 local jar 256 local jar
178 # for each jar 257 # for each jar
179 for jar in "$@"; do 258 for jar in "${@}"; do
180 local jar_basename=$(basename "${jar}") 259 local jar_basename=$(basename "${jar}")
181 260
182 java-pkg_check-versioned-jar ${jar_basename} 261 java-pkg_check-versioned-jar ${jar_basename}
183 262
184 # check if it exists 263 # check if it exists
185 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
186 # install it into JARDEST if it's a non-symlink 272 # install it into JARDEST if it's a non-symlink
187 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
188 INSDESTTREE="${JAVA_PKG_JARDEST}" \ 277 INSDESTTREE="${JAVA_PKG_JARDEST}" \
189 doins "${jar}" || die "failed to install ${jar}" 278 doins "${jar}" || die "failed to install ${jar}"
190 java-pkg_append_ JAVA_PKG_CLASSPATH "${JAVA_PKG_JARDEST}/${jar_basename}" 279 java-pkg_append_ JAVA_PKG_CLASSPATH "${JAVA_PKG_JARDEST}/${jar_basename}"
191 debug-print "installed ${jar} to ${D}${JAVA_PKG_JARDEST}" 280 debug-print "installed ${jar} to ${D}${JAVA_PKG_JARDEST}"
192 # make a symlink to the original jar if it's symlink 281 # make a symlink to the original jar if it's symlink
202 done 291 done
203 292
204 java-pkg_do_write_ 293 java-pkg_do_write_
205} 294}
206 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# ------------------------------------------------------------------------------
207 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}
208 309
209# ------------------------------------------------------------------------------ 310# ------------------------------------------------------------------------------
210# @ebuild-function java-pkg_regjar 311# @ebuild-function java-pkg_regjar
211# 312#
212# Records an already installed jar in the package.env 313# Records an already installed jar in the package.env
243 [[ ${#} -lt 1 ]] && die "at least one argument needed" 344 [[ ${#} -lt 1 ]] && die "at least one argument needed"
244 345
245 java-pkg_init_paths_ 346 java-pkg_init_paths_
246 347
247 local jar jar_dir jar_file 348 local jar jar_dir jar_file
248 for jar in "$@"; do 349 for jar in "${@}"; do
249 # TODO use java-pkg_check-versioned-jar 350 # TODO use java-pkg_check-versioned-jar
250 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
251 # 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:
252 # imagine such call: 359 # imagine such call:
253 # java-pkg_regjar ${D}/opt/java/*.jar 360 # java-pkg_regjar ${D}/opt/java/*.jar
254 # such call will fall into this case (-e ${jar}) and will 361 # such call will fall into this case (-e ${jar}) and will
255 # record paths with ${D} in package.env 362 # record paths with ${D} in package.env
256 java-pkg_append_ JAVA_PKG_CLASSPATH "${jar#${D}}" 363 java-pkg_append_ JAVA_PKG_CLASSPATH "${jar#${D}}"
257 elif [[ -e "${D}${jar}" ]]; then
258 java-pkg_append_ JAVA_PKG_CLASSPATH "${jar#${D}}"
259 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"
260 die "${jar} does not exist" 371 die "${jar} does not exist"
261 fi 372 fi
262 done 373 done
263 374
264 java-pkg_do_write_ 375 java-pkg_do_write_
265} 376}
266
267 377
268# ------------------------------------------------------------------------------ 378# ------------------------------------------------------------------------------
269# @ebuild-function java-pkg_newjar 379# @ebuild-function java-pkg_newjar
270# 380#
271# Installs a jar with a new name 381# Installs a jar with a new name
282 local original_jar="${1}" 392 local original_jar="${1}"
283 local new_jar="${2:-${PN}.jar}" 393 local new_jar="${2:-${PN}.jar}"
284 local new_jar_dest="${T}/${new_jar}" 394 local new_jar_dest="${T}/${new_jar}"
285 395
286 [[ -z ${original_jar} ]] && die "Must specify a jar to install" 396 [[ -z ${original_jar} ]] && die "Must specify a jar to install"
287 [[ ! -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!"
288 399
289 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}"
290 cp "${original_jar}" "${new_jar_dest}" \ 401 cp "${original_jar}" "${new_jar_dest}" \
291 || die "Failed to copy ${original_jar} to ${new_jar_dest}" 402 || die "Failed to copy ${original_jar} to ${new_jar_dest}"
292 java-pkg_dojar "${new_jar_dest}" 403 java-pkg_dojar "${new_jar_dest}"
319# @param $@ - JNI libraries to install 430# @param $@ - JNI libraries to install
320# ------------------------------------------------------------------------------ 431# ------------------------------------------------------------------------------
321java-pkg_doso() { 432java-pkg_doso() {
322 debug-print-function ${FUNCNAME} $* 433 debug-print-function ${FUNCNAME} $*
323 434
324 [[ ${#} -lt 1 ]] && "At least one argument required for ${FUNCNAME}"
325 java-pkg_check-phase install 435 java-pkg_check-phase install
326 436
327 [[ ${#} -lt 1 ]] && die "At least one argument required for ${FUNCNAME}" 437 [[ ${#} -lt 1 ]] && die "${FUNCNAME} requires at least one argument"
328 438
329 java-pkg_init_paths_ 439 java-pkg_init_paths_
330 440
331 local lib 441 local lib
332 # for each lib 442 # for each lib
335 if [[ -e "${lib}" ]] ; then 445 if [[ -e "${lib}" ]] ; then
336 # install if it isn't a symlink 446 # install if it isn't a symlink
337 if [[ ! -L "${lib}" ]] ; then 447 if [[ ! -L "${lib}" ]] ; then
338 INSDESTTREE="${JAVA_PKG_LIBDEST}" \ 448 INSDESTTREE="${JAVA_PKG_LIBDEST}" \
339 INSOPTIONS="${LIBOPTIONS}" \ 449 INSOPTIONS="${LIBOPTIONS}" \
340 doins "${lib}" || "failed to install ${lib}" 450 doins "${lib}" || die "failed to install ${lib}"
341 java-pkg_append_ JAVA_PKG_LIBRARY "${JAVA_PKG_LIBDEST}" 451 java-pkg_append_ JAVA_PKG_LIBRARY "${JAVA_PKG_LIBDEST}"
342 debug-print "Installing ${lib} to ${JAVA_PKG_LIBDEST}" 452 debug-print "Installing ${lib} to ${JAVA_PKG_LIBDEST}"
343 # otherwise make a symlink to the symlink's origin 453 # otherwise make a symlink to the symlink's origin
344 else 454 else
345 # TODO use dosym
346 ln -s "$(readlink "${lib}")" "${D}${JAVA_PKG_LIBDEST}/$(basename "${lib}")" 455 dosym "$(readlink "${lib}")" "${JAVA_PKG_LIBDEST}/${lib##*/}"
347 debug-print "${lib} is a symlink, linking accordanly" 456 debug-print "${lib} is a symlink, linking accordantly"
348 fi 457 fi
349 # otherwise die 458 # otherwise die
350 else 459 else
351 die "${lib} does not exist" 460 die "${lib} does not exist"
352 fi 461 fi
368java-pkg_regso() { 477java-pkg_regso() {
369 debug-print-function ${FUNCNAME} $* 478 debug-print-function ${FUNCNAME} $*
370 479
371 java-pkg_check-phase install 480 java-pkg_check-phase install
372 481
373 [[ ${#} -lt 1 ]] && "at least one argument needed" 482 [[ ${#} -lt 1 ]] && die "${FUNCNAME} requires at least one argument"
374 483
375 java-pkg_init_paths_ 484 java-pkg_init_paths_
376 485
377 local lib target_dir 486 local lib target_dir
378 for lib in "$@" ; do 487 for lib in "$@" ; do
445# ------------------------------------------------------------------------------ 554# ------------------------------------------------------------------------------
446# @ebuild-function java-pkg_dojavadoc 555# @ebuild-function java-pkg_dojavadoc
447# 556#
448# Installs javadoc documentation. This should be controlled by the doc use flag. 557# Installs javadoc documentation. This should be controlled by the doc use flag.
449# 558#
559# @param $1: optional --symlink creates to symlink like this for html
560# documentation bundles.
450# @param $1: - The javadoc root directory. 561# @param $2: - The javadoc root directory.
451# 562#
452# @example: 563# @example:
453# java-pkg_dojavadoc docs/api 564# java-pkg_dojavadoc docs/api
565# java-pkg_dojavadoc --symlink apidocs docs/api
454# 566#
455# ------------------------------------------------------------------------------ 567# ------------------------------------------------------------------------------
456java-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
457 local dir="$1" 578 local dir="$1"
579 local dest=/usr/share/doc/${PF}/html
580
581 # QA checks
458 582
459 java-pkg_check-phase install 583 java-pkg_check-phase install
460 584
461 [[ -z "${dir}" ]] && die "Must specify a directory!" 585 [[ -z "${dir}" ]] && die "Must specify a directory!"
462 [[ ! -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
463 599
464 local dir_to_install="${dir}" 600 local dir_to_install="${dir}"
465 if [[ "$(basename "${dir}")" != "api" ]]; then 601 if [[ "$(basename "${dir}")" != "api" ]]; then
466 dir_to_install="${T}/api" 602 dir_to_install="${T}/api"
467 # TODO use doins 603 # TODO use doins
468 cp -r "${dir}" "${dir_to_install}" || die "cp failed" 604 cp -r "${dir}" "${dir_to_install}" || die "cp failed"
469 fi 605 fi
470 606
607 # Actual installation
608
471 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
472} 618}
473 619
474# ------------------------------------------------------------------------------ 620# ------------------------------------------------------------------------------
475# @ebuild-function java-pkg_dosrc 621# @ebuild-function java-pkg_dosrc
476# 622#
492# FIXME apparently this fails if you give it an empty directories 638# FIXME apparently this fails if you give it an empty directories
493java-pkg_dosrc() { 639java-pkg_dosrc() {
494 debug-print-function ${FUNCNAME} $* 640 debug-print-function ${FUNCNAME} $*
495 641
496 [ ${#} -lt 1 ] && die "At least one argument needed" 642 [ ${#} -lt 1 ] && die "At least one argument needed"
497 if ! hasq source ${IUSE}; then
498 echo "Java QA Notice: ${FUNCNAME} called without source in IUSE"
499 fi
500 643
501 java-pkg_check-phase install 644 java-pkg_check-phase install
502 645
503 [[ ${#} -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
504 652
505 java-pkg_init_paths_ 653 java-pkg_init_paths_
506 654
507 local zip_name="${PN}-src.zip" 655 local zip_name="${PN}-src.zip"
508 local zip_path="${T}/${zip_name}" 656 local zip_path="${T}/${zip_name}"
509 local dir 657 local dir
510 for dir in ${@}; do 658 for dir in "${@}"; do
511 local dir_parent=$(dirname "${dir}") 659 local dir_parent=$(dirname "${dir}")
512 local dir_name=$(basename "${dir}") 660 local dir_name=$(basename "${dir}")
513 pushd ${dir_parent} > /dev/null || die "problem entering ${dir_parent}" 661 pushd ${dir_parent} > /dev/null || die "problem entering ${dir_parent}"
514 zip -q -r ${zip_path} ${dir_name} -i '*.java' 662 zip -q -r ${zip_path} ${dir_name} -i '*.java'
515 local result=$? 663 local result=$?
540# @param $1 - filename of launcher to create 688# @param $1 - filename of launcher to create
541# @param $2 - options, as follows: 689# @param $2 - options, as follows:
542# --main the.main.class.too.start 690# --main the.main.class.too.start
543# --jar /the/jar/too/launch.jar or just <name>.jar 691# --jar /the/jar/too/launch.jar or just <name>.jar
544# --java_args 'Extra arguments to pass to java' 692# --java_args 'Extra arguments to pass to java'
545# --pkg_args 'Extra arguments too pass to the package' 693# --pkg_args 'Extra arguments to pass to the package'
546# --pwd 694# --pwd Directory the launcher changes to before executing java
547# -into 695# -into Directory to install the launcher to, instead of /usr/bin
548# -pre 696# -pre Prepend contents of this file to the launcher
549# ------------------------------------------------------------------------------ 697# ------------------------------------------------------------------------------
550java-pkg_dolauncher() { 698java-pkg_dolauncher() {
551 debug-print-function ${FUNCNAME} $* 699 debug-print-function ${FUNCNAME} $*
552 700
553 java-pkg_check-phase install 701 java-pkg_check-phase install
565 local var_tmp="${T}/launcher_variables_tmp" 713 local var_tmp="${T}/launcher_variables_tmp"
566 local target_dir pre 714 local target_dir pre
567 715
568 # Process the other the rest of the arguments 716 # Process the other the rest of the arguments
569 while [[ -n "${1}" && -n "${2}" ]]; do 717 while [[ -n "${1}" && -n "${2}" ]]; do
570 local var=${1} value=${2} 718 local var="${1}" value="${2}"
571 if [[ "${var:0:2}" == "--" ]]; then 719 if [[ "${var:0:2}" == "--" ]]; then
572 local var=${var:2} 720 local var=${var:2}
573 echo "gjl_${var}=\"${value}\"" >> "${var_tmp}" 721 echo "gjl_${var}=\"${value}\"" >> "${var_tmp}"
574 local gjl_${var}="${value}" 722 local gjl_${var}="${value}"
575 elif [[ "${var}" == "-into" ]]; then 723 elif [[ "${var}" == "-into" ]]; then
594 fi 742 fi
595 fi 743 fi
596 744
597 # Write the actual script 745 # Write the actual script
598 echo "#!/bin/bash" > "${target}" 746 echo "#!/bin/bash" > "${target}"
599 [[ -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
600 echo "gjl_package=${JAVA_PKG_NAME}" >> "${target}" 754 echo "gjl_package=${JAVA_PKG_NAME}" >> "${target}"
601 cat "${var_tmp}" >> "${target}" 755 cat "${var_tmp}" >> "${target}"
602 rm -f "${var_tmp}" 756 rm -f "${var_tmp}"
603 echo "source /usr/share/java-config-2/launcher/launcher.bash" >> "${target}" 757 echo "source /usr/share/java-config-2/launcher/launcher.bash" >> "${target}"
604 758
696# 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
697# java-pkg_jar-from xerces-2 xml-apis.jar xml.jar 851# java-pkg_jar-from xerces-2 xml-apis.jar xml.jar
698# Example: get junit.jar which is needed only for building 852# Example: get junit.jar which is needed only for building
699# java-pkg_jar-from --build-only junit junit.jar 853# java-pkg_jar-from --build-only junit junit.jar
700# 854#
701# @param $1 - (optional) "--build-only" makes the jar(s) not added into 855# @param $opt
702# package.env DEPEND line. 856# --build-only - makes the jar(s) not added into package.env DEPEND line.
703# @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.
704# @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.
705# @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
706# symlink. Defaults to the name of the jar. 867# symlink. Defaults to the name of the jar.
707# ------------------------------------------------------------------------------ 868# ------------------------------------------------------------------------------
708# TODO could probably be cleaned up a little 869# TODO could probably be cleaned up a little
709java-pkg_jar-from() { 870java-pkg_jar-from() {
710 debug-print-function ${FUNCNAME} $* 871 debug-print-function ${FUNCNAME} $*
711 872
712 local build_only="" 873 local build_only=""
874 local destdir="."
875 local deep=""
876 local virtual=""
713 877
878 [[ "${EBUILD_PHASE}" == "test" ]] && build_only="build"
879
880 while [[ "${1}" == --* ]]; do
714 if [[ "${1}" = "--build-only" ]]; then 881 if [[ "${1}" = "--build-only" ]]; then
715 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
716 shift 893 shift
717 fi 894 done
718 895
719 local target_pkg="${1}" target_jar="${2}" destjar="${3}" 896 local target_pkg="${1}" target_jar="${2}" destjar="${3}"
720 897
721 [[ -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
722 903
723 # default destjar to the target jar 904 # default destjar to the target jar
724 [[ -z "${destjar}" ]] && destjar="${target_jar}" 905 [[ -z "${destjar}" ]] && destjar="${target_jar}"
725 906
726 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}."
727 local classpath 908 local classpath
728 classpath="$(java-config --classpath=${target_pkg})" 909 classpath="$(java-config ${deep} --classpath=${target_pkg})"
729 [[ $? != 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}"
730 936
731 local jar 937 local jar
732 for jar in ${classpath//:/ }; do 938 for jar in ${classpath//:/ }; do
733 local jar_name=$(basename "${jar}") 939 local jar_name=$(basename "${jar}")
734 if [[ ! -f "${jar}" ]] ; then 940 if [[ ! -f "${jar}" ]] ; then
745 elif [[ "${jar_name}" == "${target_jar}" ]] ; then 951 elif [[ "${jar_name}" == "${target_jar}" ]] ; then
746 [[ -f "${destjar}" ]] && rm "${destjar}" 952 [[ -f "${destjar}" ]] && rm "${destjar}"
747 ln -snf "${jar}" "${destjar}" \ 953 ln -snf "${jar}" "${destjar}" \
748 || die "Failed to make symlink from ${jar} to ${destjar}" 954 || die "Failed to make symlink from ${jar} to ${destjar}"
749 [[ -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
750 return 0 957 return 0
751 fi 958 fi
752 done 959 done
960 popd > /dev/null
753 # if no target was specified, we're ok 961 # if no target was specified, we're ok
754 if [[ -z "${target_jar}" ]] ; then 962 if [[ -z "${target_jar}" ]] ; then
755 return 0 963 return 0
756 # otherwise, die bitterly 964 # otherwise, die bitterly
757 else 965 else
781# Example: Get the classpath for xerces-2 and xalan, 989# Example: Get the classpath for xerces-2 and xalan,
782# java-pkg_getjars xerces-2,xalan 990# java-pkg_getjars xerces-2,xalan
783# Example Return: 991# Example Return:
784# /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
785# 993#
786# @param $1 - (optional) "--build-only" makes the jar(s) not added into 994# @param $opt
787# 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.
788# @param $2 - list of packages to get jars from 999# @param $1 - list of packages to get jars from
789# (passed to java-config --classpath) 1000# (passed to java-config --classpath)
790# ------------------------------------------------------------------------------ 1001# ------------------------------------------------------------------------------
791java-pkg_getjars() { 1002java-pkg_getjars() {
792 debug-print-function ${FUNCNAME} $* 1003 debug-print-function ${FUNCNAME} $*
793 1004
794 [[ ${#} -lt 1 || ${#} -gt 2 ]] && die "${FUNCNAME} takes only one or two arguments" 1005 local build_only=""
1006 local deep=""
795 1007
1008 [[ "${EBUILD_PHASE}" == "test" ]] && build_only="build"
1009
1010 while [[ "${1}" == --* ]]; do
796 if [[ "${1}" = "--build-only" ]]; then 1011 if [[ "${1}" = "--build-only" ]]; then
797 local 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
798 shift 1018 shift
799 fi 1019 done
800 1020
1021 [[ ${#} -ne 1 ]] && die "${FUNCNAME} takes only one argument besides --*"
1022
1023
801 local classpath pkgs="${1}" 1024 local pkgs="${1}"
1025
1026 if [[ "${EAPI}" == "1" ]]; then
1027 pkgs="${pkgs//:/-}"
1028 fi
1029
802 jars="$(java-config --classpath=${pkgs})" 1030 jars="$(java-config ${deep} --classpath=${pkgs})"
803 [[ -z "${jars}" ]] && die "java-config --classpath=${pkgs} failed" 1031 [[ $? != 0 ]] && die "java-config --classpath=${pkgs} failed"
804 debug-print "${pkgs}:${jars}" 1032 debug-print "${pkgs}:${jars}"
805 1033
806 if [[ -z "${classpath}" ]]; then 1034 for pkg in ${pkgs//,/ }; do
807 classpath="${jars}" 1035 java-pkg_ensure-dep "${build_only}" "${pkg}"
808 else 1036 done
809 classpath="${classpath}:${jars}"
810 fi
811 1037
812 # Only record jars that aren't build-only 1038 # Only record jars that aren't build-only
813 if [[ -z "${build_only}" ]]; then 1039 if [[ -z "${build_only}" ]]; then
814 oldifs="${IFS}"
815 IFS=","
816 for pkg in ${pkgs}; do 1040 for pkg in ${pkgs//,/ }; do
817 java-pkg_record-jar_ "${pkg}" 1041 java-pkg_record-jar_ "${pkg}"
818 done 1042 done
819 IFS="${oldifs}"
820 fi 1043 fi
821 1044
822 echo "${classpath}" 1045 echo "${jars}"
823} 1046}
824 1047
825# ------------------------------------------------------------------------------ 1048# ------------------------------------------------------------------------------
826# @ebuild-function java-pkg_getjar 1049# @ebuild-function java-pkg_getjar
827# 1050#
834# @example 1057# @example
835# java-pkg_getjar xerces-2 xml-apis.jar 1058# java-pkg_getjar xerces-2 xml-apis.jar
836# @example-return 1059# @example-return
837# /usr/share/xerces-2/lib/xml-apis.jar 1060# /usr/share/xerces-2/lib/xml-apis.jar
838# 1061#
839# @param $1 - (optional) "--build-only" makes the jar not added into 1062# @param $opt
840# 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.
841# @param $1 - package to use 1066# @param $1 - package to use
842# @param $2 - jar to get 1067# @param $2 - jar to get
843# ------------------------------------------------------------------------------ 1068# ------------------------------------------------------------------------------
844java-pkg_getjar() { 1069java-pkg_getjar() {
845 debug-print-function ${FUNCNAME} $* 1070 debug-print-function ${FUNCNAME} $*
846 1071
847 local build_only="" 1072 local build_only=""
1073 local virtual=""
848 1074
1075 [[ "${EBUILD_PHASE}" == "test" ]] && build_only="build"
1076
1077 while [[ "${1}" == --* ]]; do
849 if [[ "${1}" = "--build-only" ]]; then 1078 if [[ "${1}" = "--build-only" ]]; then
850 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
851 shift 1085 shift
852 fi 1086 done
1087
1088 [[ ${#} -ne 2 ]] && die "${FUNCNAME} takes only two arguments besides --*"
853 1089
854 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
855 [[ -z ${pkg} ]] && die "Must specify package to get a jar from" 1096 [[ -z ${pkg} ]] && die "Must specify package to get a jar from"
856 [[ -z ${target_jar} ]] && die "Must specify jar to get" 1097 [[ -z ${target_jar} ]] && die "Must specify jar to get"
857 1098
858 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?"
859 local classpath 1100 local classpath
860 classpath=$(java-config --classpath=${pkg}) 1101 classpath=$(java-config --classpath=${pkg})
861 [[ $? != 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
862 1112
863 for jar in ${classpath//:/ }; do 1113 for jar in ${classpath//:/ }; do
864 if [[ ! -f "${jar}" ]] ; then 1114 if [[ ! -f "${jar}" ]] ; then
865 die "Installation problem with jar ${jar} in ${pkg} - is it installed?" 1115 die "Installation problem with jar ${jar} in ${pkg} - is it installed?"
866 fi 1116 fi
873 fi 1123 fi
874 done 1124 done
875 1125
876 die "Could not find ${target_jar} in ${pkg}" 1126 die "Could not find ${target_jar} in ${pkg}"
877 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_
878} 1263}
879 1264
880# 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
881# populate jars from the filesystem. 1266# populate jars from the filesystem.
882# 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
923# 1308#
924# Various other functions to use from an ebuild 1309# Various other functions to use from an ebuild
925# ------------------------------------------------------------------------------ 1310# ------------------------------------------------------------------------------
926 1311
927# ------------------------------------------------------------------------------ 1312# ------------------------------------------------------------------------------
928# @ebuild-function java-pkg_need 1313# @ebuild-function java-pkg_find-normal-jars
929# 1314#
930# Adds virtual dependencies, which can optionally be controlled by a USE flag. 1315# Find the files with suffix .jar file in the given directory or $WORKDIR
931# Currently supported virtuals are:
932# javamail
933# jdbc-stdext
934# jaf
935# jdbc-rowset
936# jms
937# 1316#
938# @param $1 - Optionally indicate that the dependencies are controlled by 1317# @param $1 - The directory to search for jar files (default: ${WORKDIR})
939# a use flag by specifying '--use' Requires $2.
940# @param $2 - USE flag which will enable the dependencies.
941# @param $@ - virtual packages to add depenedencies for
942# ------------------------------------------------------------------------------ 1318# ------------------------------------------------------------------------------
943# TODO rewrite to parse a line based declaration file instead -- karltk 1319java-pkg_find-normal-jars() {
944#java-pkg_need() { 1320 local dir=$1
945# debug-print-function ${FUNCNAME} $* 1321 [[ "${dir}" ]] || dir="${WORKDIR}"
946# local useflag 1322 local found
947# if [[ ${1} == "--use" ]]; then 1323 for jar in $(find "${dir}" -name "*.jar" -type f); do
948# useflag="${2}" 1324 echo "${jar}"
949# shift 2 1325 found="true"
950# fi
951#
952# if [[ -z ${1} ]]; then
953# die "Must specify at least one virtual package."
954# fi
955#
956# local depstr newdepstr
957#
958# for virtual in ${@}; do
959# if has ${virtual} ${JAVA_PKG_VNEED}; then
960# debug-print "Already registered virtual ${virtual}"
961# continue
962# fi
963# case ${virtual} in
964# javamail)
965# debug-print "java-pkg_need: adding javamail dependencies"
966# newdepstr="|| ( dev-java/gnu-javamail dev-java/sun-javamail-bin )"
967# ;;
968# jdbc-stdext)
969# debug-print "java-pkg_need: adding jdbc-stdext dependencies"
970# newdepstr="|| ( >=virtual/jdk-1.4 dev-java/jdbc2-stdext )"
971# ;;
972# jaf)
973# debug-print "java-pkg_need: adding jaf dependencies"
974# newdepstr="|| ( dev-java/gnu-jaf dev-java/sun-jaf-bin )"
975# ;;
976# jdbc-rowset)
977# debug-print "java-pkg_need: adding jdbc-rowset dependencies"
978# newdepstr="|| ( >=virtual/jdk-1.5 dev-java/sun-jdbc-rowset )"
979# ;;
980# jms)
981# debug-print "java-pkg_need: adding jms dependencies"
982# newdepstr="|| ( dev-java/sun-jms dev-java/openjms )"
983# ;;
984# *)
985# die "Invalid virtual: ${virtual}"
986# esac
987#
988# export JAVA_PKG_VNEED="${JAVA_PKG_VNEED} ${virtual}"
989#
990# if [[ -n ${useflag} ]]; then
991# depstr="${depstr} ${useflag}? ( ${newdepstr} )"
992# else
993# depstr="${depstr} ${newdepstr}"
994# fi
995# done 1326 done
996# 1327 [[ "${found}" ]]
997# [[ -z ${JAVA_PKG_NV_DEPEND} ]] && export JAVA_PKG_NV_DEPEND="${DEPEND}" 1328 return $?
998# [[ -z ${JAVA_PKG_NV_RDEPEND} ]] && export JAVA_PKG_NV_RDEPEND="${RDEPEND}" 1329}
999#
1000# export DEPEND="${DEPEND} ${depstr}"
1001# export RDEPEND="${RDEPEND} ${depstr}"
1002#}
1003 1330
1331# ------------------------------------------------------------------------------
1332# @ebuild-function java-pkg_ensure-no-bundled-jars
1333#
1334# Try to locate bundled jar files in ${WORKDIR} and die if found.
1004# This should be used after S has been populated with symlinks to jars 1335# This function should be called after WORKDIR has been populated with symlink
1005# TODO document 1336# to system jar files or bundled jars removed.
1337# ------------------------------------------------------------------------------
1006java-pkg_ensure-no-bundled-jars() { 1338java-pkg_ensure-no-bundled-jars() {
1007 debug-print-function ${FUNCNAME} $* 1339 debug-print-function ${FUNCNAME} $*
1008 pushd ${WORKDIR} >/dev/null 2>/dev/null
1009 1340
1010 local bundled_jars=$(find . -name "*.jar" -type f) 1341 local bundled_jars=$(java-pkg_find-normal-jars)
1011 if [[ -n ${bundled_jars} ]]; then 1342 if [[ -n ${bundled_jars} ]]; then
1012 echo "Bundled jars found:" 1343 echo "Bundled jars found:"
1013 local jar 1344 local jar
1014 for jar in ${bundled_jars}; do 1345 for jar in ${bundled_jars}; do
1015 echo $(pwd)${jar/./} 1346 echo $(pwd)${jar/./}
1016 done 1347 done
1017 die "Bundled jars found!" 1348 die "Bundled jars found!"
1018
1019 fi 1349 fi
1020 popd >/dev/null 2>/dev/null
1021} 1350}
1022 1351
1023# ------------------------------------------------------------------------------ 1352# ------------------------------------------------------------------------------
1024# @internal-function java-pkg_ensure-vm-version-sufficient 1353# @internal-function java-pkg_ensure-vm-version-sufficient
1025# 1354#
1174# @ebuild-function java-pkg_get-target 1503# @ebuild-function java-pkg_get-target
1175# 1504#
1176# Determines what target version should be used, for passing to -target. 1505# Determines what target version should be used, for passing to -target.
1177# If you don't care about lower versions, you can set _WANT_TARGET to the 1506# If you don't care about lower versions, you can set _WANT_TARGET to the
1178# version of your JDK. 1507# version of your JDK.
1179# Remember doing this will mostly like cause things to break.
1180# Doesn't allow it to be lower then the one in depend.
1181# Doesn't allow it to be higher then the active vm.
1182# 1508#
1183# @return string - Either the lowest possible target, or JAVA_PKG_WANT_TARGET 1509# @return string - Either the lowest possible target, or JAVA_PKG_WANT_TARGET
1184# ------------------------------------------------------------------------------ 1510# ------------------------------------------------------------------------------
1185java-pkg_get-target() { 1511java-pkg_get-target() {
1186 local min=$(depend-java-query --get-lowest "${DEPEND} ${RDEPEND}")
1187 if [[ -n "${JAVA_PKG_WANT_TARGET}" ]]; then
1188 local max="$(java-config --select-vm "${GENTOO_VM}" -g PROVIDES_VERSION)"
1189 if version_is_at_least "${min}" "${JAVA_PKG_WANT_TARGET}" && version_is_at_least "${JAVA_PKG_WANT_TARGET}" "${max}"; then
1190 echo ${JAVA_PKG_WANT_TARGET}
1191 else
1192 echo ${min}
1193 fi
1194 else
1195 echo ${min}
1196 fi
1197
1198 #echo ${JAVA_PKG_WANT_TARGET:-$(depend-java-query --get-lowest "${DEPEND}")} 1512 echo ${JAVA_PKG_WANT_TARGET:-$(depend-java-query --get-lowest "${DEPEND} ${RDEPEND}")}
1199} 1513}
1200 1514
1201java-pkg_get-javac() { 1515java-pkg_get-javac() {
1202 debug-print-function ${FUNCNAME} $* 1516 debug-print-function ${FUNCNAME} $*
1203 1517
1292 die "No GCJ support found!" 1606 die "No GCJ support found!"
1293 fi 1607 fi
1294} 1608}
1295 1609
1296java-pkg_ensure-test() { 1610java-pkg_ensure-test() {
1297 if hasq test ${FEATURES} && ! hasq -test ${FEATURES} && ! use test; then 1611 if hasq test ${FEATURES} && ! hasq -test ${FEATURES} \
1612 && hasq test ${IUSE} && ! use test;
1613 then
1298 eerror "You specified FEATURES=test, but USE=test is needed" 1614 eerror "You specified FEATURES=test, but USE=test is needed"
1299 eerror "to pull in the additional dependencies for testing" 1615 eerror "to pull in the additional dependencies for testing"
1300 die "Need USE=test enabled" 1616 die "Need USE=test enabled"
1301 fi 1617 fi
1302} 1618}
1303 1619
1304# ------------------------------------------------------------------------------ 1620# ------------------------------------------------------------------------------
1621# @ebuild-function java-pkg_register-ant-task
1622#
1623# Register this package as ant task, so that ant will load it when no specific
1624# ANT_TASKS are specified. Note that even without this registering, all packages
1625# specified in ANT_TASKS will be loaded. Mostly used by the actual ant tasks
1626# packages, but can be also used by other ebuilds that used to symlink their
1627# .jar into /usr/share/ant-core/lib to get autoloaded, for backwards
1628# compatibility.
1629#
1630# @param --version x.y Register only for ant version x.y (otherwise for any ant
1631# version). Used by the ant-* packages to prevent loading of mismatched
1632# ant-core ant tasks after core was updated, before the tasks are updated,
1633# without a need for blockers.
1634# @param $1 Name to register as. Defaults to JAVA_PKG_NAME ($PN[-$SLOT])
1635# ------------------------------------------------------------------------------
1636java-pkg_register-ant-task() {
1637 local TASKS_DIR="tasks"
1638
1639 # check for --version x.y parameters
1640 while [[ -n "${1}" && -n "${2}" ]]; do
1641 local var="${1#--}"
1642 local val="${2}"
1643 if [[ "${var}" == "version" ]]; then
1644 TASKS_DIR="tasks-${val}"
1645 else
1646 die "Unknown parameter passed to java-pkg_register-ant-tasks: ${1} ${2}"
1647 fi
1648 shift 2
1649 done
1650
1651 local TASK_NAME="${1:-${JAVA_PKG_NAME}}"
1652
1653 dodir /usr/share/ant/${TASKS_DIR}
1654 touch "${D}/usr/share/ant/${TASKS_DIR}/${TASK_NAME}"
1655}
1656
1657# ------------------------------------------------------------------------------
1658# @internal-function java-pkg_ant-tasks-depend
1659#
1660# Translates the WANT_ANT_TASKS variable into valid dependencies.
1661# ------------------------------------------------------------------------------
1662java-pkg_ant-tasks-depend() {
1663 debug-print-function ${FUNCNAME} ${WANT_ANT_TASKS}
1664
1665 if [[ -n "${WANT_ANT_TASKS}" ]]; then
1666 local DEP=""
1667 for i in ${WANT_ANT_TASKS}
1668 do
1669 if [[ ${i} = ant-* ]]; then
1670 DEP="${DEP}dev-java/${i} "
1671 elif [[ ${i} = */*:* ]]; then
1672 DEP="${DEP}${i} "
1673 else
1674 echo "Invalid atom in WANT_ANT_TASKS: ${i}"
1675 return 1
1676 fi
1677 done
1678 echo ${DEP}
1679 return 0
1680 else
1681 return 0
1682 fi
1683}
1684
1685# ------------------------------------------------------------------------------
1686# @ebuild-function ejunit
1687#
1688# Junit wrapper function. Makes it easier to run the tests and checks for
1689# dev-java/junit in DEPEND. Launches the tests using junit.textui.TestRunner.
1690#
1691# Examples:
1692# ejunit -cp build/classes org.blinkenlights.jid3.test.AllTests
1693# ejunit org.blinkenlights.jid3.test.AllTests
1694#
1695# @param $1 - -cp or -classpath
1696# @param $2 - classpath; junit and recorded dependencies get appended
1697# @param $@ - the rest of the parameters are passed to java
1698# ------------------------------------------------------------------------------
1699ejunit() {
1700 debug-print-function ${FUNCNAME} $*
1701
1702 local pkgs
1703 if [[ -f ${JAVA_PKG_DEPEND_FILE} ]]; then
1704 for atom in $(cat ${JAVA_PKG_DEPEND_FILE} | tr : ' '); do
1705 pkgs=${pkgs},$(echo ${atom} | sed -re "s/^.*@//")
1706 done
1707 fi
1708
1709 local cp=$(java-pkg_getjars --with-dependencies junit${pkgs})
1710 if [[ ${1} = -cp || ${1} = -classpath ]]; then
1711 cp="${2}:${cp}"
1712 shift 2
1713 else
1714 cp=".:${cp}"
1715 fi
1716
1717 local runner=junit.textui.TestRunner
1718 debug-print "Calling: java -cp \"${cp}\" -Djava.awt.headless=true ${runner} ${@}"
1719 java -cp "${cp}" -Djava.awt.headless=true ${runner} "${@}" || die "Running junit failed"
1720}
1721
1722# ------------------------------------------------------------------------------
1305# @section-end helper 1723# @section-end helper
1306# ------------------------------------------------------------------------------ 1724# ------------------------------------------------------------------------------
1725
1726# ------------------------------------------------------------------------------
1727# @eclass-src_prepare
1728#
1729# src_prepare Searches for bundled jars
1730# Don't call directly, but via java-pkg-2_src_prepare!
1731# ------------------------------------------------------------------------------
1732
1733java-utils-2_src_prepare() {
1734 [[ ${EBUILD_PHASE} == prepare ]] &&
1735 java-pkg_func-exists java_prepare && java_prepare
1736
1737 # Remember that eant will call this unless called via Portage
1738 if [[ ! -e "${T}/java-utils-2_src_prepare-run" ]] && is-java-strict; then
1739 echo "Searching for bundled jars:"
1740 java-pkg_find-normal-jars || echo "None found."
1741 echo "Searching for bundled classes (no output if none found):"
1742 find "${WORKDIR}" -name "*.class"
1743 echo "Search done."
1744 fi
1745 touch "${T}/java-utils-2_src_prepare-run"
1746}
1747
1748# ------------------------------------------------------------------------------
1749# @eclass-pkg_preinst
1750#
1751# pkg_preinst Searches for missing and unneeded dependencies
1752# Don't call directly, but via java-pkg-2_pkg_preinst!
1753# ------------------------------------------------------------------------------
1754
1755java-utils-2_pkg_preinst() {
1756 if is-java-strict; then
1757 if has_version dev-java/java-dep-check; then
1758 [[ -e "${JAVA_PKG_ENV}" ]] || return
1759 local output=$(GENTOO_VM= java-dep-check --image "${D}" "${JAVA_PKG_ENV}")
1760 if [[ ${output} && has_version <=dev-java/java-dep-check-0.2 ]]; then
1761 ewarn "Possibly unneeded dependencies found in package.env:"
1762 for dep in ${output}; do
1763 ewarn "\t${dep}"
1764 done
1765 fi
1766 if [[ ${output} && has_version >dev-java/java-dep-check-0.2 ]]; then
1767 ewarn "${output}"
1768 fi
1769 else
1770 eerror "Install dev-java/java-dep-check for dependency checking"
1771 fi
1772 fi
1773}
1307 1774
1308# ------------------------------------------------------------------------------ 1775# ------------------------------------------------------------------------------
1309# @section-begin build 1776# @section-begin build
1310# @section-summary Build functions 1777# @section-summary Build functions
1311# 1778#
1315 1782
1316# ------------------------------------------------------------------------------ 1783# ------------------------------------------------------------------------------
1317# @ebuild-function eant 1784# @ebuild-function eant
1318# 1785#
1319# Ant wrapper function. Will use the appropriate compiler, based on user-defined 1786# Ant wrapper function. Will use the appropriate compiler, based on user-defined
1320# compiler. 1787# compiler. Will also set proper ANT_TASKS from the variable ANT_TASKS,
1321# 1788# variables:
1789# EANT_GENTOO_CLASSPATH - calls java-pkg_getjars for the value and adds to the
1790# gentoo.classpath property. Be sure to call
1791# java-ant_rewrite-classpath in src_unpack.
1792# EANT_NEEDS_TOOLS - add tools.jar to the gentoo.classpath. Should only be used
1793# for build-time purposes, the dependency is not recorded to
1794# package.env!
1795# JAVA_PKG_NO_BUNDLED_SEARCH - Don't search for bundled jars or class files
1796# *ANT_TASKS - used to determine ANT_TASKS before calling Ant.
1322# ------------------------------------------------------------------------------ 1797# ------------------------------------------------------------------------------
1323eant() { 1798eant() {
1324 debug-print-function ${FUNCNAME} $* 1799 debug-print-function ${FUNCNAME} $*
1325 1800
1326 # FIXME get this working 1801 if [[ ${EBUILD_PHASE} = compile ]]; then
1327# if is-java-strict && [[ ! ${DEPEND} =~ "dev-java/ant" ]]; then 1802 java-ant-2_src_configure
1803 java-utils-2_src_prepare
1804 fi
1805
1806 if ! hasq java-ant-2 ${INHERITED}; then
1807 local msg="You should inherit java-ant-2 when using eant"
1328# java-pkg_announce-qa-violation \ 1808 java-pkg_announce-qa-violation "${msg}"
1329# "Using eant, but not depending on dev-java/ant or dev-java/ant-core"
1330# fi 1809 fi
1331 1810
1332 local antflags 1811 local antflags="-Dnoget=true -Dmaven.mode.offline=true -Dbuild.sysclasspath=ignore"
1812
1333 java-pkg_init-compiler_ 1813 java-pkg_init-compiler_
1334 local compiler="${GENTOO_COMPILER}" 1814 local compiler="${GENTOO_COMPILER}"
1335 1815
1336 local compiler_env="${JAVA_PKG_COMPILER_DIR}/${compiler}" 1816 local compiler_env="${JAVA_PKG_COMPILER_DIR}/${compiler}"
1337
1338 local build_compiler="$(source ${compiler_env} 1>/dev/null 2>&1; echo ${ANT_BUILD_COMPILER})" 1817 local build_compiler="$(source ${compiler_env} 1>/dev/null 2>&1; echo ${ANT_BUILD_COMPILER})"
1339 if [[ "${compiler}" != "javac" && -z "${build_compiler}" ]]; then 1818 if [[ "${compiler}" != "javac" && -z "${build_compiler}" ]]; then
1340 die "ANT_BUILD_COMPILER undefined in ${compiler_env}" 1819 die "ANT_BUILD_COMPILER undefined in ${compiler_env}"
1341 fi 1820 fi
1342 1821
1343 if [[ ${compiler} != "javac" ]]; then 1822 if [[ ${compiler} != "javac" ]]; then
1344 antflags="-Dbuild.compiler=${build_compiler}" 1823 antflags="${antflags} -Dbuild.compiler=${build_compiler}"
1345 # Figure out any extra stuff to put on the classpath for compilers aside 1824 # Figure out any extra stuff to put on the classpath for compilers aside
1346 # from javac 1825 # from javac
1347 # ANT_BUILD_COMPILER_DEPS should be something that could be passed to 1826 # ANT_BUILD_COMPILER_DEPS should be something that could be passed to
1348 # java-config -p 1827 # java-config -p
1349 local build_compiler_deps="$(source ${JAVA_PKG_COMPILER_DIR}/${compiler} 1>/dev/null 2>&1; echo ${ANT_BUILD_COMPILER_DEPS})" 1828 local build_compiler_deps="$(source ${JAVA_PKG_COMPILER_DIR}/${compiler} 1>/dev/null 2>&1; echo ${ANT_BUILD_COMPILER_DEPS})"
1350 if [[ -n ${build_compiler_deps} ]]; then 1829 if [[ -n ${build_compiler_deps} ]]; then
1351 antflags="${antflags} -lib $(java-config -p ${build_compiler_deps})" 1830 antflags="${antflags} -lib $(java-config -p ${build_compiler_deps})"
1352 fi 1831 fi
1353 fi 1832 fi
1354 1833
1834 for arg in "${@}"; do
1835 if [[ ${arg} = -lib ]]; then
1355 if is-java-strict; then 1836 if is-java-strict; then
1356 einfo "Disabling system classpath for ant" 1837 eerror "You should not use the -lib argument to eant because it will fail"
1357 antflags="${antflags} -Dbuild.sysclasspath=ignore" 1838 eerror "with JAVA_PKG_STRICT. Please use for example java-pkg_jar-from"
1839 eerror "or ant properties to make dependencies available."
1840 eerror "For ant tasks use WANT_ANT_TASKS or ANT_TASKS from."
1841 eerror "split ant (>=dev-java/ant-core-1.7)."
1842 die "eant -lib is deprecated/forbidden"
1843 else
1844 echo "eant -lib is deprecated. Turn JAVA_PKG_STRICT on for"
1845 echo "more info."
1846 fi
1358 fi 1847 fi
1848 done
1359 1849
1360 if [[ -n ${JAVA_PKG_DEBUG} ]]; then 1850 # parse WANT_ANT_TASKS for atoms
1361 antflags="${antflags} -debug" 1851 local want_ant_tasks
1852 for i in ${WANT_ANT_TASKS}; do
1853 if [[ ${i} = */*:* ]]; then
1854 i=${i#*/}
1855 i=${i%:0}
1856 want_ant_tasks+="${i/:/-} "
1857 else
1858 want_ant_tasks+="${i} "
1859 fi
1860 done
1861 # default ANT_TASKS to WANT_ANT_TASKS, if ANT_TASKS is not set explicitly
1862 ANT_TASKS="${ANT_TASKS:-${want_ant_tasks% }}"
1863
1864 # override ANT_TASKS with JAVA_PKG_FORCE_ANT_TASKS if it's set
1865 ANT_TASKS="${JAVA_PKG_FORCE_ANT_TASKS:-${ANT_TASKS}}"
1866
1867 # if ant-tasks is not set by ebuild or forced, use none
1868 ANT_TASKS="${ANT_TASKS:-none}"
1869
1870 # at this point, ANT_TASKS should be "all", "none" or explicit list
1871 if [[ "${ANT_TASKS}" == "all" ]]; then
1872 einfo "Using all available ANT_TASKS"
1873 elif [[ "${ANT_TASKS}" == "none" ]]; then
1874 einfo "Disabling all optional ANT_TASKS"
1875 else
1876 einfo "Using following ANT_TASKS: ${ANT_TASKS}"
1877 fi
1878
1879 export ANT_TASKS
1880
1881 [[ -n ${JAVA_PKG_DEBUG} ]] && antflags="${antflags} --execdebug -debug"
1882 [[ -n ${PORTAGE_QUIET} ]] && antflags="${antflags} -q"
1883
1884 local gcp="${EANT_GENTOO_CLASSPATH}"
1885 local getjarsarg=""
1886
1887 if [[ ${EBUILD_PHASE} = "test" ]]; then
1888 antflags="${antflags} -DJunit.present=true"
1889 [[ ${ANT_TASKS} = *ant-junit* ]] && gcp="${gcp} junit"
1890 getjarsarg="--with-dependencies"
1891 fi
1892
1893 local cp
1894
1895 for atom in ${gcp}; do
1896 cp="${cp}:$(java-pkg_getjars ${getjarsarg} ${atom})"
1897 done
1898
1899 [[ -n "${EANT_NEEDS_TOOLS}" ]] && cp="${cp}:$(java-config --tools)"
1900
1901 if [[ ${cp} ]]; then
1902 # It seems ant does not like single quotes around ${cp}
1903 cp=${cp#:}
1904 [[ ${EANT_GENTOO_CLASSPATH_EXTRA} ]] && \
1905 cp="${cp}:${EANT_GENTOO_CLASSPATH_EXTRA}"
1906 antflags="${antflags} -Dgentoo.classpath=\"${cp}\""
1362 fi 1907 fi
1363 1908
1364 [[ -n ${JAVA_PKG_DEBUG} ]] && echo ant ${antflags} "${@}" 1909 [[ -n ${JAVA_PKG_DEBUG} ]] && echo ant ${antflags} "${@}"
1910 debug-print "Calling ant (GENTOO_VM: ${GENTOO_VM}): ${antflags} ${@}"
1365 ant ${antflags} "${@}" || die "eant failed" 1911 ant ${antflags} "${@}" || die "eant failed"
1366
1367} 1912}
1368 1913
1369# ------------------------------------------------------------------------------ 1914# ------------------------------------------------------------------------------
1370# @ebuild-function ejavac 1915# @ebuild-function ejavac
1371# 1916#
1440# ------------------------------------------------------------------------------ 1985# ------------------------------------------------------------------------------
1441use_doc() { 1986use_doc() {
1442 use doc && echo ${@:-javadoc} 1987 use doc && echo ${@:-javadoc}
1443} 1988}
1444 1989
1990
1445# ------------------------------------------------------------------------------ 1991# ------------------------------------------------------------------------------
1446# @section-end build 1992# @section-end build
1447# ------------------------------------------------------------------------------ 1993# ------------------------------------------------------------------------------
1448 1994
1449# ------------------------------------------------------------------------------ 1995# ------------------------------------------------------------------------------
1465# This shouldn't be used directly. Instead, java-pkg and java-pkg-opt will 2011# This shouldn't be used directly. Instead, java-pkg and java-pkg-opt will
1466# call it during each of the phases of the merge process. 2012# call it during each of the phases of the merge process.
1467# 2013#
1468# ----------------------------------------------------------------------------- 2014# -----------------------------------------------------------------------------
1469java-pkg_init() { 2015java-pkg_init() {
2016 debug-print-function ${FUNCNAME} $*
1470 unset JAVAC 2017 unset JAVAC
1471 unset JAVA_HOME 2018 unset JAVA_HOME
2019
2020 java-config --help >/dev/null || {
2021 eerror ""
2022 eerror "Can't run java-config --help"
2023 eerror "Have you upgraded python recently but haven't"
2024 eerror "run python-updater yet?"
2025 die "Can't run java-config --help"
2026 }
2027
2028 # People do all kinds of weird things.
2029 # http://forums.gentoo.org/viewtopic-p-3943166.html
2030 local silence="${SILENCE_JAVA_OPTIONS_WARNING}"
2031 local accept="${I_WANT_GLOBAL_JAVA_OPTIONS}"
2032 if [[ -n ${_JAVA_OPTIONS} && -z ${accept} && -z ${silence} ]]; then
2033 ewarn "_JAVA_OPTIONS changes what java -version outputs at least for"
2034 ewarn "sun-jdk vms and and as such break configure scripts that"
2035 ewarn "use it (for example app-office/openoffice) so we filter it out."
2036 ewarn "Use SILENCE_JAVA_OPTIONS_WARNING=true in the environment (use"
2037 ewarn "make.conf for example) to silence this warning or"
2038 ewarn "I_WANT_GLOBAL_JAVA_OPTIONS to not filter it."
2039 fi
2040
2041 if [[ -z ${accept} ]]; then
2042 # export _JAVA_OPTIONS= doesn't work because it will show up in java
2043 # -version output
2044 unset _JAVA_OPTIONS
2045 # phase hooks make this run many times without this
2046 I_WANT_GLOBAL_JAVA_OPTIONS="true"
2047 fi
2048
2049 if java-pkg_func-exists ant_src_unpack; then
2050 java-pkg_announce-qa-violation "Using old ant_src_unpack. Should be src_unpack"
2051 fi
2052
1472 java-pkg_init_paths_ 2053 java-pkg_init_paths_
1473 java-pkg_switch-vm 2054 java-pkg_switch-vm
1474 PATH=${JAVA_HOME}/bin:${PATH} 2055 PATH=${JAVA_HOME}/bin:${PATH}
1475 2056
1476 # TODO we will probably want to set JAVAC and JAVACFLAGS 2057 # TODO we will probably want to set JAVAC and JAVACFLAGS
1477 2058
1478 # Do some QA checks 2059 # Do some QA checks
1479 java-pkg_check-jikes 2060 java-pkg_check-jikes
2061
2062 # Can't use unset here because Portage does not save the unset
2063 # see https://bugs.gentoo.org/show_bug.cgi?id=189417#c11
1480 2064
1481 # When users have crazy classpaths some packages can fail to compile. 2065 # When users have crazy classpaths some packages can fail to compile.
1482 # and everything should work with empty CLASSPATH. 2066 # and everything should work with empty CLASSPATH.
1483 # This also helps prevent unexpected dependencies on random things 2067 # This also helps prevent unexpected dependencies on random things
1484 # from the CLASSPATH. 2068 # from the CLASSPATH.
1485 unset CLASSPATH 2069 export CLASSPATH=
2070
2071 # Unset external ANT_ stuff
2072 export ANT_TASKS=
2073 export ANT_OPTS=
2074 export ANT_RESPECT_JAVA_HOME=
1486} 2075}
1487 2076
1488# ------------------------------------------------------------------------------ 2077# ------------------------------------------------------------------------------
1489# @function-internal java-pkg-init-compiler_ 2078# @function-internal java-pkg-init-compiler_
1490# 2079#
1581 done 2170 done
1582 2171
1583 # If it hasn't been defined already, default to javac 2172 # If it hasn't been defined already, default to javac
1584 if [[ -z ${GENTOO_COMPILER} ]]; then 2173 if [[ -z ${GENTOO_COMPILER} ]]; then
1585 if [[ -n ${compilers} ]]; then 2174 if [[ -n ${compilers} ]]; then
1586 einfo "No suitable compiler found: defaulting javac for compilation" 2175 einfo "No suitable compiler found: defaulting to JDK default for compilation"
1587 else 2176 else
1588 # probably don't need to notify users about the default. 2177 # probably don't need to notify users about the default.
1589 :;#einfo "Defaulting to javac for compilation" 2178 :;#einfo "Defaulting to javac for compilation"
1590 fi 2179 fi
2180 if java-config -g GENTOO_COMPILER 2> /dev/null; then
2181 export GENTOO_COMPILER=$(java-config -g GENTOO_COMPILER)
2182 else
1591 export GENTOO_COMPILER=javac 2183 export GENTOO_COMPILER=javac
2184 fi
1592 else 2185 else
1593 einfo "Using ${GENTOO_COMPILER} for compilation" 2186 einfo "Using ${GENTOO_COMPILER} for compilation"
1594 fi 2187 fi
1595 2188
1596} 2189}
1612 fi 2205 fi
1613 2206
1614 JAVA_PKG_SHAREPATH="${DESTTREE}/share/${JAVA_PKG_NAME}" 2207 JAVA_PKG_SHAREPATH="${DESTTREE}/share/${JAVA_PKG_NAME}"
1615 JAVA_PKG_SOURCESPATH="${JAVA_PKG_SHAREPATH}/sources/" 2208 JAVA_PKG_SOURCESPATH="${JAVA_PKG_SHAREPATH}/sources/"
1616 JAVA_PKG_ENV="${D}${JAVA_PKG_SHAREPATH}/package.env" 2209 JAVA_PKG_ENV="${D}${JAVA_PKG_SHAREPATH}/package.env"
2210 JAVA_PKG_VIRTUALS_PATH="${DESTTREE}/share/java-config-2/virtuals"
2211 JAVA_PKG_VIRTUAL_PROVIDER="${D}/${JAVA_PKG_VIRTUALS_PATH}/${JAVA_PKG_NAME}"
1617 2212
1618 [[ -z "${JAVA_PKG_JARDEST}" ]] && JAVA_PKG_JARDEST="${JAVA_PKG_SHAREPATH}/lib" 2213 [[ -z "${JAVA_PKG_JARDEST}" ]] && JAVA_PKG_JARDEST="${JAVA_PKG_SHAREPATH}/lib"
1619 [[ -z "${JAVA_PKG_LIBDEST}" ]] && JAVA_PKG_LIBDEST="${DESTTREE}/$(get_libdir)/${JAVA_PKG_NAME}" 2214 [[ -z "${JAVA_PKG_LIBDEST}" ]] && JAVA_PKG_LIBDEST="${DESTTREE}/$(get_libdir)/${JAVA_PKG_NAME}"
1620 [[ -z "${JAVA_PKG_WARDEST}" ]] && JAVA_PKG_WARDEST="${JAVA_PKG_SHAREPATH}/webapps" 2215 [[ -z "${JAVA_PKG_WARDEST}" ]] && JAVA_PKG_WARDEST="${JAVA_PKG_SHAREPATH}/webapps"
1621 2216
1634# Writes the package.env out to disk. 2229# Writes the package.env out to disk.
1635# 2230#
1636# ------------------------------------------------------------------------------ 2231# ------------------------------------------------------------------------------
1637# TODO change to do-write, to match everything else 2232# TODO change to do-write, to match everything else
1638java-pkg_do_write_() { 2233java-pkg_do_write_() {
2234 debug-print-function ${FUNCNAME} $*
1639 java-pkg_init_paths_ 2235 java-pkg_init_paths_
1640 # Create directory for package.env 2236 # Create directory for package.env
1641 dodir "${JAVA_PKG_SHAREPATH}" 2237 dodir "${JAVA_PKG_SHAREPATH}"
1642 if [[ -n "${JAVA_PKG_CLASSPATH}" || -n "${JAVA_PKG_LIBRARY}" || -f "${JAVA_PKG_DEPEND}" ]]; then 2238 if [[ -n "${JAVA_PKG_CLASSPATH}" || -n "${JAVA_PKG_LIBRARY}" || -f \
2239 "${JAVA_PKG_DEPEND_FILE}" || -f \
2240 "${JAVA_PKG_OPTIONAL_DEPEND_FILE}" ]]; then
1643 # Create package.env 2241 # Create package.env
1644 ( 2242 (
1645 echo "DESCRIPTION=\"${DESCRIPTION}\"" 2243 echo "DESCRIPTION=\"${DESCRIPTION}\""
1646 echo "GENERATION=\"2\"" 2244 echo "GENERATION=\"2\""
2245 echo "SLOT=\"${SLOT}\""
1647 2246
1648 [[ -n "${JAVA_PKG_CLASSPATH}" ]] && echo "CLASSPATH=\"${JAVA_PKG_CLASSPATH}\"" 2247 [[ -n "${JAVA_PKG_CLASSPATH}" ]] && echo "CLASSPATH=\"${JAVA_PKG_CLASSPATH}\""
1649 [[ -n "${JAVA_PKG_LIBRARY}" ]] && echo "LIBRARY_PATH=\"${JAVA_PKG_LIBRARY}\"" 2248 [[ -n "${JAVA_PKG_LIBRARY}" ]] && echo "LIBRARY_PATH=\"${JAVA_PKG_LIBRARY}\""
1650 [[ -n "${JAVA_PROVIDE}" ]] && echo "PROVIDES=\"${JAVA_PROVIDE}\"" 2249 [[ -n "${JAVA_PROVIDE}" ]] && echo "PROVIDES=\"${JAVA_PROVIDE}\""
1651 [[ -f "${JAVA_PKG_DEPEND}" ]] && echo "DEPEND=\"$(cat ${JAVA_PKG_DEPEND} | uniq | tr '\n' ':')\"" 2250 [[ -f "${JAVA_PKG_DEPEND_FILE}" ]] \
2251 && echo "DEPEND=\"$(cat "${JAVA_PKG_DEPEND_FILE}" | uniq | tr '\n' ':')\""
2252 [[ -f "${JAVA_PKG_OPTIONAL_DEPEND_FILE}" ]] \
2253 && echo "OPTIONAL_DEPEND=\"$(cat "${JAVA_PKG_OPTIONAL_DEPEND_FILE}" | uniq | tr '\n' ':')\""
1652 echo "VM=\"$(echo ${RDEPEND} ${DEPEND} | sed -e 's/ /\n/g' | sed -n -e '/virtual\/\(jre\|jdk\)/ { p;q }')\"" # TODO cleanup ! 2254 echo "VM=\"$(echo ${RDEPEND} ${DEPEND} | sed -e 's/ /\n/g' | sed -n -e '/virtual\/\(jre\|jdk\)/ { p;q }')\"" # TODO cleanup !
1653 ) > "${JAVA_PKG_ENV}" 2255 ) > "${JAVA_PKG_ENV}"
1654 2256
1655 # register target/source 2257 # register target/source
1656 local target="$(java-pkg_get-target)" 2258 local target="$(java-pkg_get-target)"
1667 2269
1668 2270
1669 echo "MERGE_VM=\"${GENTOO_VM}\"" >> "${JAVA_PKG_ENV}" 2271 echo "MERGE_VM=\"${GENTOO_VM}\"" >> "${JAVA_PKG_ENV}"
1670 [[ -n ${GENTOO_COMPILER} ]] && echo "MERGE_COMPILER=\"${GENTOO_COMPILER}\"" >> "${JAVA_PKG_ENV}" 2272 [[ -n ${GENTOO_COMPILER} ]] && echo "MERGE_COMPILER=\"${GENTOO_COMPILER}\"" >> "${JAVA_PKG_ENV}"
1671 2273
2274 # extra env variables
2275 if [[ -n "${JAVA_PKG_EXTRA_ENV_VARS}" ]]; then
2276 cat "${JAVA_PKG_EXTRA_ENV}" >> "${JAVA_PKG_ENV}" || die
2277 # nested echo to remove leading/trailing spaces
2278 echo "ENV_VARS=\"$(echo ${JAVA_PKG_EXTRA_ENV_VARS})\"" \
2279 >> "${JAVA_PKG_ENV}" || die
2280 fi
2281
1672 # Strip unnecessary leading and trailing colons 2282 # Strip unnecessary leading and trailing colons
1673 # TODO try to cleanup if possible 2283 # TODO try to cleanup if possible
1674 sed -e "s/=\":/=\"/" -e "s/:\"$/\"/" -i "${JAVA_PKG_ENV}" || die "Did you forget to call java_init ?" 2284 sed -e "s/=\":/=\"/" -e "s/:\"$/\"/" -i "${JAVA_PKG_ENV}" || die "Did you forget to call java_init ?"
2285 else
2286 debug-print "JAVA_PKG_CLASSPATH, JAVA_PKG_LIBRARY, JAVA_PKG_DEPEND_FILE"
2287 debug-print "or JAVA_PKG_OPTIONAL_DEPEND_FILE not defined so can't"
2288 debug-print "write package.env."
1675 fi 2289 fi
1676} 2290}
1677 2291
1678# ------------------------------------------------------------------------------ 2292# ------------------------------------------------------------------------------
1679# @internal-function java-pkg_record-jar_ 2293# @internal-function java-pkg_record-jar_
1680# 2294#
1681# Record a dependency to the package.env 2295# Record an (optional) dependency to the package.env
1682# 2296# @param --optional - record dependency as optional
2297# @param $1 - package to record
2298# @param $2 - (optional) jar of package to record
1683# ------------------------------------------------------------------------------ 2299# ------------------------------------------------------------------------------
1684JAVA_PKG_DEPEND="${T}/java-pkg-depend" 2300JAVA_PKG_DEPEND_FILE="${T}/java-pkg-depend"
2301JAVA_PKG_OPTIONAL_DEPEND_FILE="${T}/java-pkg-optional-depend"
1685 2302
1686java-pkg_record-jar_() { 2303java-pkg_record-jar_() {
1687 debug-print-function ${FUNCNAME} $* 2304 debug-print-function ${FUNCNAME} $*
2305
2306 local depend_file="${JAVA_PKG_DEPEND_FILE}"
2307 if [[ "${1}" == "--optional" ]]; then
2308 depend_file="${JAVA_PKG_OPTIONAL_DEPEND_FILE}"
2309 shift
2310 fi
1688 2311
1689 local pkg=${1} jar=${2} append 2312 local pkg=${1} jar=${2} append
1690 if [[ -z "${jar}" ]]; then 2313 if [[ -z "${jar}" ]]; then
1691 append="${pkg}" 2314 append="${pkg}"
1692 else 2315 else
1693 append="$(basename ${jar})@${pkg}" 2316 append="$(basename ${jar})@${pkg}"
1694 fi 2317 fi
1695 2318
1696 echo ${append} >> ${JAVA_PKG_DEPEND} 2319 echo "${append}" >> "${depend_file}"
1697} 2320}
1698 2321
1699# ------------------------------------------------------------------------------ 2322# ------------------------------------------------------------------------------
1700# @internal-function java-pkg_append_ 2323# @internal-function java-pkg_append_
1701# 2324#
1745# 2368#
1746# @return 0 - function is declared 2369# @return 0 - function is declared
1747# @return 1 - function is undeclared 2370# @return 1 - function is undeclared
1748# ------------------------------------------------------------------------------ 2371# ------------------------------------------------------------------------------
1749java-pkg_func-exists() { 2372java-pkg_func-exists() {
1750 if [[ -n "$(declare -f ${1})" ]]; then 2373 declare -F ${1} > /dev/null
1751 return 0
1752 else
1753 return 1
1754 fi
1755} 2374}
1756 2375
1757# ------------------------------------------------------------------------------ 2376# ------------------------------------------------------------------------------
1758# @internal-function java-pkg_setup-vm 2377# @internal-function java-pkg_setup-vm
1759# 2378#
1760# Sets up the environment for a specific VM 2379# Sets up the environment for a specific VM
1761# 2380#
1762# ------------------------------------------------------------------------------ 2381# ------------------------------------------------------------------------------
1763java-pkg_setup-vm() { 2382java-pkg_setup-vm() {
1764 debug-print-function ${FUNCNAME} $* 2383 debug-print-function ${FUNCNAME} $*
2384
2385 export LANG="C" LC_ALL="C"
1765 2386
1766 local vendor="$(java-pkg_get-vm-vendor)" 2387 local vendor="$(java-pkg_get-vm-vendor)"
1767 if [[ "${vendor}" == "sun" ]] && java-pkg_is-vm-version-ge "1.5" ; then 2388 if [[ "${vendor}" == "sun" ]] && java-pkg_is-vm-version-ge "1.5" ; then
1768 addpredict "/dev/random" 2389 addpredict "/dev/random"
1769 elif [[ "${vendor}" == "ibm" ]]; then 2390 elif [[ "${vendor}" == "ibm" ]]; then
1770 addpredict "/proc/self/maps" 2391 addpredict "/proc/self/maps"
1771 addpredict "/proc/cpuinfo" 2392 addpredict "/proc/cpuinfo"
1772 export LANG="C" LC_ALL="C"
1773 elif [[ "${vendor}" == "jrockit" ]]; then 2393 elif [[ "${vendor}" == "jrockit" ]]; then
1774 addpredict "/proc/cpuinfo" 2394 addpredict "/proc/cpuinfo"
1775 fi 2395 fi
1776} 2396}
1777 2397
1832# Switch VM if we're allowed to (controlled by JAVA_PKG_ALLOW_VM_CHANGE), and 2452# Switch VM if we're allowed to (controlled by JAVA_PKG_ALLOW_VM_CHANGE), and
1833# verify that the current VM is sufficient. 2453# verify that the current VM is sufficient.
1834# Setup the environment for the VM being used. 2454# Setup the environment for the VM being used.
1835# ------------------------------------------------------------------------------ 2455# ------------------------------------------------------------------------------
1836java-pkg_switch-vm() { 2456java-pkg_switch-vm() {
2457 debug-print-function ${FUNCNAME} $*
2458
1837 if java-pkg_needs-vm; then 2459 if java-pkg_needs-vm; then
1838 # Use the VM specified by JAVA_PKG_FORCE_VM 2460 # Use the VM specified by JAVA_PKG_FORCE_VM
1839 if [[ -n ${JAVA_PKG_FORCE_VM} ]]; then 2461 if [[ -n "${JAVA_PKG_FORCE_VM}" ]]; then
1840 # If you're forcing the VM, I hope you know what your doing... 2462 # If you're forcing the VM, I hope you know what your doing...
2463 debug-print "JAVA_PKG_FORCE_VM used: ${JAVA_PKG_FORCE_VM}"
1841 export GENTOO_VM="${JAVA_PKG_FORCE_VM}" 2464 export GENTOO_VM="${JAVA_PKG_FORCE_VM}"
1842 # if we're allowed to switch the vm... 2465 # if we're allowed to switch the vm...
1843 elif [[ "${JAVA_PKG_ALLOW_VM_CHANGE}" == "yes" ]]; then 2466 elif [[ "${JAVA_PKG_ALLOW_VM_CHANGE}" == "yes" ]]; then
1844 debug-print "depend-java-query: NV_DEPEND: ${JAVA_PKG_NV_DEPEND:-${DEPEND}} VNEED: ${JAVA_PKG_VNEED}" 2467 debug-print "depend-java-query: NV_DEPEND: ${JAVA_PKG_NV_DEPEND:-${DEPEND}}"
1845 if [[ -n ${JAVA_PKG_VNEED} ]]; then
1846 GENTOO_VM="$(depend-java-query --need-virtual "${JAVA_PKG_VNEED}" --get-vm "${JAVA_PKG_NV_DEPEND:-${DEPEND}}")"
1847 else
1848 GENTOO_VM="$(depend-java-query --get-vm "${JAVA_PKG_NV_DEPEND:-${DEPEND}}")" 2468 GENTOO_VM="$(depend-java-query --get-vm "${JAVA_PKG_NV_DEPEND:-${DEPEND}}")"
1849 fi
1850 if [[ -z "${GENTOO_VM}" || "${GENTOO_VM}" == "None" ]]; then 2469 if [[ -z "${GENTOO_VM}" || "${GENTOO_VM}" == "None" ]]; then
1851 eerror "Unable to determine VM for building from dependencies:" 2470 eerror "Unable to determine VM for building from dependencies:"
1852 echo "NV_DEPEND: ${JAVA_PKG_NV_DEPEND:-${DEPEND}}" 2471 echo "NV_DEPEND: ${JAVA_PKG_NV_DEPEND:-${DEPEND}}"
1853 echo "VNEED: ${JAVA_PKG_VNEED}"
1854 die "Failed to determine VM for building." 2472 die "Failed to determine VM for building."
1855 else 2473 else
1856 export GENTOO_VM 2474 export GENTOO_VM
1857 fi 2475 fi
1858 # otherwise just make sure the current VM is sufficient 2476 # otherwise just make sure the current VM is sufficient
1878 2496
1879 #TODO If you know a better solution let us know. 2497 #TODO If you know a better solution let us know.
1880 java-pkg_append_ LD_LIBRARY_PATH "$(java-config -g LDPATH)" 2498 java-pkg_append_ LD_LIBRARY_PATH "$(java-config -g LDPATH)"
1881 2499
1882 local tann="${T}/announced-vm" 2500 local tann="${T}/announced-vm"
2501 # With the hooks we should only get here once from pkg_setup but better safe than sorry
2502 # if people have for example modified eclasses some where
1883 if [[ -n "${JAVA_PKG_DEBUG}" ]] || [[ ! -f "${tann}" ]] ; then 2503 if [[ -n "${JAVA_PKG_DEBUG}" ]] || [[ ! -f "${tann}" ]] ; then
1884 # Add a check for setup/preinst phase... to avoid duplicate outputs
1885 # for when FEATURES=buildpkg
1886 if [[ ${EBUILD_PHASE} != "setup" && ${EBUILD_PHASE} != "preinst" && ${EBUILD_PHASE} != "postinst" ]];
1887 then
1888 einfo "Using: $(java-config -f)" 2504 einfo "Using: $(java-config -f)"
1889 [[ ! -f "${tann}" ]] && touch "${tann}" 2505 [[ ! -f "${tann}" ]] && touch "${tann}"
1890 fi
1891 fi 2506 fi
1892 2507
1893 else 2508 else
1894 [[ -n "${JAVA_PKG_DEBUG}" ]] && ewarn "!!! This package inherits java-pkg but doesn't depend on a JDK. -bin or broken dependency!!!" 2509 [[ -n "${JAVA_PKG_DEBUG}" ]] && ewarn "!!! This package inherits java-pkg but doesn't depend on a JDK. -bin or broken dependency!!!"
1895 fi 2510 fi
1925 einfo "Classes" 2540 einfo "Classes"
1926 find "${S}" -type f -name '*.class' -print0 | xargs -0 -r -n 500 ls -ald | sed -e "s,${WORKDIR},\${WORKDIR}," 2541 find "${S}" -type f -name '*.class' -print0 | xargs -0 -r -n 500 ls -ald | sed -e "s,${WORKDIR},\${WORKDIR},"
1927 fi 2542 fi
1928} 2543}
1929 2544
1930# TODO document 2545# ------------------------------------------------------------------------------
2546# @internal-function java-pkg_verify-classes
2547#
1931# Verify that the classes were compiled for the right source / target 2548# Verify that the classes were compiled for the right source / target. Dies if
2549# not.
2550# @param $1 (optional) - the file to check, otherwise checks whole ${D}
2551# ------------------------------------------------------------------------------
1932java-pkg_verify-classes() { 2552java-pkg_verify-classes() {
1933 ebegin "Verifying java class versions"
1934 #$(find ${D} -type f -name '*.jar' -o -name '*.class') 2553 #$(find ${D} -type f -name '*.jar' -o -name '*.class')
1935 class-version-verify.py -t $(java-pkg_get-target) -r ${D} 2554
2555 local version_verify="/usr/bin/class-version-verify.py"
2556
2557 if [[ ! -x "${version_verify}" ]]; then
2558 version_verify="/usr/$(get_libdir)/javatoolkit/bin/class-version-verify.py"
2559 fi
2560
2561 if [[ ! -x "${version_verify}" ]]; then
2562 ewarn "Unable to perform class version checks as"
2563 ewarn "class-version-verify.py is unavailable"
2564 ewarn "Please install dev-java/javatoolkit."
2565 return
2566 fi
2567
2568 local target=$(java-pkg_get-target)
2569 local result
2570 local log="${T}/class-version-verify.log"
2571 if [[ -n "${1}" ]]; then
2572 ${version_verify} -v -t ${target} "${1}" > "${log}"
1936 result=$? 2573 result=$?
1937 eend ${result}
1938 if [[ ${result} == 0 ]]; then
1939 einfo "All good"
1940 else 2574 else
1941 ewarn "Possible problem" 2575 ebegin "Verifying java class versions (target: ${target})"
1942 die "Bad class files found" 2576 ${version_verify} -v -t ${target} -r "${D}" > "${log}"
2577 result=$?
2578 eend ${result}
2579 fi
2580 [[ -n ${JAVA_PKG_DEBUG} ]] && cat "${log}"
2581 if [[ ${result} != 0 ]]; then
2582 eerror "Incorrect bytecode version found"
2583 [[ -n "${1}" ]] && eerror "in file: ${1}"
2584 eerror "See ${log} for more details."
2585 die "Incorrect bytecode found"
2586 fi
2587}
2588
2589# ----------------------------------------------------------------------------
2590# @internal-function java-pkg_ensure-dep
2591# Check that a package being used in jarfrom, getjars and getjar is contained
2592# within DEPEND or RDEPEND.
2593# @param $1 - empty - check both vars; "runtime" or "build" - check only
2594# RDEPEND, resp. DEPEND
2595# @param $2 - Package name and slot.
2596
2597java-pkg_ensure-dep() {
2598 debug-print-function ${FUNCNAME} $*
2599
2600 local limit_to="${1}"
2601 local target_pkg="${2}"
2602 local dev_error=""
2603
2604 local stripped_pkg=$(echo "${target_pkg}" | sed \
2605 's/-[0-9]*\(\.[0-9]\)*$//')
2606
2607 debug-print "Matching against: ${stripped_pkg}"
2608
2609 if [[ ${limit_to} != runtime && ! ( "${DEPEND}" =~ "$stripped_pkg" ) ]]; then
2610 dev_error="The ebuild is attempting to use ${target_pkg} that is not"
2611 dev_error="${dev_error} declared in DEPEND."
2612 if is-java-strict; then
2613 eerror "${dev_error}"
2614 die "${dev_error}"
2615 elif [[ ${BASH_SUBSHELL} = 0 ]]; then
2616 eerror "${dev_error}"
2617 elog "Because you have this package installed the package will"
2618 elog "build without problems, but please report this to"
2619 elog "http://bugs.gentoo.org"
2620 fi
2621 fi
2622
2623 if [[ ${limit_to} != build ]]; then
2624 if [[ ! ( ${RDEPEND} =~ "${stripped_pkg}" ) ]]; then
2625 if [[ ! ( ${PDEPEND} =~ "${stripped_pkg}" ) ]]; then
2626 dev_error="The ebuild is attempting to use ${target_pkg},"
2627 dev_error="${dev_error} without specifying --build-only, that is not declared in RDEPEND"
2628 dev_error="${dev_error} or PDEPEND."
2629 if is-java-strict; then
2630 eerror "${dev_error}"
2631 die "${dev_error}"
2632 elif [[ ${BASH_SUBSHELL} = 0 ]]; then
2633 eerror "${dev_error}"
2634 elog "The package will build without problems, but may fail to run"
2635 elog "if you don't have ${target_pkg} installed, so please report"
2636 elog "this to http://bugs.gentoo.org"
2637 fi
2638 fi
2639 fi
1943 fi 2640 fi
1944} 2641}
1945 2642
1946# ------------------------------------------------------------------------------ 2643# ------------------------------------------------------------------------------
1947# @section-end internal 2644# @section-end internal
1948# ------------------------------------------------------------------------------ 2645# ------------------------------------------------------------------------------
1949 2646
1950java-pkg_check-phase() { 2647java-pkg_check-phase() {
1951 local phase=${1} 2648 local phase=${1}
1952 local funcname=${2} 2649 local funcname=${FUNCNAME[1]}
1953 if is-java-strict && [[ ${EBUILD_PHASE} != ${phase} ]]; then 2650 if [[ ${EBUILD_PHASE} != ${phase} ]]; then
1954 java-pkg_announce-qa-violation \
1955 "${funcname} used outside of src_${phase}" 2651 local msg="${funcname} used outside of src_${phase}"
2652 java-pkg_announce-qa-violation "${msg}"
1956 fi 2653 fi
1957} 2654}
1958 2655
1959java-pkg_check-versioned-jar() { 2656java-pkg_check-versioned-jar() {
1960 local jar=${1} 2657 local jar=${1}
1969 java-pkg_announce-qa-violation "deprecated USE flag 'jikes' in IUSE" 2666 java-pkg_announce-qa-violation "deprecated USE flag 'jikes' in IUSE"
1970 fi 2667 fi
1971} 2668}
1972 2669
1973java-pkg_announce-qa-violation() { 2670java-pkg_announce-qa-violation() {
1974 if is-java-strict; then 2671 local nodie
2672 if [[ ${1} == "--nodie" ]]; then
2673 nodie="true"
2674 shift
2675 fi
1975 echo "Java QA Notice: $@" >&2 2676 echo "Java QA Notice: $@" >&2
1976 increment-qa-violations 2677 increment-qa-violations
1977 fi 2678 [[ -z "${nodie}" ]] && is-java-strict && die "${@}"
1978} 2679}
1979 2680
1980increment-qa-violations() { 2681increment-qa-violations() {
1981 let "JAVA_PKG_QA_VIOLATIONS+=1" 2682 let "JAVA_PKG_QA_VIOLATIONS+=1"
1982 export JAVA_PKG_QA_VIOLATIONS 2683 export JAVA_PKG_QA_VIOLATIONS
1985is-java-strict() { 2686is-java-strict() {
1986 [[ -n ${JAVA_PKG_STRICT} ]] 2687 [[ -n ${JAVA_PKG_STRICT} ]]
1987 return $? 2688 return $?
1988} 2689}
1989 2690
2691
1990# ------------------------------------------------------------------------------ 2692# ------------------------------------------------------------------------------
1991# @eclass-end 2693# @eclass-end
1992# ------------------------------------------------------------------------------ 2694# ------------------------------------------------------------------------------

Legend:
Removed from v.1.33  
changed lines
  Added in v.1.128

  ViewVC Help
Powered by ViewVC 1.1.20