/[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.38 Revision 1.152
1# Base eclass for Java packages 1# Base eclass for Java packages
2# 2#
3# Copyright (c) 2004-2005, Thomas Matthijs <axxo@gentoo.org> 3# Copyright (c) 2004-2005, Thomas Matthijs <axxo@gentoo.org>
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-2011, 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.38 2006/12/31 19:30:54 betelgeuse Exp $ 9# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.152 2013/01/16 19:06:15 sera 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# -----------------------------------------------------------------------------
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# -----------------------------------------------------------------------------
42JAVA_PKG_PORTAGE_DEP=">=sys-apps/portage-2.1_pre1" 66has "${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.9-r1 ${JAVA_PKG_PORTAGE_DEP}"
76has source ${JAVA_PKG_IUSE} && JAVA_PKG_E_DEPEND="${JAVA_PKG_E_DEPEND} source? ( app-arch/zip )"
77
78# -----------------------------------------------------------------------------
79# @variable-preinherit JAVA_PKG_WANT_BOOTCLASSPATH
80#
81# The version of bootclasspath the package needs to work. Translates to a proper
82# dependency. The bootclasspath has to be obtained by java-ant_rewrite-bootclasspath
83# -----------------------------------------------------------------------------
84
85if [[ -n "${JAVA_PKG_WANT_BOOTCLASSPATH}" ]]; then
86 if [[ "${JAVA_PKG_WANT_BOOTCLASSPATH}" == "1.5" ]]; then
87 JAVA_PKG_E_DEPEND="${JAVA_PKG_E_DEPEND} >=dev-java/gnu-classpath-0.98-r1:0.98"
88 else
89 eerror "Unknown value of JAVA_PKG_WANT_BOOTCLASSPATH"
90 # since die in global scope doesn't work, this will make repoman fail
91 JAVA_PKG_E_DEPEND="${JAVA_PKG_E_DEPEND} BAD_JAVA_PKG_WANT_BOOTCLASSPATH"
92 fi
93fi
52 94
53# ----------------------------------------------------------------------------- 95# -----------------------------------------------------------------------------
54# @variable-external JAVA_PKG_ALLOW_VM_CHANGE 96# @variable-external JAVA_PKG_ALLOW_VM_CHANGE
55# @variable-default yes 97# @variable-default yes
56# 98#
72# JAVA_PKG_FORCE_VM=sun-jdk-1.5 emerge foo 114# JAVA_PKG_FORCE_VM=sun-jdk-1.5 emerge foo
73# 115#
74# ----------------------------------------------------------------------------- 116# -----------------------------------------------------------------------------
75 117
76# ----------------------------------------------------------------------------- 118# -----------------------------------------------------------------------------
119# @variable-external JAVA_PKG_WANT_BUILD_VM
120#
121# A list of VM handles to choose a build VM from. If the list contains the
122# currently active VM use that one, otherwise step through the list till a
123# usable/installed VM is found.
124#
125# This allows to use an explicit list of JDKs in DEPEND instead of a virtual.
126# Users of this variable must make sure at least one of the listed handles is
127# covered by DEPEND.
128# Requires JAVA_PKG_WANT_SOURCE and JAVA_PKG_WANT_TARGET to be set as well.
129# -----------------------------------------------------------------------------
130
131# -----------------------------------------------------------------------------
77# @variable-external JAVA_PKG_WANT_SOURCE 132# @variable-external JAVA_PKG_WANT_SOURCE
78# 133#
79# Specify a specific VM version to compile for to use for -source. 134# Specify a specific VM version to compile for to use for -source.
80# Normally this is determined from DEPEND. 135# Normally this is determined from DEPEND.
81# See java-pkg_get-source function below. 136# See java-pkg_get-source function below.
130# @note This should only be used internally or for testing. 185# @note This should only be used internally or for testing.
131# @example Use jikes and javac, in that order 186# @example Use jikes and javac, in that order
132# JAVA_PKG_FORCE_COMPILER="jikes javac" 187# JAVA_PKG_FORCE_COMPILER="jikes javac"
133# ----------------------------------------------------------------------------- 188# -----------------------------------------------------------------------------
134 189
190# -----------------------------------------------------------------------------
191# @variable-external JAVA_PKG_FORCE_ANT_TASKS
192#
193# An $IFS separated list of ant tasks. Can be set in environment before calling
194# emerge/ebuild to override variables set in ebuild, mainly for testing before
195# putting the resulting (WANT_)ANT_TASKS into ebuild. Affects only ANT_TASKS in
196# eant() call, not the dependencies specified in WANT_ANT_TASKS.
197#
198# @example JAVA_PKG_FORCE_ANT_TASKS="ant-junit ant-trax" \
199# ebuild foo.ebuild compile
200#
201# @seealso WANT_ANT_TASKS
202# -----------------------------------------------------------------------------
203
135# TODO document me 204# TODO document me
136JAVA_PKG_QA_VIOLATIONS=0 205JAVA_PKG_QA_VIOLATIONS=0
137 206
138# ----------------------------------------------------------------------------- 207# -----------------------------------------------------------------------------
139# @section-end variables 208# @section-end variables
146# 215#
147# These are used to install Java-related things, such as jars, Javadocs, JNI 216# These are used to install Java-related things, such as jars, Javadocs, JNI
148# libraries, etc. 217# libraries, etc.
149# ----------------------------------------------------------------------------- 218# -----------------------------------------------------------------------------
150 219
220# -----------------------------------------------------------------------------
221# @ebuild-function java-pkg_doexamples
222#
223# Installs given arguments to /usr/share/doc/${PF}/examples
224# If you give it only one parameter and it is a directory it will install
225# everything in that directory to the examples directory.
226#
227# @example
228# java-pkg_doexamples demo
229# java-pkg_doexamples demo/* examples/*
230#
231# @param --subdir - If the examples need a certain directory structure
232# @param $* - list of files to install
233# ------------------------------------------------------------------------------
234java-pkg_doexamples() {
235 debug-print-function ${FUNCNAME} $*
236
237 [[ ${#} -lt 1 ]] && die "At least one argument needed"
238
239 java-pkg_check-phase install
240
241 local dest=/usr/share/doc/${PF}/examples
242 if [[ ${1} == --subdir ]]; then
243 local dest=${dest}/${2}
244 dodir ${dest}
245 shift 2
246 fi
247
248 if [[ ${#} = 1 && -d ${1} ]]; then
249 ( # dont want to pollute calling env
250 insinto "${dest}"
251 doins -r ${1}/*
252 ) || die "Installing examples failed"
253 else
254 ( # dont want to pollute calling env
255 insinto "${dest}"
256 doins -r "$@"
257 ) || die "Installing examples failed"
258 fi
259
260 # Let's make a symlink to the directory we have everything else under
261 dosym "${dest}" "${JAVA_PKG_SHAREPATH}/examples" || die
262}
151 263
152# ----------------------------------------------------------------------------- 264# -----------------------------------------------------------------------------
153# @ebuild-function java-pkg_dojar 265# @ebuild-function java-pkg_dojar
154# 266#
155# Installs any number of jars. 267# Installs any number of jars.
174 # Create JARDEST if it doesn't exist 286 # Create JARDEST if it doesn't exist
175 dodir ${JAVA_PKG_JARDEST} 287 dodir ${JAVA_PKG_JARDEST}
176 288
177 local jar 289 local jar
178 # for each jar 290 # for each jar
179 for jar in "$@"; do 291 for jar in "${@}"; do
180 local jar_basename=$(basename "${jar}") 292 local jar_basename=$(basename "${jar}")
181 293
182 java-pkg_check-versioned-jar ${jar_basename} 294 java-pkg_check-versioned-jar ${jar_basename}
183 295
184 # check if it exists 296 # check if it exists
185 if [[ -e "${jar}" ]] ; then 297 if [[ -e "${jar}" ]] ; then
298 # Don't overwrite if jar has already been installed with the same
299 # name
300 local dest="${D}${JAVA_PKG_JARDEST}/${jar_basename}"
301 if [[ -e "${dest}" ]]; then
302 ewarn "Overwriting ${dest}"
303 fi
304
186 # install it into JARDEST if it's a non-symlink 305 # install it into JARDEST if it's a non-symlink
187 if [[ ! -L "${jar}" ]] ; then 306 if [[ ! -L "${jar}" ]] ; then
307 #but first check class version when in strict mode.
308 is-java-strict && java-pkg_verify-classes "${jar}"
309
188 INSDESTTREE="${JAVA_PKG_JARDEST}" \ 310 INSDESTTREE="${JAVA_PKG_JARDEST}" \
189 doins "${jar}" || die "failed to install ${jar}" 311 doins "${jar}" || die "failed to install ${jar}"
190 java-pkg_append_ JAVA_PKG_CLASSPATH "${JAVA_PKG_JARDEST}/${jar_basename}" 312 java-pkg_append_ JAVA_PKG_CLASSPATH "${JAVA_PKG_JARDEST}/${jar_basename}"
191 debug-print "installed ${jar} to ${D}${JAVA_PKG_JARDEST}" 313 debug-print "installed ${jar} to ${D}${JAVA_PKG_JARDEST}"
192 # make a symlink to the original jar if it's symlink 314 # make a symlink to the original jar if it's symlink
202 done 324 done
203 325
204 java-pkg_do_write_ 326 java-pkg_do_write_
205} 327}
206 328
207
208# ------------------------------------------------------------------------------ 329# ------------------------------------------------------------------------------
209# @internal-function depend-java-query 330# @internal-function depend-java-query
210# 331#
211# Wrapper for the depend-java-query binary to enable passing USE in env. 332# Wrapper for the depend-java-query binary to enable passing USE in env.
212# Using env variables keeps this eclass working with java-config versions that 333# Using env variables keeps this eclass working with java-config versions that
213# do not handle use flags. 334# do not handle use flags.
214# ------------------------------------------------------------------------------ 335# ------------------------------------------------------------------------------
215 336
216depend-java-query() { 337depend-java-query() {
338 # Used to have a which call here but it caused endless loops for some people
339 # that had some weird bashrc voodoo for which.
217 USE="${USE}" $(which depend-java-query) "${@}" 340 USE="${USE}" /usr/bin/depend-java-query "${@}"
218} 341}
219 342
220# ------------------------------------------------------------------------------ 343# ------------------------------------------------------------------------------
221# @ebuild-function java-pkg_regjar 344# @ebuild-function java-pkg_regjar
222# 345#
254 [[ ${#} -lt 1 ]] && die "at least one argument needed" 377 [[ ${#} -lt 1 ]] && die "at least one argument needed"
255 378
256 java-pkg_init_paths_ 379 java-pkg_init_paths_
257 380
258 local jar jar_dir jar_file 381 local jar jar_dir jar_file
259 for jar in "$@"; do 382 for jar in "${@}"; do
260 # TODO use java-pkg_check-versioned-jar 383 # TODO use java-pkg_check-versioned-jar
261 if [[ -e "${jar}" || -e "${D}${jar}" ]]; then 384 if [[ -e "${jar}" || -e "${D}${jar}" ]]; then
262 [[ -d "${jar}" || -d "${D}${jar}" ]] \ 385 [[ -d "${jar}" || -d "${D}${jar}" ]] \
263 && die "Called ${FUNCNAME} on a directory $*" 386 && die "Called ${FUNCNAME} on a directory $*"
387
388 #check that class version correct when in strict mode
389 is-java-strict && java-pkg_verify-classes "${jar}"
390
264 # nelchael: we should strip ${D} in this case too, here's why: 391 # nelchael: we should strip ${D} in this case too, here's why:
265 # imagine such call: 392 # imagine such call:
266 # java-pkg_regjar ${D}/opt/java/*.jar 393 # java-pkg_regjar ${D}/opt/java/*.jar
267 # such call will fall into this case (-e ${jar}) and will 394 # such call will fall into this case (-e ${jar}) and will
268 # record paths with ${D} in package.env 395 # record paths with ${D} in package.env
269 java-pkg_append_ JAVA_PKG_CLASSPATH "${jar#${D}}" 396 java-pkg_append_ JAVA_PKG_CLASSPATH "${jar#${D}}"
270 else 397 else
398 if [[ ${jar} = *\** ]]; then
399 eerror "The argument ${jar} to ${FUNCNAME}"
400 eerror "has * in it. If you want it to glob in"
401 eerror '${D} add ${D} to the argument.'
402 fi
403 debug-print "${jar} or ${D}${jar} not found"
271 die "${jar} does not exist" 404 die "${jar} does not exist"
272 fi 405 fi
273 done 406 done
274 407
275 java-pkg_do_write_ 408 java-pkg_do_write_
292 local original_jar="${1}" 425 local original_jar="${1}"
293 local new_jar="${2:-${PN}.jar}" 426 local new_jar="${2:-${PN}.jar}"
294 local new_jar_dest="${T}/${new_jar}" 427 local new_jar_dest="${T}/${new_jar}"
295 428
296 [[ -z ${original_jar} ]] && die "Must specify a jar to install" 429 [[ -z ${original_jar} ]] && die "Must specify a jar to install"
297 [[ ! -f ${original_jar} ]] && die "${original_jar} does not exist!" 430 [[ ! -f ${original_jar} ]] \
431 && die "${original_jar} does not exist or is not a file!"
298 432
299 rm -f "${new_jar_dest}" || die "Failed to remove ${new_jar_dest}" 433 rm -f "${new_jar_dest}" || die "Failed to remove ${new_jar_dest}"
300 cp "${original_jar}" "${new_jar_dest}" \ 434 cp "${original_jar}" "${new_jar_dest}" \
301 || die "Failed to copy ${original_jar} to ${new_jar_dest}" 435 || die "Failed to copy ${original_jar} to ${new_jar_dest}"
302 java-pkg_dojar "${new_jar_dest}" 436 java-pkg_dojar "${new_jar_dest}"
329# @param $@ - JNI libraries to install 463# @param $@ - JNI libraries to install
330# ------------------------------------------------------------------------------ 464# ------------------------------------------------------------------------------
331java-pkg_doso() { 465java-pkg_doso() {
332 debug-print-function ${FUNCNAME} $* 466 debug-print-function ${FUNCNAME} $*
333 467
334 [[ ${#} -lt 1 ]] && "At least one argument required for ${FUNCNAME}"
335 java-pkg_check-phase install 468 java-pkg_check-phase install
336 469
337 [[ ${#} -lt 1 ]] && die "At least one argument required for ${FUNCNAME}" 470 [[ ${#} -lt 1 ]] && die "${FUNCNAME} requires at least one argument"
338 471
339 java-pkg_init_paths_ 472 java-pkg_init_paths_
340 473
341 local lib 474 local lib
342 # for each lib 475 # for each lib
345 if [[ -e "${lib}" ]] ; then 478 if [[ -e "${lib}" ]] ; then
346 # install if it isn't a symlink 479 # install if it isn't a symlink
347 if [[ ! -L "${lib}" ]] ; then 480 if [[ ! -L "${lib}" ]] ; then
348 INSDESTTREE="${JAVA_PKG_LIBDEST}" \ 481 INSDESTTREE="${JAVA_PKG_LIBDEST}" \
349 INSOPTIONS="${LIBOPTIONS}" \ 482 INSOPTIONS="${LIBOPTIONS}" \
350 doins "${lib}" || "failed to install ${lib}" 483 doins "${lib}" || die "failed to install ${lib}"
351 java-pkg_append_ JAVA_PKG_LIBRARY "${JAVA_PKG_LIBDEST}" 484 java-pkg_append_ JAVA_PKG_LIBRARY "${JAVA_PKG_LIBDEST}"
352 debug-print "Installing ${lib} to ${JAVA_PKG_LIBDEST}" 485 debug-print "Installing ${lib} to ${JAVA_PKG_LIBDEST}"
353 # otherwise make a symlink to the symlink's origin 486 # otherwise make a symlink to the symlink's origin
354 else 487 else
355 # TODO use dosym
356 ln -s "$(readlink "${lib}")" "${D}${JAVA_PKG_LIBDEST}/$(basename "${lib}")" 488 dosym "$(readlink "${lib}")" "${JAVA_PKG_LIBDEST}/${lib##*/}"
357 debug-print "${lib} is a symlink, linking accordanly" 489 debug-print "${lib} is a symlink, linking accordantly"
358 fi 490 fi
359 # otherwise die 491 # otherwise die
360 else 492 else
361 die "${lib} does not exist" 493 die "${lib} does not exist"
362 fi 494 fi
378java-pkg_regso() { 510java-pkg_regso() {
379 debug-print-function ${FUNCNAME} $* 511 debug-print-function ${FUNCNAME} $*
380 512
381 java-pkg_check-phase install 513 java-pkg_check-phase install
382 514
383 [[ ${#} -lt 1 ]] && "at least one argument needed" 515 [[ ${#} -lt 1 ]] && die "${FUNCNAME} requires at least one argument"
384 516
385 java-pkg_init_paths_ 517 java-pkg_init_paths_
386 518
387 local lib target_dir 519 local lib target_dir
388 for lib in "$@" ; do 520 for lib in "$@" ; do
455# ------------------------------------------------------------------------------ 587# ------------------------------------------------------------------------------
456# @ebuild-function java-pkg_dojavadoc 588# @ebuild-function java-pkg_dojavadoc
457# 589#
458# Installs javadoc documentation. This should be controlled by the doc use flag. 590# Installs javadoc documentation. This should be controlled by the doc use flag.
459# 591#
592# @param $1: optional --symlink creates to symlink like this for html
593# documentation bundles.
460# @param $1: - The javadoc root directory. 594# @param $2: - The javadoc root directory.
461# 595#
462# @example: 596# @example:
463# java-pkg_dojavadoc docs/api 597# java-pkg_dojavadoc docs/api
598# java-pkg_dojavadoc --symlink apidocs docs/api
464# 599#
465# ------------------------------------------------------------------------------ 600# ------------------------------------------------------------------------------
466java-pkg_dojavadoc() { 601java-pkg_dojavadoc() {
602 debug-print-function ${FUNCNAME} $*
603
604 # For html documentation bundles that link to Javadoc
605 local symlink
606 if [[ ${1} = --symlink ]]; then
607 symlink=${2}
608 shift 2
609 fi
610
467 local dir="$1" 611 local dir="$1"
612 local dest=/usr/share/doc/${PF}/html
613
614 # QA checks
468 615
469 java-pkg_check-phase install 616 java-pkg_check-phase install
470 617
471 [[ -z "${dir}" ]] && die "Must specify a directory!" 618 [[ -z "${dir}" ]] && die "Must specify a directory!"
472 [[ ! -d "${dir}" ]] && die "${dir} does not exist, or isn't a directory!" 619 [[ ! -d "${dir}" ]] && die "${dir} does not exist, or isn't a directory!"
620 if [[ ! -e "${dir}/index.html" ]]; then
621 local msg="No index.html in javadoc directory"
622 ewarn "${msg}"
623 is-java-strict && die "${msg}"
624 fi
625
626 if [[ -e ${D}/${dest}/api ]]; then
627 eerror "${dest} already exists. Will not overwrite."
628 die "${dest}"
629 fi
630
631 # Renaming to match our directory layout
473 632
474 local dir_to_install="${dir}" 633 local dir_to_install="${dir}"
475 if [[ "$(basename "${dir}")" != "api" ]]; then 634 if [[ "$(basename "${dir}")" != "api" ]]; then
476 dir_to_install="${T}/api" 635 dir_to_install="${T}/api"
477 # TODO use doins 636 # TODO use doins
478 cp -r "${dir}" "${dir_to_install}" || die "cp failed" 637 cp -r "${dir}" "${dir_to_install}" || die "cp failed"
479 fi 638 fi
480 639
640 # Actual installation
641
481 java-pkg_dohtml -r ${dir_to_install} 642 java-pkg_dohtml -r "${dir_to_install}"
643
644 # Let's make a symlink to the directory we have everything else under
645 dosym ${dest}/api "${JAVA_PKG_SHAREPATH}/api" || die
646
647 if [[ ${symlink} ]]; then
648 debug-print "symlinking ${dest}/{api,${symlink}}"
649 dosym ${dest}/{api,${symlink}} || die
650 fi
482} 651}
483 652
484# ------------------------------------------------------------------------------ 653# ------------------------------------------------------------------------------
485# @ebuild-function java-pkg_dosrc 654# @ebuild-function java-pkg_dosrc
486# 655#
502# FIXME apparently this fails if you give it an empty directories 671# FIXME apparently this fails if you give it an empty directories
503java-pkg_dosrc() { 672java-pkg_dosrc() {
504 debug-print-function ${FUNCNAME} $* 673 debug-print-function ${FUNCNAME} $*
505 674
506 [ ${#} -lt 1 ] && die "At least one argument needed" 675 [ ${#} -lt 1 ] && die "At least one argument needed"
507 if ! hasq source ${IUSE}; then
508 echo "Java QA Notice: ${FUNCNAME} called without source in IUSE"
509 fi
510 676
511 java-pkg_check-phase install 677 java-pkg_check-phase install
512 678
513 [[ ${#} -lt 1 ]] && die "At least one argument needed" 679 [[ ${#} -lt 1 ]] && die "At least one argument needed"
680
681 if ! [[ ${DEPEND} = *app-arch/zip* ]]; then
682 local msg="${FUNCNAME} called without app-arch/zip in DEPEND"
683 java-pkg_announce-qa-violation ${msg}
684 fi
514 685
515 java-pkg_init_paths_ 686 java-pkg_init_paths_
516 687
517 local zip_name="${PN}-src.zip" 688 local zip_name="${PN}-src.zip"
518 local zip_path="${T}/${zip_name}" 689 local zip_path="${T}/${zip_name}"
519 local dir 690 local dir
520 for dir in ${@}; do 691 for dir in "${@}"; do
521 local dir_parent=$(dirname "${dir}") 692 local dir_parent=$(dirname "${dir}")
522 local dir_name=$(basename "${dir}") 693 local dir_name=$(basename "${dir}")
523 pushd ${dir_parent} > /dev/null || die "problem entering ${dir_parent}" 694 pushd ${dir_parent} > /dev/null || die "problem entering ${dir_parent}"
524 zip -q -r ${zip_path} ${dir_name} -i '*.java' 695 zip -q -r ${zip_path} ${dir_name} -i '*.java'
525 local result=$? 696 local result=$?
550# @param $1 - filename of launcher to create 721# @param $1 - filename of launcher to create
551# @param $2 - options, as follows: 722# @param $2 - options, as follows:
552# --main the.main.class.too.start 723# --main the.main.class.too.start
553# --jar /the/jar/too/launch.jar or just <name>.jar 724# --jar /the/jar/too/launch.jar or just <name>.jar
554# --java_args 'Extra arguments to pass to java' 725# --java_args 'Extra arguments to pass to java'
555# --pkg_args 'Extra arguments too pass to the package' 726# --pkg_args 'Extra arguments to pass to the package'
556# --pwd 727# --pwd Directory the launcher changes to before executing java
557# -into 728# -into Directory to install the launcher to, instead of /usr/bin
558# -pre 729# -pre Prepend contents of this file to the launcher
559# ------------------------------------------------------------------------------ 730# ------------------------------------------------------------------------------
560java-pkg_dolauncher() { 731java-pkg_dolauncher() {
561 debug-print-function ${FUNCNAME} $* 732 debug-print-function ${FUNCNAME} $*
562 733
563 java-pkg_check-phase install 734 java-pkg_check-phase install
604 fi 775 fi
605 fi 776 fi
606 777
607 # Write the actual script 778 # Write the actual script
608 echo "#!/bin/bash" > "${target}" 779 echo "#!/bin/bash" > "${target}"
609 [[ -n "${pre}" ]] && [[ -f "${pre}" ]] && cat "${pre}" >> "${target}" 780 if [[ -n "${pre}" ]]; then
781 if [[ -f "${pre}" ]]; then
782 cat "${pre}" >> "${target}"
783 else
784 die "-pre specified file '${pre}' does not exist"
785 fi
786 fi
610 echo "gjl_package=${JAVA_PKG_NAME}" >> "${target}" 787 echo "gjl_package=${JAVA_PKG_NAME}" >> "${target}"
611 cat "${var_tmp}" >> "${target}" 788 cat "${var_tmp}" >> "${target}"
612 rm -f "${var_tmp}" 789 rm -f "${var_tmp}"
613 echo "source /usr/share/java-config-2/launcher/launcher.bash" >> "${target}" 790 echo "source /usr/share/java-config-2/launcher/launcher.bash" >> "${target}"
614 791
706# Example: get a specific jar from xerces slot 2, and name it diffrently 883# Example: get a specific jar from xerces slot 2, and name it diffrently
707# java-pkg_jar-from xerces-2 xml-apis.jar xml.jar 884# java-pkg_jar-from xerces-2 xml-apis.jar xml.jar
708# Example: get junit.jar which is needed only for building 885# Example: get junit.jar which is needed only for building
709# java-pkg_jar-from --build-only junit junit.jar 886# java-pkg_jar-from --build-only junit junit.jar
710# 887#
711# @param $1 - (optional) "--build-only" makes the jar(s) not added into 888# @param $opt
712# package.env DEPEND line. 889# --build-only - makes the jar(s) not added into package.env DEPEND line.
713# @param $1 - Package to get jars from. 890# (assumed automatically when called inside src_test)
891# --with-dependencies - get jars also from requested package's dependencies
892# transitively.
893# --virtual - Packages passed to this function are to be handled as virtuals
894# and will not have individual jar dependencies recorded.
895# --into $dir - symlink jar(s) into $dir (must exist) instead of .
896# @param $1 - Package to get jars from, or comma-separated list of packages in
897# case other parameters are not used.
714# @param $2 - jar from package. If not specified, all jars will be used. 898# @param $2 - jar from package. If not specified, all jars will be used.
715# @param $3 - When a single jar is specified, destination filename of the 899# @param $3 - When a single jar is specified, destination filename of the
716# symlink. Defaults to the name of the jar. 900# symlink. Defaults to the name of the jar.
717# ------------------------------------------------------------------------------ 901# ------------------------------------------------------------------------------
718# TODO could probably be cleaned up a little 902# TODO could probably be cleaned up a little
719java-pkg_jar-from() { 903java-pkg_jar-from() {
720 debug-print-function ${FUNCNAME} $* 904 debug-print-function ${FUNCNAME} $*
721 905
722 local build_only="" 906 local build_only=""
907 local destdir="."
908 local deep=""
909 local virtual=""
910 local record_jar=""
723 911
912 [[ "${EBUILD_PHASE}" == "test" ]] && build_only="build"
913
914 while [[ "${1}" == --* ]]; do
724 if [[ "${1}" = "--build-only" ]]; then 915 if [[ "${1}" = "--build-only" ]]; then
725 build_only="true" 916 build_only="build"
917 elif [[ "${1}" = "--with-dependencies" ]]; then
918 deep="--with-dependencies"
919 elif [[ "${1}" = "--virtual" ]]; then
920 virtual="true"
921 elif [[ "${1}" = "--into" ]]; then
922 destdir="${2}"
923 shift
924 else
925 die "java-pkg_jar-from called with unknown parameter: ${1}"
926 fi
726 shift 927 shift
727 fi 928 done
728 929
729 local target_pkg="${1}" target_jar="${2}" destjar="${3}" 930 local target_pkg="${1}" target_jar="${2}" destjar="${3}"
730 931
731 [[ -z ${target_pkg} ]] && die "Must specify a package" 932 [[ -z ${target_pkg} ]] && die "Must specify a package"
933
934 if [[ "${EAPI}" == "1" ]]; then
935 target_pkg="${target_pkg//:/-}"
936 fi
732 937
733 # default destjar to the target jar 938 # default destjar to the target jar
734 [[ -z "${destjar}" ]] && destjar="${target_jar}" 939 [[ -z "${destjar}" ]] && destjar="${target_jar}"
735 940
736 local error_msg="There was a problem getting the classpath for ${target_pkg}." 941 local error_msg="There was a problem getting the classpath for ${target_pkg}."
737 local classpath 942 local classpath
738 classpath="$(java-config --classpath=${target_pkg})" 943 classpath="$(java-config ${deep} --classpath=${target_pkg})"
739 [[ $? != 0 ]] && die ${error_msg} 944 [[ $? != 0 ]] && die ${error_msg}
945
946 # When we have commas this functions is called to bring jars from multiple
947 # packages. This affects recording of dependencencies performed later
948 # which expects one package only, so we do it here.
949 if [[ ${target_pkg} = *,* ]]; then
950 for pkg in ${target_pkg//,/ }; do
951 java-pkg_ensure-dep "${build_only}" "${pkg}"
952 [[ -z "${build_only}" ]] && java-pkg_record-jar_ "${pkg}"
953 done
954 # setting this disables further record-jar_ calls later
955 record_jar="true"
956 else
957 java-pkg_ensure-dep "${build_only}" "${target_pkg}"
958 fi
959
960 # Record the entire virtual as a dependency so that
961 # no jars are missed.
962 if [[ -z "${build_only}" && -n "${virtual}" ]]; then
963 java-pkg_record-jar_ "${target_pkg}"
964 # setting this disables further record-jars_ calls later
965 record_jar="true"
966 fi
967
968 pushd ${destdir} > /dev/null \
969 || die "failed to change directory to ${destdir}"
740 970
741 local jar 971 local jar
742 for jar in ${classpath//:/ }; do 972 for jar in ${classpath//:/ }; do
743 local jar_name=$(basename "${jar}") 973 local jar_name=$(basename "${jar}")
744 if [[ ! -f "${jar}" ]] ; then 974 if [[ ! -f "${jar}" ]] ; then
748 # If no specific target jar was indicated, link it 978 # If no specific target jar was indicated, link it
749 if [[ -z "${target_jar}" ]] ; then 979 if [[ -z "${target_jar}" ]] ; then
750 [[ -f "${target_jar}" ]] && rm "${target_jar}" 980 [[ -f "${target_jar}" ]] && rm "${target_jar}"
751 ln -snf "${jar}" \ 981 ln -snf "${jar}" \
752 || die "Failed to make symlink from ${jar} to ${jar_name}" 982 || die "Failed to make symlink from ${jar} to ${jar_name}"
983 if [[ -z "${record_jar}" ]]; then
984 if [[ -z "${build_only}" ]]; then
753 [[ -z "${build_only}" ]] && java-pkg_record-jar_ "${target_pkg}" "${jar}" 985 java-pkg_record-jar_ "${target_pkg}" "${jar}"
986 else
987 java-pkg_record-jar_ --build-only "${target_pkg}" "${jar}"
988 fi
989 fi
754 # otherwise, if the current jar is the target jar, link it 990 # otherwise, if the current jar is the target jar, link it
755 elif [[ "${jar_name}" == "${target_jar}" ]] ; then 991 elif [[ "${jar_name}" == "${target_jar}" ]] ; then
756 [[ -f "${destjar}" ]] && rm "${destjar}" 992 [[ -f "${destjar}" ]] && rm "${destjar}"
757 ln -snf "${jar}" "${destjar}" \ 993 ln -snf "${jar}" "${destjar}" \
758 || die "Failed to make symlink from ${jar} to ${destjar}" 994 || die "Failed to make symlink from ${jar} to ${destjar}"
995 if [[ -z "${record_jar}" ]]; then
996 if [[ -z "${build_only}" ]]; then
759 [[ -z "${build_only}" ]] && java-pkg_record-jar_ "${target_pkg}" "${jar}" 997 java-pkg_record-jar_ "${target_pkg}" "${jar}"
998 else
999 java-pkg_record-jar_ --build-only "${target_jar}" "${jar}"
1000 fi
1001 fi
1002 popd > /dev/null
760 return 0 1003 return 0
761 fi 1004 fi
762 done 1005 done
1006 popd > /dev/null
763 # if no target was specified, we're ok 1007 # if no target was specified, we're ok
764 if [[ -z "${target_jar}" ]] ; then 1008 if [[ -z "${target_jar}" ]] ; then
765 return 0 1009 return 0
766 # otherwise, die bitterly 1010 # otherwise, die bitterly
767 else 1011 else
791# Example: Get the classpath for xerces-2 and xalan, 1035# Example: Get the classpath for xerces-2 and xalan,
792# java-pkg_getjars xerces-2,xalan 1036# java-pkg_getjars xerces-2,xalan
793# Example Return: 1037# Example Return:
794# /usr/share/xerces-2/lib/xml-apis.jar:/usr/share/xerces-2/lib/xmlParserAPIs.jar:/usr/share/xalan/lib/xalan.jar 1038# /usr/share/xerces-2/lib/xml-apis.jar:/usr/share/xerces-2/lib/xmlParserAPIs.jar:/usr/share/xalan/lib/xalan.jar
795# 1039#
796# @param $1 - (optional) "--build-only" makes the jar(s) not added into 1040# @param $opt
797# package.env DEPEND line. 1041# --build-only - makes the jar(s) not added into package.env DEPEND line.
1042# (assumed automatically when called inside src_test)
1043# --with-dependencies - get jars also from requested package's dependencies
1044# transitively.
798# @param $2 - list of packages to get jars from 1045# @param $1 - list of packages to get jars from
799# (passed to java-config --classpath) 1046# (passed to java-config --classpath)
800# ------------------------------------------------------------------------------ 1047# ------------------------------------------------------------------------------
801java-pkg_getjars() { 1048java-pkg_getjars() {
802 debug-print-function ${FUNCNAME} $* 1049 debug-print-function ${FUNCNAME} $*
803 1050
1051 local build_only=""
1052 local deep=""
1053
1054 [[ "${EBUILD_PHASE}" == "test" ]] && build_only="build"
1055
1056 while [[ "${1}" == --* ]]; do
804 if [[ "${1}" = "--build-only" ]]; then 1057 if [[ "${1}" = "--build-only" ]]; then
805 local build_only="true" 1058 build_only="build"
1059 elif [[ "${1}" = "--with-dependencies" ]]; then
1060 deep="--with-dependencies"
1061 else
1062 die "java-pkg_jar-from called with unknown parameter: ${1}"
1063 fi
806 shift 1064 shift
807 fi 1065 done
808 1066
809 [[ ${#} -ne 1 ]] && die "${FUNCNAME} takes only one argument besides --build-only" 1067 [[ ${#} -ne 1 ]] && die "${FUNCNAME} takes only one argument besides --*"
810 1068
1069
811 local classpath pkgs="${1}" 1070 local pkgs="${1}"
1071
1072 if [[ "${EAPI}" == "1" ]]; then
1073 pkgs="${pkgs//:/-}"
1074 fi
1075
812 jars="$(java-config --classpath=${pkgs})" 1076 jars="$(java-config ${deep} --classpath=${pkgs})"
813 [[ -z "${jars}" ]] && die "java-config --classpath=${pkgs} failed" 1077 [[ $? != 0 ]] && die "java-config --classpath=${pkgs} failed"
814 debug-print "${pkgs}:${jars}" 1078 debug-print "${pkgs}:${jars}"
815 1079
816 if [[ -z "${classpath}" ]]; then 1080 for pkg in ${pkgs//,/ }; do
817 classpath="${jars}" 1081 java-pkg_ensure-dep "${build_only}" "${pkg}"
818 else 1082 done
819 classpath="${classpath}:${jars}"
820 fi
821 1083
822 # Only record jars that aren't build-only 1084 for pkg in ${pkgs//,/ }; do
823 if [[ -z "${build_only}" ]]; then 1085 if [[ -z "${build_only}" ]]; then
824 oldifs="${IFS}"
825 IFS=","
826 for pkg in ${pkgs}; do
827 java-pkg_record-jar_ "${pkg}" 1086 java-pkg_record-jar_ "${pkg}"
1087 else
1088 java-pkg_record-jar_ --build-only "${pkg}"
1089 fi
828 done 1090 done
829 IFS="${oldifs}"
830 fi
831 1091
832 echo "${classpath}" 1092 echo "${jars}"
833} 1093}
834 1094
835# ------------------------------------------------------------------------------ 1095# ------------------------------------------------------------------------------
836# @ebuild-function java-pkg_getjar 1096# @ebuild-function java-pkg_getjar
837# 1097#
844# @example 1104# @example
845# java-pkg_getjar xerces-2 xml-apis.jar 1105# java-pkg_getjar xerces-2 xml-apis.jar
846# @example-return 1106# @example-return
847# /usr/share/xerces-2/lib/xml-apis.jar 1107# /usr/share/xerces-2/lib/xml-apis.jar
848# 1108#
849# @param $1 - (optional) "--build-only" makes the jar not added into 1109# @param $opt
850# package.env DEPEND line. 1110# --build-only - makes the jar not added into package.env DEPEND line.
1111# --virtual - Packages passed to this function are to be handled as virtuals
1112# and will not have individual jar dependencies recorded.
851# @param $1 - package to use 1113# @param $1 - package to use
852# @param $2 - jar to get 1114# @param $2 - jar to get
853# ------------------------------------------------------------------------------ 1115# ------------------------------------------------------------------------------
854java-pkg_getjar() { 1116java-pkg_getjar() {
855 debug-print-function ${FUNCNAME} $* 1117 debug-print-function ${FUNCNAME} $*
856 1118
857 local build_only="" 1119 local build_only=""
1120 local virtual=""
1121 local record_jar=""
858 1122
1123 [[ "${EBUILD_PHASE}" == "test" ]] && build_only="build"
1124
1125 while [[ "${1}" == --* ]]; do
859 if [[ "${1}" = "--build-only" ]]; then 1126 if [[ "${1}" = "--build-only" ]]; then
860 build_only="true" 1127 build_only="build"
1128 elif [[ "${1}" == "--virtual" ]]; then
1129 virtual="true"
1130 else
1131 die "java-pkg_getjar called with unknown parameter: ${1}"
1132 fi
861 shift 1133 shift
862 fi 1134 done
1135
1136 [[ ${#} -ne 2 ]] && die "${FUNCNAME} takes only two arguments besides --*"
863 1137
864 local pkg="${1}" target_jar="${2}" jar 1138 local pkg="${1}" target_jar="${2}" jar
1139
1140 if [[ "${EAPI}" == "1" ]]; then
1141 pkg="${pkg//:/-}"
1142 fi
1143
865 [[ -z ${pkg} ]] && die "Must specify package to get a jar from" 1144 [[ -z ${pkg} ]] && die "Must specify package to get a jar from"
866 [[ -z ${target_jar} ]] && die "Must specify jar to get" 1145 [[ -z ${target_jar} ]] && die "Must specify jar to get"
867 1146
868 local error_msg="Could not find classpath for ${pkg}. Are you sure its installed?" 1147 local error_msg="Could not find classpath for ${pkg}. Are you sure its installed?"
869 local classpath 1148 local classpath
870 classpath=$(java-config --classpath=${pkg}) 1149 classpath=$(java-config --classpath=${pkg})
871 [[ $? != 0 ]] && die ${error_msg} 1150 [[ $? != 0 ]] && die ${error_msg}
872 1151
1152 java-pkg_ensure-dep "${build_only}" "${pkg}"
1153
1154 # Record the package(Virtual) as a dependency and then set build_only
1155 # So that individual jars are not recorded.
1156 if [[ -n "${virtual}" ]]; then
1157 if [[ -z "${build_only}" ]]; then
1158 java-pkg_record-jar_ "${pkg}"
1159 else
1160 java-pkg_record-jar_ --build-only "${pkg}"
1161 fi
1162 record_jar="true"
1163 fi
1164
873 for jar in ${classpath//:/ }; do 1165 for jar in ${classpath//:/ }; do
874 if [[ ! -f "${jar}" ]] ; then 1166 if [[ ! -f "${jar}" ]] ; then
875 die "Installation problem with jar ${jar} in ${pkg} - is it installed?" 1167 die "Installation problem with jar ${jar} in ${pkg} - is it installed?"
876 fi 1168 fi
877 1169
878 if [[ "$(basename ${jar})" == "${target_jar}" ]] ; then 1170 if [[ "$(basename ${jar})" == "${target_jar}" ]] ; then
879 # Only record jars that aren't build-only 1171 # Only record jars that aren't build-only
880 [[ -z "${build_only}" ]] && java-pkg_record-jar_ "${pkg}" "${jar}" 1172 if [[ -z "${record_jar}" ]]; then
1173 if [[ -z "${build_only}" ]]; then
1174 java-pkg_record-jar_ "${pkg}" "${jar}"
1175 else
1176 java-pkg_record-jar_ --build-only "${pkg}" "${jar}"
1177 fi
1178 fi
881 echo "${jar}" 1179 echo "${jar}"
882 return 0 1180 return 0
883 fi 1181 fi
884 done 1182 done
885 1183
886 die "Could not find ${target_jar} in ${pkg}" 1184 die "Could not find ${target_jar} in ${pkg}"
887 return 1 1185 return 1
888} 1186}
1187
1188# ------------------------------------------------------------------------------
1189# @ebuild-function java-pkg_register-dependency
1190#
1191# Registers runtime dependency on a package, list of packages, or a single jar
1192# from a package, into package.env DEPEND line. Can only be called in
1193# src_install phase.
1194# Intended for binary packages where you don't need to symlink the jars or get
1195# their classpath during build. As such, the dependencies only need to be
1196# specified in ebuild's RDEPEND, and should be omitted in DEPEND.
1197#
1198# @param $1 - comma-separated list of packages, or a single package
1199# @param $2 - if param $1 is a single package, optionally specify the jar
1200# to depend on
1201#
1202# Example: Record the dependency on whole xerces-2 and xalan,
1203# java-pkg_register-dependency xerces-2,xalan
1204# Example: Record the dependency on ant.jar from ant-core
1205# java-pkg_register-dependency ant-core ant.jar
1206#
1207# Note: Passing both list of packages as the first parameter AND specifying the
1208# jar as the second is not allowed and will cause the function to die. We assume
1209# that there's more chance one passes such combination as a mistake, than that
1210# there are more packages providing identically named jar without class
1211# collisions.
1212# ------------------------------------------------------------------------------
1213java-pkg_register-dependency() {
1214 debug-print-function ${FUNCNAME} $*
1215
1216 java-pkg_check-phase install
1217
1218 [[ ${#} -gt 2 ]] && die "${FUNCNAME} takes at most two arguments"
1219
1220 local pkgs="${1}"
1221 local jar="${2}"
1222
1223 [[ -z "${pkgs}" ]] && die "${FUNCNAME} called with no package(s) specified"
1224
1225 if [[ "${EAPI}" == "1" ]]; then
1226 pkgs="${pkgs//:/-}"
1227 fi
1228
1229 if [[ -z "${jar}" ]]; then
1230 for pkg in ${pkgs//,/ }; do
1231 java-pkg_ensure-dep runtime "${pkg}"
1232 java-pkg_record-jar_ "${pkg}"
1233 done
1234 else
1235 [[ ${pkgs} == *,* ]] && \
1236 die "${FUNCNAME} called with both package list and jar name"
1237 java-pkg_ensure-dep runtime "${pkgs}"
1238 java-pkg_record-jar_ "${pkgs}" "${jar}"
1239 fi
1240
1241 java-pkg_do_write_
1242}
1243
1244# ------------------------------------------------------------------------------
1245# @ebuild-function java-pkg_register-optional-dependency
1246#
1247# Registers optional runtime dependency on a package, list of packages, or a
1248# single jar from a package, into package.env OPTIONAL_DEPEND line. Can only be
1249# called in src_install phase.
1250# Intended for packages that can use other packages when those are in classpath.
1251# Will be put on classpath by launcher if they are installed. Typical case is
1252# JDBC implementations for various databases. It's better than having USE flag
1253# for each implementation triggering hard dependency.
1254#
1255# @param $1 - comma-separated list of packages, or a single package
1256# @param $2 - if param $1 is a single package, optionally specify the jar
1257# to depend on
1258#
1259# Example: Record the optional dependency on some jdbc providers
1260# java-pkg_register-optional-dependency jdbc-jaybird,jtds-1.2,jdbc-mysql
1261#
1262# Note: Passing both list of packages as the first parameter AND specifying the
1263# jar as the second is not allowed and will cause the function to die. We assume
1264# that there's more chance one passes such combination as a mistake, than that
1265# there are more packages providing identically named jar without class
1266# collisions.
1267# ------------------------------------------------------------------------------
1268java-pkg_register-optional-dependency() {
1269 debug-print-function ${FUNCNAME} $*
1270
1271 java-pkg_check-phase install
1272
1273 [[ ${#} -gt 2 ]] && die "${FUNCNAME} takes at most two arguments"
1274
1275 local pkgs="${1}"
1276 local jar="${2}"
1277
1278 [[ -z "${pkgs}" ]] && die "${FUNCNAME} called with no package(s) specified"
1279
1280 if [[ "${EAPI}" == "1" ]]; then
1281 pkgs="${pkgs//:/-}"
1282 fi
1283
1284 if [[ -z "${jar}" ]]; then
1285 for pkg in ${pkgs//,/ }; do
1286 java-pkg_record-jar_ --optional "${pkg}"
1287 done
1288 else
1289 [[ ${pkgs} == *,* ]] && \
1290 die "${FUNCNAME} called with both package list and jar name"
1291 java-pkg_record-jar_ --optional "${pkgs}" "${jar}"
1292 fi
1293
1294 java-pkg_do_write_
1295}
1296
1297# ------------------------------------------------------------------------------
1298# @ebuild-function java-pkg_register-environment-variable
1299#
1300# Register an arbitrary environment variable into package.env. The gjl launcher
1301# for this package or any package depending on this will export it into
1302# environement before executing java command.
1303# Must only be called in src_install phase.
1304#
1305# @param $1 - variable name
1306# @param $2 - variable value
1307# ------------------------------------------------------------------------------
1308JAVA_PKG_EXTRA_ENV="${T}/java-pkg-extra-env"
1309JAVA_PKG_EXTRA_ENV_VARS=""
1310java-pkg_register-environment-variable() {
1311 debug-print-function ${FUNCNAME} $*
1312
1313 java-pkg_check-phase install
1314
1315 [[ ${#} != 2 ]] && die "${FUNCNAME} takes two arguments"
1316
1317 echo "${1}=\"${2}\"" >> ${JAVA_PKG_EXTRA_ENV}
1318 JAVA_PKG_EXTRA_ENV_VARS="${JAVA_PKG_EXTRA_ENV_VARS} ${1}"
1319
1320 java-pkg_do_write_
1321}
1322
1323# ------------------------------------------------------------------------------
1324# @ebuild-function java-pkg_get-bootclasspath
1325#
1326# Returns classpath of a given bootclasspath-providing package version.
1327#
1328# @param $1 - the version of bootclasspath (e.g. 1.5), 'auto' for bootclasspath
1329# of the current JDK
1330# ------------------------------------------------------------------------------
1331
1332java-pkg_get-bootclasspath() {
1333 local version="${1}"
1334
1335 local bcp
1336 case "${version}" in
1337 auto)
1338 bcp="$(java-config -g BOOTCLASSPATH)"
1339 ;;
1340 1.5)
1341 bcp="$(java-pkg_getjars --build-only gnu-classpath-0.98)"
1342 ;;
1343 *)
1344 eerror "unknown parameter of java-pkg_get-bootclasspath"
1345 die "unknown parameter of java-pkg_get-bootclasspath"
1346 ;;
1347 esac
1348
1349 echo "${bcp}"
1350}
1351
889 1352
890# This function reads stdin, and based on that input, figures out how to 1353# This function reads stdin, and based on that input, figures out how to
891# populate jars from the filesystem. 1354# populate jars from the filesystem.
892# Need to figure out a good way of making use of this, ie be able to use a 1355# Need to figure out a good way of making use of this, ie be able to use a
893# string that was built instead of stdin 1356# string that was built instead of stdin
933# 1396#
934# Various other functions to use from an ebuild 1397# Various other functions to use from an ebuild
935# ------------------------------------------------------------------------------ 1398# ------------------------------------------------------------------------------
936 1399
937# ------------------------------------------------------------------------------ 1400# ------------------------------------------------------------------------------
938# @ebuild-function java-pkg_need 1401# @ebuild-function java-pkg_find-normal-jars
939# 1402#
940# Adds virtual dependencies, which can optionally be controlled by a USE flag. 1403# Find the files with suffix .jar file in the given directory or $WORKDIR
941# Currently supported virtuals are:
942# javamail
943# jdbc-stdext
944# jaf
945# jdbc-rowset
946# jms
947# 1404#
948# @param $1 - Optionally indicate that the dependencies are controlled by 1405# @param $1 - The directory to search for jar files (default: ${WORKDIR})
949# a use flag by specifying '--use' Requires $2.
950# @param $2 - USE flag which will enable the dependencies.
951# @param $@ - virtual packages to add depenedencies for
952# ------------------------------------------------------------------------------ 1406# ------------------------------------------------------------------------------
953# TODO rewrite to parse a line based declaration file instead -- karltk 1407java-pkg_find-normal-jars() {
954#java-pkg_need() { 1408 local dir=$1
955# debug-print-function ${FUNCNAME} $* 1409 [[ "${dir}" ]] || dir="${WORKDIR}"
956# local useflag 1410 local found
957# if [[ ${1} == "--use" ]]; then 1411 for jar in $(find "${dir}" -name "*.jar" -type f); do
958# useflag="${2}" 1412 echo "${jar}"
959# shift 2 1413 found="true"
960# fi
961#
962# if [[ -z ${1} ]]; then
963# die "Must specify at least one virtual package."
964# fi
965#
966# local depstr newdepstr
967#
968# for virtual in ${@}; do
969# if has ${virtual} ${JAVA_PKG_VNEED}; then
970# debug-print "Already registered virtual ${virtual}"
971# continue
972# fi
973# case ${virtual} in
974# javamail)
975# debug-print "java-pkg_need: adding javamail dependencies"
976# newdepstr="|| ( dev-java/gnu-javamail dev-java/sun-javamail-bin )"
977# ;;
978# jdbc-stdext)
979# debug-print "java-pkg_need: adding jdbc-stdext dependencies"
980# newdepstr="|| ( >=virtual/jdk-1.4 dev-java/jdbc2-stdext )"
981# ;;
982# jaf)
983# debug-print "java-pkg_need: adding jaf dependencies"
984# newdepstr="|| ( dev-java/gnu-jaf dev-java/sun-jaf-bin )"
985# ;;
986# jdbc-rowset)
987# debug-print "java-pkg_need: adding jdbc-rowset dependencies"
988# newdepstr="|| ( >=virtual/jdk-1.5 dev-java/sun-jdbc-rowset )"
989# ;;
990# jms)
991# debug-print "java-pkg_need: adding jms dependencies"
992# newdepstr="|| ( dev-java/sun-jms dev-java/openjms )"
993# ;;
994# *)
995# die "Invalid virtual: ${virtual}"
996# esac
997#
998# export JAVA_PKG_VNEED="${JAVA_PKG_VNEED} ${virtual}"
999#
1000# if [[ -n ${useflag} ]]; then
1001# depstr="${depstr} ${useflag}? ( ${newdepstr} )"
1002# else
1003# depstr="${depstr} ${newdepstr}"
1004# fi
1005# done 1414 done
1006# 1415 [[ "${found}" ]]
1007# [[ -z ${JAVA_PKG_NV_DEPEND} ]] && export JAVA_PKG_NV_DEPEND="${DEPEND}" 1416 return $?
1008# [[ -z ${JAVA_PKG_NV_RDEPEND} ]] && export JAVA_PKG_NV_RDEPEND="${RDEPEND}" 1417}
1009#
1010# export DEPEND="${DEPEND} ${depstr}"
1011# export RDEPEND="${RDEPEND} ${depstr}"
1012#}
1013 1418
1419# ------------------------------------------------------------------------------
1420# @ebuild-function java-pkg_ensure-no-bundled-jars
1421#
1422# Try to locate bundled jar files in ${WORKDIR} and die if found.
1014# This should be used after S has been populated with symlinks to jars 1423# This function should be called after WORKDIR has been populated with symlink
1015# TODO document 1424# to system jar files or bundled jars removed.
1425# ------------------------------------------------------------------------------
1016java-pkg_ensure-no-bundled-jars() { 1426java-pkg_ensure-no-bundled-jars() {
1017 debug-print-function ${FUNCNAME} $* 1427 debug-print-function ${FUNCNAME} $*
1018 pushd ${WORKDIR} >/dev/null 2>/dev/null
1019 1428
1020 local bundled_jars=$(find . -name "*.jar" -type f) 1429 local bundled_jars=$(java-pkg_find-normal-jars)
1021 if [[ -n ${bundled_jars} ]]; then 1430 if [[ -n ${bundled_jars} ]]; then
1022 echo "Bundled jars found:" 1431 echo "Bundled jars found:"
1023 local jar 1432 local jar
1024 for jar in ${bundled_jars}; do 1433 for jar in ${bundled_jars}; do
1025 echo $(pwd)${jar/./} 1434 echo $(pwd)${jar/./}
1026 done 1435 done
1027 die "Bundled jars found!" 1436 die "Bundled jars found!"
1028
1029 fi 1437 fi
1030 popd >/dev/null 2>/dev/null
1031} 1438}
1032 1439
1033# ------------------------------------------------------------------------------ 1440# ------------------------------------------------------------------------------
1034# @internal-function java-pkg_ensure-vm-version-sufficient 1441# @internal-function java-pkg_ensure-vm-version-sufficient
1035# 1442#
1162java-pkg_get-current-vm() { 1569java-pkg_get-current-vm() {
1163 echo ${GENTOO_VM} 1570 echo ${GENTOO_VM}
1164} 1571}
1165 1572
1166java-pkg_current-vm-matches() { 1573java-pkg_current-vm-matches() {
1167 hasq $(java-pkg_get-current-vm) ${@} 1574 has $(java-pkg_get-current-vm) ${@}
1168 return $? 1575 return $?
1169} 1576}
1170 1577
1171# ------------------------------------------------------------------------------ 1578# ------------------------------------------------------------------------------
1172# @ebuild-function java-pkg_get-source 1579# @ebuild-function java-pkg_get-source
1277 1684
1278 echo ${flags} 1685 echo ${flags}
1279} 1686}
1280 1687
1281java-pkg_ensure-gcj() { 1688java-pkg_ensure-gcj() {
1282 if ! built_with_use sys-devel/gcc gcj ; then 1689 # was enforcing sys-devel/gcc[gcj]
1283 ewarn 1690 die "${FUNCNAME} was removed. Use use-deps available as of EAPI 2 instead. #261562"
1284 ewarn "You must build gcc with the gcj support to build with gcj"
1285 ewarn
1286 ebeep 5
1287 die "No GCJ support found!"
1288 fi
1289} 1691}
1290 1692
1291java-pkg_ensure-test() { 1693java-pkg_ensure-test() {
1292 if hasq test ${FEATURES} && ! hasq -test ${FEATURES} \ 1694 # was enforcing USE=test if FEATURES=test
1293 && hasq test ${IUSE} && ! use test; 1695 die "${FUNCNAME} was removed. Package mangers handle this already. #278965"
1294 then 1696}
1295 eerror "You specified FEATURES=test, but USE=test is needed" 1697
1296 eerror "to pull in the additional dependencies for testing" 1698# ------------------------------------------------------------------------------
1297 die "Need USE=test enabled" 1699# @ebuild-function java-pkg_register-ant-task
1700#
1701# Register this package as ant task, so that ant will load it when no specific
1702# ANT_TASKS are specified. Note that even without this registering, all packages
1703# specified in ANT_TASKS will be loaded. Mostly used by the actual ant tasks
1704# packages, but can be also used by other ebuilds that used to symlink their
1705# .jar into /usr/share/ant-core/lib to get autoloaded, for backwards
1706# compatibility.
1707#
1708# @param --version x.y Register only for ant version x.y (otherwise for any ant
1709# version). Used by the ant-* packages to prevent loading of mismatched
1710# ant-core ant tasks after core was updated, before the tasks are updated,
1711# without a need for blockers.
1712# @param $1 Name to register as. Defaults to JAVA_PKG_NAME ($PN[-$SLOT])
1713# ------------------------------------------------------------------------------
1714java-pkg_register-ant-task() {
1715 local TASKS_DIR="tasks"
1716
1717 # check for --version x.y parameters
1718 while [[ -n "${1}" && -n "${2}" ]]; do
1719 local var="${1#--}"
1720 local val="${2}"
1721 if [[ "${var}" == "version" ]]; then
1722 TASKS_DIR="tasks-${val}"
1723 else
1724 die "Unknown parameter passed to java-pkg_register-ant-tasks: ${1} ${2}"
1298 fi 1725 fi
1726 shift 2
1727 done
1728
1729 local TASK_NAME="${1:-${JAVA_PKG_NAME}}"
1730
1731 dodir /usr/share/ant/${TASKS_DIR}
1732 touch "${D}/usr/share/ant/${TASKS_DIR}/${TASK_NAME}"
1733}
1734
1735# ------------------------------------------------------------------------------
1736# @internal-function java-pkg_ant-tasks-depend
1737#
1738# Translates the WANT_ANT_TASKS variable into valid dependencies.
1739# ------------------------------------------------------------------------------
1740java-pkg_ant-tasks-depend() {
1741 debug-print-function ${FUNCNAME} ${WANT_ANT_TASKS}
1742
1743 if [[ -n "${WANT_ANT_TASKS}" ]]; then
1744 local DEP=""
1745 for i in ${WANT_ANT_TASKS}
1746 do
1747 if [[ ${i} = ant-* ]]; then
1748 DEP="${DEP}dev-java/${i} "
1749 elif [[ ${i} = */*:* ]]; then
1750 DEP="${DEP}${i} "
1751 else
1752 echo "Invalid atom in WANT_ANT_TASKS: ${i}"
1753 return 1
1754 fi
1755 done
1756 echo ${DEP}
1757 return 0
1758 else
1759 return 0
1760 fi
1761}
1762
1763
1764# ------------------------------------------------------------------------------
1765# @internal-function ejunit_
1766#
1767# Internal Junit wrapper function. Makes it easier to run the tests and checks for
1768# dev-java/junit in DEPEND. Launches the tests using junit.textui.TestRunner.
1769#
1770# @param $1 - junit package (junit or junit-4)
1771# @param $2 - -cp or -classpath
1772# @param $3 - classpath; junit and recorded dependencies get appended
1773# @param $@ - the rest of the parameters are passed to java
1774ejunit_() {
1775 debug-print-function ${FUNCNAME} $*
1776
1777 local pkgs
1778 if [[ -f ${JAVA_PKG_DEPEND_FILE} ]]; then
1779 for atom in $(cat ${JAVA_PKG_DEPEND_FILE} | tr : ' '); do
1780 pkgs=${pkgs},$(echo ${atom} | sed -re "s/^.*@//")
1781 done
1782 fi
1783
1784 local junit=${1}
1785 shift 1
1786
1787 local cp=$(java-pkg_getjars --with-dependencies ${junit}${pkgs})
1788 if [[ ${1} = -cp || ${1} = -classpath ]]; then
1789 cp="${2}:${cp}"
1790 shift 2
1791 else
1792 cp=".:${cp}"
1793 fi
1794
1795 local runner=junit.textui.TestRunner
1796 if [[ "${junit}" == "junit-4" ]] ; then
1797 runner=org.junit.runner.JUnitCore
1798 fi
1799 debug-print "Calling: java -cp \"${cp}\" -Djava.awt.headless=true ${runner} ${@}"
1800 java -cp "${cp}" -Djava.awt.headless=true ${runner} "${@}" || die "Running junit failed"
1801}
1802
1803# ------------------------------------------------------------------------------
1804# @ebuild-function ejunit
1805#
1806# Junit wrapper function. Makes it easier to run the tests and checks for
1807# dev-java/junit in DEPEND. Launches the tests using org.junit.runner.JUnitCore.
1808#
1809# Examples:
1810# ejunit -cp build/classes org.blinkenlights.jid3.test.AllTests
1811# ejunit org.blinkenlights.jid3.test.AllTests
1812# ejunit org.blinkenlights.jid3.test.FirstTest \
1813# org.blinkenlights.jid3.test.SecondTest
1814#
1815# @param $1 - -cp or -classpath
1816# @param $2 - classpath; junit and recorded dependencies get appended
1817# @param $@ - the rest of the parameters are passed to java
1818# ------------------------------------------------------------------------------
1819ejunit() {
1820 debug-print-function ${FUNCNAME} $*
1821
1822 ejunit_ "junit" "${@}"
1823}
1824
1825# ------------------------------------------------------------------------------
1826# @ebuild-function ejunit4
1827#
1828# Junit4 wrapper function. Makes it easier to run the tests and checks for
1829# dev-java/junit:4 in DEPEND. Launches the tests using junit.textui.TestRunner.
1830#
1831# Examples:
1832# ejunit4 -cp build/classes org.blinkenlights.jid3.test.AllTests
1833# ejunit4 org.blinkenlights.jid3.test.AllTests
1834# ejunit4 org.blinkenlights.jid3.test.FirstTest \
1835# org.blinkenlights.jid3.test.SecondTest
1836#
1837# @param $1 - -cp or -classpath
1838# @param $2 - classpath; junit and recorded dependencies get appended
1839# @param $@ - the rest of the parameters are passed to java
1840# ------------------------------------------------------------------------------
1841ejunit4() {
1842 debug-print-function ${FUNCNAME} $*
1843
1844 ejunit_ "junit-4" "${@}"
1299} 1845}
1300 1846
1301# ------------------------------------------------------------------------------ 1847# ------------------------------------------------------------------------------
1302# @section-end helper 1848# @section-end helper
1303# ------------------------------------------------------------------------------ 1849# ------------------------------------------------------------------------------
1850
1851# ------------------------------------------------------------------------------
1852# @eclass-src_prepare
1853#
1854# src_prepare Searches for bundled jars
1855# Don't call directly, but via java-pkg-2_src_prepare!
1856# ------------------------------------------------------------------------------
1857
1858java-utils-2_src_prepare() {
1859 [[ ${EBUILD_PHASE} == prepare ]] &&
1860 java-pkg_func-exists java_prepare && java_prepare
1861
1862 # Remember that eant will call this unless called via Portage
1863 if [[ ! -e "${T}/java-utils-2_src_prepare-run" ]] && is-java-strict; then
1864 echo "Searching for bundled jars:"
1865 java-pkg_find-normal-jars || echo "None found."
1866 echo "Searching for bundled classes (no output if none found):"
1867 find "${WORKDIR}" -name "*.class"
1868 echo "Search done."
1869 fi
1870 touch "${T}/java-utils-2_src_prepare-run"
1871}
1872
1873# ------------------------------------------------------------------------------
1874# @eclass-pkg_preinst
1875#
1876# pkg_preinst Searches for missing and unneeded dependencies
1877# Don't call directly, but via java-pkg-2_pkg_preinst!
1878# ------------------------------------------------------------------------------
1879
1880java-utils-2_pkg_preinst() {
1881 if is-java-strict; then
1882 if has_version dev-java/java-dep-check; then
1883 [[ -e "${JAVA_PKG_ENV}" ]] || return
1884 local output=$(GENTOO_VM= java-dep-check --image "${D}" "${JAVA_PKG_ENV}")
1885 if [[ ${output} && has_version <=dev-java/java-dep-check-0.2 ]]; then
1886 ewarn "Possibly unneeded dependencies found in package.env:"
1887 for dep in ${output}; do
1888 ewarn "\t${dep}"
1889 done
1890 fi
1891 if [[ ${output} && has_version >dev-java/java-dep-check-0.2 ]]; then
1892 ewarn "${output}"
1893 fi
1894 else
1895 eerror "Install dev-java/java-dep-check for dependency checking"
1896 fi
1897 fi
1898}
1304 1899
1305# ------------------------------------------------------------------------------ 1900# ------------------------------------------------------------------------------
1306# @section-begin build 1901# @section-begin build
1307# @section-summary Build functions 1902# @section-summary Build functions
1308# 1903#
1312 1907
1313# ------------------------------------------------------------------------------ 1908# ------------------------------------------------------------------------------
1314# @ebuild-function eant 1909# @ebuild-function eant
1315# 1910#
1316# Ant wrapper function. Will use the appropriate compiler, based on user-defined 1911# Ant wrapper function. Will use the appropriate compiler, based on user-defined
1317# compiler. 1912# compiler. Will also set proper ANT_TASKS from the variable ANT_TASKS,
1318# 1913# variables:
1914# EANT_GENTOO_CLASSPATH - calls java-pkg_getjars for the value and adds to the
1915# gentoo.classpath property. Be sure to call
1916# java-ant_rewrite-classpath in src_unpack.
1917# EANT_NEEDS_TOOLS - add tools.jar to the gentoo.classpath. Should only be used
1918# for build-time purposes, the dependency is not recorded to
1919# package.env!
1920# *ANT_TASKS - used to determine ANT_TASKS before calling Ant.
1319# ------------------------------------------------------------------------------ 1921# ------------------------------------------------------------------------------
1320eant() { 1922eant() {
1321 debug-print-function ${FUNCNAME} $* 1923 debug-print-function ${FUNCNAME} $*
1322 1924
1323 # FIXME get this working 1925 if [[ ${EBUILD_PHASE} = compile ]]; then
1324# if is-java-strict && [[ ! ${DEPEND} =~ "dev-java/ant" ]]; then 1926 java-ant-2_src_configure
1927 java-utils-2_src_prepare
1928 fi
1929
1930 if ! has java-ant-2 ${INHERITED}; then
1931 local msg="You should inherit java-ant-2 when using eant"
1325# java-pkg_announce-qa-violation \ 1932 java-pkg_announce-qa-violation "${msg}"
1326# "Using eant, but not depending on dev-java/ant or dev-java/ant-core"
1327# fi 1933 fi
1328 1934
1329 local antflags="-Dnoget=true" 1935 local antflags="-Dnoget=true -Dmaven.mode.offline=true -Dbuild.sysclasspath=ignore"
1936
1330 java-pkg_init-compiler_ 1937 java-pkg_init-compiler_
1331 local compiler="${GENTOO_COMPILER}" 1938 local compiler="${GENTOO_COMPILER}"
1332 1939
1333 local compiler_env="${JAVA_PKG_COMPILER_DIR}/${compiler}" 1940 local compiler_env="${JAVA_PKG_COMPILER_DIR}/${compiler}"
1334
1335 local build_compiler="$(source ${compiler_env} 1>/dev/null 2>&1; echo ${ANT_BUILD_COMPILER})" 1941 local build_compiler="$(source ${compiler_env} 1>/dev/null 2>&1; echo ${ANT_BUILD_COMPILER})"
1336 if [[ "${compiler}" != "javac" && -z "${build_compiler}" ]]; then 1942 if [[ "${compiler}" != "javac" && -z "${build_compiler}" ]]; then
1337 die "ANT_BUILD_COMPILER undefined in ${compiler_env}" 1943 die "ANT_BUILD_COMPILER undefined in ${compiler_env}"
1338 fi 1944 fi
1339 1945
1347 if [[ -n ${build_compiler_deps} ]]; then 1953 if [[ -n ${build_compiler_deps} ]]; then
1348 antflags="${antflags} -lib $(java-config -p ${build_compiler_deps})" 1954 antflags="${antflags} -lib $(java-config -p ${build_compiler_deps})"
1349 fi 1955 fi
1350 fi 1956 fi
1351 1957
1958 for arg in "${@}"; do
1959 if [[ ${arg} = -lib ]]; then
1352 if is-java-strict; then 1960 if is-java-strict; then
1353 einfo "Disabling system classpath for ant" 1961 eerror "You should not use the -lib argument to eant because it will fail"
1354 antflags="${antflags} -Dbuild.sysclasspath=ignore" 1962 eerror "with JAVA_PKG_STRICT. Please use for example java-pkg_jar-from"
1963 eerror "or ant properties to make dependencies available."
1964 eerror "For ant tasks use WANT_ANT_TASKS or ANT_TASKS from."
1965 eerror "split ant (>=dev-java/ant-core-1.7)."
1966 die "eant -lib is deprecated/forbidden"
1967 else
1968 echo "eant -lib is deprecated. Turn JAVA_PKG_STRICT on for"
1969 echo "more info."
1970 fi
1355 fi 1971 fi
1972 done
1356 1973
1357 if [[ -n ${JAVA_PKG_DEBUG} ]]; then 1974 # parse WANT_ANT_TASKS for atoms
1358 antflags="${antflags} -debug" 1975 local want_ant_tasks
1976 for i in ${WANT_ANT_TASKS}; do
1977 if [[ ${i} = */*:* ]]; then
1978 i=${i#*/}
1979 i=${i%:0}
1980 want_ant_tasks+="${i/:/-} "
1981 else
1982 want_ant_tasks+="${i} "
1983 fi
1984 done
1985 # default ANT_TASKS to WANT_ANT_TASKS, if ANT_TASKS is not set explicitly
1986 ANT_TASKS="${ANT_TASKS:-${want_ant_tasks% }}"
1987
1988 # override ANT_TASKS with JAVA_PKG_FORCE_ANT_TASKS if it's set
1989 ANT_TASKS="${JAVA_PKG_FORCE_ANT_TASKS:-${ANT_TASKS}}"
1990
1991 # if ant-tasks is not set by ebuild or forced, use none
1992 ANT_TASKS="${ANT_TASKS:-none}"
1993
1994 # at this point, ANT_TASKS should be "all", "none" or explicit list
1995 if [[ "${ANT_TASKS}" == "all" ]]; then
1996 einfo "Using all available ANT_TASKS"
1997 elif [[ "${ANT_TASKS}" == "none" ]]; then
1998 einfo "Disabling all optional ANT_TASKS"
1999 else
2000 einfo "Using following ANT_TASKS: ${ANT_TASKS}"
2001 fi
2002
2003 export ANT_TASKS
2004
2005 [[ -n ${JAVA_PKG_DEBUG} ]] && antflags="${antflags} --execdebug -debug"
2006 [[ -n ${PORTAGE_QUIET} ]] && antflags="${antflags} -q"
2007
2008 local gcp="${EANT_GENTOO_CLASSPATH}"
2009 local getjarsarg=""
2010
2011 if [[ ${EBUILD_PHASE} = "test" ]]; then
2012 antflags="${antflags} -DJunit.present=true"
2013 [[ ${ANT_TASKS} = *ant-junit* ]] && gcp="${gcp} junit"
2014 getjarsarg="--with-dependencies"
2015 else
2016 antflags="${antflags} -Dmaven.test.skip=true"
2017 fi
2018
2019 local cp
2020
2021 for atom in ${gcp}; do
2022 cp="${cp}:$(java-pkg_getjars ${getjarsarg} ${atom})"
2023 done
2024
2025 [[ -n "${EANT_NEEDS_TOOLS}" ]] && cp="${cp}:$(java-config --tools)"
2026
2027 if [[ ${cp} ]]; then
2028 # It seems ant does not like single quotes around ${cp}
2029 cp=${cp#:}
2030 [[ ${EANT_GENTOO_CLASSPATH_EXTRA} ]] && \
2031 cp="${cp}:${EANT_GENTOO_CLASSPATH_EXTRA}"
2032 antflags="${antflags} -Dgentoo.classpath=\"${cp}\""
1359 fi 2033 fi
1360 2034
1361 [[ -n ${JAVA_PKG_DEBUG} ]] && echo ant ${antflags} "${@}" 2035 [[ -n ${JAVA_PKG_DEBUG} ]] && echo ant ${antflags} "${@}"
2036 debug-print "Calling ant (GENTOO_VM: ${GENTOO_VM}): ${antflags} ${@}"
1362 ant ${antflags} "${@}" || die "eant failed" 2037 ant ${antflags} "${@}" || die "eant failed"
1363
1364} 2038}
1365 2039
1366# ------------------------------------------------------------------------------ 2040# ------------------------------------------------------------------------------
1367# @ebuild-function ejavac 2041# @ebuild-function ejavac
1368# 2042#
1463# This shouldn't be used directly. Instead, java-pkg and java-pkg-opt will 2137# This shouldn't be used directly. Instead, java-pkg and java-pkg-opt will
1464# call it during each of the phases of the merge process. 2138# call it during each of the phases of the merge process.
1465# 2139#
1466# ----------------------------------------------------------------------------- 2140# -----------------------------------------------------------------------------
1467java-pkg_init() { 2141java-pkg_init() {
2142 debug-print-function ${FUNCNAME} $*
2143
2144 # Don't set up build environment if installing from binary. #206024 #258423
2145 [[ "${MERGE_TYPE}" == "binary" ]] && return
2146 # Also try Portage's nonstandard EMERGE_FROM for old EAPIs, if it doesn't
2147 # work nothing is lost.
2148 has ${EAPI:-0} 0 1 2 3 && [[ "${EMERGE_FROM}" == "binary" ]] && return
2149
1468 unset JAVAC 2150 unset JAVAC
1469 unset JAVA_HOME 2151 unset JAVA_HOME
2152
2153 java-config --help >/dev/null || {
2154 eerror ""
2155 eerror "Can't run java-config --help"
2156 eerror "Have you upgraded python recently but haven't"
2157 eerror "run python-updater yet?"
2158 die "Can't run java-config --help"
2159 }
2160
2161 # People do all kinds of weird things.
2162 # http://forums.gentoo.org/viewtopic-p-3943166.html
2163 local silence="${SILENCE_JAVA_OPTIONS_WARNING}"
2164 local accept="${I_WANT_GLOBAL_JAVA_OPTIONS}"
2165 if [[ -n ${_JAVA_OPTIONS} && -z ${accept} && -z ${silence} ]]; then
2166 ewarn "_JAVA_OPTIONS changes what java -version outputs at least for"
2167 ewarn "sun-jdk vms and and as such break configure scripts that"
2168 ewarn "use it (for example app-office/openoffice) so we filter it out."
2169 ewarn "Use SILENCE_JAVA_OPTIONS_WARNING=true in the environment (use"
2170 ewarn "make.conf for example) to silence this warning or"
2171 ewarn "I_WANT_GLOBAL_JAVA_OPTIONS to not filter it."
2172 fi
2173
2174 if [[ -z ${accept} ]]; then
2175 # export _JAVA_OPTIONS= doesn't work because it will show up in java
2176 # -version output
2177 unset _JAVA_OPTIONS
2178 # phase hooks make this run many times without this
2179 I_WANT_GLOBAL_JAVA_OPTIONS="true"
2180 fi
2181
2182 if java-pkg_func-exists ant_src_unpack; then
2183 java-pkg_announce-qa-violation "Using old ant_src_unpack. Should be src_unpack"
2184 fi
2185
1470 java-pkg_init_paths_ 2186 java-pkg_init_paths_
1471 java-pkg_switch-vm 2187 java-pkg_switch-vm
1472 PATH=${JAVA_HOME}/bin:${PATH} 2188 PATH=${JAVA_HOME}/bin:${PATH}
1473 2189
1474 # TODO we will probably want to set JAVAC and JAVACFLAGS 2190 # TODO we will probably want to set JAVAC and JAVACFLAGS
1475 2191
1476 # Do some QA checks 2192 # Do some QA checks
1477 java-pkg_check-jikes 2193 java-pkg_check-jikes
2194
2195 # Can't use unset here because Portage does not save the unset
2196 # see https://bugs.gentoo.org/show_bug.cgi?id=189417#c11
1478 2197
1479 # When users have crazy classpaths some packages can fail to compile. 2198 # When users have crazy classpaths some packages can fail to compile.
1480 # and everything should work with empty CLASSPATH. 2199 # and everything should work with empty CLASSPATH.
1481 # This also helps prevent unexpected dependencies on random things 2200 # This also helps prevent unexpected dependencies on random things
1482 # from the CLASSPATH. 2201 # from the CLASSPATH.
1483 unset CLASSPATH 2202 export CLASSPATH=
2203
2204 # Unset external ANT_ stuff
2205 export ANT_TASKS=
2206 export ANT_OPTS=
2207 export ANT_RESPECT_JAVA_HOME=
1484} 2208}
1485 2209
1486# ------------------------------------------------------------------------------ 2210# ------------------------------------------------------------------------------
1487# @function-internal java-pkg-init-compiler_ 2211# @function-internal java-pkg-init-compiler_
1488# 2212#
1579 done 2303 done
1580 2304
1581 # If it hasn't been defined already, default to javac 2305 # If it hasn't been defined already, default to javac
1582 if [[ -z ${GENTOO_COMPILER} ]]; then 2306 if [[ -z ${GENTOO_COMPILER} ]]; then
1583 if [[ -n ${compilers} ]]; then 2307 if [[ -n ${compilers} ]]; then
1584 einfo "No suitable compiler found: defaulting javac for compilation" 2308 einfo "No suitable compiler found: defaulting to JDK default for compilation"
1585 else 2309 else
1586 # probably don't need to notify users about the default. 2310 # probably don't need to notify users about the default.
1587 :;#einfo "Defaulting to javac for compilation" 2311 :;#einfo "Defaulting to javac for compilation"
1588 fi 2312 fi
2313 if java-config -g GENTOO_COMPILER 2> /dev/null; then
2314 export GENTOO_COMPILER=$(java-config -g GENTOO_COMPILER)
2315 else
1589 export GENTOO_COMPILER=javac 2316 export GENTOO_COMPILER=javac
2317 fi
1590 else 2318 else
1591 einfo "Using ${GENTOO_COMPILER} for compilation" 2319 einfo "Using ${GENTOO_COMPILER} for compilation"
1592 fi 2320 fi
1593 2321
1594} 2322}
1610 fi 2338 fi
1611 2339
1612 JAVA_PKG_SHAREPATH="${DESTTREE}/share/${JAVA_PKG_NAME}" 2340 JAVA_PKG_SHAREPATH="${DESTTREE}/share/${JAVA_PKG_NAME}"
1613 JAVA_PKG_SOURCESPATH="${JAVA_PKG_SHAREPATH}/sources/" 2341 JAVA_PKG_SOURCESPATH="${JAVA_PKG_SHAREPATH}/sources/"
1614 JAVA_PKG_ENV="${D}${JAVA_PKG_SHAREPATH}/package.env" 2342 JAVA_PKG_ENV="${D}${JAVA_PKG_SHAREPATH}/package.env"
2343 JAVA_PKG_VIRTUALS_PATH="${DESTTREE}/share/java-config-2/virtuals"
2344 JAVA_PKG_VIRTUAL_PROVIDER="${D}/${JAVA_PKG_VIRTUALS_PATH}/${JAVA_PKG_NAME}"
1615 2345
1616 [[ -z "${JAVA_PKG_JARDEST}" ]] && JAVA_PKG_JARDEST="${JAVA_PKG_SHAREPATH}/lib" 2346 [[ -z "${JAVA_PKG_JARDEST}" ]] && JAVA_PKG_JARDEST="${JAVA_PKG_SHAREPATH}/lib"
1617 [[ -z "${JAVA_PKG_LIBDEST}" ]] && JAVA_PKG_LIBDEST="${DESTTREE}/$(get_libdir)/${JAVA_PKG_NAME}" 2347 [[ -z "${JAVA_PKG_LIBDEST}" ]] && JAVA_PKG_LIBDEST="${DESTTREE}/$(get_libdir)/${JAVA_PKG_NAME}"
1618 [[ -z "${JAVA_PKG_WARDEST}" ]] && JAVA_PKG_WARDEST="${JAVA_PKG_SHAREPATH}/webapps" 2348 [[ -z "${JAVA_PKG_WARDEST}" ]] && JAVA_PKG_WARDEST="${JAVA_PKG_SHAREPATH}/webapps"
1619 2349
1632# Writes the package.env out to disk. 2362# Writes the package.env out to disk.
1633# 2363#
1634# ------------------------------------------------------------------------------ 2364# ------------------------------------------------------------------------------
1635# TODO change to do-write, to match everything else 2365# TODO change to do-write, to match everything else
1636java-pkg_do_write_() { 2366java-pkg_do_write_() {
2367 debug-print-function ${FUNCNAME} $*
1637 java-pkg_init_paths_ 2368 java-pkg_init_paths_
1638 # Create directory for package.env 2369 # Create directory for package.env
1639 dodir "${JAVA_PKG_SHAREPATH}" 2370 dodir "${JAVA_PKG_SHAREPATH}"
1640 if [[ -n "${JAVA_PKG_CLASSPATH}" || -n "${JAVA_PKG_LIBRARY}" || -f "${JAVA_PKG_DEPEND}" ]]; then 2371 if [[ -n "${JAVA_PKG_CLASSPATH}" || -n "${JAVA_PKG_LIBRARY}" || -f \
2372 "${JAVA_PKG_DEPEND_FILE}" || -f \
2373 "${JAVA_PKG_OPTIONAL_DEPEND_FILE}" ]]; then
1641 # Create package.env 2374 # Create package.env
1642 ( 2375 (
1643 echo "DESCRIPTION=\"${DESCRIPTION}\"" 2376 echo "DESCRIPTION=\"${DESCRIPTION}\""
1644 echo "GENERATION=\"2\"" 2377 echo "GENERATION=\"2\""
2378 echo "SLOT=\"${SLOT}\""
2379 echo "CATEGORY=\"${CATEGORY}\""
2380 echo "PVR=\"${PVR}\""
1645 2381
1646 [[ -n "${JAVA_PKG_CLASSPATH}" ]] && echo "CLASSPATH=\"${JAVA_PKG_CLASSPATH}\"" 2382 [[ -n "${JAVA_PKG_CLASSPATH}" ]] && echo "CLASSPATH=\"${JAVA_PKG_CLASSPATH}\""
1647 [[ -n "${JAVA_PKG_LIBRARY}" ]] && echo "LIBRARY_PATH=\"${JAVA_PKG_LIBRARY}\"" 2383 [[ -n "${JAVA_PKG_LIBRARY}" ]] && echo "LIBRARY_PATH=\"${JAVA_PKG_LIBRARY}\""
1648 [[ -n "${JAVA_PROVIDE}" ]] && echo "PROVIDES=\"${JAVA_PROVIDE}\"" 2384 [[ -n "${JAVA_PROVIDE}" ]] && echo "PROVIDES=\"${JAVA_PROVIDE}\""
1649 [[ -f "${JAVA_PKG_DEPEND}" ]] && echo "DEPEND=\"$(cat ${JAVA_PKG_DEPEND} | uniq | tr '\n' ':')\"" 2385 [[ -f "${JAVA_PKG_DEPEND_FILE}" ]] \
2386 && echo "DEPEND=\"$(sort -u "${JAVA_PKG_DEPEND_FILE}" | tr '\n' ':')\""
2387 [[ -f "${JAVA_PKG_OPTIONAL_DEPEND_FILE}" ]] \
2388 && echo "OPTIONAL_DEPEND=\"$(sort -u "${JAVA_PKG_OPTIONAL_DEPEND_FILE}" | tr '\n' ':')\""
1650 echo "VM=\"$(echo ${RDEPEND} ${DEPEND} | sed -e 's/ /\n/g' | sed -n -e '/virtual\/\(jre\|jdk\)/ { p;q }')\"" # TODO cleanup ! 2389 echo "VM=\"$(echo ${RDEPEND} ${DEPEND} | sed -e 's/ /\n/g' | sed -n -e '/virtual\/\(jre\|jdk\)/ { p;q }')\"" # TODO cleanup !
2390 [[ -f "${JAVA_PKG_BUILD_DEPEND_FILE}" ]] \
2391 && echo "BUILD_DEPEND=\"$(sort -u "${JAVA_PKG_BUILD_DEPEND_FILE}" | tr '\n' ':')\""
1651 ) > "${JAVA_PKG_ENV}" 2392 ) > "${JAVA_PKG_ENV}"
1652 2393
1653 # register target/source 2394 # register target/source
1654 local target="$(java-pkg_get-target)" 2395 local target="$(java-pkg_get-target)"
1655 local source="$(java-pkg_get-source)" 2396 local source="$(java-pkg_get-source)"
1665 2406
1666 2407
1667 echo "MERGE_VM=\"${GENTOO_VM}\"" >> "${JAVA_PKG_ENV}" 2408 echo "MERGE_VM=\"${GENTOO_VM}\"" >> "${JAVA_PKG_ENV}"
1668 [[ -n ${GENTOO_COMPILER} ]] && echo "MERGE_COMPILER=\"${GENTOO_COMPILER}\"" >> "${JAVA_PKG_ENV}" 2409 [[ -n ${GENTOO_COMPILER} ]] && echo "MERGE_COMPILER=\"${GENTOO_COMPILER}\"" >> "${JAVA_PKG_ENV}"
1669 2410
2411 # extra env variables
2412 if [[ -n "${JAVA_PKG_EXTRA_ENV_VARS}" ]]; then
2413 cat "${JAVA_PKG_EXTRA_ENV}" >> "${JAVA_PKG_ENV}" || die
2414 # nested echo to remove leading/trailing spaces
2415 echo "ENV_VARS=\"$(echo ${JAVA_PKG_EXTRA_ENV_VARS})\"" \
2416 >> "${JAVA_PKG_ENV}" || die
2417 fi
2418
1670 # Strip unnecessary leading and trailing colons 2419 # Strip unnecessary leading and trailing colons
1671 # TODO try to cleanup if possible 2420 # TODO try to cleanup if possible
1672 sed -e "s/=\":/=\"/" -e "s/:\"$/\"/" -i "${JAVA_PKG_ENV}" || die "Did you forget to call java_init ?" 2421 sed -e "s/=\":/=\"/" -e "s/:\"$/\"/" -i "${JAVA_PKG_ENV}" || die "Did you forget to call java_init ?"
2422 else
2423 debug-print "JAVA_PKG_CLASSPATH, JAVA_PKG_LIBRARY, JAVA_PKG_DEPEND_FILE"
2424 debug-print "or JAVA_PKG_OPTIONAL_DEPEND_FILE not defined so can't"
2425 debug-print "write package.env."
1673 fi 2426 fi
1674} 2427}
1675 2428
1676# ------------------------------------------------------------------------------ 2429# ------------------------------------------------------------------------------
1677# @internal-function java-pkg_record-jar_ 2430# @internal-function java-pkg_record-jar_
1678# 2431#
1679# Record a dependency to the package.env 2432# Record an (optional) dependency to the package.env
1680# 2433# @param --optional - record dependency as optional
2434# @param --build - record dependency as build_only
2435# @param $1 - package to record
2436# @param $2 - (optional) jar of package to record
1681# ------------------------------------------------------------------------------ 2437# ------------------------------------------------------------------------------
1682JAVA_PKG_DEPEND="${T}/java-pkg-depend" 2438JAVA_PKG_DEPEND_FILE="${T}/java-pkg-depend"
2439JAVA_PKG_OPTIONAL_DEPEND_FILE="${T}/java-pkg-optional-depend"
2440JAVA_PKG_BUILD_DEPEND_FILE="${T}/java-pkg-build-depend"
1683 2441
1684java-pkg_record-jar_() { 2442java-pkg_record-jar_() {
1685 debug-print-function ${FUNCNAME} $* 2443 debug-print-function ${FUNCNAME} $*
2444
2445 local depend_file="${JAVA_PKG_DEPEND_FILE}"
2446 case "${1}" in
2447 "--optional") depend_file="${JAVA_PKG_OPTIONAL_DEPEND_FILE}"; shift;;
2448 "--build-only") depend_file="${JAVA_PKG_BUILD_DEPEND_FILE}"; shift;;
2449 esac
1686 2450
1687 local pkg=${1} jar=${2} append 2451 local pkg=${1} jar=${2} append
1688 if [[ -z "${jar}" ]]; then 2452 if [[ -z "${jar}" ]]; then
1689 append="${pkg}" 2453 append="${pkg}"
1690 else 2454 else
1691 append="$(basename ${jar})@${pkg}" 2455 append="$(basename ${jar})@${pkg}"
1692 fi 2456 fi
1693 2457
1694 echo ${append} >> ${JAVA_PKG_DEPEND} 2458 echo "${append}" >> "${depend_file}"
1695} 2459}
1696 2460
1697# ------------------------------------------------------------------------------ 2461# ------------------------------------------------------------------------------
1698# @internal-function java-pkg_append_ 2462# @internal-function java-pkg_append_
1699# 2463#
1743# 2507#
1744# @return 0 - function is declared 2508# @return 0 - function is declared
1745# @return 1 - function is undeclared 2509# @return 1 - function is undeclared
1746# ------------------------------------------------------------------------------ 2510# ------------------------------------------------------------------------------
1747java-pkg_func-exists() { 2511java-pkg_func-exists() {
1748 if [[ -n "$(declare -f ${1})" ]]; then 2512 declare -F ${1} > /dev/null
1749 return 0
1750 else
1751 return 1
1752 fi
1753} 2513}
1754 2514
1755# ------------------------------------------------------------------------------ 2515# ------------------------------------------------------------------------------
1756# @internal-function java-pkg_setup-vm 2516# @internal-function java-pkg_setup-vm
1757# 2517#
1765 if [[ "${vendor}" == "sun" ]] && java-pkg_is-vm-version-ge "1.5" ; then 2525 if [[ "${vendor}" == "sun" ]] && java-pkg_is-vm-version-ge "1.5" ; then
1766 addpredict "/dev/random" 2526 addpredict "/dev/random"
1767 elif [[ "${vendor}" == "ibm" ]]; then 2527 elif [[ "${vendor}" == "ibm" ]]; then
1768 addpredict "/proc/self/maps" 2528 addpredict "/proc/self/maps"
1769 addpredict "/proc/cpuinfo" 2529 addpredict "/proc/cpuinfo"
1770 export LANG="C" LC_ALL="C" 2530 addpredict "/proc/self/coredump_filter"
2531 elif [[ "${vendor}" == "oracle" ]]; then
2532 addpredict "/dev/random"
2533 addpredict "/proc/self/coredump_filter"
2534 elif [[ "${vendor}" == icedtea* ]] && java-pkg_is-vm-version-ge "1.7" ; then
2535 addpredict "/dev/random"
2536 addpredict "/proc/self/coredump_filter"
1771 elif [[ "${vendor}" == "jrockit" ]]; then 2537 elif [[ "${vendor}" == "jrockit" ]]; then
1772 addpredict "/proc/cpuinfo" 2538 addpredict "/proc/cpuinfo"
1773 fi 2539 fi
1774} 2540}
1775 2541
1776# ------------------------------------------------------------------------------ 2542# ------------------------------------------------------------------------------
1777# @internal-function java-pkg_needs-vm 2543# @internal-function java-pkg_needs-vm
1778# 2544#
1779# Does the current package depend on virtual/jdk? 2545# Does the current package depend on virtual/jdk or does it set
2546# JAVA_PKG_WANT_BUILD_VM?
1780# 2547#
1781# @return 0 - Package depends on virtual/jdk 2548# @return 0 - Package depends on virtual/jdk
1782# @return 1 - Package does not depend on virtual/jdk 2549# @return 1 - Package does not depend on virtual/jdk
1783# ------------------------------------------------------------------------------ 2550# ------------------------------------------------------------------------------
1784java-pkg_needs-vm() { 2551java-pkg_needs-vm() {
1785 debug-print-function ${FUNCNAME} $* 2552 debug-print-function ${FUNCNAME} $*
1786 2553
1787 if [[ -n "$(echo ${DEPEND} | sed -e '\:virtual/jdk:!d')" ]]; then 2554 if [[ -n "$(echo ${JAVA_PKG_NV_DEPEND:-${DEPEND}} | sed -e '\:virtual/jdk:!d')" ]]; then
1788 return 0 2555 return 0
1789 fi 2556 fi
2557
2558 [[ -n "${JAVA_PKG_WANT_BUILD_VM}" ]] && return 0
1790 2559
1791 return 1 2560 return 1
1792} 2561}
1793 2562
1794# ------------------------------------------------------------------------------ 2563# ------------------------------------------------------------------------------
1820# ------------------------------------------------------------------------------ 2589# ------------------------------------------------------------------------------
1821java-pkg_get-vm-version() { 2590java-pkg_get-vm-version() {
1822 debug-print-function ${FUNCNAME} $* 2591 debug-print-function ${FUNCNAME} $*
1823 2592
1824 java-config -g PROVIDES_VERSION 2593 java-config -g PROVIDES_VERSION
2594}
2595
2596# ------------------------------------------------------------------------------
2597# @internal-function java-pkg_build-vm-from-handle
2598#
2599# Selects a build vm from a list of vm handles. First checks for the system-vm
2600# beeing usable, then steps through the listed handles till a suitable vm is
2601# found.
2602#
2603# @return - VM handle of an available JDK
2604# ------------------------------------------------------------------------------
2605java-pkg_build-vm-from-handle() {
2606 debug-print-function ${FUNCNAME} "$*"
2607
2608 local vm
2609 vm=$(java-pkg_get-current-vm 2>/dev/null)
2610 if [[ $? -eq 0 ]]; then
2611 if has ${vm} ${JAVA_PKG_WANT_BUILD_VM}; then
2612 echo ${vm}
2613 return 0
2614 fi
2615 fi
2616
2617 for vm in ${JAVA_PKG_WANT_BUILD_VM}; do
2618 if java-config-2 --select-vm=${vm} 2>/dev/null; then
2619 echo ${vm}
2620 return 0
2621 fi
2622 done
2623
2624 eerror "${FUNCNAME}: No vm found for handles: ${JAVA_PKG_WANT_BUILD_VM}"
2625 return 1
1825} 2626}
1826 2627
1827# ------------------------------------------------------------------------------ 2628# ------------------------------------------------------------------------------
1828# @internal-function java-pkg_switch-vm 2629# @internal-function java-pkg_switch-vm
1829# 2630#
1840 # If you're forcing the VM, I hope you know what your doing... 2641 # If you're forcing the VM, I hope you know what your doing...
1841 debug-print "JAVA_PKG_FORCE_VM used: ${JAVA_PKG_FORCE_VM}" 2642 debug-print "JAVA_PKG_FORCE_VM used: ${JAVA_PKG_FORCE_VM}"
1842 export GENTOO_VM="${JAVA_PKG_FORCE_VM}" 2643 export GENTOO_VM="${JAVA_PKG_FORCE_VM}"
1843 # if we're allowed to switch the vm... 2644 # if we're allowed to switch the vm...
1844 elif [[ "${JAVA_PKG_ALLOW_VM_CHANGE}" == "yes" ]]; then 2645 elif [[ "${JAVA_PKG_ALLOW_VM_CHANGE}" == "yes" ]]; then
1845 debug-print "depend-java-query: NV_DEPEND: ${JAVA_PKG_NV_DEPEND:-${DEPEND}} VNEED: ${JAVA_PKG_VNEED}" 2646 # if there is an explicit list of handles to choose from
1846 if [[ -n ${JAVA_PKG_VNEED} ]]; then 2647 if [[ -n "${JAVA_PKG_WANT_BUILD_VM}" ]]; then
1847 GENTOO_VM="$(depend-java-query --need-virtual "${JAVA_PKG_VNEED}" --get-vm "${JAVA_PKG_NV_DEPEND:-${DEPEND}}")" 2648 debug-print "JAVA_PKG_WANT_BUILD_VM used: ${JAVA_PKG_WANT_BUILD_VM}"
2649 GENTOO_VM=$(java-pkg_build-vm-from-handle)
2650 if [[ $? != 0 ]]; then
2651 eerror "${FUNCNAME}: No VM found for handles: ${JAVA_PKG_WANT_BUILD_VM}"
2652 die "${FUNCNAME}: Failed to determine VM for building"
2653 fi
2654 # JAVA_PKG_WANT_SOURCE and JAVA_PKG_WANT_TARGET are required as
2655 # they can't be deduced from handles.
2656 if [[ -z "${JAVA_PKG_WANT_SOURCE}" ]]; then
2657 eerror "JAVA_PKG_WANT_BUILD_VM specified but not JAVA_PKG_WANT_SOURCE"
2658 die "Specify JAVA_PKG_WANT_SOURCE"
2659 fi
2660 if [[ -z "${JAVA_PKG_WANT_TARGET}" ]]; then
2661 eerror "JAVA_PKG_WANT_BUILD_VM specified but not JAVA_PKG_WANT_TARGET"
2662 die "Specify JAVA_PKG_WANT_TARGET"
2663 fi
2664 # otherwise determine a vm from dep string
1848 else 2665 else
2666 debug-print "depend-java-query: NV_DEPEND: ${JAVA_PKG_NV_DEPEND:-${DEPEND}}"
1849 GENTOO_VM="$(depend-java-query --get-vm "${JAVA_PKG_NV_DEPEND:-${DEPEND}}")" 2667 GENTOO_VM="$(depend-java-query --get-vm "${JAVA_PKG_NV_DEPEND:-${DEPEND}}")"
2668 if [[ -z "${GENTOO_VM}" || "${GENTOO_VM}" == "None" ]]; then
2669 eerror "Unable to determine VM for building from dependencies:"
2670 echo "NV_DEPEND: ${JAVA_PKG_NV_DEPEND:-${DEPEND}}"
2671 die "Failed to determine VM for building."
2672 fi
1850 fi 2673 fi
1851 if [[ -z "${GENTOO_VM}" || "${GENTOO_VM}" == "None" ]]; then
1852 eerror "Unable to determine VM for building from dependencies:"
1853 echo "NV_DEPEND: ${JAVA_PKG_NV_DEPEND:-${DEPEND}}"
1854 echo "VNEED: ${JAVA_PKG_VNEED}"
1855 die "Failed to determine VM for building."
1856 else
1857 export GENTOO_VM 2674 export GENTOO_VM
1858 fi
1859 # otherwise just make sure the current VM is sufficient 2675 # otherwise just make sure the current VM is sufficient
1860 else 2676 else
1861 java-pkg_ensure-vm-version-sufficient 2677 java-pkg_ensure-vm-version-sufficient
1862 fi 2678 fi
1863 debug-print "Using: $(java-config -f)" 2679 debug-print "Using: $(java-config -f)"
1879 2695
1880 #TODO If you know a better solution let us know. 2696 #TODO If you know a better solution let us know.
1881 java-pkg_append_ LD_LIBRARY_PATH "$(java-config -g LDPATH)" 2697 java-pkg_append_ LD_LIBRARY_PATH "$(java-config -g LDPATH)"
1882 2698
1883 local tann="${T}/announced-vm" 2699 local tann="${T}/announced-vm"
2700 # With the hooks we should only get here once from pkg_setup but better safe than sorry
2701 # if people have for example modified eclasses some where
1884 if [[ -n "${JAVA_PKG_DEBUG}" ]] || [[ ! -f "${tann}" ]] ; then 2702 if [[ -n "${JAVA_PKG_DEBUG}" ]] || [[ ! -f "${tann}" ]] ; then
1885 # Add a check for setup/preinst phase... to avoid duplicate outputs
1886 # for when FEATURES=buildpkg
1887 if [[ ${EBUILD_PHASE} != "setup" && ${EBUILD_PHASE} != "preinst" && ${EBUILD_PHASE} != "postinst" ]];
1888 then
1889 einfo "Using: $(java-config -f)" 2703 einfo "Using: $(java-config -f)"
1890 [[ ! -f "${tann}" ]] && touch "${tann}" 2704 [[ ! -f "${tann}" ]] && touch "${tann}"
1891 fi
1892 fi 2705 fi
1893 2706
1894 else 2707 else
1895 [[ -n "${JAVA_PKG_DEBUG}" ]] && ewarn "!!! This package inherits java-pkg but doesn't depend on a JDK. -bin or broken dependency!!!" 2708 [[ -n "${JAVA_PKG_DEBUG}" ]] && ewarn "!!! This package inherits java-pkg but doesn't depend on a JDK. -bin or broken dependency!!!"
1896 fi 2709 fi
1901# 2714#
1902# Enhanced die for Java packages, which displays some information that may be 2715# Enhanced die for Java packages, which displays some information that may be
1903# useful for debugging bugs on bugzilla. 2716# useful for debugging bugs on bugzilla.
1904# ------------------------------------------------------------------------------ 2717# ------------------------------------------------------------------------------
1905#register_die_hook java-pkg_die 2718#register_die_hook java-pkg_die
1906if ! hasq java-pkg_die ${EBUILD_DEATH_HOOKS}; then 2719if ! has java-pkg_die ${EBUILD_DEATH_HOOKS}; then
1907 EBUILD_DEATH_HOOKS="${EBUILD_DEATH_HOOKS} java-pkg_die" 2720 EBUILD_DEATH_HOOKS="${EBUILD_DEATH_HOOKS} java-pkg_die"
1908fi 2721fi
1909 2722
1910java-pkg_die() { 2723java-pkg_die() {
1911 echo "!!! When you file a bug report, please include the following information:" >&2 2724 echo "!!! When you file a bug report, please include the following information:" >&2
1926 einfo "Classes" 2739 einfo "Classes"
1927 find "${S}" -type f -name '*.class' -print0 | xargs -0 -r -n 500 ls -ald | sed -e "s,${WORKDIR},\${WORKDIR}," 2740 find "${S}" -type f -name '*.class' -print0 | xargs -0 -r -n 500 ls -ald | sed -e "s,${WORKDIR},\${WORKDIR},"
1928 fi 2741 fi
1929} 2742}
1930 2743
1931# TODO document 2744# ------------------------------------------------------------------------------
2745# @internal-function java-pkg_verify-classes
2746#
1932# Verify that the classes were compiled for the right source / target 2747# Verify that the classes were compiled for the right source / target. Dies if
2748# not.
2749# @param $1 (optional) - the file to check, otherwise checks whole ${D}
2750# ------------------------------------------------------------------------------
1933java-pkg_verify-classes() { 2751java-pkg_verify-classes() {
1934 ebegin "Verifying java class versions"
1935 #$(find ${D} -type f -name '*.jar' -o -name '*.class') 2752 #$(find ${D} -type f -name '*.jar' -o -name '*.class')
1936 class-version-verify.py -t $(java-pkg_get-target) -r ${D} 2753
2754 local version_verify="/usr/bin/class-version-verify.py"
2755
2756 if [[ ! -x "${version_verify}" ]]; then
2757 version_verify="/usr/$(get_libdir)/javatoolkit/bin/class-version-verify.py"
2758 fi
2759
2760 if [[ ! -x "${version_verify}" ]]; then
2761 ewarn "Unable to perform class version checks as"
2762 ewarn "class-version-verify.py is unavailable"
2763 ewarn "Please install dev-java/javatoolkit."
2764 return
2765 fi
2766
2767 local target=$(java-pkg_get-target)
2768 local result
2769 local log="${T}/class-version-verify.log"
2770 if [[ -n "${1}" ]]; then
2771 ${version_verify} -v -t ${target} "${1}" > "${log}"
1937 result=$? 2772 result=$?
1938 eend ${result}
1939 if [[ ${result} == 0 ]]; then
1940 einfo "All good"
1941 else 2773 else
1942 ewarn "Possible problem" 2774 ebegin "Verifying java class versions (target: ${target})"
1943 die "Bad class files found" 2775 ${version_verify} -v -t ${target} -r "${D}" > "${log}"
2776 result=$?
2777 eend ${result}
2778 fi
2779 [[ -n ${JAVA_PKG_DEBUG} ]] && cat "${log}"
2780 if [[ ${result} != 0 ]]; then
2781 eerror "Incorrect bytecode version found"
2782 [[ -n "${1}" ]] && eerror "in file: ${1}"
2783 eerror "See ${log} for more details."
2784 die "Incorrect bytecode found"
2785 fi
2786}
2787
2788# ----------------------------------------------------------------------------
2789# @internal-function java-pkg_ensure-dep
2790# Check that a package being used in jarfrom, getjars and getjar is contained
2791# within DEPEND or RDEPEND.
2792# @param $1 - empty - check both vars; "runtime" or "build" - check only
2793# RDEPEND, resp. DEPEND
2794# @param $2 - Package name and slot.
2795
2796java-pkg_ensure-dep() {
2797 debug-print-function ${FUNCNAME} $*
2798
2799 local limit_to="${1}"
2800 local target_pkg="${2}"
2801 local dev_error=""
2802
2803 # remove the version specification, which may include globbing (* and [123])
2804 local stripped_pkg=$(echo "${target_pkg}" | sed \
2805 's/-\([0-9*]*\(\[[0-9]*\]\)*\)*\(\.\([0-9*]*\(\[[0-9]*\]\)*\)*\)*$//')
2806
2807 debug-print "Matching against: ${stripped_pkg}"
2808
2809 if [[ ${limit_to} != runtime && ! ( "${DEPEND}" =~ "$stripped_pkg" ) ]]; then
2810 dev_error="The ebuild is attempting to use ${target_pkg} that is not"
2811 dev_error="${dev_error} declared in DEPEND."
2812 if is-java-strict; then
2813 eerror "${dev_error}"
2814 die "${dev_error}"
2815 elif [[ ${BASH_SUBSHELL} = 0 ]]; then
2816 eerror "${dev_error}"
2817 elog "Because you have this package installed the package will"
2818 elog "build without problems, but please report this to"
2819 elog "http://bugs.gentoo.org"
2820 fi
2821 fi
2822
2823 if [[ ${limit_to} != build ]]; then
2824 if [[ ! ( ${RDEPEND} =~ "${stripped_pkg}" ) ]]; then
2825 if [[ ! ( ${PDEPEND} =~ "${stripped_pkg}" ) ]]; then
2826 dev_error="The ebuild is attempting to use ${target_pkg},"
2827 dev_error="${dev_error} without specifying --build-only, that is not declared in RDEPEND"
2828 dev_error="${dev_error} or PDEPEND."
2829 if is-java-strict; then
2830 eerror "${dev_error}"
2831 die "${dev_error}"
2832 elif [[ ${BASH_SUBSHELL} = 0 ]]; then
2833 eerror "${dev_error}"
2834 elog "The package will build without problems, but may fail to run"
2835 elog "if you don't have ${target_pkg} installed, so please report"
2836 elog "this to http://bugs.gentoo.org"
2837 fi
2838 fi
2839 fi
1944 fi 2840 fi
1945} 2841}
1946 2842
1947# ------------------------------------------------------------------------------ 2843# ------------------------------------------------------------------------------
1948# @section-end internal 2844# @section-end internal
1949# ------------------------------------------------------------------------------ 2845# ------------------------------------------------------------------------------
1950 2846
1951java-pkg_check-phase() { 2847java-pkg_check-phase() {
1952 local phase=${1} 2848 local phase=${1}
1953 local funcname=${2} 2849 local funcname=${FUNCNAME[1]}
1954 if is-java-strict && [[ ${EBUILD_PHASE} != ${phase} ]]; then 2850 if [[ ${EBUILD_PHASE} != ${phase} ]]; then
1955 java-pkg_announce-qa-violation \
1956 "${funcname} used outside of src_${phase}" 2851 local msg="${funcname} used outside of src_${phase}"
2852 java-pkg_announce-qa-violation "${msg}"
1957 fi 2853 fi
1958} 2854}
1959 2855
1960java-pkg_check-versioned-jar() { 2856java-pkg_check-versioned-jar() {
1961 local jar=${1} 2857 local jar=${1}
1964 java-pkg_announce-qa-violation "installing versioned jar '${jar}'" 2860 java-pkg_announce-qa-violation "installing versioned jar '${jar}'"
1965 fi 2861 fi
1966} 2862}
1967 2863
1968java-pkg_check-jikes() { 2864java-pkg_check-jikes() {
1969 if hasq jikes ${IUSE}; then 2865 if has jikes ${IUSE}; then
1970 java-pkg_announce-qa-violation "deprecated USE flag 'jikes' in IUSE" 2866 java-pkg_announce-qa-violation "deprecated USE flag 'jikes' in IUSE"
1971 fi 2867 fi
1972} 2868}
1973 2869
1974java-pkg_announce-qa-violation() { 2870java-pkg_announce-qa-violation() {
1975 if is-java-strict; then 2871 local nodie
2872 if [[ ${1} == "--nodie" ]]; then
2873 nodie="true"
2874 shift
2875 fi
1976 echo "Java QA Notice: $@" >&2 2876 echo "Java QA Notice: $@" >&2
1977 increment-qa-violations 2877 increment-qa-violations
1978 fi 2878 [[ -z "${nodie}" ]] && is-java-strict && die "${@}"
1979} 2879}
1980 2880
1981increment-qa-violations() { 2881increment-qa-violations() {
1982 let "JAVA_PKG_QA_VIOLATIONS+=1" 2882 let "JAVA_PKG_QA_VIOLATIONS+=1"
1983 export JAVA_PKG_QA_VIOLATIONS 2883 export JAVA_PKG_QA_VIOLATIONS
1986is-java-strict() { 2886is-java-strict() {
1987 [[ -n ${JAVA_PKG_STRICT} ]] 2887 [[ -n ${JAVA_PKG_STRICT} ]]
1988 return $? 2888 return $?
1989} 2889}
1990 2890
2891
1991# ------------------------------------------------------------------------------ 2892# ------------------------------------------------------------------------------
1992# @eclass-end 2893# @eclass-end
1993# ------------------------------------------------------------------------------ 2894# ------------------------------------------------------------------------------

Legend:
Removed from v.1.38  
changed lines
  Added in v.1.152

  ViewVC Help
Powered by ViewVC 1.1.20