/[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.22 Revision 1.68
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.68 2007/03/25 10:02:09 betelgeuse 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
23# 24#
24# ----------------------------------------------------------------------------- 25# -----------------------------------------------------------------------------
25 26
26inherit eutils versionator multilib 27inherit eutils versionator multilib
27 28
29IUSE="elibc_FreeBSD"
30
28# ----------------------------------------------------------------------------- 31# -----------------------------------------------------------------------------
29# @section-begin variables 32# @section-begin variables
30# @section-title Variables 33# @section-title Variables
31# 34#
32# Summary of variables which control the behavior of building Java packges. 35# Summary of variables which control the behavior of building Java packges.
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
38# TODO document 41# -----------------------------------------------------------------------------
42# @variable-external WANT_ANT_TASKS
43# @variable-default ""
44#
45# An $IFS separated list of ant tasks.
46# Ebuild can specify this variable before inheriting java-ant-2 eclass to
47# determine ANT_TASKS it needs. They will be automatically translated to
48# DEPEND variable and ANT_TASKS variable. JAVA_PKG_FORCE_ANT_TASKS can override
49# ANT_TASKS set by WANT_ANT_TASKS, but not the DEPEND due to caching.
50# Ebuilds that need to depend conditionally on certain tasks and specify them
51# differently for different eant calls can't use this simplified approach.
52# You also cannot specify version or anything else than ant-*.
53#
54# @example WANT_ANT_TASKS="ant-junit ant-trax"
55#
56# @seealso JAVA_PKG_FORCE_ANT_TASKS
57# -----------------------------------------------------------------------------
58#WANT_ANT_TASKS
59
60# -----------------------------------------------------------------------------
61# @variable-internal JAVA_PKG_PORTAGE_DEP
62#
63# The version of portage we need to function properly. At this moment it's
64# portage with phase hooks support.
65# -----------------------------------------------------------------------------
39JAVA_PKG_PORTAGE_DEP=">=sys-apps/portage-2.1_pre1" 66JAVA_PKG_PORTAGE_DEP=">=sys-apps/portage-2.1_pre1"
40 67
41# ----------------------------------------------------------------------------- 68# -----------------------------------------------------------------------------
42# @variable-internal JAVA_PKG_E_DEPEND 69# @variable-internal JAVA_PKG_E_DEPEND
43# 70#
44# This is a convience variable to be used from the other java eclasses. This is 71# This is a convience variable to be used from the other java eclasses. This is
45# the version of java-config we want to use. We also need a recent version 72# the version of java-config we want to use. We also need a recent version
46# portage, that includes phase hooks. 73# portage, that includes phase hooks.
47# ----------------------------------------------------------------------------- 74# -----------------------------------------------------------------------------
48JAVA_PKG_E_DEPEND=">=dev-java/java-config-2.0.19-r1 ${JAVA_PKG_PORTAGE_DEP}" 75JAVA_PKG_E_DEPEND=">=dev-java/java-config-2.0.31 ${JAVA_PKG_PORTAGE_DEP}"
49 76
50# ----------------------------------------------------------------------------- 77# -----------------------------------------------------------------------------
51# @variable-external JAVA_PKG_ALLOW_VM_CHANGE 78# @variable-external JAVA_PKG_ALLOW_VM_CHANGE
52# @variable-default yes 79# @variable-default yes
53# 80#
127# @note This should only be used internally or for testing. 154# @note This should only be used internally or for testing.
128# @example Use jikes and javac, in that order 155# @example Use jikes and javac, in that order
129# JAVA_PKG_FORCE_COMPILER="jikes javac" 156# JAVA_PKG_FORCE_COMPILER="jikes javac"
130# ----------------------------------------------------------------------------- 157# -----------------------------------------------------------------------------
131 158
159# -----------------------------------------------------------------------------
160# @variable-external JAVA_PKG_FORCE_ANT_TASKS
161#
162# An $IFS separated list of ant tasks. Can be set in environment before calling
163# emerge/ebuild to override variables set in ebuild, mainly for testing before
164# putting the resulting (WANT_)ANT_TASKS into ebuild. Affects only ANT_TASKS in
165# eant() call, not the dependencies specified in WANT_ANT_TASKS.
166#
167# @example JAVA_PKG_FORCE_ANT_TASKS="ant-junit ant-trax" \
168# ebuild foo.ebuild compile
169#
170# @seealso WANT_ANT_TASKS
171# -----------------------------------------------------------------------------
172
132# TODO document me 173# TODO document me
133JAVA_PKG_QA_VIOLATIONS=0 174JAVA_PKG_QA_VIOLATIONS=0
134 175
135# ----------------------------------------------------------------------------- 176# -----------------------------------------------------------------------------
136# @section-end variables 177# @section-end variables
143# 184#
144# These are used to install Java-related things, such as jars, Javadocs, JNI 185# These are used to install Java-related things, such as jars, Javadocs, JNI
145# libraries, etc. 186# libraries, etc.
146# ----------------------------------------------------------------------------- 187# -----------------------------------------------------------------------------
147 188
189# -----------------------------------------------------------------------------
190# @ebuild-function java-pkg_doexamples
191#
192# Installs given arguments to /usr/share/doc/${PF}/examples
193# If you give it only one parameter and it is a directory it will install
194# everything in that directory to the examples directory.
195#
196# @example
197# java-pkg_doexamples demo
198# java-pkg_doexamples demo/* examples/*
199#
200# @param $* - list of files to install
201# ------------------------------------------------------------------------------
202java-pkg_doexamples() {
203 debug-print-function ${FUNCNAME} $*
204
205 [[ ${#} -lt 1 ]] && die "At least one argument needed"
206
207 java-pkg_check-phase install
208
209 local dest=/usr/share/doc/${PF}/examples
210 if [[ ${#} = 1 && -d ${1} ]]; then
211 INSDESTTREE="${dest}" doins -r ${1}/* || die "Installing examples failed"
212 else
213 INSDESTTREE="${dest}" doins -r "${@}" || die "Installing examples failed"
214 fi
215}
148 216
149# ----------------------------------------------------------------------------- 217# -----------------------------------------------------------------------------
150# @ebuild-function java-pkg_dojar 218# @ebuild-function java-pkg_dojar
151# 219#
152# Installs any number of jars. 220# Installs any number of jars.
171 # Create JARDEST if it doesn't exist 239 # Create JARDEST if it doesn't exist
172 dodir ${JAVA_PKG_JARDEST} 240 dodir ${JAVA_PKG_JARDEST}
173 241
174 local jar 242 local jar
175 # for each jar 243 # for each jar
176 for jar in "$@"; do 244 for jar in "${@}"; do
177 local jar_basename=$(basename "${jar}") 245 local jar_basename=$(basename "${jar}")
178 246
179 java-pkg_check-versioned-jar ${jar_basename} 247 java-pkg_check-versioned-jar ${jar_basename}
180 248
181 # check if it exists 249 # check if it exists
182 if [[ -e "${jar}" ]] ; then 250 if [[ -e "${jar}" ]] ; then
251 # Don't overwrite if jar has already been installed with the same
252 # name
253 local dest="${D}${JAVA_PKG_JARDEST}/${jar_basename}"
254 if [[ -e "${dest}" ]]; then
255 ewarn "Overwriting ${dest}"
256 fi
257
183 # install it into JARDEST if it's a non-symlink 258 # install it into JARDEST if it's a non-symlink
184 if [[ ! -L "${jar}" ]] ; then 259 if [[ ! -L "${jar}" ]] ; then
260 #but first check class version when in strict mode.
261 is-java-strict && java-pkg_verify-classes "${jar}"
262
185 INSDESTTREE="${JAVA_PKG_JARDEST}" \ 263 INSDESTTREE="${JAVA_PKG_JARDEST}" \
186 doins "${jar}" || die "failed to install ${jar}" 264 doins "${jar}" || die "failed to install ${jar}"
187 java-pkg_append_ JAVA_PKG_CLASSPATH "${JAVA_PKG_JARDEST}/${jar_basename}" 265 java-pkg_append_ JAVA_PKG_CLASSPATH "${JAVA_PKG_JARDEST}/${jar_basename}"
188 debug-print "installed ${jar} to ${D}${JAVA_PKG_JARDEST}" 266 debug-print "installed ${jar} to ${D}${JAVA_PKG_JARDEST}"
189 # make a symlink to the original jar if it's symlink 267 # make a symlink to the original jar if it's symlink
200 278
201 java-pkg_do_write_ 279 java-pkg_do_write_
202} 280}
203 281
204 282
283# ------------------------------------------------------------------------------
284# @internal-function depend-java-query
285#
286# Wrapper for the depend-java-query binary to enable passing USE in env.
287# Using env variables keeps this eclass working with java-config versions that
288# do not handle use flags.
289# ------------------------------------------------------------------------------
290
291depend-java-query() {
292 # Used to have a which call here but it caused endless loops for some people
293 # that had some weird bashrc voodoo for which.
294 USE="${USE}" /usr/bin/depend-java-query "${@}"
295}
205 296
206# ------------------------------------------------------------------------------ 297# ------------------------------------------------------------------------------
207# @ebuild-function java-pkg_regjar 298# @ebuild-function java-pkg_regjar
208# 299#
209# Records an already installed jar in the package.env 300# Records an already installed jar in the package.env
240 [[ ${#} -lt 1 ]] && die "at least one argument needed" 331 [[ ${#} -lt 1 ]] && die "at least one argument needed"
241 332
242 java-pkg_init_paths_ 333 java-pkg_init_paths_
243 334
244 local jar jar_dir jar_file 335 local jar jar_dir jar_file
245 for jar in "$@"; do 336 for jar in "${@}"; do
246 # TODO use java-pkg_check-versioned-jar 337 # TODO use java-pkg_check-versioned-jar
247 if [[ -e "${jar}" ]]; then 338 if [[ -e "${jar}" || -e "${D}${jar}" ]]; then
339 [[ -d "${jar}" || -d "${D}${jar}" ]] \
340 && die "Called ${FUNCNAME} on a directory $*"
341
342 #check that class version correct when in strict mode
343 is-java-strict && java-pkg_verify-classes "${jar}"
344
248 # nelchael: we should strip ${D} in this case too, here's why: 345 # nelchael: we should strip ${D} in this case too, here's why:
249 # imagine such call: 346 # imagine such call:
250 # java-pkg_regjar ${D}/opt/java/*.jar 347 # java-pkg_regjar ${D}/opt/java/*.jar
251 # such call will fall into this case (-e ${jar}) and will 348 # such call will fall into this case (-e ${jar}) and will
252 # record paths with ${D} in package.env 349 # record paths with ${D} in package.env
253 java-pkg_append_ JAVA_PKG_CLASSPATH "${jar#${D}}" 350 java-pkg_append_ JAVA_PKG_CLASSPATH "${jar#${D}}"
254 elif [[ -e "${D}${jar}" ]]; then
255 java-pkg_append_ JAVA_PKG_CLASSPATH "${jar#${D}}"
256 else 351 else
352 if [[ ${jar} = *\** ]]; then
353 eerror "The argument ${jar} to ${FUNCNAME}"
354 eerror "has * in it. If you want it to glob in"
355 eerror '${D} add ${D} to the argument.'
356 fi
257 die "${jar} does not exist" 357 die "${jar} does not exist"
258 fi 358 fi
259 done 359 done
260 360
261 java-pkg_do_write_ 361 java-pkg_do_write_
262} 362}
263
264 363
265# ------------------------------------------------------------------------------ 364# ------------------------------------------------------------------------------
266# @ebuild-function java-pkg_newjar 365# @ebuild-function java-pkg_newjar
267# 366#
268# Installs a jar with a new name 367# Installs a jar with a new name
279 local original_jar="${1}" 378 local original_jar="${1}"
280 local new_jar="${2:-${PN}.jar}" 379 local new_jar="${2:-${PN}.jar}"
281 local new_jar_dest="${T}/${new_jar}" 380 local new_jar_dest="${T}/${new_jar}"
282 381
283 [[ -z ${original_jar} ]] && die "Must specify a jar to install" 382 [[ -z ${original_jar} ]] && die "Must specify a jar to install"
284 [[ ! -f ${original_jar} ]] && die "${original_jar} does not exist!" 383 [[ ! -f ${original_jar} ]] \
384 && die "${original_jar} does not exist or is not a file!"
285 385
286 rm -f "${new_jar_dest}" || die "Failed to remove ${new_jar_dest}" 386 rm -f "${new_jar_dest}" || die "Failed to remove ${new_jar_dest}"
287 cp "${original_jar}" "${new_jar_dest}" \ 387 cp "${original_jar}" "${new_jar_dest}" \
288 || die "Failed to copy ${original_jar} to ${new_jar_dest}" 388 || die "Failed to copy ${original_jar} to ${new_jar_dest}"
289 java-pkg_dojar "${new_jar_dest}" 389 java-pkg_dojar "${new_jar_dest}"
290} 390}
291 391
292
293# ------------------------------------------------------------------------------ 392# ------------------------------------------------------------------------------
294# @ebuild-function java-pkg_addcp 393# @ebuild-function java-pkg_addcp
295# 394#
296# Add something to the package's classpath. For jars, you should use dojar, 395# Add something to the package's classpath. For jars, you should use dojar,
297# newjar, or regjar. This is typically used to add directories to the classpath. 396# newjar, or regjar. This is typically used to add directories to the classpath.
301# ------------------------------------------------------------------------------ 400# ------------------------------------------------------------------------------
302java-pkg_addcp() { 401java-pkg_addcp() {
303 java-pkg_append_ JAVA_PKG_CLASSPATH "${@}" 402 java-pkg_append_ JAVA_PKG_CLASSPATH "${@}"
304 java-pkg_do_write_ 403 java-pkg_do_write_
305} 404}
306
307 405
308# ------------------------------------------------------------------------------ 406# ------------------------------------------------------------------------------
309# @ebuild-function java-pkg_doso 407# @ebuild-function java-pkg_doso
310# 408#
311# Installs any number of JNI libraries 409# Installs any number of JNI libraries
340 java-pkg_append_ JAVA_PKG_LIBRARY "${JAVA_PKG_LIBDEST}" 438 java-pkg_append_ JAVA_PKG_LIBRARY "${JAVA_PKG_LIBDEST}"
341 debug-print "Installing ${lib} to ${JAVA_PKG_LIBDEST}" 439 debug-print "Installing ${lib} to ${JAVA_PKG_LIBDEST}"
342 # otherwise make a symlink to the symlink's origin 440 # otherwise make a symlink to the symlink's origin
343 else 441 else
344 # TODO use dosym 442 # TODO use dosym
443 ln -s "$(readlink "${lib}")" \
345 ln -s "$(readlink "${lib}")" "${D}${JAVA_PKG_LIBDEST}/$(basename "${lib}")" 444 "${D}${JAVA_PKG_LIBDEST}/$(basename "${lib}")"
346 debug-print "${lib} is a symlink, linking accordanly" 445 debug-print "${lib} is a symlink, linking accordanly"
347 fi 446 fi
348 # otherwise die 447 # otherwise die
349 else 448 else
350 die "${lib} does not exist" 449 die "${lib} does not exist"
428# ------------------------------------------------------------------------------ 527# ------------------------------------------------------------------------------
429java-pkg_dohtml() { 528java-pkg_dohtml() {
430 debug-print-function ${FUNCNAME} $* 529 debug-print-function ${FUNCNAME} $*
431 530
432 [[ ${#} -lt 1 ]] && die "At least one argument required for ${FUNCNAME}" 531 [[ ${#} -lt 1 ]] && die "At least one argument required for ${FUNCNAME}"
433 # TODO-nichoj find out what exactly -f package-list does 532
533 # from /usr/lib/portage/bin/dohtml -h
534 # -f Set list of allowed extensionless file names.
434 dohtml -f package-list "$@" 535 dohtml -f package-list "$@"
536
435 # this probably shouldn't be here but it provides 537 # this probably shouldn't be here but it provides
436 # a reasonable way to catch # docs for all of the 538 # a reasonable way to catch # docs for all of the
437 # old ebuilds. 539 # old ebuilds.
438 java-pkg_recordjavadoc 540 java-pkg_recordjavadoc
439} 541}
440 542
441# TODO document 543# ------------------------------------------------------------------------------
544# @ebuild-function java-pkg_dojavadoc
545#
546# Installs javadoc documentation. This should be controlled by the doc use flag.
547#
548# @param $1: - The javadoc root directory.
549#
550# @example:
551# java-pkg_dojavadoc docs/api
552#
553# ------------------------------------------------------------------------------
442java-pkg_dojavadoc() { 554java-pkg_dojavadoc() {
443 local dir="$1" 555 local dir="$1"
444 556
445 java-pkg_check-phase install 557 java-pkg_check-phase install
446 558
478# FIXME apparently this fails if you give it an empty directories 590# FIXME apparently this fails if you give it an empty directories
479java-pkg_dosrc() { 591java-pkg_dosrc() {
480 debug-print-function ${FUNCNAME} $* 592 debug-print-function ${FUNCNAME} $*
481 593
482 [ ${#} -lt 1 ] && die "At least one argument needed" 594 [ ${#} -lt 1 ] && die "At least one argument needed"
483 if ! hasq source ${IUSE}; then
484 echo "Java QA Notice: ${FUNCNAME} called without source in IUSE"
485 fi
486 595
487 java-pkg_check-phase install 596 java-pkg_check-phase install
488 597
489 [[ ${#} -lt 1 ]] && die "At least one argument needed" 598 [[ ${#} -lt 1 ]] && die "At least one argument needed"
599
600 if ! [[ ${DEPEND} = *app-arch/zip* ]]; then
601 local msg="${FUNCNAME} called without app-arch/zip in DEPEND"
602 if is-java-strict; then
603 eerror "${msg}"
604 die "${msg}"
605 else
606 echo "${msg}"
607 echo "Please report this to http://bugs.gentoo.org."
608 fi
609 fi
490 610
491 java-pkg_init_paths_ 611 java-pkg_init_paths_
492 612
493 local zip_name="${PN}-src.zip" 613 local zip_name="${PN}-src.zip"
494 local zip_path="${T}/${zip_name}" 614 local zip_path="${T}/${zip_name}"
495 local dir 615 local dir
496 for dir in ${@}; do 616 for dir in "${@}"; do
497 local dir_parent=$(dirname "${dir}") 617 local dir_parent=$(dirname "${dir}")
498 local dir_name=$(basename "${dir}") 618 local dir_name=$(basename "${dir}")
499 pushd ${dir_parent} > /dev/null || die "problem entering ${dir_parent}" 619 pushd ${dir_parent} > /dev/null || die "problem entering ${dir_parent}"
500 zip -q -r ${zip_path} ${dir_name} -i '*.java' 620 zip -q -r ${zip_path} ${dir_name} -i '*.java'
501 local result=$? 621 local result=$?
518# @ebuild-function java-pkg_dolauncher 638# @ebuild-function java-pkg_dolauncher
519# 639#
520# Make a wrapper script to lauch/start this package 640# Make a wrapper script to lauch/start this package
521# If necessary, the wrapper will switch to the appropriate VM. 641# If necessary, the wrapper will switch to the appropriate VM.
522# 642#
643# Can be called without parameters if the package installs only one jar
644# that has the Main-class attribute set. The wrapper will be named ${PN}.
645#
523# @param $1 - filename of launcher to create 646# @param $1 - filename of launcher to create
524# @param $2 - options, as follows: 647# @param $2 - options, as follows:
525# --main the.main.class.too.start 648# --main the.main.class.too.start
526# --jar /the/jar/too/launch.jar 649# --jar /the/jar/too/launch.jar or just <name>.jar
527# --java_args 'Extra arguments to pass to java' 650# --java_args 'Extra arguments to pass to java'
528# --pkg_args 'Extra arguments too pass to the package' 651# --pkg_args 'Extra arguments to pass to the package'
529# --pwd 652# --pwd Directory the launcher changes to before executing java
530# -into 653# -into Directory to install the launcher to, instead of /usr/bin
531# -pre 654# -pre Prepend contents of this file to the launcher
532# ------------------------------------------------------------------------------ 655# ------------------------------------------------------------------------------
533java-pkg_dolauncher() { 656java-pkg_dolauncher() {
534 debug-print-function ${FUNCNAME} $* 657 debug-print-function ${FUNCNAME} $*
535 658
536 java-pkg_check-phase install 659 java-pkg_check-phase install
537
538 [[ ${#} -lt 1 ]] && die "Need at least one argument"
539
540 java-pkg_init_paths_ 660 java-pkg_init_paths_
541 661
662 if [[ ${#} = 0 ]]; then
663 local name="${PN}"
664 else
542 local name="${1}" 665 local name="${1}"
666 shift
667 fi
668
543 # TODO rename to launcher 669 # TODO rename to launcher
544 local target="${T}/${name}" 670 local target="${T}/${name}"
545 local var_tmp="${T}/launcher_variables_tmp" 671 local var_tmp="${T}/launcher_variables_tmp"
546 local target_dir pre 672 local target_dir pre
547 shift
548 673
549 # Process the other the rest of the arguments 674 # Process the other the rest of the arguments
550 while [[ -n "${1}" && -n "${2}" ]]; do 675 while [[ -n "${1}" && -n "${2}" ]]; do
551 local var=${1} value=${2} 676 local var="${1}" value="${2}"
552 if [[ "${var:0:2}" == "--" ]]; then 677 if [[ "${var:0:2}" == "--" ]]; then
678 local var=${var:2}
553 echo "gjl_${var:2}=\"${value}\"" >> "${var_tmp}" 679 echo "gjl_${var}=\"${value}\"" >> "${var_tmp}"
680 local gjl_${var}="${value}"
554 elif [[ "${var}" == "-into" ]]; then 681 elif [[ "${var}" == "-into" ]]; then
555 target_dir="${value}" 682 target_dir="${value}"
556 elif [[ "${var}" == "-pre" ]]; then 683 elif [[ "${var}" == "-pre" ]]; then
557 pre="${value}" 684 pre="${value}"
558 fi 685 fi
559 shift 2 686 shift 2
560 done 687 done
561 688
689 # Test if no --jar and --main arguments were given and
690 # in that case check if the package only installs one jar
691 # and use that jar.
692 if [[ -z "${gjl_jar}" && -z "${gjl_main}" ]]; then
693 local cp="${JAVA_PKG_CLASSPATH}"
694 if [[ "${cp/:}" = "${cp}" && "${cp%.jar}" != "${cp}" ]]; then
695 echo "gjl_jar=\"${JAVA_PKG_CLASSPATH}\"" >> "${var_tmp}"
696 else
697 local msg="Not enough information to create a launcher given."
698 msg="${msg} Please give --jar or --main argument to ${FUNCNAME}."
699 die "${msg}"
700 fi
701 fi
702
562 # Write the actual script 703 # Write the actual script
563 echo "#!/bin/bash" > "${target}" 704 echo "#!/bin/bash" > "${target}"
564 [[ -n "${pre}" ]] && [[ -f "${pre}" ]] && cat "${pre}" >> "${target}" 705 if [[ -n "${pre}" ]]; then
706 if [[ -f "${pre}" ]]; then
707 cat "${pre}" >> "${target}"
708 else
709 die "-pre specified file '${pre}' does not exist"
710 fi
711 fi
565 echo "gjl_package=${JAVA_PKG_NAME}" >> "${target}" 712 echo "gjl_package=${JAVA_PKG_NAME}" >> "${target}"
566 cat "${var_tmp}" >> "${target}" 713 cat "${var_tmp}" >> "${target}"
567 rm -f "${var_tmp}" 714 rm -f "${var_tmp}"
568 echo "source /usr/share/java-config-2/launcher/launcher.bash" >> "${target}" 715 echo "source /usr/share/java-config-2/launcher/launcher.bash" >> "${target}"
569 716
661# Example: get a specific jar from xerces slot 2, and name it diffrently 808# Example: get a specific jar from xerces slot 2, and name it diffrently
662# java-pkg_jar-from xerces-2 xml-apis.jar xml.jar 809# java-pkg_jar-from xerces-2 xml-apis.jar xml.jar
663# Example: get junit.jar which is needed only for building 810# Example: get junit.jar which is needed only for building
664# java-pkg_jar-from --build-only junit junit.jar 811# java-pkg_jar-from --build-only junit junit.jar
665# 812#
666# @param $1 - (optional) "--build-only" makes the jar(s) not added into 813# @param $opt
667# package.env DEPEND line. 814# --build-only - makes the jar(s) not added into package.env DEPEND line.
815# (assumed automatically when called inside src_test)
816# --with-dependencies - get jars also from requested package's dependencies
817# transitively.
818# --into $dir - symlink jar(s) into $dir (must exist) instead of .
668# @param $1 - Package to get jars from. 819# @param $1 - Package to get jars from.
669# @param $2 - jar from package. If not specified, all jars will be used. 820# @param $2 - jar from package. If not specified, all jars will be used.
670# @param $3 - When a single jar is specified, destination filename of the 821# @param $3 - When a single jar is specified, destination filename of the
671# symlink. Defaults to the name of the jar. 822# symlink. Defaults to the name of the jar.
672# ------------------------------------------------------------------------------ 823# ------------------------------------------------------------------------------
673# TODO could probably be cleaned up a little 824# TODO could probably be cleaned up a little
674java-pkg_jar-from() { 825java-pkg_jar-from() {
675 debug-print-function ${FUNCNAME} $* 826 debug-print-function ${FUNCNAME} $*
676 827
677 local build_only="" 828 local build_only=""
829 local destdir="."
830 local deep=""
678 831
832 [[ "${EBUILD_PHASE}" == "test" ]] && build_only="true"
833
834 while [[ "${1}" == --* ]]; do
679 if [[ "${1}" = "--build-only" ]]; then 835 if [[ "${1}" = "--build-only" ]]; then
680 build_only="true" 836 build_only="true"
837 elif [[ "${1}" = "--with-dependencies" ]]; then
838 deep="--with-dependencies"
839 elif [[ "${1}" = "--into" ]]; then
840 destdir="${2}"
841 shift
842 else
843 die "java-pkg_jar-from called with unknown parameter: ${1}"
844 fi
681 shift 845 shift
682 fi 846 done
683 847
684 local target_pkg="${1}" target_jar="${2}" destjar="${3}" 848 local target_pkg="${1}" target_jar="${2}" destjar="${3}"
685 849
686 [[ -z ${target_pkg} ]] && die "Must specify a package" 850 [[ -z ${target_pkg} ]] && die "Must specify a package"
687 851
688 # default destjar to the target jar 852 # default destjar to the target jar
689 [[ -z "${destjar}" ]] && destjar="${target_jar}" 853 [[ -z "${destjar}" ]] && destjar="${target_jar}"
690 854
691 local error_msg="There was a problem getting the classpath for ${target_pkg}." 855 local error_msg="There was a problem getting the classpath for ${target_pkg}."
692 local classpath 856 local classpath
693 classpath="$(java-config --classpath=${target_pkg})" 857 classpath="$(java-config ${deep} --classpath=${target_pkg})"
694 [[ $? != 0 ]] && die ${error_msg} 858 [[ $? != 0 ]] && die ${error_msg}
859
860 pushd ${destdir} > /dev/null \
861 || die "failed to change directory to ${destdir}"
862
863 # When we have commas this functions is called to bring jars from multiple
864 # packages. This affects recording of dependencencies because that syntax uses :
865 # if we don't change them to : gjl and java-config -d -p break
866 if [[ ${target_pkg} = *,* ]]; then
867 build_only="true"
868 java-pkg_record-jar_ ${target_pkg//,/:}
869 fi
695 870
696 local jar 871 local jar
697 for jar in ${classpath//:/ }; do 872 for jar in ${classpath//:/ }; do
698 local jar_name=$(basename "${jar}") 873 local jar_name=$(basename "${jar}")
699 if [[ ! -f "${jar}" ]] ; then 874 if [[ ! -f "${jar}" ]] ; then
710 elif [[ "${jar_name}" == "${target_jar}" ]] ; then 885 elif [[ "${jar_name}" == "${target_jar}" ]] ; then
711 [[ -f "${destjar}" ]] && rm "${destjar}" 886 [[ -f "${destjar}" ]] && rm "${destjar}"
712 ln -snf "${jar}" "${destjar}" \ 887 ln -snf "${jar}" "${destjar}" \
713 || die "Failed to make symlink from ${jar} to ${destjar}" 888 || die "Failed to make symlink from ${jar} to ${destjar}"
714 [[ -z "${build_only}" ]] && java-pkg_record-jar_ "${target_pkg}" "${jar}" 889 [[ -z "${build_only}" ]] && java-pkg_record-jar_ "${target_pkg}" "${jar}"
890 popd > /dev/null
715 return 0 891 return 0
716 fi 892 fi
717 done 893 done
894 popd > /dev/null
718 # if no target was specified, we're ok 895 # if no target was specified, we're ok
719 if [[ -z "${target_jar}" ]] ; then 896 if [[ -z "${target_jar}" ]] ; then
720 return 0 897 return 0
721 # otherwise, die bitterly 898 # otherwise, die bitterly
722 else 899 else
741# The providing packages are recorded as dependencies into package.env DEPEND 918# 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 919# 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 920# that have to be present only at build time and are not needed on runtime
744# (junit testing etc). 921# (junit testing etc).
745# 922#
746# Example: Get the classpath for xerces-2, 923# Example: Get the classpath for xerces-2 and xalan,
747# java-pkg_getjars xerces-2 xalan 924# java-pkg_getjars xerces-2,xalan
748# Example Return: 925# Example Return:
749# /usr/share/xerces-2/lib/xml-apis.jar:/usr/share/xerces-2/lib/xmlParserAPIs.jar:/usr/share/xalan/lib/xalan.jar 926# /usr/share/xerces-2/lib/xml-apis.jar:/usr/share/xerces-2/lib/xmlParserAPIs.jar:/usr/share/xalan/lib/xalan.jar
750# 927#
751# @param $1 - (optional) "--build-only" makes the jar(s) not added into 928# @param $opt
752# package.env DEPEND line. 929# --build-only - makes the jar(s) not added into package.env DEPEND line.
930# (assumed automatically when called inside src_test)
931# --with-dependencies - get jars also from requested package's dependencies
932# transitively.
753# @param $@ - list of packages to get jars from 933# @param $1 - list of packages to get jars from
934# (passed to java-config --classpath)
754# ------------------------------------------------------------------------------ 935# ------------------------------------------------------------------------------
755java-pkg_getjars() { 936java-pkg_getjars() {
756 debug-print-function ${FUNCNAME} $* 937 debug-print-function ${FUNCNAME} $*
757 938
758 local build_only="" 939 local build_only=""
940 local deep=""
759 941
942 [[ "${EBUILD_PHASE}" == "test" ]] && build_only="true"
943
944 while [[ "${1}" == --* ]]; do
760 if [[ "${1}" = "--build-only" ]]; then 945 if [[ "${1}" = "--build-only" ]]; then
761 build_only="true" 946 build_only="true"
947 elif [[ "${1}" = "--with-dependencies" ]]; then
948 deep="--with-dependencies"
949 else
950 die "java-pkg_jar-from called with unknown parameter: ${1}"
951 fi
762 shift 952 shift
763 fi
764
765 [[ ${#} -lt 1 ]] && die "At least one argument needed"
766
767 # NOTE could probably just pass $@ to java-config --classpath. and return it
768 local classpath pkg
769 for pkg in ${@//,/ }; do
770 #for pkg in $(echo "$@" | tr ',' ' '); do
771 jars="$(java-config --classpath=${pkg})"
772 [[ -z "${jars}" ]] && die "java-config --classpath=${pkg} failed"
773 debug-print "${pkg}:${jars}"
774
775 if [[ -z "${classpath}" ]]; then
776 classpath="${jars}"
777 else
778 classpath="${classpath}:${jars}"
779 fi
780 # Only record jars that aren't build-only
781 [[ -z "${build_only}" ]] && java-pkg_record-jar_ "${pkg}"
782 done 953 done
954
955 [[ ${#} -ne 1 ]] && die "${FUNCNAME} takes only one argument besides --*"
956
957 local classpath pkgs="${1}"
958 jars="$(java-config ${deep} --classpath=${pkgs})"
959 [[ -z "${jars}" ]] && die "java-config --classpath=${pkgs} failed"
960 debug-print "${pkgs}:${jars}"
961
962 if [[ -z "${classpath}" ]]; then
963 classpath="${jars}"
964 else
965 classpath="${classpath}:${jars}"
966 fi
967
968 # Only record jars that aren't build-only
969 if [[ -z "${build_only}" ]]; then
970 oldifs="${IFS}"
971 IFS=","
972 for pkg in ${pkgs}; do
973 java-pkg_record-jar_ "${pkg}"
974 done
975 IFS="${oldifs}"
976 fi
977
783 echo "${classpath}" 978 echo "${classpath}"
784} 979}
785 980
786# ------------------------------------------------------------------------------ 981# ------------------------------------------------------------------------------
787# @ebuild-function java-pkg_getjar 982# @ebuild-function java-pkg_getjar
795# @example 990# @example
796# java-pkg_getjar xerces-2 xml-apis.jar 991# java-pkg_getjar xerces-2 xml-apis.jar
797# @example-return 992# @example-return
798# /usr/share/xerces-2/lib/xml-apis.jar 993# /usr/share/xerces-2/lib/xml-apis.jar
799# 994#
800# @param $1 - (optional) "--build-only" makes the jar not added into 995# @param $opt
801# package.env DEPEND line. 996# --build-only - makes the jar not added into package.env DEPEND line.
802# @param $1 - package to use 997# @param $1 - package to use
803# @param $2 - jar to get 998# @param $2 - jar to get
804# ------------------------------------------------------------------------------ 999# ------------------------------------------------------------------------------
805java-pkg_getjar() { 1000java-pkg_getjar() {
806 debug-print-function ${FUNCNAME} $* 1001 debug-print-function ${FUNCNAME} $*
807 1002
808 local build_only="" 1003 local build_only=""
809 1004
1005 [[ "${EBUILD_PHASE}" == "test" ]] && build_only="true"
1006
1007 while [[ "${1}" == --* ]]; do
810 if [[ "${1}" = "--build-only" ]]; then 1008 if [[ "${1}" = "--build-only" ]]; then
811 build_only="true" 1009 build_only="true"
1010 else
1011 die "java-pkg_jar-from called with unknown parameter: ${1}"
1012 fi
812 shift 1013 shift
813 fi 1014 done
1015
1016 [[ ${#} -ne 2 ]] && die "${FUNCNAME} takes only two arguments besides --*"
814 1017
815 local pkg="${1}" target_jar="${2}" jar 1018 local pkg="${1}" target_jar="${2}" jar
816 [[ -z ${pkg} ]] && die "Must specify package to get a jar from" 1019 [[ -z ${pkg} ]] && die "Must specify package to get a jar from"
817 [[ -z ${target_jar} ]] && die "Must specify jar to get" 1020 [[ -z ${target_jar} ]] && die "Must specify jar to get"
818 1021
960# 1163#
961# export DEPEND="${DEPEND} ${depstr}" 1164# export DEPEND="${DEPEND} ${depstr}"
962# export RDEPEND="${RDEPEND} ${depstr}" 1165# export RDEPEND="${RDEPEND} ${depstr}"
963#} 1166#}
964 1167
1168# ------------------------------------------------------------------------------
1169# @ebuild-function java-pkg_find-normal-jars
1170#
1171# Find the files with suffix .jar file in the given directory or $WORKDIR
1172#
1173# @param $1 - The directory to search for jar files (default: ${WORKDIR})
1174# ------------------------------------------------------------------------------
1175java-pkg_find-normal-jars() {
1176 local dir=$1
1177 [[ "${dir}" ]] || dir="${WORKDIR}"
1178 local found
1179 for jar in $(find "${dir}" -name "*.jar" -type f); do
1180 echo "${jar}"
1181 found="true"
1182 done
1183 [[ "${found}" ]]
1184 return $?
1185}
1186
1187# ------------------------------------------------------------------------------
1188# @ebuild-function java-pkg_ensure-no-bundled-jars
1189#
1190# Try to locate bundled jar files in ${WORKDIR} and die if found.
965# This should be used after S has been populated with symlinks to jars 1191# This function should be called after WORKDIR has been populated with symlink
966# TODO document 1192# to system jar files or bundled jars removed.
1193# ------------------------------------------------------------------------------
967java-pkg_ensure-no-bundled-jars() { 1194java-pkg_ensure-no-bundled-jars() {
968 debug-print-function ${FUNCNAME} $* 1195 debug-print-function ${FUNCNAME} $*
969 pushd ${WORKDIR} >/dev/null 2>/dev/null
970 1196
971 local bundled_jars=$(find . -name "*.jar" -type f) 1197 local bundled_jars=$(java-pkg_find-normal-jars)
972 if [[ -n ${bundled_jars} ]]; then 1198 if [[ -n ${bundled_jars} ]]; then
973 echo "Bundled jars found:" 1199 echo "Bundled jars found:"
974 local jar 1200 local jar
975 for jar in ${bundled_jars}; do 1201 for jar in ${bundled_jars}; do
976 echo $(pwd)${jar/./} 1202 echo $(pwd)${jar/./}
977 done 1203 done
978 die "Bundled jars found!" 1204 die "Bundled jars found!"
979
980 fi 1205 fi
981 popd >/dev/null 2>/dev/null
982} 1206}
983 1207
984# ------------------------------------------------------------------------------ 1208# ------------------------------------------------------------------------------
985# @internal-function java-pkg_ensure-vm-version-sufficient 1209# @internal-function java-pkg_ensure-vm-version-sufficient
986# 1210#
1135# @ebuild-function java-pkg_get-target 1359# @ebuild-function java-pkg_get-target
1136# 1360#
1137# Determines what target version should be used, for passing to -target. 1361# Determines what target version should be used, for passing to -target.
1138# If you don't care about lower versions, you can set _WANT_TARGET to the 1362# If you don't care about lower versions, you can set _WANT_TARGET to the
1139# version of your JDK. 1363# version of your JDK.
1140# Remember doing this will mostly like cause things to break.
1141# Doesn't allow it to be lower then the one in depend.
1142# Doesn't allow it to be higher then the active vm.
1143# 1364#
1144# @return string - Either the lowest possible target, or JAVA_PKG_WANT_TARGET 1365# @return string - Either the lowest possible target, or JAVA_PKG_WANT_TARGET
1145# ------------------------------------------------------------------------------ 1366# ------------------------------------------------------------------------------
1146java-pkg_get-target() { 1367java-pkg_get-target() {
1147 local min=$(depend-java-query --get-lowest "${DEPEND} ${RDEPEND}")
1148 if [[ -n "${JAVA_PKG_WANT_TARGET}" ]]; then
1149 local max="$(java-config --select-vm "${GENTOO_VM}" -g PROVIDES_VERSION)"
1150 if version_is_at_least "${min}" "${JAVA_PKG_WANT_TARGET}" && version_is_at_least "${JAVA_PKG_WANT_TARGET}" "${max}"; then
1151 echo ${JAVA_PKG_WANT_TARGET}
1152 else
1153 echo ${min}
1154 fi
1155 else
1156 echo ${min}
1157 fi
1158
1159 #echo ${JAVA_PKG_WANT_TARGET:-$(depend-java-query --get-lowest "${DEPEND}")} 1368 echo ${JAVA_PKG_WANT_TARGET:-$(depend-java-query --get-lowest "${DEPEND} ${RDEPEND}")}
1160} 1369}
1161 1370
1162java-pkg_get-javac() { 1371java-pkg_get-javac() {
1163 debug-print-function ${FUNCNAME} $* 1372 debug-print-function ${FUNCNAME} $*
1164 1373
1165 java-pkg_init-compiler_ 1374
1166 local compiler="${GENTOO_COMPILER}" 1375 local compiler="${GENTOO_COMPILER}"
1167 1376
1168 local compiler_executable 1377 local compiler_executable
1169 if [[ "${compiler}" = "javac" ]]; then 1378 if [[ "${compiler}" = "javac" ]]; then
1170 # nothing fancy needs to be done for javac 1379 # nothing fancy needs to be done for javac
1178 unset JAVAC 1387 unset JAVAC
1179 # try to get value of JAVAC 1388 # try to get value of JAVAC
1180 compiler_executable="$(source ${compiler_env} 1>/dev/null 2>&1; echo ${JAVAC})" 1389 compiler_executable="$(source ${compiler_env} 1>/dev/null 2>&1; echo ${JAVAC})"
1181 export JAVAC=${old_javac} 1390 export JAVAC=${old_javac}
1182 1391
1183 [[ -z ${compiler_executable} ]] && die "JAVAC is empty or undefined in ${compiler_env}" 1392 if [[ -z ${compiler_executable} ]]; then
1393 echo "JAVAC is empty or undefined in ${compiler_env}"
1394 return 1
1395 fi
1184 1396
1185 # check that it's executable 1397 # check that it's executable
1186 if [[ ! -x ${compiler_executable} ]]; then 1398 if [[ ! -x ${compiler_executable} ]]; then
1187 eerror "Could not find ${compiler_executable}!"
1188 die "${compiler_executable} doesn't exist, or isn't executable" 1399 echo "${compiler_executable} doesn't exist, or isn't executable"
1400 return 1
1189 fi 1401 fi
1190 else 1402 else
1191 eerror "Could not find environment file for ${compiler}" 1403 echo "Could not find environment file for ${compiler}"
1192 die "Could not find ${compiler_env}" 1404 return 1
1193 fi 1405 fi
1194 fi 1406 fi
1195 echo ${compiler_executable} 1407 echo ${compiler_executable}
1196} 1408}
1197 1409
1214 1426
1215 debug-print "want source: ${want_source}" 1427 debug-print "want source: ${want_source}"
1216 debug-print "want target: ${want_target}" 1428 debug-print "want target: ${want_target}"
1217 1429
1218 if [[ -z "${want_source}" || -z "${want_target}" ]]; then 1430 if [[ -z "${want_source}" || -z "${want_target}" ]]; then
1219 debug-print "could not find valid -source/-target values" 1431 debug-print "could not find valid -source/-target values for javac"
1220 die "Could not find valid -source/-target values" 1432 echo "Could not find valid -source/-target values for javac"
1433 return 1
1221 else 1434 else
1222 if java-pkg_is-vm-version-ge "1.4"; then 1435 if java-pkg_is-vm-version-ge "1.4"; then
1223 echo "${source_str} ${target_str}" 1436 echo "${source_str} ${target_str}"
1224 else 1437 else
1225 echo "${target_str}" 1438 echo "${target_str}"
1229 1442
1230# TODO document 1443# TODO document
1231java-pkg_get-jni-cflags() { 1444java-pkg_get-jni-cflags() {
1232 local flags="-I${JAVA_HOME}/include" 1445 local flags="-I${JAVA_HOME}/include"
1233 1446
1447 local platform="linux"
1448 use elibc_FreeBSD && platform="freebsd"
1449
1234 # TODO do a check that the directories are valid 1450 # TODO do a check that the directories are valid
1235 # TODO figure out how to cope with other things than linux...
1236 flags="${flags} -I${JAVA_HOME}/include/linux" 1451 flags="${flags} -I${JAVA_HOME}/include/${platform}"
1237 1452
1238 echo ${flags} 1453 echo ${flags}
1239} 1454}
1240 1455
1241java-pkg_ensure-gcj() { 1456java-pkg_ensure-gcj() {
1247 die "No GCJ support found!" 1462 die "No GCJ support found!"
1248 fi 1463 fi
1249} 1464}
1250 1465
1251java-pkg_ensure-test() { 1466java-pkg_ensure-test() {
1252 if hasq test ${FEATURES} && ! hasq -test ${FEATURES} && ! use test; then 1467 if hasq test ${FEATURES} && ! hasq -test ${FEATURES} \
1468 && hasq test ${IUSE} && ! use test;
1469 then
1253 eerror "You specified FEATURES=test, but USE=test is needed" 1470 eerror "You specified FEATURES=test, but USE=test is needed"
1254 eerror "to pull in the additional dependencies for testing" 1471 eerror "to pull in the additional dependencies for testing"
1255 die "Need USE=test enabled" 1472 die "Need USE=test enabled"
1256 fi 1473 fi
1257} 1474}
1258 1475
1259# ------------------------------------------------------------------------------ 1476# ------------------------------------------------------------------------------
1477# @ebuild-function java-pkg_register-ant-task
1478#
1479# Register this package as ant task, so that ant will load it when no specific
1480# ANT_TASKS are specified. Note that even without this registering, all packages
1481# specified in ANT_TASKS will be loaded. Mostly used by the actual ant tasks
1482# packages, but can be also used by other ebuilds that used to symlink their
1483# .jar into /usr/share/ant-core/lib to get autoloaded, for backwards
1484# compatibility.
1485#
1486# @param --version x.y Register only for ant version x.y (otherwise for any ant
1487# version). Used by the ant-* packages to prevent loading of mismatched
1488# ant-core ant tasks after core was updated, before the tasks are updated,
1489# without a need for blockers.
1490# @param $1 Name to register as. Defaults to JAVA_PKG_NAME ($PN[-$SLOT])
1491# ------------------------------------------------------------------------------
1492java-pkg_register-ant-task() {
1493 local TASKS_DIR="tasks"
1494
1495 # check for --version x.y parameters
1496 while [[ -n "${1}" && -n "${2}" ]]; do
1497 local var="${1#--}"
1498 local val="${2}"
1499 if [[ "${var}" == "version" ]]; then
1500 TASKS_DIR="tasks-${val}"
1501 else
1502 die "Unknown parameter passed to java-pkg_register-ant-tasks: ${1} ${2}"
1503 fi
1504 shift 2
1505 done
1506
1507 local TASK_NAME="${1:-${JAVA_PKG_NAME}}"
1508
1509 dodir /usr/share/ant/${TASKS_DIR}
1510 touch "${D}/usr/share/ant/${TASKS_DIR}/${TASK_NAME}"
1511}
1512
1513# ------------------------------------------------------------------------------
1514# @internal-function java-pkg_ant-tasks-from-deps
1515#
1516# Function to determine ANT_TASKS from DEPEND variable for backwards
1517# compatibility with ebuilds that don't set ANT_TASKS before calling eant() or
1518# WANT_ANT_TASKS before inheriting java-pkg-2. If the DEPEND string contains
1519# "dev-java/ant" or "dev-java/ant-tasks", then it returns "all", otherwise
1520# "none". It's not smart enough to cope with USE flag depends but that shouldn't
1521# be a problem, the worst it can do is activace all tasks when not needed.
1522# Note that this is called only with JAVA_PKG_STRICT=1, to find ebuilds with
1523# insufficient dependencies, otherwise all available tasks are used for
1524# backwards compatilbility.
1525#
1526# @return "all" or "none"
1527# ------------------------------------------------------------------------------
1528java-pkg_ant-tasks-from-deps() {
1529 local found_ant found_ant_tasks
1530
1531 for dep in ${DEPEND}
1532 do
1533 local ant="$(awk '/(dev-java\/ant)/ { if (match($1, "(dev-java/ant)((-[0-9])+|$)", m)) print m[1] }' <<< ${dep})"
1534 [[ "${ant}" == "dev-java/ant" ]] && found_ant=true
1535 [[ "${dep}" == *"ant-tasks"* ]] && found_ant_tasks=true
1536 done
1537
1538 if [[ -n "${found_ant}" || -n "${found_ant_tasks}" ]]; then
1539 java-pkg_announce-qa-violation "The ebuild DEPENDS on deprecated ant or ant-tasks"
1540 echo "all"
1541 else
1542 # ebuild doesn't set ANT_TASKS and doesn't depend on ant-tasks or ant
1543 # so we deactivate all tasks that may be installed
1544 echo "none"
1545 fi
1546}
1547
1548# ------------------------------------------------------------------------------
1549# @internal-function java-pkg_ant-tasks-depend
1550#
1551# Translates the WANT_ANT_TASKS variable into valid dependencies.
1552# ------------------------------------------------------------------------------
1553java-pkg_ant-tasks-depend() {
1554 debug-print-function ${FUNCNAME} ${WANT_ANT_TASKS}
1555
1556 if [[ -n "${WANT_ANT_TASKS}" ]]; then
1557 local DEP=""
1558 for i in ${WANT_ANT_TASKS}
1559 do
1560 if [[ ${i} != ant-* ]]; then
1561 echo "Invalid atom in WANT_ANT_TASKS: ${i}"
1562 return 1
1563 fi
1564 DEP="${DEP}dev-java/${i} "
1565 done
1566 echo ${DEP}
1567 return 0
1568 else
1569 return 0
1570 fi
1571}
1572
1573# ------------------------------------------------------------------------------
1260# @section-end helper 1574# @section-end helper
1261# ------------------------------------------------------------------------------ 1575# ------------------------------------------------------------------------------
1262 1576
1263# ------------------------------------------------------------------------------ 1577# ------------------------------------------------------------------------------
1264# @section-begin build 1578# @section-begin build
1270 1584
1271# ------------------------------------------------------------------------------ 1585# ------------------------------------------------------------------------------
1272# @ebuild-function eant 1586# @ebuild-function eant
1273# 1587#
1274# Ant wrapper function. Will use the appropriate compiler, based on user-defined 1588# Ant wrapper function. Will use the appropriate compiler, based on user-defined
1275# compiler. 1589# compiler. Will also set proper ANT_TASKS from the variable ANT_TASKS,
1276# 1590# variables:
1591# EANT_GENTOO_CLASSPATH - calls java-pkg_getjars for the value and adds to the
1592# gentoo.classpath property. Be sure to call
1593# java-ant_rewrite-classpath in src_unpack.
1594# *ANT_TASKS - used to determine ANT_TASKS before calling Ant.
1277# ------------------------------------------------------------------------------ 1595# ------------------------------------------------------------------------------
1278eant() { 1596eant() {
1279 debug-print-function ${FUNCNAME} $* 1597 debug-print-function ${FUNCNAME} $*
1280 1598
1281 # FIXME get this working 1599 # FIXME get this working
1282# if is-java-strict && [[ ! ${DEPEND} =~ "dev-java/ant" ]]; then 1600# if is-java-strict && [[ ! ${DEPEND} =~ "dev-java/ant" ]]; then
1283# java-pkg_announce-qa-violation \ 1601# java-pkg_announce-qa-violation \
1284# "Using eant, but not depending on dev-java/ant or dev-java/ant-core" 1602# "Using eant, but not depending on dev-java/ant or dev-java/ant-core"
1285# fi 1603# fi
1286 1604
1287 local antflags 1605 if ! hasq java-ant-2 ${INHERITED} && is-java-strict; then
1606 local msg="You should inherit java-ant-2 when using eant"
1607 java-pkg_announce-qa-violation ${msg}
1608 die ${msg}
1609 fi
1610
1611 local antflags="-Dnoget=true -Dmaven.mode.offline=true"
1612
1288 java-pkg_init-compiler_ 1613 java-pkg_init-compiler_
1289 local compiler="${GENTOO_COMPILER}" 1614 local compiler="${GENTOO_COMPILER}"
1290 1615
1291 local compiler_env="${JAVA_PKG_COMPILER_DIR}/${compiler}" 1616 local compiler_env="${JAVA_PKG_COMPILER_DIR}/${compiler}"
1292 1617
1294 if [[ "${compiler}" != "javac" && -z "${build_compiler}" ]]; then 1619 if [[ "${compiler}" != "javac" && -z "${build_compiler}" ]]; then
1295 die "ANT_BUILD_COMPILER undefined in ${compiler_env}" 1620 die "ANT_BUILD_COMPILER undefined in ${compiler_env}"
1296 fi 1621 fi
1297 1622
1298 if [[ ${compiler} != "javac" ]]; then 1623 if [[ ${compiler} != "javac" ]]; then
1299 antflags="-Dbuild.compiler=${build_compiler}" 1624 antflags="${antflags} -Dbuild.compiler=${build_compiler}"
1300 # Figure out any extra stuff to put on the classpath for compilers aside 1625 # Figure out any extra stuff to put on the classpath for compilers aside
1301 # from javac 1626 # from javac
1302 # ANT_BUILD_COMPILER_DEPS should be something that could be passed to 1627 # ANT_BUILD_COMPILER_DEPS should be something that could be passed to
1303 # java-config -p 1628 # java-config -p
1304 local build_compiler_deps="$(source ${JAVA_PKG_COMPILER_DIR}/${compiler} 1>/dev/null 2>&1; echo ${ANT_BUILD_COMPILER_DEPS})" 1629 local build_compiler_deps="$(source ${JAVA_PKG_COMPILER_DIR}/${compiler} 1>/dev/null 2>&1; echo ${ANT_BUILD_COMPILER_DEPS})"
1310 if is-java-strict; then 1635 if is-java-strict; then
1311 einfo "Disabling system classpath for ant" 1636 einfo "Disabling system classpath for ant"
1312 antflags="${antflags} -Dbuild.sysclasspath=ignore" 1637 antflags="${antflags} -Dbuild.sysclasspath=ignore"
1313 fi 1638 fi
1314 1639
1315 if [[ -n ${JAVA_PKG_DEBUG} ]]; then 1640 for arg in "${@}"; do
1316 antflags="${antflags} -debug" 1641 if [[ ${arg} = -lib ]]; then
1642 if is-java-strict; then
1643 eerror "You should not use the -lib argument to eant because it will fail"
1644 eerror "with JAVA_PKG_STRICT. Please use for example java-pkg_jar-from"
1645 eerror "or ant properties to make dependencies available."
1646 eerror "For ant tasks use WANT_ANT_TASKS or ANT_TASKS from."
1647 eerror "split ant (>=dev-java/ant-core-1.7)."
1648 die "eant -lib is deprecated/forbidden"
1649 else
1650 echo "eant -lib is deprecated. Turn JAVA_PKG_STRICT on for"
1651 echo "more info."
1652 fi
1653 fi
1654 done
1655
1656 if has_version ">=dev-java/ant-core-1.7.0"; then
1657 # default ANT_TASKS to WANT_ANT_TASKS, if ANT_TASKS is not set explicitly
1658 ANT_TASKS="${ANT_TASKS:-${WANT_ANT_TASKS}}"
1659
1660 # override ANT_TASKS with JAVA_PKG_FORCE_ANT_TASKS if it's set
1661 ANT_TASKS="${JAVA_PKG_FORCE_ANT_TASKS:-${ANT_TASKS}}"
1662
1663 if is-java-strict; then
1664 # if ant-tasks were not set by ebuild or forced, try to determine them from depends
1665 if [[ -z "${ANT_TASKS}" ]]; then
1666 ANT_TASKS="$(java-pkg_ant-tasks-from-deps)"
1667 fi
1668 else
1669 # if ant-tasks is not set by ebuild or forced, activate all of them
1670 ANT_TASKS="${ANT_TASKS:-all}"
1671 fi
1672
1673 # at this point, ANT_TASKS should be "all", "none" or explicit list
1674 if [[ "${ANT_TASKS}" == "all" ]]; then
1675 einfo "Using all available ANT_TASKS"
1676 elif [[ "${ANT_TASKS}" == "none" ]]; then
1677 einfo "Disabling all optional ANT_TASKS"
1678 else
1679 einfo "Using following ANT_TASKS: ${ANT_TASKS}"
1680 fi
1681
1682 export ANT_TASKS
1683 fi
1684
1685 [[ -n ${JAVA_PKG_DEBUG} ]] && antflags="${antflags} --execdebug -debug"
1686 [[ -n ${PORTAGE_QUIET} ]] && antflags="${antflags} -q"
1687
1688 local gcp="${EANT_GENTOO_CLASSPATH}"
1689
1690 if [[ ${EBUILD_PHASE} = "test" ]]; then
1691 antflags="${antflags} -DJunit.present=true"
1692 [[ ${gcp} && ${ANT_TASKS} = *ant-junit* ]] && gcp="${gcp} junit"
1693 fi
1694
1695 local cp
1696
1697 for atom in ${gcp}; do
1698 cp="${cp}:$(java-pkg_getjars ${atom})"
1699 done
1700
1701 if [[ ${cp} ]]; then
1702 # It seems ant does not like single quotes around ${cp}
1703 antflags="${antflags} -Dgentoo.classpath=\"${cp#:}\""
1317 fi 1704 fi
1318 1705
1319 [[ -n ${JAVA_PKG_DEBUG} ]] && echo ant ${antflags} "${@}" 1706 [[ -n ${JAVA_PKG_DEBUG} ]] && echo ant ${antflags} "${@}"
1707 debug-print "Calling ant: ${antflags} ${@}"
1320 ant ${antflags} "${@}" || die "eant failed" 1708 ant ${antflags} "${@}" || die "eant failed"
1321 1709
1322} 1710}
1323 1711
1324# ------------------------------------------------------------------------------ 1712# ------------------------------------------------------------------------------
1330# @param $@ - Arguments to be passed to the compiler 1718# @param $@ - Arguments to be passed to the compiler
1331# ------------------------------------------------------------------------------ 1719# ------------------------------------------------------------------------------
1332ejavac() { 1720ejavac() {
1333 debug-print-function ${FUNCNAME} $* 1721 debug-print-function ${FUNCNAME} $*
1334 1722
1335 # FIXME using get-javac ends up printing stuff with einfo 1723 java-pkg_init-compiler_
1724
1725 local compiler_executable
1336# local compiler_executable=$(java-pkg_get-javac) 1726 compiler_executable=$(java-pkg_get-javac)
1337 local compiler_executable="javac" 1727 if [[ ${?} != 0 ]]; then
1728 eerror "There was a problem determining compiler: ${compiler_executable}"
1729 die "get-javac failed"
1730 fi
1338 1731
1732 local javac_args
1733 javac_args="$(java-pkg_javac-args)"
1734 if [[ ${?} != 0 ]]; then
1735 eerror "There was a problem determining JAVACFLAGS: ${javac_args}"
1736 die "java-pkg_javac-args failed"
1737 fi
1738
1339 [[ -n ${JAVA_PKG_DEBUG} ]] && echo ${compiler_executable} $(java-pkg_javac-args) "${@}" 1739 [[ -n ${JAVA_PKG_DEBUG} ]] && echo ${compiler_executable} ${javac_args} "${@}"
1340 ${compiler_executable} $(java-pkg_javac-args) "${@}" || die "ejavac failed" 1740 ${compiler_executable} ${javac_args} "${@}" || die "ejavac failed"
1341} 1741}
1342 1742
1343# ------------------------------------------------------------------------------ 1743# ------------------------------------------------------------------------------
1344# @ebuild-function java-pkg_filter-compiler 1744# @ebuild-function java-pkg_filter-compiler
1345# 1745#
1383# ------------------------------------------------------------------------------ 1783# ------------------------------------------------------------------------------
1384use_doc() { 1784use_doc() {
1385 use doc && echo ${@:-javadoc} 1785 use doc && echo ${@:-javadoc}
1386} 1786}
1387 1787
1788
1388# ------------------------------------------------------------------------------ 1789# ------------------------------------------------------------------------------
1389# @section-end build 1790# @section-end build
1390# ------------------------------------------------------------------------------ 1791# ------------------------------------------------------------------------------
1391 1792
1392# ------------------------------------------------------------------------------ 1793# ------------------------------------------------------------------------------
1410# 1811#
1411# ----------------------------------------------------------------------------- 1812# -----------------------------------------------------------------------------
1412java-pkg_init() { 1813java-pkg_init() {
1413 unset JAVAC 1814 unset JAVAC
1414 unset JAVA_HOME 1815 unset JAVA_HOME
1816
1817 # People do all kinds of weird things.
1818 # http://forums.gentoo.org/viewtopic-p-3943166.html
1819 local silence="${SILENCE_JAVA_OPTIONS_WARNING}"
1820 local accept="${I_WANT_GLOBAL_JAVA_OPTIONS}"
1821 if [[ -n ${_JAVA_OPTIONS} && -z ${accept} && -z ${silence} ]]; then
1822 ewarn "_JAVA_OPTIONS changes what java -version outputs at least for"
1823 ewarn "sun-jdk vms and and as such break configure scripts that"
1824 ewarn "use it (for example app-office/openoffice) so we filter it out."
1825 ewarn "Use SILENCE_JAVA_OPTIONS_WARNING=true in the environment (use"
1826 ewarn "make.conf for example) to silence this warning or"
1827 ewarn "I_WANT_GLOBAL_JAVA_OPTIONS to not filter it."
1828 fi
1829
1830 if [[ -z ${accept} ]]; then
1831 unset _JAVA_OPTIONS
1832 # phase hooks make this run many times without this
1833 I_WANT_GLOBAL_JAVA_OPTIONS="true"
1834 fi
1835
1415 java-pkg_init_paths_ 1836 java-pkg_init_paths_
1416 java-pkg_switch-vm 1837 java-pkg_switch-vm
1417 PATH=${JAVA_HOME}/bin:${PATH} 1838 PATH=${JAVA_HOME}/bin:${PATH}
1418 1839
1419 # TODO we will probably want to set JAVAC and JAVACFLAGS 1840 # TODO we will probably want to set JAVAC and JAVACFLAGS
1424 # When users have crazy classpaths some packages can fail to compile. 1845 # When users have crazy classpaths some packages can fail to compile.
1425 # and everything should work with empty CLASSPATH. 1846 # and everything should work with empty CLASSPATH.
1426 # This also helps prevent unexpected dependencies on random things 1847 # This also helps prevent unexpected dependencies on random things
1427 # from the CLASSPATH. 1848 # from the CLASSPATH.
1428 unset CLASSPATH 1849 unset CLASSPATH
1850
1851 # Unset external ANT_ stuff
1852 unset ANT_TASKS
1853 unset ANT_OPTS
1429} 1854}
1430 1855
1431# ------------------------------------------------------------------------------ 1856# ------------------------------------------------------------------------------
1432# @function-internal java-pkg-init-compiler_ 1857# @function-internal java-pkg-init-compiler_
1433# 1858#
1577# Writes the package.env out to disk. 2002# Writes the package.env out to disk.
1578# 2003#
1579# ------------------------------------------------------------------------------ 2004# ------------------------------------------------------------------------------
1580# TODO change to do-write, to match everything else 2005# TODO change to do-write, to match everything else
1581java-pkg_do_write_() { 2006java-pkg_do_write_() {
2007 java-pkg_init_paths_
1582 # Create directory for package.env 2008 # Create directory for package.env
1583 dodir "${JAVA_PKG_SHAREPATH}" 2009 dodir "${JAVA_PKG_SHAREPATH}"
1584 if [[ -n "${JAVA_PKG_CLASSPATH}" || -n "${JAVA_PKG_LIBRARY}" || -f "${JAVA_PKG_DEPEND}" ]]; then 2010 if [[ -n "${JAVA_PKG_CLASSPATH}" || -n "${JAVA_PKG_LIBRARY}" || -f "${JAVA_PKG_DEPEND}" ]]; then
1585 # Create package.env 2011 # Create package.env
1586 ( 2012 (
1614 # Strip unnecessary leading and trailing colons 2040 # Strip unnecessary leading and trailing colons
1615 # TODO try to cleanup if possible 2041 # TODO try to cleanup if possible
1616 sed -e "s/=\":/=\"/" -e "s/:\"$/\"/" -i "${JAVA_PKG_ENV}" || die "Did you forget to call java_init ?" 2042 sed -e "s/=\":/=\"/" -e "s/:\"$/\"/" -i "${JAVA_PKG_ENV}" || die "Did you forget to call java_init ?"
1617 fi 2043 fi
1618} 2044}
1619
1620 2045
1621# ------------------------------------------------------------------------------ 2046# ------------------------------------------------------------------------------
1622# @internal-function java-pkg_record-jar_ 2047# @internal-function java-pkg_record-jar_
1623# 2048#
1624# Record a dependency to the package.env 2049# Record a dependency to the package.env
1705# ------------------------------------------------------------------------------ 2130# ------------------------------------------------------------------------------
1706java-pkg_setup-vm() { 2131java-pkg_setup-vm() {
1707 debug-print-function ${FUNCNAME} $* 2132 debug-print-function ${FUNCNAME} $*
1708 2133
1709 local vendor="$(java-pkg_get-vm-vendor)" 2134 local vendor="$(java-pkg_get-vm-vendor)"
1710 if [[ "${vendor}" == "sun" ]] && java-pkg_is-vm-version-ge 1 5; then 2135 if [[ "${vendor}" == "sun" ]] && java-pkg_is-vm-version-ge "1.5" ; then
1711 addpredict "/dev/random" 2136 addpredict "/dev/random"
1712 elif [[ "${vendor}" == "ibm" ]]; then 2137 elif [[ "${vendor}" == "ibm" ]]; then
1713 addpredict "/proc/self/maps" 2138 addpredict "/proc/self/maps"
1714 addpredict "/proc/cpuinfo" 2139 addpredict "/proc/cpuinfo"
1715 export LANG="C" LC_ALL="C" 2140 export LANG="C" LC_ALL="C"
1775# Switch VM if we're allowed to (controlled by JAVA_PKG_ALLOW_VM_CHANGE), and 2200# Switch VM if we're allowed to (controlled by JAVA_PKG_ALLOW_VM_CHANGE), and
1776# verify that the current VM is sufficient. 2201# verify that the current VM is sufficient.
1777# Setup the environment for the VM being used. 2202# Setup the environment for the VM being used.
1778# ------------------------------------------------------------------------------ 2203# ------------------------------------------------------------------------------
1779java-pkg_switch-vm() { 2204java-pkg_switch-vm() {
2205 debug-print-function ${FUNCNAME} $*
2206
1780 if java-pkg_needs-vm; then 2207 if java-pkg_needs-vm; then
1781 # Use the VM specified by JAVA_PKG_FORCE_VM 2208 # Use the VM specified by JAVA_PKG_FORCE_VM
1782 if [[ -n ${JAVA_PKG_FORCE_VM} ]]; then 2209 if [[ -n "${JAVA_PKG_FORCE_VM}" ]]; then
1783 # If you're forcing the VM, I hope you know what your doing... 2210 # If you're forcing the VM, I hope you know what your doing...
2211 debug-print "JAVA_PKG_FORCE_VM used: ${JAVA_PKG_FORCE_VM}"
1784 export GENTOO_VM="${JAVA_PKG_FORCE_VM}" 2212 export GENTOO_VM="${JAVA_PKG_FORCE_VM}"
1785 # if we're allowed to switch the vm... 2213 # if we're allowed to switch the vm...
1786 elif [[ "${JAVA_PKG_ALLOW_VM_CHANGE}" == "yes" ]]; then 2214 elif [[ "${JAVA_PKG_ALLOW_VM_CHANGE}" == "yes" ]]; then
1787 debug-print "depend-java-query: NV_DEPEND: ${JAVA_PKG_NV_DEPEND:-${DEPEND}} VNEED: ${JAVA_PKG_VNEED}" 2215 debug-print "depend-java-query: NV_DEPEND: ${JAVA_PKG_NV_DEPEND:-${DEPEND}} VNEED: ${JAVA_PKG_VNEED}"
1788 if [[ -n ${JAVA_PKG_VNEED} ]]; then 2216 if [[ -n ${JAVA_PKG_VNEED} ]]; then
1789 export GENTOO_VM="$(depend-java-query --need-virtual "${JAVA_PKG_VNEED}" --get-vm "${JAVA_PKG_NV_DEPEND:-${DEPEND}}")" 2217 GENTOO_VM="$(depend-java-query --need-virtual "${JAVA_PKG_VNEED}" --get-vm "${JAVA_PKG_NV_DEPEND:-${DEPEND}}")"
1790 else 2218 else
1791 export GENTOO_VM="$(depend-java-query --get-vm "${JAVA_PKG_NV_DEPEND:-${DEPEND}}")" 2219 GENTOO_VM="$(depend-java-query --get-vm "${JAVA_PKG_NV_DEPEND:-${DEPEND}}")"
2220 fi
2221 if [[ -z "${GENTOO_VM}" || "${GENTOO_VM}" == "None" ]]; then
2222 eerror "Unable to determine VM for building from dependencies:"
2223 echo "NV_DEPEND: ${JAVA_PKG_NV_DEPEND:-${DEPEND}}"
2224 echo "VNEED: ${JAVA_PKG_VNEED}"
2225 die "Failed to determine VM for building."
2226 else
2227 export GENTOO_VM
1792 fi 2228 fi
1793 # otherwise just make sure the current VM is sufficient 2229 # otherwise just make sure the current VM is sufficient
1794 else 2230 else
1795 java-pkg_ensure-vm-version-sufficient 2231 java-pkg_ensure-vm-version-sufficient
1796 fi 2232 fi
1798 2234
1799 java-pkg_setup-vm 2235 java-pkg_setup-vm
1800 2236
1801 export JAVA=$(java-config --java) 2237 export JAVA=$(java-config --java)
1802 export JAVAC=$(java-config --javac) 2238 export JAVAC=$(java-config --javac)
1803 export JAVACFLAGS="$(java-pkg_javac-args)" 2239 JAVACFLAGS="$(java-pkg_javac-args)"
2240 if [[ ${?} != 0 ]]; then
2241 eerror "There was a problem determining JAVACFLAGS: ${JAVACFLAGS}"
2242 die "java-pkg_javac-args failed"
2243 fi
1804 [[ -n ${JAVACFLAGS_EXTRA} ]] && export JAVACFLAGS="${JAVACFLAGS_EXTRA} ${JAVACFLAGS}" 2244 [[ -n ${JAVACFLAGS_EXTRA} ]] && JAVACFLAGS="${JAVACFLAGS_EXTRA} ${JAVACFLAGS}"
2245 export JAVACFLAGS
1805 2246
1806 export JAVA_HOME="$(java-config -g JAVA_HOME)" 2247 export JAVA_HOME="$(java-config -g JAVA_HOME)"
1807 export JDK_HOME=${JAVA_HOME} 2248 export JDK_HOME=${JAVA_HOME}
1808 2249
1809 #TODO If you know a better solution let us know. 2250 #TODO If you know a better solution let us know.
1855 einfo "Classes" 2296 einfo "Classes"
1856 find "${S}" -type f -name '*.class' -print0 | xargs -0 -r -n 500 ls -ald | sed -e "s,${WORKDIR},\${WORKDIR}," 2297 find "${S}" -type f -name '*.class' -print0 | xargs -0 -r -n 500 ls -ald | sed -e "s,${WORKDIR},\${WORKDIR},"
1857 fi 2298 fi
1858} 2299}
1859 2300
1860# TODO document 2301# ------------------------------------------------------------------------------
2302# @internal-function java-pkg_verify-classes
2303#
1861# Verify that the classes were compiled for the right source / target 2304# Verify that the classes were compiled for the right source / target. Dies if
2305# not.
2306# @param $1 (optional) - the file to check, otherwise checks whole ${D}
2307# ------------------------------------------------------------------------------
1862java-pkg_verify-classes() { 2308java-pkg_verify-classes() {
1863 ebegin "Verifying java class versions"
1864 #$(find ${D} -type f -name '*.jar' -o -name '*.class') 2309 #$(find ${D} -type f -name '*.jar' -o -name '*.class')
1865 class-version-verify.py -t $(java-pkg_get-target) -r ${D} 2310 local target=$(java-pkg_get-target)
2311 local result
2312 local log="${T}/class-version-verify.log"
2313 if [[ -n "${1}" ]]; then
2314 class-version-verify.py -v -t ${target} "${1}" > "${log}"
1866 result=$? 2315 result=$?
1867 eend ${result}
1868 if [[ ${result} == 0 ]]; then
1869 einfo "All good"
1870 else 2316 else
1871 ewarn "Possible problem" 2317 ebegin "Verifying java class versions (target: ${target})"
1872 die "Bad class files found" 2318 class-version-verify.py -v -t ${target} -r "${D}" > "${log}"
2319 result=$?
2320 eend ${result}
1873 fi 2321 fi
2322 [[ -n ${JAVA_PKG_DEBUG} ]] && cat "${log}"
2323 if [[ ${result} != 0 ]]; then
2324 eerror "Incorrect bytecode version found"
2325 [[ -n "${1}" ]] && eerror "in file: ${1}"
2326 eerror "See ${log} for more details."
2327 die "Incorrect bytecode found"
2328 fi
1874} 2329}
1875
1876 2330
1877# ------------------------------------------------------------------------------ 2331# ------------------------------------------------------------------------------
1878# @section-end internal 2332# @section-end internal
1879# ------------------------------------------------------------------------------ 2333# ------------------------------------------------------------------------------
1880 2334

Legend:
Removed from v.1.22  
changed lines
  Added in v.1.68

  ViewVC Help
Powered by ViewVC 1.1.20