/[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.2 Revision 1.42
4# Copyright (c) 2004, Karl Trygve Kalleberg <karltk@gentoo.org> 4# Copyright (c) 2004, Karl Trygve Kalleberg <karltk@gentoo.org>
5# Copyright (c) 2004-2005, Gentoo Foundation 5# Copyright (c) 2004-2005, Gentoo Foundation
6# 6#
7# Licensed under the GNU General Public License, v2 7# Licensed under the GNU General Public License, v2
8# 8#
9# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.42 2007/01/15 00:01:21 caster Exp $
9 10
10 11
11# ----------------------------------------------------------------------------- 12# -----------------------------------------------------------------------------
12# @eclass-begin 13# @eclass-begin
13# @eclass-shortdesc Java Utility eclass 14# @eclass-shortdesc Java Utility eclass
14# @eclass-maintainer java@gentoo.org 15# @eclass-maintainer java@gentoo.org
15# 16#
16# This eclass provides functionality which is used by 17# This eclass provides functionality which is used by
17# java-pkg.eclass and java-pkg-opt.eclass as well as from ebuilds. 18# java-pkg.eclass and java-pkg-opt.eclass as well as from ebuilds.
18# 19#
19# @warning 20# @warning
20# You probably don't want to inherit this directly from an ebuild. Instead, 21# You probably don't want to inherit this directly from an ebuild. Instead,
21# you should inherit java-ant for Ant-based Java packages, java-pkg for other 22# you should inherit java-ant for Ant-based Java packages, java-pkg for other
22# Java packages, or java-pkg-opt for packages that have optional Java support. 23# Java packages, or java-pkg-opt for packages that have optional Java support.
23# 24#
24# ----------------------------------------------------------------------------- 25# -----------------------------------------------------------------------------
25 26
26inherit eutils versionator multilib 27inherit eutils versionator multilib
28
29IUSE="elibc_FreeBSD"
27 30
28# ----------------------------------------------------------------------------- 31# -----------------------------------------------------------------------------
29# @section-begin variables 32# @section-begin variables
30# @section-title Variables 33# @section-title Variables
31# 34#
33# ----------------------------------------------------------------------------- 36# -----------------------------------------------------------------------------
34 37
35# Make sure we use java-config-2 38# Make sure we use java-config-2
36export WANT_JAVA_CONFIG="2" 39export WANT_JAVA_CONFIG="2"
37 40
41# TODO document
42JAVA_PKG_PORTAGE_DEP=">=sys-apps/portage-2.1_pre1"
43
38# ----------------------------------------------------------------------------- 44# -----------------------------------------------------------------------------
39# @variable-internal JAVA_PKG_E_DEPEND 45# @variable-internal JAVA_PKG_E_DEPEND
40# 46#
41# This is a convience variable to be used from the other java eclasses. This is 47# This is a convience variable to be used from the other java eclasses. This is
42# the version of java-config we want to use. We also need a recent version 48# the version of java-config we want to use. We also need a recent version
43# portage, that includes phase hooks. 49# portage, that includes phase hooks.
44# ----------------------------------------------------------------------------- 50# -----------------------------------------------------------------------------
45JAVA_PKG_E_DEPEND=">=dev-java/java-config-2.0.19-r1 >=sys-apps/portage-2.1_pre1" 51JAVA_PKG_E_DEPEND=">=dev-java/java-config-2.0.19-r1 ${JAVA_PKG_PORTAGE_DEP}"
46 52
47# ----------------------------------------------------------------------------- 53# -----------------------------------------------------------------------------
48# @variable-external JAVA_PKG_ALLOW_VM_CHANGE 54# @variable-external JAVA_PKG_ALLOW_VM_CHANGE
49# @variable-default yes 55# @variable-default yes
50# 56#
97# ----------------------------------------------------------------------------- 103# -----------------------------------------------------------------------------
98 104
99# ----------------------------------------------------------------------------- 105# -----------------------------------------------------------------------------
100# @variable-internal JAVA_PKG_COMPILER_DIR 106# @variable-internal JAVA_PKG_COMPILER_DIR
101# @default /usr/share/java-config-2/compiler 107# @default /usr/share/java-config-2/compiler
102# 108#
103# Directory where compiler settings are saved, without trailing slash. 109# Directory where compiler settings are saved, without trailing slash.
104# Probably shouldn't touch this variable. 110# Probably shouldn't touch this variable.
105# ----------------------------------------------------------------------------- 111# -----------------------------------------------------------------------------
106JAVA_PKG_COMPILER_DIR=${JAVA_PKG_COMPILER_DIR:="/usr/share/java-config-2/compiler"} 112JAVA_PKG_COMPILER_DIR=${JAVA_PKG_COMPILER_DIR:="/usr/share/java-config-2/compiler"}
107 113
117 123
118# ----------------------------------------------------------------------------- 124# -----------------------------------------------------------------------------
119# @variable-external JAVA_PKG_FORCE_COMPILER 125# @variable-external JAVA_PKG_FORCE_COMPILER
120# 126#
121# Explicitly set a list of compilers to use. This is normally read from 127# Explicitly set a list of compilers to use. This is normally read from
122# JAVA_PKG_COMPILERS_CONF. 128# JAVA_PKG_COMPILERS_CONF.
123# 129#
124# @note This should only be used internally or for testing. 130# @note This should only be used internally or for testing.
125# @example Use jikes and javac, in that order 131# @example Use jikes and javac, in that order
126# JAVA_PKG_FORCE_COMPILER="jikes javac" 132# JAVA_PKG_FORCE_COMPILER="jikes javac"
127# ----------------------------------------------------------------------------- 133# -----------------------------------------------------------------------------
147# @ebuild-function java-pkg_dojar 153# @ebuild-function java-pkg_dojar
148# 154#
149# Installs any number of jars. 155# Installs any number of jars.
150# Jar's will be installed into /usr/share/${PN}(-${SLOT})/lib/ by default. 156# Jar's will be installed into /usr/share/${PN}(-${SLOT})/lib/ by default.
151# You can use java-pkg_jarinto to change this path. 157# You can use java-pkg_jarinto to change this path.
152# You should never install a jar with a package version in the filename. 158# You should never install a jar with a package version in the filename.
153# Instead, use java-pkg_newjar defined below. 159# Instead, use java-pkg_newjar defined below.
154# 160#
155# @example 161# @example
156# java-pkg_dojar dist/${PN}.jar dist/${PN}-core.jar 162# java-pkg_dojar dist/${PN}.jar dist/${PN}-core.jar
157# 163#
168 # Create JARDEST if it doesn't exist 174 # Create JARDEST if it doesn't exist
169 dodir ${JAVA_PKG_JARDEST} 175 dodir ${JAVA_PKG_JARDEST}
170 176
171 local jar 177 local jar
172 # for each jar 178 # for each jar
173 for jar in "$@"; do 179 for jar in ${@}; do
174 local jar_basename=$(basename "${jar}") 180 local jar_basename=$(basename "${jar}")
175 181
176 java-pkg_check-versioned-jar ${jar_basename} 182 java-pkg_check-versioned-jar ${jar_basename}
177 183
178 # check if it exists 184 # check if it exists
197 203
198 java-pkg_do_write_ 204 java-pkg_do_write_
199} 205}
200 206
201 207
208# ------------------------------------------------------------------------------
209# @internal-function depend-java-query
210#
211# 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
213# do not handle use flags.
214# ------------------------------------------------------------------------------
215
216depend-java-query() {
217 USE="${USE}" $(which depend-java-query) "${@}"
218}
202 219
203# ------------------------------------------------------------------------------ 220# ------------------------------------------------------------------------------
204# @ebuild-function java-pkg_regjar 221# @ebuild-function java-pkg_regjar
205# 222#
206# Records an already installed jar in the package.env 223# Records an already installed jar in the package.env
207# This would mostly be used if the package has make or a custom script to 224# This would mostly be used if the package has make or a custom script to
208# install things. 225# install things.
209# 226#
210# Example: 227# Example:
211# java-pkg-regjar ${D}/opt/foo/lib/foo.jar 228# java-pkg_regjar ${D}/opt/foo/lib/foo.jar
229#
230# WARNING:
231# if you want to use shell expansion, you have to use ${D}/... as the for in
232# this function will not be able to expand the path, here's an example:
233#
234# java-pkg_regjar /opt/my-java/lib/*.jar
235#
236# will not work, because:
237# * the `for jar in "$@"` can't expand the path to jar file names, as they
238# don't exist yet
239# * all `if ...` inside for will fail - the file '/opt/my-java/lib/*.jar'
240# doesn't exist
241#
242# you have to use it as:
243#
244# java-pkg_regjar ${D}/opt/my-java/lib/*.jar
212# 245#
213# @param $@ - jars to record 246# @param $@ - jars to record
214# ------------------------------------------------------------------------------ 247# ------------------------------------------------------------------------------
215# TODO fix me! 248# TODO should we be making sure the jar is present on ${D} or wherever?
216java-pkg_regjar() { 249java-pkg_regjar() {
217 debug-print-function ${FUNCNAME} $* 250 debug-print-function ${FUNCNAME} $*
218 251
219 java-pkg_check-phase install 252 java-pkg_check-phase install
220 253
221 [[ ${#} -lt 1 ]] && die "at least one argument needed" 254 [[ ${#} -lt 1 ]] && die "at least one argument needed"
222 255
223 java-pkg_init_paths_ 256 java-pkg_init_paths_
224 257
225 local jar jar_dir jar_file 258 local jar jar_dir jar_file
226 for jar in "$@"; do 259 for jar in ${@}; do
227 # TODO use java-pkg_check-versioned-jar 260 # TODO use java-pkg_check-versioned-jar
228 if [[ -e "${jar}" ]]; then
229 java-pkg_append_ JAVA_PKG_CLASSPATH "${jar}"
230 elif [[ -e "${D}${jar}" ]]; then 261 if [[ -e "${jar}" || -e "${D}${jar}" ]]; then
262 [[ -d "${jar}" || -d "${D}${jar}" ]] \
263 && die "Called ${FUNCNAME} on a directory $*"
264 # nelchael: we should strip ${D} in this case too, here's why:
265 # imagine such call:
266 # java-pkg_regjar ${D}/opt/java/*.jar
267 # such call will fall into this case (-e ${jar}) and will
268 # record paths with ${D} in package.env
231 java-pkg_append_ JAVA_PKG_CLASSPATH "${jar#${D}}" 269 java-pkg_append_ JAVA_PKG_CLASSPATH "${jar#${D}}"
232 else 270 else
233 die "${jar} does not exist" 271 die "${jar} does not exist"
234 fi 272 fi
235 done 273 done
236 274
237 java-pkg_do_write_ 275 java-pkg_do_write_
238} 276}
239 277
240
241# ------------------------------------------------------------------------------ 278# ------------------------------------------------------------------------------
242# @ebuild-function java-pkg_newjar 279# @ebuild-function java-pkg_newjar
243# 280#
244# Installs a jar with a new name 281# Installs a jar with a new name
245# 282#
255 local original_jar="${1}" 292 local original_jar="${1}"
256 local new_jar="${2:-${PN}.jar}" 293 local new_jar="${2:-${PN}.jar}"
257 local new_jar_dest="${T}/${new_jar}" 294 local new_jar_dest="${T}/${new_jar}"
258 295
259 [[ -z ${original_jar} ]] && die "Must specify a jar to install" 296 [[ -z ${original_jar} ]] && die "Must specify a jar to install"
260 [[ ! -f ${original_jar} ]] && die "${new_jar} does not exist!" 297 [[ ! -f ${original_jar} ]] && die "${original_jar} does not exist!"
261 298
262 rm -f "${new_jar_dest}" || die "Failed to remove ${new_jar_dest}" 299 rm -f "${new_jar_dest}" || die "Failed to remove ${new_jar_dest}"
263 cp "${original_jar}" "${new_jar_dest}" \ 300 cp "${original_jar}" "${new_jar_dest}" \
264 || die "Failed to copy ${original_jar} to ${new_jar_dest}" 301 || die "Failed to copy ${original_jar} to ${new_jar_dest}"
265 java-pkg_dojar "${new_jar_dest}" 302 java-pkg_dojar "${new_jar_dest}"
266} 303}
267 304
268
269# ------------------------------------------------------------------------------ 305# ------------------------------------------------------------------------------
270# @ebuild-function java-pkg_addcp 306# @ebuild-function java-pkg_addcp
271# 307#
272# Add something to the package's classpath. For jars, you should use dojar, 308# Add something to the package's classpath. For jars, you should use dojar,
273# newjar, or regjar. This is typically used to add directories to the classpath. 309# newjar, or regjar. This is typically used to add directories to the classpath.
278java-pkg_addcp() { 314java-pkg_addcp() {
279 java-pkg_append_ JAVA_PKG_CLASSPATH "${@}" 315 java-pkg_append_ JAVA_PKG_CLASSPATH "${@}"
280 java-pkg_do_write_ 316 java-pkg_do_write_
281} 317}
282 318
283
284# ------------------------------------------------------------------------------ 319# ------------------------------------------------------------------------------
285# @ebuild-function java-pkg_doso 320# @ebuild-function java-pkg_doso
286# 321#
287# Installs any number of JNI libraries 322# Installs any number of JNI libraries
288# They will be installed into /usr/lib by default, but java-pkg_sointo 323# They will be installed into /usr/lib by default, but java-pkg_sointo
289# can be used change this path 324# can be used change this path
290# 325#
291# Example: 326# Example:
346 java-pkg_check-phase install 381 java-pkg_check-phase install
347 382
348 [[ ${#} -lt 1 ]] && "at least one argument needed" 383 [[ ${#} -lt 1 ]] && "at least one argument needed"
349 384
350 java-pkg_init_paths_ 385 java-pkg_init_paths_
351 386
352 local lib target_dir 387 local lib target_dir
353 for lib in "$@" ; do 388 for lib in "$@" ; do
354 # Check the absolute path of the lib 389 # Check the absolute path of the lib
355 if [[ -e "${lib}" ]] ; then 390 if [[ -e "${lib}" ]] ; then
356 target_dir="$(java-pkg_expand_dir_ ${lib})" 391 target_dir="$(java-pkg_expand_dir_ ${lib})"
404# ------------------------------------------------------------------------------ 439# ------------------------------------------------------------------------------
405java-pkg_dohtml() { 440java-pkg_dohtml() {
406 debug-print-function ${FUNCNAME} $* 441 debug-print-function ${FUNCNAME} $*
407 442
408 [[ ${#} -lt 1 ]] && die "At least one argument required for ${FUNCNAME}" 443 [[ ${#} -lt 1 ]] && die "At least one argument required for ${FUNCNAME}"
409 # TODO-nichoj find out what exactly -f package-list does 444
445 # from /usr/lib/portage/bin/dohtml -h
446 # -f Set list of allowed extensionless file names.
410 dohtml -f package-list "$@" 447 dohtml -f package-list "$@"
448
411 # this probably shouldn't be here but it provides 449 # this probably shouldn't be here but it provides
412 # a reasonable way to catch # docs for all of the 450 # a reasonable way to catch # docs for all of the
413 # old ebuilds. 451 # old ebuilds.
414 java-pkg_recordjavadoc 452 java-pkg_recordjavadoc
415} 453}
416 454
417# TODO document 455# ------------------------------------------------------------------------------
456# @ebuild-function java-pkg_dojavadoc
457#
458# Installs javadoc documentation. This should be controlled by the doc use flag.
459#
460# @param $1: - The javadoc root directory.
461#
462# @example:
463# java-pkg_dojavadoc docs/api
464#
465# ------------------------------------------------------------------------------
418java-pkg_dojavadoc() { 466java-pkg_dojavadoc() {
419 local dir="$1" 467 local dir="$1"
420 468
421 java-pkg_check-phase install 469 java-pkg_check-phase install
422 470
434} 482}
435 483
436# ------------------------------------------------------------------------------ 484# ------------------------------------------------------------------------------
437# @ebuild-function java-pkg_dosrc 485# @ebuild-function java-pkg_dosrc
438# 486#
439# Installs a zip containing the source for a package, so it can used in 487# Installs a zip containing the source for a package, so it can used in
440# from IDEs like eclipse and netbeans. 488# from IDEs like eclipse and netbeans.
441# 489#
442# Ebuild needs to DEPEND on app-arch/zip to use this. 490# Ebuild needs to DEPEND on app-arch/zip to use this.
443# 491#
444# It also should be controlled by USE=source. 492# It also should be controlled by USE=source.
445# 493#
446# @example: 494# @example:
447# java-pkg_dosrc src/* 495# java-pkg_dosrc src/*
448# 496#
449# ------------------------------------------------------------------------------ 497# ------------------------------------------------------------------------------
450# TODO change so it the arguments it takes are the base directories containing 498# TODO change so it the arguments it takes are the base directories containing
451# source -nichoj 499# source -nichoj
452# TODO should we be able to handle multiple calls to dosrc? -nichoj 500# TODO should we be able to handle multiple calls to dosrc? -nichoj
453# TODO maybe we can take an existing zip/jar? -nichoj 501# TODO maybe we can take an existing zip/jar? -nichoj
454# FIXME apparently this fails if you give it an empty directories 502# FIXME apparently this fails if you give it an empty directories
455java-pkg_dosrc() { 503java-pkg_dosrc() {
456 debug-print-function ${FUNCNAME} $* 504 debug-print-function ${FUNCNAME} $*
457 505
458 [ ${#} -lt 1 ] && die "At least one argument needed" 506 [ ${#} -lt 1 ] && die "At least one argument needed"
459 if ! hasq source ${IUSE}; then 507 if ! hasq source ${IUSE}; then
460 echo "Java QA Notice: ${FUNCNAME} called without source in IUSE" 508 echo "Java QA Notice: ${FUNCNAME} called without source in IUSE"
461 fi 509 fi
462 510
463 java-pkg_check-phase install 511 java-pkg_check-phase install
464 512
465 [[ ${#} -lt 1 ]] && die "At least one argument needed" 513 [[ ${#} -lt 1 ]] && die "At least one argument needed"
466 514
467 java-pkg_init_paths_ 515 java-pkg_init_paths_
468 516
469 local zip_name="${PN}-src.zip" 517 local zip_name="${PN}-src.zip"
470 local zip_path="${T}/${zip_name}" 518 local zip_path="${T}/${zip_name}"
494# @ebuild-function java-pkg_dolauncher 542# @ebuild-function java-pkg_dolauncher
495# 543#
496# Make a wrapper script to lauch/start this package 544# Make a wrapper script to lauch/start this package
497# If necessary, the wrapper will switch to the appropriate VM. 545# If necessary, the wrapper will switch to the appropriate VM.
498# 546#
547# Can be called without parameters if the package installs only one jar
548# that has the Main-class attribute set. The wrapper will be named ${PN}.
549#
499# @param $1 - filename of launcher to create 550# @param $1 - filename of launcher to create
500# @param $2 - options, as follows: 551# @param $2 - options, as follows:
501# --main the.main.class.too.start 552# --main the.main.class.too.start
502# --jar /the/jar/too/launch.jar 553# --jar /the/jar/too/launch.jar or just <name>.jar
503# --java_args 'Extra arguments to pass too jave' 554# --java_args 'Extra arguments to pass to java'
504# --pkg_args 'extra arguments too pass too the package' 555# --pkg_args 'Extra arguments to pass to the package'
505# --pwd 556# --pwd Directory the launcher changes to before executing java
506# -into 557# -into Directory to install the launcher to, instead of /usr/bin
507# -pre 558# -pre Prepend contents of this file to the launcher
508# ------------------------------------------------------------------------------ 559# ------------------------------------------------------------------------------
509java-pkg_dolauncher() { 560java-pkg_dolauncher() {
510 debug-print-function ${FUNCNAME} $* 561 debug-print-function ${FUNCNAME} $*
511 562
512 java-pkg_check-phase install 563 java-pkg_check-phase install
513
514 [[ ${#} -lt 1 ]] && die "Need at least one argument"
515
516 java-pkg_init_paths_ 564 java-pkg_init_paths_
517 565
566 if [[ ${#} = 0 ]]; then
567 local name="${PN}"
568 else
518 local name="${1}" 569 local name="${1}"
570 shift
571 fi
572
519 # TODO rename to launcher 573 # TODO rename to launcher
520 local target="${T}/${name}" 574 local target="${T}/${name}"
575 local var_tmp="${T}/launcher_variables_tmp"
521 local target_dir pre 576 local target_dir pre
522 shift
523 577
524 echo "#!/bin/bash" > "${target}" 578 # Process the other the rest of the arguments
525 while [[ -n "${1}" && -n "${2}" ]]; do 579 while [[ -n "${1}" && -n "${2}" ]]; do
526 local var=${1} value=${2} 580 local var="${1}" value="${2}"
527 if [[ "${var:0:2}" == "--" ]]; then 581 if [[ "${var:0:2}" == "--" ]]; then
582 local var=${var:2}
528 echo "gjl_${var:2}=\"${value}\"" >> "${target}" 583 echo "gjl_${var}=\"${value}\"" >> "${var_tmp}"
584 local gjl_${var}="${value}"
529 elif [[ "${var}" == "-into" ]]; then 585 elif [[ "${var}" == "-into" ]]; then
530 target_dir="${value}" 586 target_dir="${value}"
531 elif [[ "${var}" == "-pre" ]]; then 587 elif [[ "${var}" == "-pre" ]]; then
532 pre="${value}" 588 pre="${value}"
533 fi 589 fi
534 shift 2 590 shift 2
535 done 591 done
592
593 # Test if no --jar and --main arguments were given and
594 # in that case check if the package only installs one jar
595 # and use that jar.
596 if [[ -z "${gjl_jar}" && -z "${gjl_main}" ]]; then
597 local cp="${JAVA_PKG_CLASSPATH}"
598 if [[ "${cp/:}" = "${cp}" && "${cp%.jar}" != "${cp}" ]]; then
599 echo "gjl_jar=\"${JAVA_PKG_CLASSPATH}\"" >> "${var_tmp}"
600 else
601 local msg="Not enough information to create a launcher given."
602 msg="${msg} Please give --jar or --main argument to ${FUNCNAME}."
603 die "${msg}"
604 fi
605 fi
606
607 # Write the actual script
608 echo "#!/bin/bash" > "${target}"
609 if [[ -n "${pre}" ]]; then
610 if [[ -f "${pre}" ]]; then
611 cat "${pre}" >> "${target}"
612 else
613 die "-pre specified file '${pre}' does not exist"
614 fi
615 fi
536 echo "gjl_package=${JAVA_PKG_NAME}" >> "${target}" 616 echo "gjl_package=${JAVA_PKG_NAME}" >> "${target}"
537 [[ -n "${pre}" ]] && [[ -f "${pre}" ]] && cat "${pre}" >> "${target}" 617 cat "${var_tmp}" >> "${target}"
618 rm -f "${var_tmp}"
538 echo "source /usr/share/java-config-2/launcher/launcher.bash" >> "${target}" 619 echo "source /usr/share/java-config-2/launcher/launcher.bash" >> "${target}"
539 620
540 if [[ -n "${into}" ]]; then 621 if [[ -n "${target_dir}" ]]; then
541 DESTTREE="${target_dir}" dobin "${target}" 622 DESTTREE="${target_dir}" dobin "${target}"
542 local ret=$? 623 local ret=$?
543 return ${ret} 624 return ${ret}
544 else 625 else
545 dobin "${target}" 626 dobin "${target}"
573 echo "dowar: warning, skipping directory ${war}" 654 echo "dowar: warning, skipping directory ${war}"
574 continue 655 continue
575 else 656 else
576 warpath="${war}" 657 warpath="${war}"
577 fi 658 fi
578 659
579 # Install those files like you mean it 660 # Install those files like you mean it
580 INSOPTIONS="-m 0644" \ 661 INSOPTIONS="-m 0644" \
581 INSDESTTREE=${JAVA_PKG_WARDEST} \ 662 INSDESTTREE=${JAVA_PKG_WARDEST} \
582 doins ${warpath} 663 doins ${warpath}
583 done 664 done
618# @ebuild-function java-pkg_jar-from 699# @ebuild-function java-pkg_jar-from
619# 700#
620# Makes a symlink to a jar from a certain package 701# Makes a symlink to a jar from a certain package
621# A lot of java packages include dependencies in a lib/ directory 702# A lot of java packages include dependencies in a lib/ directory
622# You can use this function to replace these bundled dependencies. 703# You can use this function to replace these bundled dependencies.
704# The dependency is recorded into package.env DEPEND line, unless "--build-only"
705# is passed as the very first argument, for jars that have to be present only
706# at build time and are not needed on runtime (junit testing etc).
623# 707#
624# Example: get all jars from xerces slot 2 708# Example: get all jars from xerces slot 2
625# java-pkg_jar-from xerces-2 709# java-pkg_jar-from xerces-2
626# Example: get a specific jar from xerces slot 2 710# Example: get a specific jar from xerces slot 2
627# java-pkg_jar-from xerces-2 xml-apis.jar 711# java-pkg_jar-from xerces-2 xml-apis.jar
628# Example get a specific jar from xerces slot 2, and name it diffrently 712# Example: get a specific jar from xerces slot 2, and name it diffrently
629# java-pkg_jar-from xerces-2 xml-apis.jar xml.jar 713# java-pkg_jar-from xerces-2 xml-apis.jar xml.jar
714# Example: get junit.jar which is needed only for building
715# java-pkg_jar-from --build-only junit junit.jar
630# 716#
717# @param $1 - (optional) "--build-only" makes the jar(s) not added into
718# package.env DEPEND line.
631# @param $1 - Package to get jars from. 719# @param $1 - Package to get jars from.
632# @param $2 - jar from package. If not specified, all jars will be used. 720# @param $2 - jar from package. If not specified, all jars will be used.
633# @param $3 - When a single jar is specified, destination filename of the 721# @param $3 - When a single jar is specified, destination filename of the
634# symlink. Defaults to the name of the jar. 722# symlink. Defaults to the name of the jar.
635# ------------------------------------------------------------------------------ 723# ------------------------------------------------------------------------------
636# TODO could probably be cleaned up a little 724# TODO could probably be cleaned up a little
637java-pkg_jar-from() { 725java-pkg_jar-from() {
638 debug-print-function ${FUNCNAME} $* 726 debug-print-function ${FUNCNAME} $*
639 727
728 local build_only=""
729
730 if [[ "${1}" = "--build-only" ]]; then
731 build_only="true"
732 shift
733 fi
734
640 local target_pkg="${1}" target_jar="${2}" destjar="${3}" 735 local target_pkg="${1}" target_jar="${2}" destjar="${3}"
641 736
642 [[ -z ${target_pkg} ]] && die "Must specify a package" 737 [[ -z ${target_pkg} ]] && die "Must specify a package"
643 738
644 # default destjar to the target jar 739 # default destjar to the target jar
645 [[ -z "${destjar}" ]] && destjar="${target_jar}" 740 [[ -z "${destjar}" ]] && destjar="${target_jar}"
646 741
742 local error_msg="There was a problem getting the classpath for ${target_pkg}."
743 local classpath
647 local classpath="$(java-config --classpath=${target_pkg})" 744 classpath="$(java-config --classpath=${target_pkg})"
648 [[ $? != 0 ]] && die "There was a problem getting the classpath for ${target_pkg}" 745 [[ $? != 0 ]] && die ${error_msg}
649 746
650 local jar 747 local jar
651 for jar in ${classpath//:/ }; do 748 for jar in ${classpath//:/ }; do
652 local jar_name=$(basename "${jar}") 749 local jar_name=$(basename "${jar}")
653 if [[ ! -f "${jar}" ]] ; then 750 if [[ ! -f "${jar}" ]] ; then
657 # If no specific target jar was indicated, link it 754 # If no specific target jar was indicated, link it
658 if [[ -z "${target_jar}" ]] ; then 755 if [[ -z "${target_jar}" ]] ; then
659 [[ -f "${target_jar}" ]] && rm "${target_jar}" 756 [[ -f "${target_jar}" ]] && rm "${target_jar}"
660 ln -snf "${jar}" \ 757 ln -snf "${jar}" \
661 || die "Failed to make symlink from ${jar} to ${jar_name}" 758 || die "Failed to make symlink from ${jar} to ${jar_name}"
662 java-pkg_record-jar_ "${target_pkg}" "${jar}" 759 [[ -z "${build_only}" ]] && java-pkg_record-jar_ "${target_pkg}" "${jar}"
663 # otherwise, if the current jar is the target jar, link it 760 # otherwise, if the current jar is the target jar, link it
664 elif [[ "${jar_name}" == "${target_jar}" ]] ; then 761 elif [[ "${jar_name}" == "${target_jar}" ]] ; then
665 [[ -f "${destjar}" ]] && rm "${destjar}" 762 [[ -f "${destjar}" ]] && rm "${destjar}"
666 ln -snf "${jar}" "${destjar}" \ 763 ln -snf "${jar}" "${destjar}" \
667 || die "Failed to make symlink from ${jar} to ${destjar}" 764 || die "Failed to make symlink from ${jar} to ${destjar}"
668 java-pkg_record-jar_ "${target_pkg}" "${jar}" 765 [[ -z "${build_only}" ]] && java-pkg_record-jar_ "${target_pkg}" "${jar}"
669 return 0 766 return 0
670 fi 767 fi
671 done 768 done
672 # if no target was specified, we're ok 769 # if no target was specified, we're ok
673 if [[ -z "${target_jar}" ]] ; then 770 if [[ -z "${target_jar}" ]] ; then
690# ------------------------------------------------------------------------------ 787# ------------------------------------------------------------------------------
691# @ebuild-function java-pkg_getjars 788# @ebuild-function java-pkg_getjars
692# 789#
693# Get the classpath provided by any number of packages 790# Get the classpath provided by any number of packages
694# Among other things, this can be passed to 'javac -classpath' or 'ant -lib'. 791# Among other things, this can be passed to 'javac -classpath' or 'ant -lib'.
792# The providing packages are recorded as dependencies into package.env DEPEND
793# line, unless "--build-only" is passed as the very first argument, for jars
794# that have to be present only at build time and are not needed on runtime
795# (junit testing etc).
695# 796#
696# Example: Get the classpath for xerces-2, 797# Example: Get the classpath for xerces-2 and xalan,
697# java-pkg_getjars xerces-2 xalan 798# java-pkg_getjars xerces-2,xalan
698# Example Return: 799# Example Return:
699# /usr/share/xerces-2/lib/xml-apis.jar:/usr/share/xerces-2/lib/xmlParserAPIs.jar:/usr/share/xalan/lib/xalan.jar 800# /usr/share/xerces-2/lib/xml-apis.jar:/usr/share/xerces-2/lib/xmlParserAPIs.jar:/usr/share/xalan/lib/xalan.jar
700# 801#
802# @param $1 - (optional) "--build-only" makes the jar(s) not added into
803# package.env DEPEND line.
701# @param $@ - list of packages to get jars from 804# @param $2 - list of packages to get jars from
805# (passed to java-config --classpath)
702# ------------------------------------------------------------------------------ 806# ------------------------------------------------------------------------------
703java-pkg_getjars() { 807java-pkg_getjars() {
704 debug-print-function ${FUNCNAME} $* 808 debug-print-function ${FUNCNAME} $*
705 809
706 [[ ${#} -lt 1 ]] && die "At least one argument needed" 810 if [[ "${1}" = "--build-only" ]]; then
811 local build_only="true"
812 shift
813 fi
707 814
708 # NOTE could probably just pass $@ to java-config --classpath. and return it 815 [[ ${#} -ne 1 ]] && die "${FUNCNAME} takes only one argument besides --build-only"
816
709 local classpath pkg 817 local classpath pkgs="${1}"
710 for pkg in ${@//,/ }; do
711 #for pkg in $(echo "$@" | tr ',' ' '); do
712 jars="$(java-config --classpath=${pkg})" 818 jars="$(java-config --classpath=${pkgs})"
819 [[ -z "${jars}" ]] && die "java-config --classpath=${pkgs} failed"
713 debug-print "${pkg}:${jars}" 820 debug-print "${pkgs}:${jars}"
714 # TODO should we ensure jars exist? 821
715 if [[ -z "${classpath}" ]]; then 822 if [[ -z "${classpath}" ]]; then
716 classpath="${jars}" 823 classpath="${jars}"
717 else 824 else
718 classpath="${classpath}:${jars}" 825 classpath="${classpath}:${jars}"
719 fi 826 fi
827
828 # Only record jars that aren't build-only
829 if [[ -z "${build_only}" ]]; then
830 oldifs="${IFS}"
831 IFS=","
832 for pkg in ${pkgs}; do
720 java-pkg_record-jar_ "${pkg}" 833 java-pkg_record-jar_ "${pkg}"
721 done 834 done
835 IFS="${oldifs}"
836 fi
837
722 echo "${classpath}" 838 echo "${classpath}"
723} 839}
724 840
725# ------------------------------------------------------------------------------ 841# ------------------------------------------------------------------------------
726# @ebuild-function java-pkg_getjar 842# @ebuild-function java-pkg_getjar
727# 843#
728# Get the filename of a single jar from a package 844# Get the filename of a single jar from a package
845# The providing package is recorded as runtime dependency into package.env
846# DEPEND line, unless "--build-only" is passed as the very first argument, for
847# jars that have to be present only at build time and are not needed on runtime
848# (junit testing etc).
729# 849#
730# @example 850# @example
731# java-pkg_getjar xerces-2 xml-apis.jar 851# java-pkg_getjar xerces-2 xml-apis.jar
732# @example-return 852# @example-return
733# /usr/share/xerces-2/lib/xml-apis.jar 853# /usr/share/xerces-2/lib/xml-apis.jar
734# 854#
855# @param $1 - (optional) "--build-only" makes the jar not added into
856# package.env DEPEND line.
735# @param $1 - package to use 857# @param $1 - package to use
736# @param $2 - jar to get 858# @param $2 - jar to get
737# ------------------------------------------------------------------------------ 859# ------------------------------------------------------------------------------
738java-pkg_getjar() { 860java-pkg_getjar() {
739 debug-print-function ${FUNCNAME} $* 861 debug-print-function ${FUNCNAME} $*
862
863 local build_only=""
864
865 if [[ "${1}" = "--build-only" ]]; then
866 build_only="true"
867 shift
868 fi
740 869
741 local pkg="${1}" target_jar="${2}" jar 870 local pkg="${1}" target_jar="${2}" jar
742 [[ -z ${pkg} ]] && die "Must specify package to get a jar from" 871 [[ -z ${pkg} ]] && die "Must specify package to get a jar from"
743 [[ -z ${target_jar} ]] && die "Must specify jar to get" 872 [[ -z ${target_jar} ]] && die "Must specify jar to get"
744 873
745 # TODO check that package is actually installed 874 local error_msg="Could not find classpath for ${pkg}. Are you sure its installed?"
875 local classpath
746 local classpath=$(java-config --classpath=${pkg}) 876 classpath=$(java-config --classpath=${pkg})
747 [[ $? != 0 ]] && die "There could not find classpath for ${pkg}. Are you sure its installed?" 877 [[ $? != 0 ]] && die ${error_msg}
878
748 for jar in ${classpath//:/ }; do 879 for jar in ${classpath//:/ }; do
749 if [[ ! -f "${jar}" ]] ; then 880 if [[ ! -f "${jar}" ]] ; then
750 die "Installation problems with jars in ${pkg} - is it installed?" 881 die "Installation problem with jar ${jar} in ${pkg} - is it installed?"
751 fi 882 fi
752 883
753 if [[ "$(basename ${jar})" == "${target_jar}" ]] ; then 884 if [[ "$(basename ${jar})" == "${target_jar}" ]] ; then
754 java-pkg_record-jar_ "${pkg}" "${jar}" 885 # Only record jars that aren't build-only
886 [[ -z "${build_only}" ]] && java-pkg_record-jar_ "${pkg}" "${jar}"
755 echo "${jar}" 887 echo "${jar}"
756 return 0 888 return 0
757 fi 889 fi
758 done 890 done
759 891
760 die "Could not find ${target_jar} in ${pkg}" 892 die "Could not find ${target_jar} in ${pkg}"
761 return 1 893 return 1
762} 894}
763 895
764# This function reads stdin, and based on that input, figures out how to 896# This function reads stdin, and based on that input, figures out how to
778# line="${line// /}" 910# line="${line// /}"
779# 911#
780# # format: path=jarinfo 912# # format: path=jarinfo
781# local path=${line%%=*} 913# local path=${line%%=*}
782# local jarinfo=${line##*=} 914# local jarinfo=${line##*=}
783# 915#
784# # format: jar@package 916# # format: jar@package
785# local jar=${jarinfo%%@*}.jar 917# local jar=${jarinfo%%@*}.jar
786# local package=${jarinfo##*@} 918# local package=${jarinfo##*@}
787# if [[ -n ${replace_only} ]]; then 919# if [[ -n ${replace_only} ]]; then
788# [[ ! -f $path ]] && die "No jar exists at ${path}" 920# [[ ! -f $path ]] && die "No jar exists at ${path}"
801# @section-end query 933# @section-end query
802# ------------------------------------------------------------------------------ 934# ------------------------------------------------------------------------------
803 935
804# ------------------------------------------------------------------------------ 936# ------------------------------------------------------------------------------
805# @section-begin helper 937# @section-begin helper
806# @section-summary Helper functions 938# @section-summary Helper functions
807# 939#
808# Various other functions to use from an ebuild 940# Various other functions to use from an ebuild
809# ------------------------------------------------------------------------------ 941# ------------------------------------------------------------------------------
810 942
811# ------------------------------------------------------------------------------ 943# ------------------------------------------------------------------------------
817# jdbc-stdext 949# jdbc-stdext
818# jaf 950# jaf
819# jdbc-rowset 951# jdbc-rowset
820# jms 952# jms
821# 953#
822# @param $1 - Optionally indicate that the dependencies are controlled by 954# @param $1 - Optionally indicate that the dependencies are controlled by
823# a use flag by specifying '--use' Requires $2. 955# a use flag by specifying '--use' Requires $2.
824# @param $2 - USE flag which will enable the dependencies. 956# @param $2 - USE flag which will enable the dependencies.
825# @param $@ - virtual packages to add depenedencies for 957# @param $@ - virtual packages to add depenedencies for
826# ------------------------------------------------------------------------------ 958# ------------------------------------------------------------------------------
827# TODO rewrite to parse a line based declaration file instead -- karltk 959# TODO rewrite to parse a line based declaration file instead -- karltk
883# 1015#
884# export DEPEND="${DEPEND} ${depstr}" 1016# export DEPEND="${DEPEND} ${depstr}"
885# export RDEPEND="${RDEPEND} ${depstr}" 1017# export RDEPEND="${RDEPEND} ${depstr}"
886#} 1018#}
887 1019
1020# ------------------------------------------------------------------------------
1021# @ebuild-function java-pkg_find-normal-jars
1022#
1023# Find the files with suffix .jar file in the given directory or $WORKDIR
1024#
1025# @param $1 - The directory to search for jar files (default: ${WORKDIR})
1026# ------------------------------------------------------------------------------
1027java-pkg_find-normal-jars() {
1028 local dir=$1
1029 [[ "${dir}" ]] || dir="${WORKDIR}"
1030 local found
1031 for jar in $(find "${dir}" -name "*.jar" -type f); do
1032 echo "${jar}"
1033 found="true"
1034 done
1035 [[ "${found}" ]]
1036 return $?
1037}
1038
1039# ------------------------------------------------------------------------------
1040# @ebuild-function java-pkg_ensure-no-bundled-jars
1041#
1042# Try to locate bundled jar files in ${WORKDIR} and die if found.
888# This should be used after S has been populated with symlinks to jars 1043# This function should be called after WORKDIR has been populated with symlink
889# TODO document 1044# to system jar files or bundled jars removed.
1045# ------------------------------------------------------------------------------
890java-pkg_ensure-no-bundled-jars() { 1046java-pkg_ensure-no-bundled-jars() {
891 debug-print-function ${FUNCNAME} $* 1047 debug-print-function ${FUNCNAME} $*
892 pushd ${WORKDIR} >/dev/null 2>/dev/null
893 1048
894 local bundled_jars=$(find . -name "*.jar" -type f) 1049 local bundled_jars=$(java-pkg_find-normal-jars)
895 if [[ -n ${bundled_jars} ]]; then 1050 if [[ -n ${bundled_jars} ]]; then
896 echo "Bundled jars found:" 1051 echo "Bundled jars found:"
897 local jar 1052 local jar
898 for jar in ${bundled_jars}; do 1053 for jar in ${bundled_jars}; do
899 echo $(pwd)${jar/./} 1054 echo $(pwd)${jar/./}
900 done 1055 done
901 die "Bundled jars found!" 1056 die "Bundled jars found!"
902
903 fi 1057 fi
904 popd >/dev/null 2>/dev/null
905} 1058}
906 1059
907# ------------------------------------------------------------------------------ 1060# ------------------------------------------------------------------------------
908# @internal-function java-pkg_ensure-vm-version-sufficient 1061# @internal-function java-pkg_ensure-vm-version-sufficient
909# 1062#
921 fi 1074 fi
922} 1075}
923 1076
924# ------------------------------------------------------------------------------ 1077# ------------------------------------------------------------------------------
925# @internal-function java-pkg_is-vm-version-sufficient 1078# @internal-function java-pkg_is-vm-version-sufficient
926# 1079#
927# @return zero - VM is sufficient 1080# @return zero - VM is sufficient
928# @return non-zero - VM is not sufficient 1081# @return non-zero - VM is not sufficient
929# ------------------------------------------------------------------------------ 1082# ------------------------------------------------------------------------------
930java-pkg_is-vm-version-sufficient() { 1083java-pkg_is-vm-version-sufficient() {
931 debug-print-function ${FUNCNAME} $* 1084 debug-print-function ${FUNCNAME} $*
951 die "Active Java VM too old" 1104 die "Active Java VM too old"
952 fi 1105 fi
953} 1106}
954 1107
955# ------------------------------------------------------------------------------ 1108# ------------------------------------------------------------------------------
956# @internal-function java-pkg_is-vm-version-eq 1109# @internal-function java-pkg_is-vm-version-eq
957# 1110#
958# @param $@ - VM version to compare current VM to 1111# @param $@ - VM version to compare current VM to
959# @return zero - VM versions are equal 1112# @return zero - VM versions are equal
960# @return non-zero - VM version are not equal 1113# @return non-zero - VM version are not equal
961# ------------------------------------------------------------------------------ 1114# ------------------------------------------------------------------------------
962java-pkg_is-vm-version-eq() { 1115java-pkg_is-vm-version-eq() {
992# 1145#
993# @param $@ - VM version to compare current to 1146# @param $@ - VM version to compare current to
994# ------------------------------------------------------------------------------ 1147# ------------------------------------------------------------------------------
995java-pkg_ensure-vm-version-ge() { 1148java-pkg_ensure-vm-version-ge() {
996 debug-print-function ${FUNCNAME} $* 1149 debug-print-function ${FUNCNAME} $*
997 1150
998 if ! java-pkg_is-vm-version-ge "$@" ; then 1151 if ! java-pkg_is-vm-version-ge "$@" ; then
999 debug-print "vm is not suffient" 1152 debug-print "vm is not suffient"
1000 eerror "This package requires a Java VM version >= $@" 1153 eerror "This package requires a Java VM version >= $@"
1001 einfo "Please use java-config -S to set the correct one" 1154 einfo "Please use java-config -S to set the correct one"
1002 die "Active Java VM too old" 1155 die "Active Java VM too old"
1003 fi 1156 fi
1004} 1157}
1005 1158
1006# ------------------------------------------------------------------------------ 1159# ------------------------------------------------------------------------------
1007# @internal-function java-pkg_is-vm-version-ge 1160# @internal-function java-pkg_is-vm-version-ge
1008# 1161#
1009# @param $@ - VM version to compare current VM to 1162# @param $@ - VM version to compare current VM to
1010# @return zero - current VM version is greater than checked version 1163# @return zero - current VM version is greater than checked version
1011# @return non-zero - current VM version is not greater than checked version 1164# @return non-zero - current VM version is not greater than checked version
1012# ------------------------------------------------------------------------------ 1165# ------------------------------------------------------------------------------
1013java-pkg_is-vm-version-ge() { 1166java-pkg_is-vm-version-ge() {
1027 return 1 1180 return 1
1028 fi 1181 fi
1029 fi 1182 fi
1030} 1183}
1031 1184
1185java-pkg_set-current-vm() {
1186 export GENTOO_VM=${1}
1187}
1188
1189java-pkg_get-current-vm() {
1190 echo ${GENTOO_VM}
1191}
1192
1193java-pkg_current-vm-matches() {
1194 hasq $(java-pkg_get-current-vm) ${@}
1195 return $?
1196}
1197
1032# ------------------------------------------------------------------------------ 1198# ------------------------------------------------------------------------------
1033# @ebuild-function java-pkg_get-source 1199# @ebuild-function java-pkg_get-source
1034# 1200#
1035# Determines what source version should be used, for passing to -source. 1201# Determines what source version should be used, for passing to -source.
1036# Unless you want to break things you probably shouldn't set _WANT_SOURCE 1202# Unless you want to break things you probably shouldn't set _WANT_SOURCE
1037# 1203#
1038# @return string - Either the lowest possible source, or JAVA_PKG_WANT_SOURCE 1204# @return string - Either the lowest possible source, or JAVA_PKG_WANT_SOURCE
1039# ------------------------------------------------------------------------------ 1205# ------------------------------------------------------------------------------
1044# ------------------------------------------------------------------------------ 1210# ------------------------------------------------------------------------------
1045# @ebuild-function java-pkg_get-target 1211# @ebuild-function java-pkg_get-target
1046# 1212#
1047# Determines what target version should be used, for passing to -target. 1213# Determines what target version should be used, for passing to -target.
1048# If you don't care about lower versions, you can set _WANT_TARGET to the 1214# If you don't care about lower versions, you can set _WANT_TARGET to the
1049# version of your JDK. 1215# version of your JDK.
1050# Remember doing this will mostly like cause things to break.
1051# Doesn't allow it to be lower then the one in depend.
1052# Doesn't allow it to be higher then the active vm.
1053# 1216#
1054# @return string - Either the lowest possible target, or JAVA_PKG_WANT_TARGET 1217# @return string - Either the lowest possible target, or JAVA_PKG_WANT_TARGET
1055# ------------------------------------------------------------------------------ 1218# ------------------------------------------------------------------------------
1056java-pkg_get-target() { 1219java-pkg_get-target() {
1057 local min=$(depend-java-query --get-lowest "${DEPEND} ${RDEPEND}")
1058 if [[ -n "${JAVA_PKG_WANT_TARGET}" ]]; then
1059 local max="$(java-config --select-vm "${GENTOO_VM}" -g PROVIDES_VERSION)"
1060 if version_is_at_least "${min}" "${JAVA_PKG_WANT_TARGET}" && version_is_at_least "${JAVA_PKG_WANT_TARGET}" "${max}"; then
1061 echo ${JAVA_PKG_WANT_TARGET}
1062 else
1063 echo ${min}
1064 fi
1065 else
1066 echo ${min}
1067 fi
1068
1069 #echo ${JAVA_PKG_WANT_TARGET:-$(depend-java-query --get-lowest "${DEPEND}")} 1220 echo ${JAVA_PKG_WANT_TARGET:-$(depend-java-query --get-lowest "${DEPEND} ${RDEPEND}")}
1070} 1221}
1071 1222
1072java-pkg_get-javac() { 1223java-pkg_get-javac() {
1073 debug-print-function ${FUNCNAME} $* 1224 debug-print-function ${FUNCNAME} $*
1074 1225
1075 java-pkg_init-compiler_ 1226
1076 local compiler="${GENTOO_COMPILER}" 1227 local compiler="${GENTOO_COMPILER}"
1077 1228
1078 local compiler_executable 1229 local compiler_executable
1079 if [[ "${compiler}" = "javac" ]]; then 1230 if [[ "${compiler}" = "javac" ]]; then
1080 # nothing fancy needs to be done for javac 1231 # nothing fancy needs to be done for javac
1088 unset JAVAC 1239 unset JAVAC
1089 # try to get value of JAVAC 1240 # try to get value of JAVAC
1090 compiler_executable="$(source ${compiler_env} 1>/dev/null 2>&1; echo ${JAVAC})" 1241 compiler_executable="$(source ${compiler_env} 1>/dev/null 2>&1; echo ${JAVAC})"
1091 export JAVAC=${old_javac} 1242 export JAVAC=${old_javac}
1092 1243
1093 [[ -z ${compiler_executable} ]] && die "JAVAC is empty or undefined in ${compiler_env}" 1244 if [[ -z ${compiler_executable} ]]; then
1094 1245 echo "JAVAC is empty or undefined in ${compiler_env}"
1246 return 1
1247 fi
1248
1095 # check that it's executable 1249 # check that it's executable
1096 if [[ ! -x ${compiler_executable} ]]; then 1250 if [[ ! -x ${compiler_executable} ]]; then
1097 eerror "Could not find ${compiler_executable}!"
1098 die "${compiler_executable} doesn't exist, or isn't executable" 1251 echo "${compiler_executable} doesn't exist, or isn't executable"
1252 return 1
1099 fi 1253 fi
1100 else 1254 else
1101 eerror "Could not find environment file for ${compiler}" 1255 echo "Could not find environment file for ${compiler}"
1102 die "Could not find ${compiler_env}" 1256 return 1
1103 fi 1257 fi
1104 fi 1258 fi
1105 echo ${compiler_executable} 1259 echo ${compiler_executable}
1106} 1260}
1107 1261
1108# ------------------------------------------------------------------------------ 1262# ------------------------------------------------------------------------------
1109# @ebuild-function java-pkg_javac-args 1263# @ebuild-function java-pkg_javac-args
1110# 1264#
1111# If an ebuild uses javac directly, instead of using ejavac, it should call this 1265# If an ebuild uses javac directly, instead of using ejavac, it should call this
1112# to know what -source/-target to use. 1266# to know what -source/-target to use.
1113# 1267#
1114# @return string - arguments to pass to javac, complete with -target and -source 1268# @return string - arguments to pass to javac, complete with -target and -source
1117 debug-print-function ${FUNCNAME} $* 1271 debug-print-function ${FUNCNAME} $*
1118 1272
1119 local want_source="$(java-pkg_get-source)" 1273 local want_source="$(java-pkg_get-source)"
1120 local want_target="$(java-pkg_get-target)" 1274 local want_target="$(java-pkg_get-target)"
1121 1275
1122 local source_str="-source ${want_source}" 1276 local source_str="-source ${want_source}"
1123 local target_str="-target ${want_target}" 1277 local target_str="-target ${want_target}"
1124 1278
1125 debug-print "want source: ${want_source}" 1279 debug-print "want source: ${want_source}"
1126 debug-print "want target: ${want_target}" 1280 debug-print "want target: ${want_target}"
1127 1281
1128 if [[ -z "${want_source}" || -z "${want_target}" ]]; then 1282 if [[ -z "${want_source}" || -z "${want_target}" ]]; then
1129 debug-print "could not find valid -source/-target values" 1283 debug-print "could not find valid -source/-target values for javac"
1130 die "Could not find valid -source/-target values" 1284 echo "Could not find valid -source/-target values for javac"
1285 return 1
1131 else 1286 else
1132 if java-pkg_is-vm-version-ge "1.4"; then 1287 if java-pkg_is-vm-version-ge "1.4"; then
1133 echo "${source_str} ${target_str}" 1288 echo "${source_str} ${target_str}"
1134 else 1289 else
1135 echo "${target_str}" 1290 echo "${target_str}"
1139 1294
1140# TODO document 1295# TODO document
1141java-pkg_get-jni-cflags() { 1296java-pkg_get-jni-cflags() {
1142 local flags="-I${JAVA_HOME}/include" 1297 local flags="-I${JAVA_HOME}/include"
1143 1298
1144 # TODO figure out how to cope with other things than linux... 1299 local platform="linux"
1300 use elibc_FreeBSD && platform="freebsd"
1301
1302 # TODO do a check that the directories are valid
1145 flags="${flags} -I${JAVA_HOME}/include/linux" 1303 flags="${flags} -I${JAVA_HOME}/include/${platform}"
1146 1304
1147 echo ${flags} 1305 echo ${flags}
1306}
1307
1308java-pkg_ensure-gcj() {
1309 if ! built_with_use sys-devel/gcc gcj ; then
1310 ewarn
1311 ewarn "You must build gcc with the gcj support to build with gcj"
1312 ewarn
1313 ebeep 5
1314 die "No GCJ support found!"
1315 fi
1316}
1317
1318java-pkg_ensure-test() {
1319 if hasq test ${FEATURES} && ! hasq -test ${FEATURES} \
1320 && hasq test ${IUSE} && ! use test;
1321 then
1322 eerror "You specified FEATURES=test, but USE=test is needed"
1323 eerror "to pull in the additional dependencies for testing"
1324 die "Need USE=test enabled"
1325 fi
1148} 1326}
1149 1327
1150# ------------------------------------------------------------------------------ 1328# ------------------------------------------------------------------------------
1151# @section-end helper 1329# @section-end helper
1152# ------------------------------------------------------------------------------ 1330# ------------------------------------------------------------------------------
1162# ------------------------------------------------------------------------------ 1340# ------------------------------------------------------------------------------
1163# @ebuild-function eant 1341# @ebuild-function eant
1164# 1342#
1165# Ant wrapper function. Will use the appropriate compiler, based on user-defined 1343# Ant wrapper function. Will use the appropriate compiler, based on user-defined
1166# compiler. 1344# compiler.
1345# variables:
1346# EANT_GENTOO_CLASSPATH - calls java-pkg_getjars for the value and adds to the
1347# gentoo.classpath property. Be sure to call
1348# java-ant_rewrite-classpath in src_unpack.
1167# 1349#
1168# ------------------------------------------------------------------------------ 1350# ------------------------------------------------------------------------------
1169eant() { 1351eant() {
1170 debug-print-function ${FUNCNAME} $* 1352 debug-print-function ${FUNCNAME} $*
1171 1353
1172 local antflags 1354 # FIXME get this working
1355# if is-java-strict && [[ ! ${DEPEND} =~ "dev-java/ant" ]]; then
1356# java-pkg_announce-qa-violation \
1357# "Using eant, but not depending on dev-java/ant or dev-java/ant-core"
1358# fi
1359
1360 local antflags="-Dnoget=true"
1173 java-pkg_init-compiler_ 1361 java-pkg_init-compiler_
1174 local compiler="${GENTOO_COMPILER}" 1362 local compiler="${GENTOO_COMPILER}"
1175 1363
1176 local compiler_env="${JAVA_PKG_COMPILER_DIR}/${compiler}" 1364 local compiler_env="${JAVA_PKG_COMPILER_DIR}/${compiler}"
1177 1365
1179 if [[ "${compiler}" != "javac" && -z "${build_compiler}" ]]; then 1367 if [[ "${compiler}" != "javac" && -z "${build_compiler}" ]]; then
1180 die "ANT_BUILD_COMPILER undefined in ${compiler_env}" 1368 die "ANT_BUILD_COMPILER undefined in ${compiler_env}"
1181 fi 1369 fi
1182 1370
1183 if [[ ${compiler} != "javac" ]]; then 1371 if [[ ${compiler} != "javac" ]]; then
1184 antflags="-Dbuild.compiler=${build_compiler}" 1372 antflags="${antflags} -Dbuild.compiler=${build_compiler}"
1185 # Figure out any extra stuff to put on the classpath for compilers aside 1373 # Figure out any extra stuff to put on the classpath for compilers aside
1186 # from javac 1374 # from javac
1187 # ANT_BUILD_COMPILER_DEPS should be something that could be passed to 1375 # ANT_BUILD_COMPILER_DEPS should be something that could be passed to
1188 # java-config -p 1376 # java-config -p
1189 local build_compiler_deps="$(source ${JAVA_PKG_COMPILER_DIR}/${compiler} 1>/dev/null 2>&1; echo ${ANT_BUILD_COMPILER_DEPS})" 1377 local build_compiler_deps="$(source ${JAVA_PKG_COMPILER_DIR}/${compiler} 1>/dev/null 2>&1; echo ${ANT_BUILD_COMPILER_DEPS})"
1190 if [[ -n ${build_compiler_deps} ]]; then 1378 if [[ -n ${build_compiler_deps} ]]; then
1191 antflags="${antflags} -lib $(java-config -p ${build_compiler_deps})" 1379 antflags="${antflags} -lib $(java-config -p ${build_compiler_deps})"
1192 fi 1380 fi
1193 fi 1381 fi
1194 1382
1383 if is-java-strict; then
1384 einfo "Disabling system classpath for ant"
1385 antflags="${antflags} -Dbuild.sysclasspath=ignore"
1386 fi
1387
1195 if [[ -n ${JAVA_PKG_DEBUG} ]]; then 1388 if [[ -n ${JAVA_PKG_DEBUG} ]]; then
1196 antflags="${antflags} -debug" 1389 antflags="${antflags} -debug"
1197 fi 1390 fi
1198 1391
1392 local gcp="${EANT_GENTOO_CLASSPATH}"
1393
1394 if [[ "${gcp}" ]]; then
1395 local cp="$(java-pkg_getjars ${gcp})"
1396 # It seems ant does not like single quotes around ${cp}
1397 antflags="${antflags} -Dgentoo.classpath=\"${cp}\""
1398 fi
1399
1199 [[ -n ${JAVA_PKG_DEBUG} ]] && echo ant ${antflags} "${@}" 1400 [[ -n ${JAVA_PKG_DEBUG} ]] && echo ant ${antflags} "${@}"
1200 ant ${antflags} "${@}" || die "eant failed" 1401 ant ${antflags} "${@}" || die "eant failed"
1201 1402
1202} 1403}
1203 1404
1204# ------------------------------------------------------------------------------ 1405# ------------------------------------------------------------------------------
1205# @ebuild-function ejavac 1406# @ebuild-function ejavac
1206# 1407#
1207# Javac wrapper function. Will use the appropriate compiler, based on 1408# Javac wrapper function. Will use the appropriate compiler, based on
1208# /etc/java-config/compilers.conf 1409# /etc/java-config/compilers.conf
1209# 1410#
1210# @param $@ - Arguments to be passed to the compiler 1411# @param $@ - Arguments to be passed to the compiler
1211# ------------------------------------------------------------------------------ 1412# ------------------------------------------------------------------------------
1212ejavac() { 1413ejavac() {
1213 debug-print-function ${FUNCNAME} $* 1414 debug-print-function ${FUNCNAME} $*
1214 1415
1416 java-pkg_init-compiler_
1417
1418 local compiler_executable
1215 local compiler_executable=$(java-pkg_get-javac) 1419 compiler_executable=$(java-pkg_get-javac)
1420 if [[ ${?} != 0 ]]; then
1421 eerror "There was a problem determining compiler: ${compiler_executable}"
1422 die "get-javac failed"
1423 fi
1216 1424
1425 local javac_args
1426 javac_args="$(java-pkg_javac-args)"
1427 if [[ ${?} != 0 ]]; then
1428 eerror "There was a problem determining JAVACFLAGS: ${javac_args}"
1429 die "java-pkg_javac-args failed"
1430 fi
1431
1217 [[ -n ${JAVA_PKG_DEBUG} ]] && echo ${compiler_executable} $(java-pkg_javac-args) "${@}" 1432 [[ -n ${JAVA_PKG_DEBUG} ]] && echo ${compiler_executable} ${javac_args} "${@}"
1218 ${compiler_executable} $(java-pkg_javac-args) "${@}" || die "ejavac failed" 1433 ${compiler_executable} ${javac_args} "${@}" || die "ejavac failed"
1219} 1434}
1220 1435
1221# ------------------------------------------------------------------------------ 1436# ------------------------------------------------------------------------------
1222# @ebuild-function java-pkg_filter-compiler 1437# @ebuild-function java-pkg_filter-compiler
1223# 1438#
1224# Used to prevent the use of some compilers. Should be used in src_compile. 1439# Used to prevent the use of some compilers. Should be used in src_compile.
1225# Basically, it just appends onto JAVA_PKG_FILTER_COMPILER 1440# Basically, it just appends onto JAVA_PKG_FILTER_COMPILER
1226# 1441#
1227# @param $@ - compilers to filter 1442# @param $@ - compilers to filter
1228# ------------------------------------------------------------------------------ 1443# ------------------------------------------------------------------------------
1229java-pkg_filter-compiler() { 1444java-pkg_filter-compiler() {
1230 JAVA_PKG_FILTER_COMPILER="${JAVA_PKG_FILTER_COMPILER} $@" 1445 JAVA_PKG_FILTER_COMPILER="${JAVA_PKG_FILTER_COMPILER} $@"
1231} 1446}
1232 1447
1233# ------------------------------------------------------------------------------ 1448# ------------------------------------------------------------------------------
1449# @ebuild-function java-pkg_force-compiler
1450#
1451# Used to force the use of particular compilers. Should be used in src_compile.
1452# A common use of this would be to force ecj-3.1 to be used on amd64, to avoid
1453# OutOfMemoryErrors that may come up.
1454#
1455# @param $@ - compilers to force
1456# ------------------------------------------------------------------------------
1457java-pkg_force-compiler() {
1458 JAVA_PKG_FORCE_COMPILER="$@"
1459}
1460
1461# ------------------------------------------------------------------------------
1234# @ebuild-function use_doc 1462# @ebuild-function use_doc
1235# 1463#
1236# Helper function for getting ant to build javadocs. If the user has USE=doc, 1464# Helper function for getting ant to build javadocs. If the user has USE=doc,
1237# then 'javadoc' or the argument are returned. Otherwise, there is no return. 1465# then 'javadoc' or the argument are returned. Otherwise, there is no return.
1238# 1466#
1239# The output of this should be passed to ant. 1467# The output of this should be passed to ant.
1240# 1468#
1241# Example: build javadocs by calling 'javadoc' target 1469# Example: build javadocs by calling 'javadoc' target
1242# eant $(use_doc) 1470# eant $(use_doc)
1243# Example: build javadocs by calling 'apidoc' target 1471# Example: build javadocs by calling 'apidoc' target
1248# ------------------------------------------------------------------------------ 1476# ------------------------------------------------------------------------------
1249use_doc() { 1477use_doc() {
1250 use doc && echo ${@:-javadoc} 1478 use doc && echo ${@:-javadoc}
1251} 1479}
1252 1480
1481
1253# ------------------------------------------------------------------------------ 1482# ------------------------------------------------------------------------------
1254# @section-end build 1483# @section-end build
1255# ------------------------------------------------------------------------------ 1484# ------------------------------------------------------------------------------
1256 1485
1257# ------------------------------------------------------------------------------ 1486# ------------------------------------------------------------------------------
1258# @section-begin internal 1487# @section-begin internal
1259# @section-summary Internal functions 1488# @section-summary Internal functions
1260# 1489#
1261# Do __NOT__ use any of these from an ebuild! These are only to be used from 1490# Do __NOT__ use any of these from an ebuild! These are only to be used from
1262# within the java eclasses. 1491# within the java eclasses.
1263# ------------------------------------------------------------------------------ 1492# ------------------------------------------------------------------------------
1264 1493
1265# ----------------------------------------------------------------------------- 1494# -----------------------------------------------------------------------------
1266# @function-internal java-pkg_init 1495# @function-internal java-pkg_init
1267# 1496#
1268# The purpose of this function, as the name might imply, is to initialize the 1497# The purpose of this function, as the name might imply, is to initialize the
1269# Java environment. It ensures that that there aren't any environment variables 1498# Java environment. It ensures that that there aren't any environment variables
1270# that'll muss things up. It initializes some variables, which are used 1499# that'll muss things up. It initializes some variables, which are used
1271# internally. And most importantly, it'll switch the VM if necessary. 1500# internally. And most importantly, it'll switch the VM if necessary.
1272# 1501#
1284 # TODO we will probably want to set JAVAC and JAVACFLAGS 1513 # TODO we will probably want to set JAVAC and JAVACFLAGS
1285 1514
1286 # Do some QA checks 1515 # Do some QA checks
1287 java-pkg_check-jikes 1516 java-pkg_check-jikes
1288 1517
1289 # When users have crazy classpaths some packages can fail to compile. 1518 # When users have crazy classpaths some packages can fail to compile.
1290 # and everything should work with empty CLASSPATH. 1519 # and everything should work with empty CLASSPATH.
1291 # This also helps prevent unexpected dependencies on random things 1520 # This also helps prevent unexpected dependencies on random things
1292 # from the CLASSPATH. 1521 # from the CLASSPATH.
1293 unset CLASSPATH 1522 unset CLASSPATH
1294} 1523}
1295 1524
1296# ------------------------------------------------------------------------------ 1525# ------------------------------------------------------------------------------
1297# @function-internal java-pkg-init-compiler_ 1526# @function-internal java-pkg-init-compiler_
1298# 1527#
1299# This function attempts to figure out what compiler should be used. It does 1528# This function attempts to figure out what compiler should be used. It does
1300# this by reading the file at JAVA_PKG_COMPILERS_CONF, and checking the 1529# this by reading the file at JAVA_PKG_COMPILERS_CONF, and checking the
1301# COMPILERS variable defined there. 1530# COMPILERS variable defined there.
1302# This can be overridden by a list in JAVA_PKG_FORCE_COMPILER 1531# This can be overridden by a list in JAVA_PKG_FORCE_COMPILER
1303# 1532#
1304# It will go through the list of compilers, and verify that it supports the 1533# It will go through the list of compilers, and verify that it supports the
1305# target and source that are needed. If it is not suitable, then the next 1534# target and source that are needed. If it is not suitable, then the next
1306# compiler is checked. When JAVA_PKG_FORCE_COMPILER is defined, this checking 1535# compiler is checked. When JAVA_PKG_FORCE_COMPILER is defined, this checking
1307# isn't done. 1536# isn't done.
1308# 1537#
1324 if [[ -n ${GENTOO_COMPILER} ]]; then 1553 if [[ -n ${GENTOO_COMPILER} ]]; then
1325 debug-print "GENTOO_COMPILER already set" 1554 debug-print "GENTOO_COMPILER already set"
1326 return 1555 return
1327 fi 1556 fi
1328 1557
1558 local compilers;
1559 if [[ -z ${JAVA_PKG_FORCE_COMPILER} ]]; then
1329 local compilers="$(source ${JAVA_PKG_COMPILERS_CONF} 1>/dev/null 2>&1; echo ${COMPILERS})" 1560 compilers="$(source ${JAVA_PKG_COMPILERS_CONF} 1>/dev/null 2>&1; echo ${COMPILERS})"
1561 else
1562 compilers=${JAVA_PKG_FORCE_COMPILER}
1563 fi
1564
1330 debug-print "Read \"${compilers}\" from ${JAVA_PKG_COMPILERS_CONF}" 1565 debug-print "Read \"${compilers}\" from ${JAVA_PKG_COMPILERS_CONF}"
1331 1566
1332 # Figure out if we should announce what compiler we're using 1567 # Figure out if we should announce what compiler we're using
1333 local compiler 1568 local compiler
1334 for compiler in ${compilers}; do 1569 for compiler in ${compilers}; do
1337 if [[ ${compiler} = "javac" ]]; then 1572 if [[ ${compiler} = "javac" ]]; then
1338 debug-print "Found javac... breaking" 1573 debug-print "Found javac... breaking"
1339 export GENTOO_COMPILER="javac" 1574 export GENTOO_COMPILER="javac"
1340 break 1575 break
1341 fi 1576 fi
1342 1577
1343 if has ${compiler} ${JAVA_PKG_FILTER_COMPILER}; then 1578 if has ${compiler} ${JAVA_PKG_FILTER_COMPILER}; then
1344 if [[ -z ${JAVA_PKG_FORCE_COMPILER} ]]; then 1579 if [[ -z ${JAVA_PKG_FORCE_COMPILER} ]]; then
1345 einfo "Filtering ${compiler}" 1580 einfo "Filtering ${compiler}"
1346 continue 1581 continue
1347 fi 1582 fi
1348 fi 1583 fi
1349 1584
1350 # for non-javac, we need to make sure it supports the right target and 1585 # for non-javac, we need to make sure it supports the right target and
1351 # source 1586 # source
1352 local compiler_env="${JAVA_PKG_COMPILER_DIR}/${compiler}" 1587 local compiler_env="${JAVA_PKG_COMPILER_DIR}/${compiler}"
1353 if [[ -f ${compiler_env} ]]; then 1588 if [[ -f ${compiler_env} ]]; then
1354 local desired_target="$(java-pkg_get-target)" 1589 local desired_target="$(java-pkg_get-target)"
1436# Writes the package.env out to disk. 1671# Writes the package.env out to disk.
1437# 1672#
1438# ------------------------------------------------------------------------------ 1673# ------------------------------------------------------------------------------
1439# TODO change to do-write, to match everything else 1674# TODO change to do-write, to match everything else
1440java-pkg_do_write_() { 1675java-pkg_do_write_() {
1676 java-pkg_init_paths_
1441 # Create directory for package.env 1677 # Create directory for package.env
1442 dodir "${JAVA_PKG_SHAREPATH}" 1678 dodir "${JAVA_PKG_SHAREPATH}"
1443 if [[ -n "${JAVA_PKG_CLASSPATH}" || -n "${JAVA_PKG_LIBRARY}" || -f "${JAVA_PKG_DEPEND}" ]]; then 1679 if [[ -n "${JAVA_PKG_CLASSPATH}" || -n "${JAVA_PKG_LIBRARY}" || -f "${JAVA_PKG_DEPEND}" ]]; then
1444 # Create package.env 1680 # Create package.env
1445 ( 1681 (
1450 [[ -n "${JAVA_PKG_LIBRARY}" ]] && echo "LIBRARY_PATH=\"${JAVA_PKG_LIBRARY}\"" 1686 [[ -n "${JAVA_PKG_LIBRARY}" ]] && echo "LIBRARY_PATH=\"${JAVA_PKG_LIBRARY}\""
1451 [[ -n "${JAVA_PROVIDE}" ]] && echo "PROVIDES=\"${JAVA_PROVIDE}\"" 1687 [[ -n "${JAVA_PROVIDE}" ]] && echo "PROVIDES=\"${JAVA_PROVIDE}\""
1452 [[ -f "${JAVA_PKG_DEPEND}" ]] && echo "DEPEND=\"$(cat ${JAVA_PKG_DEPEND} | uniq | tr '\n' ':')\"" 1688 [[ -f "${JAVA_PKG_DEPEND}" ]] && echo "DEPEND=\"$(cat ${JAVA_PKG_DEPEND} | uniq | tr '\n' ':')\""
1453 echo "VM=\"$(echo ${RDEPEND} ${DEPEND} | sed -e 's/ /\n/g' | sed -n -e '/virtual\/\(jre\|jdk\)/ { p;q }')\"" # TODO cleanup ! 1689 echo "VM=\"$(echo ${RDEPEND} ${DEPEND} | sed -e 's/ /\n/g' | sed -n -e '/virtual\/\(jre\|jdk\)/ { p;q }')\"" # TODO cleanup !
1454 ) > "${JAVA_PKG_ENV}" 1690 ) > "${JAVA_PKG_ENV}"
1455 1691
1456 # register target/source 1692 # register target/source
1457 local target="$(java-pkg_get-target)" 1693 local target="$(java-pkg_get-target)"
1458 local source="$(java-pkg_get-source)" 1694 local source="$(java-pkg_get-source)"
1459 [[ -n ${target} ]] && echo "TARGET=\"${target}\"" >> "${JAVA_PKG_ENV}" 1695 [[ -n ${target} ]] && echo "TARGET=\"${target}\"" >> "${JAVA_PKG_ENV}"
1460 [[ -n ${source} ]] && echo "SOURCE=\"${source}\"" >> "${JAVA_PKG_ENV}" 1696 [[ -n ${source} ]] && echo "SOURCE=\"${source}\"" >> "${JAVA_PKG_ENV}"
1473 # Strip unnecessary leading and trailing colons 1709 # Strip unnecessary leading and trailing colons
1474 # TODO try to cleanup if possible 1710 # TODO try to cleanup if possible
1475 sed -e "s/=\":/=\"/" -e "s/:\"$/\"/" -i "${JAVA_PKG_ENV}" || die "Did you forget to call java_init ?" 1711 sed -e "s/=\":/=\"/" -e "s/:\"$/\"/" -i "${JAVA_PKG_ENV}" || die "Did you forget to call java_init ?"
1476 fi 1712 fi
1477} 1713}
1478
1479 1714
1480# ------------------------------------------------------------------------------ 1715# ------------------------------------------------------------------------------
1481# @internal-function java-pkg_record-jar_ 1716# @internal-function java-pkg_record-jar_
1482# 1717#
1483# Record a dependency to the package.env 1718# Record a dependency to the package.env
1527 fi 1762 fi
1528} 1763}
1529 1764
1530# ------------------------------------------------------------------------------ 1765# ------------------------------------------------------------------------------
1531# @internal-function java-pkg_expand_dir_ 1766# @internal-function java-pkg_expand_dir_
1532# 1767#
1533# Gets the full path of the file/directory's parent. 1768# Gets the full path of the file/directory's parent.
1534# @param $1 - file/directory to find parent directory for 1769# @param $1 - file/directory to find parent directory for
1535# @return - path to $1's parent directory 1770# @return - path to $1's parent directory
1536# ------------------------------------------------------------------------------ 1771# ------------------------------------------------------------------------------
1537java-pkg_expand_dir_() { 1772java-pkg_expand_dir_() {
1564# ------------------------------------------------------------------------------ 1799# ------------------------------------------------------------------------------
1565java-pkg_setup-vm() { 1800java-pkg_setup-vm() {
1566 debug-print-function ${FUNCNAME} $* 1801 debug-print-function ${FUNCNAME} $*
1567 1802
1568 local vendor="$(java-pkg_get-vm-vendor)" 1803 local vendor="$(java-pkg_get-vm-vendor)"
1569 if [[ "${vendor}" == "sun" ]] && java-pkg_is-vm-version-ge 1 5; then 1804 if [[ "${vendor}" == "sun" ]] && java-pkg_is-vm-version-ge "1.5" ; then
1570 addpredict "/dev/random" 1805 addpredict "/dev/random"
1571 elif [[ "${vendor}" == "ibm" ]]; then 1806 elif [[ "${vendor}" == "ibm" ]]; then
1572 addpredict "/proc/self/maps" 1807 addpredict "/proc/self/maps"
1573 addpredict "/proc/cpuinfo" 1808 addpredict "/proc/cpuinfo"
1574 export LANG="C" LC_ALL="C" 1809 export LANG="C" LC_ALL="C"
1623# @return - The version of the current VM 1858# @return - The version of the current VM
1624# ------------------------------------------------------------------------------ 1859# ------------------------------------------------------------------------------
1625java-pkg_get-vm-version() { 1860java-pkg_get-vm-version() {
1626 debug-print-function ${FUNCNAME} $* 1861 debug-print-function ${FUNCNAME} $*
1627 1862
1628 java-pkg_get-current-vm | sed -e "s/.*-\([0-9.]\+\).*/\1/" 1863 java-config -g PROVIDES_VERSION
1629} 1864}
1630 1865
1631# ------------------------------------------------------------------------------ 1866# ------------------------------------------------------------------------------
1632# @internal-function java-pkg_switch-vm 1867# @internal-function java-pkg_switch-vm
1633# 1868#
1634# Switch VM if we're allowed to (controlled by JAVA_PKG_ALLOW_VM_CHANGE), and 1869# Switch VM if we're allowed to (controlled by JAVA_PKG_ALLOW_VM_CHANGE), and
1635# verify that the current VM is sufficient. 1870# verify that the current VM is sufficient.
1636# Setup the environment for the VM being used. 1871# Setup the environment for the VM being used.
1637# ------------------------------------------------------------------------------ 1872# ------------------------------------------------------------------------------
1638java-pkg_switch-vm() { 1873java-pkg_switch-vm() {
1874 debug-print-function ${FUNCNAME} $*
1875
1639 if java-pkg_needs-vm; then 1876 if java-pkg_needs-vm; then
1640 # Use the VM specified by JAVA_PKG_FORCE_VM 1877 # Use the VM specified by JAVA_PKG_FORCE_VM
1641 if [[ -n ${JAVA_PKG_FORCE_VM} ]]; then 1878 if [[ -n "${JAVA_PKG_FORCE_VM}" ]]; then
1642 # If you're forcing the VM, I hope you know what your doing... 1879 # If you're forcing the VM, I hope you know what your doing...
1880 debug-print "JAVA_PKG_FORCE_VM used: ${JAVA_PKG_FORCE_VM}"
1643 export GENTOO_VM="${JAVA_PKG_FORCE_VM}" 1881 export GENTOO_VM="${JAVA_PKG_FORCE_VM}"
1644 # if we're allowed to switch the vm... 1882 # if we're allowed to switch the vm...
1645 elif [[ "${JAVA_PKG_ALLOW_VM_CHANGE}" == "yes" ]]; then 1883 elif [[ "${JAVA_PKG_ALLOW_VM_CHANGE}" == "yes" ]]; then
1646 debug-print "depend-java-query: NV_DEPEND: ${JAVA_PKG_NV_DEPEND:-${DEPEND}} VNEED: ${JAVA_PKG_VNEED}" 1884 debug-print "depend-java-query: NV_DEPEND: ${JAVA_PKG_NV_DEPEND:-${DEPEND}} VNEED: ${JAVA_PKG_VNEED}"
1647 if [[ -n ${JAVA_PKG_VNEED} ]]; then 1885 if [[ -n ${JAVA_PKG_VNEED} ]]; then
1648 export GENTOO_VM="$(depend-java-query --need-virtual "${JAVA_PKG_VNEED}" --get-vm "${JAVA_PKG_NV_DEPEND:-${DEPEND}}")" 1886 GENTOO_VM="$(depend-java-query --need-virtual "${JAVA_PKG_VNEED}" --get-vm "${JAVA_PKG_NV_DEPEND:-${DEPEND}}")"
1649 else 1887 else
1650 export GENTOO_VM="$(depend-java-query --get-vm "${JAVA_PKG_NV_DEPEND:-${DEPEND}}")" 1888 GENTOO_VM="$(depend-java-query --get-vm "${JAVA_PKG_NV_DEPEND:-${DEPEND}}")"
1889 fi
1890 if [[ -z "${GENTOO_VM}" || "${GENTOO_VM}" == "None" ]]; then
1891 eerror "Unable to determine VM for building from dependencies:"
1892 echo "NV_DEPEND: ${JAVA_PKG_NV_DEPEND:-${DEPEND}}"
1893 echo "VNEED: ${JAVA_PKG_VNEED}"
1894 die "Failed to determine VM for building."
1895 else
1896 export GENTOO_VM
1651 fi 1897 fi
1652 # otherwise just make sure the current VM is sufficient 1898 # otherwise just make sure the current VM is sufficient
1653 else 1899 else
1654 java-pkg_ensure-vm-version-sufficient 1900 java-pkg_ensure-vm-version-sufficient
1655 fi 1901 fi
1656 debug-print "Using: $(java-config -f)" 1902 debug-print "Using: $(java-config -f)"
1657 1903
1658 java-pkg_setup-vm 1904 java-pkg_setup-vm
1659 1905
1906 export JAVA=$(java-config --java)
1907 export JAVAC=$(java-config --javac)
1660 export JAVACFLAGS="$(java-pkg_javac-args)" 1908 JAVACFLAGS="$(java-pkg_javac-args)"
1909 if [[ ${?} != 0 ]]; then
1910 eerror "There was a problem determining JAVACFLAGS: ${JAVACFLAGS}"
1911 die "java-pkg_javac-args failed"
1912 fi
1661 [[ -n ${JAVACFLAGS_EXTRA} ]] && export JAVACFLAGS="${JAVACFLAGS_EXTRA} ${JAVACFLAGS}" 1913 [[ -n ${JAVACFLAGS_EXTRA} ]] && JAVACFLAGS="${JAVACFLAGS_EXTRA} ${JAVACFLAGS}"
1914 export JAVACFLAGS
1662 1915
1663 export JAVA_HOME="$(java-config -g JAVA_HOME)" 1916 export JAVA_HOME="$(java-config -g JAVA_HOME)"
1664 export JDK_HOME=${JAVA_HOME} 1917 export JDK_HOME=${JAVA_HOME}
1665 1918
1666 #TODO If you know a better solution let us know. 1919 #TODO If you know a better solution let us know.
1667 java-pkg_append_ LD_LIBRARY_PATH "$(java-config -g LDPATH)" 1920 java-pkg_append_ LD_LIBRARY_PATH "$(java-config -g LDPATH)"
1668 1921
1669 local tann="${T}/announced-vm" 1922 local tann="${T}/announced-vm"
1670 if [[ -n "${JAVA_PKG_DEBUG}" ]] || [[ ! -f "${tann}" ]] ; then 1923 if [[ -n "${JAVA_PKG_DEBUG}" ]] || [[ ! -f "${tann}" ]] ; then
1671 # Add a check for setup/preinst phase... to avoid duplicate outputs 1924 # Add a check for setup/preinst phase... to avoid duplicate outputs
1672 # for when FEATURES=buildpkg 1925 # for when FEATURES=buildpkg
1673 if [[ ${EBUILD_PHASE} != "setup" && ${EBUILD_PHASE} != "preinst" && ${EBUILD_PHASE} != "postinst" ]]; 1926 if [[ ${EBUILD_PHASE} != "setup" && ${EBUILD_PHASE} != "preinst" && ${EBUILD_PHASE} != "postinst" ]];
1698 echo "GENTOO_VM=${GENTOO_VM} CLASSPATH=\"${CLASSPATH}\" JAVA_HOME=\"${JAVA_HOME}\"" >&2 1951 echo "GENTOO_VM=${GENTOO_VM} CLASSPATH=\"${CLASSPATH}\" JAVA_HOME=\"${JAVA_HOME}\"" >&2
1699 echo "JAVACFLAGS=\"${JAVACFLAGS}\" COMPILER=\"${GENTOO_COMPILER}\"" >&2 1952 echo "JAVACFLAGS=\"${JAVACFLAGS}\" COMPILER=\"${GENTOO_COMPILER}\"" >&2
1700 echo "and of course, the output of emerge --info" >&2 1953 echo "and of course, the output of emerge --info" >&2
1701} 1954}
1702 1955
1956
1957# TODO document
1958# List jars in the source directory, ${S}
1959java-pkg_jar-list() {
1960 if [[ -n "${JAVA_PKG_DEBUG}" ]]; then
1961 einfo "Linked Jars"
1962 find "${S}" -type l -name '*.jar' -print0 | xargs -0 -r -n 500 ls -ald | sed -e "s,${WORKDIR},\${WORKDIR},"
1963 einfo "Jars"
1964 find "${S}" -type f -name '*.jar' -print0 | xargs -0 -r -n 500 ls -ald | sed -e "s,${WORKDIR},\${WORKDIR},"
1965 einfo "Classes"
1966 find "${S}" -type f -name '*.class' -print0 | xargs -0 -r -n 500 ls -ald | sed -e "s,${WORKDIR},\${WORKDIR},"
1967 fi
1968}
1969
1970# TODO document
1971# Verify that the classes were compiled for the right source / target
1972java-pkg_verify-classes() {
1973 ebegin "Verifying java class versions"
1974 #$(find ${D} -type f -name '*.jar' -o -name '*.class')
1975 class-version-verify.py -t $(java-pkg_get-target) -r ${D}
1976 result=$?
1977 eend ${result}
1978 if [[ ${result} == 0 ]]; then
1979 einfo "All good"
1980 else
1981 ewarn "Possible problem"
1982 die "Bad class files found"
1983 fi
1984}
1985
1703# ------------------------------------------------------------------------------ 1986# ------------------------------------------------------------------------------
1704# @section-end internal 1987# @section-end internal
1705# ------------------------------------------------------------------------------ 1988# ------------------------------------------------------------------------------
1706 1989
1707java-pkg_check-phase() { 1990java-pkg_check-phase() {
1708 local phase=${1} 1991 local phase=${1}
1709 local funcname=${2} 1992 local funcname=${2}
1710 # TODO add check for java-stricter
1711 if [[ ${EBUILD_PHASE} != ${phase} ]]; then 1993 if is-java-strict && [[ ${EBUILD_PHASE} != ${phase} ]]; then
1712 java-pkg_announce-qa-violation \ 1994 java-pkg_announce-qa-violation \
1713 "${funcname} used outside of src_${phase}" 1995 "${funcname} used outside of src_${phase}"
1714 fi 1996 fi
1715} 1997}
1716 1998
1727 java-pkg_announce-qa-violation "deprecated USE flag 'jikes' in IUSE" 2009 java-pkg_announce-qa-violation "deprecated USE flag 'jikes' in IUSE"
1728 fi 2010 fi
1729} 2011}
1730 2012
1731java-pkg_announce-qa-violation() { 2013java-pkg_announce-qa-violation() {
1732 if hasq java-strict ${FEATURES}; then 2014 if is-java-strict; then
1733 echo "Java QA Notice: $@" >&2 2015 echo "Java QA Notice: $@" >&2
1734 increment-qa-violations 2016 increment-qa-violations
1735 fi 2017 fi
1736} 2018}
1737 2019
1738increment-qa-violations() { 2020increment-qa-violations() {
1739 let "JAVA_PKG_QA_VIOLATIONS+=1" 2021 let "JAVA_PKG_QA_VIOLATIONS+=1"
1740 export JAVA_PKG_QA_VIOLATIONS 2022 export JAVA_PKG_QA_VIOLATIONS
1741} 2023}
1742 2024
2025is-java-strict() {
2026 [[ -n ${JAVA_PKG_STRICT} ]]
2027 return $?
2028}
2029
1743# ------------------------------------------------------------------------------ 2030# ------------------------------------------------------------------------------
1744# @eclass-end 2031# @eclass-end
1745# ------------------------------------------------------------------------------ 2032# ------------------------------------------------------------------------------

Legend:
Removed from v.1.2  
changed lines
  Added in v.1.42

  ViewVC Help
Powered by ViewVC 1.1.20