/[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.6 Revision 1.33
4# Copyright (c) 2004, Karl Trygve Kalleberg <karltk@gentoo.org> 4# Copyright (c) 2004, Karl Trygve Kalleberg <karltk@gentoo.org>
5# Copyright (c) 2004-2005, Gentoo Foundation 5# Copyright (c) 2004-2005, Gentoo Foundation
6# 6#
7# Licensed under the GNU General Public License, v2 7# Licensed under the GNU General Public License, v2
8# 8#
9# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.33 2006/12/07 02:27:22 flameeyes Exp $
9 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#
219# will not work, because: 225# will not work, because:
220# * the `for jar in "$@"` can't expand the path to jar file names, as they 226# * the `for jar in "$@"` can't expand the path to jar file names, as they
221# don't exist yet 227# don't exist yet
222# * all `if ...` inside for will fail - the file '/opt/my-java/lib/*.jar' 228# * all `if ...` inside for will fail - the file '/opt/my-java/lib/*.jar'
223# doesn't exist 229# doesn't exist
224# 230#
225# you have to use it as: 231# you have to use it as:
226# 232#
227# java-pkg_regjar ${D}/opt/my-java/lib/*.jar 233# java-pkg_regjar ${D}/opt/my-java/lib/*.jar
228# 234#
229# @param $@ - jars to record 235# @param $@ - jars to record
230# ------------------------------------------------------------------------------ 236# ------------------------------------------------------------------------------
231# TODO fix me! 237# TODO should we be making sure the jar is present on ${D} or wherever?
232java-pkg_regjar() { 238java-pkg_regjar() {
233 debug-print-function ${FUNCNAME} $* 239 debug-print-function ${FUNCNAME} $*
234 240
235 java-pkg_check-phase install 241 java-pkg_check-phase install
236 242
284 cp "${original_jar}" "${new_jar_dest}" \ 290 cp "${original_jar}" "${new_jar_dest}" \
285 || die "Failed to copy ${original_jar} to ${new_jar_dest}" 291 || die "Failed to copy ${original_jar} to ${new_jar_dest}"
286 java-pkg_dojar "${new_jar_dest}" 292 java-pkg_dojar "${new_jar_dest}"
287} 293}
288 294
289
290# ------------------------------------------------------------------------------ 295# ------------------------------------------------------------------------------
291# @ebuild-function java-pkg_addcp 296# @ebuild-function java-pkg_addcp
292# 297#
293# Add something to the package's classpath. For jars, you should use dojar, 298# Add something to the package's classpath. For jars, you should use dojar,
294# newjar, or regjar. This is typically used to add directories to the classpath. 299# newjar, or regjar. This is typically used to add directories to the classpath.
299java-pkg_addcp() { 304java-pkg_addcp() {
300 java-pkg_append_ JAVA_PKG_CLASSPATH "${@}" 305 java-pkg_append_ JAVA_PKG_CLASSPATH "${@}"
301 java-pkg_do_write_ 306 java-pkg_do_write_
302} 307}
303 308
304
305# ------------------------------------------------------------------------------ 309# ------------------------------------------------------------------------------
306# @ebuild-function java-pkg_doso 310# @ebuild-function java-pkg_doso
307# 311#
308# Installs any number of JNI libraries 312# Installs any number of JNI libraries
309# They will be installed into /usr/lib by default, but java-pkg_sointo 313# They will be installed into /usr/lib by default, but java-pkg_sointo
310# can be used change this path 314# can be used change this path
311# 315#
312# Example: 316# Example:
367 java-pkg_check-phase install 371 java-pkg_check-phase install
368 372
369 [[ ${#} -lt 1 ]] && "at least one argument needed" 373 [[ ${#} -lt 1 ]] && "at least one argument needed"
370 374
371 java-pkg_init_paths_ 375 java-pkg_init_paths_
372 376
373 local lib target_dir 377 local lib target_dir
374 for lib in "$@" ; do 378 for lib in "$@" ; do
375 # Check the absolute path of the lib 379 # Check the absolute path of the lib
376 if [[ -e "${lib}" ]] ; then 380 if [[ -e "${lib}" ]] ; then
377 target_dir="$(java-pkg_expand_dir_ ${lib})" 381 target_dir="$(java-pkg_expand_dir_ ${lib})"
425# ------------------------------------------------------------------------------ 429# ------------------------------------------------------------------------------
426java-pkg_dohtml() { 430java-pkg_dohtml() {
427 debug-print-function ${FUNCNAME} $* 431 debug-print-function ${FUNCNAME} $*
428 432
429 [[ ${#} -lt 1 ]] && die "At least one argument required for ${FUNCNAME}" 433 [[ ${#} -lt 1 ]] && die "At least one argument required for ${FUNCNAME}"
430 # TODO-nichoj find out what exactly -f package-list does 434
435 # from /usr/lib/portage/bin/dohtml -h
436 # -f Set list of allowed extensionless file names.
431 dohtml -f package-list "$@" 437 dohtml -f package-list "$@"
438
432 # this probably shouldn't be here but it provides 439 # this probably shouldn't be here but it provides
433 # a reasonable way to catch # docs for all of the 440 # a reasonable way to catch # docs for all of the
434 # old ebuilds. 441 # old ebuilds.
435 java-pkg_recordjavadoc 442 java-pkg_recordjavadoc
436} 443}
437 444
438# TODO document 445# ------------------------------------------------------------------------------
446# @ebuild-function java-pkg_dojavadoc
447#
448# Installs javadoc documentation. This should be controlled by the doc use flag.
449#
450# @param $1: - The javadoc root directory.
451#
452# @example:
453# java-pkg_dojavadoc docs/api
454#
455# ------------------------------------------------------------------------------
439java-pkg_dojavadoc() { 456java-pkg_dojavadoc() {
440 local dir="$1" 457 local dir="$1"
441 458
442 java-pkg_check-phase install 459 java-pkg_check-phase install
443 460
455} 472}
456 473
457# ------------------------------------------------------------------------------ 474# ------------------------------------------------------------------------------
458# @ebuild-function java-pkg_dosrc 475# @ebuild-function java-pkg_dosrc
459# 476#
460# Installs a zip containing the source for a package, so it can used in 477# Installs a zip containing the source for a package, so it can used in
461# from IDEs like eclipse and netbeans. 478# from IDEs like eclipse and netbeans.
462# 479#
463# Ebuild needs to DEPEND on app-arch/zip to use this. 480# Ebuild needs to DEPEND on app-arch/zip to use this.
464# 481#
465# It also should be controlled by USE=source. 482# It also should be controlled by USE=source.
466# 483#
467# @example: 484# @example:
468# java-pkg_dosrc src/* 485# java-pkg_dosrc src/*
469# 486#
470# ------------------------------------------------------------------------------ 487# ------------------------------------------------------------------------------
471# TODO change so it the arguments it takes are the base directories containing 488# TODO change so it the arguments it takes are the base directories containing
472# source -nichoj 489# source -nichoj
473# TODO should we be able to handle multiple calls to dosrc? -nichoj 490# TODO should we be able to handle multiple calls to dosrc? -nichoj
474# TODO maybe we can take an existing zip/jar? -nichoj 491# TODO maybe we can take an existing zip/jar? -nichoj
475# FIXME apparently this fails if you give it an empty directories 492# FIXME apparently this fails if you give it an empty directories
476java-pkg_dosrc() { 493java-pkg_dosrc() {
477 debug-print-function ${FUNCNAME} $* 494 debug-print-function ${FUNCNAME} $*
478 495
479 [ ${#} -lt 1 ] && die "At least one argument needed" 496 [ ${#} -lt 1 ] && die "At least one argument needed"
480 if ! hasq source ${IUSE}; then 497 if ! hasq source ${IUSE}; then
481 echo "Java QA Notice: ${FUNCNAME} called without source in IUSE" 498 echo "Java QA Notice: ${FUNCNAME} called without source in IUSE"
482 fi 499 fi
483 500
484 java-pkg_check-phase install 501 java-pkg_check-phase install
485 502
486 [[ ${#} -lt 1 ]] && die "At least one argument needed" 503 [[ ${#} -lt 1 ]] && die "At least one argument needed"
487 504
488 java-pkg_init_paths_ 505 java-pkg_init_paths_
489 506
490 local zip_name="${PN}-src.zip" 507 local zip_name="${PN}-src.zip"
491 local zip_path="${T}/${zip_name}" 508 local zip_path="${T}/${zip_name}"
515# @ebuild-function java-pkg_dolauncher 532# @ebuild-function java-pkg_dolauncher
516# 533#
517# Make a wrapper script to lauch/start this package 534# Make a wrapper script to lauch/start this package
518# If necessary, the wrapper will switch to the appropriate VM. 535# If necessary, the wrapper will switch to the appropriate VM.
519# 536#
537# Can be called without parameters if the package installs only one jar
538# that has the Main-class attribute set. The wrapper will be named ${PN}.
539#
520# @param $1 - filename of launcher to create 540# @param $1 - filename of launcher to create
521# @param $2 - options, as follows: 541# @param $2 - options, as follows:
522# --main the.main.class.too.start 542# --main the.main.class.too.start
523# --jar /the/jar/too/launch.jar 543# --jar /the/jar/too/launch.jar or just <name>.jar
524# --java_args 'Extra arguments to pass too jave' 544# --java_args 'Extra arguments to pass to java'
525# --pkg_args 'extra arguments too pass too the package' 545# --pkg_args 'Extra arguments too pass to the package'
526# --pwd 546# --pwd
527# -into 547# -into
528# -pre 548# -pre
529# ------------------------------------------------------------------------------ 549# ------------------------------------------------------------------------------
530java-pkg_dolauncher() { 550java-pkg_dolauncher() {
531 debug-print-function ${FUNCNAME} $* 551 debug-print-function ${FUNCNAME} $*
532 552
533 java-pkg_check-phase install 553 java-pkg_check-phase install
534
535 [[ ${#} -lt 1 ]] && die "Need at least one argument"
536
537 java-pkg_init_paths_ 554 java-pkg_init_paths_
538 555
556 if [[ ${#} = 0 ]]; then
557 local name="${PN}"
558 else
539 local name="${1}" 559 local name="${1}"
560 shift
561 fi
562
540 # TODO rename to launcher 563 # TODO rename to launcher
541 local target="${T}/${name}" 564 local target="${T}/${name}"
565 local var_tmp="${T}/launcher_variables_tmp"
542 local target_dir pre 566 local target_dir pre
543 shift
544 567
545 echo "#!/bin/bash" > "${target}" 568 # Process the other the rest of the arguments
546 while [[ -n "${1}" && -n "${2}" ]]; do 569 while [[ -n "${1}" && -n "${2}" ]]; do
547 local var=${1} value=${2} 570 local var=${1} value=${2}
548 if [[ "${var:0:2}" == "--" ]]; then 571 if [[ "${var:0:2}" == "--" ]]; then
572 local var=${var:2}
549 echo "gjl_${var:2}=\"${value}\"" >> "${target}" 573 echo "gjl_${var}=\"${value}\"" >> "${var_tmp}"
574 local gjl_${var}="${value}"
550 elif [[ "${var}" == "-into" ]]; then 575 elif [[ "${var}" == "-into" ]]; then
551 target_dir="${value}" 576 target_dir="${value}"
552 elif [[ "${var}" == "-pre" ]]; then 577 elif [[ "${var}" == "-pre" ]]; then
553 pre="${value}" 578 pre="${value}"
554 fi 579 fi
555 shift 2 580 shift 2
556 done 581 done
582
583 # Test if no --jar and --main arguments were given and
584 # in that case check if the package only installs one jar
585 # and use that jar.
586 if [[ -z "${gjl_jar}" && -z "${gjl_main}" ]]; then
587 local cp="${JAVA_PKG_CLASSPATH}"
588 if [[ "${cp/:}" = "${cp}" && "${cp%.jar}" != "${cp}" ]]; then
589 echo "gjl_jar=\"${JAVA_PKG_CLASSPATH}\"" >> "${var_tmp}"
590 else
591 local msg="Not enough information to create a launcher given."
592 msg="${msg} Please give --jar or --main argument to ${FUNCNAME}."
593 die "${msg}"
594 fi
595 fi
596
597 # Write the actual script
598 echo "#!/bin/bash" > "${target}"
599 [[ -n "${pre}" ]] && [[ -f "${pre}" ]] && cat "${pre}" >> "${target}"
557 echo "gjl_package=${JAVA_PKG_NAME}" >> "${target}" 600 echo "gjl_package=${JAVA_PKG_NAME}" >> "${target}"
558 [[ -n "${pre}" ]] && [[ -f "${pre}" ]] && cat "${pre}" >> "${target}" 601 cat "${var_tmp}" >> "${target}"
602 rm -f "${var_tmp}"
559 echo "source /usr/share/java-config-2/launcher/launcher.bash" >> "${target}" 603 echo "source /usr/share/java-config-2/launcher/launcher.bash" >> "${target}"
560 604
561 if [[ -n "${into}" ]]; then 605 if [[ -n "${target_dir}" ]]; then
562 DESTTREE="${target_dir}" dobin "${target}" 606 DESTTREE="${target_dir}" dobin "${target}"
563 local ret=$? 607 local ret=$?
564 return ${ret} 608 return ${ret}
565 else 609 else
566 dobin "${target}" 610 dobin "${target}"
594 echo "dowar: warning, skipping directory ${war}" 638 echo "dowar: warning, skipping directory ${war}"
595 continue 639 continue
596 else 640 else
597 warpath="${war}" 641 warpath="${war}"
598 fi 642 fi
599 643
600 # Install those files like you mean it 644 # Install those files like you mean it
601 INSOPTIONS="-m 0644" \ 645 INSOPTIONS="-m 0644" \
602 INSDESTTREE=${JAVA_PKG_WARDEST} \ 646 INSDESTTREE=${JAVA_PKG_WARDEST} \
603 doins ${warpath} 647 doins ${warpath}
604 done 648 done
639# @ebuild-function java-pkg_jar-from 683# @ebuild-function java-pkg_jar-from
640# 684#
641# Makes a symlink to a jar from a certain package 685# Makes a symlink to a jar from a certain package
642# A lot of java packages include dependencies in a lib/ directory 686# A lot of java packages include dependencies in a lib/ directory
643# You can use this function to replace these bundled dependencies. 687# You can use this function to replace these bundled dependencies.
688# The dependency is recorded into package.env DEPEND line, unless "--build-only"
689# is passed as the very first argument, for jars that have to be present only
690# at build time and are not needed on runtime (junit testing etc).
644# 691#
645# Example: get all jars from xerces slot 2 692# Example: get all jars from xerces slot 2
646# java-pkg_jar-from xerces-2 693# java-pkg_jar-from xerces-2
647# Example: get a specific jar from xerces slot 2 694# Example: get a specific jar from xerces slot 2
648# java-pkg_jar-from xerces-2 xml-apis.jar 695# java-pkg_jar-from xerces-2 xml-apis.jar
649# Example get a specific jar from xerces slot 2, and name it diffrently 696# Example: get a specific jar from xerces slot 2, and name it diffrently
650# java-pkg_jar-from xerces-2 xml-apis.jar xml.jar 697# java-pkg_jar-from xerces-2 xml-apis.jar xml.jar
698# Example: get junit.jar which is needed only for building
699# java-pkg_jar-from --build-only junit junit.jar
651# 700#
701# @param $1 - (optional) "--build-only" makes the jar(s) not added into
702# package.env DEPEND line.
652# @param $1 - Package to get jars from. 703# @param $1 - Package to get jars from.
653# @param $2 - jar from package. If not specified, all jars will be used. 704# @param $2 - jar from package. If not specified, all jars will be used.
654# @param $3 - When a single jar is specified, destination filename of the 705# @param $3 - When a single jar is specified, destination filename of the
655# symlink. Defaults to the name of the jar. 706# symlink. Defaults to the name of the jar.
656# ------------------------------------------------------------------------------ 707# ------------------------------------------------------------------------------
657# TODO could probably be cleaned up a little 708# TODO could probably be cleaned up a little
658java-pkg_jar-from() { 709java-pkg_jar-from() {
659 debug-print-function ${FUNCNAME} $* 710 debug-print-function ${FUNCNAME} $*
660 711
712 local build_only=""
713
714 if [[ "${1}" = "--build-only" ]]; then
715 build_only="true"
716 shift
717 fi
718
661 local target_pkg="${1}" target_jar="${2}" destjar="${3}" 719 local target_pkg="${1}" target_jar="${2}" destjar="${3}"
662 720
663 [[ -z ${target_pkg} ]] && die "Must specify a package" 721 [[ -z ${target_pkg} ]] && die "Must specify a package"
664 722
665 # default destjar to the target jar 723 # default destjar to the target jar
666 [[ -z "${destjar}" ]] && destjar="${target_jar}" 724 [[ -z "${destjar}" ]] && destjar="${target_jar}"
667 725
726 local error_msg="There was a problem getting the classpath for ${target_pkg}."
727 local classpath
668 local classpath="$(java-config --classpath=${target_pkg})" 728 classpath="$(java-config --classpath=${target_pkg})"
669 [[ $? != 0 ]] && die "There was a problem getting the classpath for ${target_pkg}" 729 [[ $? != 0 ]] && die ${error_msg}
670 730
671 local jar 731 local jar
672 for jar in ${classpath//:/ }; do 732 for jar in ${classpath//:/ }; do
673 local jar_name=$(basename "${jar}") 733 local jar_name=$(basename "${jar}")
674 if [[ ! -f "${jar}" ]] ; then 734 if [[ ! -f "${jar}" ]] ; then
678 # If no specific target jar was indicated, link it 738 # If no specific target jar was indicated, link it
679 if [[ -z "${target_jar}" ]] ; then 739 if [[ -z "${target_jar}" ]] ; then
680 [[ -f "${target_jar}" ]] && rm "${target_jar}" 740 [[ -f "${target_jar}" ]] && rm "${target_jar}"
681 ln -snf "${jar}" \ 741 ln -snf "${jar}" \
682 || die "Failed to make symlink from ${jar} to ${jar_name}" 742 || die "Failed to make symlink from ${jar} to ${jar_name}"
683 java-pkg_record-jar_ "${target_pkg}" "${jar}" 743 [[ -z "${build_only}" ]] && java-pkg_record-jar_ "${target_pkg}" "${jar}"
684 # otherwise, if the current jar is the target jar, link it 744 # otherwise, if the current jar is the target jar, link it
685 elif [[ "${jar_name}" == "${target_jar}" ]] ; then 745 elif [[ "${jar_name}" == "${target_jar}" ]] ; then
686 [[ -f "${destjar}" ]] && rm "${destjar}" 746 [[ -f "${destjar}" ]] && rm "${destjar}"
687 ln -snf "${jar}" "${destjar}" \ 747 ln -snf "${jar}" "${destjar}" \
688 || die "Failed to make symlink from ${jar} to ${destjar}" 748 || die "Failed to make symlink from ${jar} to ${destjar}"
689 java-pkg_record-jar_ "${target_pkg}" "${jar}" 749 [[ -z "${build_only}" ]] && java-pkg_record-jar_ "${target_pkg}" "${jar}"
690 return 0 750 return 0
691 fi 751 fi
692 done 752 done
693 # if no target was specified, we're ok 753 # if no target was specified, we're ok
694 if [[ -z "${target_jar}" ]] ; then 754 if [[ -z "${target_jar}" ]] ; then
711# ------------------------------------------------------------------------------ 771# ------------------------------------------------------------------------------
712# @ebuild-function java-pkg_getjars 772# @ebuild-function java-pkg_getjars
713# 773#
714# Get the classpath provided by any number of packages 774# Get the classpath provided by any number of packages
715# Among other things, this can be passed to 'javac -classpath' or 'ant -lib'. 775# Among other things, this can be passed to 'javac -classpath' or 'ant -lib'.
776# The providing packages are recorded as dependencies into package.env DEPEND
777# line, unless "--build-only" is passed as the very first argument, for jars
778# that have to be present only at build time and are not needed on runtime
779# (junit testing etc).
716# 780#
717# Example: Get the classpath for xerces-2, 781# Example: Get the classpath for xerces-2 and xalan,
718# java-pkg_getjars xerces-2 xalan 782# java-pkg_getjars xerces-2,xalan
719# Example Return: 783# Example Return:
720# /usr/share/xerces-2/lib/xml-apis.jar:/usr/share/xerces-2/lib/xmlParserAPIs.jar:/usr/share/xalan/lib/xalan.jar 784# /usr/share/xerces-2/lib/xml-apis.jar:/usr/share/xerces-2/lib/xmlParserAPIs.jar:/usr/share/xalan/lib/xalan.jar
721# 785#
786# @param $1 - (optional) "--build-only" makes the jar(s) not added into
787# package.env DEPEND line.
722# @param $@ - list of packages to get jars from 788# @param $2 - list of packages to get jars from
789# (passed to java-config --classpath)
723# ------------------------------------------------------------------------------ 790# ------------------------------------------------------------------------------
724java-pkg_getjars() { 791java-pkg_getjars() {
725 debug-print-function ${FUNCNAME} $* 792 debug-print-function ${FUNCNAME} $*
726 793
727 [[ ${#} -lt 1 ]] && die "At least one argument needed" 794 [[ ${#} -lt 1 || ${#} -gt 2 ]] && die "${FUNCNAME} takes only one or two arguments"
728 795
729 # NOTE could probably just pass $@ to java-config --classpath. and return it 796 if [[ "${1}" = "--build-only" ]]; then
797 local build_only="true"
798 shift
799 fi
800
730 local classpath pkg 801 local classpath pkgs="${1}"
731 for pkg in ${@//,/ }; do
732 #for pkg in $(echo "$@" | tr ',' ' '); do
733 jars="$(java-config --classpath=${pkg})" 802 jars="$(java-config --classpath=${pkgs})"
803 [[ -z "${jars}" ]] && die "java-config --classpath=${pkgs} failed"
734 debug-print "${pkg}:${jars}" 804 debug-print "${pkgs}:${jars}"
735 # TODO should we ensure jars exist? 805
736 if [[ -z "${classpath}" ]]; then 806 if [[ -z "${classpath}" ]]; then
737 classpath="${jars}" 807 classpath="${jars}"
738 else 808 else
739 classpath="${classpath}:${jars}" 809 classpath="${classpath}:${jars}"
740 fi 810 fi
811
812 # Only record jars that aren't build-only
813 if [[ -z "${build_only}" ]]; then
814 oldifs="${IFS}"
815 IFS=","
816 for pkg in ${pkgs}; do
741 java-pkg_record-jar_ "${pkg}" 817 java-pkg_record-jar_ "${pkg}"
742 done 818 done
819 IFS="${oldifs}"
820 fi
821
743 echo "${classpath}" 822 echo "${classpath}"
744} 823}
745 824
746# ------------------------------------------------------------------------------ 825# ------------------------------------------------------------------------------
747# @ebuild-function java-pkg_getjar 826# @ebuild-function java-pkg_getjar
748# 827#
749# Get the filename of a single jar from a package 828# Get the filename of a single jar from a package
829# The providing package is recorded as runtime dependency into package.env
830# DEPEND line, unless "--build-only" is passed as the very first argument, for
831# jars that have to be present only at build time and are not needed on runtime
832# (junit testing etc).
750# 833#
751# @example 834# @example
752# java-pkg_getjar xerces-2 xml-apis.jar 835# java-pkg_getjar xerces-2 xml-apis.jar
753# @example-return 836# @example-return
754# /usr/share/xerces-2/lib/xml-apis.jar 837# /usr/share/xerces-2/lib/xml-apis.jar
755# 838#
839# @param $1 - (optional) "--build-only" makes the jar not added into
840# package.env DEPEND line.
756# @param $1 - package to use 841# @param $1 - package to use
757# @param $2 - jar to get 842# @param $2 - jar to get
758# ------------------------------------------------------------------------------ 843# ------------------------------------------------------------------------------
759java-pkg_getjar() { 844java-pkg_getjar() {
760 debug-print-function ${FUNCNAME} $* 845 debug-print-function ${FUNCNAME} $*
846
847 local build_only=""
848
849 if [[ "${1}" = "--build-only" ]]; then
850 build_only="true"
851 shift
852 fi
761 853
762 local pkg="${1}" target_jar="${2}" jar 854 local pkg="${1}" target_jar="${2}" jar
763 [[ -z ${pkg} ]] && die "Must specify package to get a jar from" 855 [[ -z ${pkg} ]] && die "Must specify package to get a jar from"
764 [[ -z ${target_jar} ]] && die "Must specify jar to get" 856 [[ -z ${target_jar} ]] && die "Must specify jar to get"
765 857
766 # TODO check that package is actually installed 858 local error_msg="Could not find classpath for ${pkg}. Are you sure its installed?"
859 local classpath
767 local classpath=$(java-config --classpath=${pkg}) 860 classpath=$(java-config --classpath=${pkg})
768 [[ $? != 0 ]] && die "There could not find classpath for ${pkg}. Are you sure its installed?" 861 [[ $? != 0 ]] && die ${error_msg}
862
769 for jar in ${classpath//:/ }; do 863 for jar in ${classpath//:/ }; do
770 if [[ ! -f "${jar}" ]] ; then 864 if [[ ! -f "${jar}" ]] ; then
771 die "Installation problems with jars in ${pkg} - is it installed?" 865 die "Installation problem with jar ${jar} in ${pkg} - is it installed?"
772 fi 866 fi
773 867
774 if [[ "$(basename ${jar})" == "${target_jar}" ]] ; then 868 if [[ "$(basename ${jar})" == "${target_jar}" ]] ; then
775 java-pkg_record-jar_ "${pkg}" "${jar}" 869 # Only record jars that aren't build-only
870 [[ -z "${build_only}" ]] && java-pkg_record-jar_ "${pkg}" "${jar}"
776 echo "${jar}" 871 echo "${jar}"
777 return 0 872 return 0
778 fi 873 fi
779 done 874 done
780 875
781 die "Could not find ${target_jar} in ${pkg}" 876 die "Could not find ${target_jar} in ${pkg}"
782 return 1 877 return 1
783} 878}
784 879
785# This function reads stdin, and based on that input, figures out how to 880# This function reads stdin, and based on that input, figures out how to
799# line="${line// /}" 894# line="${line// /}"
800# 895#
801# # format: path=jarinfo 896# # format: path=jarinfo
802# local path=${line%%=*} 897# local path=${line%%=*}
803# local jarinfo=${line##*=} 898# local jarinfo=${line##*=}
804# 899#
805# # format: jar@package 900# # format: jar@package
806# local jar=${jarinfo%%@*}.jar 901# local jar=${jarinfo%%@*}.jar
807# local package=${jarinfo##*@} 902# local package=${jarinfo##*@}
808# if [[ -n ${replace_only} ]]; then 903# if [[ -n ${replace_only} ]]; then
809# [[ ! -f $path ]] && die "No jar exists at ${path}" 904# [[ ! -f $path ]] && die "No jar exists at ${path}"
822# @section-end query 917# @section-end query
823# ------------------------------------------------------------------------------ 918# ------------------------------------------------------------------------------
824 919
825# ------------------------------------------------------------------------------ 920# ------------------------------------------------------------------------------
826# @section-begin helper 921# @section-begin helper
827# @section-summary Helper functions 922# @section-summary Helper functions
828# 923#
829# Various other functions to use from an ebuild 924# Various other functions to use from an ebuild
830# ------------------------------------------------------------------------------ 925# ------------------------------------------------------------------------------
831 926
832# ------------------------------------------------------------------------------ 927# ------------------------------------------------------------------------------
838# jdbc-stdext 933# jdbc-stdext
839# jaf 934# jaf
840# jdbc-rowset 935# jdbc-rowset
841# jms 936# jms
842# 937#
843# @param $1 - Optionally indicate that the dependencies are controlled by 938# @param $1 - Optionally indicate that the dependencies are controlled by
844# a use flag by specifying '--use' Requires $2. 939# a use flag by specifying '--use' Requires $2.
845# @param $2 - USE flag which will enable the dependencies. 940# @param $2 - USE flag which will enable the dependencies.
846# @param $@ - virtual packages to add depenedencies for 941# @param $@ - virtual packages to add depenedencies for
847# ------------------------------------------------------------------------------ 942# ------------------------------------------------------------------------------
848# TODO rewrite to parse a line based declaration file instead -- karltk 943# TODO rewrite to parse a line based declaration file instead -- karltk
942 fi 1037 fi
943} 1038}
944 1039
945# ------------------------------------------------------------------------------ 1040# ------------------------------------------------------------------------------
946# @internal-function java-pkg_is-vm-version-sufficient 1041# @internal-function java-pkg_is-vm-version-sufficient
947# 1042#
948# @return zero - VM is sufficient 1043# @return zero - VM is sufficient
949# @return non-zero - VM is not sufficient 1044# @return non-zero - VM is not sufficient
950# ------------------------------------------------------------------------------ 1045# ------------------------------------------------------------------------------
951java-pkg_is-vm-version-sufficient() { 1046java-pkg_is-vm-version-sufficient() {
952 debug-print-function ${FUNCNAME} $* 1047 debug-print-function ${FUNCNAME} $*
972 die "Active Java VM too old" 1067 die "Active Java VM too old"
973 fi 1068 fi
974} 1069}
975 1070
976# ------------------------------------------------------------------------------ 1071# ------------------------------------------------------------------------------
977# @internal-function java-pkg_is-vm-version-eq 1072# @internal-function java-pkg_is-vm-version-eq
978# 1073#
979# @param $@ - VM version to compare current VM to 1074# @param $@ - VM version to compare current VM to
980# @return zero - VM versions are equal 1075# @return zero - VM versions are equal
981# @return non-zero - VM version are not equal 1076# @return non-zero - VM version are not equal
982# ------------------------------------------------------------------------------ 1077# ------------------------------------------------------------------------------
983java-pkg_is-vm-version-eq() { 1078java-pkg_is-vm-version-eq() {
1013# 1108#
1014# @param $@ - VM version to compare current to 1109# @param $@ - VM version to compare current to
1015# ------------------------------------------------------------------------------ 1110# ------------------------------------------------------------------------------
1016java-pkg_ensure-vm-version-ge() { 1111java-pkg_ensure-vm-version-ge() {
1017 debug-print-function ${FUNCNAME} $* 1112 debug-print-function ${FUNCNAME} $*
1018 1113
1019 if ! java-pkg_is-vm-version-ge "$@" ; then 1114 if ! java-pkg_is-vm-version-ge "$@" ; then
1020 debug-print "vm is not suffient" 1115 debug-print "vm is not suffient"
1021 eerror "This package requires a Java VM version >= $@" 1116 eerror "This package requires a Java VM version >= $@"
1022 einfo "Please use java-config -S to set the correct one" 1117 einfo "Please use java-config -S to set the correct one"
1023 die "Active Java VM too old" 1118 die "Active Java VM too old"
1024 fi 1119 fi
1025} 1120}
1026 1121
1027# ------------------------------------------------------------------------------ 1122# ------------------------------------------------------------------------------
1028# @internal-function java-pkg_is-vm-version-ge 1123# @internal-function java-pkg_is-vm-version-ge
1029# 1124#
1030# @param $@ - VM version to compare current VM to 1125# @param $@ - VM version to compare current VM to
1031# @return zero - current VM version is greater than checked version 1126# @return zero - current VM version is greater than checked version
1032# @return non-zero - current VM version is not greater than checked version 1127# @return non-zero - current VM version is not greater than checked version
1033# ------------------------------------------------------------------------------ 1128# ------------------------------------------------------------------------------
1034java-pkg_is-vm-version-ge() { 1129java-pkg_is-vm-version-ge() {
1048 return 1 1143 return 1
1049 fi 1144 fi
1050 fi 1145 fi
1051} 1146}
1052 1147
1148java-pkg_set-current-vm() {
1149 export GENTOO_VM=${1}
1150}
1151
1152java-pkg_get-current-vm() {
1153 echo ${GENTOO_VM}
1154}
1155
1156java-pkg_current-vm-matches() {
1157 hasq $(java-pkg_get-current-vm) ${@}
1158 return $?
1159}
1160
1053# ------------------------------------------------------------------------------ 1161# ------------------------------------------------------------------------------
1054# @ebuild-function java-pkg_get-source 1162# @ebuild-function java-pkg_get-source
1055# 1163#
1056# Determines what source version should be used, for passing to -source. 1164# Determines what source version should be used, for passing to -source.
1057# Unless you want to break things you probably shouldn't set _WANT_SOURCE 1165# Unless you want to break things you probably shouldn't set _WANT_SOURCE
1058# 1166#
1059# @return string - Either the lowest possible source, or JAVA_PKG_WANT_SOURCE 1167# @return string - Either the lowest possible source, or JAVA_PKG_WANT_SOURCE
1060# ------------------------------------------------------------------------------ 1168# ------------------------------------------------------------------------------
1065# ------------------------------------------------------------------------------ 1173# ------------------------------------------------------------------------------
1066# @ebuild-function java-pkg_get-target 1174# @ebuild-function java-pkg_get-target
1067# 1175#
1068# Determines what target version should be used, for passing to -target. 1176# Determines what target version should be used, for passing to -target.
1069# If you don't care about lower versions, you can set _WANT_TARGET to the 1177# If you don't care about lower versions, you can set _WANT_TARGET to the
1070# version of your JDK. 1178# version of your JDK.
1071# Remember doing this will mostly like cause things to break. 1179# Remember doing this will mostly like cause things to break.
1072# Doesn't allow it to be lower then the one in depend. 1180# Doesn't allow it to be lower then the one in depend.
1073# Doesn't allow it to be higher then the active vm. 1181# Doesn't allow it to be higher then the active vm.
1074# 1182#
1075# @return string - Either the lowest possible target, or JAVA_PKG_WANT_TARGET 1183# @return string - Either the lowest possible target, or JAVA_PKG_WANT_TARGET
1076# ------------------------------------------------------------------------------ 1184# ------------------------------------------------------------------------------
1077java-pkg_get-target() { 1185java-pkg_get-target() {
1078 local min=$(depend-java-query --get-lowest "${DEPEND} ${RDEPEND}") 1186 local min=$(depend-java-query --get-lowest "${DEPEND} ${RDEPEND}")
1079 if [[ -n "${JAVA_PKG_WANT_TARGET}" ]]; then 1187 if [[ -n "${JAVA_PKG_WANT_TARGET}" ]]; then
1080 local max="$(java-config --select-vm "${GENTOO_VM}" -g PROVIDES_VERSION)" 1188 local max="$(java-config --select-vm "${GENTOO_VM}" -g PROVIDES_VERSION)"
1081 if version_is_at_least "${min}" "${JAVA_PKG_WANT_TARGET}" && version_is_at_least "${JAVA_PKG_WANT_TARGET}" "${max}"; then 1189 if version_is_at_least "${min}" "${JAVA_PKG_WANT_TARGET}" && version_is_at_least "${JAVA_PKG_WANT_TARGET}" "${max}"; then
1082 echo ${JAVA_PKG_WANT_TARGET} 1190 echo ${JAVA_PKG_WANT_TARGET}
1083 else 1191 else
1091} 1199}
1092 1200
1093java-pkg_get-javac() { 1201java-pkg_get-javac() {
1094 debug-print-function ${FUNCNAME} $* 1202 debug-print-function ${FUNCNAME} $*
1095 1203
1096 java-pkg_init-compiler_ 1204
1097 local compiler="${GENTOO_COMPILER}" 1205 local compiler="${GENTOO_COMPILER}"
1098 1206
1099 local compiler_executable 1207 local compiler_executable
1100 if [[ "${compiler}" = "javac" ]]; then 1208 if [[ "${compiler}" = "javac" ]]; then
1101 # nothing fancy needs to be done for javac 1209 # nothing fancy needs to be done for javac
1109 unset JAVAC 1217 unset JAVAC
1110 # try to get value of JAVAC 1218 # try to get value of JAVAC
1111 compiler_executable="$(source ${compiler_env} 1>/dev/null 2>&1; echo ${JAVAC})" 1219 compiler_executable="$(source ${compiler_env} 1>/dev/null 2>&1; echo ${JAVAC})"
1112 export JAVAC=${old_javac} 1220 export JAVAC=${old_javac}
1113 1221
1114 [[ -z ${compiler_executable} ]] && die "JAVAC is empty or undefined in ${compiler_env}" 1222 if [[ -z ${compiler_executable} ]]; then
1115 1223 echo "JAVAC is empty or undefined in ${compiler_env}"
1224 return 1
1225 fi
1226
1116 # check that it's executable 1227 # check that it's executable
1117 if [[ ! -x ${compiler_executable} ]]; then 1228 if [[ ! -x ${compiler_executable} ]]; then
1118 eerror "Could not find ${compiler_executable}!"
1119 die "${compiler_executable} doesn't exist, or isn't executable" 1229 echo "${compiler_executable} doesn't exist, or isn't executable"
1230 return 1
1120 fi 1231 fi
1121 else 1232 else
1122 eerror "Could not find environment file for ${compiler}" 1233 echo "Could not find environment file for ${compiler}"
1123 die "Could not find ${compiler_env}" 1234 return 1
1124 fi 1235 fi
1125 fi 1236 fi
1126 echo ${compiler_executable} 1237 echo ${compiler_executable}
1127} 1238}
1128 1239
1129# ------------------------------------------------------------------------------ 1240# ------------------------------------------------------------------------------
1130# @ebuild-function java-pkg_javac-args 1241# @ebuild-function java-pkg_javac-args
1131# 1242#
1132# If an ebuild uses javac directly, instead of using ejavac, it should call this 1243# If an ebuild uses javac directly, instead of using ejavac, it should call this
1133# to know what -source/-target to use. 1244# to know what -source/-target to use.
1134# 1245#
1135# @return string - arguments to pass to javac, complete with -target and -source 1246# @return string - arguments to pass to javac, complete with -target and -source
1138 debug-print-function ${FUNCNAME} $* 1249 debug-print-function ${FUNCNAME} $*
1139 1250
1140 local want_source="$(java-pkg_get-source)" 1251 local want_source="$(java-pkg_get-source)"
1141 local want_target="$(java-pkg_get-target)" 1252 local want_target="$(java-pkg_get-target)"
1142 1253
1143 local source_str="-source ${want_source}" 1254 local source_str="-source ${want_source}"
1144 local target_str="-target ${want_target}" 1255 local target_str="-target ${want_target}"
1145 1256
1146 debug-print "want source: ${want_source}" 1257 debug-print "want source: ${want_source}"
1147 debug-print "want target: ${want_target}" 1258 debug-print "want target: ${want_target}"
1148 1259
1149 if [[ -z "${want_source}" || -z "${want_target}" ]]; then 1260 if [[ -z "${want_source}" || -z "${want_target}" ]]; then
1150 debug-print "could not find valid -source/-target values" 1261 debug-print "could not find valid -source/-target values for javac"
1151 die "Could not find valid -source/-target values" 1262 echo "Could not find valid -source/-target values for javac"
1263 return 1
1152 else 1264 else
1153 if java-pkg_is-vm-version-ge "1.4"; then 1265 if java-pkg_is-vm-version-ge "1.4"; then
1154 echo "${source_str} ${target_str}" 1266 echo "${source_str} ${target_str}"
1155 else 1267 else
1156 echo "${target_str}" 1268 echo "${target_str}"
1160 1272
1161# TODO document 1273# TODO document
1162java-pkg_get-jni-cflags() { 1274java-pkg_get-jni-cflags() {
1163 local flags="-I${JAVA_HOME}/include" 1275 local flags="-I${JAVA_HOME}/include"
1164 1276
1165 # TODO figure out how to cope with other things than linux... 1277 local platform="linux"
1278 use elibc_FreeBSD && platform="freebsd"
1279
1280 # TODO do a check that the directories are valid
1166 flags="${flags} -I${JAVA_HOME}/include/linux" 1281 flags="${flags} -I${JAVA_HOME}/include/${platform}"
1167 1282
1168 echo ${flags} 1283 echo ${flags}
1284}
1285
1286java-pkg_ensure-gcj() {
1287 if ! built_with_use sys-devel/gcc gcj ; then
1288 ewarn
1289 ewarn "You must build gcc with the gcj support to build with gcj"
1290 ewarn
1291 ebeep 5
1292 die "No GCJ support found!"
1293 fi
1294}
1295
1296java-pkg_ensure-test() {
1297 if hasq test ${FEATURES} && ! hasq -test ${FEATURES} && ! use test; then
1298 eerror "You specified FEATURES=test, but USE=test is needed"
1299 eerror "to pull in the additional dependencies for testing"
1300 die "Need USE=test enabled"
1301 fi
1169} 1302}
1170 1303
1171# ------------------------------------------------------------------------------ 1304# ------------------------------------------------------------------------------
1172# @section-end helper 1305# @section-end helper
1173# ------------------------------------------------------------------------------ 1306# ------------------------------------------------------------------------------
1187# compiler. 1320# compiler.
1188# 1321#
1189# ------------------------------------------------------------------------------ 1322# ------------------------------------------------------------------------------
1190eant() { 1323eant() {
1191 debug-print-function ${FUNCNAME} $* 1324 debug-print-function ${FUNCNAME} $*
1325
1326 # FIXME get this working
1327# if is-java-strict && [[ ! ${DEPEND} =~ "dev-java/ant" ]]; then
1328# java-pkg_announce-qa-violation \
1329# "Using eant, but not depending on dev-java/ant or dev-java/ant-core"
1330# fi
1192 1331
1193 local antflags 1332 local antflags
1194 java-pkg_init-compiler_ 1333 java-pkg_init-compiler_
1195 local compiler="${GENTOO_COMPILER}" 1334 local compiler="${GENTOO_COMPILER}"
1196 1335
1210 local build_compiler_deps="$(source ${JAVA_PKG_COMPILER_DIR}/${compiler} 1>/dev/null 2>&1; echo ${ANT_BUILD_COMPILER_DEPS})" 1349 local build_compiler_deps="$(source ${JAVA_PKG_COMPILER_DIR}/${compiler} 1>/dev/null 2>&1; echo ${ANT_BUILD_COMPILER_DEPS})"
1211 if [[ -n ${build_compiler_deps} ]]; then 1350 if [[ -n ${build_compiler_deps} ]]; then
1212 antflags="${antflags} -lib $(java-config -p ${build_compiler_deps})" 1351 antflags="${antflags} -lib $(java-config -p ${build_compiler_deps})"
1213 fi 1352 fi
1214 fi 1353 fi
1215 1354
1355 if is-java-strict; then
1356 einfo "Disabling system classpath for ant"
1357 antflags="${antflags} -Dbuild.sysclasspath=ignore"
1358 fi
1359
1216 if [[ -n ${JAVA_PKG_DEBUG} ]]; then 1360 if [[ -n ${JAVA_PKG_DEBUG} ]]; then
1217 antflags="${antflags} -debug" 1361 antflags="${antflags} -debug"
1218 fi 1362 fi
1219 1363
1220 [[ -n ${JAVA_PKG_DEBUG} ]] && echo ant ${antflags} "${@}" 1364 [[ -n ${JAVA_PKG_DEBUG} ]] && echo ant ${antflags} "${@}"
1221 ant ${antflags} "${@}" || die "eant failed" 1365 ant ${antflags} "${@}" || die "eant failed"
1222 1366
1223} 1367}
1224 1368
1225# ------------------------------------------------------------------------------ 1369# ------------------------------------------------------------------------------
1226# @ebuild-function ejavac 1370# @ebuild-function ejavac
1227# 1371#
1228# Javac wrapper function. Will use the appropriate compiler, based on 1372# Javac wrapper function. Will use the appropriate compiler, based on
1229# /etc/java-config/compilers.conf 1373# /etc/java-config/compilers.conf
1230# 1374#
1231# @param $@ - Arguments to be passed to the compiler 1375# @param $@ - Arguments to be passed to the compiler
1232# ------------------------------------------------------------------------------ 1376# ------------------------------------------------------------------------------
1233ejavac() { 1377ejavac() {
1234 debug-print-function ${FUNCNAME} $* 1378 debug-print-function ${FUNCNAME} $*
1235 1379
1236 # FIXME using get-javac ends up printing stuff with einfo 1380 java-pkg_init-compiler_
1381
1382 local compiler_executable
1237# local compiler_executable=$(java-pkg_get-javac) 1383 compiler_executable=$(java-pkg_get-javac)
1238 local compiler_executable="javac" 1384 if [[ ${?} != 0 ]]; then
1385 eerror "There was a problem determining compiler: ${compiler_executable}"
1386 die "get-javac failed"
1387 fi
1239 1388
1389 local javac_args
1390 javac_args="$(java-pkg_javac-args)"
1391 if [[ ${?} != 0 ]]; then
1392 eerror "There was a problem determining JAVACFLAGS: ${javac_args}"
1393 die "java-pkg_javac-args failed"
1394 fi
1395
1240 [[ -n ${JAVA_PKG_DEBUG} ]] && echo ${compiler_executable} $(java-pkg_javac-args) "${@}" 1396 [[ -n ${JAVA_PKG_DEBUG} ]] && echo ${compiler_executable} ${javac_args} "${@}"
1241 ${compiler_executable} $(java-pkg_javac-args) "${@}" || die "ejavac failed" 1397 ${compiler_executable} ${javac_args} "${@}" || die "ejavac failed"
1242} 1398}
1243 1399
1244# ------------------------------------------------------------------------------ 1400# ------------------------------------------------------------------------------
1245# @ebuild-function java-pkg_filter-compiler 1401# @ebuild-function java-pkg_filter-compiler
1246# 1402#
1247# Used to prevent the use of some compilers. Should be used in src_compile. 1403# Used to prevent the use of some compilers. Should be used in src_compile.
1248# Basically, it just appends onto JAVA_PKG_FILTER_COMPILER 1404# Basically, it just appends onto JAVA_PKG_FILTER_COMPILER
1249# 1405#
1250# @param $@ - compilers to filter 1406# @param $@ - compilers to filter
1251# ------------------------------------------------------------------------------ 1407# ------------------------------------------------------------------------------
1252java-pkg_filter-compiler() { 1408java-pkg_filter-compiler() {
1253 JAVA_PKG_FILTER_COMPILER="${JAVA_PKG_FILTER_COMPILER} $@" 1409 JAVA_PKG_FILTER_COMPILER="${JAVA_PKG_FILTER_COMPILER} $@"
1254} 1410}
1255 1411
1256# ------------------------------------------------------------------------------ 1412# ------------------------------------------------------------------------------
1413# @ebuild-function java-pkg_force-compiler
1414#
1415# Used to force the use of particular compilers. Should be used in src_compile.
1416# A common use of this would be to force ecj-3.1 to be used on amd64, to avoid
1417# OutOfMemoryErrors that may come up.
1418#
1419# @param $@ - compilers to force
1420# ------------------------------------------------------------------------------
1421java-pkg_force-compiler() {
1422 JAVA_PKG_FORCE_COMPILER="$@"
1423}
1424
1425# ------------------------------------------------------------------------------
1257# @ebuild-function use_doc 1426# @ebuild-function use_doc
1258# 1427#
1259# Helper function for getting ant to build javadocs. If the user has USE=doc, 1428# Helper function for getting ant to build javadocs. If the user has USE=doc,
1260# then 'javadoc' or the argument are returned. Otherwise, there is no return. 1429# then 'javadoc' or the argument are returned. Otherwise, there is no return.
1261# 1430#
1262# The output of this should be passed to ant. 1431# The output of this should be passed to ant.
1263# 1432#
1264# Example: build javadocs by calling 'javadoc' target 1433# Example: build javadocs by calling 'javadoc' target
1265# eant $(use_doc) 1434# eant $(use_doc)
1266# Example: build javadocs by calling 'apidoc' target 1435# Example: build javadocs by calling 'apidoc' target
1274} 1443}
1275 1444
1276# ------------------------------------------------------------------------------ 1445# ------------------------------------------------------------------------------
1277# @section-end build 1446# @section-end build
1278# ------------------------------------------------------------------------------ 1447# ------------------------------------------------------------------------------
1279 1448
1280# ------------------------------------------------------------------------------ 1449# ------------------------------------------------------------------------------
1281# @section-begin internal 1450# @section-begin internal
1282# @section-summary Internal functions 1451# @section-summary Internal functions
1283# 1452#
1284# Do __NOT__ use any of these from an ebuild! These are only to be used from 1453# Do __NOT__ use any of these from an ebuild! These are only to be used from
1285# within the java eclasses. 1454# within the java eclasses.
1286# ------------------------------------------------------------------------------ 1455# ------------------------------------------------------------------------------
1287 1456
1288# ----------------------------------------------------------------------------- 1457# -----------------------------------------------------------------------------
1289# @function-internal java-pkg_init 1458# @function-internal java-pkg_init
1290# 1459#
1291# The purpose of this function, as the name might imply, is to initialize the 1460# The purpose of this function, as the name might imply, is to initialize the
1292# Java environment. It ensures that that there aren't any environment variables 1461# Java environment. It ensures that that there aren't any environment variables
1293# that'll muss things up. It initializes some variables, which are used 1462# that'll muss things up. It initializes some variables, which are used
1294# internally. And most importantly, it'll switch the VM if necessary. 1463# internally. And most importantly, it'll switch the VM if necessary.
1295# 1464#
1307 # TODO we will probably want to set JAVAC and JAVACFLAGS 1476 # TODO we will probably want to set JAVAC and JAVACFLAGS
1308 1477
1309 # Do some QA checks 1478 # Do some QA checks
1310 java-pkg_check-jikes 1479 java-pkg_check-jikes
1311 1480
1312 # When users have crazy classpaths some packages can fail to compile. 1481 # When users have crazy classpaths some packages can fail to compile.
1313 # and everything should work with empty CLASSPATH. 1482 # and everything should work with empty CLASSPATH.
1314 # This also helps prevent unexpected dependencies on random things 1483 # This also helps prevent unexpected dependencies on random things
1315 # from the CLASSPATH. 1484 # from the CLASSPATH.
1316 unset CLASSPATH 1485 unset CLASSPATH
1317} 1486}
1318 1487
1319# ------------------------------------------------------------------------------ 1488# ------------------------------------------------------------------------------
1320# @function-internal java-pkg-init-compiler_ 1489# @function-internal java-pkg-init-compiler_
1321# 1490#
1322# This function attempts to figure out what compiler should be used. It does 1491# This function attempts to figure out what compiler should be used. It does
1323# this by reading the file at JAVA_PKG_COMPILERS_CONF, and checking the 1492# this by reading the file at JAVA_PKG_COMPILERS_CONF, and checking the
1324# COMPILERS variable defined there. 1493# COMPILERS variable defined there.
1325# This can be overridden by a list in JAVA_PKG_FORCE_COMPILER 1494# This can be overridden by a list in JAVA_PKG_FORCE_COMPILER
1326# 1495#
1327# It will go through the list of compilers, and verify that it supports the 1496# It will go through the list of compilers, and verify that it supports the
1328# target and source that are needed. If it is not suitable, then the next 1497# target and source that are needed. If it is not suitable, then the next
1329# compiler is checked. When JAVA_PKG_FORCE_COMPILER is defined, this checking 1498# compiler is checked. When JAVA_PKG_FORCE_COMPILER is defined, this checking
1330# isn't done. 1499# isn't done.
1331# 1500#
1353 if [[ -z ${JAVA_PKG_FORCE_COMPILER} ]]; then 1522 if [[ -z ${JAVA_PKG_FORCE_COMPILER} ]]; then
1354 compilers="$(source ${JAVA_PKG_COMPILERS_CONF} 1>/dev/null 2>&1; echo ${COMPILERS})" 1523 compilers="$(source ${JAVA_PKG_COMPILERS_CONF} 1>/dev/null 2>&1; echo ${COMPILERS})"
1355 else 1524 else
1356 compilers=${JAVA_PKG_FORCE_COMPILER} 1525 compilers=${JAVA_PKG_FORCE_COMPILER}
1357 fi 1526 fi
1358 1527
1359 debug-print "Read \"${compilers}\" from ${JAVA_PKG_COMPILERS_CONF}" 1528 debug-print "Read \"${compilers}\" from ${JAVA_PKG_COMPILERS_CONF}"
1360 1529
1361 # Figure out if we should announce what compiler we're using 1530 # Figure out if we should announce what compiler we're using
1362 local compiler 1531 local compiler
1363 for compiler in ${compilers}; do 1532 for compiler in ${compilers}; do
1366 if [[ ${compiler} = "javac" ]]; then 1535 if [[ ${compiler} = "javac" ]]; then
1367 debug-print "Found javac... breaking" 1536 debug-print "Found javac... breaking"
1368 export GENTOO_COMPILER="javac" 1537 export GENTOO_COMPILER="javac"
1369 break 1538 break
1370 fi 1539 fi
1371 1540
1372 if has ${compiler} ${JAVA_PKG_FILTER_COMPILER}; then 1541 if has ${compiler} ${JAVA_PKG_FILTER_COMPILER}; then
1373 if [[ -z ${JAVA_PKG_FORCE_COMPILER} ]]; then 1542 if [[ -z ${JAVA_PKG_FORCE_COMPILER} ]]; then
1374 einfo "Filtering ${compiler}" 1543 einfo "Filtering ${compiler}"
1375 continue 1544 continue
1376 fi 1545 fi
1377 fi 1546 fi
1378 1547
1379 # for non-javac, we need to make sure it supports the right target and 1548 # for non-javac, we need to make sure it supports the right target and
1380 # source 1549 # source
1381 local compiler_env="${JAVA_PKG_COMPILER_DIR}/${compiler}" 1550 local compiler_env="${JAVA_PKG_COMPILER_DIR}/${compiler}"
1382 if [[ -f ${compiler_env} ]]; then 1551 if [[ -f ${compiler_env} ]]; then
1383 local desired_target="$(java-pkg_get-target)" 1552 local desired_target="$(java-pkg_get-target)"
1465# Writes the package.env out to disk. 1634# Writes the package.env out to disk.
1466# 1635#
1467# ------------------------------------------------------------------------------ 1636# ------------------------------------------------------------------------------
1468# TODO change to do-write, to match everything else 1637# TODO change to do-write, to match everything else
1469java-pkg_do_write_() { 1638java-pkg_do_write_() {
1639 java-pkg_init_paths_
1470 # Create directory for package.env 1640 # Create directory for package.env
1471 dodir "${JAVA_PKG_SHAREPATH}" 1641 dodir "${JAVA_PKG_SHAREPATH}"
1472 if [[ -n "${JAVA_PKG_CLASSPATH}" || -n "${JAVA_PKG_LIBRARY}" || -f "${JAVA_PKG_DEPEND}" ]]; then 1642 if [[ -n "${JAVA_PKG_CLASSPATH}" || -n "${JAVA_PKG_LIBRARY}" || -f "${JAVA_PKG_DEPEND}" ]]; then
1473 # Create package.env 1643 # Create package.env
1474 ( 1644 (
1479 [[ -n "${JAVA_PKG_LIBRARY}" ]] && echo "LIBRARY_PATH=\"${JAVA_PKG_LIBRARY}\"" 1649 [[ -n "${JAVA_PKG_LIBRARY}" ]] && echo "LIBRARY_PATH=\"${JAVA_PKG_LIBRARY}\""
1480 [[ -n "${JAVA_PROVIDE}" ]] && echo "PROVIDES=\"${JAVA_PROVIDE}\"" 1650 [[ -n "${JAVA_PROVIDE}" ]] && echo "PROVIDES=\"${JAVA_PROVIDE}\""
1481 [[ -f "${JAVA_PKG_DEPEND}" ]] && echo "DEPEND=\"$(cat ${JAVA_PKG_DEPEND} | uniq | tr '\n' ':')\"" 1651 [[ -f "${JAVA_PKG_DEPEND}" ]] && echo "DEPEND=\"$(cat ${JAVA_PKG_DEPEND} | uniq | tr '\n' ':')\""
1482 echo "VM=\"$(echo ${RDEPEND} ${DEPEND} | sed -e 's/ /\n/g' | sed -n -e '/virtual\/\(jre\|jdk\)/ { p;q }')\"" # TODO cleanup ! 1652 echo "VM=\"$(echo ${RDEPEND} ${DEPEND} | sed -e 's/ /\n/g' | sed -n -e '/virtual\/\(jre\|jdk\)/ { p;q }')\"" # TODO cleanup !
1483 ) > "${JAVA_PKG_ENV}" 1653 ) > "${JAVA_PKG_ENV}"
1484 1654
1485 # register target/source 1655 # register target/source
1486 local target="$(java-pkg_get-target)" 1656 local target="$(java-pkg_get-target)"
1487 local source="$(java-pkg_get-source)" 1657 local source="$(java-pkg_get-source)"
1488 [[ -n ${target} ]] && echo "TARGET=\"${target}\"" >> "${JAVA_PKG_ENV}" 1658 [[ -n ${target} ]] && echo "TARGET=\"${target}\"" >> "${JAVA_PKG_ENV}"
1489 [[ -n ${source} ]] && echo "SOURCE=\"${source}\"" >> "${JAVA_PKG_ENV}" 1659 [[ -n ${source} ]] && echo "SOURCE=\"${source}\"" >> "${JAVA_PKG_ENV}"
1502 # Strip unnecessary leading and trailing colons 1672 # Strip unnecessary leading and trailing colons
1503 # TODO try to cleanup if possible 1673 # TODO try to cleanup if possible
1504 sed -e "s/=\":/=\"/" -e "s/:\"$/\"/" -i "${JAVA_PKG_ENV}" || die "Did you forget to call java_init ?" 1674 sed -e "s/=\":/=\"/" -e "s/:\"$/\"/" -i "${JAVA_PKG_ENV}" || die "Did you forget to call java_init ?"
1505 fi 1675 fi
1506} 1676}
1507
1508 1677
1509# ------------------------------------------------------------------------------ 1678# ------------------------------------------------------------------------------
1510# @internal-function java-pkg_record-jar_ 1679# @internal-function java-pkg_record-jar_
1511# 1680#
1512# Record a dependency to the package.env 1681# Record a dependency to the package.env
1556 fi 1725 fi
1557} 1726}
1558 1727
1559# ------------------------------------------------------------------------------ 1728# ------------------------------------------------------------------------------
1560# @internal-function java-pkg_expand_dir_ 1729# @internal-function java-pkg_expand_dir_
1561# 1730#
1562# Gets the full path of the file/directory's parent. 1731# Gets the full path of the file/directory's parent.
1563# @param $1 - file/directory to find parent directory for 1732# @param $1 - file/directory to find parent directory for
1564# @return - path to $1's parent directory 1733# @return - path to $1's parent directory
1565# ------------------------------------------------------------------------------ 1734# ------------------------------------------------------------------------------
1566java-pkg_expand_dir_() { 1735java-pkg_expand_dir_() {
1593# ------------------------------------------------------------------------------ 1762# ------------------------------------------------------------------------------
1594java-pkg_setup-vm() { 1763java-pkg_setup-vm() {
1595 debug-print-function ${FUNCNAME} $* 1764 debug-print-function ${FUNCNAME} $*
1596 1765
1597 local vendor="$(java-pkg_get-vm-vendor)" 1766 local vendor="$(java-pkg_get-vm-vendor)"
1598 if [[ "${vendor}" == "sun" ]] && java-pkg_is-vm-version-ge 1 5; then 1767 if [[ "${vendor}" == "sun" ]] && java-pkg_is-vm-version-ge "1.5" ; then
1599 addpredict "/dev/random" 1768 addpredict "/dev/random"
1600 elif [[ "${vendor}" == "ibm" ]]; then 1769 elif [[ "${vendor}" == "ibm" ]]; then
1601 addpredict "/proc/self/maps" 1770 addpredict "/proc/self/maps"
1602 addpredict "/proc/cpuinfo" 1771 addpredict "/proc/cpuinfo"
1603 export LANG="C" LC_ALL="C" 1772 export LANG="C" LC_ALL="C"
1652# @return - The version of the current VM 1821# @return - The version of the current VM
1653# ------------------------------------------------------------------------------ 1822# ------------------------------------------------------------------------------
1654java-pkg_get-vm-version() { 1823java-pkg_get-vm-version() {
1655 debug-print-function ${FUNCNAME} $* 1824 debug-print-function ${FUNCNAME} $*
1656 1825
1657 java-pkg_get-current-vm | sed -e "s/.*-\([0-9.]\+\).*/\1/" 1826 java-config -g PROVIDES_VERSION
1658} 1827}
1659 1828
1660# ------------------------------------------------------------------------------ 1829# ------------------------------------------------------------------------------
1661# @internal-function java-pkg_switch-vm 1830# @internal-function java-pkg_switch-vm
1662# 1831#
1663# Switch VM if we're allowed to (controlled by JAVA_PKG_ALLOW_VM_CHANGE), and 1832# Switch VM if we're allowed to (controlled by JAVA_PKG_ALLOW_VM_CHANGE), and
1664# verify that the current VM is sufficient. 1833# verify that the current VM is sufficient.
1665# Setup the environment for the VM being used. 1834# Setup the environment for the VM being used.
1666# ------------------------------------------------------------------------------ 1835# ------------------------------------------------------------------------------
1667java-pkg_switch-vm() { 1836java-pkg_switch-vm() {
1668 if java-pkg_needs-vm; then 1837 if java-pkg_needs-vm; then
1672 export GENTOO_VM="${JAVA_PKG_FORCE_VM}" 1841 export GENTOO_VM="${JAVA_PKG_FORCE_VM}"
1673 # if we're allowed to switch the vm... 1842 # if we're allowed to switch the vm...
1674 elif [[ "${JAVA_PKG_ALLOW_VM_CHANGE}" == "yes" ]]; then 1843 elif [[ "${JAVA_PKG_ALLOW_VM_CHANGE}" == "yes" ]]; then
1675 debug-print "depend-java-query: NV_DEPEND: ${JAVA_PKG_NV_DEPEND:-${DEPEND}} VNEED: ${JAVA_PKG_VNEED}" 1844 debug-print "depend-java-query: NV_DEPEND: ${JAVA_PKG_NV_DEPEND:-${DEPEND}} VNEED: ${JAVA_PKG_VNEED}"
1676 if [[ -n ${JAVA_PKG_VNEED} ]]; then 1845 if [[ -n ${JAVA_PKG_VNEED} ]]; then
1677 export GENTOO_VM="$(depend-java-query --need-virtual "${JAVA_PKG_VNEED}" --get-vm "${JAVA_PKG_NV_DEPEND:-${DEPEND}}")" 1846 GENTOO_VM="$(depend-java-query --need-virtual "${JAVA_PKG_VNEED}" --get-vm "${JAVA_PKG_NV_DEPEND:-${DEPEND}}")"
1678 else 1847 else
1679 export GENTOO_VM="$(depend-java-query --get-vm "${JAVA_PKG_NV_DEPEND:-${DEPEND}}")" 1848 GENTOO_VM="$(depend-java-query --get-vm "${JAVA_PKG_NV_DEPEND:-${DEPEND}}")"
1849 fi
1850 if [[ -z "${GENTOO_VM}" || "${GENTOO_VM}" == "None" ]]; then
1851 eerror "Unable to determine VM for building from dependencies:"
1852 echo "NV_DEPEND: ${JAVA_PKG_NV_DEPEND:-${DEPEND}}"
1853 echo "VNEED: ${JAVA_PKG_VNEED}"
1854 die "Failed to determine VM for building."
1855 else
1856 export GENTOO_VM
1680 fi 1857 fi
1681 # otherwise just make sure the current VM is sufficient 1858 # otherwise just make sure the current VM is sufficient
1682 else 1859 else
1683 java-pkg_ensure-vm-version-sufficient 1860 java-pkg_ensure-vm-version-sufficient
1684 fi 1861 fi
1685 debug-print "Using: $(java-config -f)" 1862 debug-print "Using: $(java-config -f)"
1686 1863
1687 java-pkg_setup-vm 1864 java-pkg_setup-vm
1688 1865
1689 export JAVA=$(java-config --java) 1866 export JAVA=$(java-config --java)
1690 export JAVAC=$(java-config --javac) 1867 export JAVAC=$(java-config --javac)
1691 export JAVACFLAGS="$(java-pkg_javac-args)" 1868 JAVACFLAGS="$(java-pkg_javac-args)"
1869 if [[ ${?} != 0 ]]; then
1870 eerror "There was a problem determining JAVACFLAGS: ${JAVACFLAGS}"
1871 die "java-pkg_javac-args failed"
1872 fi
1692 [[ -n ${JAVACFLAGS_EXTRA} ]] && export JAVACFLAGS="${JAVACFLAGS_EXTRA} ${JAVACFLAGS}" 1873 [[ -n ${JAVACFLAGS_EXTRA} ]] && JAVACFLAGS="${JAVACFLAGS_EXTRA} ${JAVACFLAGS}"
1874 export JAVACFLAGS
1693 1875
1694 export JAVA_HOME="$(java-config -g JAVA_HOME)" 1876 export JAVA_HOME="$(java-config -g JAVA_HOME)"
1695 export JDK_HOME=${JAVA_HOME} 1877 export JDK_HOME=${JAVA_HOME}
1696 1878
1697 #TODO If you know a better solution let us know. 1879 #TODO If you know a better solution let us know.
1698 java-pkg_append_ LD_LIBRARY_PATH "$(java-config -g LDPATH)" 1880 java-pkg_append_ LD_LIBRARY_PATH "$(java-config -g LDPATH)"
1699 1881
1700 local tann="${T}/announced-vm" 1882 local tann="${T}/announced-vm"
1701 if [[ -n "${JAVA_PKG_DEBUG}" ]] || [[ ! -f "${tann}" ]] ; then 1883 if [[ -n "${JAVA_PKG_DEBUG}" ]] || [[ ! -f "${tann}" ]] ; then
1702 # Add a check for setup/preinst phase... to avoid duplicate outputs 1884 # Add a check for setup/preinst phase... to avoid duplicate outputs
1703 # for when FEATURES=buildpkg 1885 # for when FEATURES=buildpkg
1704 if [[ ${EBUILD_PHASE} != "setup" && ${EBUILD_PHASE} != "preinst" && ${EBUILD_PHASE} != "postinst" ]]; 1886 if [[ ${EBUILD_PHASE} != "setup" && ${EBUILD_PHASE} != "preinst" && ${EBUILD_PHASE} != "postinst" ]];
1729 echo "GENTOO_VM=${GENTOO_VM} CLASSPATH=\"${CLASSPATH}\" JAVA_HOME=\"${JAVA_HOME}\"" >&2 1911 echo "GENTOO_VM=${GENTOO_VM} CLASSPATH=\"${CLASSPATH}\" JAVA_HOME=\"${JAVA_HOME}\"" >&2
1730 echo "JAVACFLAGS=\"${JAVACFLAGS}\" COMPILER=\"${GENTOO_COMPILER}\"" >&2 1912 echo "JAVACFLAGS=\"${JAVACFLAGS}\" COMPILER=\"${GENTOO_COMPILER}\"" >&2
1731 echo "and of course, the output of emerge --info" >&2 1913 echo "and of course, the output of emerge --info" >&2
1732} 1914}
1733 1915
1916
1917# TODO document
1918# List jars in the source directory, ${S}
1919java-pkg_jar-list() {
1920 if [[ -n "${JAVA_PKG_DEBUG}" ]]; then
1921 einfo "Linked Jars"
1922 find "${S}" -type l -name '*.jar' -print0 | xargs -0 -r -n 500 ls -ald | sed -e "s,${WORKDIR},\${WORKDIR},"
1923 einfo "Jars"
1924 find "${S}" -type f -name '*.jar' -print0 | xargs -0 -r -n 500 ls -ald | sed -e "s,${WORKDIR},\${WORKDIR},"
1925 einfo "Classes"
1926 find "${S}" -type f -name '*.class' -print0 | xargs -0 -r -n 500 ls -ald | sed -e "s,${WORKDIR},\${WORKDIR},"
1927 fi
1928}
1929
1930# TODO document
1931# Verify that the classes were compiled for the right source / target
1932java-pkg_verify-classes() {
1933 ebegin "Verifying java class versions"
1934 #$(find ${D} -type f -name '*.jar' -o -name '*.class')
1935 class-version-verify.py -t $(java-pkg_get-target) -r ${D}
1936 result=$?
1937 eend ${result}
1938 if [[ ${result} == 0 ]]; then
1939 einfo "All good"
1940 else
1941 ewarn "Possible problem"
1942 die "Bad class files found"
1943 fi
1944}
1945
1734# ------------------------------------------------------------------------------ 1946# ------------------------------------------------------------------------------
1735# @section-end internal 1947# @section-end internal
1736# ------------------------------------------------------------------------------ 1948# ------------------------------------------------------------------------------
1737 1949
1738java-pkg_check-phase() { 1950java-pkg_check-phase() {
1739 local phase=${1} 1951 local phase=${1}
1740 local funcname=${2} 1952 local funcname=${2}
1741 # TODO add check for java-stricter
1742 if [[ ${EBUILD_PHASE} != ${phase} ]]; then 1953 if is-java-strict && [[ ${EBUILD_PHASE} != ${phase} ]]; then
1743 java-pkg_announce-qa-violation \ 1954 java-pkg_announce-qa-violation \
1744 "${funcname} used outside of src_${phase}" 1955 "${funcname} used outside of src_${phase}"
1745 fi 1956 fi
1746} 1957}
1747 1958
1758 java-pkg_announce-qa-violation "deprecated USE flag 'jikes' in IUSE" 1969 java-pkg_announce-qa-violation "deprecated USE flag 'jikes' in IUSE"
1759 fi 1970 fi
1760} 1971}
1761 1972
1762java-pkg_announce-qa-violation() { 1973java-pkg_announce-qa-violation() {
1763 if hasq java-strict ${FEATURES}; then 1974 if is-java-strict; then
1764 echo "Java QA Notice: $@" >&2 1975 echo "Java QA Notice: $@" >&2
1765 increment-qa-violations 1976 increment-qa-violations
1766 fi 1977 fi
1767} 1978}
1768 1979
1769increment-qa-violations() { 1980increment-qa-violations() {
1770 let "JAVA_PKG_QA_VIOLATIONS+=1" 1981 let "JAVA_PKG_QA_VIOLATIONS+=1"
1771 export JAVA_PKG_QA_VIOLATIONS 1982 export JAVA_PKG_QA_VIOLATIONS
1772} 1983}
1773 1984
1985is-java-strict() {
1986 [[ -n ${JAVA_PKG_STRICT} ]]
1987 return $?
1988}
1989
1774# ------------------------------------------------------------------------------ 1990# ------------------------------------------------------------------------------
1775# @eclass-end 1991# @eclass-end
1776# ------------------------------------------------------------------------------ 1992# ------------------------------------------------------------------------------

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

  ViewVC Help
Powered by ViewVC 1.1.20