/[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.12 Revision 1.97
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 9# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.97 2007/11/26 20:38:26 betelgeuse Exp $
10 10
11# ----------------------------------------------------------------------------- 11# -----------------------------------------------------------------------------
12# @eclass-begin 12# @eclass-begin
13# @eclass-shortdesc Java Utility eclass 13# @eclass-shortdesc Java Utility eclass
14# @eclass-maintainer java@gentoo.org 14# @eclass-maintainer java@gentoo.org
15# 15#
16# This eclass provides functionality which is used by 16# This eclass provides functionality which is used by
17# java-pkg.eclass and java-pkg-opt.eclass as well as from ebuilds. 17# java-pkg.eclass and java-pkg-opt.eclass as well as from ebuilds.
18# 18#
19# @warning 19# @warning
20# You probably don't want to inherit this directly from an ebuild. Instead, 20# 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 21# 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. 22# Java packages, or java-pkg-opt for packages that have optional Java support.
23# 23#
24# ----------------------------------------------------------------------------- 24# -----------------------------------------------------------------------------
25 25
26inherit eutils versionator multilib 26inherit eutils versionator multilib
27
28IUSE="elibc_FreeBSD"
27 29
28# ----------------------------------------------------------------------------- 30# -----------------------------------------------------------------------------
29# @section-begin variables 31# @section-begin variables
30# @section-title Variables 32# @section-title Variables
31# 33#
33# ----------------------------------------------------------------------------- 35# -----------------------------------------------------------------------------
34 36
35# Make sure we use java-config-2 37# Make sure we use java-config-2
36export WANT_JAVA_CONFIG="2" 38export WANT_JAVA_CONFIG="2"
37 39
38# TODO document 40# -----------------------------------------------------------------------------
41# @variable-external WANT_ANT_TASKS
42# @variable-default ""
43#
44# An $IFS separated list of ant tasks.
45# Ebuild can specify this variable before inheriting java-ant-2 eclass to
46# determine ANT_TASKS it needs. They will be automatically translated to
47# DEPEND variable and ANT_TASKS variable. JAVA_PKG_FORCE_ANT_TASKS can override
48# ANT_TASKS set by WANT_ANT_TASKS, but not the DEPEND due to caching.
49# Ebuilds that need to depend conditionally on certain tasks and specify them
50# differently for different eant calls can't use this simplified approach.
51# You also cannot specify version or anything else than ant-*.
52#
53# @example WANT_ANT_TASKS="ant-junit ant-trax"
54#
55# @seealso JAVA_PKG_FORCE_ANT_TASKS
56# -----------------------------------------------------------------------------
57#WANT_ANT_TASKS
58
59# -----------------------------------------------------------------------------
60# @variable-internal JAVA_PKG_PORTAGE_DEP
61#
62# The version of portage we need to function properly. Previously it was
63# portage with phase hooks support but now we use a version with proper env
64# saving.
65# -----------------------------------------------------------------------------
39JAVA_PKG_PORTAGE_DEP=">=sys-apps/portage-2.1_pre1" 66JAVA_PKG_PORTAGE_DEP=">=sys-apps/portage-2.1.2.7"
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. Usually the latest stable version
46# portage, that includes phase hooks. 73# so that ebuilds can use new features without depending on specific versions.
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.33-r1 ${JAVA_PKG_PORTAGE_DEP}"
76hasq source ${JAVA_PKG_IUSE} && JAVA_PKG_E_DEPEND="${JAVA_PKG_E_DEPEND} source? ( app-arch/zip )"
49 77
50# ----------------------------------------------------------------------------- 78# -----------------------------------------------------------------------------
51# @variable-external JAVA_PKG_ALLOW_VM_CHANGE 79# @variable-external JAVA_PKG_ALLOW_VM_CHANGE
52# @variable-default yes 80# @variable-default yes
53# 81#
100# ----------------------------------------------------------------------------- 128# -----------------------------------------------------------------------------
101 129
102# ----------------------------------------------------------------------------- 130# -----------------------------------------------------------------------------
103# @variable-internal JAVA_PKG_COMPILER_DIR 131# @variable-internal JAVA_PKG_COMPILER_DIR
104# @default /usr/share/java-config-2/compiler 132# @default /usr/share/java-config-2/compiler
105# 133#
106# Directory where compiler settings are saved, without trailing slash. 134# Directory where compiler settings are saved, without trailing slash.
107# Probably shouldn't touch this variable. 135# Probably shouldn't touch this variable.
108# ----------------------------------------------------------------------------- 136# -----------------------------------------------------------------------------
109JAVA_PKG_COMPILER_DIR=${JAVA_PKG_COMPILER_DIR:="/usr/share/java-config-2/compiler"} 137JAVA_PKG_COMPILER_DIR=${JAVA_PKG_COMPILER_DIR:="/usr/share/java-config-2/compiler"}
110 138
120 148
121# ----------------------------------------------------------------------------- 149# -----------------------------------------------------------------------------
122# @variable-external JAVA_PKG_FORCE_COMPILER 150# @variable-external JAVA_PKG_FORCE_COMPILER
123# 151#
124# Explicitly set a list of compilers to use. This is normally read from 152# Explicitly set a list of compilers to use. This is normally read from
125# JAVA_PKG_COMPILERS_CONF. 153# JAVA_PKG_COMPILERS_CONF.
126# 154#
127# @note This should only be used internally or for testing. 155# @note This should only be used internally or for testing.
128# @example Use jikes and javac, in that order 156# @example Use jikes and javac, in that order
129# JAVA_PKG_FORCE_COMPILER="jikes javac" 157# JAVA_PKG_FORCE_COMPILER="jikes javac"
130# ----------------------------------------------------------------------------- 158# -----------------------------------------------------------------------------
131 159
160# -----------------------------------------------------------------------------
161# @variable-external JAVA_PKG_FORCE_ANT_TASKS
162#
163# An $IFS separated list of ant tasks. Can be set in environment before calling
164# emerge/ebuild to override variables set in ebuild, mainly for testing before
165# putting the resulting (WANT_)ANT_TASKS into ebuild. Affects only ANT_TASKS in
166# eant() call, not the dependencies specified in WANT_ANT_TASKS.
167#
168# @example JAVA_PKG_FORCE_ANT_TASKS="ant-junit ant-trax" \
169# ebuild foo.ebuild compile
170#
171# @seealso WANT_ANT_TASKS
172# -----------------------------------------------------------------------------
173
132# TODO document me 174# TODO document me
133JAVA_PKG_QA_VIOLATIONS=0 175JAVA_PKG_QA_VIOLATIONS=0
134 176
135# ----------------------------------------------------------------------------- 177# -----------------------------------------------------------------------------
136# @section-end variables 178# @section-end variables
143# 185#
144# These are used to install Java-related things, such as jars, Javadocs, JNI 186# These are used to install Java-related things, such as jars, Javadocs, JNI
145# libraries, etc. 187# libraries, etc.
146# ----------------------------------------------------------------------------- 188# -----------------------------------------------------------------------------
147 189
190# -----------------------------------------------------------------------------
191# @ebuild-function java-pkg_doexamples
192#
193# Installs given arguments to /usr/share/doc/${PF}/examples
194# If you give it only one parameter and it is a directory it will install
195# everything in that directory to the examples directory.
196#
197# @example
198# java-pkg_doexamples demo
199# java-pkg_doexamples demo/* examples/*
200#
201# @param --subdir - If the examples need a certain directory structure
202# @param $* - list of files to install
203# ------------------------------------------------------------------------------
204java-pkg_doexamples() {
205 debug-print-function ${FUNCNAME} $*
206
207 [[ ${#} -lt 1 ]] && die "At least one argument needed"
208
209 java-pkg_check-phase install
210
211 local dest=/usr/share/doc/${PF}/examples
212 if [[ ${1} == --subdir ]]; then
213 local dest=${dest}/${2}
214 dodir ${dest}
215 shift 2
216 fi
217
218 if [[ ${#} = 1 && -d ${1} ]]; then
219 ( # dont want to pollute calling env
220 insinto "${dest}"
221 doins -r ${1}/*
222 ) || die "Installing examples failed"
223 else
224 ( # dont want to pollute calling env
225 insinto "${dest}"
226 doins -r "$@"
227 ) || die "Installing examples failed"
228 fi
229}
148 230
149# ----------------------------------------------------------------------------- 231# -----------------------------------------------------------------------------
150# @ebuild-function java-pkg_dojar 232# @ebuild-function java-pkg_dojar
151# 233#
152# Installs any number of jars. 234# Installs any number of jars.
153# Jar's will be installed into /usr/share/${PN}(-${SLOT})/lib/ by default. 235# Jar's will be installed into /usr/share/${PN}(-${SLOT})/lib/ by default.
154# You can use java-pkg_jarinto to change this path. 236# You can use java-pkg_jarinto to change this path.
155# You should never install a jar with a package version in the filename. 237# You should never install a jar with a package version in the filename.
156# Instead, use java-pkg_newjar defined below. 238# Instead, use java-pkg_newjar defined below.
157# 239#
158# @example 240# @example
159# java-pkg_dojar dist/${PN}.jar dist/${PN}-core.jar 241# java-pkg_dojar dist/${PN}.jar dist/${PN}-core.jar
160# 242#
171 # Create JARDEST if it doesn't exist 253 # Create JARDEST if it doesn't exist
172 dodir ${JAVA_PKG_JARDEST} 254 dodir ${JAVA_PKG_JARDEST}
173 255
174 local jar 256 local jar
175 # for each jar 257 # for each jar
176 for jar in "$@"; do 258 for jar in "${@}"; do
177 local jar_basename=$(basename "${jar}") 259 local jar_basename=$(basename "${jar}")
178 260
179 java-pkg_check-versioned-jar ${jar_basename} 261 java-pkg_check-versioned-jar ${jar_basename}
180 262
181 # check if it exists 263 # check if it exists
182 if [[ -e "${jar}" ]] ; then 264 if [[ -e "${jar}" ]] ; then
265 # Don't overwrite if jar has already been installed with the same
266 # name
267 local dest="${D}${JAVA_PKG_JARDEST}/${jar_basename}"
268 if [[ -e "${dest}" ]]; then
269 ewarn "Overwriting ${dest}"
270 fi
271
183 # install it into JARDEST if it's a non-symlink 272 # install it into JARDEST if it's a non-symlink
184 if [[ ! -L "${jar}" ]] ; then 273 if [[ ! -L "${jar}" ]] ; then
274 #but first check class version when in strict mode.
275 is-java-strict && java-pkg_verify-classes "${jar}"
276
185 INSDESTTREE="${JAVA_PKG_JARDEST}" \ 277 INSDESTTREE="${JAVA_PKG_JARDEST}" \
186 doins "${jar}" || die "failed to install ${jar}" 278 doins "${jar}" || die "failed to install ${jar}"
187 java-pkg_append_ JAVA_PKG_CLASSPATH "${JAVA_PKG_JARDEST}/${jar_basename}" 279 java-pkg_append_ JAVA_PKG_CLASSPATH "${JAVA_PKG_JARDEST}/${jar_basename}"
188 debug-print "installed ${jar} to ${D}${JAVA_PKG_JARDEST}" 280 debug-print "installed ${jar} to ${D}${JAVA_PKG_JARDEST}"
189 # make a symlink to the original jar if it's symlink 281 # make a symlink to the original jar if it's symlink
200 292
201 java-pkg_do_write_ 293 java-pkg_do_write_
202} 294}
203 295
204 296
297# ------------------------------------------------------------------------------
298# @internal-function depend-java-query
299#
300# Wrapper for the depend-java-query binary to enable passing USE in env.
301# Using env variables keeps this eclass working with java-config versions that
302# do not handle use flags.
303# ------------------------------------------------------------------------------
304
305depend-java-query() {
306 # Used to have a which call here but it caused endless loops for some people
307 # that had some weird bashrc voodoo for which.
308 USE="${USE}" /usr/bin/depend-java-query "${@}"
309}
205 310
206# ------------------------------------------------------------------------------ 311# ------------------------------------------------------------------------------
207# @ebuild-function java-pkg_regjar 312# @ebuild-function java-pkg_regjar
208# 313#
209# Records an already installed jar in the package.env 314# Records an already installed jar in the package.env
222# will not work, because: 327# will not work, because:
223# * the `for jar in "$@"` can't expand the path to jar file names, as they 328# * the `for jar in "$@"` can't expand the path to jar file names, as they
224# don't exist yet 329# don't exist yet
225# * all `if ...` inside for will fail - the file '/opt/my-java/lib/*.jar' 330# * all `if ...` inside for will fail - the file '/opt/my-java/lib/*.jar'
226# doesn't exist 331# doesn't exist
227# 332#
228# you have to use it as: 333# you have to use it as:
229# 334#
230# java-pkg_regjar ${D}/opt/my-java/lib/*.jar 335# java-pkg_regjar ${D}/opt/my-java/lib/*.jar
231# 336#
232# @param $@ - jars to record 337# @param $@ - jars to record
240 [[ ${#} -lt 1 ]] && die "at least one argument needed" 345 [[ ${#} -lt 1 ]] && die "at least one argument needed"
241 346
242 java-pkg_init_paths_ 347 java-pkg_init_paths_
243 348
244 local jar jar_dir jar_file 349 local jar jar_dir jar_file
245 for jar in "$@"; do 350 for jar in "${@}"; do
246 # TODO use java-pkg_check-versioned-jar 351 # TODO use java-pkg_check-versioned-jar
247 if [[ -e "${jar}" ]]; then 352 if [[ -e "${jar}" || -e "${D}${jar}" ]]; then
353 [[ -d "${jar}" || -d "${D}${jar}" ]] \
354 && die "Called ${FUNCNAME} on a directory $*"
355
356 #check that class version correct when in strict mode
357 is-java-strict && java-pkg_verify-classes "${jar}"
358
248 # nelchael: we should strip ${D} in this case too, here's why: 359 # nelchael: we should strip ${D} in this case too, here's why:
249 # imagine such call: 360 # imagine such call:
250 # java-pkg_regjar ${D}/opt/java/*.jar 361 # java-pkg_regjar ${D}/opt/java/*.jar
251 # such call will fall into this case (-e ${jar}) and will 362 # such call will fall into this case (-e ${jar}) and will
252 # record paths with ${D} in package.env 363 # record paths with ${D} in package.env
253 java-pkg_append_ JAVA_PKG_CLASSPATH "${jar#${D}}" 364 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 365 else
366 if [[ ${jar} = *\** ]]; then
367 eerror "The argument ${jar} to ${FUNCNAME}"
368 eerror "has * in it. If you want it to glob in"
369 eerror '${D} add ${D} to the argument.'
370 fi
257 die "${jar} does not exist" 371 die "${jar} does not exist"
258 fi 372 fi
259 done 373 done
260 374
261 java-pkg_do_write_ 375 java-pkg_do_write_
262} 376}
263
264 377
265# ------------------------------------------------------------------------------ 378# ------------------------------------------------------------------------------
266# @ebuild-function java-pkg_newjar 379# @ebuild-function java-pkg_newjar
267# 380#
268# Installs a jar with a new name 381# Installs a jar with a new name
279 local original_jar="${1}" 392 local original_jar="${1}"
280 local new_jar="${2:-${PN}.jar}" 393 local new_jar="${2:-${PN}.jar}"
281 local new_jar_dest="${T}/${new_jar}" 394 local new_jar_dest="${T}/${new_jar}"
282 395
283 [[ -z ${original_jar} ]] && die "Must specify a jar to install" 396 [[ -z ${original_jar} ]] && die "Must specify a jar to install"
284 [[ ! -f ${original_jar} ]] && die "${original_jar} does not exist!" 397 [[ ! -f ${original_jar} ]] \
398 && die "${original_jar} does not exist or is not a file!"
285 399
286 rm -f "${new_jar_dest}" || die "Failed to remove ${new_jar_dest}" 400 rm -f "${new_jar_dest}" || die "Failed to remove ${new_jar_dest}"
287 cp "${original_jar}" "${new_jar_dest}" \ 401 cp "${original_jar}" "${new_jar_dest}" \
288 || die "Failed to copy ${original_jar} to ${new_jar_dest}" 402 || die "Failed to copy ${original_jar} to ${new_jar_dest}"
289 java-pkg_dojar "${new_jar_dest}" 403 java-pkg_dojar "${new_jar_dest}"
290} 404}
291 405
292
293# ------------------------------------------------------------------------------ 406# ------------------------------------------------------------------------------
294# @ebuild-function java-pkg_addcp 407# @ebuild-function java-pkg_addcp
295# 408#
296# Add something to the package's classpath. For jars, you should use dojar, 409# 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. 410# newjar, or regjar. This is typically used to add directories to the classpath.
302java-pkg_addcp() { 415java-pkg_addcp() {
303 java-pkg_append_ JAVA_PKG_CLASSPATH "${@}" 416 java-pkg_append_ JAVA_PKG_CLASSPATH "${@}"
304 java-pkg_do_write_ 417 java-pkg_do_write_
305} 418}
306 419
307
308# ------------------------------------------------------------------------------ 420# ------------------------------------------------------------------------------
309# @ebuild-function java-pkg_doso 421# @ebuild-function java-pkg_doso
310# 422#
311# Installs any number of JNI libraries 423# Installs any number of JNI libraries
312# They will be installed into /usr/lib by default, but java-pkg_sointo 424# They will be installed into /usr/lib by default, but java-pkg_sointo
313# can be used change this path 425# can be used change this path
314# 426#
315# Example: 427# Example:
340 java-pkg_append_ JAVA_PKG_LIBRARY "${JAVA_PKG_LIBDEST}" 452 java-pkg_append_ JAVA_PKG_LIBRARY "${JAVA_PKG_LIBDEST}"
341 debug-print "Installing ${lib} to ${JAVA_PKG_LIBDEST}" 453 debug-print "Installing ${lib} to ${JAVA_PKG_LIBDEST}"
342 # otherwise make a symlink to the symlink's origin 454 # otherwise make a symlink to the symlink's origin
343 else 455 else
344 # TODO use dosym 456 # TODO use dosym
457 ln -s "$(readlink "${lib}")" \
345 ln -s "$(readlink "${lib}")" "${D}${JAVA_PKG_LIBDEST}/$(basename "${lib}")" 458 "${D}${JAVA_PKG_LIBDEST}/$(basename "${lib}")"
346 debug-print "${lib} is a symlink, linking accordanly" 459 debug-print "${lib} is a symlink, linking accordanly"
347 fi 460 fi
348 # otherwise die 461 # otherwise die
349 else 462 else
350 die "${lib} does not exist" 463 die "${lib} does not exist"
370 java-pkg_check-phase install 483 java-pkg_check-phase install
371 484
372 [[ ${#} -lt 1 ]] && "at least one argument needed" 485 [[ ${#} -lt 1 ]] && "at least one argument needed"
373 486
374 java-pkg_init_paths_ 487 java-pkg_init_paths_
375 488
376 local lib target_dir 489 local lib target_dir
377 for lib in "$@" ; do 490 for lib in "$@" ; do
378 # Check the absolute path of the lib 491 # Check the absolute path of the lib
379 if [[ -e "${lib}" ]] ; then 492 if [[ -e "${lib}" ]] ; then
380 target_dir="$(java-pkg_expand_dir_ ${lib})" 493 target_dir="$(java-pkg_expand_dir_ ${lib})"
428# ------------------------------------------------------------------------------ 541# ------------------------------------------------------------------------------
429java-pkg_dohtml() { 542java-pkg_dohtml() {
430 debug-print-function ${FUNCNAME} $* 543 debug-print-function ${FUNCNAME} $*
431 544
432 [[ ${#} -lt 1 ]] && die "At least one argument required for ${FUNCNAME}" 545 [[ ${#} -lt 1 ]] && die "At least one argument required for ${FUNCNAME}"
433 # TODO-nichoj find out what exactly -f package-list does 546
547 # from /usr/lib/portage/bin/dohtml -h
548 # -f Set list of allowed extensionless file names.
434 dohtml -f package-list "$@" 549 dohtml -f package-list "$@"
550
435 # this probably shouldn't be here but it provides 551 # this probably shouldn't be here but it provides
436 # a reasonable way to catch # docs for all of the 552 # a reasonable way to catch # docs for all of the
437 # old ebuilds. 553 # old ebuilds.
438 java-pkg_recordjavadoc 554 java-pkg_recordjavadoc
439} 555}
440 556
441# TODO document 557# ------------------------------------------------------------------------------
558# @ebuild-function java-pkg_dojavadoc
559#
560# Installs javadoc documentation. This should be controlled by the doc use flag.
561#
562# @param $1: - The javadoc root directory.
563#
564# @example:
565# java-pkg_dojavadoc docs/api
566#
567# ------------------------------------------------------------------------------
442java-pkg_dojavadoc() { 568java-pkg_dojavadoc() {
569 debug-print-function ${FUNCNAME} $*
443 local dir="$1" 570 local dir="$1"
571
572 # QA checks
444 573
445 java-pkg_check-phase install 574 java-pkg_check-phase install
446 575
447 [[ -z "${dir}" ]] && die "Must specify a directory!" 576 [[ -z "${dir}" ]] && die "Must specify a directory!"
448 [[ ! -d "${dir}" ]] && die "${dir} does not exist, or isn't a directory!" 577 [[ ! -d "${dir}" ]] && die "${dir} does not exist, or isn't a directory!"
578 if [[ ! -e "${dir}/index.html" ]]; then
579 local msg="No index.html in javadoc directory"
580 ewarn "${msg}"
581 is-java-strict && die "${msg}"
582 fi
583
584 # Renaming to match our directory layout
449 585
450 local dir_to_install="${dir}" 586 local dir_to_install="${dir}"
451 if [[ "$(basename "${dir}")" != "api" ]]; then 587 if [[ "$(basename "${dir}")" != "api" ]]; then
452 dir_to_install="${T}/api" 588 dir_to_install="${T}/api"
453 # TODO use doins 589 # TODO use doins
454 cp -r "${dir}" "${dir_to_install}" || die "cp failed" 590 cp -r "${dir}" "${dir_to_install}" || die "cp failed"
455 fi 591 fi
456 592
593 # Actual installation
594
457 java-pkg_dohtml -r ${dir_to_install} 595 java-pkg_dohtml -r ${dir_to_install}
458} 596}
459 597
460# ------------------------------------------------------------------------------ 598# ------------------------------------------------------------------------------
461# @ebuild-function java-pkg_dosrc 599# @ebuild-function java-pkg_dosrc
462# 600#
463# Installs a zip containing the source for a package, so it can used in 601# Installs a zip containing the source for a package, so it can used in
464# from IDEs like eclipse and netbeans. 602# from IDEs like eclipse and netbeans.
465# 603#
466# Ebuild needs to DEPEND on app-arch/zip to use this. 604# Ebuild needs to DEPEND on app-arch/zip to use this.
467# 605#
468# It also should be controlled by USE=source. 606# It also should be controlled by USE=source.
469# 607#
470# @example: 608# @example:
471# java-pkg_dosrc src/* 609# java-pkg_dosrc src/*
472# 610#
473# ------------------------------------------------------------------------------ 611# ------------------------------------------------------------------------------
474# TODO change so it the arguments it takes are the base directories containing 612# TODO change so it the arguments it takes are the base directories containing
475# source -nichoj 613# source -nichoj
476# TODO should we be able to handle multiple calls to dosrc? -nichoj 614# TODO should we be able to handle multiple calls to dosrc? -nichoj
477# TODO maybe we can take an existing zip/jar? -nichoj 615# TODO maybe we can take an existing zip/jar? -nichoj
478# FIXME apparently this fails if you give it an empty directories 616# FIXME apparently this fails if you give it an empty directories
479java-pkg_dosrc() { 617java-pkg_dosrc() {
480 debug-print-function ${FUNCNAME} $* 618 debug-print-function ${FUNCNAME} $*
481 619
482 [ ${#} -lt 1 ] && die "At least one argument needed" 620 [ ${#} -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 621
487 java-pkg_check-phase install 622 java-pkg_check-phase install
488 623
489 [[ ${#} -lt 1 ]] && die "At least one argument needed" 624 [[ ${#} -lt 1 ]] && die "At least one argument needed"
625
626 if ! [[ ${DEPEND} = *app-arch/zip* ]]; then
627 local msg="${FUNCNAME} called without app-arch/zip in DEPEND"
628 if is-java-strict; then
629 eerror "${msg}"
630 die "${msg}"
631 else
632 echo "${msg}"
633 echo "Please report this to http://bugs.gentoo.org."
634 fi
635 fi
490 636
491 java-pkg_init_paths_ 637 java-pkg_init_paths_
492 638
493 local zip_name="${PN}-src.zip" 639 local zip_name="${PN}-src.zip"
494 local zip_path="${T}/${zip_name}" 640 local zip_path="${T}/${zip_name}"
495 local dir 641 local dir
496 for dir in ${@}; do 642 for dir in "${@}"; do
497 local dir_parent=$(dirname "${dir}") 643 local dir_parent=$(dirname "${dir}")
498 local dir_name=$(basename "${dir}") 644 local dir_name=$(basename "${dir}")
499 pushd ${dir_parent} > /dev/null || die "problem entering ${dir_parent}" 645 pushd ${dir_parent} > /dev/null || die "problem entering ${dir_parent}"
500 zip -q -r ${zip_path} ${dir_name} -i '*.java' 646 zip -q -r ${zip_path} ${dir_name} -i '*.java'
501 local result=$? 647 local result=$?
518# @ebuild-function java-pkg_dolauncher 664# @ebuild-function java-pkg_dolauncher
519# 665#
520# Make a wrapper script to lauch/start this package 666# Make a wrapper script to lauch/start this package
521# If necessary, the wrapper will switch to the appropriate VM. 667# If necessary, the wrapper will switch to the appropriate VM.
522# 668#
669# Can be called without parameters if the package installs only one jar
670# that has the Main-class attribute set. The wrapper will be named ${PN}.
671#
523# @param $1 - filename of launcher to create 672# @param $1 - filename of launcher to create
524# @param $2 - options, as follows: 673# @param $2 - options, as follows:
525# --main the.main.class.too.start 674# --main the.main.class.too.start
526# --jar /the/jar/too/launch.jar 675# --jar /the/jar/too/launch.jar or just <name>.jar
527# --java_args 'Extra arguments to pass too jave' 676# --java_args 'Extra arguments to pass to java'
528# --pkg_args 'extra arguments too pass too the package' 677# --pkg_args 'Extra arguments to pass to the package'
529# --pwd 678# --pwd Directory the launcher changes to before executing java
530# -into 679# -into Directory to install the launcher to, instead of /usr/bin
531# -pre 680# -pre Prepend contents of this file to the launcher
532# ------------------------------------------------------------------------------ 681# ------------------------------------------------------------------------------
533java-pkg_dolauncher() { 682java-pkg_dolauncher() {
534 debug-print-function ${FUNCNAME} $* 683 debug-print-function ${FUNCNAME} $*
535 684
536 java-pkg_check-phase install 685 java-pkg_check-phase install
537
538 [[ ${#} -lt 1 ]] && die "Need at least one argument"
539
540 java-pkg_init_paths_ 686 java-pkg_init_paths_
541 687
688 if [[ ${#} = 0 ]]; then
689 local name="${PN}"
690 else
542 local name="${1}" 691 local name="${1}"
692 shift
693 fi
694
543 # TODO rename to launcher 695 # TODO rename to launcher
544 local target="${T}/${name}" 696 local target="${T}/${name}"
697 local var_tmp="${T}/launcher_variables_tmp"
545 local target_dir pre 698 local target_dir pre
546 shift
547 699
548 echo "#!/bin/bash" > "${target}" 700 # Process the other the rest of the arguments
549 while [[ -n "${1}" && -n "${2}" ]]; do 701 while [[ -n "${1}" && -n "${2}" ]]; do
550 local var=${1} value=${2} 702 local var="${1}" value="${2}"
551 if [[ "${var:0:2}" == "--" ]]; then 703 if [[ "${var:0:2}" == "--" ]]; then
704 local var=${var:2}
552 echo "gjl_${var:2}=\"${value}\"" >> "${target}" 705 echo "gjl_${var}=\"${value}\"" >> "${var_tmp}"
706 local gjl_${var}="${value}"
553 elif [[ "${var}" == "-into" ]]; then 707 elif [[ "${var}" == "-into" ]]; then
554 target_dir="${value}" 708 target_dir="${value}"
555 elif [[ "${var}" == "-pre" ]]; then 709 elif [[ "${var}" == "-pre" ]]; then
556 pre="${value}" 710 pre="${value}"
557 fi 711 fi
558 shift 2 712 shift 2
559 done 713 done
714
715 # Test if no --jar and --main arguments were given and
716 # in that case check if the package only installs one jar
717 # and use that jar.
718 if [[ -z "${gjl_jar}" && -z "${gjl_main}" ]]; then
719 local cp="${JAVA_PKG_CLASSPATH}"
720 if [[ "${cp/:}" = "${cp}" && "${cp%.jar}" != "${cp}" ]]; then
721 echo "gjl_jar=\"${JAVA_PKG_CLASSPATH}\"" >> "${var_tmp}"
722 else
723 local msg="Not enough information to create a launcher given."
724 msg="${msg} Please give --jar or --main argument to ${FUNCNAME}."
725 die "${msg}"
726 fi
727 fi
728
729 # Write the actual script
730 echo "#!/bin/bash" > "${target}"
731 if [[ -n "${pre}" ]]; then
732 if [[ -f "${pre}" ]]; then
733 cat "${pre}" >> "${target}"
734 else
735 die "-pre specified file '${pre}' does not exist"
736 fi
737 fi
560 echo "gjl_package=${JAVA_PKG_NAME}" >> "${target}" 738 echo "gjl_package=${JAVA_PKG_NAME}" >> "${target}"
561 [[ -n "${pre}" ]] && [[ -f "${pre}" ]] && cat "${pre}" >> "${target}" 739 cat "${var_tmp}" >> "${target}"
740 rm -f "${var_tmp}"
562 echo "source /usr/share/java-config-2/launcher/launcher.bash" >> "${target}" 741 echo "source /usr/share/java-config-2/launcher/launcher.bash" >> "${target}"
563 742
564 if [[ -n "${into}" ]]; then 743 if [[ -n "${target_dir}" ]]; then
565 DESTTREE="${target_dir}" dobin "${target}" 744 DESTTREE="${target_dir}" dobin "${target}"
566 local ret=$? 745 local ret=$?
567 return ${ret} 746 return ${ret}
568 else 747 else
569 dobin "${target}" 748 dobin "${target}"
597 echo "dowar: warning, skipping directory ${war}" 776 echo "dowar: warning, skipping directory ${war}"
598 continue 777 continue
599 else 778 else
600 warpath="${war}" 779 warpath="${war}"
601 fi 780 fi
602 781
603 # Install those files like you mean it 782 # Install those files like you mean it
604 INSOPTIONS="-m 0644" \ 783 INSOPTIONS="-m 0644" \
605 INSDESTTREE=${JAVA_PKG_WARDEST} \ 784 INSDESTTREE=${JAVA_PKG_WARDEST} \
606 doins ${warpath} 785 doins ${warpath}
607 done 786 done
642# @ebuild-function java-pkg_jar-from 821# @ebuild-function java-pkg_jar-from
643# 822#
644# Makes a symlink to a jar from a certain package 823# Makes a symlink to a jar from a certain package
645# A lot of java packages include dependencies in a lib/ directory 824# A lot of java packages include dependencies in a lib/ directory
646# You can use this function to replace these bundled dependencies. 825# You can use this function to replace these bundled dependencies.
826# The dependency is recorded into package.env DEPEND line, unless "--build-only"
827# is passed as the very first argument, for jars that have to be present only
828# at build time and are not needed on runtime (junit testing etc).
647# 829#
648# Example: get all jars from xerces slot 2 830# Example: get all jars from xerces slot 2
649# java-pkg_jar-from xerces-2 831# java-pkg_jar-from xerces-2
650# Example: get a specific jar from xerces slot 2 832# Example: get a specific jar from xerces slot 2
651# java-pkg_jar-from xerces-2 xml-apis.jar 833# java-pkg_jar-from xerces-2 xml-apis.jar
652# Example get a specific jar from xerces slot 2, and name it diffrently 834# 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 835# java-pkg_jar-from xerces-2 xml-apis.jar xml.jar
836# Example: get junit.jar which is needed only for building
837# java-pkg_jar-from --build-only junit junit.jar
654# 838#
655# @param $1 - Package to get jars from. 839# @param $opt
840# --build-only - makes the jar(s) not added into package.env DEPEND line.
841# (assumed automatically when called inside src_test)
842# --with-dependencies - get jars also from requested package's dependencies
843# transitively.
844# --virtual - Packages passed to this function are to be handled as virtuals
845# and will not have individual jar dependencies recorded.
846# --into $dir - symlink jar(s) into $dir (must exist) instead of .
847# @param $1 - Package to get jars from, or comma-separated list of packages in
848# case other parameters are not used.
656# @param $2 - jar from package. If not specified, all jars will be used. 849# @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 850# @param $3 - When a single jar is specified, destination filename of the
658# symlink. Defaults to the name of the jar. 851# symlink. Defaults to the name of the jar.
659# ------------------------------------------------------------------------------ 852# ------------------------------------------------------------------------------
660# TODO could probably be cleaned up a little 853# TODO could probably be cleaned up a little
661java-pkg_jar-from() { 854java-pkg_jar-from() {
662 debug-print-function ${FUNCNAME} $* 855 debug-print-function ${FUNCNAME} $*
663 856
857 local build_only=""
858 local destdir="."
859 local deep=""
860 local virtual=""
861
862 [[ "${EBUILD_PHASE}" == "test" ]] && build_only="build"
863
864 while [[ "${1}" == --* ]]; do
865 if [[ "${1}" = "--build-only" ]]; then
866 build_only="build"
867 elif [[ "${1}" = "--with-dependencies" ]]; then
868 deep="--with-dependencies"
869 elif [[ "${1}" = "--virtual" ]]; then
870 virtual="true"
871 elif [[ "${1}" = "--into" ]]; then
872 destdir="${2}"
873 shift
874 else
875 die "java-pkg_jar-from called with unknown parameter: ${1}"
876 fi
877 shift
878 done
879
664 local target_pkg="${1}" target_jar="${2}" destjar="${3}" 880 local target_pkg="${1}" target_jar="${2}" destjar="${3}"
665 881
666 [[ -z ${target_pkg} ]] && die "Must specify a package" 882 [[ -z ${target_pkg} ]] && die "Must specify a package"
667 883
668 # default destjar to the target jar 884 # default destjar to the target jar
669 [[ -z "${destjar}" ]] && destjar="${target_jar}" 885 [[ -z "${destjar}" ]] && destjar="${target_jar}"
670 886
887 local error_msg="There was a problem getting the classpath for ${target_pkg}."
888 local classpath
671 local classpath="$(java-config --classpath=${target_pkg})" 889 classpath="$(java-config ${deep} --classpath=${target_pkg})"
672 [[ $? != 0 ]] && die "There was a problem getting the classpath for ${target_pkg}" 890 [[ $? != 0 ]] && die ${error_msg}
891
892 # When we have commas this functions is called to bring jars from multiple
893 # packages. This affects recording of dependencencies performed later
894 # which expects one package only, so we do it here.
895 if [[ ${target_pkg} = *,* ]]; then
896 for pkg in ${target_pkg//,/ }; do
897 java-pkg_ensure-dep "${build_only}" "${pkg}"
898 [[ -z "${build_only}" ]] && java-pkg_record-jar_ "${pkg}"
899 done
900 # setting this disables further record-jar_ calls later
901 build_only="build"
902 else
903 java-pkg_ensure-dep "${build_only}" "${target_pkg}"
904 fi
905
906 # Record the entire virtual as a dependency so that
907 # no jars are missed.
908 if [[ -z "${build_only}" && -n "${virtual}" ]]; then
909 java-pkg_record-jar_ "${target_pkg}"
910 # setting this disables further record-jars_ calls later
911 build_only="build"
912 fi
913
914 pushd ${destdir} > /dev/null \
915 || die "failed to change directory to ${destdir}"
673 916
674 local jar 917 local jar
675 for jar in ${classpath//:/ }; do 918 for jar in ${classpath//:/ }; do
676 local jar_name=$(basename "${jar}") 919 local jar_name=$(basename "${jar}")
677 if [[ ! -f "${jar}" ]] ; then 920 if [[ ! -f "${jar}" ]] ; then
681 # If no specific target jar was indicated, link it 924 # If no specific target jar was indicated, link it
682 if [[ -z "${target_jar}" ]] ; then 925 if [[ -z "${target_jar}" ]] ; then
683 [[ -f "${target_jar}" ]] && rm "${target_jar}" 926 [[ -f "${target_jar}" ]] && rm "${target_jar}"
684 ln -snf "${jar}" \ 927 ln -snf "${jar}" \
685 || die "Failed to make symlink from ${jar} to ${jar_name}" 928 || die "Failed to make symlink from ${jar} to ${jar_name}"
686 java-pkg_record-jar_ "${target_pkg}" "${jar}" 929 [[ -z "${build_only}" ]] && java-pkg_record-jar_ "${target_pkg}" "${jar}"
687 # otherwise, if the current jar is the target jar, link it 930 # otherwise, if the current jar is the target jar, link it
688 elif [[ "${jar_name}" == "${target_jar}" ]] ; then 931 elif [[ "${jar_name}" == "${target_jar}" ]] ; then
689 [[ -f "${destjar}" ]] && rm "${destjar}" 932 [[ -f "${destjar}" ]] && rm "${destjar}"
690 ln -snf "${jar}" "${destjar}" \ 933 ln -snf "${jar}" "${destjar}" \
691 || die "Failed to make symlink from ${jar} to ${destjar}" 934 || die "Failed to make symlink from ${jar} to ${destjar}"
692 java-pkg_record-jar_ "${target_pkg}" "${jar}" 935 [[ -z "${build_only}" ]] && java-pkg_record-jar_ "${target_pkg}" "${jar}"
936 popd > /dev/null
693 return 0 937 return 0
694 fi 938 fi
695 done 939 done
940 popd > /dev/null
696 # if no target was specified, we're ok 941 # if no target was specified, we're ok
697 if [[ -z "${target_jar}" ]] ; then 942 if [[ -z "${target_jar}" ]] ; then
698 return 0 943 return 0
699 # otherwise, die bitterly 944 # otherwise, die bitterly
700 else 945 else
714# ------------------------------------------------------------------------------ 959# ------------------------------------------------------------------------------
715# @ebuild-function java-pkg_getjars 960# @ebuild-function java-pkg_getjars
716# 961#
717# Get the classpath provided by any number of packages 962# Get the classpath provided by any number of packages
718# Among other things, this can be passed to 'javac -classpath' or 'ant -lib'. 963# Among other things, this can be passed to 'javac -classpath' or 'ant -lib'.
964# The providing packages are recorded as dependencies into package.env DEPEND
965# line, unless "--build-only" is passed as the very first argument, for jars
966# that have to be present only at build time and are not needed on runtime
967# (junit testing etc).
719# 968#
720# Example: Get the classpath for xerces-2, 969# Example: Get the classpath for xerces-2 and xalan,
721# java-pkg_getjars xerces-2 xalan 970# java-pkg_getjars xerces-2,xalan
722# Example Return: 971# Example Return:
723# /usr/share/xerces-2/lib/xml-apis.jar:/usr/share/xerces-2/lib/xmlParserAPIs.jar:/usr/share/xalan/lib/xalan.jar 972# /usr/share/xerces-2/lib/xml-apis.jar:/usr/share/xerces-2/lib/xmlParserAPIs.jar:/usr/share/xalan/lib/xalan.jar
724# 973#
974# @param $opt
975# --build-only - makes the jar(s) not added into package.env DEPEND line.
976# (assumed automatically when called inside src_test)
977# --with-dependencies - get jars also from requested package's dependencies
978# transitively.
725# @param $@ - list of packages to get jars from 979# @param $1 - list of packages to get jars from
980# (passed to java-config --classpath)
726# ------------------------------------------------------------------------------ 981# ------------------------------------------------------------------------------
727java-pkg_getjars() { 982java-pkg_getjars() {
728 debug-print-function ${FUNCNAME} $* 983 debug-print-function ${FUNCNAME} $*
729 984
730 [[ ${#} -lt 1 ]] && die "At least one argument needed" 985 local build_only=""
986 local deep=""
731 987
732 # NOTE could probably just pass $@ to java-config --classpath. and return it 988 [[ "${EBUILD_PHASE}" == "test" ]] && build_only="build"
733 local classpath pkg 989
734 for pkg in ${@//,/ }; do 990 while [[ "${1}" == --* ]]; do
735 #for pkg in $(echo "$@" | tr ',' ' '); do 991 if [[ "${1}" = "--build-only" ]]; then
736 jars="$(java-config --classpath=${pkg})" 992 build_only="build"
737 debug-print "${pkg}:${jars}" 993 elif [[ "${1}" = "--with-dependencies" ]]; then
738 # TODO should we ensure jars exist? 994 deep="--with-dependencies"
739 if [[ -z "${classpath}" ]]; then
740 classpath="${jars}"
741 else 995 else
742 classpath="${classpath}:${jars}" 996 die "java-pkg_jar-from called with unknown parameter: ${1}"
743 fi 997 fi
744 java-pkg_record-jar_ "${pkg}" 998 shift
745 done 999 done
1000
1001 [[ ${#} -ne 1 ]] && die "${FUNCNAME} takes only one argument besides --*"
1002
1003
1004 local classpath pkgs="${1}"
1005 jars="$(java-config ${deep} --classpath=${pkgs})"
1006 [[ $? != 0 || -z "${jars}" ]] && die "java-config --classpath=${pkgs} failed"
1007 debug-print "${pkgs}:${jars}"
1008
1009 for pkg in ${pkgs//,/ }; do
1010 java-pkg_ensure-dep "${build_only}" "${pkg}"
1011 done
1012
1013 if [[ -z "${classpath}" ]]; then
1014 classpath="${jars}"
1015 else
1016 classpath="${classpath}:${jars}"
1017 fi
1018
1019 # Only record jars that aren't build-only
1020 if [[ -z "${build_only}" ]]; then
1021 for pkg in ${pkgs//,/ }; do
1022 java-pkg_record-jar_ "${pkg}"
1023 done
1024 fi
1025
746 echo "${classpath}" 1026 echo "${classpath}"
747} 1027}
748 1028
749# ------------------------------------------------------------------------------ 1029# ------------------------------------------------------------------------------
750# @ebuild-function java-pkg_getjar 1030# @ebuild-function java-pkg_getjar
751# 1031#
752# Get the filename of a single jar from a package 1032# Get the filename of a single jar from a package
1033# The providing package is recorded as runtime dependency into package.env
1034# DEPEND line, unless "--build-only" is passed as the very first argument, for
1035# jars that have to be present only at build time and are not needed on runtime
1036# (junit testing etc).
753# 1037#
754# @example 1038# @example
755# java-pkg_getjar xerces-2 xml-apis.jar 1039# java-pkg_getjar xerces-2 xml-apis.jar
756# @example-return 1040# @example-return
757# /usr/share/xerces-2/lib/xml-apis.jar 1041# /usr/share/xerces-2/lib/xml-apis.jar
758# 1042#
1043# @param $opt
1044# --build-only - makes the jar not added into package.env DEPEND line.
1045# --virtual - Packages passed to this function are to be handled as virtuals
1046# and will not have individual jar dependencies recorded.
759# @param $1 - package to use 1047# @param $1 - package to use
760# @param $2 - jar to get 1048# @param $2 - jar to get
761# ------------------------------------------------------------------------------ 1049# ------------------------------------------------------------------------------
762java-pkg_getjar() { 1050java-pkg_getjar() {
763 debug-print-function ${FUNCNAME} $* 1051 debug-print-function ${FUNCNAME} $*
1052
1053 local build_only=""
1054 local virtual=""
1055
1056 [[ "${EBUILD_PHASE}" == "test" ]] && build_only="build"
1057
1058 while [[ "${1}" == --* ]]; do
1059 if [[ "${1}" = "--build-only" ]]; then
1060 build_only="build"
1061 elif [[ "${1}" == --* ]]; then
1062 virtual="true"
1063 else
1064 die "java-pkg_jar-from called with unknown parameter: ${1}"
1065 fi
1066 shift
1067 done
1068
1069 [[ ${#} -ne 2 ]] && die "${FUNCNAME} takes only two arguments besides --*"
764 1070
765 local pkg="${1}" target_jar="${2}" jar 1071 local pkg="${1}" target_jar="${2}" jar
766 [[ -z ${pkg} ]] && die "Must specify package to get a jar from" 1072 [[ -z ${pkg} ]] && die "Must specify package to get a jar from"
767 [[ -z ${target_jar} ]] && die "Must specify jar to get" 1073 [[ -z ${target_jar} ]] && die "Must specify jar to get"
768 1074
769 # TODO check that package is actually installed 1075 local error_msg="Could not find classpath for ${pkg}. Are you sure its installed?"
1076 local classpath
770 local classpath=$(java-config --classpath=${pkg}) 1077 classpath=$(java-config --classpath=${pkg})
771 [[ $? != 0 ]] && die "There could not find classpath for ${pkg}. Are you sure its installed?" 1078 [[ $? != 0 ]] && die ${error_msg}
1079
1080 java-pkg_ensure-dep "${build_only}" "${pkg}"
1081
1082 # Record the package(Virtual) as a dependency and then set build_only
1083 # So that individual jars are not recorded.
1084 if [[ -n "${virtual}" ]]; then
1085 java-pkg_record-jar_ "${pkg}"
1086 build_only="true"
1087 fi
1088
772 for jar in ${classpath//:/ }; do 1089 for jar in ${classpath//:/ }; do
773 if [[ ! -f "${jar}" ]] ; then 1090 if [[ ! -f "${jar}" ]] ; then
774 die "Installation problems with jars in ${pkg} - is it installed?" 1091 die "Installation problem with jar ${jar} in ${pkg} - is it installed?"
775 fi 1092 fi
776 1093
777 if [[ "$(basename ${jar})" == "${target_jar}" ]] ; then 1094 if [[ "$(basename ${jar})" == "${target_jar}" ]] ; then
778 java-pkg_record-jar_ "${pkg}" "${jar}" 1095 # Only record jars that aren't build-only
1096 [[ -z "${build_only}" ]] && java-pkg_record-jar_ "${pkg}" "${jar}"
779 echo "${jar}" 1097 echo "${jar}"
780 return 0 1098 return 0
781 fi 1099 fi
782 done 1100 done
783 1101
784 die "Could not find ${target_jar} in ${pkg}" 1102 die "Could not find ${target_jar} in ${pkg}"
785 return 1 1103 return 1
1104}
1105
1106# ------------------------------------------------------------------------------
1107# @ebuild-function java-pkg_register-dependency
1108#
1109# Registers runtime dependency on a package, list of packages, or a single jar
1110# from a package, into package.env DEPEND line. Can only be called in
1111# src_install phase.
1112# Intended for binary packages where you don't need to symlink the jars or get
1113# their classpath during build. As such, the dependencies only need to be
1114# specified in ebuild's RDEPEND, and should be omitted in DEPEND.
1115#
1116# @param $1 - comma-separated list of packages, or a single package
1117# @param $2 - if param $1 is a single package, optionally specify the jar
1118# to depend on
1119#
1120# Example: Record the dependency on whole xerces-2 and xalan,
1121# java-pkg_register-dependency xerces-2,xalan
1122# Example: Record the dependency on ant.jar from ant-core
1123# java-pkg_register-dependency ant-core ant.jar
1124#
1125# Note: Passing both list of packages as the first parameter AND specifying the
1126# jar as the second is not allowed and will cause the function to die. We assume
1127# that there's more chance one passes such combination as a mistake, than that
1128# there are more packages providing identically named jar without class
1129# collisions.
1130# ------------------------------------------------------------------------------
1131java-pkg_register-dependency() {
1132 debug-print-function ${FUNCNAME} $*
1133
1134 java-pkg_check-phase install
1135
1136 [[ ${#} -gt 2 ]] && die "${FUNCNAME} takes at most two arguments"
1137
1138 local pkgs="${1}"
1139 local jar="${2}"
1140
1141 [[ -z "${pkgs}" ]] && die "${FUNCNAME} called with no package(s) specified"
1142
1143 if [[ -z "${jar}" ]]; then
1144 for pkg in ${pkgs//,/ }; do
1145 java-pkg_ensure-dep runtime "${pkg}"
1146 java-pkg_record-jar_ "${pkg}"
1147 done
1148 else
1149 [[ ${pkgs} == *,* ]] && \
1150 die "${FUNCNAME} called with both package list and jar name"
1151 java-pkg_ensure-dep runtime "${pkgs}"
1152 java-pkg_record-jar_ "${pkgs}" "${jar}"
1153 fi
1154
1155 java-pkg_do_write_
1156}
1157
1158# ------------------------------------------------------------------------------
1159# @ebuild-function java-pkg_register-optional-dependency
1160#
1161# Registers optional runtime dependency on a package, list of packages, or a
1162# single jar from a package, into package.env OPTIONAL_DEPEND line. Can only be
1163# called in src_install phase.
1164# Intended for packages that can use other packages when those are in classpath.
1165# Will be put on classpath by launcher if they are installed. Typical case is
1166# JDBC implementations for various databases. It's better than having USE flag
1167# for each implementation triggering hard dependency.
1168#
1169# @param $1 - comma-separated list of packages, or a single package
1170# @param $2 - if param $1 is a single package, optionally specify the jar
1171# to depend on
1172#
1173# Example: Record the optional dependency on some jdbc providers
1174# java-pkg_register-optional-dependency jdbc-jaybird,jtds-1.2,jdbc-mysql
1175#
1176# Note: Passing both list of packages as the first parameter AND specifying the
1177# jar as the second is not allowed and will cause the function to die. We assume
1178# that there's more chance one passes such combination as a mistake, than that
1179# there are more packages providing identically named jar without class
1180# collisions.
1181# ------------------------------------------------------------------------------
1182java-pkg_register-optional-dependency() {
1183 debug-print-function ${FUNCNAME} $*
1184
1185 java-pkg_check-phase install
1186
1187 [[ ${#} -gt 2 ]] && die "${FUNCNAME} takes at most two arguments"
1188
1189 local pkgs="${1}"
1190 local jar="${2}"
1191
1192 [[ -z "${pkgs}" ]] && die "${FUNCNAME} called with no package(s) specified"
1193
1194 if [[ -z "${jar}" ]]; then
1195 for pkg in ${pkgs//,/ }; do
1196 java-pkg_record-jar_ --optional "${pkg}"
1197 done
1198 else
1199 [[ ${pkgs} == *,* ]] && \
1200 die "${FUNCNAME} called with both package list and jar name"
1201 java-pkg_record-jar_ --optional "${pkgs}" "${jar}"
1202 fi
1203
1204 java-pkg_do_write_
1205}
1206
1207# ------------------------------------------------------------------------------
1208# @ebuild-function java-pkg_register-environment-variable
1209#
1210# Register an arbitrary environment variable into package.env. The gjl launcher
1211# for this package or any package depending on this will export it into
1212# environement before executing java command.
1213# Must only be called in src_install phase.
1214#
1215# @param $1 - variable name
1216# @param $2 - variable value
1217# ------------------------------------------------------------------------------
1218JAVA_PKG_EXTRA_ENV="${T}/java-pkg-extra-env"
1219JAVA_PKG_EXTRA_ENV_VARS=""
1220java-pkg_register-environment-variable() {
1221 debug-print-function ${FUNCNAME} $*
1222
1223 java-pkg_check-phase install
1224
1225 [[ ${#} != 2 ]] && die "${FUNCNAME} takes two arguments"
1226
1227 echo "${1}=\"${2}\"" >> ${JAVA_PKG_EXTRA_ENV}
1228 JAVA_PKG_EXTRA_ENV_VARS="${JAVA_PKG_EXTRA_ENV_VARS} ${1}"
1229
1230 java-pkg_do_write_
786} 1231}
787 1232
788# This function reads stdin, and based on that input, figures out how to 1233# This function reads stdin, and based on that input, figures out how to
789# populate jars from the filesystem. 1234# populate jars from the filesystem.
790# Need to figure out a good way of making use of this, ie be able to use a 1235# Need to figure out a good way of making use of this, ie be able to use a
802# line="${line// /}" 1247# line="${line// /}"
803# 1248#
804# # format: path=jarinfo 1249# # format: path=jarinfo
805# local path=${line%%=*} 1250# local path=${line%%=*}
806# local jarinfo=${line##*=} 1251# local jarinfo=${line##*=}
807# 1252#
808# # format: jar@package 1253# # format: jar@package
809# local jar=${jarinfo%%@*}.jar 1254# local jar=${jarinfo%%@*}.jar
810# local package=${jarinfo##*@} 1255# local package=${jarinfo##*@}
811# if [[ -n ${replace_only} ]]; then 1256# if [[ -n ${replace_only} ]]; then
812# [[ ! -f $path ]] && die "No jar exists at ${path}" 1257# [[ ! -f $path ]] && die "No jar exists at ${path}"
825# @section-end query 1270# @section-end query
826# ------------------------------------------------------------------------------ 1271# ------------------------------------------------------------------------------
827 1272
828# ------------------------------------------------------------------------------ 1273# ------------------------------------------------------------------------------
829# @section-begin helper 1274# @section-begin helper
830# @section-summary Helper functions 1275# @section-summary Helper functions
831# 1276#
832# Various other functions to use from an ebuild 1277# Various other functions to use from an ebuild
833# ------------------------------------------------------------------------------ 1278# ------------------------------------------------------------------------------
834 1279
835# ------------------------------------------------------------------------------ 1280# ------------------------------------------------------------------------------
841# jdbc-stdext 1286# jdbc-stdext
842# jaf 1287# jaf
843# jdbc-rowset 1288# jdbc-rowset
844# jms 1289# jms
845# 1290#
846# @param $1 - Optionally indicate that the dependencies are controlled by 1291# @param $1 - Optionally indicate that the dependencies are controlled by
847# a use flag by specifying '--use' Requires $2. 1292# a use flag by specifying '--use' Requires $2.
848# @param $2 - USE flag which will enable the dependencies. 1293# @param $2 - USE flag which will enable the dependencies.
849# @param $@ - virtual packages to add depenedencies for 1294# @param $@ - virtual packages to add depenedencies for
850# ------------------------------------------------------------------------------ 1295# ------------------------------------------------------------------------------
851# TODO rewrite to parse a line based declaration file instead -- karltk 1296# TODO rewrite to parse a line based declaration file instead -- karltk
907# 1352#
908# export DEPEND="${DEPEND} ${depstr}" 1353# export DEPEND="${DEPEND} ${depstr}"
909# export RDEPEND="${RDEPEND} ${depstr}" 1354# export RDEPEND="${RDEPEND} ${depstr}"
910#} 1355#}
911 1356
1357# ------------------------------------------------------------------------------
1358# @ebuild-function java-pkg_find-normal-jars
1359#
1360# Find the files with suffix .jar file in the given directory or $WORKDIR
1361#
1362# @param $1 - The directory to search for jar files (default: ${WORKDIR})
1363# ------------------------------------------------------------------------------
1364java-pkg_find-normal-jars() {
1365 local dir=$1
1366 [[ "${dir}" ]] || dir="${WORKDIR}"
1367 local found
1368 for jar in $(find "${dir}" -name "*.jar" -type f); do
1369 echo "${jar}"
1370 found="true"
1371 done
1372 [[ "${found}" ]]
1373 return $?
1374}
1375
1376# ------------------------------------------------------------------------------
1377# @ebuild-function java-pkg_ensure-no-bundled-jars
1378#
1379# 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 1380# This function should be called after WORKDIR has been populated with symlink
913# TODO document 1381# to system jar files or bundled jars removed.
1382# ------------------------------------------------------------------------------
914java-pkg_ensure-no-bundled-jars() { 1383java-pkg_ensure-no-bundled-jars() {
915 debug-print-function ${FUNCNAME} $* 1384 debug-print-function ${FUNCNAME} $*
916 pushd ${WORKDIR} >/dev/null 2>/dev/null
917 1385
918 local bundled_jars=$(find . -name "*.jar" -type f) 1386 local bundled_jars=$(java-pkg_find-normal-jars)
919 if [[ -n ${bundled_jars} ]]; then 1387 if [[ -n ${bundled_jars} ]]; then
920 echo "Bundled jars found:" 1388 echo "Bundled jars found:"
921 local jar 1389 local jar
922 for jar in ${bundled_jars}; do 1390 for jar in ${bundled_jars}; do
923 echo $(pwd)${jar/./} 1391 echo $(pwd)${jar/./}
924 done 1392 done
925 die "Bundled jars found!" 1393 die "Bundled jars found!"
926
927 fi 1394 fi
928 popd >/dev/null 2>/dev/null
929} 1395}
930 1396
931# ------------------------------------------------------------------------------ 1397# ------------------------------------------------------------------------------
932# @internal-function java-pkg_ensure-vm-version-sufficient 1398# @internal-function java-pkg_ensure-vm-version-sufficient
933# 1399#
945 fi 1411 fi
946} 1412}
947 1413
948# ------------------------------------------------------------------------------ 1414# ------------------------------------------------------------------------------
949# @internal-function java-pkg_is-vm-version-sufficient 1415# @internal-function java-pkg_is-vm-version-sufficient
950# 1416#
951# @return zero - VM is sufficient 1417# @return zero - VM is sufficient
952# @return non-zero - VM is not sufficient 1418# @return non-zero - VM is not sufficient
953# ------------------------------------------------------------------------------ 1419# ------------------------------------------------------------------------------
954java-pkg_is-vm-version-sufficient() { 1420java-pkg_is-vm-version-sufficient() {
955 debug-print-function ${FUNCNAME} $* 1421 debug-print-function ${FUNCNAME} $*
975 die "Active Java VM too old" 1441 die "Active Java VM too old"
976 fi 1442 fi
977} 1443}
978 1444
979# ------------------------------------------------------------------------------ 1445# ------------------------------------------------------------------------------
980# @internal-function java-pkg_is-vm-version-eq 1446# @internal-function java-pkg_is-vm-version-eq
981# 1447#
982# @param $@ - VM version to compare current VM to 1448# @param $@ - VM version to compare current VM to
983# @return zero - VM versions are equal 1449# @return zero - VM versions are equal
984# @return non-zero - VM version are not equal 1450# @return non-zero - VM version are not equal
985# ------------------------------------------------------------------------------ 1451# ------------------------------------------------------------------------------
986java-pkg_is-vm-version-eq() { 1452java-pkg_is-vm-version-eq() {
1016# 1482#
1017# @param $@ - VM version to compare current to 1483# @param $@ - VM version to compare current to
1018# ------------------------------------------------------------------------------ 1484# ------------------------------------------------------------------------------
1019java-pkg_ensure-vm-version-ge() { 1485java-pkg_ensure-vm-version-ge() {
1020 debug-print-function ${FUNCNAME} $* 1486 debug-print-function ${FUNCNAME} $*
1021 1487
1022 if ! java-pkg_is-vm-version-ge "$@" ; then 1488 if ! java-pkg_is-vm-version-ge "$@" ; then
1023 debug-print "vm is not suffient" 1489 debug-print "vm is not suffient"
1024 eerror "This package requires a Java VM version >= $@" 1490 eerror "This package requires a Java VM version >= $@"
1025 einfo "Please use java-config -S to set the correct one" 1491 einfo "Please use java-config -S to set the correct one"
1026 die "Active Java VM too old" 1492 die "Active Java VM too old"
1027 fi 1493 fi
1028} 1494}
1029 1495
1030# ------------------------------------------------------------------------------ 1496# ------------------------------------------------------------------------------
1031# @internal-function java-pkg_is-vm-version-ge 1497# @internal-function java-pkg_is-vm-version-ge
1032# 1498#
1033# @param $@ - VM version to compare current VM to 1499# @param $@ - VM version to compare current VM to
1034# @return zero - current VM version is greater than checked version 1500# @return zero - current VM version is greater than checked version
1035# @return non-zero - current VM version is not greater than checked version 1501# @return non-zero - current VM version is not greater than checked version
1036# ------------------------------------------------------------------------------ 1502# ------------------------------------------------------------------------------
1037java-pkg_is-vm-version-ge() { 1503java-pkg_is-vm-version-ge() {
1060java-pkg_get-current-vm() { 1526java-pkg_get-current-vm() {
1061 echo ${GENTOO_VM} 1527 echo ${GENTOO_VM}
1062} 1528}
1063 1529
1064java-pkg_current-vm-matches() { 1530java-pkg_current-vm-matches() {
1065 hasq java-pkg_get-currenv-vm ${@} 1531 hasq $(java-pkg_get-current-vm) ${@}
1066 return $? 1532 return $?
1067} 1533}
1068 1534
1069# ------------------------------------------------------------------------------ 1535# ------------------------------------------------------------------------------
1070# @ebuild-function java-pkg_get-source 1536# @ebuild-function java-pkg_get-source
1071# 1537#
1072# Determines what source version should be used, for passing to -source. 1538# Determines what source version should be used, for passing to -source.
1073# Unless you want to break things you probably shouldn't set _WANT_SOURCE 1539# Unless you want to break things you probably shouldn't set _WANT_SOURCE
1074# 1540#
1075# @return string - Either the lowest possible source, or JAVA_PKG_WANT_SOURCE 1541# @return string - Either the lowest possible source, or JAVA_PKG_WANT_SOURCE
1076# ------------------------------------------------------------------------------ 1542# ------------------------------------------------------------------------------
1081# ------------------------------------------------------------------------------ 1547# ------------------------------------------------------------------------------
1082# @ebuild-function java-pkg_get-target 1548# @ebuild-function java-pkg_get-target
1083# 1549#
1084# Determines what target version should be used, for passing to -target. 1550# Determines what target version should be used, for passing to -target.
1085# If you don't care about lower versions, you can set _WANT_TARGET to the 1551# If you don't care about lower versions, you can set _WANT_TARGET to the
1086# version of your JDK. 1552# version of your JDK.
1087# Remember doing this will mostly like cause things to break.
1088# Doesn't allow it to be lower then the one in depend.
1089# Doesn't allow it to be higher then the active vm.
1090# 1553#
1091# @return string - Either the lowest possible target, or JAVA_PKG_WANT_TARGET 1554# @return string - Either the lowest possible target, or JAVA_PKG_WANT_TARGET
1092# ------------------------------------------------------------------------------ 1555# ------------------------------------------------------------------------------
1093java-pkg_get-target() { 1556java-pkg_get-target() {
1094 local min=$(depend-java-query --get-lowest "${DEPEND} ${RDEPEND}")
1095 if [[ -n "${JAVA_PKG_WANT_TARGET}" ]]; then
1096 local max="$(java-config --select-vm "${GENTOO_VM}" -g PROVIDES_VERSION)"
1097 if version_is_at_least "${min}" "${JAVA_PKG_WANT_TARGET}" && version_is_at_least "${JAVA_PKG_WANT_TARGET}" "${max}"; then
1098 echo ${JAVA_PKG_WANT_TARGET}
1099 else
1100 echo ${min}
1101 fi
1102 else
1103 echo ${min}
1104 fi
1105
1106 #echo ${JAVA_PKG_WANT_TARGET:-$(depend-java-query --get-lowest "${DEPEND}")} 1557 echo ${JAVA_PKG_WANT_TARGET:-$(depend-java-query --get-lowest "${DEPEND} ${RDEPEND}")}
1107} 1558}
1108 1559
1109java-pkg_get-javac() { 1560java-pkg_get-javac() {
1110 debug-print-function ${FUNCNAME} $* 1561 debug-print-function ${FUNCNAME} $*
1111 1562
1112 java-pkg_init-compiler_ 1563
1113 local compiler="${GENTOO_COMPILER}" 1564 local compiler="${GENTOO_COMPILER}"
1114 1565
1115 local compiler_executable 1566 local compiler_executable
1116 if [[ "${compiler}" = "javac" ]]; then 1567 if [[ "${compiler}" = "javac" ]]; then
1117 # nothing fancy needs to be done for javac 1568 # nothing fancy needs to be done for javac
1125 unset JAVAC 1576 unset JAVAC
1126 # try to get value of JAVAC 1577 # try to get value of JAVAC
1127 compiler_executable="$(source ${compiler_env} 1>/dev/null 2>&1; echo ${JAVAC})" 1578 compiler_executable="$(source ${compiler_env} 1>/dev/null 2>&1; echo ${JAVAC})"
1128 export JAVAC=${old_javac} 1579 export JAVAC=${old_javac}
1129 1580
1130 [[ -z ${compiler_executable} ]] && die "JAVAC is empty or undefined in ${compiler_env}" 1581 if [[ -z ${compiler_executable} ]]; then
1131 1582 echo "JAVAC is empty or undefined in ${compiler_env}"
1583 return 1
1584 fi
1585
1132 # check that it's executable 1586 # check that it's executable
1133 if [[ ! -x ${compiler_executable} ]]; then 1587 if [[ ! -x ${compiler_executable} ]]; then
1134 eerror "Could not find ${compiler_executable}!"
1135 die "${compiler_executable} doesn't exist, or isn't executable" 1588 echo "${compiler_executable} doesn't exist, or isn't executable"
1589 return 1
1136 fi 1590 fi
1137 else 1591 else
1138 eerror "Could not find environment file for ${compiler}" 1592 echo "Could not find environment file for ${compiler}"
1139 die "Could not find ${compiler_env}" 1593 return 1
1140 fi 1594 fi
1141 fi 1595 fi
1142 echo ${compiler_executable} 1596 echo ${compiler_executable}
1143} 1597}
1144 1598
1145# ------------------------------------------------------------------------------ 1599# ------------------------------------------------------------------------------
1146# @ebuild-function java-pkg_javac-args 1600# @ebuild-function java-pkg_javac-args
1147# 1601#
1148# If an ebuild uses javac directly, instead of using ejavac, it should call this 1602# If an ebuild uses javac directly, instead of using ejavac, it should call this
1149# to know what -source/-target to use. 1603# to know what -source/-target to use.
1150# 1604#
1151# @return string - arguments to pass to javac, complete with -target and -source 1605# @return string - arguments to pass to javac, complete with -target and -source
1154 debug-print-function ${FUNCNAME} $* 1608 debug-print-function ${FUNCNAME} $*
1155 1609
1156 local want_source="$(java-pkg_get-source)" 1610 local want_source="$(java-pkg_get-source)"
1157 local want_target="$(java-pkg_get-target)" 1611 local want_target="$(java-pkg_get-target)"
1158 1612
1159 local source_str="-source ${want_source}" 1613 local source_str="-source ${want_source}"
1160 local target_str="-target ${want_target}" 1614 local target_str="-target ${want_target}"
1161 1615
1162 debug-print "want source: ${want_source}" 1616 debug-print "want source: ${want_source}"
1163 debug-print "want target: ${want_target}" 1617 debug-print "want target: ${want_target}"
1164 1618
1165 if [[ -z "${want_source}" || -z "${want_target}" ]]; then 1619 if [[ -z "${want_source}" || -z "${want_target}" ]]; then
1166 debug-print "could not find valid -source/-target values" 1620 debug-print "could not find valid -source/-target values for javac"
1167 die "Could not find valid -source/-target values" 1621 echo "Could not find valid -source/-target values for javac"
1622 return 1
1168 else 1623 else
1169 if java-pkg_is-vm-version-ge "1.4"; then 1624 if java-pkg_is-vm-version-ge "1.4"; then
1170 echo "${source_str} ${target_str}" 1625 echo "${source_str} ${target_str}"
1171 else 1626 else
1172 echo "${target_str}" 1627 echo "${target_str}"
1176 1631
1177# TODO document 1632# TODO document
1178java-pkg_get-jni-cflags() { 1633java-pkg_get-jni-cflags() {
1179 local flags="-I${JAVA_HOME}/include" 1634 local flags="-I${JAVA_HOME}/include"
1180 1635
1636 local platform="linux"
1637 use elibc_FreeBSD && platform="freebsd"
1638
1181 # TODO do a check that the directories are valid 1639 # TODO do a check that the directories are valid
1182 # TODO figure out how to cope with other things than linux...
1183 flags="${flags} -I${JAVA_HOME}/include/linux" 1640 flags="${flags} -I${JAVA_HOME}/include/${platform}"
1184 1641
1185 echo ${flags} 1642 echo ${flags}
1186} 1643}
1187 1644
1188java-pkg_ensure-gcj() { 1645java-pkg_ensure-gcj() {
1193 ebeep 5 1650 ebeep 5
1194 die "No GCJ support found!" 1651 die "No GCJ support found!"
1195 fi 1652 fi
1196} 1653}
1197 1654
1655java-pkg_ensure-test() {
1656 if hasq test ${FEATURES} && ! hasq -test ${FEATURES} \
1657 && hasq test ${IUSE} && ! use test;
1658 then
1659 eerror "You specified FEATURES=test, but USE=test is needed"
1660 eerror "to pull in the additional dependencies for testing"
1661 die "Need USE=test enabled"
1662 fi
1663}
1664
1665# ------------------------------------------------------------------------------
1666# @ebuild-function java-pkg_register-ant-task
1667#
1668# Register this package as ant task, so that ant will load it when no specific
1669# ANT_TASKS are specified. Note that even without this registering, all packages
1670# specified in ANT_TASKS will be loaded. Mostly used by the actual ant tasks
1671# packages, but can be also used by other ebuilds that used to symlink their
1672# .jar into /usr/share/ant-core/lib to get autoloaded, for backwards
1673# compatibility.
1674#
1675# @param --version x.y Register only for ant version x.y (otherwise for any ant
1676# version). Used by the ant-* packages to prevent loading of mismatched
1677# ant-core ant tasks after core was updated, before the tasks are updated,
1678# without a need for blockers.
1679# @param $1 Name to register as. Defaults to JAVA_PKG_NAME ($PN[-$SLOT])
1680# ------------------------------------------------------------------------------
1681java-pkg_register-ant-task() {
1682 local TASKS_DIR="tasks"
1683
1684 # check for --version x.y parameters
1685 while [[ -n "${1}" && -n "${2}" ]]; do
1686 local var="${1#--}"
1687 local val="${2}"
1688 if [[ "${var}" == "version" ]]; then
1689 TASKS_DIR="tasks-${val}"
1690 else
1691 die "Unknown parameter passed to java-pkg_register-ant-tasks: ${1} ${2}"
1692 fi
1693 shift 2
1694 done
1695
1696 local TASK_NAME="${1:-${JAVA_PKG_NAME}}"
1697
1698 dodir /usr/share/ant/${TASKS_DIR}
1699 touch "${D}/usr/share/ant/${TASKS_DIR}/${TASK_NAME}"
1700}
1701
1702# ------------------------------------------------------------------------------
1703# @internal-function java-pkg_ant-tasks-from-deps
1704#
1705# Function to determine ANT_TASKS from DEPEND variable for backwards
1706# compatibility with ebuilds that don't set ANT_TASKS before calling eant() or
1707# WANT_ANT_TASKS before inheriting java-pkg-2. If the DEPEND string contains
1708# "dev-java/ant" or "dev-java/ant-tasks", then it returns "all", otherwise
1709# "none". It's not smart enough to cope with USE flag depends but that shouldn't
1710# be a problem, the worst it can do is activace all tasks when not needed.
1711# Note that this is called only with JAVA_PKG_STRICT=1, to find ebuilds with
1712# insufficient dependencies, otherwise all available tasks are used for
1713# backwards compatilbility.
1714#
1715# @return "all" or "none"
1716# ------------------------------------------------------------------------------
1717java-pkg_ant-tasks-from-deps() {
1718 local found_ant found_ant_tasks
1719
1720 for dep in ${DEPEND}
1721 do
1722 local ant="$(awk '/(dev-java\/ant)/ { if (match($1, "(dev-java/ant)((-[0-9])+|$)", m)) print m[1] }' <<< ${dep})"
1723 [[ "${ant}" == "dev-java/ant" ]] && found_ant=true
1724 [[ "${dep}" == *"ant-tasks"* ]] && found_ant_tasks=true
1725 done
1726
1727 if [[ -n "${found_ant}" || -n "${found_ant_tasks}" ]]; then
1728 java-pkg_announce-qa-violation --nodie "The ebuild DEPENDS on deprecated ant or ant-tasks"
1729 echo "all"
1730 else
1731 # ebuild doesn't set ANT_TASKS and doesn't depend on ant-tasks or ant
1732 # so we deactivate all tasks that may be installed
1733 echo "none"
1734 fi
1735}
1736
1737# ------------------------------------------------------------------------------
1738# @internal-function java-pkg_ant-tasks-depend
1739#
1740# Translates the WANT_ANT_TASKS variable into valid dependencies.
1741# ------------------------------------------------------------------------------
1742java-pkg_ant-tasks-depend() {
1743 debug-print-function ${FUNCNAME} ${WANT_ANT_TASKS}
1744
1745 if [[ -n "${WANT_ANT_TASKS}" ]]; then
1746 local DEP=""
1747 for i in ${WANT_ANT_TASKS}
1748 do
1749 if [[ ${i} != ant-* ]]; then
1750 echo "Invalid atom in WANT_ANT_TASKS: ${i}"
1751 return 1
1752 fi
1753 DEP="${DEP}dev-java/${i} "
1754 done
1755 echo ${DEP}
1756 return 0
1757 else
1758 return 0
1759 fi
1760}
1761
1762# ------------------------------------------------------------------------------
1763# @ebuild-function ejunit
1764#
1765# Junit wrapper function. Makes it easier to run the tests and checks for
1766# dev-java/junit in DEPEND. Launches the tests using junit.textui.TestRunner.
1767#
1768# Examples:
1769# ejunit -cp build/classes org.blinkenlights.jid3.test.AllTests
1770# ejunit org.blinkenlights.jid3.test.AllTests
1771#
1772# @param $1 - -cp or -classpath
1773# @param $2 - classpath; junit and recorded dependencies get appended
1774# @param $@ - the rest of the parameters are passed to java
1775# ------------------------------------------------------------------------------
1776ejunit() {
1777 debug-print-function ${FUNCNAME} $*
1778
1779 local pkgs
1780 for atom in $(cat ${JAVA_PKG_DEPEND_FILE} | tr : ' '); do
1781 pkgs=${pkgs},$(echo ${atom} | sed -re "s/^.*@//")
1782 done
1783
1784 local cp=$(java-pkg_getjars --with-dependencies junit${pkgs})
1785 if [[ ${1} = -cp || ${1} = -classpath ]]; then
1786 cp="${2}:${cp}"
1787 shift 2
1788 else
1789 cp=".:${cp}"
1790 fi
1791
1792 local runner=junit.textui.TestRunner
1793 debug-print "Calling: java -cp \"${cp}\" -Djava.awt.headless=true ${runner} ${@}"
1794 java -cp "${cp}" -Djava.awt.headless=true ${runner} "${@}" || die "Running junit failed"
1795}
1796
1198# ------------------------------------------------------------------------------ 1797# ------------------------------------------------------------------------------
1199# @section-end helper 1798# @section-end helper
1200# ------------------------------------------------------------------------------ 1799# ------------------------------------------------------------------------------
1201 1800
1202# ------------------------------------------------------------------------------ 1801# ------------------------------------------------------------------------------
1209 1808
1210# ------------------------------------------------------------------------------ 1809# ------------------------------------------------------------------------------
1211# @ebuild-function eant 1810# @ebuild-function eant
1212# 1811#
1213# Ant wrapper function. Will use the appropriate compiler, based on user-defined 1812# Ant wrapper function. Will use the appropriate compiler, based on user-defined
1214# compiler. 1813# compiler. Will also set proper ANT_TASKS from the variable ANT_TASKS,
1215# 1814# variables:
1815# EANT_GENTOO_CLASSPATH - calls java-pkg_getjars for the value and adds to the
1816# gentoo.classpath property. Be sure to call
1817# java-ant_rewrite-classpath in src_unpack.
1818# JAVA_PKG_NO_BUNDLED_SEARCH - Don't search for bundled jars or class files
1819# *ANT_TASKS - used to determine ANT_TASKS before calling Ant.
1216# ------------------------------------------------------------------------------ 1820# ------------------------------------------------------------------------------
1217eant() { 1821eant() {
1218 debug-print-function ${FUNCNAME} $* 1822 debug-print-function ${FUNCNAME} $*
1219 1823
1220 # FIXME get this working 1824 if [[ ${EBUILD_PHASE} = compile ]]; then
1221# if is-java-strict && [[ ! ${DEPEND} =~ "dev-java/ant" ]]; then 1825 # Used to be done in hooks in java-ant-2.eclass but moved here so that we can
1826 # finally get rid of the hooks without breaking stuff
1827
1828 [[ "${JAVA_ANT_IGNORE_SYSTEM_CLASSES}" && "${JAVA_PKG_BSFIX}" ]] \
1829 && java-ant_ignore-system-classes "${S}/build.xml"
1830
1831 if hasq java-ant-2 ${INHERITED}; then
1832 java-ant_bsfix
1833 fi
1834
1835 # eant can be called multiple times
1836 JAVA_PKG_BSFIX="off"
1837
1838 if [[ -z ${JAVA_PKG_NO_BUNDLED_SEARCH} ]] && is-java-strict; then
1839 echo "Searching for bundled jars:"
1840 java-pkg_find-normal-jars || echo "None found."
1841 echo "Searching for bundled classes (no output if none found):"
1842 find "${WORKDIR}" -name "*.class"
1843 echo "Search done."
1844 JAVA_PKG_NO_BUNDLED_SEARCH=true # eant can be called many times
1845 fi
1846 fi
1847
1848 if ! hasq java-ant-2 ${INHERITED}; then
1849 local msg="You should inherit java-ant-2 when using eant"
1222# java-pkg_announce-qa-violation \ 1850 java-pkg_announce-qa-violation "${msg}"
1223# "Using eant, but not depending on dev-java/ant or dev-java/ant-core"
1224# fi 1851 fi
1225 1852
1226 local antflags 1853 local antflags="-Dnoget=true -Dmaven.mode.offline=true -Dbuild.sysclasspath=ignore"
1854
1227 java-pkg_init-compiler_ 1855 java-pkg_init-compiler_
1228 local compiler="${GENTOO_COMPILER}" 1856 local compiler="${GENTOO_COMPILER}"
1229 1857
1230 local compiler_env="${JAVA_PKG_COMPILER_DIR}/${compiler}" 1858 local compiler_env="${JAVA_PKG_COMPILER_DIR}/${compiler}"
1231
1232 local build_compiler="$(source ${compiler_env} 1>/dev/null 2>&1; echo ${ANT_BUILD_COMPILER})" 1859 local build_compiler="$(source ${compiler_env} 1>/dev/null 2>&1; echo ${ANT_BUILD_COMPILER})"
1233 if [[ "${compiler}" != "javac" && -z "${build_compiler}" ]]; then 1860 if [[ "${compiler}" != "javac" && -z "${build_compiler}" ]]; then
1234 die "ANT_BUILD_COMPILER undefined in ${compiler_env}" 1861 die "ANT_BUILD_COMPILER undefined in ${compiler_env}"
1235 fi 1862 fi
1236 1863
1237 if [[ ${compiler} != "javac" ]]; then 1864 if [[ ${compiler} != "javac" ]]; then
1238 antflags="-Dbuild.compiler=${build_compiler}" 1865 antflags="${antflags} -Dbuild.compiler=${build_compiler}"
1239 # Figure out any extra stuff to put on the classpath for compilers aside 1866 # Figure out any extra stuff to put on the classpath for compilers aside
1240 # from javac 1867 # from javac
1241 # ANT_BUILD_COMPILER_DEPS should be something that could be passed to 1868 # ANT_BUILD_COMPILER_DEPS should be something that could be passed to
1242 # java-config -p 1869 # java-config -p
1243 local build_compiler_deps="$(source ${JAVA_PKG_COMPILER_DIR}/${compiler} 1>/dev/null 2>&1; echo ${ANT_BUILD_COMPILER_DEPS})" 1870 local build_compiler_deps="$(source ${JAVA_PKG_COMPILER_DIR}/${compiler} 1>/dev/null 2>&1; echo ${ANT_BUILD_COMPILER_DEPS})"
1244 if [[ -n ${build_compiler_deps} ]]; then 1871 if [[ -n ${build_compiler_deps} ]]; then
1245 antflags="${antflags} -lib $(java-config -p ${build_compiler_deps})" 1872 antflags="${antflags} -lib $(java-config -p ${build_compiler_deps})"
1246 fi 1873 fi
1247 fi 1874 fi
1248 1875
1876 for arg in "${@}"; do
1877 if [[ ${arg} = -lib ]]; then
1878 if is-java-strict; then
1879 eerror "You should not use the -lib argument to eant because it will fail"
1880 eerror "with JAVA_PKG_STRICT. Please use for example java-pkg_jar-from"
1881 eerror "or ant properties to make dependencies available."
1882 eerror "For ant tasks use WANT_ANT_TASKS or ANT_TASKS from."
1883 eerror "split ant (>=dev-java/ant-core-1.7)."
1884 die "eant -lib is deprecated/forbidden"
1885 else
1886 echo "eant -lib is deprecated. Turn JAVA_PKG_STRICT on for"
1887 echo "more info."
1888 fi
1889 fi
1890 done
1891
1892 # we use this in src_* so we run ant from /
1893 if ROOT=/ has_version ">=dev-java/ant-core-1.7.0"; then
1894 # default ANT_TASKS to WANT_ANT_TASKS, if ANT_TASKS is not set explicitly
1895 ANT_TASKS="${ANT_TASKS:-${WANT_ANT_TASKS}}"
1896
1897 # override ANT_TASKS with JAVA_PKG_FORCE_ANT_TASKS if it's set
1898 ANT_TASKS="${JAVA_PKG_FORCE_ANT_TASKS:-${ANT_TASKS}}"
1899
1249 if is-java-strict; then 1900 if is-java-strict; then
1250 einfo "Disabling system classpath for ant" 1901 # if ant-tasks were not set by ebuild or forced, try to determine them from depends
1251 antflags="${antflags} -Dbuild.sysclasspath=ignore" 1902 if [[ -z "${ANT_TASKS}" ]]; then
1903 ANT_TASKS="$(java-pkg_ant-tasks-from-deps)"
1904 fi
1905 else
1906 # if ant-tasks is not set by ebuild or forced, activate all of them
1907 ANT_TASKS="${ANT_TASKS:-all}"
1252 fi 1908 fi
1253 1909
1254 if [[ -n ${JAVA_PKG_DEBUG} ]]; then 1910 # at this point, ANT_TASKS should be "all", "none" or explicit list
1255 antflags="${antflags} -debug" 1911 if [[ "${ANT_TASKS}" == "all" ]]; then
1912 einfo "Using all available ANT_TASKS"
1913 elif [[ "${ANT_TASKS}" == "none" ]]; then
1914 einfo "Disabling all optional ANT_TASKS"
1915 else
1916 einfo "Using following ANT_TASKS: ${ANT_TASKS}"
1256 fi 1917 fi
1257 1918
1919 export ANT_TASKS
1920 fi
1921
1922 [[ -n ${JAVA_PKG_DEBUG} ]] && antflags="${antflags} --execdebug -debug"
1923 [[ -n ${PORTAGE_QUIET} ]] && antflags="${antflags} -q"
1924
1925 local gcp="${EANT_GENTOO_CLASSPATH}"
1926 local getjarsarg=""
1927
1928 if [[ ${EBUILD_PHASE} = "test" ]]; then
1929 antflags="${antflags} -DJunit.present=true"
1930 [[ ${gcp} && ${ANT_TASKS} = *ant-junit* ]] && gcp="${gcp} junit"
1931 getjarsarg="--with-dependencies"
1932 fi
1933
1934 local cp
1935
1936 for atom in ${gcp}; do
1937 cp="${cp}:$(java-pkg_getjars ${getjarsarg} ${atom})"
1938 done
1939
1940 if [[ ${cp} ]]; then
1941 # It seems ant does not like single quotes around ${cp}
1942 antflags="${antflags} -Dgentoo.classpath=\"${cp#:}\""
1943 fi
1944
1258 [[ -n ${JAVA_PKG_DEBUG} ]] && echo ant ${antflags} "${@}" 1945 [[ -n ${JAVA_PKG_DEBUG} ]] && echo ant ${antflags} "${@}"
1946 debug-print "Calling ant (GENTOO_VM: ${GENTOO_VM}): ${antflags} ${@}"
1259 ant ${antflags} "${@}" || die "eant failed" 1947 ant ${antflags} "${@}" || die "eant failed"
1260
1261} 1948}
1262 1949
1263# ------------------------------------------------------------------------------ 1950# ------------------------------------------------------------------------------
1264# @ebuild-function ejavac 1951# @ebuild-function ejavac
1265# 1952#
1266# Javac wrapper function. Will use the appropriate compiler, based on 1953# Javac wrapper function. Will use the appropriate compiler, based on
1267# /etc/java-config/compilers.conf 1954# /etc/java-config/compilers.conf
1268# 1955#
1269# @param $@ - Arguments to be passed to the compiler 1956# @param $@ - Arguments to be passed to the compiler
1270# ------------------------------------------------------------------------------ 1957# ------------------------------------------------------------------------------
1271ejavac() { 1958ejavac() {
1272 debug-print-function ${FUNCNAME} $* 1959 debug-print-function ${FUNCNAME} $*
1273 1960
1274 # FIXME using get-javac ends up printing stuff with einfo 1961 java-pkg_init-compiler_
1962
1963 local compiler_executable
1275# local compiler_executable=$(java-pkg_get-javac) 1964 compiler_executable=$(java-pkg_get-javac)
1276 local compiler_executable="javac" 1965 if [[ ${?} != 0 ]]; then
1966 eerror "There was a problem determining compiler: ${compiler_executable}"
1967 die "get-javac failed"
1968 fi
1277 1969
1970 local javac_args
1971 javac_args="$(java-pkg_javac-args)"
1972 if [[ ${?} != 0 ]]; then
1973 eerror "There was a problem determining JAVACFLAGS: ${javac_args}"
1974 die "java-pkg_javac-args failed"
1975 fi
1976
1278 [[ -n ${JAVA_PKG_DEBUG} ]] && echo ${compiler_executable} $(java-pkg_javac-args) "${@}" 1977 [[ -n ${JAVA_PKG_DEBUG} ]] && echo ${compiler_executable} ${javac_args} "${@}"
1279 ${compiler_executable} $(java-pkg_javac-args) "${@}" || die "ejavac failed" 1978 ${compiler_executable} ${javac_args} "${@}" || die "ejavac failed"
1280} 1979}
1281 1980
1282# ------------------------------------------------------------------------------ 1981# ------------------------------------------------------------------------------
1283# @ebuild-function java-pkg_filter-compiler 1982# @ebuild-function java-pkg_filter-compiler
1284# 1983#
1285# Used to prevent the use of some compilers. Should be used in src_compile. 1984# Used to prevent the use of some compilers. Should be used in src_compile.
1286# Basically, it just appends onto JAVA_PKG_FILTER_COMPILER 1985# Basically, it just appends onto JAVA_PKG_FILTER_COMPILER
1287# 1986#
1288# @param $@ - compilers to filter 1987# @param $@ - compilers to filter
1289# ------------------------------------------------------------------------------ 1988# ------------------------------------------------------------------------------
1307# ------------------------------------------------------------------------------ 2006# ------------------------------------------------------------------------------
1308# @ebuild-function use_doc 2007# @ebuild-function use_doc
1309# 2008#
1310# Helper function for getting ant to build javadocs. If the user has USE=doc, 2009# Helper function for getting ant to build javadocs. If the user has USE=doc,
1311# then 'javadoc' or the argument are returned. Otherwise, there is no return. 2010# then 'javadoc' or the argument are returned. Otherwise, there is no return.
1312# 2011#
1313# The output of this should be passed to ant. 2012# The output of this should be passed to ant.
1314# 2013#
1315# Example: build javadocs by calling 'javadoc' target 2014# Example: build javadocs by calling 'javadoc' target
1316# eant $(use_doc) 2015# eant $(use_doc)
1317# Example: build javadocs by calling 'apidoc' target 2016# Example: build javadocs by calling 'apidoc' target
1322# ------------------------------------------------------------------------------ 2021# ------------------------------------------------------------------------------
1323use_doc() { 2022use_doc() {
1324 use doc && echo ${@:-javadoc} 2023 use doc && echo ${@:-javadoc}
1325} 2024}
1326 2025
2026
1327# ------------------------------------------------------------------------------ 2027# ------------------------------------------------------------------------------
1328# @section-end build 2028# @section-end build
1329# ------------------------------------------------------------------------------ 2029# ------------------------------------------------------------------------------
1330 2030
1331# ------------------------------------------------------------------------------ 2031# ------------------------------------------------------------------------------
1332# @section-begin internal 2032# @section-begin internal
1333# @section-summary Internal functions 2033# @section-summary Internal functions
1334# 2034#
1335# Do __NOT__ use any of these from an ebuild! These are only to be used from 2035# Do __NOT__ use any of these from an ebuild! These are only to be used from
1336# within the java eclasses. 2036# within the java eclasses.
1337# ------------------------------------------------------------------------------ 2037# ------------------------------------------------------------------------------
1338 2038
1339# ----------------------------------------------------------------------------- 2039# -----------------------------------------------------------------------------
1340# @function-internal java-pkg_init 2040# @function-internal java-pkg_init
1341# 2041#
1342# The purpose of this function, as the name might imply, is to initialize the 2042# The purpose of this function, as the name might imply, is to initialize the
1343# Java environment. It ensures that that there aren't any environment variables 2043# Java environment. It ensures that that there aren't any environment variables
1344# that'll muss things up. It initializes some variables, which are used 2044# that'll muss things up. It initializes some variables, which are used
1345# internally. And most importantly, it'll switch the VM if necessary. 2045# internally. And most importantly, it'll switch the VM if necessary.
1346# 2046#
1347# This shouldn't be used directly. Instead, java-pkg and java-pkg-opt will 2047# This shouldn't be used directly. Instead, java-pkg and java-pkg-opt will
1348# call it during each of the phases of the merge process. 2048# call it during each of the phases of the merge process.
1349# 2049#
1350# ----------------------------------------------------------------------------- 2050# -----------------------------------------------------------------------------
1351java-pkg_init() { 2051java-pkg_init() {
2052 debug-print-function ${FUNCNAME} $*
1352 unset JAVAC 2053 unset JAVAC
1353 unset JAVA_HOME 2054 unset JAVA_HOME
2055
2056 # People do all kinds of weird things.
2057 # http://forums.gentoo.org/viewtopic-p-3943166.html
2058 local silence="${SILENCE_JAVA_OPTIONS_WARNING}"
2059 local accept="${I_WANT_GLOBAL_JAVA_OPTIONS}"
2060 if [[ -n ${_JAVA_OPTIONS} && -z ${accept} && -z ${silence} ]]; then
2061 ewarn "_JAVA_OPTIONS changes what java -version outputs at least for"
2062 ewarn "sun-jdk vms and and as such break configure scripts that"
2063 ewarn "use it (for example app-office/openoffice) so we filter it out."
2064 ewarn "Use SILENCE_JAVA_OPTIONS_WARNING=true in the environment (use"
2065 ewarn "make.conf for example) to silence this warning or"
2066 ewarn "I_WANT_GLOBAL_JAVA_OPTIONS to not filter it."
2067 fi
2068
2069 if [[ -z ${accept} ]]; then
2070 export _JAVA_OPTIONS=
2071 # phase hooks make this run many times without this
2072 I_WANT_GLOBAL_JAVA_OPTIONS="true"
2073 fi
2074
2075 if java-pkg_func-exists ant_src_unpack; then
2076 java-pkg_announce-qa-violation "Using old ant_src_unpack. Should be src_unpack"
2077 fi
2078
1354 java-pkg_init_paths_ 2079 java-pkg_init_paths_
1355 java-pkg_switch-vm 2080 java-pkg_switch-vm
1356 PATH=${JAVA_HOME}/bin:${PATH} 2081 PATH=${JAVA_HOME}/bin:${PATH}
1357 2082
1358 # TODO we will probably want to set JAVAC and JAVACFLAGS 2083 # TODO we will probably want to set JAVAC and JAVACFLAGS
1359 2084
1360 # Do some QA checks 2085 # Do some QA checks
1361 java-pkg_check-jikes 2086 java-pkg_check-jikes
1362 2087
2088 # Can't use unset here because Portage does not save the unset
2089 # see https://bugs.gentoo.org/show_bug.cgi?id=189417#c11
2090
1363 # When users have crazy classpaths some packages can fail to compile. 2091 # When users have crazy classpaths some packages can fail to compile.
1364 # and everything should work with empty CLASSPATH. 2092 # and everything should work with empty CLASSPATH.
1365 # This also helps prevent unexpected dependencies on random things 2093 # This also helps prevent unexpected dependencies on random things
1366 # from the CLASSPATH. 2094 # from the CLASSPATH.
1367 unset CLASSPATH 2095 export CLASSPATH=
2096
2097 # Unset external ANT_ stuff
2098 export ANT_TASKS=
2099 export ANT_OPTS=
1368} 2100}
1369 2101
1370# ------------------------------------------------------------------------------ 2102# ------------------------------------------------------------------------------
1371# @function-internal java-pkg-init-compiler_ 2103# @function-internal java-pkg-init-compiler_
1372# 2104#
1373# This function attempts to figure out what compiler should be used. It does 2105# This function attempts to figure out what compiler should be used. It does
1374# this by reading the file at JAVA_PKG_COMPILERS_CONF, and checking the 2106# this by reading the file at JAVA_PKG_COMPILERS_CONF, and checking the
1375# COMPILERS variable defined there. 2107# COMPILERS variable defined there.
1376# This can be overridden by a list in JAVA_PKG_FORCE_COMPILER 2108# This can be overridden by a list in JAVA_PKG_FORCE_COMPILER
1377# 2109#
1378# It will go through the list of compilers, and verify that it supports the 2110# It will go through the list of compilers, and verify that it supports the
1379# target and source that are needed. If it is not suitable, then the next 2111# target and source that are needed. If it is not suitable, then the next
1380# compiler is checked. When JAVA_PKG_FORCE_COMPILER is defined, this checking 2112# compiler is checked. When JAVA_PKG_FORCE_COMPILER is defined, this checking
1381# isn't done. 2113# isn't done.
1382# 2114#
1404 if [[ -z ${JAVA_PKG_FORCE_COMPILER} ]]; then 2136 if [[ -z ${JAVA_PKG_FORCE_COMPILER} ]]; then
1405 compilers="$(source ${JAVA_PKG_COMPILERS_CONF} 1>/dev/null 2>&1; echo ${COMPILERS})" 2137 compilers="$(source ${JAVA_PKG_COMPILERS_CONF} 1>/dev/null 2>&1; echo ${COMPILERS})"
1406 else 2138 else
1407 compilers=${JAVA_PKG_FORCE_COMPILER} 2139 compilers=${JAVA_PKG_FORCE_COMPILER}
1408 fi 2140 fi
1409 2141
1410 debug-print "Read \"${compilers}\" from ${JAVA_PKG_COMPILERS_CONF}" 2142 debug-print "Read \"${compilers}\" from ${JAVA_PKG_COMPILERS_CONF}"
1411 2143
1412 # Figure out if we should announce what compiler we're using 2144 # Figure out if we should announce what compiler we're using
1413 local compiler 2145 local compiler
1414 for compiler in ${compilers}; do 2146 for compiler in ${compilers}; do
1417 if [[ ${compiler} = "javac" ]]; then 2149 if [[ ${compiler} = "javac" ]]; then
1418 debug-print "Found javac... breaking" 2150 debug-print "Found javac... breaking"
1419 export GENTOO_COMPILER="javac" 2151 export GENTOO_COMPILER="javac"
1420 break 2152 break
1421 fi 2153 fi
1422 2154
1423 if has ${compiler} ${JAVA_PKG_FILTER_COMPILER}; then 2155 if has ${compiler} ${JAVA_PKG_FILTER_COMPILER}; then
1424 if [[ -z ${JAVA_PKG_FORCE_COMPILER} ]]; then 2156 if [[ -z ${JAVA_PKG_FORCE_COMPILER} ]]; then
1425 einfo "Filtering ${compiler}" 2157 einfo "Filtering ${compiler}"
1426 continue 2158 continue
1427 fi 2159 fi
1428 fi 2160 fi
1429 2161
1430 # for non-javac, we need to make sure it supports the right target and 2162 # for non-javac, we need to make sure it supports the right target and
1431 # source 2163 # source
1432 local compiler_env="${JAVA_PKG_COMPILER_DIR}/${compiler}" 2164 local compiler_env="${JAVA_PKG_COMPILER_DIR}/${compiler}"
1433 if [[ -f ${compiler_env} ]]; then 2165 if [[ -f ${compiler_env} ]]; then
1434 local desired_target="$(java-pkg_get-target)" 2166 local desired_target="$(java-pkg_get-target)"
1494 fi 2226 fi
1495 2227
1496 JAVA_PKG_SHAREPATH="${DESTTREE}/share/${JAVA_PKG_NAME}" 2228 JAVA_PKG_SHAREPATH="${DESTTREE}/share/${JAVA_PKG_NAME}"
1497 JAVA_PKG_SOURCESPATH="${JAVA_PKG_SHAREPATH}/sources/" 2229 JAVA_PKG_SOURCESPATH="${JAVA_PKG_SHAREPATH}/sources/"
1498 JAVA_PKG_ENV="${D}${JAVA_PKG_SHAREPATH}/package.env" 2230 JAVA_PKG_ENV="${D}${JAVA_PKG_SHAREPATH}/package.env"
2231 JAVA_PKG_VIRTUALS_PATH="${DESTTREE}/share/java-config-2/virtuals"
2232 JAVA_PKG_VIRTUAL_PROVIDER="${D}/${JAVA_PKG_VIRTUALS_PATH}/${JAVA_PKG_NAME}"
1499 2233
1500 [[ -z "${JAVA_PKG_JARDEST}" ]] && JAVA_PKG_JARDEST="${JAVA_PKG_SHAREPATH}/lib" 2234 [[ -z "${JAVA_PKG_JARDEST}" ]] && JAVA_PKG_JARDEST="${JAVA_PKG_SHAREPATH}/lib"
1501 [[ -z "${JAVA_PKG_LIBDEST}" ]] && JAVA_PKG_LIBDEST="${DESTTREE}/$(get_libdir)/${JAVA_PKG_NAME}" 2235 [[ -z "${JAVA_PKG_LIBDEST}" ]] && JAVA_PKG_LIBDEST="${DESTTREE}/$(get_libdir)/${JAVA_PKG_NAME}"
1502 [[ -z "${JAVA_PKG_WARDEST}" ]] && JAVA_PKG_WARDEST="${JAVA_PKG_SHAREPATH}/webapps" 2236 [[ -z "${JAVA_PKG_WARDEST}" ]] && JAVA_PKG_WARDEST="${JAVA_PKG_SHAREPATH}/webapps"
1503 2237
1516# Writes the package.env out to disk. 2250# Writes the package.env out to disk.
1517# 2251#
1518# ------------------------------------------------------------------------------ 2252# ------------------------------------------------------------------------------
1519# TODO change to do-write, to match everything else 2253# TODO change to do-write, to match everything else
1520java-pkg_do_write_() { 2254java-pkg_do_write_() {
2255 debug-print-function ${FUNCNAME} $*
2256 java-pkg_init_paths_
1521 # Create directory for package.env 2257 # Create directory for package.env
1522 dodir "${JAVA_PKG_SHAREPATH}" 2258 dodir "${JAVA_PKG_SHAREPATH}"
1523 if [[ -n "${JAVA_PKG_CLASSPATH}" || -n "${JAVA_PKG_LIBRARY}" || -f "${JAVA_PKG_DEPEND}" ]]; then 2259 if [[ -n "${JAVA_PKG_CLASSPATH}" || -n "${JAVA_PKG_LIBRARY}" || -f \
2260 "${JAVA_PKG_DEPEND_FILE}" || -f \
2261 "${JAVA_PKG_OPTIONAL_DEPEND_FILE}" ]]; then
1524 # Create package.env 2262 # Create package.env
1525 ( 2263 (
1526 echo "DESCRIPTION=\"${DESCRIPTION}\"" 2264 echo "DESCRIPTION=\"${DESCRIPTION}\""
1527 echo "GENERATION=\"2\"" 2265 echo "GENERATION=\"2\""
1528 2266
1529 [[ -n "${JAVA_PKG_CLASSPATH}" ]] && echo "CLASSPATH=\"${JAVA_PKG_CLASSPATH}\"" 2267 [[ -n "${JAVA_PKG_CLASSPATH}" ]] && echo "CLASSPATH=\"${JAVA_PKG_CLASSPATH}\""
1530 [[ -n "${JAVA_PKG_LIBRARY}" ]] && echo "LIBRARY_PATH=\"${JAVA_PKG_LIBRARY}\"" 2268 [[ -n "${JAVA_PKG_LIBRARY}" ]] && echo "LIBRARY_PATH=\"${JAVA_PKG_LIBRARY}\""
1531 [[ -n "${JAVA_PROVIDE}" ]] && echo "PROVIDES=\"${JAVA_PROVIDE}\"" 2269 [[ -n "${JAVA_PROVIDE}" ]] && echo "PROVIDES=\"${JAVA_PROVIDE}\""
1532 [[ -f "${JAVA_PKG_DEPEND}" ]] && echo "DEPEND=\"$(cat ${JAVA_PKG_DEPEND} | uniq | tr '\n' ':')\"" 2270 [[ -f "${JAVA_PKG_DEPEND_FILE}" ]] \
2271 && echo "DEPEND=\"$(cat "${JAVA_PKG_DEPEND_FILE}" | uniq | tr '\n' ':')\""
2272 [[ -f "${JAVA_PKG_OPTIONAL_DEPEND_FILE}" ]] \
2273 && echo "OPTIONAL_DEPEND=\"$(cat "${JAVA_PKG_OPTIONAL_DEPEND_FILE}" | uniq | tr '\n' ':')\""
1533 echo "VM=\"$(echo ${RDEPEND} ${DEPEND} | sed -e 's/ /\n/g' | sed -n -e '/virtual\/\(jre\|jdk\)/ { p;q }')\"" # TODO cleanup ! 2274 echo "VM=\"$(echo ${RDEPEND} ${DEPEND} | sed -e 's/ /\n/g' | sed -n -e '/virtual\/\(jre\|jdk\)/ { p;q }')\"" # TODO cleanup !
1534 ) > "${JAVA_PKG_ENV}" 2275 ) > "${JAVA_PKG_ENV}"
1535 2276
1536 # register target/source 2277 # register target/source
1537 local target="$(java-pkg_get-target)" 2278 local target="$(java-pkg_get-target)"
1538 local source="$(java-pkg_get-source)" 2279 local source="$(java-pkg_get-source)"
1539 [[ -n ${target} ]] && echo "TARGET=\"${target}\"" >> "${JAVA_PKG_ENV}" 2280 [[ -n ${target} ]] && echo "TARGET=\"${target}\"" >> "${JAVA_PKG_ENV}"
1540 [[ -n ${source} ]] && echo "SOURCE=\"${source}\"" >> "${JAVA_PKG_ENV}" 2281 [[ -n ${source} ]] && echo "SOURCE=\"${source}\"" >> "${JAVA_PKG_ENV}"
1548 2289
1549 2290
1550 echo "MERGE_VM=\"${GENTOO_VM}\"" >> "${JAVA_PKG_ENV}" 2291 echo "MERGE_VM=\"${GENTOO_VM}\"" >> "${JAVA_PKG_ENV}"
1551 [[ -n ${GENTOO_COMPILER} ]] && echo "MERGE_COMPILER=\"${GENTOO_COMPILER}\"" >> "${JAVA_PKG_ENV}" 2292 [[ -n ${GENTOO_COMPILER} ]] && echo "MERGE_COMPILER=\"${GENTOO_COMPILER}\"" >> "${JAVA_PKG_ENV}"
1552 2293
2294 # extra env variables
2295 if [[ -n "${JAVA_PKG_EXTRA_ENV_VARS}" ]]; then
2296 cat "${JAVA_PKG_EXTRA_ENV}" >> "${JAVA_PKG_ENV}" || die
2297 # nested echo to remove leading/trailing spaces
2298 echo "ENV_VARS=\"$(echo ${JAVA_PKG_EXTRA_ENV_VARS})\"" \
2299 >> "${JAVA_PKG_ENV}" || die
2300 fi
2301
1553 # Strip unnecessary leading and trailing colons 2302 # Strip unnecessary leading and trailing colons
1554 # TODO try to cleanup if possible 2303 # TODO try to cleanup if possible
1555 sed -e "s/=\":/=\"/" -e "s/:\"$/\"/" -i "${JAVA_PKG_ENV}" || die "Did you forget to call java_init ?" 2304 sed -e "s/=\":/=\"/" -e "s/:\"$/\"/" -i "${JAVA_PKG_ENV}" || die "Did you forget to call java_init ?"
2305 else
2306 debug-print "JAVA_PKG_CLASSPATH, JAVA_PKG_LIBRARY, JAVA_PKG_DEPEND_FILE"
2307 debug-print "or JAVA_PKG_OPTIONAL_DEPEND_FILE not defined so can't"
2308 debug-print "write package.env."
1556 fi 2309 fi
1557} 2310}
1558
1559 2311
1560# ------------------------------------------------------------------------------ 2312# ------------------------------------------------------------------------------
1561# @internal-function java-pkg_record-jar_ 2313# @internal-function java-pkg_record-jar_
1562# 2314#
1563# Record a dependency to the package.env 2315# Record an (optional) dependency to the package.env
1564# 2316# @param --optional - record dependency as optional
2317# @param $1 - package to record
2318# @param $2 - (optional) jar of package to record
1565# ------------------------------------------------------------------------------ 2319# ------------------------------------------------------------------------------
1566JAVA_PKG_DEPEND="${T}/java-pkg-depend" 2320JAVA_PKG_DEPEND_FILE="${T}/java-pkg-depend"
2321JAVA_PKG_OPTIONAL_DEPEND_FILE="${T}/java-pkg-optional-depend"
1567 2322
1568java-pkg_record-jar_() { 2323java-pkg_record-jar_() {
1569 debug-print-function ${FUNCNAME} $* 2324 debug-print-function ${FUNCNAME} $*
2325
2326 local depend_file="${JAVA_PKG_DEPEND_FILE}"
2327 if [[ "${1}" == "--optional" ]]; then
2328 depend_file="${JAVA_PKG_OPTIONAL_DEPEND_FILE}"
2329 shift
2330 fi
1570 2331
1571 local pkg=${1} jar=${2} append 2332 local pkg=${1} jar=${2} append
1572 if [[ -z "${jar}" ]]; then 2333 if [[ -z "${jar}" ]]; then
1573 append="${pkg}" 2334 append="${pkg}"
1574 else 2335 else
1575 append="$(basename ${jar})@${pkg}" 2336 append="$(basename ${jar})@${pkg}"
1576 fi 2337 fi
1577 2338
1578 echo ${append} >> ${JAVA_PKG_DEPEND} 2339 echo "${append}" >> "${depend_file}"
1579} 2340}
1580 2341
1581# ------------------------------------------------------------------------------ 2342# ------------------------------------------------------------------------------
1582# @internal-function java-pkg_append_ 2343# @internal-function java-pkg_append_
1583# 2344#
1607 fi 2368 fi
1608} 2369}
1609 2370
1610# ------------------------------------------------------------------------------ 2371# ------------------------------------------------------------------------------
1611# @internal-function java-pkg_expand_dir_ 2372# @internal-function java-pkg_expand_dir_
1612# 2373#
1613# Gets the full path of the file/directory's parent. 2374# Gets the full path of the file/directory's parent.
1614# @param $1 - file/directory to find parent directory for 2375# @param $1 - file/directory to find parent directory for
1615# @return - path to $1's parent directory 2376# @return - path to $1's parent directory
1616# ------------------------------------------------------------------------------ 2377# ------------------------------------------------------------------------------
1617java-pkg_expand_dir_() { 2378java-pkg_expand_dir_() {
1643# 2404#
1644# ------------------------------------------------------------------------------ 2405# ------------------------------------------------------------------------------
1645java-pkg_setup-vm() { 2406java-pkg_setup-vm() {
1646 debug-print-function ${FUNCNAME} $* 2407 debug-print-function ${FUNCNAME} $*
1647 2408
2409 export LANG="C" LC_ALL="C"
2410
1648 local vendor="$(java-pkg_get-vm-vendor)" 2411 local vendor="$(java-pkg_get-vm-vendor)"
1649 if [[ "${vendor}" == "sun" ]] && java-pkg_is-vm-version-ge 1 5; then 2412 if [[ "${vendor}" == "sun" ]] && java-pkg_is-vm-version-ge "1.5" ; then
1650 addpredict "/dev/random" 2413 addpredict "/dev/random"
1651 elif [[ "${vendor}" == "ibm" ]]; then 2414 elif [[ "${vendor}" == "ibm" ]]; then
1652 addpredict "/proc/self/maps" 2415 addpredict "/proc/self/maps"
1653 addpredict "/proc/cpuinfo" 2416 addpredict "/proc/cpuinfo"
1654 export LANG="C" LC_ALL="C"
1655 elif [[ "${vendor}" == "jrockit" ]]; then 2417 elif [[ "${vendor}" == "jrockit" ]]; then
1656 addpredict "/proc/cpuinfo" 2418 addpredict "/proc/cpuinfo"
1657 fi 2419 fi
1658} 2420}
1659 2421
1703# @return - The version of the current VM 2465# @return - The version of the current VM
1704# ------------------------------------------------------------------------------ 2466# ------------------------------------------------------------------------------
1705java-pkg_get-vm-version() { 2467java-pkg_get-vm-version() {
1706 debug-print-function ${FUNCNAME} $* 2468 debug-print-function ${FUNCNAME} $*
1707 2469
1708 java-pkg_get-current-vm | sed -e "s/.*-\([0-9.]\+\).*/\1/" 2470 java-config -g PROVIDES_VERSION
1709} 2471}
1710 2472
1711# ------------------------------------------------------------------------------ 2473# ------------------------------------------------------------------------------
1712# @internal-function java-pkg_switch-vm 2474# @internal-function java-pkg_switch-vm
1713# 2475#
1714# Switch VM if we're allowed to (controlled by JAVA_PKG_ALLOW_VM_CHANGE), and 2476# Switch VM if we're allowed to (controlled by JAVA_PKG_ALLOW_VM_CHANGE), and
1715# verify that the current VM is sufficient. 2477# verify that the current VM is sufficient.
1716# Setup the environment for the VM being used. 2478# Setup the environment for the VM being used.
1717# ------------------------------------------------------------------------------ 2479# ------------------------------------------------------------------------------
1718java-pkg_switch-vm() { 2480java-pkg_switch-vm() {
2481 debug-print-function ${FUNCNAME} $*
2482
1719 if java-pkg_needs-vm; then 2483 if java-pkg_needs-vm; then
1720 # Use the VM specified by JAVA_PKG_FORCE_VM 2484 # Use the VM specified by JAVA_PKG_FORCE_VM
1721 if [[ -n ${JAVA_PKG_FORCE_VM} ]]; then 2485 if [[ -n "${JAVA_PKG_FORCE_VM}" ]]; then
1722 # If you're forcing the VM, I hope you know what your doing... 2486 # If you're forcing the VM, I hope you know what your doing...
2487 debug-print "JAVA_PKG_FORCE_VM used: ${JAVA_PKG_FORCE_VM}"
1723 export GENTOO_VM="${JAVA_PKG_FORCE_VM}" 2488 export GENTOO_VM="${JAVA_PKG_FORCE_VM}"
1724 # if we're allowed to switch the vm... 2489 # if we're allowed to switch the vm...
1725 elif [[ "${JAVA_PKG_ALLOW_VM_CHANGE}" == "yes" ]]; then 2490 elif [[ "${JAVA_PKG_ALLOW_VM_CHANGE}" == "yes" ]]; then
1726 debug-print "depend-java-query: NV_DEPEND: ${JAVA_PKG_NV_DEPEND:-${DEPEND}} VNEED: ${JAVA_PKG_VNEED}" 2491 debug-print "depend-java-query: NV_DEPEND: ${JAVA_PKG_NV_DEPEND:-${DEPEND}} VNEED: ${JAVA_PKG_VNEED}"
1727 if [[ -n ${JAVA_PKG_VNEED} ]]; then 2492 if [[ -n ${JAVA_PKG_VNEED} ]]; then
1728 export GENTOO_VM="$(depend-java-query --need-virtual "${JAVA_PKG_VNEED}" --get-vm "${JAVA_PKG_NV_DEPEND:-${DEPEND}}")" 2493 GENTOO_VM="$(depend-java-query --need-virtual "${JAVA_PKG_VNEED}" --get-vm "${JAVA_PKG_NV_DEPEND:-${DEPEND}}")"
1729 else 2494 else
1730 export GENTOO_VM="$(depend-java-query --get-vm "${JAVA_PKG_NV_DEPEND:-${DEPEND}}")" 2495 GENTOO_VM="$(depend-java-query --get-vm "${JAVA_PKG_NV_DEPEND:-${DEPEND}}")"
2496 fi
2497 if [[ -z "${GENTOO_VM}" || "${GENTOO_VM}" == "None" ]]; then
2498 eerror "Unable to determine VM for building from dependencies:"
2499 echo "NV_DEPEND: ${JAVA_PKG_NV_DEPEND:-${DEPEND}}"
2500 echo "VNEED: ${JAVA_PKG_VNEED}"
2501 die "Failed to determine VM for building."
2502 else
2503 export GENTOO_VM
1731 fi 2504 fi
1732 # otherwise just make sure the current VM is sufficient 2505 # otherwise just make sure the current VM is sufficient
1733 else 2506 else
1734 java-pkg_ensure-vm-version-sufficient 2507 java-pkg_ensure-vm-version-sufficient
1735 fi 2508 fi
1736 debug-print "Using: $(java-config -f)" 2509 debug-print "Using: $(java-config -f)"
1737 2510
1738 java-pkg_setup-vm 2511 java-pkg_setup-vm
1739 2512
1740 export JAVA=$(java-config --java) 2513 export JAVA=$(java-config --java)
1741 export JAVAC=$(java-config --javac) 2514 export JAVAC=$(java-config --javac)
1742 export JAVACFLAGS="$(java-pkg_javac-args)" 2515 JAVACFLAGS="$(java-pkg_javac-args)"
2516 if [[ ${?} != 0 ]]; then
2517 eerror "There was a problem determining JAVACFLAGS: ${JAVACFLAGS}"
2518 die "java-pkg_javac-args failed"
2519 fi
1743 [[ -n ${JAVACFLAGS_EXTRA} ]] && export JAVACFLAGS="${JAVACFLAGS_EXTRA} ${JAVACFLAGS}" 2520 [[ -n ${JAVACFLAGS_EXTRA} ]] && JAVACFLAGS="${JAVACFLAGS_EXTRA} ${JAVACFLAGS}"
2521 export JAVACFLAGS
1744 2522
1745 export JAVA_HOME="$(java-config -g JAVA_HOME)" 2523 export JAVA_HOME="$(java-config -g JAVA_HOME)"
1746 export JDK_HOME=${JAVA_HOME} 2524 export JDK_HOME=${JAVA_HOME}
1747 2525
1748 #TODO If you know a better solution let us know. 2526 #TODO If you know a better solution let us know.
1749 java-pkg_append_ LD_LIBRARY_PATH "$(java-config -g LDPATH)" 2527 java-pkg_append_ LD_LIBRARY_PATH "$(java-config -g LDPATH)"
1750 2528
1751 local tann="${T}/announced-vm" 2529 local tann="${T}/announced-vm"
2530 # With the hooks we should only get here once from pkg_setup but better safe than sorry
2531 # if people have for example modified eclasses some where
1752 if [[ -n "${JAVA_PKG_DEBUG}" ]] || [[ ! -f "${tann}" ]] ; then 2532 if [[ -n "${JAVA_PKG_DEBUG}" ]] || [[ ! -f "${tann}" ]] ; then
1753 # Add a check for setup/preinst phase... to avoid duplicate outputs
1754 # for when FEATURES=buildpkg
1755 if [[ ${EBUILD_PHASE} != "setup" && ${EBUILD_PHASE} != "preinst" && ${EBUILD_PHASE} != "postinst" ]];
1756 then
1757 einfo "Using: $(java-config -f)" 2533 einfo "Using: $(java-config -f)"
1758 [[ ! -f "${tann}" ]] && touch "${tann}" 2534 [[ ! -f "${tann}" ]] && touch "${tann}"
1759 fi
1760 fi 2535 fi
1761 2536
1762 else 2537 else
1763 [[ -n "${JAVA_PKG_DEBUG}" ]] && ewarn "!!! This package inherits java-pkg but doesn't depend on a JDK. -bin or broken dependency!!!" 2538 [[ -n "${JAVA_PKG_DEBUG}" ]] && ewarn "!!! This package inherits java-pkg but doesn't depend on a JDK. -bin or broken dependency!!!"
1764 fi 2539 fi
1794 einfo "Classes" 2569 einfo "Classes"
1795 find "${S}" -type f -name '*.class' -print0 | xargs -0 -r -n 500 ls -ald | sed -e "s,${WORKDIR},\${WORKDIR}," 2570 find "${S}" -type f -name '*.class' -print0 | xargs -0 -r -n 500 ls -ald | sed -e "s,${WORKDIR},\${WORKDIR},"
1796 fi 2571 fi
1797} 2572}
1798 2573
1799# TODO document 2574# ------------------------------------------------------------------------------
2575# @internal-function java-pkg_verify-classes
2576#
1800# Verify that the classes were compiled for the right source / target 2577# Verify that the classes were compiled for the right source / target. Dies if
2578# not.
2579# @param $1 (optional) - the file to check, otherwise checks whole ${D}
2580# ------------------------------------------------------------------------------
1801java-pkg_verify-classes() { 2581java-pkg_verify-classes() {
1802 ebegin "Verifying java class versions"
1803 #$(find ${D} -type f -name '*.jar' -o -name '*.class') 2582 #$(find ${D} -type f -name '*.jar' -o -name '*.class')
1804 class-version-verify.py -t $(java-pkg_get-target) -r ${D} 2583 local target=$(java-pkg_get-target)
2584 local result
2585 local log="${T}/class-version-verify.log"
2586 if [[ -n "${1}" ]]; then
2587 class-version-verify.py -v -t ${target} "${1}" > "${log}"
1805 result=$? 2588 result=$?
1806 eend ${result}
1807 if [[ ${result} == 0 ]]; then
1808 einfo "All good"
1809 else 2589 else
1810 ewarn "Possible problem" 2590 ebegin "Verifying java class versions (target: ${target})"
1811 die "Bad class files found" 2591 class-version-verify.py -v -t ${target} -r "${D}" > "${log}"
2592 result=$?
2593 eend ${result}
2594 fi
2595 [[ -n ${JAVA_PKG_DEBUG} ]] && cat "${log}"
2596 if [[ ${result} != 0 ]]; then
2597 eerror "Incorrect bytecode version found"
2598 [[ -n "${1}" ]] && eerror "in file: ${1}"
2599 eerror "See ${log} for more details."
2600 die "Incorrect bytecode found"
2601 fi
2602}
2603
2604# ----------------------------------------------------------------------------
2605# @internal-function java-pkg_ensure-dep
2606# Check that a package being used in jarfrom, getjars and getjar is contained
2607# within DEPEND or RDEPEND.
2608# @param $1 - empty - check both vars; "runtime" or "build" - check only
2609# RDEPEND, resp. DEPEND
2610# @param $2 - Package name and slot.
2611
2612java-pkg_ensure-dep() {
2613 debug-print-function ${FUNCNAME} $*
2614
2615 local limit_to="${1}"
2616 local target_pkg="${2}"
2617 local dev_error=""
2618
2619 local stripped_pkg=$(echo "${target_pkg}" | sed \
2620 's/-[0-9]*\(\.[0-9]\)*$//')
2621
2622 debug-print "Matching against: ${stripped_pkg}"
2623
2624 if [[ ${limit_to} != runtime && ! ( "${DEPEND}" =~ "$stripped_pkg" ) ]]; then
2625 dev_error="The ebuild is attempting to use ${target_pkg} that is not"
2626 dev_error="${dev_error} declared in DEPEND."
2627 if is-java-strict; then
2628 eerror "${dev_error}"
2629 die "${dev_error}"
2630 elif [[ ${BASH_SUBSHELL} = 0 ]]; then
2631 eerror "${dev_error}"
2632 elog "Because you have this package installed the package will"
2633 elog "build without problems, but please report this to"
2634 elog "http://bugs.gentoo.org"
1812 fi 2635 fi
1813} 2636 fi
1814 2637
2638 if [[ ${limit_to} != build ]]; then
2639 if [[ ! ( ${RDEPEND} =~ "${stripped_pkg}" ) ]]; then
2640 if [[ ! ( ${PDEPEND} =~ "${stripped_pkg}" ) ]]; then
2641 dev_error="The ebuild is attempting to use ${target_pkg},"
2642 dev_error="${dev_error} without specifying --build-only, that is not declared in RDEPEND"
2643 dev_error="${dev_error} or PDEPEND."
2644 if is-java-strict; then
2645 eerror "${dev_error}"
2646 die "${dev_error}"
2647 elif [[ ${BASH_SUBSHELL} = 0 ]]; then
2648 eerror "${dev_error}"
2649 elog "The package will build without problems, but may fail to run"
2650 elog "if you don't have ${target_pkg} installed, so please report"
2651 elog "this to http://bugs.gentoo.org"
2652 fi
2653 fi
2654 fi
2655 fi
2656}
1815 2657
1816# ------------------------------------------------------------------------------ 2658# ------------------------------------------------------------------------------
1817# @section-end internal 2659# @section-end internal
1818# ------------------------------------------------------------------------------ 2660# ------------------------------------------------------------------------------
1819 2661
1820java-pkg_check-phase() { 2662java-pkg_check-phase() {
1821 local phase=${1} 2663 local phase=${1}
1822 local funcname=${2} 2664 local funcname=${FUNCNAME[1]}
1823 if is-java-strict && [[ ${EBUILD_PHASE} != ${phase} ]]; then 2665 if [[ ${EBUILD_PHASE} != ${phase} ]]; then
1824 java-pkg_announce-qa-violation \
1825 "${funcname} used outside of src_${phase}" 2666 local msg="${funcname} used outside of src_${phase}"
2667 java-pkg_announce-qa-violation "${msg}"
1826 fi 2668 fi
1827} 2669}
1828 2670
1829java-pkg_check-versioned-jar() { 2671java-pkg_check-versioned-jar() {
1830 local jar=${1} 2672 local jar=${1}
1839 java-pkg_announce-qa-violation "deprecated USE flag 'jikes' in IUSE" 2681 java-pkg_announce-qa-violation "deprecated USE flag 'jikes' in IUSE"
1840 fi 2682 fi
1841} 2683}
1842 2684
1843java-pkg_announce-qa-violation() { 2685java-pkg_announce-qa-violation() {
1844 if is-java-strict; then 2686 local nodie
2687 if [[ ${1} == "--nodie" ]]; then
2688 nodie="true"
2689 shift
2690 fi
1845 echo "Java QA Notice: $@" >&2 2691 echo "Java QA Notice: $@" >&2
1846 increment-qa-violations 2692 increment-qa-violations
1847 fi 2693 [[ -z "${nodie}" ]] && is-java-strict && die "${@}"
1848} 2694}
1849 2695
1850increment-qa-violations() { 2696increment-qa-violations() {
1851 let "JAVA_PKG_QA_VIOLATIONS+=1" 2697 let "JAVA_PKG_QA_VIOLATIONS+=1"
1852 export JAVA_PKG_QA_VIOLATIONS 2698 export JAVA_PKG_QA_VIOLATIONS
1853} 2699}
1854 2700
1855is-java-strict() { 2701is-java-strict() {
1856 hasq java-strict ${FEATURES} && ! hasq -java-strict ${FEATURES} 2702 [[ -n ${JAVA_PKG_STRICT} ]]
1857 return $? 2703 return $?
1858} 2704}
1859 2705
1860# ------------------------------------------------------------------------------ 2706# ------------------------------------------------------------------------------
1861# @eclass-end 2707# @eclass-end

Legend:
Removed from v.1.12  
changed lines
  Added in v.1.97

  ViewVC Help
Powered by ViewVC 1.1.20