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

Legend:
Removed from v.1.3  
changed lines
  Added in v.1.45

  ViewVC Help
Powered by ViewVC 1.1.20