/[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.10 Revision 1.21
11# ----------------------------------------------------------------------------- 11# -----------------------------------------------------------------------------
12# @eclass-begin 12# @eclass-begin
13# @eclass-shortdesc Java Utility eclass 13# @eclass-shortdesc Java Utility eclass
14# @eclass-maintainer java@gentoo.org 14# @eclass-maintainer java@gentoo.org
15# 15#
16# This eclass provides functionality which is used by 16# This eclass provides functionality which is used by
17# java-pkg.eclass and java-pkg-opt.eclass as well as from ebuilds. 17# java-pkg.eclass and java-pkg-opt.eclass as well as from ebuilds.
18# 18#
19# @warning 19# @warning
20# You probably don't want to inherit this directly from an ebuild. Instead, 20# 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 21# 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. 22# Java packages, or java-pkg-opt for packages that have optional Java support.
23# 23#
24# ----------------------------------------------------------------------------- 24# -----------------------------------------------------------------------------
25 25
26inherit eutils versionator multilib 26inherit eutils versionator multilib
40 40
41# ----------------------------------------------------------------------------- 41# -----------------------------------------------------------------------------
42# @variable-internal JAVA_PKG_E_DEPEND 42# @variable-internal JAVA_PKG_E_DEPEND
43# 43#
44# This is a convience variable to be used from the other java eclasses. This is 44# This is a convience variable to be used from the other java eclasses. This is
45# the version of java-config we want to use. We also need a recent version 45# the version of java-config we want to use. We also need a recent version
46# portage, that includes phase hooks. 46# portage, that includes phase hooks.
47# ----------------------------------------------------------------------------- 47# -----------------------------------------------------------------------------
48JAVA_PKG_E_DEPEND=">=dev-java/java-config-2.0.19-r1 ${JAVA_PKG_PORTAGE_DEP}" 48JAVA_PKG_E_DEPEND=">=dev-java/java-config-2.0.19-r1 ${JAVA_PKG_PORTAGE_DEP}"
49 49
50# ----------------------------------------------------------------------------- 50# -----------------------------------------------------------------------------
100# ----------------------------------------------------------------------------- 100# -----------------------------------------------------------------------------
101 101
102# ----------------------------------------------------------------------------- 102# -----------------------------------------------------------------------------
103# @variable-internal JAVA_PKG_COMPILER_DIR 103# @variable-internal JAVA_PKG_COMPILER_DIR
104# @default /usr/share/java-config-2/compiler 104# @default /usr/share/java-config-2/compiler
105# 105#
106# Directory where compiler settings are saved, without trailing slash. 106# Directory where compiler settings are saved, without trailing slash.
107# Probably shouldn't touch this variable. 107# Probably shouldn't touch this variable.
108# ----------------------------------------------------------------------------- 108# -----------------------------------------------------------------------------
109JAVA_PKG_COMPILER_DIR=${JAVA_PKG_COMPILER_DIR:="/usr/share/java-config-2/compiler"} 109JAVA_PKG_COMPILER_DIR=${JAVA_PKG_COMPILER_DIR:="/usr/share/java-config-2/compiler"}
110 110
120 120
121# ----------------------------------------------------------------------------- 121# -----------------------------------------------------------------------------
122# @variable-external JAVA_PKG_FORCE_COMPILER 122# @variable-external JAVA_PKG_FORCE_COMPILER
123# 123#
124# Explicitly set a list of compilers to use. This is normally read from 124# Explicitly set a list of compilers to use. This is normally read from
125# JAVA_PKG_COMPILERS_CONF. 125# JAVA_PKG_COMPILERS_CONF.
126# 126#
127# @note This should only be used internally or for testing. 127# @note This should only be used internally or for testing.
128# @example Use jikes and javac, in that order 128# @example Use jikes and javac, in that order
129# JAVA_PKG_FORCE_COMPILER="jikes javac" 129# JAVA_PKG_FORCE_COMPILER="jikes javac"
130# ----------------------------------------------------------------------------- 130# -----------------------------------------------------------------------------
150# @ebuild-function java-pkg_dojar 150# @ebuild-function java-pkg_dojar
151# 151#
152# Installs any number of jars. 152# Installs any number of jars.
153# Jar's will be installed into /usr/share/${PN}(-${SLOT})/lib/ by default. 153# Jar's will be installed into /usr/share/${PN}(-${SLOT})/lib/ by default.
154# You can use java-pkg_jarinto to change this path. 154# You can use java-pkg_jarinto to change this path.
155# You should never install a jar with a package version in the filename. 155# You should never install a jar with a package version in the filename.
156# Instead, use java-pkg_newjar defined below. 156# Instead, use java-pkg_newjar defined below.
157# 157#
158# @example 158# @example
159# java-pkg_dojar dist/${PN}.jar dist/${PN}-core.jar 159# java-pkg_dojar dist/${PN}.jar dist/${PN}-core.jar
160# 160#
222# will not work, because: 222# will not work, because:
223# * the `for jar in "$@"` can't expand the path to jar file names, as they 223# * the `for jar in "$@"` can't expand the path to jar file names, as they
224# don't exist yet 224# don't exist yet
225# * all `if ...` inside for will fail - the file '/opt/my-java/lib/*.jar' 225# * all `if ...` inside for will fail - the file '/opt/my-java/lib/*.jar'
226# doesn't exist 226# doesn't exist
227# 227#
228# you have to use it as: 228# you have to use it as:
229# 229#
230# java-pkg_regjar ${D}/opt/my-java/lib/*.jar 230# java-pkg_regjar ${D}/opt/my-java/lib/*.jar
231# 231#
232# @param $@ - jars to record 232# @param $@ - jars to record
305} 305}
306 306
307 307
308# ------------------------------------------------------------------------------ 308# ------------------------------------------------------------------------------
309# @ebuild-function java-pkg_doso 309# @ebuild-function java-pkg_doso
310# 310#
311# Installs any number of JNI libraries 311# Installs any number of JNI libraries
312# They will be installed into /usr/lib by default, but java-pkg_sointo 312# They will be installed into /usr/lib by default, but java-pkg_sointo
313# can be used change this path 313# can be used change this path
314# 314#
315# Example: 315# Example:
370 java-pkg_check-phase install 370 java-pkg_check-phase install
371 371
372 [[ ${#} -lt 1 ]] && "at least one argument needed" 372 [[ ${#} -lt 1 ]] && "at least one argument needed"
373 373
374 java-pkg_init_paths_ 374 java-pkg_init_paths_
375 375
376 local lib target_dir 376 local lib target_dir
377 for lib in "$@" ; do 377 for lib in "$@" ; do
378 # Check the absolute path of the lib 378 # Check the absolute path of the lib
379 if [[ -e "${lib}" ]] ; then 379 if [[ -e "${lib}" ]] ; then
380 target_dir="$(java-pkg_expand_dir_ ${lib})" 380 target_dir="$(java-pkg_expand_dir_ ${lib})"
458} 458}
459 459
460# ------------------------------------------------------------------------------ 460# ------------------------------------------------------------------------------
461# @ebuild-function java-pkg_dosrc 461# @ebuild-function java-pkg_dosrc
462# 462#
463# Installs a zip containing the source for a package, so it can used in 463# Installs a zip containing the source for a package, so it can used in
464# from IDEs like eclipse and netbeans. 464# from IDEs like eclipse and netbeans.
465# 465#
466# Ebuild needs to DEPEND on app-arch/zip to use this. 466# Ebuild needs to DEPEND on app-arch/zip to use this.
467# 467#
468# It also should be controlled by USE=source. 468# It also should be controlled by USE=source.
469# 469#
470# @example: 470# @example:
471# java-pkg_dosrc src/* 471# java-pkg_dosrc src/*
472# 472#
473# ------------------------------------------------------------------------------ 473# ------------------------------------------------------------------------------
474# TODO change so it the arguments it takes are the base directories containing 474# TODO change so it the arguments it takes are the base directories containing
475# source -nichoj 475# source -nichoj
476# TODO should we be able to handle multiple calls to dosrc? -nichoj 476# TODO should we be able to handle multiple calls to dosrc? -nichoj
477# TODO maybe we can take an existing zip/jar? -nichoj 477# TODO maybe we can take an existing zip/jar? -nichoj
478# FIXME apparently this fails if you give it an empty directories 478# FIXME apparently this fails if you give it an empty directories
479java-pkg_dosrc() { 479java-pkg_dosrc() {
480 debug-print-function ${FUNCNAME} $* 480 debug-print-function ${FUNCNAME} $*
481 481
482 [ ${#} -lt 1 ] && die "At least one argument needed" 482 [ ${#} -lt 1 ] && die "At least one argument needed"
483 if ! hasq source ${IUSE}; then 483 if ! hasq source ${IUSE}; then
484 echo "Java QA Notice: ${FUNCNAME} called without source in IUSE" 484 echo "Java QA Notice: ${FUNCNAME} called without source in IUSE"
485 fi 485 fi
486 486
487 java-pkg_check-phase install 487 java-pkg_check-phase install
488 488
489 [[ ${#} -lt 1 ]] && die "At least one argument needed" 489 [[ ${#} -lt 1 ]] && die "At least one argument needed"
490 490
491 java-pkg_init_paths_ 491 java-pkg_init_paths_
492 492
493 local zip_name="${PN}-src.zip" 493 local zip_name="${PN}-src.zip"
494 local zip_path="${T}/${zip_name}" 494 local zip_path="${T}/${zip_name}"
522# 522#
523# @param $1 - filename of launcher to create 523# @param $1 - filename of launcher to create
524# @param $2 - options, as follows: 524# @param $2 - options, as follows:
525# --main the.main.class.too.start 525# --main the.main.class.too.start
526# --jar /the/jar/too/launch.jar 526# --jar /the/jar/too/launch.jar
527# --java_args 'Extra arguments to pass too jave' 527# --java_args 'Extra arguments to pass to java'
528# --pkg_args 'extra arguments too pass too the package' 528# --pkg_args 'Extra arguments too pass to the package'
529# --pwd 529# --pwd
530# -into 530# -into
531# -pre 531# -pre
532# ------------------------------------------------------------------------------ 532# ------------------------------------------------------------------------------
533java-pkg_dolauncher() { 533java-pkg_dolauncher() {
540 java-pkg_init_paths_ 540 java-pkg_init_paths_
541 541
542 local name="${1}" 542 local name="${1}"
543 # TODO rename to launcher 543 # TODO rename to launcher
544 local target="${T}/${name}" 544 local target="${T}/${name}"
545 local var_tmp="${T}/launcher_variables_tmp"
545 local target_dir pre 546 local target_dir pre
546 shift 547 shift
547 548
548 echo "#!/bin/bash" > "${target}" 549 # Process the other the rest of the arguments
549 while [[ -n "${1}" && -n "${2}" ]]; do 550 while [[ -n "${1}" && -n "${2}" ]]; do
550 local var=${1} value=${2} 551 local var=${1} value=${2}
551 if [[ "${var:0:2}" == "--" ]]; then 552 if [[ "${var:0:2}" == "--" ]]; then
552 echo "gjl_${var:2}=\"${value}\"" >> "${target}" 553 echo "gjl_${var:2}=\"${value}\"" >> "${var_tmp}"
553 elif [[ "${var}" == "-into" ]]; then 554 elif [[ "${var}" == "-into" ]]; then
554 target_dir="${value}" 555 target_dir="${value}"
555 elif [[ "${var}" == "-pre" ]]; then 556 elif [[ "${var}" == "-pre" ]]; then
556 pre="${value}" 557 pre="${value}"
557 fi 558 fi
558 shift 2 559 shift 2
559 done 560 done
561
562 # Write the actual script
563 echo "#!/bin/bash" > "${target}"
564 [[ -n "${pre}" ]] && [[ -f "${pre}" ]] && cat "${pre}" >> "${target}"
560 echo "gjl_package=${JAVA_PKG_NAME}" >> "${target}" 565 echo "gjl_package=${JAVA_PKG_NAME}" >> "${target}"
561 [[ -n "${pre}" ]] && [[ -f "${pre}" ]] && cat "${pre}" >> "${target}" 566 cat "${var_tmp}" >> "${target}"
567 rm -f "${var_tmp}"
562 echo "source /usr/share/java-config-2/launcher/launcher.bash" >> "${target}" 568 echo "source /usr/share/java-config-2/launcher/launcher.bash" >> "${target}"
563 569
564 if [[ -n "${into}" ]]; then 570 if [[ -n "${target_dir}" ]]; then
565 DESTTREE="${target_dir}" dobin "${target}" 571 DESTTREE="${target_dir}" dobin "${target}"
566 local ret=$? 572 local ret=$?
567 return ${ret} 573 return ${ret}
568 else 574 else
569 dobin "${target}" 575 dobin "${target}"
597 echo "dowar: warning, skipping directory ${war}" 603 echo "dowar: warning, skipping directory ${war}"
598 continue 604 continue
599 else 605 else
600 warpath="${war}" 606 warpath="${war}"
601 fi 607 fi
602 608
603 # Install those files like you mean it 609 # Install those files like you mean it
604 INSOPTIONS="-m 0644" \ 610 INSOPTIONS="-m 0644" \
605 INSDESTTREE=${JAVA_PKG_WARDEST} \ 611 INSDESTTREE=${JAVA_PKG_WARDEST} \
606 doins ${warpath} 612 doins ${warpath}
607 done 613 done
642# @ebuild-function java-pkg_jar-from 648# @ebuild-function java-pkg_jar-from
643# 649#
644# Makes a symlink to a jar from a certain package 650# Makes a symlink to a jar from a certain package
645# A lot of java packages include dependencies in a lib/ directory 651# A lot of java packages include dependencies in a lib/ directory
646# You can use this function to replace these bundled dependencies. 652# You can use this function to replace these bundled dependencies.
653# The dependency is recorded into package.env DEPEND line, unless "--build-only"
654# is passed as the very first argument, for jars that have to be present only
655# at build time and are not needed on runtime (junit testing etc).
647# 656#
648# Example: get all jars from xerces slot 2 657# Example: get all jars from xerces slot 2
649# java-pkg_jar-from xerces-2 658# java-pkg_jar-from xerces-2
650# Example: get a specific jar from xerces slot 2 659# Example: get a specific jar from xerces slot 2
651# java-pkg_jar-from xerces-2 xml-apis.jar 660# java-pkg_jar-from xerces-2 xml-apis.jar
652# Example get a specific jar from xerces slot 2, and name it diffrently 661# Example: get a specific jar from xerces slot 2, and name it diffrently
653# java-pkg_jar-from xerces-2 xml-apis.jar xml.jar 662# java-pkg_jar-from xerces-2 xml-apis.jar xml.jar
663# Example: get junit.jar which is needed only for building
664# java-pkg_jar-from --build-only junit junit.jar
654# 665#
666# @param $1 - (optional) "--build-only" makes the jar(s) not added into
667# package.env DEPEND line.
655# @param $1 - Package to get jars from. 668# @param $1 - Package to get jars from.
656# @param $2 - jar from package. If not specified, all jars will be used. 669# @param $2 - jar from package. If not specified, all jars will be used.
657# @param $3 - When a single jar is specified, destination filename of the 670# @param $3 - When a single jar is specified, destination filename of the
658# symlink. Defaults to the name of the jar. 671# symlink. Defaults to the name of the jar.
659# ------------------------------------------------------------------------------ 672# ------------------------------------------------------------------------------
660# TODO could probably be cleaned up a little 673# TODO could probably be cleaned up a little
661java-pkg_jar-from() { 674java-pkg_jar-from() {
662 debug-print-function ${FUNCNAME} $* 675 debug-print-function ${FUNCNAME} $*
663 676
677 local build_only=""
678
679 if [[ "${1}" = "--build-only" ]]; then
680 build_only="true"
681 shift
682 fi
683
664 local target_pkg="${1}" target_jar="${2}" destjar="${3}" 684 local target_pkg="${1}" target_jar="${2}" destjar="${3}"
665 685
666 [[ -z ${target_pkg} ]] && die "Must specify a package" 686 [[ -z ${target_pkg} ]] && die "Must specify a package"
667 687
668 # default destjar to the target jar 688 # default destjar to the target jar
669 [[ -z "${destjar}" ]] && destjar="${target_jar}" 689 [[ -z "${destjar}" ]] && destjar="${target_jar}"
670 690
691 local error_msg="There was a problem getting the classpath for ${target_pkg}."
692 local classpath
671 local classpath="$(java-config --classpath=${target_pkg})" 693 classpath="$(java-config --classpath=${target_pkg})"
672 [[ $? != 0 ]] && die "There was a problem getting the classpath for ${target_pkg}" 694 [[ $? != 0 ]] && die ${error_msg}
673 695
674 local jar 696 local jar
675 for jar in ${classpath//:/ }; do 697 for jar in ${classpath//:/ }; do
676 local jar_name=$(basename "${jar}") 698 local jar_name=$(basename "${jar}")
677 if [[ ! -f "${jar}" ]] ; then 699 if [[ ! -f "${jar}" ]] ; then
681 # If no specific target jar was indicated, link it 703 # If no specific target jar was indicated, link it
682 if [[ -z "${target_jar}" ]] ; then 704 if [[ -z "${target_jar}" ]] ; then
683 [[ -f "${target_jar}" ]] && rm "${target_jar}" 705 [[ -f "${target_jar}" ]] && rm "${target_jar}"
684 ln -snf "${jar}" \ 706 ln -snf "${jar}" \
685 || die "Failed to make symlink from ${jar} to ${jar_name}" 707 || die "Failed to make symlink from ${jar} to ${jar_name}"
686 java-pkg_record-jar_ "${target_pkg}" "${jar}" 708 [[ -z "${build_only}" ]] && java-pkg_record-jar_ "${target_pkg}" "${jar}"
687 # otherwise, if the current jar is the target jar, link it 709 # otherwise, if the current jar is the target jar, link it
688 elif [[ "${jar_name}" == "${target_jar}" ]] ; then 710 elif [[ "${jar_name}" == "${target_jar}" ]] ; then
689 [[ -f "${destjar}" ]] && rm "${destjar}" 711 [[ -f "${destjar}" ]] && rm "${destjar}"
690 ln -snf "${jar}" "${destjar}" \ 712 ln -snf "${jar}" "${destjar}" \
691 || die "Failed to make symlink from ${jar} to ${destjar}" 713 || die "Failed to make symlink from ${jar} to ${destjar}"
692 java-pkg_record-jar_ "${target_pkg}" "${jar}" 714 [[ -z "${build_only}" ]] && java-pkg_record-jar_ "${target_pkg}" "${jar}"
693 return 0 715 return 0
694 fi 716 fi
695 done 717 done
696 # if no target was specified, we're ok 718 # if no target was specified, we're ok
697 if [[ -z "${target_jar}" ]] ; then 719 if [[ -z "${target_jar}" ]] ; then
714# ------------------------------------------------------------------------------ 736# ------------------------------------------------------------------------------
715# @ebuild-function java-pkg_getjars 737# @ebuild-function java-pkg_getjars
716# 738#
717# Get the classpath provided by any number of packages 739# Get the classpath provided by any number of packages
718# Among other things, this can be passed to 'javac -classpath' or 'ant -lib'. 740# Among other things, this can be passed to 'javac -classpath' or 'ant -lib'.
741# The providing packages are recorded as dependencies into package.env DEPEND
742# line, unless "--build-only" is passed as the very first argument, for jars
743# that have to be present only at build time and are not needed on runtime
744# (junit testing etc).
719# 745#
720# Example: Get the classpath for xerces-2, 746# Example: Get the classpath for xerces-2,
721# java-pkg_getjars xerces-2 xalan 747# java-pkg_getjars xerces-2 xalan
722# Example Return: 748# Example Return:
723# /usr/share/xerces-2/lib/xml-apis.jar:/usr/share/xerces-2/lib/xmlParserAPIs.jar:/usr/share/xalan/lib/xalan.jar 749# /usr/share/xerces-2/lib/xml-apis.jar:/usr/share/xerces-2/lib/xmlParserAPIs.jar:/usr/share/xalan/lib/xalan.jar
724# 750#
751# @param $1 - (optional) "--build-only" makes the jar(s) not added into
752# package.env DEPEND line.
725# @param $@ - list of packages to get jars from 753# @param $@ - list of packages to get jars from
726# ------------------------------------------------------------------------------ 754# ------------------------------------------------------------------------------
727java-pkg_getjars() { 755java-pkg_getjars() {
728 debug-print-function ${FUNCNAME} $* 756 debug-print-function ${FUNCNAME} $*
757
758 local build_only=""
759
760 if [[ "${1}" = "--build-only" ]]; then
761 build_only="true"
762 shift
763 fi
729 764
730 [[ ${#} -lt 1 ]] && die "At least one argument needed" 765 [[ ${#} -lt 1 ]] && die "At least one argument needed"
731 766
732 # NOTE could probably just pass $@ to java-config --classpath. and return it 767 # NOTE could probably just pass $@ to java-config --classpath. and return it
733 local classpath pkg 768 local classpath pkg
734 for pkg in ${@//,/ }; do 769 for pkg in ${@//,/ }; do
735 #for pkg in $(echo "$@" | tr ',' ' '); do 770 #for pkg in $(echo "$@" | tr ',' ' '); do
736 jars="$(java-config --classpath=${pkg})" 771 jars="$(java-config --classpath=${pkg})"
772 [[ -z "${jars}" ]] && die "java-config --classpath=${pkg} failed"
737 debug-print "${pkg}:${jars}" 773 debug-print "${pkg}:${jars}"
738 # TODO should we ensure jars exist? 774
739 if [[ -z "${classpath}" ]]; then 775 if [[ -z "${classpath}" ]]; then
740 classpath="${jars}" 776 classpath="${jars}"
741 else 777 else
742 classpath="${classpath}:${jars}" 778 classpath="${classpath}:${jars}"
743 fi 779 fi
744 java-pkg_record-jar_ "${pkg}" 780 # Only record jars that aren't build-only
781 [[ -z "${build_only}" ]] && java-pkg_record-jar_ "${pkg}"
745 done 782 done
746 echo "${classpath}" 783 echo "${classpath}"
747} 784}
748 785
749# ------------------------------------------------------------------------------ 786# ------------------------------------------------------------------------------
750# @ebuild-function java-pkg_getjar 787# @ebuild-function java-pkg_getjar
751# 788#
752# Get the filename of a single jar from a package 789# Get the filename of a single jar from a package
790# The providing package is recorded as runtime dependency into package.env
791# DEPEND line, unless "--build-only" is passed as the very first argument, for
792# jars that have to be present only at build time and are not needed on runtime
793# (junit testing etc).
753# 794#
754# @example 795# @example
755# java-pkg_getjar xerces-2 xml-apis.jar 796# java-pkg_getjar xerces-2 xml-apis.jar
756# @example-return 797# @example-return
757# /usr/share/xerces-2/lib/xml-apis.jar 798# /usr/share/xerces-2/lib/xml-apis.jar
758# 799#
800# @param $1 - (optional) "--build-only" makes the jar not added into
801# package.env DEPEND line.
759# @param $1 - package to use 802# @param $1 - package to use
760# @param $2 - jar to get 803# @param $2 - jar to get
761# ------------------------------------------------------------------------------ 804# ------------------------------------------------------------------------------
762java-pkg_getjar() { 805java-pkg_getjar() {
763 debug-print-function ${FUNCNAME} $* 806 debug-print-function ${FUNCNAME} $*
807
808 local build_only=""
809
810 if [[ "${1}" = "--build-only" ]]; then
811 build_only="true"
812 shift
813 fi
764 814
765 local pkg="${1}" target_jar="${2}" jar 815 local pkg="${1}" target_jar="${2}" jar
766 [[ -z ${pkg} ]] && die "Must specify package to get a jar from" 816 [[ -z ${pkg} ]] && die "Must specify package to get a jar from"
767 [[ -z ${target_jar} ]] && die "Must specify jar to get" 817 [[ -z ${target_jar} ]] && die "Must specify jar to get"
768 818
769 # TODO check that package is actually installed 819 local error_msg="Could not find classpath for ${pkg}. Are you sure its installed?"
820 local classpath
770 local classpath=$(java-config --classpath=${pkg}) 821 classpath=$(java-config --classpath=${pkg})
771 [[ $? != 0 ]] && die "There could not find classpath for ${pkg}. Are you sure its installed?" 822 [[ $? != 0 ]] && die ${error_msg}
823
772 for jar in ${classpath//:/ }; do 824 for jar in ${classpath//:/ }; do
773 if [[ ! -f "${jar}" ]] ; then 825 if [[ ! -f "${jar}" ]] ; then
774 die "Installation problems with jars in ${pkg} - is it installed?" 826 die "Installation problem with jar ${jar} in ${pkg} - is it installed?"
775 fi 827 fi
776 828
777 if [[ "$(basename ${jar})" == "${target_jar}" ]] ; then 829 if [[ "$(basename ${jar})" == "${target_jar}" ]] ; then
778 java-pkg_record-jar_ "${pkg}" "${jar}" 830 # Only record jars that aren't build-only
831 [[ -z "${build_only}" ]] && java-pkg_record-jar_ "${pkg}" "${jar}"
779 echo "${jar}" 832 echo "${jar}"
780 return 0 833 return 0
781 fi 834 fi
782 done 835 done
783 836
784 die "Could not find ${target_jar} in ${pkg}" 837 die "Could not find ${target_jar} in ${pkg}"
785 return 1 838 return 1
786} 839}
787 840
788# This function reads stdin, and based on that input, figures out how to 841# This function reads stdin, and based on that input, figures out how to
802# line="${line// /}" 855# line="${line// /}"
803# 856#
804# # format: path=jarinfo 857# # format: path=jarinfo
805# local path=${line%%=*} 858# local path=${line%%=*}
806# local jarinfo=${line##*=} 859# local jarinfo=${line##*=}
807# 860#
808# # format: jar@package 861# # format: jar@package
809# local jar=${jarinfo%%@*}.jar 862# local jar=${jarinfo%%@*}.jar
810# local package=${jarinfo##*@} 863# local package=${jarinfo##*@}
811# if [[ -n ${replace_only} ]]; then 864# if [[ -n ${replace_only} ]]; then
812# [[ ! -f $path ]] && die "No jar exists at ${path}" 865# [[ ! -f $path ]] && die "No jar exists at ${path}"
825# @section-end query 878# @section-end query
826# ------------------------------------------------------------------------------ 879# ------------------------------------------------------------------------------
827 880
828# ------------------------------------------------------------------------------ 881# ------------------------------------------------------------------------------
829# @section-begin helper 882# @section-begin helper
830# @section-summary Helper functions 883# @section-summary Helper functions
831# 884#
832# Various other functions to use from an ebuild 885# Various other functions to use from an ebuild
833# ------------------------------------------------------------------------------ 886# ------------------------------------------------------------------------------
834 887
835# ------------------------------------------------------------------------------ 888# ------------------------------------------------------------------------------
841# jdbc-stdext 894# jdbc-stdext
842# jaf 895# jaf
843# jdbc-rowset 896# jdbc-rowset
844# jms 897# jms
845# 898#
846# @param $1 - Optionally indicate that the dependencies are controlled by 899# @param $1 - Optionally indicate that the dependencies are controlled by
847# a use flag by specifying '--use' Requires $2. 900# a use flag by specifying '--use' Requires $2.
848# @param $2 - USE flag which will enable the dependencies. 901# @param $2 - USE flag which will enable the dependencies.
849# @param $@ - virtual packages to add depenedencies for 902# @param $@ - virtual packages to add depenedencies for
850# ------------------------------------------------------------------------------ 903# ------------------------------------------------------------------------------
851# TODO rewrite to parse a line based declaration file instead -- karltk 904# TODO rewrite to parse a line based declaration file instead -- karltk
945 fi 998 fi
946} 999}
947 1000
948# ------------------------------------------------------------------------------ 1001# ------------------------------------------------------------------------------
949# @internal-function java-pkg_is-vm-version-sufficient 1002# @internal-function java-pkg_is-vm-version-sufficient
950# 1003#
951# @return zero - VM is sufficient 1004# @return zero - VM is sufficient
952# @return non-zero - VM is not sufficient 1005# @return non-zero - VM is not sufficient
953# ------------------------------------------------------------------------------ 1006# ------------------------------------------------------------------------------
954java-pkg_is-vm-version-sufficient() { 1007java-pkg_is-vm-version-sufficient() {
955 debug-print-function ${FUNCNAME} $* 1008 debug-print-function ${FUNCNAME} $*
975 die "Active Java VM too old" 1028 die "Active Java VM too old"
976 fi 1029 fi
977} 1030}
978 1031
979# ------------------------------------------------------------------------------ 1032# ------------------------------------------------------------------------------
980# @internal-function java-pkg_is-vm-version-eq 1033# @internal-function java-pkg_is-vm-version-eq
981# 1034#
982# @param $@ - VM version to compare current VM to 1035# @param $@ - VM version to compare current VM to
983# @return zero - VM versions are equal 1036# @return zero - VM versions are equal
984# @return non-zero - VM version are not equal 1037# @return non-zero - VM version are not equal
985# ------------------------------------------------------------------------------ 1038# ------------------------------------------------------------------------------
986java-pkg_is-vm-version-eq() { 1039java-pkg_is-vm-version-eq() {
1016# 1069#
1017# @param $@ - VM version to compare current to 1070# @param $@ - VM version to compare current to
1018# ------------------------------------------------------------------------------ 1071# ------------------------------------------------------------------------------
1019java-pkg_ensure-vm-version-ge() { 1072java-pkg_ensure-vm-version-ge() {
1020 debug-print-function ${FUNCNAME} $* 1073 debug-print-function ${FUNCNAME} $*
1021 1074
1022 if ! java-pkg_is-vm-version-ge "$@" ; then 1075 if ! java-pkg_is-vm-version-ge "$@" ; then
1023 debug-print "vm is not suffient" 1076 debug-print "vm is not suffient"
1024 eerror "This package requires a Java VM version >= $@" 1077 eerror "This package requires a Java VM version >= $@"
1025 einfo "Please use java-config -S to set the correct one" 1078 einfo "Please use java-config -S to set the correct one"
1026 die "Active Java VM too old" 1079 die "Active Java VM too old"
1027 fi 1080 fi
1028} 1081}
1029 1082
1030# ------------------------------------------------------------------------------ 1083# ------------------------------------------------------------------------------
1031# @internal-function java-pkg_is-vm-version-ge 1084# @internal-function java-pkg_is-vm-version-ge
1032# 1085#
1033# @param $@ - VM version to compare current VM to 1086# @param $@ - VM version to compare current VM to
1034# @return zero - current VM version is greater than checked version 1087# @return zero - current VM version is greater than checked version
1035# @return non-zero - current VM version is not greater than checked version 1088# @return non-zero - current VM version is not greater than checked version
1036# ------------------------------------------------------------------------------ 1089# ------------------------------------------------------------------------------
1037java-pkg_is-vm-version-ge() { 1090java-pkg_is-vm-version-ge() {
1051 return 1 1104 return 1
1052 fi 1105 fi
1053 fi 1106 fi
1054} 1107}
1055 1108
1109java-pkg_set-current-vm() {
1110 export GENTOO_VM=${1}
1111}
1112
1113java-pkg_get-current-vm() {
1114 echo ${GENTOO_VM}
1115}
1116
1117java-pkg_current-vm-matches() {
1118 hasq $(java-pkg_get-current-vm) ${@}
1119 return $?
1120}
1121
1056# ------------------------------------------------------------------------------ 1122# ------------------------------------------------------------------------------
1057# @ebuild-function java-pkg_get-source 1123# @ebuild-function java-pkg_get-source
1058# 1124#
1059# Determines what source version should be used, for passing to -source. 1125# Determines what source version should be used, for passing to -source.
1060# Unless you want to break things you probably shouldn't set _WANT_SOURCE 1126# Unless you want to break things you probably shouldn't set _WANT_SOURCE
1061# 1127#
1062# @return string - Either the lowest possible source, or JAVA_PKG_WANT_SOURCE 1128# @return string - Either the lowest possible source, or JAVA_PKG_WANT_SOURCE
1063# ------------------------------------------------------------------------------ 1129# ------------------------------------------------------------------------------
1068# ------------------------------------------------------------------------------ 1134# ------------------------------------------------------------------------------
1069# @ebuild-function java-pkg_get-target 1135# @ebuild-function java-pkg_get-target
1070# 1136#
1071# Determines what target version should be used, for passing to -target. 1137# Determines what target version should be used, for passing to -target.
1072# If you don't care about lower versions, you can set _WANT_TARGET to the 1138# If you don't care about lower versions, you can set _WANT_TARGET to the
1073# version of your JDK. 1139# version of your JDK.
1074# Remember doing this will mostly like cause things to break. 1140# Remember doing this will mostly like cause things to break.
1075# Doesn't allow it to be lower then the one in depend. 1141# Doesn't allow it to be lower then the one in depend.
1076# Doesn't allow it to be higher then the active vm. 1142# Doesn't allow it to be higher then the active vm.
1077# 1143#
1078# @return string - Either the lowest possible target, or JAVA_PKG_WANT_TARGET 1144# @return string - Either the lowest possible target, or JAVA_PKG_WANT_TARGET
1079# ------------------------------------------------------------------------------ 1145# ------------------------------------------------------------------------------
1080java-pkg_get-target() { 1146java-pkg_get-target() {
1081 local min=$(depend-java-query --get-lowest "${DEPEND} ${RDEPEND}") 1147 local min=$(depend-java-query --get-lowest "${DEPEND} ${RDEPEND}")
1082 if [[ -n "${JAVA_PKG_WANT_TARGET}" ]]; then 1148 if [[ -n "${JAVA_PKG_WANT_TARGET}" ]]; then
1083 local max="$(java-config --select-vm "${GENTOO_VM}" -g PROVIDES_VERSION)" 1149 local max="$(java-config --select-vm "${GENTOO_VM}" -g PROVIDES_VERSION)"
1084 if version_is_at_least "${min}" "${JAVA_PKG_WANT_TARGET}" && version_is_at_least "${JAVA_PKG_WANT_TARGET}" "${max}"; then 1150 if version_is_at_least "${min}" "${JAVA_PKG_WANT_TARGET}" && version_is_at_least "${JAVA_PKG_WANT_TARGET}" "${max}"; then
1085 echo ${JAVA_PKG_WANT_TARGET} 1151 echo ${JAVA_PKG_WANT_TARGET}
1086 else 1152 else
1113 # try to get value of JAVAC 1179 # try to get value of JAVAC
1114 compiler_executable="$(source ${compiler_env} 1>/dev/null 2>&1; echo ${JAVAC})" 1180 compiler_executable="$(source ${compiler_env} 1>/dev/null 2>&1; echo ${JAVAC})"
1115 export JAVAC=${old_javac} 1181 export JAVAC=${old_javac}
1116 1182
1117 [[ -z ${compiler_executable} ]] && die "JAVAC is empty or undefined in ${compiler_env}" 1183 [[ -z ${compiler_executable} ]] && die "JAVAC is empty or undefined in ${compiler_env}"
1118 1184
1119 # check that it's executable 1185 # check that it's executable
1120 if [[ ! -x ${compiler_executable} ]]; then 1186 if [[ ! -x ${compiler_executable} ]]; then
1121 eerror "Could not find ${compiler_executable}!" 1187 eerror "Could not find ${compiler_executable}!"
1122 die "${compiler_executable} doesn't exist, or isn't executable" 1188 die "${compiler_executable} doesn't exist, or isn't executable"
1123 fi 1189 fi
1128 fi 1194 fi
1129 echo ${compiler_executable} 1195 echo ${compiler_executable}
1130} 1196}
1131 1197
1132# ------------------------------------------------------------------------------ 1198# ------------------------------------------------------------------------------
1133# @ebuild-function java-pkg_javac-args 1199# @ebuild-function java-pkg_javac-args
1134# 1200#
1135# If an ebuild uses javac directly, instead of using ejavac, it should call this 1201# If an ebuild uses javac directly, instead of using ejavac, it should call this
1136# to know what -source/-target to use. 1202# to know what -source/-target to use.
1137# 1203#
1138# @return string - arguments to pass to javac, complete with -target and -source 1204# @return string - arguments to pass to javac, complete with -target and -source
1141 debug-print-function ${FUNCNAME} $* 1207 debug-print-function ${FUNCNAME} $*
1142 1208
1143 local want_source="$(java-pkg_get-source)" 1209 local want_source="$(java-pkg_get-source)"
1144 local want_target="$(java-pkg_get-target)" 1210 local want_target="$(java-pkg_get-target)"
1145 1211
1146 local source_str="-source ${want_source}" 1212 local source_str="-source ${want_source}"
1147 local target_str="-target ${want_target}" 1213 local target_str="-target ${want_target}"
1148 1214
1149 debug-print "want source: ${want_source}" 1215 debug-print "want source: ${want_source}"
1150 debug-print "want target: ${want_target}" 1216 debug-print "want target: ${want_target}"
1151 1217
1180 ebeep 5 1246 ebeep 5
1181 die "No GCJ support found!" 1247 die "No GCJ support found!"
1182 fi 1248 fi
1183} 1249}
1184 1250
1251java-pkg_ensure-test() {
1252 if hasq test ${FEATURES} && ! hasq -test ${FEATURES} && ! use test; then
1253 eerror "You specified FEATURES=test, but USE=test is needed"
1254 eerror "to pull in the additional dependencies for testing"
1255 die "Need USE=test enabled"
1256 fi
1257}
1258
1185# ------------------------------------------------------------------------------ 1259# ------------------------------------------------------------------------------
1186# @section-end helper 1260# @section-end helper
1187# ------------------------------------------------------------------------------ 1261# ------------------------------------------------------------------------------
1188 1262
1189# ------------------------------------------------------------------------------ 1263# ------------------------------------------------------------------------------
1201# compiler. 1275# compiler.
1202# 1276#
1203# ------------------------------------------------------------------------------ 1277# ------------------------------------------------------------------------------
1204eant() { 1278eant() {
1205 debug-print-function ${FUNCNAME} $* 1279 debug-print-function ${FUNCNAME} $*
1280
1281 # FIXME get this working
1282# if is-java-strict && [[ ! ${DEPEND} =~ "dev-java/ant" ]]; then
1283# java-pkg_announce-qa-violation \
1284# "Using eant, but not depending on dev-java/ant or dev-java/ant-core"
1285# fi
1206 1286
1207 local antflags 1287 local antflags
1208 java-pkg_init-compiler_ 1288 java-pkg_init-compiler_
1209 local compiler="${GENTOO_COMPILER}" 1289 local compiler="${GENTOO_COMPILER}"
1210 1290
1229 1309
1230 if is-java-strict; then 1310 if is-java-strict; then
1231 einfo "Disabling system classpath for ant" 1311 einfo "Disabling system classpath for ant"
1232 antflags="${antflags} -Dbuild.sysclasspath=ignore" 1312 antflags="${antflags} -Dbuild.sysclasspath=ignore"
1233 fi 1313 fi
1234 1314
1235 if [[ -n ${JAVA_PKG_DEBUG} ]]; then 1315 if [[ -n ${JAVA_PKG_DEBUG} ]]; then
1236 antflags="${antflags} -debug" 1316 antflags="${antflags} -debug"
1237 fi 1317 fi
1238 1318
1239 [[ -n ${JAVA_PKG_DEBUG} ]] && echo ant ${antflags} "${@}" 1319 [[ -n ${JAVA_PKG_DEBUG} ]] && echo ant ${antflags} "${@}"
1240 ant ${antflags} "${@}" || die "eant failed" 1320 ant ${antflags} "${@}" || die "eant failed"
1241 1321
1242} 1322}
1243 1323
1244# ------------------------------------------------------------------------------ 1324# ------------------------------------------------------------------------------
1245# @ebuild-function ejavac 1325# @ebuild-function ejavac
1246# 1326#
1247# Javac wrapper function. Will use the appropriate compiler, based on 1327# Javac wrapper function. Will use the appropriate compiler, based on
1248# /etc/java-config/compilers.conf 1328# /etc/java-config/compilers.conf
1249# 1329#
1250# @param $@ - Arguments to be passed to the compiler 1330# @param $@ - Arguments to be passed to the compiler
1251# ------------------------------------------------------------------------------ 1331# ------------------------------------------------------------------------------
1252ejavac() { 1332ejavac() {
1260 ${compiler_executable} $(java-pkg_javac-args) "${@}" || die "ejavac failed" 1340 ${compiler_executable} $(java-pkg_javac-args) "${@}" || die "ejavac failed"
1261} 1341}
1262 1342
1263# ------------------------------------------------------------------------------ 1343# ------------------------------------------------------------------------------
1264# @ebuild-function java-pkg_filter-compiler 1344# @ebuild-function java-pkg_filter-compiler
1265# 1345#
1266# Used to prevent the use of some compilers. Should be used in src_compile. 1346# Used to prevent the use of some compilers. Should be used in src_compile.
1267# Basically, it just appends onto JAVA_PKG_FILTER_COMPILER 1347# Basically, it just appends onto JAVA_PKG_FILTER_COMPILER
1268# 1348#
1269# @param $@ - compilers to filter 1349# @param $@ - compilers to filter
1270# ------------------------------------------------------------------------------ 1350# ------------------------------------------------------------------------------
1288# ------------------------------------------------------------------------------ 1368# ------------------------------------------------------------------------------
1289# @ebuild-function use_doc 1369# @ebuild-function use_doc
1290# 1370#
1291# Helper function for getting ant to build javadocs. If the user has USE=doc, 1371# Helper function for getting ant to build javadocs. If the user has USE=doc,
1292# then 'javadoc' or the argument are returned. Otherwise, there is no return. 1372# then 'javadoc' or the argument are returned. Otherwise, there is no return.
1293# 1373#
1294# The output of this should be passed to ant. 1374# The output of this should be passed to ant.
1295# 1375#
1296# Example: build javadocs by calling 'javadoc' target 1376# Example: build javadocs by calling 'javadoc' target
1297# eant $(use_doc) 1377# eant $(use_doc)
1298# Example: build javadocs by calling 'apidoc' target 1378# Example: build javadocs by calling 'apidoc' target
1306} 1386}
1307 1387
1308# ------------------------------------------------------------------------------ 1388# ------------------------------------------------------------------------------
1309# @section-end build 1389# @section-end build
1310# ------------------------------------------------------------------------------ 1390# ------------------------------------------------------------------------------
1311 1391
1312# ------------------------------------------------------------------------------ 1392# ------------------------------------------------------------------------------
1313# @section-begin internal 1393# @section-begin internal
1314# @section-summary Internal functions 1394# @section-summary Internal functions
1315# 1395#
1316# Do __NOT__ use any of these from an ebuild! These are only to be used from 1396# Do __NOT__ use any of these from an ebuild! These are only to be used from
1317# within the java eclasses. 1397# within the java eclasses.
1318# ------------------------------------------------------------------------------ 1398# ------------------------------------------------------------------------------
1319 1399
1320# ----------------------------------------------------------------------------- 1400# -----------------------------------------------------------------------------
1321# @function-internal java-pkg_init 1401# @function-internal java-pkg_init
1322# 1402#
1323# The purpose of this function, as the name might imply, is to initialize the 1403# The purpose of this function, as the name might imply, is to initialize the
1324# Java environment. It ensures that that there aren't any environment variables 1404# Java environment. It ensures that that there aren't any environment variables
1325# that'll muss things up. It initializes some variables, which are used 1405# that'll muss things up. It initializes some variables, which are used
1326# internally. And most importantly, it'll switch the VM if necessary. 1406# internally. And most importantly, it'll switch the VM if necessary.
1327# 1407#
1339 # TODO we will probably want to set JAVAC and JAVACFLAGS 1419 # TODO we will probably want to set JAVAC and JAVACFLAGS
1340 1420
1341 # Do some QA checks 1421 # Do some QA checks
1342 java-pkg_check-jikes 1422 java-pkg_check-jikes
1343 1423
1344 # When users have crazy classpaths some packages can fail to compile. 1424 # When users have crazy classpaths some packages can fail to compile.
1345 # and everything should work with empty CLASSPATH. 1425 # and everything should work with empty CLASSPATH.
1346 # This also helps prevent unexpected dependencies on random things 1426 # This also helps prevent unexpected dependencies on random things
1347 # from the CLASSPATH. 1427 # from the CLASSPATH.
1348 unset CLASSPATH 1428 unset CLASSPATH
1349} 1429}
1350 1430
1351# ------------------------------------------------------------------------------ 1431# ------------------------------------------------------------------------------
1352# @function-internal java-pkg-init-compiler_ 1432# @function-internal java-pkg-init-compiler_
1353# 1433#
1354# This function attempts to figure out what compiler should be used. It does 1434# This function attempts to figure out what compiler should be used. It does
1355# this by reading the file at JAVA_PKG_COMPILERS_CONF, and checking the 1435# this by reading the file at JAVA_PKG_COMPILERS_CONF, and checking the
1356# COMPILERS variable defined there. 1436# COMPILERS variable defined there.
1357# This can be overridden by a list in JAVA_PKG_FORCE_COMPILER 1437# This can be overridden by a list in JAVA_PKG_FORCE_COMPILER
1358# 1438#
1359# It will go through the list of compilers, and verify that it supports the 1439# It will go through the list of compilers, and verify that it supports the
1360# target and source that are needed. If it is not suitable, then the next 1440# target and source that are needed. If it is not suitable, then the next
1361# compiler is checked. When JAVA_PKG_FORCE_COMPILER is defined, this checking 1441# compiler is checked. When JAVA_PKG_FORCE_COMPILER is defined, this checking
1362# isn't done. 1442# isn't done.
1363# 1443#
1385 if [[ -z ${JAVA_PKG_FORCE_COMPILER} ]]; then 1465 if [[ -z ${JAVA_PKG_FORCE_COMPILER} ]]; then
1386 compilers="$(source ${JAVA_PKG_COMPILERS_CONF} 1>/dev/null 2>&1; echo ${COMPILERS})" 1466 compilers="$(source ${JAVA_PKG_COMPILERS_CONF} 1>/dev/null 2>&1; echo ${COMPILERS})"
1387 else 1467 else
1388 compilers=${JAVA_PKG_FORCE_COMPILER} 1468 compilers=${JAVA_PKG_FORCE_COMPILER}
1389 fi 1469 fi
1390 1470
1391 debug-print "Read \"${compilers}\" from ${JAVA_PKG_COMPILERS_CONF}" 1471 debug-print "Read \"${compilers}\" from ${JAVA_PKG_COMPILERS_CONF}"
1392 1472
1393 # Figure out if we should announce what compiler we're using 1473 # Figure out if we should announce what compiler we're using
1394 local compiler 1474 local compiler
1395 for compiler in ${compilers}; do 1475 for compiler in ${compilers}; do
1398 if [[ ${compiler} = "javac" ]]; then 1478 if [[ ${compiler} = "javac" ]]; then
1399 debug-print "Found javac... breaking" 1479 debug-print "Found javac... breaking"
1400 export GENTOO_COMPILER="javac" 1480 export GENTOO_COMPILER="javac"
1401 break 1481 break
1402 fi 1482 fi
1403 1483
1404 if has ${compiler} ${JAVA_PKG_FILTER_COMPILER}; then 1484 if has ${compiler} ${JAVA_PKG_FILTER_COMPILER}; then
1405 if [[ -z ${JAVA_PKG_FORCE_COMPILER} ]]; then 1485 if [[ -z ${JAVA_PKG_FORCE_COMPILER} ]]; then
1406 einfo "Filtering ${compiler}" 1486 einfo "Filtering ${compiler}"
1407 continue 1487 continue
1408 fi 1488 fi
1409 fi 1489 fi
1410 1490
1411 # for non-javac, we need to make sure it supports the right target and 1491 # for non-javac, we need to make sure it supports the right target and
1412 # source 1492 # source
1413 local compiler_env="${JAVA_PKG_COMPILER_DIR}/${compiler}" 1493 local compiler_env="${JAVA_PKG_COMPILER_DIR}/${compiler}"
1414 if [[ -f ${compiler_env} ]]; then 1494 if [[ -f ${compiler_env} ]]; then
1415 local desired_target="$(java-pkg_get-target)" 1495 local desired_target="$(java-pkg_get-target)"
1511 [[ -n "${JAVA_PKG_LIBRARY}" ]] && echo "LIBRARY_PATH=\"${JAVA_PKG_LIBRARY}\"" 1591 [[ -n "${JAVA_PKG_LIBRARY}" ]] && echo "LIBRARY_PATH=\"${JAVA_PKG_LIBRARY}\""
1512 [[ -n "${JAVA_PROVIDE}" ]] && echo "PROVIDES=\"${JAVA_PROVIDE}\"" 1592 [[ -n "${JAVA_PROVIDE}" ]] && echo "PROVIDES=\"${JAVA_PROVIDE}\""
1513 [[ -f "${JAVA_PKG_DEPEND}" ]] && echo "DEPEND=\"$(cat ${JAVA_PKG_DEPEND} | uniq | tr '\n' ':')\"" 1593 [[ -f "${JAVA_PKG_DEPEND}" ]] && echo "DEPEND=\"$(cat ${JAVA_PKG_DEPEND} | uniq | tr '\n' ':')\""
1514 echo "VM=\"$(echo ${RDEPEND} ${DEPEND} | sed -e 's/ /\n/g' | sed -n -e '/virtual\/\(jre\|jdk\)/ { p;q }')\"" # TODO cleanup ! 1594 echo "VM=\"$(echo ${RDEPEND} ${DEPEND} | sed -e 's/ /\n/g' | sed -n -e '/virtual\/\(jre\|jdk\)/ { p;q }')\"" # TODO cleanup !
1515 ) > "${JAVA_PKG_ENV}" 1595 ) > "${JAVA_PKG_ENV}"
1516 1596
1517 # register target/source 1597 # register target/source
1518 local target="$(java-pkg_get-target)" 1598 local target="$(java-pkg_get-target)"
1519 local source="$(java-pkg_get-source)" 1599 local source="$(java-pkg_get-source)"
1520 [[ -n ${target} ]] && echo "TARGET=\"${target}\"" >> "${JAVA_PKG_ENV}" 1600 [[ -n ${target} ]] && echo "TARGET=\"${target}\"" >> "${JAVA_PKG_ENV}"
1521 [[ -n ${source} ]] && echo "SOURCE=\"${source}\"" >> "${JAVA_PKG_ENV}" 1601 [[ -n ${source} ]] && echo "SOURCE=\"${source}\"" >> "${JAVA_PKG_ENV}"
1588 fi 1668 fi
1589} 1669}
1590 1670
1591# ------------------------------------------------------------------------------ 1671# ------------------------------------------------------------------------------
1592# @internal-function java-pkg_expand_dir_ 1672# @internal-function java-pkg_expand_dir_
1593# 1673#
1594# Gets the full path of the file/directory's parent. 1674# Gets the full path of the file/directory's parent.
1595# @param $1 - file/directory to find parent directory for 1675# @param $1 - file/directory to find parent directory for
1596# @return - path to $1's parent directory 1676# @return - path to $1's parent directory
1597# ------------------------------------------------------------------------------ 1677# ------------------------------------------------------------------------------
1598java-pkg_expand_dir_() { 1678java-pkg_expand_dir_() {
1690} 1770}
1691 1771
1692# ------------------------------------------------------------------------------ 1772# ------------------------------------------------------------------------------
1693# @internal-function java-pkg_switch-vm 1773# @internal-function java-pkg_switch-vm
1694# 1774#
1695# Switch VM if we're allowed to (controlled by JAVA_PKG_ALLOW_VM_CHANGE), and 1775# Switch VM if we're allowed to (controlled by JAVA_PKG_ALLOW_VM_CHANGE), and
1696# verify that the current VM is sufficient. 1776# verify that the current VM is sufficient.
1697# Setup the environment for the VM being used. 1777# Setup the environment for the VM being used.
1698# ------------------------------------------------------------------------------ 1778# ------------------------------------------------------------------------------
1699java-pkg_switch-vm() { 1779java-pkg_switch-vm() {
1700 if java-pkg_needs-vm; then 1780 if java-pkg_needs-vm; then
1713 # otherwise just make sure the current VM is sufficient 1793 # otherwise just make sure the current VM is sufficient
1714 else 1794 else
1715 java-pkg_ensure-vm-version-sufficient 1795 java-pkg_ensure-vm-version-sufficient
1716 fi 1796 fi
1717 debug-print "Using: $(java-config -f)" 1797 debug-print "Using: $(java-config -f)"
1718 1798
1719 java-pkg_setup-vm 1799 java-pkg_setup-vm
1720 1800
1721 export JAVA=$(java-config --java) 1801 export JAVA=$(java-config --java)
1722 export JAVAC=$(java-config --javac) 1802 export JAVAC=$(java-config --javac)
1723 export JAVACFLAGS="$(java-pkg_javac-args)" 1803 export JAVACFLAGS="$(java-pkg_javac-args)"
1724 [[ -n ${JAVACFLAGS_EXTRA} ]] && export JAVACFLAGS="${JAVACFLAGS_EXTRA} ${JAVACFLAGS}" 1804 [[ -n ${JAVACFLAGS_EXTRA} ]] && export JAVACFLAGS="${JAVACFLAGS_EXTRA} ${JAVACFLAGS}"
1725 1805
1726 export JAVA_HOME="$(java-config -g JAVA_HOME)" 1806 export JAVA_HOME="$(java-config -g JAVA_HOME)"
1727 export JDK_HOME=${JAVA_HOME} 1807 export JDK_HOME=${JAVA_HOME}
1728 1808
1729 #TODO If you know a better solution let us know. 1809 #TODO If you know a better solution let us know.
1730 java-pkg_append_ LD_LIBRARY_PATH "$(java-config -g LDPATH)" 1810 java-pkg_append_ LD_LIBRARY_PATH "$(java-config -g LDPATH)"
1731 1811
1732 local tann="${T}/announced-vm" 1812 local tann="${T}/announced-vm"
1733 if [[ -n "${JAVA_PKG_DEBUG}" ]] || [[ ! -f "${tann}" ]] ; then 1813 if [[ -n "${JAVA_PKG_DEBUG}" ]] || [[ ! -f "${tann}" ]] ; then
1734 # Add a check for setup/preinst phase... to avoid duplicate outputs 1814 # Add a check for setup/preinst phase... to avoid duplicate outputs
1735 # for when FEATURES=buildpkg 1815 # for when FEATURES=buildpkg
1736 if [[ ${EBUILD_PHASE} != "setup" && ${EBUILD_PHASE} != "preinst" && ${EBUILD_PHASE} != "postinst" ]]; 1816 if [[ ${EBUILD_PHASE} != "setup" && ${EBUILD_PHASE} != "preinst" && ${EBUILD_PHASE} != "postinst" ]];
1780# TODO document 1860# TODO document
1781# Verify that the classes were compiled for the right source / target 1861# Verify that the classes were compiled for the right source / target
1782java-pkg_verify-classes() { 1862java-pkg_verify-classes() {
1783 ebegin "Verifying java class versions" 1863 ebegin "Verifying java class versions"
1784 #$(find ${D} -type f -name '*.jar' -o -name '*.class') 1864 #$(find ${D} -type f -name '*.jar' -o -name '*.class')
1785 class-version-verify.py -t $(java-pkg_get-target) -r ${D} 1865 class-version-verify.py -t $(java-pkg_get-target) -r ${D}
1786 result=$? 1866 result=$?
1787 eend ${result} 1867 eend ${result}
1788 if [[ ${result} == 0 ]]; then 1868 if [[ ${result} == 0 ]]; then
1789 einfo "All good" 1869 einfo "All good"
1790 else 1870 else
1832 let "JAVA_PKG_QA_VIOLATIONS+=1" 1912 let "JAVA_PKG_QA_VIOLATIONS+=1"
1833 export JAVA_PKG_QA_VIOLATIONS 1913 export JAVA_PKG_QA_VIOLATIONS
1834} 1914}
1835 1915
1836is-java-strict() { 1916is-java-strict() {
1837 hasq java-strict ${FEATURES}; 1917 [[ -n ${JAVA_PKG_STRICT} ]]
1838 return $? 1918 return $?
1839} 1919}
1840 1920
1841# ------------------------------------------------------------------------------ 1921# ------------------------------------------------------------------------------
1842# @eclass-end 1922# @eclass-end

Legend:
Removed from v.1.10  
changed lines
  Added in v.1.21

  ViewVC Help
Powered by ViewVC 1.1.20