/[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.20 Revision 1.80
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.80 2007/04/26 23:32:12 caster Exp $
9 10
10 11
11# ----------------------------------------------------------------------------- 12# -----------------------------------------------------------------------------
12# @eclass-begin 13# @eclass-begin
13# @eclass-shortdesc Java Utility eclass 14# @eclass-shortdesc Java Utility eclass
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 ( # dont want to pollute calling env
212 insinto "${dest}"
213 doins -r ${1}/*
214 ) || die "Installing examples failed"
215 else
216 ( # dont want to pollute calling env
217 insinto "${dest}"
218 doins -r "$@"
219 ) || die "Installing examples failed"
220 fi
221}
148 222
149# ----------------------------------------------------------------------------- 223# -----------------------------------------------------------------------------
150# @ebuild-function java-pkg_dojar 224# @ebuild-function java-pkg_dojar
151# 225#
152# Installs any number of jars. 226# Installs any number of jars.
171 # Create JARDEST if it doesn't exist 245 # Create JARDEST if it doesn't exist
172 dodir ${JAVA_PKG_JARDEST} 246 dodir ${JAVA_PKG_JARDEST}
173 247
174 local jar 248 local jar
175 # for each jar 249 # for each jar
176 for jar in "$@"; do 250 for jar in "${@}"; do
177 local jar_basename=$(basename "${jar}") 251 local jar_basename=$(basename "${jar}")
178 252
179 java-pkg_check-versioned-jar ${jar_basename} 253 java-pkg_check-versioned-jar ${jar_basename}
180 254
181 # check if it exists 255 # check if it exists
182 if [[ -e "${jar}" ]] ; then 256 if [[ -e "${jar}" ]] ; then
257 # Don't overwrite if jar has already been installed with the same
258 # name
259 local dest="${D}${JAVA_PKG_JARDEST}/${jar_basename}"
260 if [[ -e "${dest}" ]]; then
261 ewarn "Overwriting ${dest}"
262 fi
263
183 # install it into JARDEST if it's a non-symlink 264 # install it into JARDEST if it's a non-symlink
184 if [[ ! -L "${jar}" ]] ; then 265 if [[ ! -L "${jar}" ]] ; then
266 #but first check class version when in strict mode.
267 is-java-strict && java-pkg_verify-classes "${jar}"
268
185 INSDESTTREE="${JAVA_PKG_JARDEST}" \ 269 INSDESTTREE="${JAVA_PKG_JARDEST}" \
186 doins "${jar}" || die "failed to install ${jar}" 270 doins "${jar}" || die "failed to install ${jar}"
187 java-pkg_append_ JAVA_PKG_CLASSPATH "${JAVA_PKG_JARDEST}/${jar_basename}" 271 java-pkg_append_ JAVA_PKG_CLASSPATH "${JAVA_PKG_JARDEST}/${jar_basename}"
188 debug-print "installed ${jar} to ${D}${JAVA_PKG_JARDEST}" 272 debug-print "installed ${jar} to ${D}${JAVA_PKG_JARDEST}"
189 # make a symlink to the original jar if it's symlink 273 # make a symlink to the original jar if it's symlink
200 284
201 java-pkg_do_write_ 285 java-pkg_do_write_
202} 286}
203 287
204 288
289# ------------------------------------------------------------------------------
290# @internal-function depend-java-query
291#
292# Wrapper for the depend-java-query binary to enable passing USE in env.
293# Using env variables keeps this eclass working with java-config versions that
294# do not handle use flags.
295# ------------------------------------------------------------------------------
296
297depend-java-query() {
298 # Used to have a which call here but it caused endless loops for some people
299 # that had some weird bashrc voodoo for which.
300 USE="${USE}" /usr/bin/depend-java-query "${@}"
301}
205 302
206# ------------------------------------------------------------------------------ 303# ------------------------------------------------------------------------------
207# @ebuild-function java-pkg_regjar 304# @ebuild-function java-pkg_regjar
208# 305#
209# Records an already installed jar in the package.env 306# Records an already installed jar in the package.env
240 [[ ${#} -lt 1 ]] && die "at least one argument needed" 337 [[ ${#} -lt 1 ]] && die "at least one argument needed"
241 338
242 java-pkg_init_paths_ 339 java-pkg_init_paths_
243 340
244 local jar jar_dir jar_file 341 local jar jar_dir jar_file
245 for jar in "$@"; do 342 for jar in "${@}"; do
246 # TODO use java-pkg_check-versioned-jar 343 # TODO use java-pkg_check-versioned-jar
247 if [[ -e "${jar}" ]]; then 344 if [[ -e "${jar}" || -e "${D}${jar}" ]]; then
345 [[ -d "${jar}" || -d "${D}${jar}" ]] \
346 && die "Called ${FUNCNAME} on a directory $*"
347
348 #check that class version correct when in strict mode
349 is-java-strict && java-pkg_verify-classes "${jar}"
350
248 # nelchael: we should strip ${D} in this case too, here's why: 351 # nelchael: we should strip ${D} in this case too, here's why:
249 # imagine such call: 352 # imagine such call:
250 # java-pkg_regjar ${D}/opt/java/*.jar 353 # java-pkg_regjar ${D}/opt/java/*.jar
251 # such call will fall into this case (-e ${jar}) and will 354 # such call will fall into this case (-e ${jar}) and will
252 # record paths with ${D} in package.env 355 # record paths with ${D} in package.env
253 java-pkg_append_ JAVA_PKG_CLASSPATH "${jar#${D}}" 356 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 357 else
358 if [[ ${jar} = *\** ]]; then
359 eerror "The argument ${jar} to ${FUNCNAME}"
360 eerror "has * in it. If you want it to glob in"
361 eerror '${D} add ${D} to the argument.'
362 fi
257 die "${jar} does not exist" 363 die "${jar} does not exist"
258 fi 364 fi
259 done 365 done
260 366
261 java-pkg_do_write_ 367 java-pkg_do_write_
262} 368}
263
264 369
265# ------------------------------------------------------------------------------ 370# ------------------------------------------------------------------------------
266# @ebuild-function java-pkg_newjar 371# @ebuild-function java-pkg_newjar
267# 372#
268# Installs a jar with a new name 373# Installs a jar with a new name
279 local original_jar="${1}" 384 local original_jar="${1}"
280 local new_jar="${2:-${PN}.jar}" 385 local new_jar="${2:-${PN}.jar}"
281 local new_jar_dest="${T}/${new_jar}" 386 local new_jar_dest="${T}/${new_jar}"
282 387
283 [[ -z ${original_jar} ]] && die "Must specify a jar to install" 388 [[ -z ${original_jar} ]] && die "Must specify a jar to install"
284 [[ ! -f ${original_jar} ]] && die "${original_jar} does not exist!" 389 [[ ! -f ${original_jar} ]] \
390 && die "${original_jar} does not exist or is not a file!"
285 391
286 rm -f "${new_jar_dest}" || die "Failed to remove ${new_jar_dest}" 392 rm -f "${new_jar_dest}" || die "Failed to remove ${new_jar_dest}"
287 cp "${original_jar}" "${new_jar_dest}" \ 393 cp "${original_jar}" "${new_jar_dest}" \
288 || die "Failed to copy ${original_jar} to ${new_jar_dest}" 394 || die "Failed to copy ${original_jar} to ${new_jar_dest}"
289 java-pkg_dojar "${new_jar_dest}" 395 java-pkg_dojar "${new_jar_dest}"
290} 396}
291 397
292
293# ------------------------------------------------------------------------------ 398# ------------------------------------------------------------------------------
294# @ebuild-function java-pkg_addcp 399# @ebuild-function java-pkg_addcp
295# 400#
296# Add something to the package's classpath. For jars, you should use dojar, 401# 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. 402# newjar, or regjar. This is typically used to add directories to the classpath.
301# ------------------------------------------------------------------------------ 406# ------------------------------------------------------------------------------
302java-pkg_addcp() { 407java-pkg_addcp() {
303 java-pkg_append_ JAVA_PKG_CLASSPATH "${@}" 408 java-pkg_append_ JAVA_PKG_CLASSPATH "${@}"
304 java-pkg_do_write_ 409 java-pkg_do_write_
305} 410}
306
307 411
308# ------------------------------------------------------------------------------ 412# ------------------------------------------------------------------------------
309# @ebuild-function java-pkg_doso 413# @ebuild-function java-pkg_doso
310# 414#
311# Installs any number of JNI libraries 415# Installs any number of JNI libraries
340 java-pkg_append_ JAVA_PKG_LIBRARY "${JAVA_PKG_LIBDEST}" 444 java-pkg_append_ JAVA_PKG_LIBRARY "${JAVA_PKG_LIBDEST}"
341 debug-print "Installing ${lib} to ${JAVA_PKG_LIBDEST}" 445 debug-print "Installing ${lib} to ${JAVA_PKG_LIBDEST}"
342 # otherwise make a symlink to the symlink's origin 446 # otherwise make a symlink to the symlink's origin
343 else 447 else
344 # TODO use dosym 448 # TODO use dosym
449 ln -s "$(readlink "${lib}")" \
345 ln -s "$(readlink "${lib}")" "${D}${JAVA_PKG_LIBDEST}/$(basename "${lib}")" 450 "${D}${JAVA_PKG_LIBDEST}/$(basename "${lib}")"
346 debug-print "${lib} is a symlink, linking accordanly" 451 debug-print "${lib} is a symlink, linking accordanly"
347 fi 452 fi
348 # otherwise die 453 # otherwise die
349 else 454 else
350 die "${lib} does not exist" 455 die "${lib} does not exist"
428# ------------------------------------------------------------------------------ 533# ------------------------------------------------------------------------------
429java-pkg_dohtml() { 534java-pkg_dohtml() {
430 debug-print-function ${FUNCNAME} $* 535 debug-print-function ${FUNCNAME} $*
431 536
432 [[ ${#} -lt 1 ]] && die "At least one argument required for ${FUNCNAME}" 537 [[ ${#} -lt 1 ]] && die "At least one argument required for ${FUNCNAME}"
433 # TODO-nichoj find out what exactly -f package-list does 538
539 # from /usr/lib/portage/bin/dohtml -h
540 # -f Set list of allowed extensionless file names.
434 dohtml -f package-list "$@" 541 dohtml -f package-list "$@"
542
435 # this probably shouldn't be here but it provides 543 # this probably shouldn't be here but it provides
436 # a reasonable way to catch # docs for all of the 544 # a reasonable way to catch # docs for all of the
437 # old ebuilds. 545 # old ebuilds.
438 java-pkg_recordjavadoc 546 java-pkg_recordjavadoc
439} 547}
440 548
441# TODO document 549# ------------------------------------------------------------------------------
550# @ebuild-function java-pkg_dojavadoc
551#
552# Installs javadoc documentation. This should be controlled by the doc use flag.
553#
554# @param $1: - The javadoc root directory.
555#
556# @example:
557# java-pkg_dojavadoc docs/api
558#
559# ------------------------------------------------------------------------------
442java-pkg_dojavadoc() { 560java-pkg_dojavadoc() {
561 debug-print-function ${FUNCNAME} $*
443 local dir="$1" 562 local dir="$1"
563
564 # QA checks
444 565
445 java-pkg_check-phase install 566 java-pkg_check-phase install
446 567
447 [[ -z "${dir}" ]] && die "Must specify a directory!" 568 [[ -z "${dir}" ]] && die "Must specify a directory!"
448 [[ ! -d "${dir}" ]] && die "${dir} does not exist, or isn't a directory!" 569 [[ ! -d "${dir}" ]] && die "${dir} does not exist, or isn't a directory!"
570 if [[ ! -e "${dir}/index.html" ]]; then
571 local msg="No index.html in javadoc directory"
572 ewarn "${msg}"
573 is-java-strict && die "${msg}"
574 fi
575
576 # Renaming to match our directory layout
449 577
450 local dir_to_install="${dir}" 578 local dir_to_install="${dir}"
451 if [[ "$(basename "${dir}")" != "api" ]]; then 579 if [[ "$(basename "${dir}")" != "api" ]]; then
452 dir_to_install="${T}/api" 580 dir_to_install="${T}/api"
453 # TODO use doins 581 # TODO use doins
454 cp -r "${dir}" "${dir_to_install}" || die "cp failed" 582 cp -r "${dir}" "${dir_to_install}" || die "cp failed"
455 fi 583 fi
584
585 # Actual installation
456 586
457 java-pkg_dohtml -r ${dir_to_install} 587 java-pkg_dohtml -r ${dir_to_install}
458} 588}
459 589
460# ------------------------------------------------------------------------------ 590# ------------------------------------------------------------------------------
478# FIXME apparently this fails if you give it an empty directories 608# FIXME apparently this fails if you give it an empty directories
479java-pkg_dosrc() { 609java-pkg_dosrc() {
480 debug-print-function ${FUNCNAME} $* 610 debug-print-function ${FUNCNAME} $*
481 611
482 [ ${#} -lt 1 ] && die "At least one argument needed" 612 [ ${#} -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 613
487 java-pkg_check-phase install 614 java-pkg_check-phase install
488 615
489 [[ ${#} -lt 1 ]] && die "At least one argument needed" 616 [[ ${#} -lt 1 ]] && die "At least one argument needed"
617
618 if ! [[ ${DEPEND} = *app-arch/zip* ]]; then
619 local msg="${FUNCNAME} called without app-arch/zip in DEPEND"
620 if is-java-strict; then
621 eerror "${msg}"
622 die "${msg}"
623 else
624 echo "${msg}"
625 echo "Please report this to http://bugs.gentoo.org."
626 fi
627 fi
490 628
491 java-pkg_init_paths_ 629 java-pkg_init_paths_
492 630
493 local zip_name="${PN}-src.zip" 631 local zip_name="${PN}-src.zip"
494 local zip_path="${T}/${zip_name}" 632 local zip_path="${T}/${zip_name}"
495 local dir 633 local dir
496 for dir in ${@}; do 634 for dir in "${@}"; do
497 local dir_parent=$(dirname "${dir}") 635 local dir_parent=$(dirname "${dir}")
498 local dir_name=$(basename "${dir}") 636 local dir_name=$(basename "${dir}")
499 pushd ${dir_parent} > /dev/null || die "problem entering ${dir_parent}" 637 pushd ${dir_parent} > /dev/null || die "problem entering ${dir_parent}"
500 zip -q -r ${zip_path} ${dir_name} -i '*.java' 638 zip -q -r ${zip_path} ${dir_name} -i '*.java'
501 local result=$? 639 local result=$?
518# @ebuild-function java-pkg_dolauncher 656# @ebuild-function java-pkg_dolauncher
519# 657#
520# Make a wrapper script to lauch/start this package 658# Make a wrapper script to lauch/start this package
521# If necessary, the wrapper will switch to the appropriate VM. 659# If necessary, the wrapper will switch to the appropriate VM.
522# 660#
661# Can be called without parameters if the package installs only one jar
662# that has the Main-class attribute set. The wrapper will be named ${PN}.
663#
523# @param $1 - filename of launcher to create 664# @param $1 - filename of launcher to create
524# @param $2 - options, as follows: 665# @param $2 - options, as follows:
525# --main the.main.class.too.start 666# --main the.main.class.too.start
526# --jar /the/jar/too/launch.jar 667# --jar /the/jar/too/launch.jar or just <name>.jar
527# --java_args 'Extra arguments to pass to java' 668# --java_args 'Extra arguments to pass to java'
528# --pkg_args 'Extra arguments too pass to the package' 669# --pkg_args 'Extra arguments to pass to the package'
529# --pwd 670# --pwd Directory the launcher changes to before executing java
530# -into 671# -into Directory to install the launcher to, instead of /usr/bin
531# -pre 672# -pre Prepend contents of this file to the launcher
532# ------------------------------------------------------------------------------ 673# ------------------------------------------------------------------------------
533java-pkg_dolauncher() { 674java-pkg_dolauncher() {
534 debug-print-function ${FUNCNAME} $* 675 debug-print-function ${FUNCNAME} $*
535 676
536 java-pkg_check-phase install 677 java-pkg_check-phase install
537
538 [[ ${#} -lt 1 ]] && die "Need at least one argument"
539
540 java-pkg_init_paths_ 678 java-pkg_init_paths_
541 679
680 if [[ ${#} = 0 ]]; then
681 local name="${PN}"
682 else
542 local name="${1}" 683 local name="${1}"
684 shift
685 fi
686
543 # TODO rename to launcher 687 # TODO rename to launcher
544 local target="${T}/${name}" 688 local target="${T}/${name}"
545 local var_tmp="${T}/launcher_variables_tmp" 689 local var_tmp="${T}/launcher_variables_tmp"
546 local target_dir pre 690 local target_dir pre
547 shift
548 691
549 # Process the other the rest of the arguments 692 # Process the other the rest of the arguments
550 while [[ -n "${1}" && -n "${2}" ]]; do 693 while [[ -n "${1}" && -n "${2}" ]]; do
551 local var=${1} value=${2} 694 local var="${1}" value="${2}"
552 if [[ "${var:0:2}" == "--" ]]; then 695 if [[ "${var:0:2}" == "--" ]]; then
696 local var=${var:2}
553 echo "gjl_${var:2}=\"${value}\"" >> "${var_tmp}" 697 echo "gjl_${var}=\"${value}\"" >> "${var_tmp}"
698 local gjl_${var}="${value}"
554 elif [[ "${var}" == "-into" ]]; then 699 elif [[ "${var}" == "-into" ]]; then
555 target_dir="${value}" 700 target_dir="${value}"
556 elif [[ "${var}" == "-pre" ]]; then 701 elif [[ "${var}" == "-pre" ]]; then
557 pre="${value}" 702 pre="${value}"
558 fi 703 fi
559 shift 2 704 shift 2
560 done 705 done
561 706
707 # Test if no --jar and --main arguments were given and
708 # in that case check if the package only installs one jar
709 # and use that jar.
710 if [[ -z "${gjl_jar}" && -z "${gjl_main}" ]]; then
711 local cp="${JAVA_PKG_CLASSPATH}"
712 if [[ "${cp/:}" = "${cp}" && "${cp%.jar}" != "${cp}" ]]; then
713 echo "gjl_jar=\"${JAVA_PKG_CLASSPATH}\"" >> "${var_tmp}"
714 else
715 local msg="Not enough information to create a launcher given."
716 msg="${msg} Please give --jar or --main argument to ${FUNCNAME}."
717 die "${msg}"
718 fi
719 fi
720
562 # Write the actual script 721 # Write the actual script
563 echo "#!/bin/bash" > "${target}" 722 echo "#!/bin/bash" > "${target}"
564 [[ -n "${pre}" ]] && [[ -f "${pre}" ]] && cat "${pre}" >> "${target}" 723 if [[ -n "${pre}" ]]; then
724 if [[ -f "${pre}" ]]; then
725 cat "${pre}" >> "${target}"
726 else
727 die "-pre specified file '${pre}' does not exist"
728 fi
729 fi
565 echo "gjl_package=${JAVA_PKG_NAME}" >> "${target}" 730 echo "gjl_package=${JAVA_PKG_NAME}" >> "${target}"
566 cat "${var_tmp}" >> "${target}" 731 cat "${var_tmp}" >> "${target}"
732 rm -f "${var_tmp}"
567 echo "source /usr/share/java-config-2/launcher/launcher.bash" >> "${target}" 733 echo "source /usr/share/java-config-2/launcher/launcher.bash" >> "${target}"
568 734
569 if [[ -n "${target_dir}" ]]; then 735 if [[ -n "${target_dir}" ]]; then
570 DESTTREE="${target_dir}" dobin "${target}" 736 DESTTREE="${target_dir}" dobin "${target}"
571 local ret=$? 737 local ret=$?
660# Example: get a specific jar from xerces slot 2, and name it diffrently 826# Example: get a specific jar from xerces slot 2, and name it diffrently
661# java-pkg_jar-from xerces-2 xml-apis.jar xml.jar 827# java-pkg_jar-from xerces-2 xml-apis.jar xml.jar
662# Example: get junit.jar which is needed only for building 828# Example: get junit.jar which is needed only for building
663# java-pkg_jar-from --build-only junit junit.jar 829# java-pkg_jar-from --build-only junit junit.jar
664# 830#
665# @param $1 - (optional) "--build-only" makes the jar(s) not added into 831# @param $opt
666# package.env DEPEND line. 832# --build-only - makes the jar(s) not added into package.env DEPEND line.
667# @param $1 - Package to get jars from. 833# (assumed automatically when called inside src_test)
834# --with-dependencies - get jars also from requested package's dependencies
835# transitively.
836# --into $dir - symlink jar(s) into $dir (must exist) instead of .
837# @param $1 - Package to get jars from, or comma-separated list of packages in
838# case other parameters are not used.
668# @param $2 - jar from package. If not specified, all jars will be used. 839# @param $2 - jar from package. If not specified, all jars will be used.
669# @param $3 - When a single jar is specified, destination filename of the 840# @param $3 - When a single jar is specified, destination filename of the
670# symlink. Defaults to the name of the jar. 841# symlink. Defaults to the name of the jar.
671# ------------------------------------------------------------------------------ 842# ------------------------------------------------------------------------------
672# TODO could probably be cleaned up a little 843# TODO could probably be cleaned up a little
673java-pkg_jar-from() { 844java-pkg_jar-from() {
674 debug-print-function ${FUNCNAME} $* 845 debug-print-function ${FUNCNAME} $*
675 846
676 local build_only="" 847 local build_only=""
848 local destdir="."
849 local deep=""
677 850
851 [[ "${EBUILD_PHASE}" == "test" ]] && build_only="build"
852
853 while [[ "${1}" == --* ]]; do
678 if [[ "${1}" = "--build-only" ]]; then 854 if [[ "${1}" = "--build-only" ]]; then
679 build_only="true" 855 build_only="build"
856 elif [[ "${1}" = "--with-dependencies" ]]; then
857 deep="--with-dependencies"
858 elif [[ "${1}" = "--into" ]]; then
859 destdir="${2}"
860 shift
861 else
862 die "java-pkg_jar-from called with unknown parameter: ${1}"
863 fi
680 shift 864 shift
681 fi 865 done
682 866
683 local target_pkg="${1}" target_jar="${2}" destjar="${3}" 867 local target_pkg="${1}" target_jar="${2}" destjar="${3}"
684 868
685 [[ -z ${target_pkg} ]] && die "Must specify a package" 869 [[ -z ${target_pkg} ]] && die "Must specify a package"
686 870
687 # default destjar to the target jar 871 # default destjar to the target jar
688 [[ -z "${destjar}" ]] && destjar="${target_jar}" 872 [[ -z "${destjar}" ]] && destjar="${target_jar}"
689 873
690 local error_msg="There was a problem getting the classpath for ${target_pkg}." 874 local error_msg="There was a problem getting the classpath for ${target_pkg}."
691 local classpath 875 local classpath
692 classpath="$(java-config --classpath=${target_pkg})" 876 classpath="$(java-config ${deep} --classpath=${target_pkg})"
693 [[ $? != 0 ]] && die ${error_msg} 877 [[ $? != 0 ]] && die ${error_msg}
878
879 # When we have commas this functions is called to bring jars from multiple
880 # packages. This affects recording of dependencencies performed later
881 # which expects one package only, so we do it here.
882 if [[ ${target_pkg} = *,* ]]; then
883 for pkg in ${target_pkg//,/ }; do
884 java-pkg_ensure-dep "${build_only}" "${pkg}"
885 [[ -z "${build_only}" ]] && java-pkg_record-jar_ "${pkg}"
886 done
887 # setting this disables further record-jar_ calls later
888 build_only="build"
889 else
890 java-pkg_ensure-dep "${build_only}" "${target_pkg}"
891 fi
892
893 pushd ${destdir} > /dev/null \
894 || die "failed to change directory to ${destdir}"
694 895
695 local jar 896 local jar
696 for jar in ${classpath//:/ }; do 897 for jar in ${classpath//:/ }; do
697 local jar_name=$(basename "${jar}") 898 local jar_name=$(basename "${jar}")
698 if [[ ! -f "${jar}" ]] ; then 899 if [[ ! -f "${jar}" ]] ; then
709 elif [[ "${jar_name}" == "${target_jar}" ]] ; then 910 elif [[ "${jar_name}" == "${target_jar}" ]] ; then
710 [[ -f "${destjar}" ]] && rm "${destjar}" 911 [[ -f "${destjar}" ]] && rm "${destjar}"
711 ln -snf "${jar}" "${destjar}" \ 912 ln -snf "${jar}" "${destjar}" \
712 || die "Failed to make symlink from ${jar} to ${destjar}" 913 || die "Failed to make symlink from ${jar} to ${destjar}"
713 [[ -z "${build_only}" ]] && java-pkg_record-jar_ "${target_pkg}" "${jar}" 914 [[ -z "${build_only}" ]] && java-pkg_record-jar_ "${target_pkg}" "${jar}"
915 popd > /dev/null
714 return 0 916 return 0
715 fi 917 fi
716 done 918 done
919 popd > /dev/null
717 # if no target was specified, we're ok 920 # if no target was specified, we're ok
718 if [[ -z "${target_jar}" ]] ; then 921 if [[ -z "${target_jar}" ]] ; then
719 return 0 922 return 0
720 # otherwise, die bitterly 923 # otherwise, die bitterly
721 else 924 else
740# The providing packages are recorded as dependencies into package.env DEPEND 943# The providing packages are recorded as dependencies into package.env DEPEND
741# line, unless "--build-only" is passed as the very first argument, for jars 944# line, unless "--build-only" is passed as the very first argument, for jars
742# that have to be present only at build time and are not needed on runtime 945# that have to be present only at build time and are not needed on runtime
743# (junit testing etc). 946# (junit testing etc).
744# 947#
745# Example: Get the classpath for xerces-2, 948# Example: Get the classpath for xerces-2 and xalan,
746# java-pkg_getjars xerces-2 xalan 949# java-pkg_getjars xerces-2,xalan
747# Example Return: 950# Example Return:
748# /usr/share/xerces-2/lib/xml-apis.jar:/usr/share/xerces-2/lib/xmlParserAPIs.jar:/usr/share/xalan/lib/xalan.jar 951# /usr/share/xerces-2/lib/xml-apis.jar:/usr/share/xerces-2/lib/xmlParserAPIs.jar:/usr/share/xalan/lib/xalan.jar
749# 952#
750# @param $1 - (optional) "--build-only" makes the jar(s) not added into 953# @param $opt
751# package.env DEPEND line. 954# --build-only - makes the jar(s) not added into package.env DEPEND line.
955# (assumed automatically when called inside src_test)
956# --with-dependencies - get jars also from requested package's dependencies
957# transitively.
752# @param $@ - list of packages to get jars from 958# @param $1 - list of packages to get jars from
959# (passed to java-config --classpath)
753# ------------------------------------------------------------------------------ 960# ------------------------------------------------------------------------------
754java-pkg_getjars() { 961java-pkg_getjars() {
755 debug-print-function ${FUNCNAME} $* 962 debug-print-function ${FUNCNAME} $*
756 963
757 local build_only="" 964 local build_only=""
965 local deep=""
758 966
967 [[ "${EBUILD_PHASE}" == "test" ]] && build_only="build"
968
969 while [[ "${1}" == --* ]]; do
759 if [[ "${1}" = "--build-only" ]]; then 970 if [[ "${1}" = "--build-only" ]]; then
760 build_only="true" 971 build_only="build"
972 elif [[ "${1}" = "--with-dependencies" ]]; then
973 deep="--with-dependencies"
974 else
975 die "java-pkg_jar-from called with unknown parameter: ${1}"
976 fi
761 shift 977 shift
762 fi
763
764 [[ ${#} -lt 1 ]] && die "At least one argument needed"
765
766 # NOTE could probably just pass $@ to java-config --classpath. and return it
767 local classpath pkg
768 for pkg in ${@//,/ }; do
769 #for pkg in $(echo "$@" | tr ',' ' '); do
770 jars="$(java-config --classpath=${pkg})"
771 [[ -z "${jars}" ]] && die "java-config --classpath=${pkg} failed"
772 debug-print "${pkg}:${jars}"
773
774 if [[ -z "${classpath}" ]]; then
775 classpath="${jars}"
776 else
777 classpath="${classpath}:${jars}"
778 fi
779 # Only record jars that aren't build-only
780 [[ -z "${build_only}" ]] && java-pkg_record-jar_ "${pkg}"
781 done 978 done
979
980 [[ ${#} -ne 1 ]] && die "${FUNCNAME} takes only one argument besides --*"
981
982
983 local classpath pkgs="${1}"
984 jars="$(java-config ${deep} --classpath=${pkgs})"
985 [[ $? != 0 || -z "${jars}" ]] && die "java-config --classpath=${pkgs} failed"
986 debug-print "${pkgs}:${jars}"
987
988 for pkg in ${pkgs//,/ }; do
989 java-pkg_ensure-dep "${build_only}" "${pkg}"
990 done
991
992 if [[ -z "${classpath}" ]]; then
993 classpath="${jars}"
994 else
995 classpath="${classpath}:${jars}"
996 fi
997
998 # Only record jars that aren't build-only
999 if [[ -z "${build_only}" ]]; then
1000 for pkg in ${pkgs//:/ }; do
1001 java-pkg_record-jar_ "${pkg}"
1002 done
1003 fi
1004
782 echo "${classpath}" 1005 echo "${classpath}"
783} 1006}
784 1007
785# ------------------------------------------------------------------------------ 1008# ------------------------------------------------------------------------------
786# @ebuild-function java-pkg_getjar 1009# @ebuild-function java-pkg_getjar
794# @example 1017# @example
795# java-pkg_getjar xerces-2 xml-apis.jar 1018# java-pkg_getjar xerces-2 xml-apis.jar
796# @example-return 1019# @example-return
797# /usr/share/xerces-2/lib/xml-apis.jar 1020# /usr/share/xerces-2/lib/xml-apis.jar
798# 1021#
799# @param $1 - (optional) "--build-only" makes the jar not added into 1022# @param $opt
800# package.env DEPEND line. 1023# --build-only - makes the jar not added into package.env DEPEND line.
801# @param $1 - package to use 1024# @param $1 - package to use
802# @param $2 - jar to get 1025# @param $2 - jar to get
803# ------------------------------------------------------------------------------ 1026# ------------------------------------------------------------------------------
804java-pkg_getjar() { 1027java-pkg_getjar() {
805 debug-print-function ${FUNCNAME} $* 1028 debug-print-function ${FUNCNAME} $*
806 1029
807 local build_only="" 1030 local build_only=""
808 1031
1032 [[ "${EBUILD_PHASE}" == "test" ]] && build_only="build"
1033
1034 while [[ "${1}" == --* ]]; do
809 if [[ "${1}" = "--build-only" ]]; then 1035 if [[ "${1}" = "--build-only" ]]; then
810 build_only="true" 1036 build_only="build"
1037 else
1038 die "java-pkg_jar-from called with unknown parameter: ${1}"
1039 fi
811 shift 1040 shift
812 fi 1041 done
1042
1043 [[ ${#} -ne 2 ]] && die "${FUNCNAME} takes only two arguments besides --*"
813 1044
814 local pkg="${1}" target_jar="${2}" jar 1045 local pkg="${1}" target_jar="${2}" jar
815 [[ -z ${pkg} ]] && die "Must specify package to get a jar from" 1046 [[ -z ${pkg} ]] && die "Must specify package to get a jar from"
816 [[ -z ${target_jar} ]] && die "Must specify jar to get" 1047 [[ -z ${target_jar} ]] && die "Must specify jar to get"
817 1048
818 local error_msg="Could not find classpath for ${pkg}. Are you sure its installed?" 1049 local error_msg="Could not find classpath for ${pkg}. Are you sure its installed?"
819 local classpath 1050 local classpath
820 classpath=$(java-config --classpath=${pkg}) 1051 classpath=$(java-config --classpath=${pkg})
821 [[ $? != 0 ]] && die ${error_msg} 1052 [[ $? != 0 ]] && die ${error_msg}
1053
1054 java-pkg_ensure-dep "${build_only}" "${pkg}"
822 1055
823 for jar in ${classpath//:/ }; do 1056 for jar in ${classpath//:/ }; do
824 if [[ ! -f "${jar}" ]] ; then 1057 if [[ ! -f "${jar}" ]] ; then
825 die "Installation problem with jar ${jar} in ${pkg} - is it installed?" 1058 die "Installation problem with jar ${jar} in ${pkg} - is it installed?"
826 fi 1059 fi
833 fi 1066 fi
834 done 1067 done
835 1068
836 die "Could not find ${target_jar} in ${pkg}" 1069 die "Could not find ${target_jar} in ${pkg}"
837 return 1 1070 return 1
1071}
1072
1073# ------------------------------------------------------------------------------
1074# @ebuild-function java-pkg_register-dependency
1075#
1076# Registers runtime dependency on a package, list of packages, or a single jar
1077# from a package, into package.env DEPEND line. Can only be called in
1078# src_install phase.
1079# Intended for binary packages where you don't need to symlink the jars or get
1080# their classpath during build. As such, the dependencies only need to be
1081# specified in ebuild's RDEPEND, and should be omitted in DEPEND.
1082# Get the classpath provided by any number of packages.
1083#
1084# @param $1 - comma-separated list of packages, or a single package
1085# @param $2 - if param $1 is a single package, optionally specify the jar
1086# to depend on
1087#
1088# Example: Record the dependency on whole xerces-2 and xalan,
1089# java-pkg_register-dependency xerces-2,xalan
1090# Example: Record the dependency on ant.jar from ant-core
1091# java-pkg_register-dependency ant-core ant.jar
1092#
1093# Note: Passing both list of packages as the first parameter AND specifying the
1094# jar as the second is not allowed and will cause the function to die. We assume
1095# that there's more chance one passes such combination as a mistake, than that
1096# there are more packages providing identically named jar without class
1097# collisions.
1098# ------------------------------------------------------------------------------
1099java-pkg_register-dependency() {
1100 debug-print-function ${FUNCNAME} $*
1101
1102 java-pkg_check-phase install
1103
1104 [[ ${#} -gt 2 ]] && die "${FUNCNAME} takes at most two arguments"
1105
1106 local pkgs="${1}"
1107 local jar="${2}"
1108
1109 [[ -z "${pkgs}" ]] && die "${FUNCNAME} called with no package(s) specified"
1110
1111 if [[ -z "${jar}" ]]; then
1112 for pkg in ${pkgs//,/ }; do
1113 java-pkg_ensure-dep runtime "${pkg}"
1114 java-pkg_record-jar_ "${pkg}"
1115 done
1116 else
1117 [[ ${pkgs} == *,* ]] && \
1118 die "${FUNCNAME} called with both package list and jar name"
1119 java-pkg_ensure-dep runtime "${pkgs}"
1120 java-pkg_record-jar_ "${pkgs}" "${jar}"
1121 fi
1122
1123 java-pkg_do_write_
838} 1124}
839 1125
840# This function reads stdin, and based on that input, figures out how to 1126# This function reads stdin, and based on that input, figures out how to
841# populate jars from the filesystem. 1127# populate jars from the filesystem.
842# Need to figure out a good way of making use of this, ie be able to use a 1128# Need to figure out a good way of making use of this, ie be able to use a
959# 1245#
960# export DEPEND="${DEPEND} ${depstr}" 1246# export DEPEND="${DEPEND} ${depstr}"
961# export RDEPEND="${RDEPEND} ${depstr}" 1247# export RDEPEND="${RDEPEND} ${depstr}"
962#} 1248#}
963 1249
1250# ------------------------------------------------------------------------------
1251# @ebuild-function java-pkg_find-normal-jars
1252#
1253# Find the files with suffix .jar file in the given directory or $WORKDIR
1254#
1255# @param $1 - The directory to search for jar files (default: ${WORKDIR})
1256# ------------------------------------------------------------------------------
1257java-pkg_find-normal-jars() {
1258 local dir=$1
1259 [[ "${dir}" ]] || dir="${WORKDIR}"
1260 local found
1261 for jar in $(find "${dir}" -name "*.jar" -type f); do
1262 echo "${jar}"
1263 found="true"
1264 done
1265 [[ "${found}" ]]
1266 return $?
1267}
1268
1269# ------------------------------------------------------------------------------
1270# @ebuild-function java-pkg_ensure-no-bundled-jars
1271#
1272# Try to locate bundled jar files in ${WORKDIR} and die if found.
964# This should be used after S has been populated with symlinks to jars 1273# This function should be called after WORKDIR has been populated with symlink
965# TODO document 1274# to system jar files or bundled jars removed.
1275# ------------------------------------------------------------------------------
966java-pkg_ensure-no-bundled-jars() { 1276java-pkg_ensure-no-bundled-jars() {
967 debug-print-function ${FUNCNAME} $* 1277 debug-print-function ${FUNCNAME} $*
968 pushd ${WORKDIR} >/dev/null 2>/dev/null
969 1278
970 local bundled_jars=$(find . -name "*.jar" -type f) 1279 local bundled_jars=$(java-pkg_find-normal-jars)
971 if [[ -n ${bundled_jars} ]]; then 1280 if [[ -n ${bundled_jars} ]]; then
972 echo "Bundled jars found:" 1281 echo "Bundled jars found:"
973 local jar 1282 local jar
974 for jar in ${bundled_jars}; do 1283 for jar in ${bundled_jars}; do
975 echo $(pwd)${jar/./} 1284 echo $(pwd)${jar/./}
976 done 1285 done
977 die "Bundled jars found!" 1286 die "Bundled jars found!"
978
979 fi 1287 fi
980 popd >/dev/null 2>/dev/null
981} 1288}
982 1289
983# ------------------------------------------------------------------------------ 1290# ------------------------------------------------------------------------------
984# @internal-function java-pkg_ensure-vm-version-sufficient 1291# @internal-function java-pkg_ensure-vm-version-sufficient
985# 1292#
1134# @ebuild-function java-pkg_get-target 1441# @ebuild-function java-pkg_get-target
1135# 1442#
1136# Determines what target version should be used, for passing to -target. 1443# Determines what target version should be used, for passing to -target.
1137# If you don't care about lower versions, you can set _WANT_TARGET to the 1444# If you don't care about lower versions, you can set _WANT_TARGET to the
1138# version of your JDK. 1445# version of your JDK.
1139# Remember doing this will mostly like cause things to break.
1140# Doesn't allow it to be lower then the one in depend.
1141# Doesn't allow it to be higher then the active vm.
1142# 1446#
1143# @return string - Either the lowest possible target, or JAVA_PKG_WANT_TARGET 1447# @return string - Either the lowest possible target, or JAVA_PKG_WANT_TARGET
1144# ------------------------------------------------------------------------------ 1448# ------------------------------------------------------------------------------
1145java-pkg_get-target() { 1449java-pkg_get-target() {
1146 local min=$(depend-java-query --get-lowest "${DEPEND} ${RDEPEND}")
1147 if [[ -n "${JAVA_PKG_WANT_TARGET}" ]]; then
1148 local max="$(java-config --select-vm "${GENTOO_VM}" -g PROVIDES_VERSION)"
1149 if version_is_at_least "${min}" "${JAVA_PKG_WANT_TARGET}" && version_is_at_least "${JAVA_PKG_WANT_TARGET}" "${max}"; then
1150 echo ${JAVA_PKG_WANT_TARGET}
1151 else
1152 echo ${min}
1153 fi
1154 else
1155 echo ${min}
1156 fi
1157
1158 #echo ${JAVA_PKG_WANT_TARGET:-$(depend-java-query --get-lowest "${DEPEND}")} 1450 echo ${JAVA_PKG_WANT_TARGET:-$(depend-java-query --get-lowest "${DEPEND} ${RDEPEND}")}
1159} 1451}
1160 1452
1161java-pkg_get-javac() { 1453java-pkg_get-javac() {
1162 debug-print-function ${FUNCNAME} $* 1454 debug-print-function ${FUNCNAME} $*
1163 1455
1164 java-pkg_init-compiler_ 1456
1165 local compiler="${GENTOO_COMPILER}" 1457 local compiler="${GENTOO_COMPILER}"
1166 1458
1167 local compiler_executable 1459 local compiler_executable
1168 if [[ "${compiler}" = "javac" ]]; then 1460 if [[ "${compiler}" = "javac" ]]; then
1169 # nothing fancy needs to be done for javac 1461 # nothing fancy needs to be done for javac
1177 unset JAVAC 1469 unset JAVAC
1178 # try to get value of JAVAC 1470 # try to get value of JAVAC
1179 compiler_executable="$(source ${compiler_env} 1>/dev/null 2>&1; echo ${JAVAC})" 1471 compiler_executable="$(source ${compiler_env} 1>/dev/null 2>&1; echo ${JAVAC})"
1180 export JAVAC=${old_javac} 1472 export JAVAC=${old_javac}
1181 1473
1182 [[ -z ${compiler_executable} ]] && die "JAVAC is empty or undefined in ${compiler_env}" 1474 if [[ -z ${compiler_executable} ]]; then
1475 echo "JAVAC is empty or undefined in ${compiler_env}"
1476 return 1
1477 fi
1183 1478
1184 # check that it's executable 1479 # check that it's executable
1185 if [[ ! -x ${compiler_executable} ]]; then 1480 if [[ ! -x ${compiler_executable} ]]; then
1186 eerror "Could not find ${compiler_executable}!"
1187 die "${compiler_executable} doesn't exist, or isn't executable" 1481 echo "${compiler_executable} doesn't exist, or isn't executable"
1482 return 1
1188 fi 1483 fi
1189 else 1484 else
1190 eerror "Could not find environment file for ${compiler}" 1485 echo "Could not find environment file for ${compiler}"
1191 die "Could not find ${compiler_env}" 1486 return 1
1192 fi 1487 fi
1193 fi 1488 fi
1194 echo ${compiler_executable} 1489 echo ${compiler_executable}
1195} 1490}
1196 1491
1213 1508
1214 debug-print "want source: ${want_source}" 1509 debug-print "want source: ${want_source}"
1215 debug-print "want target: ${want_target}" 1510 debug-print "want target: ${want_target}"
1216 1511
1217 if [[ -z "${want_source}" || -z "${want_target}" ]]; then 1512 if [[ -z "${want_source}" || -z "${want_target}" ]]; then
1218 debug-print "could not find valid -source/-target values" 1513 debug-print "could not find valid -source/-target values for javac"
1219 die "Could not find valid -source/-target values" 1514 echo "Could not find valid -source/-target values for javac"
1515 return 1
1220 else 1516 else
1221 if java-pkg_is-vm-version-ge "1.4"; then 1517 if java-pkg_is-vm-version-ge "1.4"; then
1222 echo "${source_str} ${target_str}" 1518 echo "${source_str} ${target_str}"
1223 else 1519 else
1224 echo "${target_str}" 1520 echo "${target_str}"
1228 1524
1229# TODO document 1525# TODO document
1230java-pkg_get-jni-cflags() { 1526java-pkg_get-jni-cflags() {
1231 local flags="-I${JAVA_HOME}/include" 1527 local flags="-I${JAVA_HOME}/include"
1232 1528
1529 local platform="linux"
1530 use elibc_FreeBSD && platform="freebsd"
1531
1233 # TODO do a check that the directories are valid 1532 # TODO do a check that the directories are valid
1234 # TODO figure out how to cope with other things than linux...
1235 flags="${flags} -I${JAVA_HOME}/include/linux" 1533 flags="${flags} -I${JAVA_HOME}/include/${platform}"
1236 1534
1237 echo ${flags} 1535 echo ${flags}
1238} 1536}
1239 1537
1240java-pkg_ensure-gcj() { 1538java-pkg_ensure-gcj() {
1246 die "No GCJ support found!" 1544 die "No GCJ support found!"
1247 fi 1545 fi
1248} 1546}
1249 1547
1250java-pkg_ensure-test() { 1548java-pkg_ensure-test() {
1251 if hasq test ${FEATURES} && ! hasq -test ${FEATURES} && ! use test; then 1549 if hasq test ${FEATURES} && ! hasq -test ${FEATURES} \
1550 && hasq test ${IUSE} && ! use test;
1551 then
1252 eerror "You specified FEATURES=test, but USE=test is needed" 1552 eerror "You specified FEATURES=test, but USE=test is needed"
1253 eerror "to pull in the additional dependencies for testing" 1553 eerror "to pull in the additional dependencies for testing"
1254 die "Need USE=test enabled" 1554 die "Need USE=test enabled"
1255 fi 1555 fi
1256} 1556}
1257 1557
1258# ------------------------------------------------------------------------------ 1558# ------------------------------------------------------------------------------
1559# @ebuild-function java-pkg_register-ant-task
1560#
1561# Register this package as ant task, so that ant will load it when no specific
1562# ANT_TASKS are specified. Note that even without this registering, all packages
1563# specified in ANT_TASKS will be loaded. Mostly used by the actual ant tasks
1564# packages, but can be also used by other ebuilds that used to symlink their
1565# .jar into /usr/share/ant-core/lib to get autoloaded, for backwards
1566# compatibility.
1567#
1568# @param --version x.y Register only for ant version x.y (otherwise for any ant
1569# version). Used by the ant-* packages to prevent loading of mismatched
1570# ant-core ant tasks after core was updated, before the tasks are updated,
1571# without a need for blockers.
1572# @param $1 Name to register as. Defaults to JAVA_PKG_NAME ($PN[-$SLOT])
1573# ------------------------------------------------------------------------------
1574java-pkg_register-ant-task() {
1575 local TASKS_DIR="tasks"
1576
1577 # check for --version x.y parameters
1578 while [[ -n "${1}" && -n "${2}" ]]; do
1579 local var="${1#--}"
1580 local val="${2}"
1581 if [[ "${var}" == "version" ]]; then
1582 TASKS_DIR="tasks-${val}"
1583 else
1584 die "Unknown parameter passed to java-pkg_register-ant-tasks: ${1} ${2}"
1585 fi
1586 shift 2
1587 done
1588
1589 local TASK_NAME="${1:-${JAVA_PKG_NAME}}"
1590
1591 dodir /usr/share/ant/${TASKS_DIR}
1592 touch "${D}/usr/share/ant/${TASKS_DIR}/${TASK_NAME}"
1593}
1594
1595# ------------------------------------------------------------------------------
1596# @internal-function java-pkg_ant-tasks-from-deps
1597#
1598# Function to determine ANT_TASKS from DEPEND variable for backwards
1599# compatibility with ebuilds that don't set ANT_TASKS before calling eant() or
1600# WANT_ANT_TASKS before inheriting java-pkg-2. If the DEPEND string contains
1601# "dev-java/ant" or "dev-java/ant-tasks", then it returns "all", otherwise
1602# "none". It's not smart enough to cope with USE flag depends but that shouldn't
1603# be a problem, the worst it can do is activace all tasks when not needed.
1604# Note that this is called only with JAVA_PKG_STRICT=1, to find ebuilds with
1605# insufficient dependencies, otherwise all available tasks are used for
1606# backwards compatilbility.
1607#
1608# @return "all" or "none"
1609# ------------------------------------------------------------------------------
1610java-pkg_ant-tasks-from-deps() {
1611 local found_ant found_ant_tasks
1612
1613 for dep in ${DEPEND}
1614 do
1615 local ant="$(awk '/(dev-java\/ant)/ { if (match($1, "(dev-java/ant)((-[0-9])+|$)", m)) print m[1] }' <<< ${dep})"
1616 [[ "${ant}" == "dev-java/ant" ]] && found_ant=true
1617 [[ "${dep}" == *"ant-tasks"* ]] && found_ant_tasks=true
1618 done
1619
1620 if [[ -n "${found_ant}" || -n "${found_ant_tasks}" ]]; then
1621 java-pkg_announce-qa-violation "The ebuild DEPENDS on deprecated ant or ant-tasks"
1622 echo "all"
1623 else
1624 # ebuild doesn't set ANT_TASKS and doesn't depend on ant-tasks or ant
1625 # so we deactivate all tasks that may be installed
1626 echo "none"
1627 fi
1628}
1629
1630# ------------------------------------------------------------------------------
1631# @internal-function java-pkg_ant-tasks-depend
1632#
1633# Translates the WANT_ANT_TASKS variable into valid dependencies.
1634# ------------------------------------------------------------------------------
1635java-pkg_ant-tasks-depend() {
1636 debug-print-function ${FUNCNAME} ${WANT_ANT_TASKS}
1637
1638 if [[ -n "${WANT_ANT_TASKS}" ]]; then
1639 local DEP=""
1640 for i in ${WANT_ANT_TASKS}
1641 do
1642 if [[ ${i} != ant-* ]]; then
1643 echo "Invalid atom in WANT_ANT_TASKS: ${i}"
1644 return 1
1645 fi
1646 DEP="${DEP}dev-java/${i} "
1647 done
1648 echo ${DEP}
1649 return 0
1650 else
1651 return 0
1652 fi
1653}
1654
1655# ------------------------------------------------------------------------------
1259# @section-end helper 1656# @section-end helper
1260# ------------------------------------------------------------------------------ 1657# ------------------------------------------------------------------------------
1261 1658
1262# ------------------------------------------------------------------------------ 1659# ------------------------------------------------------------------------------
1263# @section-begin build 1660# @section-begin build
1269 1666
1270# ------------------------------------------------------------------------------ 1667# ------------------------------------------------------------------------------
1271# @ebuild-function eant 1668# @ebuild-function eant
1272# 1669#
1273# Ant wrapper function. Will use the appropriate compiler, based on user-defined 1670# Ant wrapper function. Will use the appropriate compiler, based on user-defined
1274# compiler. 1671# compiler. Will also set proper ANT_TASKS from the variable ANT_TASKS,
1275# 1672# variables:
1673# EANT_GENTOO_CLASSPATH - calls java-pkg_getjars for the value and adds to the
1674# gentoo.classpath property. Be sure to call
1675# java-ant_rewrite-classpath in src_unpack.
1676# *ANT_TASKS - used to determine ANT_TASKS before calling Ant.
1276# ------------------------------------------------------------------------------ 1677# ------------------------------------------------------------------------------
1277eant() { 1678eant() {
1278 debug-print-function ${FUNCNAME} $* 1679 debug-print-function ${FUNCNAME} $*
1279 1680
1280 # FIXME get this working 1681 # FIXME get this working
1281# if is-java-strict && [[ ! ${DEPEND} =~ "dev-java/ant" ]]; then 1682# if is-java-strict && [[ ! ${DEPEND} =~ "dev-java/ant" ]]; then
1282# java-pkg_announce-qa-violation \ 1683# java-pkg_announce-qa-violation \
1283# "Using eant, but not depending on dev-java/ant or dev-java/ant-core" 1684# "Using eant, but not depending on dev-java/ant or dev-java/ant-core"
1284# fi 1685# fi
1285 1686
1286 local antflags 1687 if ! hasq java-ant-2 ${INHERITED} && is-java-strict; then
1688 local msg="You should inherit java-ant-2 when using eant"
1689 java-pkg_announce-qa-violation ${msg}
1690 die ${msg}
1691 fi
1692
1693 local antflags="-Dnoget=true -Dmaven.mode.offline=true"
1694
1287 java-pkg_init-compiler_ 1695 java-pkg_init-compiler_
1288 local compiler="${GENTOO_COMPILER}" 1696 local compiler="${GENTOO_COMPILER}"
1289 1697
1290 local compiler_env="${JAVA_PKG_COMPILER_DIR}/${compiler}" 1698 local compiler_env="${JAVA_PKG_COMPILER_DIR}/${compiler}"
1291 1699
1293 if [[ "${compiler}" != "javac" && -z "${build_compiler}" ]]; then 1701 if [[ "${compiler}" != "javac" && -z "${build_compiler}" ]]; then
1294 die "ANT_BUILD_COMPILER undefined in ${compiler_env}" 1702 die "ANT_BUILD_COMPILER undefined in ${compiler_env}"
1295 fi 1703 fi
1296 1704
1297 if [[ ${compiler} != "javac" ]]; then 1705 if [[ ${compiler} != "javac" ]]; then
1298 antflags="-Dbuild.compiler=${build_compiler}" 1706 antflags="${antflags} -Dbuild.compiler=${build_compiler}"
1299 # Figure out any extra stuff to put on the classpath for compilers aside 1707 # Figure out any extra stuff to put on the classpath for compilers aside
1300 # from javac 1708 # from javac
1301 # ANT_BUILD_COMPILER_DEPS should be something that could be passed to 1709 # ANT_BUILD_COMPILER_DEPS should be something that could be passed to
1302 # java-config -p 1710 # java-config -p
1303 local build_compiler_deps="$(source ${JAVA_PKG_COMPILER_DIR}/${compiler} 1>/dev/null 2>&1; echo ${ANT_BUILD_COMPILER_DEPS})" 1711 local build_compiler_deps="$(source ${JAVA_PKG_COMPILER_DIR}/${compiler} 1>/dev/null 2>&1; echo ${ANT_BUILD_COMPILER_DEPS})"
1309 if is-java-strict; then 1717 if is-java-strict; then
1310 einfo "Disabling system classpath for ant" 1718 einfo "Disabling system classpath for ant"
1311 antflags="${antflags} -Dbuild.sysclasspath=ignore" 1719 antflags="${antflags} -Dbuild.sysclasspath=ignore"
1312 fi 1720 fi
1313 1721
1314 if [[ -n ${JAVA_PKG_DEBUG} ]]; then 1722 for arg in "${@}"; do
1315 antflags="${antflags} -debug" 1723 if [[ ${arg} = -lib ]]; then
1724 if is-java-strict; then
1725 eerror "You should not use the -lib argument to eant because it will fail"
1726 eerror "with JAVA_PKG_STRICT. Please use for example java-pkg_jar-from"
1727 eerror "or ant properties to make dependencies available."
1728 eerror "For ant tasks use WANT_ANT_TASKS or ANT_TASKS from."
1729 eerror "split ant (>=dev-java/ant-core-1.7)."
1730 die "eant -lib is deprecated/forbidden"
1731 else
1732 echo "eant -lib is deprecated. Turn JAVA_PKG_STRICT on for"
1733 echo "more info."
1734 fi
1735 fi
1736 done
1737
1738 if has_version ">=dev-java/ant-core-1.7.0"; then
1739 # default ANT_TASKS to WANT_ANT_TASKS, if ANT_TASKS is not set explicitly
1740 ANT_TASKS="${ANT_TASKS:-${WANT_ANT_TASKS}}"
1741
1742 # override ANT_TASKS with JAVA_PKG_FORCE_ANT_TASKS if it's set
1743 ANT_TASKS="${JAVA_PKG_FORCE_ANT_TASKS:-${ANT_TASKS}}"
1744
1745 if is-java-strict; then
1746 # if ant-tasks were not set by ebuild or forced, try to determine them from depends
1747 if [[ -z "${ANT_TASKS}" ]]; then
1748 ANT_TASKS="$(java-pkg_ant-tasks-from-deps)"
1749 fi
1750 else
1751 # if ant-tasks is not set by ebuild or forced, activate all of them
1752 ANT_TASKS="${ANT_TASKS:-all}"
1753 fi
1754
1755 # at this point, ANT_TASKS should be "all", "none" or explicit list
1756 if [[ "${ANT_TASKS}" == "all" ]]; then
1757 einfo "Using all available ANT_TASKS"
1758 elif [[ "${ANT_TASKS}" == "none" ]]; then
1759 einfo "Disabling all optional ANT_TASKS"
1760 else
1761 einfo "Using following ANT_TASKS: ${ANT_TASKS}"
1762 fi
1763
1764 export ANT_TASKS
1765 fi
1766
1767 [[ -n ${JAVA_PKG_DEBUG} ]] && antflags="${antflags} --execdebug -debug"
1768 [[ -n ${PORTAGE_QUIET} ]] && antflags="${antflags} -q"
1769
1770 local gcp="${EANT_GENTOO_CLASSPATH}"
1771 local getjarsarg=""
1772
1773 if [[ ${EBUILD_PHASE} = "test" ]]; then
1774 antflags="${antflags} -DJunit.present=true"
1775 [[ ${gcp} && ${ANT_TASKS} = *ant-junit* ]] && gcp="${gcp} junit"
1776 getjarsarg="--with-dependencies"
1777 fi
1778
1779 local cp
1780
1781 for atom in ${gcp}; do
1782 cp="${cp}:$(java-pkg_getjars ${getjarsarg} ${atom})"
1783 done
1784
1785 if [[ ${cp} ]]; then
1786 # It seems ant does not like single quotes around ${cp}
1787 antflags="${antflags} -Dgentoo.classpath=\"${cp#:}\""
1316 fi 1788 fi
1317 1789
1318 [[ -n ${JAVA_PKG_DEBUG} ]] && echo ant ${antflags} "${@}" 1790 [[ -n ${JAVA_PKG_DEBUG} ]] && echo ant ${antflags} "${@}"
1791 debug-print "Calling ant (GENTOO_VM: ${GENTOO_VM}): ${antflags} ${@}"
1319 ant ${antflags} "${@}" || die "eant failed" 1792 ant ${antflags} "${@}" || die "eant failed"
1320
1321} 1793}
1322 1794
1323# ------------------------------------------------------------------------------ 1795# ------------------------------------------------------------------------------
1324# @ebuild-function ejavac 1796# @ebuild-function ejavac
1325# 1797#
1329# @param $@ - Arguments to be passed to the compiler 1801# @param $@ - Arguments to be passed to the compiler
1330# ------------------------------------------------------------------------------ 1802# ------------------------------------------------------------------------------
1331ejavac() { 1803ejavac() {
1332 debug-print-function ${FUNCNAME} $* 1804 debug-print-function ${FUNCNAME} $*
1333 1805
1334 # FIXME using get-javac ends up printing stuff with einfo 1806 java-pkg_init-compiler_
1807
1808 local compiler_executable
1335# local compiler_executable=$(java-pkg_get-javac) 1809 compiler_executable=$(java-pkg_get-javac)
1336 local compiler_executable="javac" 1810 if [[ ${?} != 0 ]]; then
1811 eerror "There was a problem determining compiler: ${compiler_executable}"
1812 die "get-javac failed"
1813 fi
1337 1814
1815 local javac_args
1816 javac_args="$(java-pkg_javac-args)"
1817 if [[ ${?} != 0 ]]; then
1818 eerror "There was a problem determining JAVACFLAGS: ${javac_args}"
1819 die "java-pkg_javac-args failed"
1820 fi
1821
1338 [[ -n ${JAVA_PKG_DEBUG} ]] && echo ${compiler_executable} $(java-pkg_javac-args) "${@}" 1822 [[ -n ${JAVA_PKG_DEBUG} ]] && echo ${compiler_executable} ${javac_args} "${@}"
1339 ${compiler_executable} $(java-pkg_javac-args) "${@}" || die "ejavac failed" 1823 ${compiler_executable} ${javac_args} "${@}" || die "ejavac failed"
1340} 1824}
1341 1825
1342# ------------------------------------------------------------------------------ 1826# ------------------------------------------------------------------------------
1343# @ebuild-function java-pkg_filter-compiler 1827# @ebuild-function java-pkg_filter-compiler
1344# 1828#
1382# ------------------------------------------------------------------------------ 1866# ------------------------------------------------------------------------------
1383use_doc() { 1867use_doc() {
1384 use doc && echo ${@:-javadoc} 1868 use doc && echo ${@:-javadoc}
1385} 1869}
1386 1870
1871
1387# ------------------------------------------------------------------------------ 1872# ------------------------------------------------------------------------------
1388# @section-end build 1873# @section-end build
1389# ------------------------------------------------------------------------------ 1874# ------------------------------------------------------------------------------
1390 1875
1391# ------------------------------------------------------------------------------ 1876# ------------------------------------------------------------------------------
1409# 1894#
1410# ----------------------------------------------------------------------------- 1895# -----------------------------------------------------------------------------
1411java-pkg_init() { 1896java-pkg_init() {
1412 unset JAVAC 1897 unset JAVAC
1413 unset JAVA_HOME 1898 unset JAVA_HOME
1899
1900 # People do all kinds of weird things.
1901 # http://forums.gentoo.org/viewtopic-p-3943166.html
1902 local silence="${SILENCE_JAVA_OPTIONS_WARNING}"
1903 local accept="${I_WANT_GLOBAL_JAVA_OPTIONS}"
1904 if [[ -n ${_JAVA_OPTIONS} && -z ${accept} && -z ${silence} ]]; then
1905 ewarn "_JAVA_OPTIONS changes what java -version outputs at least for"
1906 ewarn "sun-jdk vms and and as such break configure scripts that"
1907 ewarn "use it (for example app-office/openoffice) so we filter it out."
1908 ewarn "Use SILENCE_JAVA_OPTIONS_WARNING=true in the environment (use"
1909 ewarn "make.conf for example) to silence this warning or"
1910 ewarn "I_WANT_GLOBAL_JAVA_OPTIONS to not filter it."
1911 fi
1912
1913 if [[ -z ${accept} ]]; then
1914 unset _JAVA_OPTIONS
1915 # phase hooks make this run many times without this
1916 I_WANT_GLOBAL_JAVA_OPTIONS="true"
1917 fi
1918
1414 java-pkg_init_paths_ 1919 java-pkg_init_paths_
1415 java-pkg_switch-vm 1920 java-pkg_switch-vm
1416 PATH=${JAVA_HOME}/bin:${PATH} 1921 PATH=${JAVA_HOME}/bin:${PATH}
1417 1922
1418 # TODO we will probably want to set JAVAC and JAVACFLAGS 1923 # TODO we will probably want to set JAVAC and JAVACFLAGS
1423 # When users have crazy classpaths some packages can fail to compile. 1928 # When users have crazy classpaths some packages can fail to compile.
1424 # and everything should work with empty CLASSPATH. 1929 # and everything should work with empty CLASSPATH.
1425 # This also helps prevent unexpected dependencies on random things 1930 # This also helps prevent unexpected dependencies on random things
1426 # from the CLASSPATH. 1931 # from the CLASSPATH.
1427 unset CLASSPATH 1932 unset CLASSPATH
1933
1934 # Unset external ANT_ stuff
1935 unset ANT_TASKS
1936 unset ANT_OPTS
1428} 1937}
1429 1938
1430# ------------------------------------------------------------------------------ 1939# ------------------------------------------------------------------------------
1431# @function-internal java-pkg-init-compiler_ 1940# @function-internal java-pkg-init-compiler_
1432# 1941#
1576# Writes the package.env out to disk. 2085# Writes the package.env out to disk.
1577# 2086#
1578# ------------------------------------------------------------------------------ 2087# ------------------------------------------------------------------------------
1579# TODO change to do-write, to match everything else 2088# TODO change to do-write, to match everything else
1580java-pkg_do_write_() { 2089java-pkg_do_write_() {
2090 java-pkg_init_paths_
1581 # Create directory for package.env 2091 # Create directory for package.env
1582 dodir "${JAVA_PKG_SHAREPATH}" 2092 dodir "${JAVA_PKG_SHAREPATH}"
1583 if [[ -n "${JAVA_PKG_CLASSPATH}" || -n "${JAVA_PKG_LIBRARY}" || -f "${JAVA_PKG_DEPEND}" ]]; then 2093 if [[ -n "${JAVA_PKG_CLASSPATH}" || -n "${JAVA_PKG_LIBRARY}" || -f "${JAVA_PKG_DEPEND}" ]]; then
1584 # Create package.env 2094 # Create package.env
1585 ( 2095 (
1613 # Strip unnecessary leading and trailing colons 2123 # Strip unnecessary leading and trailing colons
1614 # TODO try to cleanup if possible 2124 # TODO try to cleanup if possible
1615 sed -e "s/=\":/=\"/" -e "s/:\"$/\"/" -i "${JAVA_PKG_ENV}" || die "Did you forget to call java_init ?" 2125 sed -e "s/=\":/=\"/" -e "s/:\"$/\"/" -i "${JAVA_PKG_ENV}" || die "Did you forget to call java_init ?"
1616 fi 2126 fi
1617} 2127}
1618
1619 2128
1620# ------------------------------------------------------------------------------ 2129# ------------------------------------------------------------------------------
1621# @internal-function java-pkg_record-jar_ 2130# @internal-function java-pkg_record-jar_
1622# 2131#
1623# Record a dependency to the package.env 2132# Record a dependency to the package.env
1704# ------------------------------------------------------------------------------ 2213# ------------------------------------------------------------------------------
1705java-pkg_setup-vm() { 2214java-pkg_setup-vm() {
1706 debug-print-function ${FUNCNAME} $* 2215 debug-print-function ${FUNCNAME} $*
1707 2216
1708 local vendor="$(java-pkg_get-vm-vendor)" 2217 local vendor="$(java-pkg_get-vm-vendor)"
1709 if [[ "${vendor}" == "sun" ]] && java-pkg_is-vm-version-ge 1 5; then 2218 if [[ "${vendor}" == "sun" ]] && java-pkg_is-vm-version-ge "1.5" ; then
1710 addpredict "/dev/random" 2219 addpredict "/dev/random"
1711 elif [[ "${vendor}" == "ibm" ]]; then 2220 elif [[ "${vendor}" == "ibm" ]]; then
1712 addpredict "/proc/self/maps" 2221 addpredict "/proc/self/maps"
1713 addpredict "/proc/cpuinfo" 2222 addpredict "/proc/cpuinfo"
1714 export LANG="C" LC_ALL="C" 2223 export LANG="C" LC_ALL="C"
1763# @return - The version of the current VM 2272# @return - The version of the current VM
1764# ------------------------------------------------------------------------------ 2273# ------------------------------------------------------------------------------
1765java-pkg_get-vm-version() { 2274java-pkg_get-vm-version() {
1766 debug-print-function ${FUNCNAME} $* 2275 debug-print-function ${FUNCNAME} $*
1767 2276
1768 java-pkg_get-current-vm | sed -e "s/.*-\([0-9.]\+\).*/\1/" 2277 java-config -g PROVIDES_VERSION
1769} 2278}
1770 2279
1771# ------------------------------------------------------------------------------ 2280# ------------------------------------------------------------------------------
1772# @internal-function java-pkg_switch-vm 2281# @internal-function java-pkg_switch-vm
1773# 2282#
1774# Switch VM if we're allowed to (controlled by JAVA_PKG_ALLOW_VM_CHANGE), and 2283# Switch VM if we're allowed to (controlled by JAVA_PKG_ALLOW_VM_CHANGE), and
1775# verify that the current VM is sufficient. 2284# verify that the current VM is sufficient.
1776# Setup the environment for the VM being used. 2285# Setup the environment for the VM being used.
1777# ------------------------------------------------------------------------------ 2286# ------------------------------------------------------------------------------
1778java-pkg_switch-vm() { 2287java-pkg_switch-vm() {
2288 debug-print-function ${FUNCNAME} $*
2289
1779 if java-pkg_needs-vm; then 2290 if java-pkg_needs-vm; then
1780 # Use the VM specified by JAVA_PKG_FORCE_VM 2291 # Use the VM specified by JAVA_PKG_FORCE_VM
1781 if [[ -n ${JAVA_PKG_FORCE_VM} ]]; then 2292 if [[ -n "${JAVA_PKG_FORCE_VM}" ]]; then
1782 # If you're forcing the VM, I hope you know what your doing... 2293 # If you're forcing the VM, I hope you know what your doing...
2294 debug-print "JAVA_PKG_FORCE_VM used: ${JAVA_PKG_FORCE_VM}"
1783 export GENTOO_VM="${JAVA_PKG_FORCE_VM}" 2295 export GENTOO_VM="${JAVA_PKG_FORCE_VM}"
1784 # if we're allowed to switch the vm... 2296 # if we're allowed to switch the vm...
1785 elif [[ "${JAVA_PKG_ALLOW_VM_CHANGE}" == "yes" ]]; then 2297 elif [[ "${JAVA_PKG_ALLOW_VM_CHANGE}" == "yes" ]]; then
1786 debug-print "depend-java-query: NV_DEPEND: ${JAVA_PKG_NV_DEPEND:-${DEPEND}} VNEED: ${JAVA_PKG_VNEED}" 2298 debug-print "depend-java-query: NV_DEPEND: ${JAVA_PKG_NV_DEPEND:-${DEPEND}} VNEED: ${JAVA_PKG_VNEED}"
1787 if [[ -n ${JAVA_PKG_VNEED} ]]; then 2299 if [[ -n ${JAVA_PKG_VNEED} ]]; then
1788 export GENTOO_VM="$(depend-java-query --need-virtual "${JAVA_PKG_VNEED}" --get-vm "${JAVA_PKG_NV_DEPEND:-${DEPEND}}")" 2300 GENTOO_VM="$(depend-java-query --need-virtual "${JAVA_PKG_VNEED}" --get-vm "${JAVA_PKG_NV_DEPEND:-${DEPEND}}")"
1789 else 2301 else
1790 export GENTOO_VM="$(depend-java-query --get-vm "${JAVA_PKG_NV_DEPEND:-${DEPEND}}")" 2302 GENTOO_VM="$(depend-java-query --get-vm "${JAVA_PKG_NV_DEPEND:-${DEPEND}}")"
2303 fi
2304 if [[ -z "${GENTOO_VM}" || "${GENTOO_VM}" == "None" ]]; then
2305 eerror "Unable to determine VM for building from dependencies:"
2306 echo "NV_DEPEND: ${JAVA_PKG_NV_DEPEND:-${DEPEND}}"
2307 echo "VNEED: ${JAVA_PKG_VNEED}"
2308 die "Failed to determine VM for building."
2309 else
2310 export GENTOO_VM
1791 fi 2311 fi
1792 # otherwise just make sure the current VM is sufficient 2312 # otherwise just make sure the current VM is sufficient
1793 else 2313 else
1794 java-pkg_ensure-vm-version-sufficient 2314 java-pkg_ensure-vm-version-sufficient
1795 fi 2315 fi
1797 2317
1798 java-pkg_setup-vm 2318 java-pkg_setup-vm
1799 2319
1800 export JAVA=$(java-config --java) 2320 export JAVA=$(java-config --java)
1801 export JAVAC=$(java-config --javac) 2321 export JAVAC=$(java-config --javac)
1802 export JAVACFLAGS="$(java-pkg_javac-args)" 2322 JAVACFLAGS="$(java-pkg_javac-args)"
2323 if [[ ${?} != 0 ]]; then
2324 eerror "There was a problem determining JAVACFLAGS: ${JAVACFLAGS}"
2325 die "java-pkg_javac-args failed"
2326 fi
1803 [[ -n ${JAVACFLAGS_EXTRA} ]] && export JAVACFLAGS="${JAVACFLAGS_EXTRA} ${JAVACFLAGS}" 2327 [[ -n ${JAVACFLAGS_EXTRA} ]] && JAVACFLAGS="${JAVACFLAGS_EXTRA} ${JAVACFLAGS}"
2328 export JAVACFLAGS
1804 2329
1805 export JAVA_HOME="$(java-config -g JAVA_HOME)" 2330 export JAVA_HOME="$(java-config -g JAVA_HOME)"
1806 export JDK_HOME=${JAVA_HOME} 2331 export JDK_HOME=${JAVA_HOME}
1807 2332
1808 #TODO If you know a better solution let us know. 2333 #TODO If you know a better solution let us know.
1854 einfo "Classes" 2379 einfo "Classes"
1855 find "${S}" -type f -name '*.class' -print0 | xargs -0 -r -n 500 ls -ald | sed -e "s,${WORKDIR},\${WORKDIR}," 2380 find "${S}" -type f -name '*.class' -print0 | xargs -0 -r -n 500 ls -ald | sed -e "s,${WORKDIR},\${WORKDIR},"
1856 fi 2381 fi
1857} 2382}
1858 2383
1859# TODO document 2384# ------------------------------------------------------------------------------
2385# @internal-function java-pkg_verify-classes
2386#
1860# Verify that the classes were compiled for the right source / target 2387# Verify that the classes were compiled for the right source / target. Dies if
2388# not.
2389# @param $1 (optional) - the file to check, otherwise checks whole ${D}
2390# ------------------------------------------------------------------------------
1861java-pkg_verify-classes() { 2391java-pkg_verify-classes() {
1862 ebegin "Verifying java class versions"
1863 #$(find ${D} -type f -name '*.jar' -o -name '*.class') 2392 #$(find ${D} -type f -name '*.jar' -o -name '*.class')
1864 class-version-verify.py -t $(java-pkg_get-target) -r ${D} 2393 local target=$(java-pkg_get-target)
2394 local result
2395 local log="${T}/class-version-verify.log"
2396 if [[ -n "${1}" ]]; then
2397 class-version-verify.py -v -t ${target} "${1}" > "${log}"
1865 result=$? 2398 result=$?
1866 eend ${result}
1867 if [[ ${result} == 0 ]]; then
1868 einfo "All good"
1869 else 2399 else
1870 ewarn "Possible problem" 2400 ebegin "Verifying java class versions (target: ${target})"
1871 die "Bad class files found" 2401 class-version-verify.py -v -t ${target} -r "${D}" > "${log}"
2402 result=$?
2403 eend ${result}
2404 fi
2405 [[ -n ${JAVA_PKG_DEBUG} ]] && cat "${log}"
2406 if [[ ${result} != 0 ]]; then
2407 eerror "Incorrect bytecode version found"
2408 [[ -n "${1}" ]] && eerror "in file: ${1}"
2409 eerror "See ${log} for more details."
2410 die "Incorrect bytecode found"
2411 fi
2412}
2413
2414# ----------------------------------------------------------------------------
2415# @internal-function java-pkg_ensure-dep
2416# Check that a package being used in jarfrom, getjars and getjar is contained
2417# within DEPEND or RDEPEND.
2418# @param $1 - empty - check both vars; "runtime" or "build" - check only
2419# RDEPEND, resp. DEPEND
2420# @param $2 - Package name and slot.
2421java-pkg_ensure-dep() {
2422 debug-print-function ${FUNCNAME} $*
2423
2424 local limit_to="${1}"
2425 local target_pkg="${2}"
2426 local dev_error=""
2427
2428 local stripped_pkg=$(echo "${target_pkg}" | sed \
2429 's/-[0-9]*\(\.[0-9]\)*$//')
2430
2431 if [[ ${limit_to} != runtime && ! ( "${DEPEND}" =~ "$stripped_pkg" ) ]]; then
2432 dev_error="The ebuild is attempting to use ${target_pkg} that is not"
2433 dev_error="${dev_error} declared in DEPEND."
2434 if is-java-strict; then
2435 die "${dev_error}"
2436 elif [[ ${BASH_SUBSHELL} = 0 ]]; then
2437 eerror "${dev_error}"
2438 elog "Because you have this package installed the package will"
2439 elog "build without problems, but please report this to"
2440 elog "http://bugs.gentoo.org"
1872 fi 2441 fi
1873} 2442 fi
1874 2443
2444 if [[ ${limit_to} != build && ! ( ${RDEPEND} =~ "${stripped_pkg}" ) ]]; then
2445 dev_error="The ebuild is attempting to use ${target_pkg},"
2446 dev_error="${dev_error} without specifying --build-only, that is not declared in RDEPEND."
2447 if is-java-strict; then
2448 die "${dev_error}"
2449 elif [[ ${BASH_SUBSHELL} = 0 ]]; then
2450 eerror "${dev_error}"
2451 elog "The package will build without problems, but may fail to run"
2452 elog "if you don't have ${target_pkg} installed, so please report"
2453 elog "this to http://bugs.gentoo.org"
2454 fi
2455 fi
2456}
1875 2457
1876# ------------------------------------------------------------------------------ 2458# ------------------------------------------------------------------------------
1877# @section-end internal 2459# @section-end internal
1878# ------------------------------------------------------------------------------ 2460# ------------------------------------------------------------------------------
1879 2461

Legend:
Removed from v.1.20  
changed lines
  Added in v.1.80

  ViewVC Help
Powered by ViewVC 1.1.20