/[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.70
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.70 2007/04/17 09:16:22 ali_bush 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# -----------------------------------------------------------------------------
61# @variable-internal JAVA_PKG_PORTAGE_DEP
62#
63# The version of portage we need to function properly. At this moment it's
64# portage with phase hooks support.
65# -----------------------------------------------------------------------------
39JAVA_PKG_PORTAGE_DEP=">=sys-apps/portage-2.1_pre1" 66JAVA_PKG_PORTAGE_DEP=">=sys-apps/portage-2.1_pre1"
40 67
41# ----------------------------------------------------------------------------- 68# -----------------------------------------------------------------------------
42# @variable-internal JAVA_PKG_E_DEPEND 69# @variable-internal JAVA_PKG_E_DEPEND
43# 70#
44# This is a convience variable to be used from the other java eclasses. This is 71# This is a convience variable to be used from the other java eclasses. This is
45# the version of java-config we want to use. We also need a recent version 72# the version of java-config we want to use. We also need a recent version
46# portage, that includes phase hooks. 73# portage, that includes phase hooks.
47# ----------------------------------------------------------------------------- 74# -----------------------------------------------------------------------------
48JAVA_PKG_E_DEPEND=">=dev-java/java-config-2.0.19-r1 ${JAVA_PKG_PORTAGE_DEP}" 75JAVA_PKG_E_DEPEND=">=dev-java/java-config-2.0.31 ${JAVA_PKG_PORTAGE_DEP}"
49 76
50# ----------------------------------------------------------------------------- 77# -----------------------------------------------------------------------------
51# @variable-external JAVA_PKG_ALLOW_VM_CHANGE 78# @variable-external JAVA_PKG_ALLOW_VM_CHANGE
52# @variable-default yes 79# @variable-default yes
53# 80#
100# ----------------------------------------------------------------------------- 127# -----------------------------------------------------------------------------
101 128
102# ----------------------------------------------------------------------------- 129# -----------------------------------------------------------------------------
103# @variable-internal JAVA_PKG_COMPILER_DIR 130# @variable-internal JAVA_PKG_COMPILER_DIR
104# @default /usr/share/java-config-2/compiler 131# @default /usr/share/java-config-2/compiler
105# 132#
106# Directory where compiler settings are saved, without trailing slash. 133# Directory where compiler settings are saved, without trailing slash.
107# Probably shouldn't touch this variable. 134# Probably shouldn't touch this variable.
108# ----------------------------------------------------------------------------- 135# -----------------------------------------------------------------------------
109JAVA_PKG_COMPILER_DIR=${JAVA_PKG_COMPILER_DIR:="/usr/share/java-config-2/compiler"} 136JAVA_PKG_COMPILER_DIR=${JAVA_PKG_COMPILER_DIR:="/usr/share/java-config-2/compiler"}
110 137
120 147
121# ----------------------------------------------------------------------------- 148# -----------------------------------------------------------------------------
122# @variable-external JAVA_PKG_FORCE_COMPILER 149# @variable-external JAVA_PKG_FORCE_COMPILER
123# 150#
124# Explicitly set a list of compilers to use. This is normally read from 151# Explicitly set a list of compilers to use. This is normally read from
125# JAVA_PKG_COMPILERS_CONF. 152# JAVA_PKG_COMPILERS_CONF.
126# 153#
127# @note This should only be used internally or for testing. 154# @note This should only be used internally or for testing.
128# @example Use jikes and javac, in that order 155# @example Use jikes and javac, in that order
129# JAVA_PKG_FORCE_COMPILER="jikes javac" 156# JAVA_PKG_FORCE_COMPILER="jikes javac"
130# ----------------------------------------------------------------------------- 157# -----------------------------------------------------------------------------
131 158
159# -----------------------------------------------------------------------------
160# @variable-external JAVA_PKG_FORCE_ANT_TASKS
161#
162# An $IFS separated list of ant tasks. Can be set in environment before calling
163# emerge/ebuild to override variables set in ebuild, mainly for testing before
164# putting the resulting (WANT_)ANT_TASKS into ebuild. Affects only ANT_TASKS in
165# eant() call, not the dependencies specified in WANT_ANT_TASKS.
166#
167# @example JAVA_PKG_FORCE_ANT_TASKS="ant-junit ant-trax" \
168# ebuild foo.ebuild compile
169#
170# @seealso WANT_ANT_TASKS
171# -----------------------------------------------------------------------------
172
132# TODO document me 173# TODO document me
133JAVA_PKG_QA_VIOLATIONS=0 174JAVA_PKG_QA_VIOLATIONS=0
134 175
135# ----------------------------------------------------------------------------- 176# -----------------------------------------------------------------------------
136# @section-end variables 177# @section-end variables
143# 184#
144# These are used to install Java-related things, such as jars, Javadocs, JNI 185# These are used to install Java-related things, such as jars, Javadocs, JNI
145# libraries, etc. 186# libraries, etc.
146# ----------------------------------------------------------------------------- 187# -----------------------------------------------------------------------------
147 188
189# -----------------------------------------------------------------------------
190# @ebuild-function java-pkg_doexamples
191#
192# Installs given arguments to /usr/share/doc/${PF}/examples
193# If you give it only one parameter and it is a directory it will install
194# everything in that directory to the examples directory.
195#
196# @example
197# java-pkg_doexamples demo
198# java-pkg_doexamples demo/* examples/*
199#
200# @param $* - list of files to install
201# ------------------------------------------------------------------------------
202java-pkg_doexamples() {
203 debug-print-function ${FUNCNAME} $*
204
205 [[ ${#} -lt 1 ]] && die "At least one argument needed"
206
207 java-pkg_check-phase install
208
209 local dest=/usr/share/doc/${PF}/examples
210 if [[ ${#} = 1 && -d ${1} ]]; then
211 ( # dont want to pollute calling env
212 insinto "${dest}"
213 doins -r ${1}/*
214 ) || die "Installing examples failed"
215 else
216 ( # dont want to pollute calling env
217 insinto "${dest}"
218 doins -r "$@"
219 ) || die "Installing examples failed"
220 fi
221}
148 222
149# ----------------------------------------------------------------------------- 223# -----------------------------------------------------------------------------
150# @ebuild-function java-pkg_dojar 224# @ebuild-function java-pkg_dojar
151# 225#
152# Installs any number of jars. 226# Installs any number of jars.
153# Jar's will be installed into /usr/share/${PN}(-${SLOT})/lib/ by default. 227# Jar's will be installed into /usr/share/${PN}(-${SLOT})/lib/ by default.
154# You can use java-pkg_jarinto to change this path. 228# You can use java-pkg_jarinto to change this path.
155# You should never install a jar with a package version in the filename. 229# You should never install a jar with a package version in the filename.
156# Instead, use java-pkg_newjar defined below. 230# Instead, use java-pkg_newjar defined below.
157# 231#
158# @example 232# @example
159# java-pkg_dojar dist/${PN}.jar dist/${PN}-core.jar 233# java-pkg_dojar dist/${PN}.jar dist/${PN}-core.jar
160# 234#
171 # Create JARDEST if it doesn't exist 245 # Create JARDEST if it doesn't exist
172 dodir ${JAVA_PKG_JARDEST} 246 dodir ${JAVA_PKG_JARDEST}
173 247
174 local jar 248 local jar
175 # for each jar 249 # for each jar
176 for jar in "$@"; do 250 for jar in "${@}"; do
177 local jar_basename=$(basename "${jar}") 251 local jar_basename=$(basename "${jar}")
178 252
179 java-pkg_check-versioned-jar ${jar_basename} 253 java-pkg_check-versioned-jar ${jar_basename}
180 254
181 # check if it exists 255 # check if it exists
182 if [[ -e "${jar}" ]] ; then 256 if [[ -e "${jar}" ]] ; then
257 # Don't overwrite if jar has already been installed with the same
258 # name
259 local dest="${D}${JAVA_PKG_JARDEST}/${jar_basename}"
260 if [[ -e "${dest}" ]]; then
261 ewarn "Overwriting ${dest}"
262 fi
263
183 # install it into JARDEST if it's a non-symlink 264 # install it into JARDEST if it's a non-symlink
184 if [[ ! -L "${jar}" ]] ; then 265 if [[ ! -L "${jar}" ]] ; then
266 #but first check class version when in strict mode.
267 is-java-strict && java-pkg_verify-classes "${jar}"
268
185 INSDESTTREE="${JAVA_PKG_JARDEST}" \ 269 INSDESTTREE="${JAVA_PKG_JARDEST}" \
186 doins "${jar}" || die "failed to install ${jar}" 270 doins "${jar}" || die "failed to install ${jar}"
187 java-pkg_append_ JAVA_PKG_CLASSPATH "${JAVA_PKG_JARDEST}/${jar_basename}" 271 java-pkg_append_ JAVA_PKG_CLASSPATH "${JAVA_PKG_JARDEST}/${jar_basename}"
188 debug-print "installed ${jar} to ${D}${JAVA_PKG_JARDEST}" 272 debug-print "installed ${jar} to ${D}${JAVA_PKG_JARDEST}"
189 # make a symlink to the original jar if it's symlink 273 # make a symlink to the original jar if it's symlink
200 284
201 java-pkg_do_write_ 285 java-pkg_do_write_
202} 286}
203 287
204 288
289# ------------------------------------------------------------------------------
290# @internal-function depend-java-query
291#
292# Wrapper for the depend-java-query binary to enable passing USE in env.
293# Using env variables keeps this eclass working with java-config versions that
294# do not handle use flags.
295# ------------------------------------------------------------------------------
296
297depend-java-query() {
298 # Used to have a which call here but it caused endless loops for some people
299 # that had some weird bashrc voodoo for which.
300 USE="${USE}" /usr/bin/depend-java-query "${@}"
301}
205 302
206# ------------------------------------------------------------------------------ 303# ------------------------------------------------------------------------------
207# @ebuild-function java-pkg_regjar 304# @ebuild-function java-pkg_regjar
208# 305#
209# Records an already installed jar in the package.env 306# Records an already installed jar in the package.env
222# will not work, because: 319# will not work, because:
223# * the `for jar in "$@"` can't expand the path to jar file names, as they 320# * the `for jar in "$@"` can't expand the path to jar file names, as they
224# don't exist yet 321# don't exist yet
225# * all `if ...` inside for will fail - the file '/opt/my-java/lib/*.jar' 322# * all `if ...` inside for will fail - the file '/opt/my-java/lib/*.jar'
226# doesn't exist 323# doesn't exist
227# 324#
228# you have to use it as: 325# you have to use it as:
229# 326#
230# java-pkg_regjar ${D}/opt/my-java/lib/*.jar 327# java-pkg_regjar ${D}/opt/my-java/lib/*.jar
231# 328#
232# @param $@ - jars to record 329# @param $@ - jars to record
240 [[ ${#} -lt 1 ]] && die "at least one argument needed" 337 [[ ${#} -lt 1 ]] && die "at least one argument needed"
241 338
242 java-pkg_init_paths_ 339 java-pkg_init_paths_
243 340
244 local jar jar_dir jar_file 341 local jar jar_dir jar_file
245 for jar in "$@"; do 342 for jar in "${@}"; do
246 # TODO use java-pkg_check-versioned-jar 343 # TODO use java-pkg_check-versioned-jar
247 if [[ -e "${jar}" ]]; then 344 if [[ -e "${jar}" || -e "${D}${jar}" ]]; then
345 [[ -d "${jar}" || -d "${D}${jar}" ]] \
346 && die "Called ${FUNCNAME} on a directory $*"
347
348 #check that class version correct when in strict mode
349 is-java-strict && java-pkg_verify-classes "${jar}"
350
248 # nelchael: we should strip ${D} in this case too, here's why: 351 # nelchael: we should strip ${D} in this case too, here's why:
249 # imagine such call: 352 # imagine such call:
250 # java-pkg_regjar ${D}/opt/java/*.jar 353 # java-pkg_regjar ${D}/opt/java/*.jar
251 # such call will fall into this case (-e ${jar}) and will 354 # such call will fall into this case (-e ${jar}) and will
252 # record paths with ${D} in package.env 355 # record paths with ${D} in package.env
253 java-pkg_append_ JAVA_PKG_CLASSPATH "${jar#${D}}" 356 java-pkg_append_ JAVA_PKG_CLASSPATH "${jar#${D}}"
254 elif [[ -e "${D}${jar}" ]]; then
255 java-pkg_append_ JAVA_PKG_CLASSPATH "${jar#${D}}"
256 else 357 else
358 if [[ ${jar} = *\** ]]; then
359 eerror "The argument ${jar} to ${FUNCNAME}"
360 eerror "has * in it. If you want it to glob in"
361 eerror '${D} add ${D} to the argument.'
362 fi
257 die "${jar} does not exist" 363 die "${jar} does not exist"
258 fi 364 fi
259 done 365 done
260 366
261 java-pkg_do_write_ 367 java-pkg_do_write_
262} 368}
263
264 369
265# ------------------------------------------------------------------------------ 370# ------------------------------------------------------------------------------
266# @ebuild-function java-pkg_newjar 371# @ebuild-function java-pkg_newjar
267# 372#
268# Installs a jar with a new name 373# Installs a jar with a new name
279 local original_jar="${1}" 384 local original_jar="${1}"
280 local new_jar="${2:-${PN}.jar}" 385 local new_jar="${2:-${PN}.jar}"
281 local new_jar_dest="${T}/${new_jar}" 386 local new_jar_dest="${T}/${new_jar}"
282 387
283 [[ -z ${original_jar} ]] && die "Must specify a jar to install" 388 [[ -z ${original_jar} ]] && die "Must specify a jar to install"
284 [[ ! -f ${original_jar} ]] && die "${original_jar} does not exist!" 389 [[ ! -f ${original_jar} ]] \
390 && die "${original_jar} does not exist or is not a file!"
285 391
286 rm -f "${new_jar_dest}" || die "Failed to remove ${new_jar_dest}" 392 rm -f "${new_jar_dest}" || die "Failed to remove ${new_jar_dest}"
287 cp "${original_jar}" "${new_jar_dest}" \ 393 cp "${original_jar}" "${new_jar_dest}" \
288 || die "Failed to copy ${original_jar} to ${new_jar_dest}" 394 || die "Failed to copy ${original_jar} to ${new_jar_dest}"
289 java-pkg_dojar "${new_jar_dest}" 395 java-pkg_dojar "${new_jar_dest}"
290} 396}
291 397
292
293# ------------------------------------------------------------------------------ 398# ------------------------------------------------------------------------------
294# @ebuild-function java-pkg_addcp 399# @ebuild-function java-pkg_addcp
295# 400#
296# Add something to the package's classpath. For jars, you should use dojar, 401# Add something to the package's classpath. For jars, you should use dojar,
297# newjar, or regjar. This is typically used to add directories to the classpath. 402# newjar, or regjar. This is typically used to add directories to the classpath.
302java-pkg_addcp() { 407java-pkg_addcp() {
303 java-pkg_append_ JAVA_PKG_CLASSPATH "${@}" 408 java-pkg_append_ JAVA_PKG_CLASSPATH "${@}"
304 java-pkg_do_write_ 409 java-pkg_do_write_
305} 410}
306 411
307
308# ------------------------------------------------------------------------------ 412# ------------------------------------------------------------------------------
309# @ebuild-function java-pkg_doso 413# @ebuild-function java-pkg_doso
310# 414#
311# Installs any number of JNI libraries 415# Installs any number of JNI libraries
312# They will be installed into /usr/lib by default, but java-pkg_sointo 416# They will be installed into /usr/lib by default, but java-pkg_sointo
313# can be used change this path 417# can be used change this path
314# 418#
315# Example: 419# Example:
340 java-pkg_append_ JAVA_PKG_LIBRARY "${JAVA_PKG_LIBDEST}" 444 java-pkg_append_ JAVA_PKG_LIBRARY "${JAVA_PKG_LIBDEST}"
341 debug-print "Installing ${lib} to ${JAVA_PKG_LIBDEST}" 445 debug-print "Installing ${lib} to ${JAVA_PKG_LIBDEST}"
342 # otherwise make a symlink to the symlink's origin 446 # otherwise make a symlink to the symlink's origin
343 else 447 else
344 # TODO use dosym 448 # TODO use dosym
449 ln -s "$(readlink "${lib}")" \
345 ln -s "$(readlink "${lib}")" "${D}${JAVA_PKG_LIBDEST}/$(basename "${lib}")" 450 "${D}${JAVA_PKG_LIBDEST}/$(basename "${lib}")"
346 debug-print "${lib} is a symlink, linking accordanly" 451 debug-print "${lib} is a symlink, linking accordanly"
347 fi 452 fi
348 # otherwise die 453 # otherwise die
349 else 454 else
350 die "${lib} does not exist" 455 die "${lib} does not exist"
370 java-pkg_check-phase install 475 java-pkg_check-phase install
371 476
372 [[ ${#} -lt 1 ]] && "at least one argument needed" 477 [[ ${#} -lt 1 ]] && "at least one argument needed"
373 478
374 java-pkg_init_paths_ 479 java-pkg_init_paths_
375 480
376 local lib target_dir 481 local lib target_dir
377 for lib in "$@" ; do 482 for lib in "$@" ; do
378 # Check the absolute path of the lib 483 # Check the absolute path of the lib
379 if [[ -e "${lib}" ]] ; then 484 if [[ -e "${lib}" ]] ; then
380 target_dir="$(java-pkg_expand_dir_ ${lib})" 485 target_dir="$(java-pkg_expand_dir_ ${lib})"
428# ------------------------------------------------------------------------------ 533# ------------------------------------------------------------------------------
429java-pkg_dohtml() { 534java-pkg_dohtml() {
430 debug-print-function ${FUNCNAME} $* 535 debug-print-function ${FUNCNAME} $*
431 536
432 [[ ${#} -lt 1 ]] && die "At least one argument required for ${FUNCNAME}" 537 [[ ${#} -lt 1 ]] && die "At least one argument required for ${FUNCNAME}"
433 # TODO-nichoj find out what exactly -f package-list does 538
539 # from /usr/lib/portage/bin/dohtml -h
540 # -f Set list of allowed extensionless file names.
434 dohtml -f package-list "$@" 541 dohtml -f package-list "$@"
542
435 # this probably shouldn't be here but it provides 543 # this probably shouldn't be here but it provides
436 # a reasonable way to catch # docs for all of the 544 # a reasonable way to catch # docs for all of the
437 # old ebuilds. 545 # old ebuilds.
438 java-pkg_recordjavadoc 546 java-pkg_recordjavadoc
439} 547}
440 548
441# TODO document 549# ------------------------------------------------------------------------------
550# @ebuild-function java-pkg_dojavadoc
551#
552# Installs javadoc documentation. This should be controlled by the doc use flag.
553#
554# @param $1: - The javadoc root directory.
555#
556# @example:
557# java-pkg_dojavadoc docs/api
558#
559# ------------------------------------------------------------------------------
442java-pkg_dojavadoc() { 560java-pkg_dojavadoc() {
443 local dir="$1" 561 local dir="$1"
444 562
445 java-pkg_check-phase install 563 java-pkg_check-phase install
446 564
458} 576}
459 577
460# ------------------------------------------------------------------------------ 578# ------------------------------------------------------------------------------
461# @ebuild-function java-pkg_dosrc 579# @ebuild-function java-pkg_dosrc
462# 580#
463# Installs a zip containing the source for a package, so it can used in 581# Installs a zip containing the source for a package, so it can used in
464# from IDEs like eclipse and netbeans. 582# from IDEs like eclipse and netbeans.
465# 583#
466# Ebuild needs to DEPEND on app-arch/zip to use this. 584# Ebuild needs to DEPEND on app-arch/zip to use this.
467# 585#
468# It also should be controlled by USE=source. 586# It also should be controlled by USE=source.
469# 587#
470# @example: 588# @example:
471# java-pkg_dosrc src/* 589# java-pkg_dosrc src/*
472# 590#
473# ------------------------------------------------------------------------------ 591# ------------------------------------------------------------------------------
474# TODO change so it the arguments it takes are the base directories containing 592# TODO change so it the arguments it takes are the base directories containing
475# source -nichoj 593# source -nichoj
476# TODO should we be able to handle multiple calls to dosrc? -nichoj 594# TODO should we be able to handle multiple calls to dosrc? -nichoj
477# TODO maybe we can take an existing zip/jar? -nichoj 595# TODO maybe we can take an existing zip/jar? -nichoj
478# FIXME apparently this fails if you give it an empty directories 596# FIXME apparently this fails if you give it an empty directories
479java-pkg_dosrc() { 597java-pkg_dosrc() {
480 debug-print-function ${FUNCNAME} $* 598 debug-print-function ${FUNCNAME} $*
481 599
482 [ ${#} -lt 1 ] && die "At least one argument needed" 600 [ ${#} -lt 1 ] && die "At least one argument needed"
483 if ! hasq source ${IUSE}; then
484 echo "Java QA Notice: ${FUNCNAME} called without source in IUSE"
485 fi
486 601
487 java-pkg_check-phase install 602 java-pkg_check-phase install
488 603
489 [[ ${#} -lt 1 ]] && die "At least one argument needed" 604 [[ ${#} -lt 1 ]] && die "At least one argument needed"
605
606 if ! [[ ${DEPEND} = *app-arch/zip* ]]; then
607 local msg="${FUNCNAME} called without app-arch/zip in DEPEND"
608 if is-java-strict; then
609 eerror "${msg}"
610 die "${msg}"
611 else
612 echo "${msg}"
613 echo "Please report this to http://bugs.gentoo.org."
614 fi
615 fi
490 616
491 java-pkg_init_paths_ 617 java-pkg_init_paths_
492 618
493 local zip_name="${PN}-src.zip" 619 local zip_name="${PN}-src.zip"
494 local zip_path="${T}/${zip_name}" 620 local zip_path="${T}/${zip_name}"
495 local dir 621 local dir
496 for dir in ${@}; do 622 for dir in "${@}"; do
497 local dir_parent=$(dirname "${dir}") 623 local dir_parent=$(dirname "${dir}")
498 local dir_name=$(basename "${dir}") 624 local dir_name=$(basename "${dir}")
499 pushd ${dir_parent} > /dev/null || die "problem entering ${dir_parent}" 625 pushd ${dir_parent} > /dev/null || die "problem entering ${dir_parent}"
500 zip -q -r ${zip_path} ${dir_name} -i '*.java' 626 zip -q -r ${zip_path} ${dir_name} -i '*.java'
501 local result=$? 627 local result=$?
518# @ebuild-function java-pkg_dolauncher 644# @ebuild-function java-pkg_dolauncher
519# 645#
520# Make a wrapper script to lauch/start this package 646# Make a wrapper script to lauch/start this package
521# If necessary, the wrapper will switch to the appropriate VM. 647# If necessary, the wrapper will switch to the appropriate VM.
522# 648#
649# Can be called without parameters if the package installs only one jar
650# that has the Main-class attribute set. The wrapper will be named ${PN}.
651#
523# @param $1 - filename of launcher to create 652# @param $1 - filename of launcher to create
524# @param $2 - options, as follows: 653# @param $2 - options, as follows:
525# --main the.main.class.too.start 654# --main the.main.class.too.start
526# --jar /the/jar/too/launch.jar 655# --jar /the/jar/too/launch.jar or just <name>.jar
527# --java_args 'Extra arguments to pass too jave' 656# --java_args 'Extra arguments to pass to java'
528# --pkg_args 'extra arguments too pass too the package' 657# --pkg_args 'Extra arguments to pass to the package'
529# --pwd 658# --pwd Directory the launcher changes to before executing java
530# -into 659# -into Directory to install the launcher to, instead of /usr/bin
531# -pre 660# -pre Prepend contents of this file to the launcher
532# ------------------------------------------------------------------------------ 661# ------------------------------------------------------------------------------
533java-pkg_dolauncher() { 662java-pkg_dolauncher() {
534 debug-print-function ${FUNCNAME} $* 663 debug-print-function ${FUNCNAME} $*
535 664
536 java-pkg_check-phase install 665 java-pkg_check-phase install
537
538 [[ ${#} -lt 1 ]] && die "Need at least one argument"
539
540 java-pkg_init_paths_ 666 java-pkg_init_paths_
541 667
668 if [[ ${#} = 0 ]]; then
669 local name="${PN}"
670 else
542 local name="${1}" 671 local name="${1}"
672 shift
673 fi
674
543 # TODO rename to launcher 675 # TODO rename to launcher
544 local target="${T}/${name}" 676 local target="${T}/${name}"
677 local var_tmp="${T}/launcher_variables_tmp"
545 local target_dir pre 678 local target_dir pre
546 shift
547 679
548 echo "#!/bin/bash" > "${target}" 680 # Process the other the rest of the arguments
549 while [[ -n "${1}" && -n "${2}" ]]; do 681 while [[ -n "${1}" && -n "${2}" ]]; do
550 local var=${1} value=${2} 682 local var="${1}" value="${2}"
551 if [[ "${var:0:2}" == "--" ]]; then 683 if [[ "${var:0:2}" == "--" ]]; then
684 local var=${var:2}
552 echo "gjl_${var:2}=\"${value}\"" >> "${target}" 685 echo "gjl_${var}=\"${value}\"" >> "${var_tmp}"
686 local gjl_${var}="${value}"
553 elif [[ "${var}" == "-into" ]]; then 687 elif [[ "${var}" == "-into" ]]; then
554 target_dir="${value}" 688 target_dir="${value}"
555 elif [[ "${var}" == "-pre" ]]; then 689 elif [[ "${var}" == "-pre" ]]; then
556 pre="${value}" 690 pre="${value}"
557 fi 691 fi
558 shift 2 692 shift 2
559 done 693 done
694
695 # Test if no --jar and --main arguments were given and
696 # in that case check if the package only installs one jar
697 # and use that jar.
698 if [[ -z "${gjl_jar}" && -z "${gjl_main}" ]]; then
699 local cp="${JAVA_PKG_CLASSPATH}"
700 if [[ "${cp/:}" = "${cp}" && "${cp%.jar}" != "${cp}" ]]; then
701 echo "gjl_jar=\"${JAVA_PKG_CLASSPATH}\"" >> "${var_tmp}"
702 else
703 local msg="Not enough information to create a launcher given."
704 msg="${msg} Please give --jar or --main argument to ${FUNCNAME}."
705 die "${msg}"
706 fi
707 fi
708
709 # Write the actual script
710 echo "#!/bin/bash" > "${target}"
711 if [[ -n "${pre}" ]]; then
712 if [[ -f "${pre}" ]]; then
713 cat "${pre}" >> "${target}"
714 else
715 die "-pre specified file '${pre}' does not exist"
716 fi
717 fi
560 echo "gjl_package=${JAVA_PKG_NAME}" >> "${target}" 718 echo "gjl_package=${JAVA_PKG_NAME}" >> "${target}"
561 [[ -n "${pre}" ]] && [[ -f "${pre}" ]] && cat "${pre}" >> "${target}" 719 cat "${var_tmp}" >> "${target}"
720 rm -f "${var_tmp}"
562 echo "source /usr/share/java-config-2/launcher/launcher.bash" >> "${target}" 721 echo "source /usr/share/java-config-2/launcher/launcher.bash" >> "${target}"
563 722
564 if [[ -n "${into}" ]]; then 723 if [[ -n "${target_dir}" ]]; then
565 DESTTREE="${target_dir}" dobin "${target}" 724 DESTTREE="${target_dir}" dobin "${target}"
566 local ret=$? 725 local ret=$?
567 return ${ret} 726 return ${ret}
568 else 727 else
569 dobin "${target}" 728 dobin "${target}"
597 echo "dowar: warning, skipping directory ${war}" 756 echo "dowar: warning, skipping directory ${war}"
598 continue 757 continue
599 else 758 else
600 warpath="${war}" 759 warpath="${war}"
601 fi 760 fi
602 761
603 # Install those files like you mean it 762 # Install those files like you mean it
604 INSOPTIONS="-m 0644" \ 763 INSOPTIONS="-m 0644" \
605 INSDESTTREE=${JAVA_PKG_WARDEST} \ 764 INSDESTTREE=${JAVA_PKG_WARDEST} \
606 doins ${warpath} 765 doins ${warpath}
607 done 766 done
642# @ebuild-function java-pkg_jar-from 801# @ebuild-function java-pkg_jar-from
643# 802#
644# Makes a symlink to a jar from a certain package 803# Makes a symlink to a jar from a certain package
645# A lot of java packages include dependencies in a lib/ directory 804# A lot of java packages include dependencies in a lib/ directory
646# You can use this function to replace these bundled dependencies. 805# You can use this function to replace these bundled dependencies.
806# The dependency is recorded into package.env DEPEND line, unless "--build-only"
807# is passed as the very first argument, for jars that have to be present only
808# at build time and are not needed on runtime (junit testing etc).
647# 809#
648# Example: get all jars from xerces slot 2 810# Example: get all jars from xerces slot 2
649# java-pkg_jar-from xerces-2 811# java-pkg_jar-from xerces-2
650# Example: get a specific jar from xerces slot 2 812# Example: get a specific jar from xerces slot 2
651# java-pkg_jar-from xerces-2 xml-apis.jar 813# java-pkg_jar-from xerces-2 xml-apis.jar
652# Example get a specific jar from xerces slot 2, and name it diffrently 814# 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 815# java-pkg_jar-from xerces-2 xml-apis.jar xml.jar
816# Example: get junit.jar which is needed only for building
817# java-pkg_jar-from --build-only junit junit.jar
654# 818#
819# @param $opt
820# --build-only - makes the jar(s) not added into package.env DEPEND line.
821# (assumed automatically when called inside src_test)
822# --with-dependencies - get jars also from requested package's dependencies
823# transitively.
824# --into $dir - symlink jar(s) into $dir (must exist) instead of .
655# @param $1 - Package to get jars from. 825# @param $1 - Package to get jars from.
656# @param $2 - jar from package. If not specified, all jars will be used. 826# @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 827# @param $3 - When a single jar is specified, destination filename of the
658# symlink. Defaults to the name of the jar. 828# symlink. Defaults to the name of the jar.
659# ------------------------------------------------------------------------------ 829# ------------------------------------------------------------------------------
660# TODO could probably be cleaned up a little 830# TODO could probably be cleaned up a little
661java-pkg_jar-from() { 831java-pkg_jar-from() {
662 debug-print-function ${FUNCNAME} $* 832 debug-print-function ${FUNCNAME} $*
663 833
834 local build_only=""
835 local destdir="."
836 local deep=""
837
838 [[ "${EBUILD_PHASE}" == "test" ]] && build_only="true"
839
840 while [[ "${1}" == --* ]]; do
841 if [[ "${1}" = "--build-only" ]]; then
842 build_only="true"
843 elif [[ "${1}" = "--with-dependencies" ]]; then
844 deep="--with-dependencies"
845 elif [[ "${1}" = "--into" ]]; then
846 destdir="${2}"
847 shift
848 else
849 die "java-pkg_jar-from called with unknown parameter: ${1}"
850 fi
851 shift
852 done
853
664 local target_pkg="${1}" target_jar="${2}" destjar="${3}" 854 local target_pkg="${1}" target_jar="${2}" destjar="${3}"
665 855
666 [[ -z ${target_pkg} ]] && die "Must specify a package" 856 [[ -z ${target_pkg} ]] && die "Must specify a package"
667 857
668 # default destjar to the target jar 858 # default destjar to the target jar
669 [[ -z "${destjar}" ]] && destjar="${target_jar}" 859 [[ -z "${destjar}" ]] && destjar="${target_jar}"
670 860
861 local error_msg="There was a problem getting the classpath for ${target_pkg}."
862 local classpath
671 local classpath="$(java-config --classpath=${target_pkg})" 863 classpath="$(java-config ${deep} --classpath=${target_pkg})"
672 [[ $? != 0 ]] && die "There was a problem getting the classpath for ${target_pkg}" 864 [[ $? != 0 ]] && die ${error_msg}
865
866 java-pkg_ensure-dep "${build_only}" "${target_pkg}"
867
868 pushd ${destdir} > /dev/null \
869 || die "failed to change directory to ${destdir}"
870
871 # When we have commas this functions is called to bring jars from multiple
872 # packages. This affects recording of dependencencies because that syntax uses :
873 # if we don't change them to : gjl and java-config -d -p break
874 if [[ ${target_pkg} = *,* ]]; then
875 build_only="true"
876 java-pkg_record-jar_ ${target_pkg//,/:}
877 fi
673 878
674 local jar 879 local jar
675 for jar in ${classpath//:/ }; do 880 for jar in ${classpath//:/ }; do
676 local jar_name=$(basename "${jar}") 881 local jar_name=$(basename "${jar}")
677 if [[ ! -f "${jar}" ]] ; then 882 if [[ ! -f "${jar}" ]] ; then
681 # If no specific target jar was indicated, link it 886 # If no specific target jar was indicated, link it
682 if [[ -z "${target_jar}" ]] ; then 887 if [[ -z "${target_jar}" ]] ; then
683 [[ -f "${target_jar}" ]] && rm "${target_jar}" 888 [[ -f "${target_jar}" ]] && rm "${target_jar}"
684 ln -snf "${jar}" \ 889 ln -snf "${jar}" \
685 || die "Failed to make symlink from ${jar} to ${jar_name}" 890 || die "Failed to make symlink from ${jar} to ${jar_name}"
686 java-pkg_record-jar_ "${target_pkg}" "${jar}" 891 [[ -z "${build_only}" ]] && java-pkg_record-jar_ "${target_pkg}" "${jar}"
687 # otherwise, if the current jar is the target jar, link it 892 # otherwise, if the current jar is the target jar, link it
688 elif [[ "${jar_name}" == "${target_jar}" ]] ; then 893 elif [[ "${jar_name}" == "${target_jar}" ]] ; then
689 [[ -f "${destjar}" ]] && rm "${destjar}" 894 [[ -f "${destjar}" ]] && rm "${destjar}"
690 ln -snf "${jar}" "${destjar}" \ 895 ln -snf "${jar}" "${destjar}" \
691 || die "Failed to make symlink from ${jar} to ${destjar}" 896 || die "Failed to make symlink from ${jar} to ${destjar}"
692 java-pkg_record-jar_ "${target_pkg}" "${jar}" 897 [[ -z "${build_only}" ]] && java-pkg_record-jar_ "${target_pkg}" "${jar}"
898 popd > /dev/null
693 return 0 899 return 0
694 fi 900 fi
695 done 901 done
902 popd > /dev/null
696 # if no target was specified, we're ok 903 # if no target was specified, we're ok
697 if [[ -z "${target_jar}" ]] ; then 904 if [[ -z "${target_jar}" ]] ; then
698 return 0 905 return 0
699 # otherwise, die bitterly 906 # otherwise, die bitterly
700 else 907 else
714# ------------------------------------------------------------------------------ 921# ------------------------------------------------------------------------------
715# @ebuild-function java-pkg_getjars 922# @ebuild-function java-pkg_getjars
716# 923#
717# Get the classpath provided by any number of packages 924# Get the classpath provided by any number of packages
718# Among other things, this can be passed to 'javac -classpath' or 'ant -lib'. 925# Among other things, this can be passed to 'javac -classpath' or 'ant -lib'.
926# The providing packages are recorded as dependencies into package.env DEPEND
927# line, unless "--build-only" is passed as the very first argument, for jars
928# that have to be present only at build time and are not needed on runtime
929# (junit testing etc).
719# 930#
720# Example: Get the classpath for xerces-2, 931# Example: Get the classpath for xerces-2 and xalan,
721# java-pkg_getjars xerces-2 xalan 932# java-pkg_getjars xerces-2,xalan
722# Example Return: 933# Example Return:
723# /usr/share/xerces-2/lib/xml-apis.jar:/usr/share/xerces-2/lib/xmlParserAPIs.jar:/usr/share/xalan/lib/xalan.jar 934# /usr/share/xerces-2/lib/xml-apis.jar:/usr/share/xerces-2/lib/xmlParserAPIs.jar:/usr/share/xalan/lib/xalan.jar
724# 935#
936# @param $opt
937# --build-only - makes the jar(s) not added into package.env DEPEND line.
938# (assumed automatically when called inside src_test)
939# --with-dependencies - get jars also from requested package's dependencies
940# transitively.
725# @param $@ - list of packages to get jars from 941# @param $1 - list of packages to get jars from
942# (passed to java-config --classpath)
726# ------------------------------------------------------------------------------ 943# ------------------------------------------------------------------------------
727java-pkg_getjars() { 944java-pkg_getjars() {
728 debug-print-function ${FUNCNAME} $* 945 debug-print-function ${FUNCNAME} $*
729 946
730 [[ ${#} -lt 1 ]] && die "At least one argument needed" 947 local build_only=""
948 local deep=""
731 949
732 # NOTE could probably just pass $@ to java-config --classpath. and return it 950 [[ "${EBUILD_PHASE}" == "test" ]] && build_only="true"
733 local classpath pkg 951
734 for pkg in ${@//,/ }; do 952 while [[ "${1}" == --* ]]; do
735 #for pkg in $(echo "$@" | tr ',' ' '); do 953 if [[ "${1}" = "--build-only" ]]; then
736 jars="$(java-config --classpath=${pkg})" 954 build_only="true"
737 debug-print "${pkg}:${jars}" 955 elif [[ "${1}" = "--with-dependencies" ]]; then
738 # TODO should we ensure jars exist? 956 deep="--with-dependencies"
739 if [[ -z "${classpath}" ]]; then
740 classpath="${jars}"
741 else 957 else
742 classpath="${classpath}:${jars}" 958 die "java-pkg_jar-from called with unknown parameter: ${1}"
743 fi 959 fi
744 java-pkg_record-jar_ "${pkg}" 960 shift
745 done 961 done
962
963 [[ ${#} -ne 1 ]] && die "${FUNCNAME} takes only one argument besides --*"
964
965
966 local classpath pkgs="${1}"
967 jars="$(java-config ${deep} --classpath=${pkgs})"
968 [[ $? != 0 || -z "${jars}" ]] && die "java-config --classpath=${pkgs} failed"
969 debug-print "${pkgs}:${jars}"
970
971 for pkg in "${pkgs//,/ }"; do
972 java-pkg_ensure-dep "${build_only}" "${pkg}"
973 done
974
975 if [[ -z "${classpath}" ]]; then
976 classpath="${jars}"
977 else
978 classpath="${classpath}:${jars}"
979 fi
980
981 # Only record jars that aren't build-only
982 if [[ -z "${build_only}" ]]; then
983 oldifs="${IFS}"
984 IFS=","
985 for pkg in ${pkgs}; do
986 java-pkg_record-jar_ "${pkg}"
987 done
988 IFS="${oldifs}"
989 fi
990
746 echo "${classpath}" 991 echo "${classpath}"
747} 992}
748 993
749# ------------------------------------------------------------------------------ 994# ------------------------------------------------------------------------------
750# @ebuild-function java-pkg_getjar 995# @ebuild-function java-pkg_getjar
751# 996#
752# Get the filename of a single jar from a package 997# Get the filename of a single jar from a package
998# The providing package is recorded as runtime dependency into package.env
999# DEPEND line, unless "--build-only" is passed as the very first argument, for
1000# jars that have to be present only at build time and are not needed on runtime
1001# (junit testing etc).
753# 1002#
754# @example 1003# @example
755# java-pkg_getjar xerces-2 xml-apis.jar 1004# java-pkg_getjar xerces-2 xml-apis.jar
756# @example-return 1005# @example-return
757# /usr/share/xerces-2/lib/xml-apis.jar 1006# /usr/share/xerces-2/lib/xml-apis.jar
758# 1007#
1008# @param $opt
1009# --build-only - makes the jar not added into package.env DEPEND line.
759# @param $1 - package to use 1010# @param $1 - package to use
760# @param $2 - jar to get 1011# @param $2 - jar to get
761# ------------------------------------------------------------------------------ 1012# ------------------------------------------------------------------------------
762java-pkg_getjar() { 1013java-pkg_getjar() {
763 debug-print-function ${FUNCNAME} $* 1014 debug-print-function ${FUNCNAME} $*
1015
1016 local build_only=""
1017
1018 [[ "${EBUILD_PHASE}" == "test" ]] && build_only="true"
1019
1020 while [[ "${1}" == --* ]]; do
1021 if [[ "${1}" = "--build-only" ]]; then
1022 build_only="true"
1023 else
1024 die "java-pkg_jar-from called with unknown parameter: ${1}"
1025 fi
1026 shift
1027 done
1028
1029 [[ ${#} -ne 2 ]] && die "${FUNCNAME} takes only two arguments besides --*"
764 1030
765 local pkg="${1}" target_jar="${2}" jar 1031 local pkg="${1}" target_jar="${2}" jar
766 [[ -z ${pkg} ]] && die "Must specify package to get a jar from" 1032 [[ -z ${pkg} ]] && die "Must specify package to get a jar from"
767 [[ -z ${target_jar} ]] && die "Must specify jar to get" 1033 [[ -z ${target_jar} ]] && die "Must specify jar to get"
768 1034
769 # TODO check that package is actually installed 1035 local error_msg="Could not find classpath for ${pkg}. Are you sure its installed?"
1036 local classpath
770 local classpath=$(java-config --classpath=${pkg}) 1037 classpath=$(java-config --classpath=${pkg})
771 [[ $? != 0 ]] && die "There could not find classpath for ${pkg}. Are you sure its installed?" 1038 [[ $? != 0 ]] && die ${error_msg}
1039
1040 java-pkg_ensure-dep "${build_only}" "${pkg}"
1041
772 for jar in ${classpath//:/ }; do 1042 for jar in ${classpath//:/ }; do
773 if [[ ! -f "${jar}" ]] ; then 1043 if [[ ! -f "${jar}" ]] ; then
774 die "Installation problems with jars in ${pkg} - is it installed?" 1044 die "Installation problem with jar ${jar} in ${pkg} - is it installed?"
775 fi 1045 fi
776 1046
777 if [[ "$(basename ${jar})" == "${target_jar}" ]] ; then 1047 if [[ "$(basename ${jar})" == "${target_jar}" ]] ; then
778 java-pkg_record-jar_ "${pkg}" "${jar}" 1048 # Only record jars that aren't build-only
1049 [[ -z "${build_only}" ]] && java-pkg_record-jar_ "${pkg}" "${jar}"
779 echo "${jar}" 1050 echo "${jar}"
780 return 0 1051 return 0
781 fi 1052 fi
782 done 1053 done
783 1054
784 die "Could not find ${target_jar} in ${pkg}" 1055 die "Could not find ${target_jar} in ${pkg}"
785 return 1 1056 return 1
786} 1057}
787 1058
788# This function reads stdin, and based on that input, figures out how to 1059# This function reads stdin, and based on that input, figures out how to
802# line="${line// /}" 1073# line="${line// /}"
803# 1074#
804# # format: path=jarinfo 1075# # format: path=jarinfo
805# local path=${line%%=*} 1076# local path=${line%%=*}
806# local jarinfo=${line##*=} 1077# local jarinfo=${line##*=}
807# 1078#
808# # format: jar@package 1079# # format: jar@package
809# local jar=${jarinfo%%@*}.jar 1080# local jar=${jarinfo%%@*}.jar
810# local package=${jarinfo##*@} 1081# local package=${jarinfo##*@}
811# if [[ -n ${replace_only} ]]; then 1082# if [[ -n ${replace_only} ]]; then
812# [[ ! -f $path ]] && die "No jar exists at ${path}" 1083# [[ ! -f $path ]] && die "No jar exists at ${path}"
825# @section-end query 1096# @section-end query
826# ------------------------------------------------------------------------------ 1097# ------------------------------------------------------------------------------
827 1098
828# ------------------------------------------------------------------------------ 1099# ------------------------------------------------------------------------------
829# @section-begin helper 1100# @section-begin helper
830# @section-summary Helper functions 1101# @section-summary Helper functions
831# 1102#
832# Various other functions to use from an ebuild 1103# Various other functions to use from an ebuild
833# ------------------------------------------------------------------------------ 1104# ------------------------------------------------------------------------------
834 1105
835# ------------------------------------------------------------------------------ 1106# ------------------------------------------------------------------------------
841# jdbc-stdext 1112# jdbc-stdext
842# jaf 1113# jaf
843# jdbc-rowset 1114# jdbc-rowset
844# jms 1115# jms
845# 1116#
846# @param $1 - Optionally indicate that the dependencies are controlled by 1117# @param $1 - Optionally indicate that the dependencies are controlled by
847# a use flag by specifying '--use' Requires $2. 1118# a use flag by specifying '--use' Requires $2.
848# @param $2 - USE flag which will enable the dependencies. 1119# @param $2 - USE flag which will enable the dependencies.
849# @param $@ - virtual packages to add depenedencies for 1120# @param $@ - virtual packages to add depenedencies for
850# ------------------------------------------------------------------------------ 1121# ------------------------------------------------------------------------------
851# TODO rewrite to parse a line based declaration file instead -- karltk 1122# TODO rewrite to parse a line based declaration file instead -- karltk
907# 1178#
908# export DEPEND="${DEPEND} ${depstr}" 1179# export DEPEND="${DEPEND} ${depstr}"
909# export RDEPEND="${RDEPEND} ${depstr}" 1180# export RDEPEND="${RDEPEND} ${depstr}"
910#} 1181#}
911 1182
1183# ------------------------------------------------------------------------------
1184# @ebuild-function java-pkg_find-normal-jars
1185#
1186# Find the files with suffix .jar file in the given directory or $WORKDIR
1187#
1188# @param $1 - The directory to search for jar files (default: ${WORKDIR})
1189# ------------------------------------------------------------------------------
1190java-pkg_find-normal-jars() {
1191 local dir=$1
1192 [[ "${dir}" ]] || dir="${WORKDIR}"
1193 local found
1194 for jar in $(find "${dir}" -name "*.jar" -type f); do
1195 echo "${jar}"
1196 found="true"
1197 done
1198 [[ "${found}" ]]
1199 return $?
1200}
1201
1202# ------------------------------------------------------------------------------
1203# @ebuild-function java-pkg_ensure-no-bundled-jars
1204#
1205# 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 1206# This function should be called after WORKDIR has been populated with symlink
913# TODO document 1207# to system jar files or bundled jars removed.
1208# ------------------------------------------------------------------------------
914java-pkg_ensure-no-bundled-jars() { 1209java-pkg_ensure-no-bundled-jars() {
915 debug-print-function ${FUNCNAME} $* 1210 debug-print-function ${FUNCNAME} $*
916 pushd ${WORKDIR} >/dev/null 2>/dev/null
917 1211
918 local bundled_jars=$(find . -name "*.jar" -type f) 1212 local bundled_jars=$(java-pkg_find-normal-jars)
919 if [[ -n ${bundled_jars} ]]; then 1213 if [[ -n ${bundled_jars} ]]; then
920 echo "Bundled jars found:" 1214 echo "Bundled jars found:"
921 local jar 1215 local jar
922 for jar in ${bundled_jars}; do 1216 for jar in ${bundled_jars}; do
923 echo $(pwd)${jar/./} 1217 echo $(pwd)${jar/./}
924 done 1218 done
925 die "Bundled jars found!" 1219 die "Bundled jars found!"
926
927 fi 1220 fi
928 popd >/dev/null 2>/dev/null
929} 1221}
930 1222
931# ------------------------------------------------------------------------------ 1223# ------------------------------------------------------------------------------
932# @internal-function java-pkg_ensure-vm-version-sufficient 1224# @internal-function java-pkg_ensure-vm-version-sufficient
933# 1225#
945 fi 1237 fi
946} 1238}
947 1239
948# ------------------------------------------------------------------------------ 1240# ------------------------------------------------------------------------------
949# @internal-function java-pkg_is-vm-version-sufficient 1241# @internal-function java-pkg_is-vm-version-sufficient
950# 1242#
951# @return zero - VM is sufficient 1243# @return zero - VM is sufficient
952# @return non-zero - VM is not sufficient 1244# @return non-zero - VM is not sufficient
953# ------------------------------------------------------------------------------ 1245# ------------------------------------------------------------------------------
954java-pkg_is-vm-version-sufficient() { 1246java-pkg_is-vm-version-sufficient() {
955 debug-print-function ${FUNCNAME} $* 1247 debug-print-function ${FUNCNAME} $*
975 die "Active Java VM too old" 1267 die "Active Java VM too old"
976 fi 1268 fi
977} 1269}
978 1270
979# ------------------------------------------------------------------------------ 1271# ------------------------------------------------------------------------------
980# @internal-function java-pkg_is-vm-version-eq 1272# @internal-function java-pkg_is-vm-version-eq
981# 1273#
982# @param $@ - VM version to compare current VM to 1274# @param $@ - VM version to compare current VM to
983# @return zero - VM versions are equal 1275# @return zero - VM versions are equal
984# @return non-zero - VM version are not equal 1276# @return non-zero - VM version are not equal
985# ------------------------------------------------------------------------------ 1277# ------------------------------------------------------------------------------
986java-pkg_is-vm-version-eq() { 1278java-pkg_is-vm-version-eq() {
1016# 1308#
1017# @param $@ - VM version to compare current to 1309# @param $@ - VM version to compare current to
1018# ------------------------------------------------------------------------------ 1310# ------------------------------------------------------------------------------
1019java-pkg_ensure-vm-version-ge() { 1311java-pkg_ensure-vm-version-ge() {
1020 debug-print-function ${FUNCNAME} $* 1312 debug-print-function ${FUNCNAME} $*
1021 1313
1022 if ! java-pkg_is-vm-version-ge "$@" ; then 1314 if ! java-pkg_is-vm-version-ge "$@" ; then
1023 debug-print "vm is not suffient" 1315 debug-print "vm is not suffient"
1024 eerror "This package requires a Java VM version >= $@" 1316 eerror "This package requires a Java VM version >= $@"
1025 einfo "Please use java-config -S to set the correct one" 1317 einfo "Please use java-config -S to set the correct one"
1026 die "Active Java VM too old" 1318 die "Active Java VM too old"
1027 fi 1319 fi
1028} 1320}
1029 1321
1030# ------------------------------------------------------------------------------ 1322# ------------------------------------------------------------------------------
1031# @internal-function java-pkg_is-vm-version-ge 1323# @internal-function java-pkg_is-vm-version-ge
1032# 1324#
1033# @param $@ - VM version to compare current VM to 1325# @param $@ - VM version to compare current VM to
1034# @return zero - current VM version is greater than checked version 1326# @return zero - current VM version is greater than checked version
1035# @return non-zero - current VM version is not greater than checked version 1327# @return non-zero - current VM version is not greater than checked version
1036# ------------------------------------------------------------------------------ 1328# ------------------------------------------------------------------------------
1037java-pkg_is-vm-version-ge() { 1329java-pkg_is-vm-version-ge() {
1051 return 1 1343 return 1
1052 fi 1344 fi
1053 fi 1345 fi
1054} 1346}
1055 1347
1348java-pkg_set-current-vm() {
1349 export GENTOO_VM=${1}
1350}
1351
1352java-pkg_get-current-vm() {
1353 echo ${GENTOO_VM}
1354}
1355
1356java-pkg_current-vm-matches() {
1357 hasq $(java-pkg_get-current-vm) ${@}
1358 return $?
1359}
1360
1056# ------------------------------------------------------------------------------ 1361# ------------------------------------------------------------------------------
1057# @ebuild-function java-pkg_get-source 1362# @ebuild-function java-pkg_get-source
1058# 1363#
1059# Determines what source version should be used, for passing to -source. 1364# 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 1365# Unless you want to break things you probably shouldn't set _WANT_SOURCE
1061# 1366#
1062# @return string - Either the lowest possible source, or JAVA_PKG_WANT_SOURCE 1367# @return string - Either the lowest possible source, or JAVA_PKG_WANT_SOURCE
1063# ------------------------------------------------------------------------------ 1368# ------------------------------------------------------------------------------
1068# ------------------------------------------------------------------------------ 1373# ------------------------------------------------------------------------------
1069# @ebuild-function java-pkg_get-target 1374# @ebuild-function java-pkg_get-target
1070# 1375#
1071# Determines what target version should be used, for passing to -target. 1376# 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 1377# If you don't care about lower versions, you can set _WANT_TARGET to the
1073# version of your JDK. 1378# 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# 1379#
1078# @return string - Either the lowest possible target, or JAVA_PKG_WANT_TARGET 1380# @return string - Either the lowest possible target, or JAVA_PKG_WANT_TARGET
1079# ------------------------------------------------------------------------------ 1381# ------------------------------------------------------------------------------
1080java-pkg_get-target() { 1382java-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}")} 1383 echo ${JAVA_PKG_WANT_TARGET:-$(depend-java-query --get-lowest "${DEPEND} ${RDEPEND}")}
1094} 1384}
1095 1385
1096java-pkg_get-javac() { 1386java-pkg_get-javac() {
1097 debug-print-function ${FUNCNAME} $* 1387 debug-print-function ${FUNCNAME} $*
1098 1388
1099 java-pkg_init-compiler_ 1389
1100 local compiler="${GENTOO_COMPILER}" 1390 local compiler="${GENTOO_COMPILER}"
1101 1391
1102 local compiler_executable 1392 local compiler_executable
1103 if [[ "${compiler}" = "javac" ]]; then 1393 if [[ "${compiler}" = "javac" ]]; then
1104 # nothing fancy needs to be done for javac 1394 # nothing fancy needs to be done for javac
1112 unset JAVAC 1402 unset JAVAC
1113 # try to get value of JAVAC 1403 # try to get value of JAVAC
1114 compiler_executable="$(source ${compiler_env} 1>/dev/null 2>&1; echo ${JAVAC})" 1404 compiler_executable="$(source ${compiler_env} 1>/dev/null 2>&1; echo ${JAVAC})"
1115 export JAVAC=${old_javac} 1405 export JAVAC=${old_javac}
1116 1406
1117 [[ -z ${compiler_executable} ]] && die "JAVAC is empty or undefined in ${compiler_env}" 1407 if [[ -z ${compiler_executable} ]]; then
1118 1408 echo "JAVAC is empty or undefined in ${compiler_env}"
1409 return 1
1410 fi
1411
1119 # check that it's executable 1412 # check that it's executable
1120 if [[ ! -x ${compiler_executable} ]]; then 1413 if [[ ! -x ${compiler_executable} ]]; then
1121 eerror "Could not find ${compiler_executable}!"
1122 die "${compiler_executable} doesn't exist, or isn't executable" 1414 echo "${compiler_executable} doesn't exist, or isn't executable"
1415 return 1
1123 fi 1416 fi
1124 else 1417 else
1125 eerror "Could not find environment file for ${compiler}" 1418 echo "Could not find environment file for ${compiler}"
1126 die "Could not find ${compiler_env}" 1419 return 1
1127 fi 1420 fi
1128 fi 1421 fi
1129 echo ${compiler_executable} 1422 echo ${compiler_executable}
1130} 1423}
1131 1424
1132# ------------------------------------------------------------------------------ 1425# ------------------------------------------------------------------------------
1133# @ebuild-function java-pkg_javac-args 1426# @ebuild-function java-pkg_javac-args
1134# 1427#
1135# If an ebuild uses javac directly, instead of using ejavac, it should call this 1428# If an ebuild uses javac directly, instead of using ejavac, it should call this
1136# to know what -source/-target to use. 1429# to know what -source/-target to use.
1137# 1430#
1138# @return string - arguments to pass to javac, complete with -target and -source 1431# @return string - arguments to pass to javac, complete with -target and -source
1141 debug-print-function ${FUNCNAME} $* 1434 debug-print-function ${FUNCNAME} $*
1142 1435
1143 local want_source="$(java-pkg_get-source)" 1436 local want_source="$(java-pkg_get-source)"
1144 local want_target="$(java-pkg_get-target)" 1437 local want_target="$(java-pkg_get-target)"
1145 1438
1146 local source_str="-source ${want_source}" 1439 local source_str="-source ${want_source}"
1147 local target_str="-target ${want_target}" 1440 local target_str="-target ${want_target}"
1148 1441
1149 debug-print "want source: ${want_source}" 1442 debug-print "want source: ${want_source}"
1150 debug-print "want target: ${want_target}" 1443 debug-print "want target: ${want_target}"
1151 1444
1152 if [[ -z "${want_source}" || -z "${want_target}" ]]; then 1445 if [[ -z "${want_source}" || -z "${want_target}" ]]; then
1153 debug-print "could not find valid -source/-target values" 1446 debug-print "could not find valid -source/-target values for javac"
1154 die "Could not find valid -source/-target values" 1447 echo "Could not find valid -source/-target values for javac"
1448 return 1
1155 else 1449 else
1156 if java-pkg_is-vm-version-ge "1.4"; then 1450 if java-pkg_is-vm-version-ge "1.4"; then
1157 echo "${source_str} ${target_str}" 1451 echo "${source_str} ${target_str}"
1158 else 1452 else
1159 echo "${target_str}" 1453 echo "${target_str}"
1163 1457
1164# TODO document 1458# TODO document
1165java-pkg_get-jni-cflags() { 1459java-pkg_get-jni-cflags() {
1166 local flags="-I${JAVA_HOME}/include" 1460 local flags="-I${JAVA_HOME}/include"
1167 1461
1462 local platform="linux"
1463 use elibc_FreeBSD && platform="freebsd"
1464
1168 # TODO do a check that the directories are valid 1465 # 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" 1466 flags="${flags} -I${JAVA_HOME}/include/${platform}"
1171 1467
1172 echo ${flags} 1468 echo ${flags}
1173} 1469}
1174 1470
1175java-pkg_ensure-gcj() { 1471java-pkg_ensure-gcj() {
1180 ebeep 5 1476 ebeep 5
1181 die "No GCJ support found!" 1477 die "No GCJ support found!"
1182 fi 1478 fi
1183} 1479}
1184 1480
1481java-pkg_ensure-test() {
1482 if hasq test ${FEATURES} && ! hasq -test ${FEATURES} \
1483 && hasq test ${IUSE} && ! use test;
1484 then
1485 eerror "You specified FEATURES=test, but USE=test is needed"
1486 eerror "to pull in the additional dependencies for testing"
1487 die "Need USE=test enabled"
1488 fi
1489}
1490
1491# ------------------------------------------------------------------------------
1492# @ebuild-function java-pkg_register-ant-task
1493#
1494# Register this package as ant task, so that ant will load it when no specific
1495# ANT_TASKS are specified. Note that even without this registering, all packages
1496# specified in ANT_TASKS will be loaded. Mostly used by the actual ant tasks
1497# packages, but can be also used by other ebuilds that used to symlink their
1498# .jar into /usr/share/ant-core/lib to get autoloaded, for backwards
1499# compatibility.
1500#
1501# @param --version x.y Register only for ant version x.y (otherwise for any ant
1502# version). Used by the ant-* packages to prevent loading of mismatched
1503# ant-core ant tasks after core was updated, before the tasks are updated,
1504# without a need for blockers.
1505# @param $1 Name to register as. Defaults to JAVA_PKG_NAME ($PN[-$SLOT])
1506# ------------------------------------------------------------------------------
1507java-pkg_register-ant-task() {
1508 local TASKS_DIR="tasks"
1509
1510 # check for --version x.y parameters
1511 while [[ -n "${1}" && -n "${2}" ]]; do
1512 local var="${1#--}"
1513 local val="${2}"
1514 if [[ "${var}" == "version" ]]; then
1515 TASKS_DIR="tasks-${val}"
1516 else
1517 die "Unknown parameter passed to java-pkg_register-ant-tasks: ${1} ${2}"
1518 fi
1519 shift 2
1520 done
1521
1522 local TASK_NAME="${1:-${JAVA_PKG_NAME}}"
1523
1524 dodir /usr/share/ant/${TASKS_DIR}
1525 touch "${D}/usr/share/ant/${TASKS_DIR}/${TASK_NAME}"
1526}
1527
1528# ------------------------------------------------------------------------------
1529# @internal-function java-pkg_ant-tasks-from-deps
1530#
1531# Function to determine ANT_TASKS from DEPEND variable for backwards
1532# compatibility with ebuilds that don't set ANT_TASKS before calling eant() or
1533# WANT_ANT_TASKS before inheriting java-pkg-2. If the DEPEND string contains
1534# "dev-java/ant" or "dev-java/ant-tasks", then it returns "all", otherwise
1535# "none". It's not smart enough to cope with USE flag depends but that shouldn't
1536# be a problem, the worst it can do is activace all tasks when not needed.
1537# Note that this is called only with JAVA_PKG_STRICT=1, to find ebuilds with
1538# insufficient dependencies, otherwise all available tasks are used for
1539# backwards compatilbility.
1540#
1541# @return "all" or "none"
1542# ------------------------------------------------------------------------------
1543java-pkg_ant-tasks-from-deps() {
1544 local found_ant found_ant_tasks
1545
1546 for dep in ${DEPEND}
1547 do
1548 local ant="$(awk '/(dev-java\/ant)/ { if (match($1, "(dev-java/ant)((-[0-9])+|$)", m)) print m[1] }' <<< ${dep})"
1549 [[ "${ant}" == "dev-java/ant" ]] && found_ant=true
1550 [[ "${dep}" == *"ant-tasks"* ]] && found_ant_tasks=true
1551 done
1552
1553 if [[ -n "${found_ant}" || -n "${found_ant_tasks}" ]]; then
1554 java-pkg_announce-qa-violation "The ebuild DEPENDS on deprecated ant or ant-tasks"
1555 echo "all"
1556 else
1557 # ebuild doesn't set ANT_TASKS and doesn't depend on ant-tasks or ant
1558 # so we deactivate all tasks that may be installed
1559 echo "none"
1560 fi
1561}
1562
1563# ------------------------------------------------------------------------------
1564# @internal-function java-pkg_ant-tasks-depend
1565#
1566# Translates the WANT_ANT_TASKS variable into valid dependencies.
1567# ------------------------------------------------------------------------------
1568java-pkg_ant-tasks-depend() {
1569 debug-print-function ${FUNCNAME} ${WANT_ANT_TASKS}
1570
1571 if [[ -n "${WANT_ANT_TASKS}" ]]; then
1572 local DEP=""
1573 for i in ${WANT_ANT_TASKS}
1574 do
1575 if [[ ${i} != ant-* ]]; then
1576 echo "Invalid atom in WANT_ANT_TASKS: ${i}"
1577 return 1
1578 fi
1579 DEP="${DEP}dev-java/${i} "
1580 done
1581 echo ${DEP}
1582 return 0
1583 else
1584 return 0
1585 fi
1586}
1587
1185# ------------------------------------------------------------------------------ 1588# ------------------------------------------------------------------------------
1186# @section-end helper 1589# @section-end helper
1187# ------------------------------------------------------------------------------ 1590# ------------------------------------------------------------------------------
1188 1591
1189# ------------------------------------------------------------------------------ 1592# ------------------------------------------------------------------------------
1196 1599
1197# ------------------------------------------------------------------------------ 1600# ------------------------------------------------------------------------------
1198# @ebuild-function eant 1601# @ebuild-function eant
1199# 1602#
1200# Ant wrapper function. Will use the appropriate compiler, based on user-defined 1603# Ant wrapper function. Will use the appropriate compiler, based on user-defined
1201# compiler. 1604# compiler. Will also set proper ANT_TASKS from the variable ANT_TASKS,
1202# 1605# variables:
1606# EANT_GENTOO_CLASSPATH - calls java-pkg_getjars for the value and adds to the
1607# gentoo.classpath property. Be sure to call
1608# java-ant_rewrite-classpath in src_unpack.
1609# *ANT_TASKS - used to determine ANT_TASKS before calling Ant.
1203# ------------------------------------------------------------------------------ 1610# ------------------------------------------------------------------------------
1204eant() { 1611eant() {
1205 debug-print-function ${FUNCNAME} $* 1612 debug-print-function ${FUNCNAME} $*
1206 1613
1207 local antflags 1614 # FIXME get this working
1615# if is-java-strict && [[ ! ${DEPEND} =~ "dev-java/ant" ]]; then
1616# java-pkg_announce-qa-violation \
1617# "Using eant, but not depending on dev-java/ant or dev-java/ant-core"
1618# fi
1619
1620 if ! hasq java-ant-2 ${INHERITED} && is-java-strict; then
1621 local msg="You should inherit java-ant-2 when using eant"
1622 java-pkg_announce-qa-violation ${msg}
1623 die ${msg}
1624 fi
1625
1626 local antflags="-Dnoget=true -Dmaven.mode.offline=true"
1627
1208 java-pkg_init-compiler_ 1628 java-pkg_init-compiler_
1209 local compiler="${GENTOO_COMPILER}" 1629 local compiler="${GENTOO_COMPILER}"
1210 1630
1211 local compiler_env="${JAVA_PKG_COMPILER_DIR}/${compiler}" 1631 local compiler_env="${JAVA_PKG_COMPILER_DIR}/${compiler}"
1212 1632
1214 if [[ "${compiler}" != "javac" && -z "${build_compiler}" ]]; then 1634 if [[ "${compiler}" != "javac" && -z "${build_compiler}" ]]; then
1215 die "ANT_BUILD_COMPILER undefined in ${compiler_env}" 1635 die "ANT_BUILD_COMPILER undefined in ${compiler_env}"
1216 fi 1636 fi
1217 1637
1218 if [[ ${compiler} != "javac" ]]; then 1638 if [[ ${compiler} != "javac" ]]; then
1219 antflags="-Dbuild.compiler=${build_compiler}" 1639 antflags="${antflags} -Dbuild.compiler=${build_compiler}"
1220 # Figure out any extra stuff to put on the classpath for compilers aside 1640 # Figure out any extra stuff to put on the classpath for compilers aside
1221 # from javac 1641 # from javac
1222 # ANT_BUILD_COMPILER_DEPS should be something that could be passed to 1642 # ANT_BUILD_COMPILER_DEPS should be something that could be passed to
1223 # java-config -p 1643 # java-config -p
1224 local build_compiler_deps="$(source ${JAVA_PKG_COMPILER_DIR}/${compiler} 1>/dev/null 2>&1; echo ${ANT_BUILD_COMPILER_DEPS})" 1644 local build_compiler_deps="$(source ${JAVA_PKG_COMPILER_DIR}/${compiler} 1>/dev/null 2>&1; echo ${ANT_BUILD_COMPILER_DEPS})"
1229 1649
1230 if is-java-strict; then 1650 if is-java-strict; then
1231 einfo "Disabling system classpath for ant" 1651 einfo "Disabling system classpath for ant"
1232 antflags="${antflags} -Dbuild.sysclasspath=ignore" 1652 antflags="${antflags} -Dbuild.sysclasspath=ignore"
1233 fi 1653 fi
1234 1654
1235 if [[ -n ${JAVA_PKG_DEBUG} ]]; then 1655 for arg in "${@}"; do
1236 antflags="${antflags} -debug" 1656 if [[ ${arg} = -lib ]]; then
1657 if is-java-strict; then
1658 eerror "You should not use the -lib argument to eant because it will fail"
1659 eerror "with JAVA_PKG_STRICT. Please use for example java-pkg_jar-from"
1660 eerror "or ant properties to make dependencies available."
1661 eerror "For ant tasks use WANT_ANT_TASKS or ANT_TASKS from."
1662 eerror "split ant (>=dev-java/ant-core-1.7)."
1663 die "eant -lib is deprecated/forbidden"
1664 else
1665 echo "eant -lib is deprecated. Turn JAVA_PKG_STRICT on for"
1666 echo "more info."
1667 fi
1237 fi 1668 fi
1238 1669 done
1670
1671 if has_version ">=dev-java/ant-core-1.7.0"; then
1672 # default ANT_TASKS to WANT_ANT_TASKS, if ANT_TASKS is not set explicitly
1673 ANT_TASKS="${ANT_TASKS:-${WANT_ANT_TASKS}}"
1674
1675 # override ANT_TASKS with JAVA_PKG_FORCE_ANT_TASKS if it's set
1676 ANT_TASKS="${JAVA_PKG_FORCE_ANT_TASKS:-${ANT_TASKS}}"
1677
1678 if is-java-strict; then
1679 # if ant-tasks were not set by ebuild or forced, try to determine them from depends
1680 if [[ -z "${ANT_TASKS}" ]]; then
1681 ANT_TASKS="$(java-pkg_ant-tasks-from-deps)"
1682 fi
1683 else
1684 # if ant-tasks is not set by ebuild or forced, activate all of them
1685 ANT_TASKS="${ANT_TASKS:-all}"
1686 fi
1687
1688 # at this point, ANT_TASKS should be "all", "none" or explicit list
1689 if [[ "${ANT_TASKS}" == "all" ]]; then
1690 einfo "Using all available ANT_TASKS"
1691 elif [[ "${ANT_TASKS}" == "none" ]]; then
1692 einfo "Disabling all optional ANT_TASKS"
1693 else
1694 einfo "Using following ANT_TASKS: ${ANT_TASKS}"
1695 fi
1696
1697 export ANT_TASKS
1698 fi
1699
1700 [[ -n ${JAVA_PKG_DEBUG} ]] && antflags="${antflags} --execdebug -debug"
1701 [[ -n ${PORTAGE_QUIET} ]] && antflags="${antflags} -q"
1702
1703 local gcp="${EANT_GENTOO_CLASSPATH}"
1704
1705 if [[ ${EBUILD_PHASE} = "test" ]]; then
1706 antflags="${antflags} -DJunit.present=true"
1707 [[ ${gcp} && ${ANT_TASKS} = *ant-junit* ]] && gcp="${gcp} junit"
1708 fi
1709
1710 local cp
1711
1712 for atom in ${gcp}; do
1713 cp="${cp}:$(java-pkg_getjars ${atom})"
1714 done
1715
1716 if [[ ${cp} ]]; then
1717 # It seems ant does not like single quotes around ${cp}
1718 antflags="${antflags} -Dgentoo.classpath=\"${cp#:}\""
1719 fi
1720
1239 [[ -n ${JAVA_PKG_DEBUG} ]] && echo ant ${antflags} "${@}" 1721 [[ -n ${JAVA_PKG_DEBUG} ]] && echo ant ${antflags} "${@}"
1722 debug-print "Calling ant: ${antflags} ${@}"
1240 ant ${antflags} "${@}" || die "eant failed" 1723 ant ${antflags} "${@}" || die "eant failed"
1241 1724
1242} 1725}
1243 1726
1244# ------------------------------------------------------------------------------ 1727# ------------------------------------------------------------------------------
1245# @ebuild-function ejavac 1728# @ebuild-function ejavac
1246# 1729#
1247# Javac wrapper function. Will use the appropriate compiler, based on 1730# Javac wrapper function. Will use the appropriate compiler, based on
1248# /etc/java-config/compilers.conf 1731# /etc/java-config/compilers.conf
1249# 1732#
1250# @param $@ - Arguments to be passed to the compiler 1733# @param $@ - Arguments to be passed to the compiler
1251# ------------------------------------------------------------------------------ 1734# ------------------------------------------------------------------------------
1252ejavac() { 1735ejavac() {
1253 debug-print-function ${FUNCNAME} $* 1736 debug-print-function ${FUNCNAME} $*
1254 1737
1255 # FIXME using get-javac ends up printing stuff with einfo 1738 java-pkg_init-compiler_
1739
1740 local compiler_executable
1256# local compiler_executable=$(java-pkg_get-javac) 1741 compiler_executable=$(java-pkg_get-javac)
1257 local compiler_executable="javac" 1742 if [[ ${?} != 0 ]]; then
1743 eerror "There was a problem determining compiler: ${compiler_executable}"
1744 die "get-javac failed"
1745 fi
1258 1746
1747 local javac_args
1748 javac_args="$(java-pkg_javac-args)"
1749 if [[ ${?} != 0 ]]; then
1750 eerror "There was a problem determining JAVACFLAGS: ${javac_args}"
1751 die "java-pkg_javac-args failed"
1752 fi
1753
1259 [[ -n ${JAVA_PKG_DEBUG} ]] && echo ${compiler_executable} $(java-pkg_javac-args) "${@}" 1754 [[ -n ${JAVA_PKG_DEBUG} ]] && echo ${compiler_executable} ${javac_args} "${@}"
1260 ${compiler_executable} $(java-pkg_javac-args) "${@}" || die "ejavac failed" 1755 ${compiler_executable} ${javac_args} "${@}" || die "ejavac failed"
1261} 1756}
1262 1757
1263# ------------------------------------------------------------------------------ 1758# ------------------------------------------------------------------------------
1264# @ebuild-function java-pkg_filter-compiler 1759# @ebuild-function java-pkg_filter-compiler
1265# 1760#
1266# Used to prevent the use of some compilers. Should be used in src_compile. 1761# Used to prevent the use of some compilers. Should be used in src_compile.
1267# Basically, it just appends onto JAVA_PKG_FILTER_COMPILER 1762# Basically, it just appends onto JAVA_PKG_FILTER_COMPILER
1268# 1763#
1269# @param $@ - compilers to filter 1764# @param $@ - compilers to filter
1270# ------------------------------------------------------------------------------ 1765# ------------------------------------------------------------------------------
1288# ------------------------------------------------------------------------------ 1783# ------------------------------------------------------------------------------
1289# @ebuild-function use_doc 1784# @ebuild-function use_doc
1290# 1785#
1291# Helper function for getting ant to build javadocs. If the user has USE=doc, 1786# 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. 1787# then 'javadoc' or the argument are returned. Otherwise, there is no return.
1293# 1788#
1294# The output of this should be passed to ant. 1789# The output of this should be passed to ant.
1295# 1790#
1296# Example: build javadocs by calling 'javadoc' target 1791# Example: build javadocs by calling 'javadoc' target
1297# eant $(use_doc) 1792# eant $(use_doc)
1298# Example: build javadocs by calling 'apidoc' target 1793# Example: build javadocs by calling 'apidoc' target
1303# ------------------------------------------------------------------------------ 1798# ------------------------------------------------------------------------------
1304use_doc() { 1799use_doc() {
1305 use doc && echo ${@:-javadoc} 1800 use doc && echo ${@:-javadoc}
1306} 1801}
1307 1802
1803
1308# ------------------------------------------------------------------------------ 1804# ------------------------------------------------------------------------------
1309# @section-end build 1805# @section-end build
1310# ------------------------------------------------------------------------------ 1806# ------------------------------------------------------------------------------
1311 1807
1312# ------------------------------------------------------------------------------ 1808# ------------------------------------------------------------------------------
1313# @section-begin internal 1809# @section-begin internal
1314# @section-summary Internal functions 1810# @section-summary Internal functions
1315# 1811#
1316# Do __NOT__ use any of these from an ebuild! These are only to be used from 1812# Do __NOT__ use any of these from an ebuild! These are only to be used from
1317# within the java eclasses. 1813# within the java eclasses.
1318# ------------------------------------------------------------------------------ 1814# ------------------------------------------------------------------------------
1319 1815
1320# ----------------------------------------------------------------------------- 1816# -----------------------------------------------------------------------------
1321# @function-internal java-pkg_init 1817# @function-internal java-pkg_init
1322# 1818#
1323# The purpose of this function, as the name might imply, is to initialize the 1819# 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 1820# 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 1821# that'll muss things up. It initializes some variables, which are used
1326# internally. And most importantly, it'll switch the VM if necessary. 1822# internally. And most importantly, it'll switch the VM if necessary.
1327# 1823#
1330# 1826#
1331# ----------------------------------------------------------------------------- 1827# -----------------------------------------------------------------------------
1332java-pkg_init() { 1828java-pkg_init() {
1333 unset JAVAC 1829 unset JAVAC
1334 unset JAVA_HOME 1830 unset JAVA_HOME
1831
1832 # People do all kinds of weird things.
1833 # http://forums.gentoo.org/viewtopic-p-3943166.html
1834 local silence="${SILENCE_JAVA_OPTIONS_WARNING}"
1835 local accept="${I_WANT_GLOBAL_JAVA_OPTIONS}"
1836 if [[ -n ${_JAVA_OPTIONS} && -z ${accept} && -z ${silence} ]]; then
1837 ewarn "_JAVA_OPTIONS changes what java -version outputs at least for"
1838 ewarn "sun-jdk vms and and as such break configure scripts that"
1839 ewarn "use it (for example app-office/openoffice) so we filter it out."
1840 ewarn "Use SILENCE_JAVA_OPTIONS_WARNING=true in the environment (use"
1841 ewarn "make.conf for example) to silence this warning or"
1842 ewarn "I_WANT_GLOBAL_JAVA_OPTIONS to not filter it."
1843 fi
1844
1845 if [[ -z ${accept} ]]; then
1846 unset _JAVA_OPTIONS
1847 # phase hooks make this run many times without this
1848 I_WANT_GLOBAL_JAVA_OPTIONS="true"
1849 fi
1850
1335 java-pkg_init_paths_ 1851 java-pkg_init_paths_
1336 java-pkg_switch-vm 1852 java-pkg_switch-vm
1337 PATH=${JAVA_HOME}/bin:${PATH} 1853 PATH=${JAVA_HOME}/bin:${PATH}
1338 1854
1339 # TODO we will probably want to set JAVAC and JAVACFLAGS 1855 # TODO we will probably want to set JAVAC and JAVACFLAGS
1340 1856
1341 # Do some QA checks 1857 # Do some QA checks
1342 java-pkg_check-jikes 1858 java-pkg_check-jikes
1343 1859
1344 # When users have crazy classpaths some packages can fail to compile. 1860 # When users have crazy classpaths some packages can fail to compile.
1345 # and everything should work with empty CLASSPATH. 1861 # and everything should work with empty CLASSPATH.
1346 # This also helps prevent unexpected dependencies on random things 1862 # This also helps prevent unexpected dependencies on random things
1347 # from the CLASSPATH. 1863 # from the CLASSPATH.
1348 unset CLASSPATH 1864 unset CLASSPATH
1865
1866 # Unset external ANT_ stuff
1867 unset ANT_TASKS
1868 unset ANT_OPTS
1349} 1869}
1350 1870
1351# ------------------------------------------------------------------------------ 1871# ------------------------------------------------------------------------------
1352# @function-internal java-pkg-init-compiler_ 1872# @function-internal java-pkg-init-compiler_
1353# 1873#
1354# This function attempts to figure out what compiler should be used. It does 1874# 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 1875# this by reading the file at JAVA_PKG_COMPILERS_CONF, and checking the
1356# COMPILERS variable defined there. 1876# COMPILERS variable defined there.
1357# This can be overridden by a list in JAVA_PKG_FORCE_COMPILER 1877# This can be overridden by a list in JAVA_PKG_FORCE_COMPILER
1358# 1878#
1359# It will go through the list of compilers, and verify that it supports the 1879# 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 1880# 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 1881# compiler is checked. When JAVA_PKG_FORCE_COMPILER is defined, this checking
1362# isn't done. 1882# isn't done.
1363# 1883#
1385 if [[ -z ${JAVA_PKG_FORCE_COMPILER} ]]; then 1905 if [[ -z ${JAVA_PKG_FORCE_COMPILER} ]]; then
1386 compilers="$(source ${JAVA_PKG_COMPILERS_CONF} 1>/dev/null 2>&1; echo ${COMPILERS})" 1906 compilers="$(source ${JAVA_PKG_COMPILERS_CONF} 1>/dev/null 2>&1; echo ${COMPILERS})"
1387 else 1907 else
1388 compilers=${JAVA_PKG_FORCE_COMPILER} 1908 compilers=${JAVA_PKG_FORCE_COMPILER}
1389 fi 1909 fi
1390 1910
1391 debug-print "Read \"${compilers}\" from ${JAVA_PKG_COMPILERS_CONF}" 1911 debug-print "Read \"${compilers}\" from ${JAVA_PKG_COMPILERS_CONF}"
1392 1912
1393 # Figure out if we should announce what compiler we're using 1913 # Figure out if we should announce what compiler we're using
1394 local compiler 1914 local compiler
1395 for compiler in ${compilers}; do 1915 for compiler in ${compilers}; do
1398 if [[ ${compiler} = "javac" ]]; then 1918 if [[ ${compiler} = "javac" ]]; then
1399 debug-print "Found javac... breaking" 1919 debug-print "Found javac... breaking"
1400 export GENTOO_COMPILER="javac" 1920 export GENTOO_COMPILER="javac"
1401 break 1921 break
1402 fi 1922 fi
1403 1923
1404 if has ${compiler} ${JAVA_PKG_FILTER_COMPILER}; then 1924 if has ${compiler} ${JAVA_PKG_FILTER_COMPILER}; then
1405 if [[ -z ${JAVA_PKG_FORCE_COMPILER} ]]; then 1925 if [[ -z ${JAVA_PKG_FORCE_COMPILER} ]]; then
1406 einfo "Filtering ${compiler}" 1926 einfo "Filtering ${compiler}"
1407 continue 1927 continue
1408 fi 1928 fi
1409 fi 1929 fi
1410 1930
1411 # for non-javac, we need to make sure it supports the right target and 1931 # for non-javac, we need to make sure it supports the right target and
1412 # source 1932 # source
1413 local compiler_env="${JAVA_PKG_COMPILER_DIR}/${compiler}" 1933 local compiler_env="${JAVA_PKG_COMPILER_DIR}/${compiler}"
1414 if [[ -f ${compiler_env} ]]; then 1934 if [[ -f ${compiler_env} ]]; then
1415 local desired_target="$(java-pkg_get-target)" 1935 local desired_target="$(java-pkg_get-target)"
1497# Writes the package.env out to disk. 2017# Writes the package.env out to disk.
1498# 2018#
1499# ------------------------------------------------------------------------------ 2019# ------------------------------------------------------------------------------
1500# TODO change to do-write, to match everything else 2020# TODO change to do-write, to match everything else
1501java-pkg_do_write_() { 2021java-pkg_do_write_() {
2022 java-pkg_init_paths_
1502 # Create directory for package.env 2023 # Create directory for package.env
1503 dodir "${JAVA_PKG_SHAREPATH}" 2024 dodir "${JAVA_PKG_SHAREPATH}"
1504 if [[ -n "${JAVA_PKG_CLASSPATH}" || -n "${JAVA_PKG_LIBRARY}" || -f "${JAVA_PKG_DEPEND}" ]]; then 2025 if [[ -n "${JAVA_PKG_CLASSPATH}" || -n "${JAVA_PKG_LIBRARY}" || -f "${JAVA_PKG_DEPEND}" ]]; then
1505 # Create package.env 2026 # Create package.env
1506 ( 2027 (
1511 [[ -n "${JAVA_PKG_LIBRARY}" ]] && echo "LIBRARY_PATH=\"${JAVA_PKG_LIBRARY}\"" 2032 [[ -n "${JAVA_PKG_LIBRARY}" ]] && echo "LIBRARY_PATH=\"${JAVA_PKG_LIBRARY}\""
1512 [[ -n "${JAVA_PROVIDE}" ]] && echo "PROVIDES=\"${JAVA_PROVIDE}\"" 2033 [[ -n "${JAVA_PROVIDE}" ]] && echo "PROVIDES=\"${JAVA_PROVIDE}\""
1513 [[ -f "${JAVA_PKG_DEPEND}" ]] && echo "DEPEND=\"$(cat ${JAVA_PKG_DEPEND} | uniq | tr '\n' ':')\"" 2034 [[ -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 ! 2035 echo "VM=\"$(echo ${RDEPEND} ${DEPEND} | sed -e 's/ /\n/g' | sed -n -e '/virtual\/\(jre\|jdk\)/ { p;q }')\"" # TODO cleanup !
1515 ) > "${JAVA_PKG_ENV}" 2036 ) > "${JAVA_PKG_ENV}"
1516 2037
1517 # register target/source 2038 # register target/source
1518 local target="$(java-pkg_get-target)" 2039 local target="$(java-pkg_get-target)"
1519 local source="$(java-pkg_get-source)" 2040 local source="$(java-pkg_get-source)"
1520 [[ -n ${target} ]] && echo "TARGET=\"${target}\"" >> "${JAVA_PKG_ENV}" 2041 [[ -n ${target} ]] && echo "TARGET=\"${target}\"" >> "${JAVA_PKG_ENV}"
1521 [[ -n ${source} ]] && echo "SOURCE=\"${source}\"" >> "${JAVA_PKG_ENV}" 2042 [[ -n ${source} ]] && echo "SOURCE=\"${source}\"" >> "${JAVA_PKG_ENV}"
1534 # Strip unnecessary leading and trailing colons 2055 # Strip unnecessary leading and trailing colons
1535 # TODO try to cleanup if possible 2056 # TODO try to cleanup if possible
1536 sed -e "s/=\":/=\"/" -e "s/:\"$/\"/" -i "${JAVA_PKG_ENV}" || die "Did you forget to call java_init ?" 2057 sed -e "s/=\":/=\"/" -e "s/:\"$/\"/" -i "${JAVA_PKG_ENV}" || die "Did you forget to call java_init ?"
1537 fi 2058 fi
1538} 2059}
1539
1540 2060
1541# ------------------------------------------------------------------------------ 2061# ------------------------------------------------------------------------------
1542# @internal-function java-pkg_record-jar_ 2062# @internal-function java-pkg_record-jar_
1543# 2063#
1544# Record a dependency to the package.env 2064# Record a dependency to the package.env
1588 fi 2108 fi
1589} 2109}
1590 2110
1591# ------------------------------------------------------------------------------ 2111# ------------------------------------------------------------------------------
1592# @internal-function java-pkg_expand_dir_ 2112# @internal-function java-pkg_expand_dir_
1593# 2113#
1594# Gets the full path of the file/directory's parent. 2114# Gets the full path of the file/directory's parent.
1595# @param $1 - file/directory to find parent directory for 2115# @param $1 - file/directory to find parent directory for
1596# @return - path to $1's parent directory 2116# @return - path to $1's parent directory
1597# ------------------------------------------------------------------------------ 2117# ------------------------------------------------------------------------------
1598java-pkg_expand_dir_() { 2118java-pkg_expand_dir_() {
1625# ------------------------------------------------------------------------------ 2145# ------------------------------------------------------------------------------
1626java-pkg_setup-vm() { 2146java-pkg_setup-vm() {
1627 debug-print-function ${FUNCNAME} $* 2147 debug-print-function ${FUNCNAME} $*
1628 2148
1629 local vendor="$(java-pkg_get-vm-vendor)" 2149 local vendor="$(java-pkg_get-vm-vendor)"
1630 if [[ "${vendor}" == "sun" ]] && java-pkg_is-vm-version-ge 1 5; then 2150 if [[ "${vendor}" == "sun" ]] && java-pkg_is-vm-version-ge "1.5" ; then
1631 addpredict "/dev/random" 2151 addpredict "/dev/random"
1632 elif [[ "${vendor}" == "ibm" ]]; then 2152 elif [[ "${vendor}" == "ibm" ]]; then
1633 addpredict "/proc/self/maps" 2153 addpredict "/proc/self/maps"
1634 addpredict "/proc/cpuinfo" 2154 addpredict "/proc/cpuinfo"
1635 export LANG="C" LC_ALL="C" 2155 export LANG="C" LC_ALL="C"
1684# @return - The version of the current VM 2204# @return - The version of the current VM
1685# ------------------------------------------------------------------------------ 2205# ------------------------------------------------------------------------------
1686java-pkg_get-vm-version() { 2206java-pkg_get-vm-version() {
1687 debug-print-function ${FUNCNAME} $* 2207 debug-print-function ${FUNCNAME} $*
1688 2208
1689 java-pkg_get-current-vm | sed -e "s/.*-\([0-9.]\+\).*/\1/" 2209 java-config -g PROVIDES_VERSION
1690} 2210}
1691 2211
1692# ------------------------------------------------------------------------------ 2212# ------------------------------------------------------------------------------
1693# @internal-function java-pkg_switch-vm 2213# @internal-function java-pkg_switch-vm
1694# 2214#
1695# Switch VM if we're allowed to (controlled by JAVA_PKG_ALLOW_VM_CHANGE), and 2215# Switch VM if we're allowed to (controlled by JAVA_PKG_ALLOW_VM_CHANGE), and
1696# verify that the current VM is sufficient. 2216# verify that the current VM is sufficient.
1697# Setup the environment for the VM being used. 2217# Setup the environment for the VM being used.
1698# ------------------------------------------------------------------------------ 2218# ------------------------------------------------------------------------------
1699java-pkg_switch-vm() { 2219java-pkg_switch-vm() {
2220 debug-print-function ${FUNCNAME} $*
2221
1700 if java-pkg_needs-vm; then 2222 if java-pkg_needs-vm; then
1701 # Use the VM specified by JAVA_PKG_FORCE_VM 2223 # Use the VM specified by JAVA_PKG_FORCE_VM
1702 if [[ -n ${JAVA_PKG_FORCE_VM} ]]; then 2224 if [[ -n "${JAVA_PKG_FORCE_VM}" ]]; then
1703 # If you're forcing the VM, I hope you know what your doing... 2225 # If you're forcing the VM, I hope you know what your doing...
2226 debug-print "JAVA_PKG_FORCE_VM used: ${JAVA_PKG_FORCE_VM}"
1704 export GENTOO_VM="${JAVA_PKG_FORCE_VM}" 2227 export GENTOO_VM="${JAVA_PKG_FORCE_VM}"
1705 # if we're allowed to switch the vm... 2228 # if we're allowed to switch the vm...
1706 elif [[ "${JAVA_PKG_ALLOW_VM_CHANGE}" == "yes" ]]; then 2229 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}" 2230 debug-print "depend-java-query: NV_DEPEND: ${JAVA_PKG_NV_DEPEND:-${DEPEND}} VNEED: ${JAVA_PKG_VNEED}"
1708 if [[ -n ${JAVA_PKG_VNEED} ]]; then 2231 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}}")" 2232 GENTOO_VM="$(depend-java-query --need-virtual "${JAVA_PKG_VNEED}" --get-vm "${JAVA_PKG_NV_DEPEND:-${DEPEND}}")"
1710 else 2233 else
1711 export GENTOO_VM="$(depend-java-query --get-vm "${JAVA_PKG_NV_DEPEND:-${DEPEND}}")" 2234 GENTOO_VM="$(depend-java-query --get-vm "${JAVA_PKG_NV_DEPEND:-${DEPEND}}")"
2235 fi
2236 if [[ -z "${GENTOO_VM}" || "${GENTOO_VM}" == "None" ]]; then
2237 eerror "Unable to determine VM for building from dependencies:"
2238 echo "NV_DEPEND: ${JAVA_PKG_NV_DEPEND:-${DEPEND}}"
2239 echo "VNEED: ${JAVA_PKG_VNEED}"
2240 die "Failed to determine VM for building."
2241 else
2242 export GENTOO_VM
1712 fi 2243 fi
1713 # otherwise just make sure the current VM is sufficient 2244 # otherwise just make sure the current VM is sufficient
1714 else 2245 else
1715 java-pkg_ensure-vm-version-sufficient 2246 java-pkg_ensure-vm-version-sufficient
1716 fi 2247 fi
1717 debug-print "Using: $(java-config -f)" 2248 debug-print "Using: $(java-config -f)"
1718 2249
1719 java-pkg_setup-vm 2250 java-pkg_setup-vm
1720 2251
1721 export JAVA=$(java-config --java) 2252 export JAVA=$(java-config --java)
1722 export JAVAC=$(java-config --javac) 2253 export JAVAC=$(java-config --javac)
1723 export JAVACFLAGS="$(java-pkg_javac-args)" 2254 JAVACFLAGS="$(java-pkg_javac-args)"
2255 if [[ ${?} != 0 ]]; then
2256 eerror "There was a problem determining JAVACFLAGS: ${JAVACFLAGS}"
2257 die "java-pkg_javac-args failed"
2258 fi
1724 [[ -n ${JAVACFLAGS_EXTRA} ]] && export JAVACFLAGS="${JAVACFLAGS_EXTRA} ${JAVACFLAGS}" 2259 [[ -n ${JAVACFLAGS_EXTRA} ]] && JAVACFLAGS="${JAVACFLAGS_EXTRA} ${JAVACFLAGS}"
2260 export JAVACFLAGS
1725 2261
1726 export JAVA_HOME="$(java-config -g JAVA_HOME)" 2262 export JAVA_HOME="$(java-config -g JAVA_HOME)"
1727 export JDK_HOME=${JAVA_HOME} 2263 export JDK_HOME=${JAVA_HOME}
1728 2264
1729 #TODO If you know a better solution let us know. 2265 #TODO If you know a better solution let us know.
1730 java-pkg_append_ LD_LIBRARY_PATH "$(java-config -g LDPATH)" 2266 java-pkg_append_ LD_LIBRARY_PATH "$(java-config -g LDPATH)"
1731 2267
1732 local tann="${T}/announced-vm" 2268 local tann="${T}/announced-vm"
1733 if [[ -n "${JAVA_PKG_DEBUG}" ]] || [[ ! -f "${tann}" ]] ; then 2269 if [[ -n "${JAVA_PKG_DEBUG}" ]] || [[ ! -f "${tann}" ]] ; then
1734 # Add a check for setup/preinst phase... to avoid duplicate outputs 2270 # Add a check for setup/preinst phase... to avoid duplicate outputs
1735 # for when FEATURES=buildpkg 2271 # for when FEATURES=buildpkg
1736 if [[ ${EBUILD_PHASE} != "setup" && ${EBUILD_PHASE} != "preinst" && ${EBUILD_PHASE} != "postinst" ]]; 2272 if [[ ${EBUILD_PHASE} != "setup" && ${EBUILD_PHASE} != "preinst" && ${EBUILD_PHASE} != "postinst" ]];
1775 einfo "Classes" 2311 einfo "Classes"
1776 find "${S}" -type f -name '*.class' -print0 | xargs -0 -r -n 500 ls -ald | sed -e "s,${WORKDIR},\${WORKDIR}," 2312 find "${S}" -type f -name '*.class' -print0 | xargs -0 -r -n 500 ls -ald | sed -e "s,${WORKDIR},\${WORKDIR},"
1777 fi 2313 fi
1778} 2314}
1779 2315
1780# TODO document 2316# ------------------------------------------------------------------------------
2317# @internal-function java-pkg_verify-classes
2318#
1781# Verify that the classes were compiled for the right source / target 2319# Verify that the classes were compiled for the right source / target. Dies if
2320# not.
2321# @param $1 (optional) - the file to check, otherwise checks whole ${D}
2322# ------------------------------------------------------------------------------
1782java-pkg_verify-classes() { 2323java-pkg_verify-classes() {
1783 ebegin "Verifying java class versions"
1784 #$(find ${D} -type f -name '*.jar' -o -name '*.class') 2324 #$(find ${D} -type f -name '*.jar' -o -name '*.class')
1785 class-version-verify.py -t $(java-pkg_get-target) -r ${D} 2325 local target=$(java-pkg_get-target)
2326 local result
2327 local log="${T}/class-version-verify.log"
2328 if [[ -n "${1}" ]]; then
2329 class-version-verify.py -v -t ${target} "${1}" > "${log}"
1786 result=$? 2330 result=$?
1787 eend ${result}
1788 if [[ ${result} == 0 ]]; then
1789 einfo "All good"
1790 else 2331 else
1791 ewarn "Possible problem" 2332 ebegin "Verifying java class versions (target: ${target})"
1792 die "Bad class files found" 2333 class-version-verify.py -v -t ${target} -r "${D}" > "${log}"
2334 result=$?
2335 eend ${result}
2336 fi
2337 [[ -n ${JAVA_PKG_DEBUG} ]] && cat "${log}"
2338 if [[ ${result} != 0 ]]; then
2339 eerror "Incorrect bytecode version found"
2340 [[ -n "${1}" ]] && eerror "in file: ${1}"
2341 eerror "See ${log} for more details."
2342 die "Incorrect bytecode found"
2343 fi
2344}
2345
2346# ----------------------------------------------------------------------------
2347# @internal-function java-pkg_ensure-dep
2348# Check that a package being used in jarfrom, getjars and getjar is contained
2349# within DEPEND or RDEPEND.
2350# @param $1 - Is the package a runtime dependency
2351# @param $2 - Package name and slot.
2352
2353java-pkg_ensure-dep() {
2354 debug-print-function ${FUNCNAME} $*
2355
2356 local build_only="${1}"
2357 local target_pkg="${2}"
2358 local dev_error=""
2359
2360 local stripped_pkg=$(echo "${target_pkg}" | sed \
2361 's/-[0-9]*\(\.[0-9]\)*$//')
2362
2363 if [[ ! ( "${DEPEND}" =~ "$stripped_pkg" ) ]]; then
2364 dev_error="The ebuild is attempting to use ${target_pkg} that is not"
2365 dev_error="${dev_error} declared in DEPEND."
2366 if is-java-strict; then
2367 die "${dev_error}"
2368 else
2369 eerror "${dev_error}"
2370 einfo "Because you have this package installed the package will"
2371 einfo "build without problems, but please report this to"
2372 einfo "http://bugs.gentoo.org"
1793 fi 2373 fi
1794} 2374 fi
1795 2375
2376 if [[ -z ${build_only} && ! ( ${RDEPEND} =~ "${stripped_pkg}" ) ]]; then
2377 dev_error="The ebuild is attempting to use ${target_pkg},"
2378 dev_error="${dev_error} without specifying --build-only, that is not declared in RDEPEND."
2379 if is-java-strict; then
2380 die "${error}"
2381 else
2382 eerror "${dev_error}"
2383 einfo "Because you have this package installed the package will"
2384 einfo "build without problems, but please report this to"
2385 einfo "http://bugs.gentoo.org"
2386 fi
2387 fi
2388}
1796 2389
1797# ------------------------------------------------------------------------------ 2390# ------------------------------------------------------------------------------
1798# @section-end internal 2391# @section-end internal
1799# ------------------------------------------------------------------------------ 2392# ------------------------------------------------------------------------------
1800 2393
1832 let "JAVA_PKG_QA_VIOLATIONS+=1" 2425 let "JAVA_PKG_QA_VIOLATIONS+=1"
1833 export JAVA_PKG_QA_VIOLATIONS 2426 export JAVA_PKG_QA_VIOLATIONS
1834} 2427}
1835 2428
1836is-java-strict() { 2429is-java-strict() {
1837 hasq java-strict ${FEATURES}; 2430 [[ -n ${JAVA_PKG_STRICT} ]]
1838 return $? 2431 return $?
1839} 2432}
1840 2433
1841# ------------------------------------------------------------------------------ 2434# ------------------------------------------------------------------------------
1842# @eclass-end 2435# @eclass-end

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

  ViewVC Help
Powered by ViewVC 1.1.20