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

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

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

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

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

  ViewVC Help
Powered by ViewVC 1.1.20