/[gentoo-x86]/eclass/java-utils-2.eclass
Gentoo

Diff of /eclass/java-utils-2.eclass

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 1.10 Revision 1.58
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.58 2007/02/28 10:45:20 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
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# @variable-internal JAVA_PKG_PORTAGE_DEP
61#
62# The version of portage we need to function properly. At this moment it's
63# portage with phase hooks support.
64# -----------------------------------------------------------------------------
39JAVA_PKG_PORTAGE_DEP=">=sys-apps/portage-2.1_pre1" 65JAVA_PKG_PORTAGE_DEP=">=sys-apps/portage-2.1_pre1"
40 66
41# ----------------------------------------------------------------------------- 67# -----------------------------------------------------------------------------
42# @variable-internal JAVA_PKG_E_DEPEND 68# @variable-internal JAVA_PKG_E_DEPEND
43# 69#
44# This is a convience variable to be used from the other java eclasses. This is 70# 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 71# the version of java-config we want to use. We also need a recent version
46# portage, that includes phase hooks. 72# portage, that includes phase hooks.
47# ----------------------------------------------------------------------------- 73# -----------------------------------------------------------------------------
48JAVA_PKG_E_DEPEND=">=dev-java/java-config-2.0.19-r1 ${JAVA_PKG_PORTAGE_DEP}" 74JAVA_PKG_E_DEPEND=">=dev-java/java-config-2.0.31 ${JAVA_PKG_PORTAGE_DEP}"
49 75
50# ----------------------------------------------------------------------------- 76# -----------------------------------------------------------------------------
51# @variable-external JAVA_PKG_ALLOW_VM_CHANGE 77# @variable-external JAVA_PKG_ALLOW_VM_CHANGE
52# @variable-default yes 78# @variable-default yes
53# 79#
100# ----------------------------------------------------------------------------- 126# -----------------------------------------------------------------------------
101 127
102# ----------------------------------------------------------------------------- 128# -----------------------------------------------------------------------------
103# @variable-internal JAVA_PKG_COMPILER_DIR 129# @variable-internal JAVA_PKG_COMPILER_DIR
104# @default /usr/share/java-config-2/compiler 130# @default /usr/share/java-config-2/compiler
105# 131#
106# Directory where compiler settings are saved, without trailing slash. 132# Directory where compiler settings are saved, without trailing slash.
107# Probably shouldn't touch this variable. 133# Probably shouldn't touch this variable.
108# ----------------------------------------------------------------------------- 134# -----------------------------------------------------------------------------
109JAVA_PKG_COMPILER_DIR=${JAVA_PKG_COMPILER_DIR:="/usr/share/java-config-2/compiler"} 135JAVA_PKG_COMPILER_DIR=${JAVA_PKG_COMPILER_DIR:="/usr/share/java-config-2/compiler"}
110 136
120 146
121# ----------------------------------------------------------------------------- 147# -----------------------------------------------------------------------------
122# @variable-external JAVA_PKG_FORCE_COMPILER 148# @variable-external JAVA_PKG_FORCE_COMPILER
123# 149#
124# Explicitly set a list of compilers to use. This is normally read from 150# Explicitly set a list of compilers to use. This is normally read from
125# JAVA_PKG_COMPILERS_CONF. 151# JAVA_PKG_COMPILERS_CONF.
126# 152#
127# @note This should only be used internally or for testing. 153# @note This should only be used internally or for testing.
128# @example Use jikes and javac, in that order 154# @example Use jikes and javac, in that order
129# JAVA_PKG_FORCE_COMPILER="jikes javac" 155# JAVA_PKG_FORCE_COMPILER="jikes javac"
130# ----------------------------------------------------------------------------- 156# -----------------------------------------------------------------------------
131 157
158# -----------------------------------------------------------------------------
159# @variable-external JAVA_PKG_FORCE_ANT_TASKS
160#
161# An $IFS separated list of ant tasks. Can be set in environment before calling
162# emerge/ebuild to override variables set in ebuild, mainly for testing before
163# putting the resulting (WANT_)ANT_TASKS into ebuild. Affects only ANT_TASKS in
164# eant() call, not the dependencies specified in WANT_ANT_TASKS.
165#
166# @example JAVA_PKG_FORCE_ANT_TASKS="ant-junit ant-trax" \
167# ebuild foo.ebuild compile
168#
169# @seealso WANT_ANT_TASKS
170# -----------------------------------------------------------------------------
171
132# TODO document me 172# TODO document me
133JAVA_PKG_QA_VIOLATIONS=0 173JAVA_PKG_QA_VIOLATIONS=0
134 174
135# ----------------------------------------------------------------------------- 175# -----------------------------------------------------------------------------
136# @section-end variables 176# @section-end variables
150# @ebuild-function java-pkg_dojar 190# @ebuild-function java-pkg_dojar
151# 191#
152# Installs any number of jars. 192# Installs any number of jars.
153# Jar's will be installed into /usr/share/${PN}(-${SLOT})/lib/ by default. 193# Jar's will be installed into /usr/share/${PN}(-${SLOT})/lib/ by default.
154# You can use java-pkg_jarinto to change this path. 194# You can use java-pkg_jarinto to change this path.
155# You should never install a jar with a package version in the filename. 195# You should never install a jar with a package version in the filename.
156# Instead, use java-pkg_newjar defined below. 196# Instead, use java-pkg_newjar defined below.
157# 197#
158# @example 198# @example
159# java-pkg_dojar dist/${PN}.jar dist/${PN}-core.jar 199# java-pkg_dojar dist/${PN}.jar dist/${PN}-core.jar
160# 200#
171 # Create JARDEST if it doesn't exist 211 # Create JARDEST if it doesn't exist
172 dodir ${JAVA_PKG_JARDEST} 212 dodir ${JAVA_PKG_JARDEST}
173 213
174 local jar 214 local jar
175 # for each jar 215 # for each jar
176 for jar in "$@"; do 216 for jar in "${@}"; do
177 local jar_basename=$(basename "${jar}") 217 local jar_basename=$(basename "${jar}")
178 218
179 java-pkg_check-versioned-jar ${jar_basename} 219 java-pkg_check-versioned-jar ${jar_basename}
180 220
181 # check if it exists 221 # check if it exists
182 if [[ -e "${jar}" ]] ; then 222 if [[ -e "${jar}" ]] ; then
223 # Don't overwrite if jar has already been installed with the same
224 # name
225 local dest="${D}${JAVA_PKG_JARDEST}/${jar_basename}"
226 if [[ -e "${dest}" ]]; then
227 ewarn "Overwriting ${dest}"
228 fi
229
183 # install it into JARDEST if it's a non-symlink 230 # install it into JARDEST if it's a non-symlink
184 if [[ ! -L "${jar}" ]] ; then 231 if [[ ! -L "${jar}" ]] ; then
232 #but first check class version when in strict mode.
233 is-java-strict && java-pkg_verify-classes "${jar}"
234
185 INSDESTTREE="${JAVA_PKG_JARDEST}" \ 235 INSDESTTREE="${JAVA_PKG_JARDEST}" \
186 doins "${jar}" || die "failed to install ${jar}" 236 doins "${jar}" || die "failed to install ${jar}"
187 java-pkg_append_ JAVA_PKG_CLASSPATH "${JAVA_PKG_JARDEST}/${jar_basename}" 237 java-pkg_append_ JAVA_PKG_CLASSPATH "${JAVA_PKG_JARDEST}/${jar_basename}"
188 debug-print "installed ${jar} to ${D}${JAVA_PKG_JARDEST}" 238 debug-print "installed ${jar} to ${D}${JAVA_PKG_JARDEST}"
189 # make a symlink to the original jar if it's symlink 239 # make a symlink to the original jar if it's symlink
200 250
201 java-pkg_do_write_ 251 java-pkg_do_write_
202} 252}
203 253
204 254
255# ------------------------------------------------------------------------------
256# @internal-function depend-java-query
257#
258# Wrapper for the depend-java-query binary to enable passing USE in env.
259# Using env variables keeps this eclass working with java-config versions that
260# do not handle use flags.
261# ------------------------------------------------------------------------------
262
263depend-java-query() {
264 USE="${USE}" $(which depend-java-query) "${@}"
265}
205 266
206# ------------------------------------------------------------------------------ 267# ------------------------------------------------------------------------------
207# @ebuild-function java-pkg_regjar 268# @ebuild-function java-pkg_regjar
208# 269#
209# Records an already installed jar in the package.env 270# Records an already installed jar in the package.env
222# will not work, because: 283# will not work, because:
223# * the `for jar in "$@"` can't expand the path to jar file names, as they 284# * the `for jar in "$@"` can't expand the path to jar file names, as they
224# don't exist yet 285# don't exist yet
225# * all `if ...` inside for will fail - the file '/opt/my-java/lib/*.jar' 286# * all `if ...` inside for will fail - the file '/opt/my-java/lib/*.jar'
226# doesn't exist 287# doesn't exist
227# 288#
228# you have to use it as: 289# you have to use it as:
229# 290#
230# java-pkg_regjar ${D}/opt/my-java/lib/*.jar 291# java-pkg_regjar ${D}/opt/my-java/lib/*.jar
231# 292#
232# @param $@ - jars to record 293# @param $@ - jars to record
240 [[ ${#} -lt 1 ]] && die "at least one argument needed" 301 [[ ${#} -lt 1 ]] && die "at least one argument needed"
241 302
242 java-pkg_init_paths_ 303 java-pkg_init_paths_
243 304
244 local jar jar_dir jar_file 305 local jar jar_dir jar_file
245 for jar in "$@"; do 306 for jar in "${@}"; do
246 # TODO use java-pkg_check-versioned-jar 307 # TODO use java-pkg_check-versioned-jar
247 if [[ -e "${jar}" ]]; then 308 if [[ -e "${jar}" || -e "${D}${jar}" ]]; then
309 [[ -d "${jar}" || -d "${D}${jar}" ]] \
310 && die "Called ${FUNCNAME} on a directory $*"
311
312 #check that class version correct when in strict mode
313 is-java-strict && java-pkg_verify-classes "${jar}"
314
248 # nelchael: we should strip ${D} in this case too, here's why: 315 # nelchael: we should strip ${D} in this case too, here's why:
249 # imagine such call: 316 # imagine such call:
250 # java-pkg_regjar ${D}/opt/java/*.jar 317 # java-pkg_regjar ${D}/opt/java/*.jar
251 # such call will fall into this case (-e ${jar}) and will 318 # such call will fall into this case (-e ${jar}) and will
252 # record paths with ${D} in package.env 319 # record paths with ${D} in package.env
253 java-pkg_append_ JAVA_PKG_CLASSPATH "${jar#${D}}" 320 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 321 else
257 die "${jar} does not exist" 322 die "${jar} does not exist"
258 fi 323 fi
259 done 324 done
260 325
261 java-pkg_do_write_ 326 java-pkg_do_write_
262} 327}
263
264 328
265# ------------------------------------------------------------------------------ 329# ------------------------------------------------------------------------------
266# @ebuild-function java-pkg_newjar 330# @ebuild-function java-pkg_newjar
267# 331#
268# Installs a jar with a new name 332# Installs a jar with a new name
279 local original_jar="${1}" 343 local original_jar="${1}"
280 local new_jar="${2:-${PN}.jar}" 344 local new_jar="${2:-${PN}.jar}"
281 local new_jar_dest="${T}/${new_jar}" 345 local new_jar_dest="${T}/${new_jar}"
282 346
283 [[ -z ${original_jar} ]] && die "Must specify a jar to install" 347 [[ -z ${original_jar} ]] && die "Must specify a jar to install"
284 [[ ! -f ${original_jar} ]] && die "${original_jar} does not exist!" 348 [[ ! -f ${original_jar} ]] \
349 && die "${original_jar} does not exist or is not a file!"
285 350
286 rm -f "${new_jar_dest}" || die "Failed to remove ${new_jar_dest}" 351 rm -f "${new_jar_dest}" || die "Failed to remove ${new_jar_dest}"
287 cp "${original_jar}" "${new_jar_dest}" \ 352 cp "${original_jar}" "${new_jar_dest}" \
288 || die "Failed to copy ${original_jar} to ${new_jar_dest}" 353 || die "Failed to copy ${original_jar} to ${new_jar_dest}"
289 java-pkg_dojar "${new_jar_dest}" 354 java-pkg_dojar "${new_jar_dest}"
290} 355}
291 356
292
293# ------------------------------------------------------------------------------ 357# ------------------------------------------------------------------------------
294# @ebuild-function java-pkg_addcp 358# @ebuild-function java-pkg_addcp
295# 359#
296# Add something to the package's classpath. For jars, you should use dojar, 360# 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. 361# newjar, or regjar. This is typically used to add directories to the classpath.
302java-pkg_addcp() { 366java-pkg_addcp() {
303 java-pkg_append_ JAVA_PKG_CLASSPATH "${@}" 367 java-pkg_append_ JAVA_PKG_CLASSPATH "${@}"
304 java-pkg_do_write_ 368 java-pkg_do_write_
305} 369}
306 370
307
308# ------------------------------------------------------------------------------ 371# ------------------------------------------------------------------------------
309# @ebuild-function java-pkg_doso 372# @ebuild-function java-pkg_doso
310# 373#
311# Installs any number of JNI libraries 374# Installs any number of JNI libraries
312# They will be installed into /usr/lib by default, but java-pkg_sointo 375# They will be installed into /usr/lib by default, but java-pkg_sointo
313# can be used change this path 376# can be used change this path
314# 377#
315# Example: 378# Example:
340 java-pkg_append_ JAVA_PKG_LIBRARY "${JAVA_PKG_LIBDEST}" 403 java-pkg_append_ JAVA_PKG_LIBRARY "${JAVA_PKG_LIBDEST}"
341 debug-print "Installing ${lib} to ${JAVA_PKG_LIBDEST}" 404 debug-print "Installing ${lib} to ${JAVA_PKG_LIBDEST}"
342 # otherwise make a symlink to the symlink's origin 405 # otherwise make a symlink to the symlink's origin
343 else 406 else
344 # TODO use dosym 407 # TODO use dosym
408 ln -s "$(readlink "${lib}")" \
345 ln -s "$(readlink "${lib}")" "${D}${JAVA_PKG_LIBDEST}/$(basename "${lib}")" 409 "${D}${JAVA_PKG_LIBDEST}/$(basename "${lib}")"
346 debug-print "${lib} is a symlink, linking accordanly" 410 debug-print "${lib} is a symlink, linking accordanly"
347 fi 411 fi
348 # otherwise die 412 # otherwise die
349 else 413 else
350 die "${lib} does not exist" 414 die "${lib} does not exist"
370 java-pkg_check-phase install 434 java-pkg_check-phase install
371 435
372 [[ ${#} -lt 1 ]] && "at least one argument needed" 436 [[ ${#} -lt 1 ]] && "at least one argument needed"
373 437
374 java-pkg_init_paths_ 438 java-pkg_init_paths_
375 439
376 local lib target_dir 440 local lib target_dir
377 for lib in "$@" ; do 441 for lib in "$@" ; do
378 # Check the absolute path of the lib 442 # Check the absolute path of the lib
379 if [[ -e "${lib}" ]] ; then 443 if [[ -e "${lib}" ]] ; then
380 target_dir="$(java-pkg_expand_dir_ ${lib})" 444 target_dir="$(java-pkg_expand_dir_ ${lib})"
428# ------------------------------------------------------------------------------ 492# ------------------------------------------------------------------------------
429java-pkg_dohtml() { 493java-pkg_dohtml() {
430 debug-print-function ${FUNCNAME} $* 494 debug-print-function ${FUNCNAME} $*
431 495
432 [[ ${#} -lt 1 ]] && die "At least one argument required for ${FUNCNAME}" 496 [[ ${#} -lt 1 ]] && die "At least one argument required for ${FUNCNAME}"
433 # TODO-nichoj find out what exactly -f package-list does 497
498 # from /usr/lib/portage/bin/dohtml -h
499 # -f Set list of allowed extensionless file names.
434 dohtml -f package-list "$@" 500 dohtml -f package-list "$@"
501
435 # this probably shouldn't be here but it provides 502 # this probably shouldn't be here but it provides
436 # a reasonable way to catch # docs for all of the 503 # a reasonable way to catch # docs for all of the
437 # old ebuilds. 504 # old ebuilds.
438 java-pkg_recordjavadoc 505 java-pkg_recordjavadoc
439} 506}
440 507
441# TODO document 508# ------------------------------------------------------------------------------
509# @ebuild-function java-pkg_dojavadoc
510#
511# Installs javadoc documentation. This should be controlled by the doc use flag.
512#
513# @param $1: - The javadoc root directory.
514#
515# @example:
516# java-pkg_dojavadoc docs/api
517#
518# ------------------------------------------------------------------------------
442java-pkg_dojavadoc() { 519java-pkg_dojavadoc() {
443 local dir="$1" 520 local dir="$1"
444 521
445 java-pkg_check-phase install 522 java-pkg_check-phase install
446 523
458} 535}
459 536
460# ------------------------------------------------------------------------------ 537# ------------------------------------------------------------------------------
461# @ebuild-function java-pkg_dosrc 538# @ebuild-function java-pkg_dosrc
462# 539#
463# Installs a zip containing the source for a package, so it can used in 540# Installs a zip containing the source for a package, so it can used in
464# from IDEs like eclipse and netbeans. 541# from IDEs like eclipse and netbeans.
465# 542#
466# Ebuild needs to DEPEND on app-arch/zip to use this. 543# Ebuild needs to DEPEND on app-arch/zip to use this.
467# 544#
468# It also should be controlled by USE=source. 545# It also should be controlled by USE=source.
469# 546#
470# @example: 547# @example:
471# java-pkg_dosrc src/* 548# java-pkg_dosrc src/*
472# 549#
473# ------------------------------------------------------------------------------ 550# ------------------------------------------------------------------------------
474# TODO change so it the arguments it takes are the base directories containing 551# TODO change so it the arguments it takes are the base directories containing
475# source -nichoj 552# source -nichoj
476# TODO should we be able to handle multiple calls to dosrc? -nichoj 553# TODO should we be able to handle multiple calls to dosrc? -nichoj
477# TODO maybe we can take an existing zip/jar? -nichoj 554# TODO maybe we can take an existing zip/jar? -nichoj
478# FIXME apparently this fails if you give it an empty directories 555# FIXME apparently this fails if you give it an empty directories
479java-pkg_dosrc() { 556java-pkg_dosrc() {
480 debug-print-function ${FUNCNAME} $* 557 debug-print-function ${FUNCNAME} $*
481 558
482 [ ${#} -lt 1 ] && die "At least one argument needed" 559 [ ${#} -lt 1 ] && die "At least one argument needed"
483 if ! hasq source ${IUSE}; then 560 if ! hasq source ${IUSE}; then
484 echo "Java QA Notice: ${FUNCNAME} called without source in IUSE" 561 echo "Java QA Notice: ${FUNCNAME} called without source in IUSE"
485 fi 562 fi
486 563
487 java-pkg_check-phase install 564 java-pkg_check-phase install
488 565
489 [[ ${#} -lt 1 ]] && die "At least one argument needed" 566 [[ ${#} -lt 1 ]] && die "At least one argument needed"
490 567
491 java-pkg_init_paths_ 568 java-pkg_init_paths_
492 569
493 local zip_name="${PN}-src.zip" 570 local zip_name="${PN}-src.zip"
494 local zip_path="${T}/${zip_name}" 571 local zip_path="${T}/${zip_name}"
495 local dir 572 local dir
496 for dir in ${@}; do 573 for dir in "${@}"; do
497 local dir_parent=$(dirname "${dir}") 574 local dir_parent=$(dirname "${dir}")
498 local dir_name=$(basename "${dir}") 575 local dir_name=$(basename "${dir}")
499 pushd ${dir_parent} > /dev/null || die "problem entering ${dir_parent}" 576 pushd ${dir_parent} > /dev/null || die "problem entering ${dir_parent}"
500 zip -q -r ${zip_path} ${dir_name} -i '*.java' 577 zip -q -r ${zip_path} ${dir_name} -i '*.java'
501 local result=$? 578 local result=$?
518# @ebuild-function java-pkg_dolauncher 595# @ebuild-function java-pkg_dolauncher
519# 596#
520# Make a wrapper script to lauch/start this package 597# Make a wrapper script to lauch/start this package
521# If necessary, the wrapper will switch to the appropriate VM. 598# If necessary, the wrapper will switch to the appropriate VM.
522# 599#
600# Can be called without parameters if the package installs only one jar
601# that has the Main-class attribute set. The wrapper will be named ${PN}.
602#
523# @param $1 - filename of launcher to create 603# @param $1 - filename of launcher to create
524# @param $2 - options, as follows: 604# @param $2 - options, as follows:
525# --main the.main.class.too.start 605# --main the.main.class.too.start
526# --jar /the/jar/too/launch.jar 606# --jar /the/jar/too/launch.jar or just <name>.jar
527# --java_args 'Extra arguments to pass too jave' 607# --java_args 'Extra arguments to pass to java'
528# --pkg_args 'extra arguments too pass too the package' 608# --pkg_args 'Extra arguments to pass to the package'
529# --pwd 609# --pwd Directory the launcher changes to before executing java
530# -into 610# -into Directory to install the launcher to, instead of /usr/bin
531# -pre 611# -pre Prepend contents of this file to the launcher
532# ------------------------------------------------------------------------------ 612# ------------------------------------------------------------------------------
533java-pkg_dolauncher() { 613java-pkg_dolauncher() {
534 debug-print-function ${FUNCNAME} $* 614 debug-print-function ${FUNCNAME} $*
535 615
536 java-pkg_check-phase install 616 java-pkg_check-phase install
537
538 [[ ${#} -lt 1 ]] && die "Need at least one argument"
539
540 java-pkg_init_paths_ 617 java-pkg_init_paths_
541 618
619 if [[ ${#} = 0 ]]; then
620 local name="${PN}"
621 else
542 local name="${1}" 622 local name="${1}"
623 shift
624 fi
625
543 # TODO rename to launcher 626 # TODO rename to launcher
544 local target="${T}/${name}" 627 local target="${T}/${name}"
628 local var_tmp="${T}/launcher_variables_tmp"
545 local target_dir pre 629 local target_dir pre
546 shift
547 630
548 echo "#!/bin/bash" > "${target}" 631 # Process the other the rest of the arguments
549 while [[ -n "${1}" && -n "${2}" ]]; do 632 while [[ -n "${1}" && -n "${2}" ]]; do
550 local var=${1} value=${2} 633 local var="${1}" value="${2}"
551 if [[ "${var:0:2}" == "--" ]]; then 634 if [[ "${var:0:2}" == "--" ]]; then
635 local var=${var:2}
552 echo "gjl_${var:2}=\"${value}\"" >> "${target}" 636 echo "gjl_${var}=\"${value}\"" >> "${var_tmp}"
637 local gjl_${var}="${value}"
553 elif [[ "${var}" == "-into" ]]; then 638 elif [[ "${var}" == "-into" ]]; then
554 target_dir="${value}" 639 target_dir="${value}"
555 elif [[ "${var}" == "-pre" ]]; then 640 elif [[ "${var}" == "-pre" ]]; then
556 pre="${value}" 641 pre="${value}"
557 fi 642 fi
558 shift 2 643 shift 2
559 done 644 done
645
646 # Test if no --jar and --main arguments were given and
647 # in that case check if the package only installs one jar
648 # and use that jar.
649 if [[ -z "${gjl_jar}" && -z "${gjl_main}" ]]; then
650 local cp="${JAVA_PKG_CLASSPATH}"
651 if [[ "${cp/:}" = "${cp}" && "${cp%.jar}" != "${cp}" ]]; then
652 echo "gjl_jar=\"${JAVA_PKG_CLASSPATH}\"" >> "${var_tmp}"
653 else
654 local msg="Not enough information to create a launcher given."
655 msg="${msg} Please give --jar or --main argument to ${FUNCNAME}."
656 die "${msg}"
657 fi
658 fi
659
660 # Write the actual script
661 echo "#!/bin/bash" > "${target}"
662 if [[ -n "${pre}" ]]; then
663 if [[ -f "${pre}" ]]; then
664 cat "${pre}" >> "${target}"
665 else
666 die "-pre specified file '${pre}' does not exist"
667 fi
668 fi
560 echo "gjl_package=${JAVA_PKG_NAME}" >> "${target}" 669 echo "gjl_package=${JAVA_PKG_NAME}" >> "${target}"
561 [[ -n "${pre}" ]] && [[ -f "${pre}" ]] && cat "${pre}" >> "${target}" 670 cat "${var_tmp}" >> "${target}"
671 rm -f "${var_tmp}"
562 echo "source /usr/share/java-config-2/launcher/launcher.bash" >> "${target}" 672 echo "source /usr/share/java-config-2/launcher/launcher.bash" >> "${target}"
563 673
564 if [[ -n "${into}" ]]; then 674 if [[ -n "${target_dir}" ]]; then
565 DESTTREE="${target_dir}" dobin "${target}" 675 DESTTREE="${target_dir}" dobin "${target}"
566 local ret=$? 676 local ret=$?
567 return ${ret} 677 return ${ret}
568 else 678 else
569 dobin "${target}" 679 dobin "${target}"
597 echo "dowar: warning, skipping directory ${war}" 707 echo "dowar: warning, skipping directory ${war}"
598 continue 708 continue
599 else 709 else
600 warpath="${war}" 710 warpath="${war}"
601 fi 711 fi
602 712
603 # Install those files like you mean it 713 # Install those files like you mean it
604 INSOPTIONS="-m 0644" \ 714 INSOPTIONS="-m 0644" \
605 INSDESTTREE=${JAVA_PKG_WARDEST} \ 715 INSDESTTREE=${JAVA_PKG_WARDEST} \
606 doins ${warpath} 716 doins ${warpath}
607 done 717 done
642# @ebuild-function java-pkg_jar-from 752# @ebuild-function java-pkg_jar-from
643# 753#
644# Makes a symlink to a jar from a certain package 754# Makes a symlink to a jar from a certain package
645# A lot of java packages include dependencies in a lib/ directory 755# A lot of java packages include dependencies in a lib/ directory
646# You can use this function to replace these bundled dependencies. 756# You can use this function to replace these bundled dependencies.
757# The dependency is recorded into package.env DEPEND line, unless "--build-only"
758# is passed as the very first argument, for jars that have to be present only
759# at build time and are not needed on runtime (junit testing etc).
647# 760#
648# Example: get all jars from xerces slot 2 761# Example: get all jars from xerces slot 2
649# java-pkg_jar-from xerces-2 762# java-pkg_jar-from xerces-2
650# Example: get a specific jar from xerces slot 2 763# Example: get a specific jar from xerces slot 2
651# java-pkg_jar-from xerces-2 xml-apis.jar 764# java-pkg_jar-from xerces-2 xml-apis.jar
652# Example get a specific jar from xerces slot 2, and name it diffrently 765# Example: get a specific jar from xerces slot 2, and name it diffrently
653# java-pkg_jar-from xerces-2 xml-apis.jar xml.jar 766# java-pkg_jar-from xerces-2 xml-apis.jar xml.jar
767# Example: get junit.jar which is needed only for building
768# java-pkg_jar-from --build-only junit junit.jar
654# 769#
770# @param $opt
771# --build-only - makes the jar(s) not added into package.env DEPEND line.
772# (assumed automatically when called inside src_test)
773# --with-dependencies - get jars also from requested package's dependencies
774# transitively.
775# --into $dir - symlink jar(s) into $dir (must exist) instead of .
655# @param $1 - Package to get jars from. 776# @param $1 - Package to get jars from.
656# @param $2 - jar from package. If not specified, all jars will be used. 777# @param $2 - jar from package. If not specified, all jars will be used.
657# @param $3 - When a single jar is specified, destination filename of the 778# @param $3 - When a single jar is specified, destination filename of the
658# symlink. Defaults to the name of the jar. 779# symlink. Defaults to the name of the jar.
659# ------------------------------------------------------------------------------ 780# ------------------------------------------------------------------------------
660# TODO could probably be cleaned up a little 781# TODO could probably be cleaned up a little
661java-pkg_jar-from() { 782java-pkg_jar-from() {
662 debug-print-function ${FUNCNAME} $* 783 debug-print-function ${FUNCNAME} $*
663 784
664 local target_pkg="${1}" target_jar="${2}" destjar="${3}" 785 local build_only=""
786 local destdir="."
787 local deep=""
665 788
789 [[ "${EBUILD_PHASE}" == "test" ]] && build_only="true"
790
791 while [[ "${1}" == --* ]]; do
792 if [[ "${1}" = "--build-only" ]]; then
793 build_only="true"
794 elif [[ "${1}" = "--with-dependencies" ]]; then
795 deep="--with-dependencies"
796 elif [[ "${1}" = "--into" ]]; then
797 destdir="${2}"
798 shift
799 else
800 die "java-pkg_jar-from called with unknown parameter: ${1}"
801 fi
802 shift
803 done
804
805 local target_pkg="${1}" target_jar="${2}" destjar="${3}"
806
666 [[ -z ${target_pkg} ]] && die "Must specify a package" 807 [[ -z ${target_pkg} ]] && die "Must specify a package"
667 808
668 # default destjar to the target jar 809 # default destjar to the target jar
669 [[ -z "${destjar}" ]] && destjar="${target_jar}" 810 [[ -z "${destjar}" ]] && destjar="${target_jar}"
670 811
812 local error_msg="There was a problem getting the classpath for ${target_pkg}."
813 local classpath
671 local classpath="$(java-config --classpath=${target_pkg})" 814 classpath="$(java-config ${deep} --classpath=${target_pkg})"
672 [[ $? != 0 ]] && die "There was a problem getting the classpath for ${target_pkg}" 815 [[ $? != 0 ]] && die ${error_msg}
673 816
817 pushd ${destdir} > /dev/null \
818 || die "failed to change directory to ${destdir}"
674 local jar 819 local jar
675 for jar in ${classpath//:/ }; do 820 for jar in ${classpath//:/ }; do
676 local jar_name=$(basename "${jar}") 821 local jar_name=$(basename "${jar}")
677 if [[ ! -f "${jar}" ]] ; then 822 if [[ ! -f "${jar}" ]] ; then
678 debug-print "${jar} from ${target_pkg} does not exist" 823 debug-print "${jar} from ${target_pkg} does not exist"
681 # If no specific target jar was indicated, link it 826 # If no specific target jar was indicated, link it
682 if [[ -z "${target_jar}" ]] ; then 827 if [[ -z "${target_jar}" ]] ; then
683 [[ -f "${target_jar}" ]] && rm "${target_jar}" 828 [[ -f "${target_jar}" ]] && rm "${target_jar}"
684 ln -snf "${jar}" \ 829 ln -snf "${jar}" \
685 || die "Failed to make symlink from ${jar} to ${jar_name}" 830 || die "Failed to make symlink from ${jar} to ${jar_name}"
686 java-pkg_record-jar_ "${target_pkg}" "${jar}" 831 [[ -z "${build_only}" ]] && java-pkg_record-jar_ "${target_pkg}" "${jar}"
687 # otherwise, if the current jar is the target jar, link it 832 # otherwise, if the current jar is the target jar, link it
688 elif [[ "${jar_name}" == "${target_jar}" ]] ; then 833 elif [[ "${jar_name}" == "${target_jar}" ]] ; then
689 [[ -f "${destjar}" ]] && rm "${destjar}" 834 [[ -f "${destjar}" ]] && rm "${destjar}"
690 ln -snf "${jar}" "${destjar}" \ 835 ln -snf "${jar}" "${destjar}" \
691 || die "Failed to make symlink from ${jar} to ${destjar}" 836 || die "Failed to make symlink from ${jar} to ${destjar}"
692 java-pkg_record-jar_ "${target_pkg}" "${jar}" 837 [[ -z "${build_only}" ]] && java-pkg_record-jar_ "${target_pkg}" "${jar}"
838 popd > /dev/null
693 return 0 839 return 0
694 fi 840 fi
695 done 841 done
842 popd > /dev/null
696 # if no target was specified, we're ok 843 # if no target was specified, we're ok
697 if [[ -z "${target_jar}" ]] ; then 844 if [[ -z "${target_jar}" ]] ; then
698 return 0 845 return 0
699 # otherwise, die bitterly 846 # otherwise, die bitterly
700 else 847 else
714# ------------------------------------------------------------------------------ 861# ------------------------------------------------------------------------------
715# @ebuild-function java-pkg_getjars 862# @ebuild-function java-pkg_getjars
716# 863#
717# Get the classpath provided by any number of packages 864# Get the classpath provided by any number of packages
718# Among other things, this can be passed to 'javac -classpath' or 'ant -lib'. 865# Among other things, this can be passed to 'javac -classpath' or 'ant -lib'.
866# The providing packages are recorded as dependencies into package.env DEPEND
867# line, unless "--build-only" is passed as the very first argument, for jars
868# that have to be present only at build time and are not needed on runtime
869# (junit testing etc).
719# 870#
720# Example: Get the classpath for xerces-2, 871# Example: Get the classpath for xerces-2 and xalan,
721# java-pkg_getjars xerces-2 xalan 872# java-pkg_getjars xerces-2,xalan
722# Example Return: 873# Example Return:
723# /usr/share/xerces-2/lib/xml-apis.jar:/usr/share/xerces-2/lib/xmlParserAPIs.jar:/usr/share/xalan/lib/xalan.jar 874# /usr/share/xerces-2/lib/xml-apis.jar:/usr/share/xerces-2/lib/xmlParserAPIs.jar:/usr/share/xalan/lib/xalan.jar
724# 875#
876# @param $opt
877# --build-only - makes the jar(s) not added into package.env DEPEND line.
878# (assumed automatically when called inside src_test)
879# --with-dependencies - get jars also from requested package's dependencies
880# transitively.
725# @param $@ - list of packages to get jars from 881# @param $1 - list of packages to get jars from
882# (passed to java-config --classpath)
726# ------------------------------------------------------------------------------ 883# ------------------------------------------------------------------------------
727java-pkg_getjars() { 884java-pkg_getjars() {
728 debug-print-function ${FUNCNAME} $* 885 debug-print-function ${FUNCNAME} $*
729 886
730 [[ ${#} -lt 1 ]] && die "At least one argument needed" 887 local build_only=""
888 local deep=""
889
890 [[ "${EBUILD_PHASE}" == "test" ]] && build_only="true"
731 891
732 # NOTE could probably just pass $@ to java-config --classpath. and return it 892 while [[ "${1}" == --* ]]; do
733 local classpath pkg 893 if [[ "${1}" = "--build-only" ]]; then
734 for pkg in ${@//,/ }; do 894 build_only="true"
735 #for pkg in $(echo "$@" | tr ',' ' '); do 895 elif [[ "${1}" = "--with-dependencies" ]]; then
736 jars="$(java-config --classpath=${pkg})" 896 deep="--with-dependencies"
737 debug-print "${pkg}:${jars}"
738 # TODO should we ensure jars exist?
739 if [[ -z "${classpath}" ]]; then
740 classpath="${jars}"
741 else 897 else
742 classpath="${classpath}:${jars}" 898 die "java-pkg_jar-from called with unknown parameter: ${1}"
743 fi 899 fi
744 java-pkg_record-jar_ "${pkg}" 900 shift
745 done 901 done
902
903 [[ ${#} -ne 1 ]] && die "${FUNCNAME} takes only one argument besides --*"
904
905 local classpath pkgs="${1}"
906 jars="$(java-config ${deep} --classpath=${pkgs})"
907 [[ -z "${jars}" ]] && die "java-config --classpath=${pkgs} failed"
908 debug-print "${pkgs}:${jars}"
909
910 if [[ -z "${classpath}" ]]; then
911 classpath="${jars}"
912 else
913 classpath="${classpath}:${jars}"
914 fi
915
916 # Only record jars that aren't build-only
917 if [[ -z "${build_only}" ]]; then
918 oldifs="${IFS}"
919 IFS=","
920 for pkg in ${pkgs}; do
921 java-pkg_record-jar_ "${pkg}"
922 done
923 IFS="${oldifs}"
924 fi
925
746 echo "${classpath}" 926 echo "${classpath}"
747} 927}
748 928
749# ------------------------------------------------------------------------------ 929# ------------------------------------------------------------------------------
750# @ebuild-function java-pkg_getjar 930# @ebuild-function java-pkg_getjar
751# 931#
752# Get the filename of a single jar from a package 932# Get the filename of a single jar from a package
933# The providing package is recorded as runtime dependency into package.env
934# DEPEND line, unless "--build-only" is passed as the very first argument, for
935# jars that have to be present only at build time and are not needed on runtime
936# (junit testing etc).
753# 937#
754# @example 938# @example
755# java-pkg_getjar xerces-2 xml-apis.jar 939# java-pkg_getjar xerces-2 xml-apis.jar
756# @example-return 940# @example-return
757# /usr/share/xerces-2/lib/xml-apis.jar 941# /usr/share/xerces-2/lib/xml-apis.jar
758# 942#
943# @param $opt
944# --build-only - makes the jar not added into package.env DEPEND line.
759# @param $1 - package to use 945# @param $1 - package to use
760# @param $2 - jar to get 946# @param $2 - jar to get
761# ------------------------------------------------------------------------------ 947# ------------------------------------------------------------------------------
762java-pkg_getjar() { 948java-pkg_getjar() {
763 debug-print-function ${FUNCNAME} $* 949 debug-print-function ${FUNCNAME} $*
950
951 local build_only=""
952
953 [[ "${EBUILD_PHASE}" == "test" ]] && build_only="true"
954
955 while [[ "${1}" == --* ]]; do
956 if [[ "${1}" = "--build-only" ]]; then
957 build_only="true"
958 else
959 die "java-pkg_jar-from called with unknown parameter: ${1}"
960 fi
961 shift
962 done
963
964 [[ ${#} -ne 2 ]] && die "${FUNCNAME} takes only two arguments besides --*"
764 965
765 local pkg="${1}" target_jar="${2}" jar 966 local pkg="${1}" target_jar="${2}" jar
766 [[ -z ${pkg} ]] && die "Must specify package to get a jar from" 967 [[ -z ${pkg} ]] && die "Must specify package to get a jar from"
767 [[ -z ${target_jar} ]] && die "Must specify jar to get" 968 [[ -z ${target_jar} ]] && die "Must specify jar to get"
768 969
769 # TODO check that package is actually installed 970 local error_msg="Could not find classpath for ${pkg}. Are you sure its installed?"
971 local classpath
770 local classpath=$(java-config --classpath=${pkg}) 972 classpath=$(java-config --classpath=${pkg})
771 [[ $? != 0 ]] && die "There could not find classpath for ${pkg}. Are you sure its installed?" 973 [[ $? != 0 ]] && die ${error_msg}
974
772 for jar in ${classpath//:/ }; do 975 for jar in ${classpath//:/ }; do
773 if [[ ! -f "${jar}" ]] ; then 976 if [[ ! -f "${jar}" ]] ; then
774 die "Installation problems with jars in ${pkg} - is it installed?" 977 die "Installation problem with jar ${jar} in ${pkg} - is it installed?"
775 fi 978 fi
776 979
777 if [[ "$(basename ${jar})" == "${target_jar}" ]] ; then 980 if [[ "$(basename ${jar})" == "${target_jar}" ]] ; then
778 java-pkg_record-jar_ "${pkg}" "${jar}" 981 # Only record jars that aren't build-only
982 [[ -z "${build_only}" ]] && java-pkg_record-jar_ "${pkg}" "${jar}"
779 echo "${jar}" 983 echo "${jar}"
780 return 0 984 return 0
781 fi 985 fi
782 done 986 done
783 987
784 die "Could not find ${target_jar} in ${pkg}" 988 die "Could not find ${target_jar} in ${pkg}"
785 return 1 989 return 1
786} 990}
787 991
788# This function reads stdin, and based on that input, figures out how to 992# This function reads stdin, and based on that input, figures out how to
802# line="${line// /}" 1006# line="${line// /}"
803# 1007#
804# # format: path=jarinfo 1008# # format: path=jarinfo
805# local path=${line%%=*} 1009# local path=${line%%=*}
806# local jarinfo=${line##*=} 1010# local jarinfo=${line##*=}
807# 1011#
808# # format: jar@package 1012# # format: jar@package
809# local jar=${jarinfo%%@*}.jar 1013# local jar=${jarinfo%%@*}.jar
810# local package=${jarinfo##*@} 1014# local package=${jarinfo##*@}
811# if [[ -n ${replace_only} ]]; then 1015# if [[ -n ${replace_only} ]]; then
812# [[ ! -f $path ]] && die "No jar exists at ${path}" 1016# [[ ! -f $path ]] && die "No jar exists at ${path}"
825# @section-end query 1029# @section-end query
826# ------------------------------------------------------------------------------ 1030# ------------------------------------------------------------------------------
827 1031
828# ------------------------------------------------------------------------------ 1032# ------------------------------------------------------------------------------
829# @section-begin helper 1033# @section-begin helper
830# @section-summary Helper functions 1034# @section-summary Helper functions
831# 1035#
832# Various other functions to use from an ebuild 1036# Various other functions to use from an ebuild
833# ------------------------------------------------------------------------------ 1037# ------------------------------------------------------------------------------
834 1038
835# ------------------------------------------------------------------------------ 1039# ------------------------------------------------------------------------------
841# jdbc-stdext 1045# jdbc-stdext
842# jaf 1046# jaf
843# jdbc-rowset 1047# jdbc-rowset
844# jms 1048# jms
845# 1049#
846# @param $1 - Optionally indicate that the dependencies are controlled by 1050# @param $1 - Optionally indicate that the dependencies are controlled by
847# a use flag by specifying '--use' Requires $2. 1051# a use flag by specifying '--use' Requires $2.
848# @param $2 - USE flag which will enable the dependencies. 1052# @param $2 - USE flag which will enable the dependencies.
849# @param $@ - virtual packages to add depenedencies for 1053# @param $@ - virtual packages to add depenedencies for
850# ------------------------------------------------------------------------------ 1054# ------------------------------------------------------------------------------
851# TODO rewrite to parse a line based declaration file instead -- karltk 1055# TODO rewrite to parse a line based declaration file instead -- karltk
907# 1111#
908# export DEPEND="${DEPEND} ${depstr}" 1112# export DEPEND="${DEPEND} ${depstr}"
909# export RDEPEND="${RDEPEND} ${depstr}" 1113# export RDEPEND="${RDEPEND} ${depstr}"
910#} 1114#}
911 1115
1116# ------------------------------------------------------------------------------
1117# @ebuild-function java-pkg_find-normal-jars
1118#
1119# Find the files with suffix .jar file in the given directory or $WORKDIR
1120#
1121# @param $1 - The directory to search for jar files (default: ${WORKDIR})
1122# ------------------------------------------------------------------------------
1123java-pkg_find-normal-jars() {
1124 local dir=$1
1125 [[ "${dir}" ]] || dir="${WORKDIR}"
1126 local found
1127 for jar in $(find "${dir}" -name "*.jar" -type f); do
1128 echo "${jar}"
1129 found="true"
1130 done
1131 [[ "${found}" ]]
1132 return $?
1133}
1134
1135# ------------------------------------------------------------------------------
1136# @ebuild-function java-pkg_ensure-no-bundled-jars
1137#
1138# Try to locate bundled jar files in ${WORKDIR} and die if found.
912# This should be used after S has been populated with symlinks to jars 1139# This function should be called after WORKDIR has been populated with symlink
913# TODO document 1140# to system jar files or bundled jars removed.
1141# ------------------------------------------------------------------------------
914java-pkg_ensure-no-bundled-jars() { 1142java-pkg_ensure-no-bundled-jars() {
915 debug-print-function ${FUNCNAME} $* 1143 debug-print-function ${FUNCNAME} $*
916 pushd ${WORKDIR} >/dev/null 2>/dev/null
917 1144
918 local bundled_jars=$(find . -name "*.jar" -type f) 1145 local bundled_jars=$(java-pkg_find-normal-jars)
919 if [[ -n ${bundled_jars} ]]; then 1146 if [[ -n ${bundled_jars} ]]; then
920 echo "Bundled jars found:" 1147 echo "Bundled jars found:"
921 local jar 1148 local jar
922 for jar in ${bundled_jars}; do 1149 for jar in ${bundled_jars}; do
923 echo $(pwd)${jar/./} 1150 echo $(pwd)${jar/./}
924 done 1151 done
925 die "Bundled jars found!" 1152 die "Bundled jars found!"
926
927 fi 1153 fi
928 popd >/dev/null 2>/dev/null
929} 1154}
930 1155
931# ------------------------------------------------------------------------------ 1156# ------------------------------------------------------------------------------
932# @internal-function java-pkg_ensure-vm-version-sufficient 1157# @internal-function java-pkg_ensure-vm-version-sufficient
933# 1158#
945 fi 1170 fi
946} 1171}
947 1172
948# ------------------------------------------------------------------------------ 1173# ------------------------------------------------------------------------------
949# @internal-function java-pkg_is-vm-version-sufficient 1174# @internal-function java-pkg_is-vm-version-sufficient
950# 1175#
951# @return zero - VM is sufficient 1176# @return zero - VM is sufficient
952# @return non-zero - VM is not sufficient 1177# @return non-zero - VM is not sufficient
953# ------------------------------------------------------------------------------ 1178# ------------------------------------------------------------------------------
954java-pkg_is-vm-version-sufficient() { 1179java-pkg_is-vm-version-sufficient() {
955 debug-print-function ${FUNCNAME} $* 1180 debug-print-function ${FUNCNAME} $*
975 die "Active Java VM too old" 1200 die "Active Java VM too old"
976 fi 1201 fi
977} 1202}
978 1203
979# ------------------------------------------------------------------------------ 1204# ------------------------------------------------------------------------------
980# @internal-function java-pkg_is-vm-version-eq 1205# @internal-function java-pkg_is-vm-version-eq
981# 1206#
982# @param $@ - VM version to compare current VM to 1207# @param $@ - VM version to compare current VM to
983# @return zero - VM versions are equal 1208# @return zero - VM versions are equal
984# @return non-zero - VM version are not equal 1209# @return non-zero - VM version are not equal
985# ------------------------------------------------------------------------------ 1210# ------------------------------------------------------------------------------
986java-pkg_is-vm-version-eq() { 1211java-pkg_is-vm-version-eq() {
1016# 1241#
1017# @param $@ - VM version to compare current to 1242# @param $@ - VM version to compare current to
1018# ------------------------------------------------------------------------------ 1243# ------------------------------------------------------------------------------
1019java-pkg_ensure-vm-version-ge() { 1244java-pkg_ensure-vm-version-ge() {
1020 debug-print-function ${FUNCNAME} $* 1245 debug-print-function ${FUNCNAME} $*
1021 1246
1022 if ! java-pkg_is-vm-version-ge "$@" ; then 1247 if ! java-pkg_is-vm-version-ge "$@" ; then
1023 debug-print "vm is not suffient" 1248 debug-print "vm is not suffient"
1024 eerror "This package requires a Java VM version >= $@" 1249 eerror "This package requires a Java VM version >= $@"
1025 einfo "Please use java-config -S to set the correct one" 1250 einfo "Please use java-config -S to set the correct one"
1026 die "Active Java VM too old" 1251 die "Active Java VM too old"
1027 fi 1252 fi
1028} 1253}
1029 1254
1030# ------------------------------------------------------------------------------ 1255# ------------------------------------------------------------------------------
1031# @internal-function java-pkg_is-vm-version-ge 1256# @internal-function java-pkg_is-vm-version-ge
1032# 1257#
1033# @param $@ - VM version to compare current VM to 1258# @param $@ - VM version to compare current VM to
1034# @return zero - current VM version is greater than checked version 1259# @return zero - current VM version is greater than checked version
1035# @return non-zero - current VM version is not greater than checked version 1260# @return non-zero - current VM version is not greater than checked version
1036# ------------------------------------------------------------------------------ 1261# ------------------------------------------------------------------------------
1037java-pkg_is-vm-version-ge() { 1262java-pkg_is-vm-version-ge() {
1051 return 1 1276 return 1
1052 fi 1277 fi
1053 fi 1278 fi
1054} 1279}
1055 1280
1281java-pkg_set-current-vm() {
1282 export GENTOO_VM=${1}
1283}
1284
1285java-pkg_get-current-vm() {
1286 echo ${GENTOO_VM}
1287}
1288
1289java-pkg_current-vm-matches() {
1290 hasq $(java-pkg_get-current-vm) ${@}
1291 return $?
1292}
1293
1056# ------------------------------------------------------------------------------ 1294# ------------------------------------------------------------------------------
1057# @ebuild-function java-pkg_get-source 1295# @ebuild-function java-pkg_get-source
1058# 1296#
1059# Determines what source version should be used, for passing to -source. 1297# Determines what source version should be used, for passing to -source.
1060# Unless you want to break things you probably shouldn't set _WANT_SOURCE 1298# Unless you want to break things you probably shouldn't set _WANT_SOURCE
1061# 1299#
1062# @return string - Either the lowest possible source, or JAVA_PKG_WANT_SOURCE 1300# @return string - Either the lowest possible source, or JAVA_PKG_WANT_SOURCE
1063# ------------------------------------------------------------------------------ 1301# ------------------------------------------------------------------------------
1068# ------------------------------------------------------------------------------ 1306# ------------------------------------------------------------------------------
1069# @ebuild-function java-pkg_get-target 1307# @ebuild-function java-pkg_get-target
1070# 1308#
1071# Determines what target version should be used, for passing to -target. 1309# Determines what target version should be used, for passing to -target.
1072# If you don't care about lower versions, you can set _WANT_TARGET to the 1310# If you don't care about lower versions, you can set _WANT_TARGET to the
1073# version of your JDK. 1311# version of your JDK.
1074# Remember doing this will mostly like cause things to break.
1075# Doesn't allow it to be lower then the one in depend.
1076# Doesn't allow it to be higher then the active vm.
1077# 1312#
1078# @return string - Either the lowest possible target, or JAVA_PKG_WANT_TARGET 1313# @return string - Either the lowest possible target, or JAVA_PKG_WANT_TARGET
1079# ------------------------------------------------------------------------------ 1314# ------------------------------------------------------------------------------
1080java-pkg_get-target() { 1315java-pkg_get-target() {
1081 local min=$(depend-java-query --get-lowest "${DEPEND} ${RDEPEND}")
1082 if [[ -n "${JAVA_PKG_WANT_TARGET}" ]]; then
1083 local max="$(java-config --select-vm "${GENTOO_VM}" -g PROVIDES_VERSION)"
1084 if version_is_at_least "${min}" "${JAVA_PKG_WANT_TARGET}" && version_is_at_least "${JAVA_PKG_WANT_TARGET}" "${max}"; then
1085 echo ${JAVA_PKG_WANT_TARGET}
1086 else
1087 echo ${min}
1088 fi
1089 else
1090 echo ${min}
1091 fi
1092
1093 #echo ${JAVA_PKG_WANT_TARGET:-$(depend-java-query --get-lowest "${DEPEND}")} 1316 echo ${JAVA_PKG_WANT_TARGET:-$(depend-java-query --get-lowest "${DEPEND} ${RDEPEND}")}
1094} 1317}
1095 1318
1096java-pkg_get-javac() { 1319java-pkg_get-javac() {
1097 debug-print-function ${FUNCNAME} $* 1320 debug-print-function ${FUNCNAME} $*
1098 1321
1099 java-pkg_init-compiler_ 1322
1100 local compiler="${GENTOO_COMPILER}" 1323 local compiler="${GENTOO_COMPILER}"
1101 1324
1102 local compiler_executable 1325 local compiler_executable
1103 if [[ "${compiler}" = "javac" ]]; then 1326 if [[ "${compiler}" = "javac" ]]; then
1104 # nothing fancy needs to be done for javac 1327 # nothing fancy needs to be done for javac
1112 unset JAVAC 1335 unset JAVAC
1113 # try to get value of JAVAC 1336 # try to get value of JAVAC
1114 compiler_executable="$(source ${compiler_env} 1>/dev/null 2>&1; echo ${JAVAC})" 1337 compiler_executable="$(source ${compiler_env} 1>/dev/null 2>&1; echo ${JAVAC})"
1115 export JAVAC=${old_javac} 1338 export JAVAC=${old_javac}
1116 1339
1117 [[ -z ${compiler_executable} ]] && die "JAVAC is empty or undefined in ${compiler_env}" 1340 if [[ -z ${compiler_executable} ]]; then
1118 1341 echo "JAVAC is empty or undefined in ${compiler_env}"
1342 return 1
1343 fi
1344
1119 # check that it's executable 1345 # check that it's executable
1120 if [[ ! -x ${compiler_executable} ]]; then 1346 if [[ ! -x ${compiler_executable} ]]; then
1121 eerror "Could not find ${compiler_executable}!"
1122 die "${compiler_executable} doesn't exist, or isn't executable" 1347 echo "${compiler_executable} doesn't exist, or isn't executable"
1348 return 1
1123 fi 1349 fi
1124 else 1350 else
1125 eerror "Could not find environment file for ${compiler}" 1351 echo "Could not find environment file for ${compiler}"
1126 die "Could not find ${compiler_env}" 1352 return 1
1127 fi 1353 fi
1128 fi 1354 fi
1129 echo ${compiler_executable} 1355 echo ${compiler_executable}
1130} 1356}
1131 1357
1132# ------------------------------------------------------------------------------ 1358# ------------------------------------------------------------------------------
1133# @ebuild-function java-pkg_javac-args 1359# @ebuild-function java-pkg_javac-args
1134# 1360#
1135# If an ebuild uses javac directly, instead of using ejavac, it should call this 1361# If an ebuild uses javac directly, instead of using ejavac, it should call this
1136# to know what -source/-target to use. 1362# to know what -source/-target to use.
1137# 1363#
1138# @return string - arguments to pass to javac, complete with -target and -source 1364# @return string - arguments to pass to javac, complete with -target and -source
1141 debug-print-function ${FUNCNAME} $* 1367 debug-print-function ${FUNCNAME} $*
1142 1368
1143 local want_source="$(java-pkg_get-source)" 1369 local want_source="$(java-pkg_get-source)"
1144 local want_target="$(java-pkg_get-target)" 1370 local want_target="$(java-pkg_get-target)"
1145 1371
1146 local source_str="-source ${want_source}" 1372 local source_str="-source ${want_source}"
1147 local target_str="-target ${want_target}" 1373 local target_str="-target ${want_target}"
1148 1374
1149 debug-print "want source: ${want_source}" 1375 debug-print "want source: ${want_source}"
1150 debug-print "want target: ${want_target}" 1376 debug-print "want target: ${want_target}"
1151 1377
1152 if [[ -z "${want_source}" || -z "${want_target}" ]]; then 1378 if [[ -z "${want_source}" || -z "${want_target}" ]]; then
1153 debug-print "could not find valid -source/-target values" 1379 debug-print "could not find valid -source/-target values for javac"
1154 die "Could not find valid -source/-target values" 1380 echo "Could not find valid -source/-target values for javac"
1381 return 1
1155 else 1382 else
1156 if java-pkg_is-vm-version-ge "1.4"; then 1383 if java-pkg_is-vm-version-ge "1.4"; then
1157 echo "${source_str} ${target_str}" 1384 echo "${source_str} ${target_str}"
1158 else 1385 else
1159 echo "${target_str}" 1386 echo "${target_str}"
1163 1390
1164# TODO document 1391# TODO document
1165java-pkg_get-jni-cflags() { 1392java-pkg_get-jni-cflags() {
1166 local flags="-I${JAVA_HOME}/include" 1393 local flags="-I${JAVA_HOME}/include"
1167 1394
1395 local platform="linux"
1396 use elibc_FreeBSD && platform="freebsd"
1397
1168 # TODO do a check that the directories are valid 1398 # TODO do a check that the directories are valid
1169 # TODO figure out how to cope with other things than linux...
1170 flags="${flags} -I${JAVA_HOME}/include/linux" 1399 flags="${flags} -I${JAVA_HOME}/include/${platform}"
1171 1400
1172 echo ${flags} 1401 echo ${flags}
1173} 1402}
1174 1403
1175java-pkg_ensure-gcj() { 1404java-pkg_ensure-gcj() {
1180 ebeep 5 1409 ebeep 5
1181 die "No GCJ support found!" 1410 die "No GCJ support found!"
1182 fi 1411 fi
1183} 1412}
1184 1413
1414java-pkg_ensure-test() {
1415 if hasq test ${FEATURES} && ! hasq -test ${FEATURES} \
1416 && hasq test ${IUSE} && ! use test;
1417 then
1418 eerror "You specified FEATURES=test, but USE=test is needed"
1419 eerror "to pull in the additional dependencies for testing"
1420 die "Need USE=test enabled"
1421 fi
1422}
1423
1424# ------------------------------------------------------------------------------
1425# @ebuild-function java-pkg_register-ant-task
1426#
1427# Register this package as ant task, so that ant will load it when no specific
1428# ANT_TASKS are specified. Note that even without this registering, all packages
1429# specified in ANT_TASKS will be loaded. Mostly used by the actual ant tasks
1430# packages, but can be also used by other ebuilds that used to symlink their
1431# .jar into /usr/share/ant-core/lib to get autoloaded, for backwards
1432# compatibility.
1433#
1434# @param --version x.y Register only for ant version x.y (otherwise for any ant
1435# version). Used by the ant-* packages to prevent loading of mismatched
1436# ant-core ant tasks after core was updated, before the tasks are updated,
1437# without a need for blockers.
1438# @param $1 Name to register as. Defaults to JAVA_PKG_NAME ($PN[-$SLOT])
1439# ------------------------------------------------------------------------------
1440java-pkg_register-ant-task() {
1441 local TASKS_DIR="tasks"
1442
1443 # check for --version x.y parameters
1444 while [[ -n "${1}" && -n "${2}" ]]; do
1445 local var="${1#--}"
1446 local val="${2}"
1447 if [[ "${var}" == "version" ]]; then
1448 TASKS_DIR="tasks-${val}"
1449 else
1450 die "Unknown parameter passed to java-pkg_register-ant-tasks: ${1} ${2}"
1451 fi
1452 shift 2
1453 done
1454
1455 local TASK_NAME="${1:-${JAVA_PKG_NAME}}"
1456
1457 dodir /usr/share/ant/${TASKS_DIR}
1458 touch "${D}/usr/share/ant/${TASKS_DIR}/${TASK_NAME}"
1459}
1460
1461# ------------------------------------------------------------------------------
1462# @internal-function java-pkg_ant-tasks-from-deps
1463#
1464# Function to determine ANT_TASKS from DEPEND variable for backwards
1465# compatibility with ebuilds that don't set ANT_TASKS before calling eant() or
1466# WANT_ANT_TASKS before inheriting java-pkg-2. If the DEPEND string contains
1467# "dev-java/ant" or "dev-java/ant-tasks", then it returns "all", otherwise
1468# "none". It's not smart enough to cope with USE flag depends but that shouldn't
1469# be a problem, the worst it can do is activace all tasks when not needed.
1470# Note that this is called only with JAVA_PKG_STRICT=1, to find ebuilds with
1471# insufficient dependencies, otherwise all available tasks are used for
1472# backwards compatilbility.
1473#
1474# @return "all" or "none"
1475# ------------------------------------------------------------------------------
1476java-pkg_ant-tasks-from-deps() {
1477 local found_ant found_ant_tasks
1478
1479 for dep in ${DEPEND}
1480 do
1481 local ant="$(awk '/(dev-java\/ant)/ { if (match($1, "(dev-java/ant)((-[0-9])+|$)", m)) print m[1] }' <<< ${dep})"
1482 [[ "${ant}" == "dev-java/ant" ]] && found_ant=true
1483 [[ "${dep}" == *"ant-tasks"* ]] && found_ant_tasks=true
1484 done
1485
1486 if [[ -n "${found_ant}" || -n "${found_ant_tasks}" ]]; then
1487 java-pkg_announce-qa-violation "The ebuild DEPENDS on deprecated ant or ant-tasks"
1488 echo "all"
1489 else
1490 # ebuild doesn't set ANT_TASKS and doesn't depend on ant-tasks or ant
1491 # so we deactivate all tasks that may be installed
1492 echo "none"
1493 fi
1494}
1495
1496# ------------------------------------------------------------------------------
1497# @internal-function java-pkg_ant-tasks-depend
1498#
1499# Translates the WANT_ANT_TASKS variable into valid dependencies.
1500# ------------------------------------------------------------------------------
1501java-pkg_ant-tasks-depend() {
1502 debug-print-function ${FUNCNAME} ${WANT_ANT_TASKS}
1503
1504 if [[ -n "${WANT_ANT_TASKS}" ]]; then
1505 local DEP=""
1506 for i in ${WANT_ANT_TASKS}
1507 do
1508 if [[ ${i} != ant-* ]]; then
1509 echo "Invalid atom in WANT_ANT_TASKS: ${i}"
1510 return 1
1511 fi
1512 DEP="${DEP}dev-java/${i} "
1513 done
1514 echo ${DEP}
1515 return 0
1516 else
1517 return 0
1518 fi
1519}
1520
1185# ------------------------------------------------------------------------------ 1521# ------------------------------------------------------------------------------
1186# @section-end helper 1522# @section-end helper
1187# ------------------------------------------------------------------------------ 1523# ------------------------------------------------------------------------------
1188 1524
1189# ------------------------------------------------------------------------------ 1525# ------------------------------------------------------------------------------
1196 1532
1197# ------------------------------------------------------------------------------ 1533# ------------------------------------------------------------------------------
1198# @ebuild-function eant 1534# @ebuild-function eant
1199# 1535#
1200# Ant wrapper function. Will use the appropriate compiler, based on user-defined 1536# Ant wrapper function. Will use the appropriate compiler, based on user-defined
1201# compiler. 1537# compiler. Will also set proper ANT_TASKS from the variable ANT_TASKS,
1202# 1538# variables:
1539# EANT_GENTOO_CLASSPATH - calls java-pkg_getjars for the value and adds to the
1540# gentoo.classpath property. Be sure to call
1541# java-ant_rewrite-classpath in src_unpack.
1542# *ANT_TASKS - used to determine ANT_TASKS before calling Ant.
1203# ------------------------------------------------------------------------------ 1543# ------------------------------------------------------------------------------
1204eant() { 1544eant() {
1205 debug-print-function ${FUNCNAME} $* 1545 debug-print-function ${FUNCNAME} $*
1206 1546
1207 local antflags 1547 # FIXME get this working
1548# if is-java-strict && [[ ! ${DEPEND} =~ "dev-java/ant" ]]; then
1549# java-pkg_announce-qa-violation \
1550# "Using eant, but not depending on dev-java/ant or dev-java/ant-core"
1551# fi
1552
1553 if ! hasq java-ant-2 ${INHERITED} && is-java-strict; then
1554 local msg="You should inherit java-ant-2 when using eant"
1555 java-pkg_announce-qa-violation ${msg}
1556 die ${msg}
1557 fi
1558
1559 local antflags="-Dnoget=true -Dmaven.mode.offline=true"
1560
1208 java-pkg_init-compiler_ 1561 java-pkg_init-compiler_
1209 local compiler="${GENTOO_COMPILER}" 1562 local compiler="${GENTOO_COMPILER}"
1210 1563
1211 local compiler_env="${JAVA_PKG_COMPILER_DIR}/${compiler}" 1564 local compiler_env="${JAVA_PKG_COMPILER_DIR}/${compiler}"
1212 1565
1214 if [[ "${compiler}" != "javac" && -z "${build_compiler}" ]]; then 1567 if [[ "${compiler}" != "javac" && -z "${build_compiler}" ]]; then
1215 die "ANT_BUILD_COMPILER undefined in ${compiler_env}" 1568 die "ANT_BUILD_COMPILER undefined in ${compiler_env}"
1216 fi 1569 fi
1217 1570
1218 if [[ ${compiler} != "javac" ]]; then 1571 if [[ ${compiler} != "javac" ]]; then
1219 antflags="-Dbuild.compiler=${build_compiler}" 1572 antflags="${antflags} -Dbuild.compiler=${build_compiler}"
1220 # Figure out any extra stuff to put on the classpath for compilers aside 1573 # Figure out any extra stuff to put on the classpath for compilers aside
1221 # from javac 1574 # from javac
1222 # ANT_BUILD_COMPILER_DEPS should be something that could be passed to 1575 # ANT_BUILD_COMPILER_DEPS should be something that could be passed to
1223 # java-config -p 1576 # java-config -p
1224 local build_compiler_deps="$(source ${JAVA_PKG_COMPILER_DIR}/${compiler} 1>/dev/null 2>&1; echo ${ANT_BUILD_COMPILER_DEPS})" 1577 local build_compiler_deps="$(source ${JAVA_PKG_COMPILER_DIR}/${compiler} 1>/dev/null 2>&1; echo ${ANT_BUILD_COMPILER_DEPS})"
1229 1582
1230 if is-java-strict; then 1583 if is-java-strict; then
1231 einfo "Disabling system classpath for ant" 1584 einfo "Disabling system classpath for ant"
1232 antflags="${antflags} -Dbuild.sysclasspath=ignore" 1585 antflags="${antflags} -Dbuild.sysclasspath=ignore"
1233 fi 1586 fi
1234 1587
1235 if [[ -n ${JAVA_PKG_DEBUG} ]]; then 1588 for arg in "${@}"; do
1236 antflags="${antflags} -debug" 1589 if [[ ${arg} = -lib ]]; then
1590 if is-java-strict; then
1591 eerror "You should not use the -lib argument to eant because it will fail"
1592 eerror "with JAVA_PKG_STRICT. Please use for example java-pkg_jar-from"
1593 eerror "or ant properties to make dependencies available."
1594 eerror "For ant tasks use WANT_ANT_TASKS or ANT_TASKS from."
1595 eerror "split ant (>=dev-java/ant-core-1.7)."
1596 die "eant -lib is deprecated/forbidden"
1597 else
1598 echo "eant -lib is deprecated. Turn JAVA_PKG_STRICT on for"
1599 echo "more info."
1600 fi
1237 fi 1601 fi
1238 1602 done
1603
1604 if has_version ">=dev-java/ant-core-1.7.0"; then
1605 # default ANT_TASKS to WANT_ANT_TASKS, if ANT_TASKS is not set explicitly
1606 ANT_TASKS="${ANT_TASKS:-${WANT_ANT_TASKS}}"
1607
1608 # override ANT_TASKS with JAVA_PKG_FORCE_ANT_TASKS if it's set
1609 ANT_TASKS="${JAVA_PKG_FORCE_ANT_TASKS:-${ANT_TASKS}}"
1610
1611 if is-java-strict; then
1612 # if ant-tasks were not set by ebuild or forced, try to determine them from depends
1613 if [[ -z "${ANT_TASKS}" ]]; then
1614 ANT_TASKS="$(java-pkg_ant-tasks-from-deps)"
1615 fi
1616 else
1617 # if ant-tasks is not set by ebuild or forced, activate all of them
1618 ANT_TASKS="${ANT_TASKS:-all}"
1619 fi
1620
1621 # at this point, ANT_TASKS should be "all", "none" or explicit list
1622 if [[ "${ANT_TASKS}" == "all" ]]; then
1623 einfo "Using all available ANT_TASKS"
1624 elif [[ "${ANT_TASKS}" == "none" ]]; then
1625 einfo "Disabling all optional ANT_TASKS"
1626 else
1627 einfo "Using following ANT_TASKS: ${ANT_TASKS}"
1628 fi
1629
1630 export ANT_TASKS
1631 fi
1632
1633 [[ -n ${JAVA_PKG_DEBUG} ]] && antflags="${antflags} --execdebug -debug"
1634 [[ -n ${PORTAGE_QUIET} ]] && antflags="${antflags} -q"
1635
1636 local gcp="${EANT_GENTOO_CLASSPATH}"
1637
1638 if [[ ${EBUILD_PHASE} = "test" ]]; then
1639 antflags="${antflags} -DJunit.present=true"
1640 [[ ${gcp} && ${ANT_TASKS} = *ant-junit* ]] && gcp="${gcp} junit"
1641 fi
1642
1643 local cp
1644
1645 for atom in ${gcp}; do
1646 cp="${cp}:$(java-pkg_getjars ${atom})"
1647 done
1648
1649 if [[ ${cp} ]]; then
1650 # It seems ant does not like single quotes around ${cp}
1651 antflags="${antflags} -Dgentoo.classpath=\"${cp#:}\""
1652 fi
1653
1239 [[ -n ${JAVA_PKG_DEBUG} ]] && echo ant ${antflags} "${@}" 1654 [[ -n ${JAVA_PKG_DEBUG} ]] && echo ant ${antflags} "${@}"
1655 debug-print "Calling ant: ${antflags} ${@}"
1240 ant ${antflags} "${@}" || die "eant failed" 1656 ant ${antflags} "${@}" || die "eant failed"
1241 1657
1242} 1658}
1243 1659
1244# ------------------------------------------------------------------------------ 1660# ------------------------------------------------------------------------------
1245# @ebuild-function ejavac 1661# @ebuild-function ejavac
1246# 1662#
1247# Javac wrapper function. Will use the appropriate compiler, based on 1663# Javac wrapper function. Will use the appropriate compiler, based on
1248# /etc/java-config/compilers.conf 1664# /etc/java-config/compilers.conf
1249# 1665#
1250# @param $@ - Arguments to be passed to the compiler 1666# @param $@ - Arguments to be passed to the compiler
1251# ------------------------------------------------------------------------------ 1667# ------------------------------------------------------------------------------
1252ejavac() { 1668ejavac() {
1253 debug-print-function ${FUNCNAME} $* 1669 debug-print-function ${FUNCNAME} $*
1254 1670
1255 # FIXME using get-javac ends up printing stuff with einfo 1671 java-pkg_init-compiler_
1672
1673 local compiler_executable
1256# local compiler_executable=$(java-pkg_get-javac) 1674 compiler_executable=$(java-pkg_get-javac)
1257 local compiler_executable="javac" 1675 if [[ ${?} != 0 ]]; then
1676 eerror "There was a problem determining compiler: ${compiler_executable}"
1677 die "get-javac failed"
1678 fi
1258 1679
1680 local javac_args
1681 javac_args="$(java-pkg_javac-args)"
1682 if [[ ${?} != 0 ]]; then
1683 eerror "There was a problem determining JAVACFLAGS: ${javac_args}"
1684 die "java-pkg_javac-args failed"
1685 fi
1686
1259 [[ -n ${JAVA_PKG_DEBUG} ]] && echo ${compiler_executable} $(java-pkg_javac-args) "${@}" 1687 [[ -n ${JAVA_PKG_DEBUG} ]] && echo ${compiler_executable} ${javac_args} "${@}"
1260 ${compiler_executable} $(java-pkg_javac-args) "${@}" || die "ejavac failed" 1688 ${compiler_executable} ${javac_args} "${@}" || die "ejavac failed"
1261} 1689}
1262 1690
1263# ------------------------------------------------------------------------------ 1691# ------------------------------------------------------------------------------
1264# @ebuild-function java-pkg_filter-compiler 1692# @ebuild-function java-pkg_filter-compiler
1265# 1693#
1266# Used to prevent the use of some compilers. Should be used in src_compile. 1694# Used to prevent the use of some compilers. Should be used in src_compile.
1267# Basically, it just appends onto JAVA_PKG_FILTER_COMPILER 1695# Basically, it just appends onto JAVA_PKG_FILTER_COMPILER
1268# 1696#
1269# @param $@ - compilers to filter 1697# @param $@ - compilers to filter
1270# ------------------------------------------------------------------------------ 1698# ------------------------------------------------------------------------------
1288# ------------------------------------------------------------------------------ 1716# ------------------------------------------------------------------------------
1289# @ebuild-function use_doc 1717# @ebuild-function use_doc
1290# 1718#
1291# Helper function for getting ant to build javadocs. If the user has USE=doc, 1719# Helper function for getting ant to build javadocs. If the user has USE=doc,
1292# then 'javadoc' or the argument are returned. Otherwise, there is no return. 1720# then 'javadoc' or the argument are returned. Otherwise, there is no return.
1293# 1721#
1294# The output of this should be passed to ant. 1722# The output of this should be passed to ant.
1295# 1723#
1296# Example: build javadocs by calling 'javadoc' target 1724# Example: build javadocs by calling 'javadoc' target
1297# eant $(use_doc) 1725# eant $(use_doc)
1298# Example: build javadocs by calling 'apidoc' target 1726# Example: build javadocs by calling 'apidoc' target
1303# ------------------------------------------------------------------------------ 1731# ------------------------------------------------------------------------------
1304use_doc() { 1732use_doc() {
1305 use doc && echo ${@:-javadoc} 1733 use doc && echo ${@:-javadoc}
1306} 1734}
1307 1735
1736
1308# ------------------------------------------------------------------------------ 1737# ------------------------------------------------------------------------------
1309# @section-end build 1738# @section-end build
1310# ------------------------------------------------------------------------------ 1739# ------------------------------------------------------------------------------
1311 1740
1312# ------------------------------------------------------------------------------ 1741# ------------------------------------------------------------------------------
1313# @section-begin internal 1742# @section-begin internal
1314# @section-summary Internal functions 1743# @section-summary Internal functions
1315# 1744#
1316# Do __NOT__ use any of these from an ebuild! These are only to be used from 1745# Do __NOT__ use any of these from an ebuild! These are only to be used from
1317# within the java eclasses. 1746# within the java eclasses.
1318# ------------------------------------------------------------------------------ 1747# ------------------------------------------------------------------------------
1319 1748
1320# ----------------------------------------------------------------------------- 1749# -----------------------------------------------------------------------------
1321# @function-internal java-pkg_init 1750# @function-internal java-pkg_init
1322# 1751#
1323# The purpose of this function, as the name might imply, is to initialize the 1752# The purpose of this function, as the name might imply, is to initialize the
1324# Java environment. It ensures that that there aren't any environment variables 1753# Java environment. It ensures that that there aren't any environment variables
1325# that'll muss things up. It initializes some variables, which are used 1754# that'll muss things up. It initializes some variables, which are used
1326# internally. And most importantly, it'll switch the VM if necessary. 1755# internally. And most importantly, it'll switch the VM if necessary.
1327# 1756#
1339 # TODO we will probably want to set JAVAC and JAVACFLAGS 1768 # TODO we will probably want to set JAVAC and JAVACFLAGS
1340 1769
1341 # Do some QA checks 1770 # Do some QA checks
1342 java-pkg_check-jikes 1771 java-pkg_check-jikes
1343 1772
1344 # When users have crazy classpaths some packages can fail to compile. 1773 # When users have crazy classpaths some packages can fail to compile.
1345 # and everything should work with empty CLASSPATH. 1774 # and everything should work with empty CLASSPATH.
1346 # This also helps prevent unexpected dependencies on random things 1775 # This also helps prevent unexpected dependencies on random things
1347 # from the CLASSPATH. 1776 # from the CLASSPATH.
1348 unset CLASSPATH 1777 unset CLASSPATH
1778
1779 # Unset external ANT_ stuff
1780 unset ANT_TASKS
1781 unset ANT_OPTS
1349} 1782}
1350 1783
1351# ------------------------------------------------------------------------------ 1784# ------------------------------------------------------------------------------
1352# @function-internal java-pkg-init-compiler_ 1785# @function-internal java-pkg-init-compiler_
1353# 1786#
1354# This function attempts to figure out what compiler should be used. It does 1787# This function attempts to figure out what compiler should be used. It does
1355# this by reading the file at JAVA_PKG_COMPILERS_CONF, and checking the 1788# this by reading the file at JAVA_PKG_COMPILERS_CONF, and checking the
1356# COMPILERS variable defined there. 1789# COMPILERS variable defined there.
1357# This can be overridden by a list in JAVA_PKG_FORCE_COMPILER 1790# This can be overridden by a list in JAVA_PKG_FORCE_COMPILER
1358# 1791#
1359# It will go through the list of compilers, and verify that it supports the 1792# It will go through the list of compilers, and verify that it supports the
1360# target and source that are needed. If it is not suitable, then the next 1793# target and source that are needed. If it is not suitable, then the next
1361# compiler is checked. When JAVA_PKG_FORCE_COMPILER is defined, this checking 1794# compiler is checked. When JAVA_PKG_FORCE_COMPILER is defined, this checking
1362# isn't done. 1795# isn't done.
1363# 1796#
1385 if [[ -z ${JAVA_PKG_FORCE_COMPILER} ]]; then 1818 if [[ -z ${JAVA_PKG_FORCE_COMPILER} ]]; then
1386 compilers="$(source ${JAVA_PKG_COMPILERS_CONF} 1>/dev/null 2>&1; echo ${COMPILERS})" 1819 compilers="$(source ${JAVA_PKG_COMPILERS_CONF} 1>/dev/null 2>&1; echo ${COMPILERS})"
1387 else 1820 else
1388 compilers=${JAVA_PKG_FORCE_COMPILER} 1821 compilers=${JAVA_PKG_FORCE_COMPILER}
1389 fi 1822 fi
1390 1823
1391 debug-print "Read \"${compilers}\" from ${JAVA_PKG_COMPILERS_CONF}" 1824 debug-print "Read \"${compilers}\" from ${JAVA_PKG_COMPILERS_CONF}"
1392 1825
1393 # Figure out if we should announce what compiler we're using 1826 # Figure out if we should announce what compiler we're using
1394 local compiler 1827 local compiler
1395 for compiler in ${compilers}; do 1828 for compiler in ${compilers}; do
1398 if [[ ${compiler} = "javac" ]]; then 1831 if [[ ${compiler} = "javac" ]]; then
1399 debug-print "Found javac... breaking" 1832 debug-print "Found javac... breaking"
1400 export GENTOO_COMPILER="javac" 1833 export GENTOO_COMPILER="javac"
1401 break 1834 break
1402 fi 1835 fi
1403 1836
1404 if has ${compiler} ${JAVA_PKG_FILTER_COMPILER}; then 1837 if has ${compiler} ${JAVA_PKG_FILTER_COMPILER}; then
1405 if [[ -z ${JAVA_PKG_FORCE_COMPILER} ]]; then 1838 if [[ -z ${JAVA_PKG_FORCE_COMPILER} ]]; then
1406 einfo "Filtering ${compiler}" 1839 einfo "Filtering ${compiler}"
1407 continue 1840 continue
1408 fi 1841 fi
1409 fi 1842 fi
1410 1843
1411 # for non-javac, we need to make sure it supports the right target and 1844 # for non-javac, we need to make sure it supports the right target and
1412 # source 1845 # source
1413 local compiler_env="${JAVA_PKG_COMPILER_DIR}/${compiler}" 1846 local compiler_env="${JAVA_PKG_COMPILER_DIR}/${compiler}"
1414 if [[ -f ${compiler_env} ]]; then 1847 if [[ -f ${compiler_env} ]]; then
1415 local desired_target="$(java-pkg_get-target)" 1848 local desired_target="$(java-pkg_get-target)"
1497# Writes the package.env out to disk. 1930# Writes the package.env out to disk.
1498# 1931#
1499# ------------------------------------------------------------------------------ 1932# ------------------------------------------------------------------------------
1500# TODO change to do-write, to match everything else 1933# TODO change to do-write, to match everything else
1501java-pkg_do_write_() { 1934java-pkg_do_write_() {
1935 java-pkg_init_paths_
1502 # Create directory for package.env 1936 # Create directory for package.env
1503 dodir "${JAVA_PKG_SHAREPATH}" 1937 dodir "${JAVA_PKG_SHAREPATH}"
1504 if [[ -n "${JAVA_PKG_CLASSPATH}" || -n "${JAVA_PKG_LIBRARY}" || -f "${JAVA_PKG_DEPEND}" ]]; then 1938 if [[ -n "${JAVA_PKG_CLASSPATH}" || -n "${JAVA_PKG_LIBRARY}" || -f "${JAVA_PKG_DEPEND}" ]]; then
1505 # Create package.env 1939 # Create package.env
1506 ( 1940 (
1511 [[ -n "${JAVA_PKG_LIBRARY}" ]] && echo "LIBRARY_PATH=\"${JAVA_PKG_LIBRARY}\"" 1945 [[ -n "${JAVA_PKG_LIBRARY}" ]] && echo "LIBRARY_PATH=\"${JAVA_PKG_LIBRARY}\""
1512 [[ -n "${JAVA_PROVIDE}" ]] && echo "PROVIDES=\"${JAVA_PROVIDE}\"" 1946 [[ -n "${JAVA_PROVIDE}" ]] && echo "PROVIDES=\"${JAVA_PROVIDE}\""
1513 [[ -f "${JAVA_PKG_DEPEND}" ]] && echo "DEPEND=\"$(cat ${JAVA_PKG_DEPEND} | uniq | tr '\n' ':')\"" 1947 [[ -f "${JAVA_PKG_DEPEND}" ]] && echo "DEPEND=\"$(cat ${JAVA_PKG_DEPEND} | uniq | tr '\n' ':')\""
1514 echo "VM=\"$(echo ${RDEPEND} ${DEPEND} | sed -e 's/ /\n/g' | sed -n -e '/virtual\/\(jre\|jdk\)/ { p;q }')\"" # TODO cleanup ! 1948 echo "VM=\"$(echo ${RDEPEND} ${DEPEND} | sed -e 's/ /\n/g' | sed -n -e '/virtual\/\(jre\|jdk\)/ { p;q }')\"" # TODO cleanup !
1515 ) > "${JAVA_PKG_ENV}" 1949 ) > "${JAVA_PKG_ENV}"
1516 1950
1517 # register target/source 1951 # register target/source
1518 local target="$(java-pkg_get-target)" 1952 local target="$(java-pkg_get-target)"
1519 local source="$(java-pkg_get-source)" 1953 local source="$(java-pkg_get-source)"
1520 [[ -n ${target} ]] && echo "TARGET=\"${target}\"" >> "${JAVA_PKG_ENV}" 1954 [[ -n ${target} ]] && echo "TARGET=\"${target}\"" >> "${JAVA_PKG_ENV}"
1521 [[ -n ${source} ]] && echo "SOURCE=\"${source}\"" >> "${JAVA_PKG_ENV}" 1955 [[ -n ${source} ]] && echo "SOURCE=\"${source}\"" >> "${JAVA_PKG_ENV}"
1534 # Strip unnecessary leading and trailing colons 1968 # Strip unnecessary leading and trailing colons
1535 # TODO try to cleanup if possible 1969 # TODO try to cleanup if possible
1536 sed -e "s/=\":/=\"/" -e "s/:\"$/\"/" -i "${JAVA_PKG_ENV}" || die "Did you forget to call java_init ?" 1970 sed -e "s/=\":/=\"/" -e "s/:\"$/\"/" -i "${JAVA_PKG_ENV}" || die "Did you forget to call java_init ?"
1537 fi 1971 fi
1538} 1972}
1539
1540 1973
1541# ------------------------------------------------------------------------------ 1974# ------------------------------------------------------------------------------
1542# @internal-function java-pkg_record-jar_ 1975# @internal-function java-pkg_record-jar_
1543# 1976#
1544# Record a dependency to the package.env 1977# Record a dependency to the package.env
1588 fi 2021 fi
1589} 2022}
1590 2023
1591# ------------------------------------------------------------------------------ 2024# ------------------------------------------------------------------------------
1592# @internal-function java-pkg_expand_dir_ 2025# @internal-function java-pkg_expand_dir_
1593# 2026#
1594# Gets the full path of the file/directory's parent. 2027# Gets the full path of the file/directory's parent.
1595# @param $1 - file/directory to find parent directory for 2028# @param $1 - file/directory to find parent directory for
1596# @return - path to $1's parent directory 2029# @return - path to $1's parent directory
1597# ------------------------------------------------------------------------------ 2030# ------------------------------------------------------------------------------
1598java-pkg_expand_dir_() { 2031java-pkg_expand_dir_() {
1625# ------------------------------------------------------------------------------ 2058# ------------------------------------------------------------------------------
1626java-pkg_setup-vm() { 2059java-pkg_setup-vm() {
1627 debug-print-function ${FUNCNAME} $* 2060 debug-print-function ${FUNCNAME} $*
1628 2061
1629 local vendor="$(java-pkg_get-vm-vendor)" 2062 local vendor="$(java-pkg_get-vm-vendor)"
1630 if [[ "${vendor}" == "sun" ]] && java-pkg_is-vm-version-ge 1 5; then 2063 if [[ "${vendor}" == "sun" ]] && java-pkg_is-vm-version-ge "1.5" ; then
1631 addpredict "/dev/random" 2064 addpredict "/dev/random"
1632 elif [[ "${vendor}" == "ibm" ]]; then 2065 elif [[ "${vendor}" == "ibm" ]]; then
1633 addpredict "/proc/self/maps" 2066 addpredict "/proc/self/maps"
1634 addpredict "/proc/cpuinfo" 2067 addpredict "/proc/cpuinfo"
1635 export LANG="C" LC_ALL="C" 2068 export LANG="C" LC_ALL="C"
1684# @return - The version of the current VM 2117# @return - The version of the current VM
1685# ------------------------------------------------------------------------------ 2118# ------------------------------------------------------------------------------
1686java-pkg_get-vm-version() { 2119java-pkg_get-vm-version() {
1687 debug-print-function ${FUNCNAME} $* 2120 debug-print-function ${FUNCNAME} $*
1688 2121
1689 java-pkg_get-current-vm | sed -e "s/.*-\([0-9.]\+\).*/\1/" 2122 java-config -g PROVIDES_VERSION
1690} 2123}
1691 2124
1692# ------------------------------------------------------------------------------ 2125# ------------------------------------------------------------------------------
1693# @internal-function java-pkg_switch-vm 2126# @internal-function java-pkg_switch-vm
1694# 2127#
1695# Switch VM if we're allowed to (controlled by JAVA_PKG_ALLOW_VM_CHANGE), and 2128# Switch VM if we're allowed to (controlled by JAVA_PKG_ALLOW_VM_CHANGE), and
1696# verify that the current VM is sufficient. 2129# verify that the current VM is sufficient.
1697# Setup the environment for the VM being used. 2130# Setup the environment for the VM being used.
1698# ------------------------------------------------------------------------------ 2131# ------------------------------------------------------------------------------
1699java-pkg_switch-vm() { 2132java-pkg_switch-vm() {
2133 debug-print-function ${FUNCNAME} $*
2134
1700 if java-pkg_needs-vm; then 2135 if java-pkg_needs-vm; then
1701 # Use the VM specified by JAVA_PKG_FORCE_VM 2136 # Use the VM specified by JAVA_PKG_FORCE_VM
1702 if [[ -n ${JAVA_PKG_FORCE_VM} ]]; then 2137 if [[ -n "${JAVA_PKG_FORCE_VM}" ]]; then
1703 # If you're forcing the VM, I hope you know what your doing... 2138 # If you're forcing the VM, I hope you know what your doing...
2139 debug-print "JAVA_PKG_FORCE_VM used: ${JAVA_PKG_FORCE_VM}"
1704 export GENTOO_VM="${JAVA_PKG_FORCE_VM}" 2140 export GENTOO_VM="${JAVA_PKG_FORCE_VM}"
1705 # if we're allowed to switch the vm... 2141 # if we're allowed to switch the vm...
1706 elif [[ "${JAVA_PKG_ALLOW_VM_CHANGE}" == "yes" ]]; then 2142 elif [[ "${JAVA_PKG_ALLOW_VM_CHANGE}" == "yes" ]]; then
1707 debug-print "depend-java-query: NV_DEPEND: ${JAVA_PKG_NV_DEPEND:-${DEPEND}} VNEED: ${JAVA_PKG_VNEED}" 2143 debug-print "depend-java-query: NV_DEPEND: ${JAVA_PKG_NV_DEPEND:-${DEPEND}} VNEED: ${JAVA_PKG_VNEED}"
1708 if [[ -n ${JAVA_PKG_VNEED} ]]; then 2144 if [[ -n ${JAVA_PKG_VNEED} ]]; then
1709 export GENTOO_VM="$(depend-java-query --need-virtual "${JAVA_PKG_VNEED}" --get-vm "${JAVA_PKG_NV_DEPEND:-${DEPEND}}")" 2145 GENTOO_VM="$(depend-java-query --need-virtual "${JAVA_PKG_VNEED}" --get-vm "${JAVA_PKG_NV_DEPEND:-${DEPEND}}")"
1710 else 2146 else
1711 export GENTOO_VM="$(depend-java-query --get-vm "${JAVA_PKG_NV_DEPEND:-${DEPEND}}")" 2147 GENTOO_VM="$(depend-java-query --get-vm "${JAVA_PKG_NV_DEPEND:-${DEPEND}}")"
2148 fi
2149 if [[ -z "${GENTOO_VM}" || "${GENTOO_VM}" == "None" ]]; then
2150 eerror "Unable to determine VM for building from dependencies:"
2151 echo "NV_DEPEND: ${JAVA_PKG_NV_DEPEND:-${DEPEND}}"
2152 echo "VNEED: ${JAVA_PKG_VNEED}"
2153 die "Failed to determine VM for building."
2154 else
2155 export GENTOO_VM
1712 fi 2156 fi
1713 # otherwise just make sure the current VM is sufficient 2157 # otherwise just make sure the current VM is sufficient
1714 else 2158 else
1715 java-pkg_ensure-vm-version-sufficient 2159 java-pkg_ensure-vm-version-sufficient
1716 fi 2160 fi
1717 debug-print "Using: $(java-config -f)" 2161 debug-print "Using: $(java-config -f)"
1718 2162
1719 java-pkg_setup-vm 2163 java-pkg_setup-vm
1720 2164
1721 export JAVA=$(java-config --java) 2165 export JAVA=$(java-config --java)
1722 export JAVAC=$(java-config --javac) 2166 export JAVAC=$(java-config --javac)
1723 export JAVACFLAGS="$(java-pkg_javac-args)" 2167 JAVACFLAGS="$(java-pkg_javac-args)"
2168 if [[ ${?} != 0 ]]; then
2169 eerror "There was a problem determining JAVACFLAGS: ${JAVACFLAGS}"
2170 die "java-pkg_javac-args failed"
2171 fi
1724 [[ -n ${JAVACFLAGS_EXTRA} ]] && export JAVACFLAGS="${JAVACFLAGS_EXTRA} ${JAVACFLAGS}" 2172 [[ -n ${JAVACFLAGS_EXTRA} ]] && JAVACFLAGS="${JAVACFLAGS_EXTRA} ${JAVACFLAGS}"
2173 export JAVACFLAGS
1725 2174
1726 export JAVA_HOME="$(java-config -g JAVA_HOME)" 2175 export JAVA_HOME="$(java-config -g JAVA_HOME)"
1727 export JDK_HOME=${JAVA_HOME} 2176 export JDK_HOME=${JAVA_HOME}
1728 2177
1729 #TODO If you know a better solution let us know. 2178 #TODO If you know a better solution let us know.
1730 java-pkg_append_ LD_LIBRARY_PATH "$(java-config -g LDPATH)" 2179 java-pkg_append_ LD_LIBRARY_PATH "$(java-config -g LDPATH)"
1731 2180
1732 local tann="${T}/announced-vm" 2181 local tann="${T}/announced-vm"
1733 if [[ -n "${JAVA_PKG_DEBUG}" ]] || [[ ! -f "${tann}" ]] ; then 2182 if [[ -n "${JAVA_PKG_DEBUG}" ]] || [[ ! -f "${tann}" ]] ; then
1734 # Add a check for setup/preinst phase... to avoid duplicate outputs 2183 # Add a check for setup/preinst phase... to avoid duplicate outputs
1735 # for when FEATURES=buildpkg 2184 # for when FEATURES=buildpkg
1736 if [[ ${EBUILD_PHASE} != "setup" && ${EBUILD_PHASE} != "preinst" && ${EBUILD_PHASE} != "postinst" ]]; 2185 if [[ ${EBUILD_PHASE} != "setup" && ${EBUILD_PHASE} != "preinst" && ${EBUILD_PHASE} != "postinst" ]];
1775 einfo "Classes" 2224 einfo "Classes"
1776 find "${S}" -type f -name '*.class' -print0 | xargs -0 -r -n 500 ls -ald | sed -e "s,${WORKDIR},\${WORKDIR}," 2225 find "${S}" -type f -name '*.class' -print0 | xargs -0 -r -n 500 ls -ald | sed -e "s,${WORKDIR},\${WORKDIR},"
1777 fi 2226 fi
1778} 2227}
1779 2228
1780# TODO document 2229# ------------------------------------------------------------------------------
2230# @internal-function java-pkg_verify-classes
2231#
1781# Verify that the classes were compiled for the right source / target 2232# Verify that the classes were compiled for the right source / target. Dies if
2233# not.
2234# @param $1 (optional) - the file to check, otherwise checks whole ${D}
2235# ------------------------------------------------------------------------------
1782java-pkg_verify-classes() { 2236java-pkg_verify-classes() {
1783 ebegin "Verifying java class versions"
1784 #$(find ${D} -type f -name '*.jar' -o -name '*.class') 2237 #$(find ${D} -type f -name '*.jar' -o -name '*.class')
1785 class-version-verify.py -t $(java-pkg_get-target) -r ${D} 2238 local target=$(java-pkg_get-target)
2239 local result
2240 local log="${T}/class-version-verify.log"
2241 if [[ -n "${1}" ]]; then
2242 class-version-verify.py -v -t ${target} "${1}" > "${log}"
1786 result=$? 2243 result=$?
1787 eend ${result}
1788 if [[ ${result} == 0 ]]; then
1789 einfo "All good"
1790 else 2244 else
1791 ewarn "Possible problem" 2245 ebegin "Verifying java class versions (target: ${target})"
1792 die "Bad class files found" 2246 class-version-verify.py -v -t ${target} -r "${D}" > "${log}"
2247 result=$?
2248 eend ${result}
1793 fi 2249 fi
2250 [[ -n ${JAVA_PKG_DEBUG} ]] && cat "${log}"
2251 if [[ ${result} != 0 ]]; then
2252 eerror "Incorrect bytecode version found"
2253 [[ -n "${1}" ]] && eerror "in file: ${1}"
2254 eerror "See ${log} for more details."
2255 die "Incorrect bytecode found"
2256 fi
1794} 2257}
1795
1796 2258
1797# ------------------------------------------------------------------------------ 2259# ------------------------------------------------------------------------------
1798# @section-end internal 2260# @section-end internal
1799# ------------------------------------------------------------------------------ 2261# ------------------------------------------------------------------------------
1800 2262
1832 let "JAVA_PKG_QA_VIOLATIONS+=1" 2294 let "JAVA_PKG_QA_VIOLATIONS+=1"
1833 export JAVA_PKG_QA_VIOLATIONS 2295 export JAVA_PKG_QA_VIOLATIONS
1834} 2296}
1835 2297
1836is-java-strict() { 2298is-java-strict() {
1837 hasq java-strict ${FEATURES}; 2299 [[ -n ${JAVA_PKG_STRICT} ]]
1838 return $? 2300 return $?
1839} 2301}
1840 2302
1841# ------------------------------------------------------------------------------ 2303# ------------------------------------------------------------------------------
1842# @eclass-end 2304# @eclass-end

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

  ViewVC Help
Powered by ViewVC 1.1.20