/[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.94 Revision 1.157
1# Base eclass for Java packages 1# Base eclass for Java packages
2# 2#
3# Copyright (c) 2004-2005, Thomas Matthijs <axxo@gentoo.org> 3# Copyright (c) 2004-2005, Thomas Matthijs <axxo@gentoo.org>
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-2011, Gentoo Foundation
6# 6#
7# Licensed under the GNU General Public License, v2 7# Licensed under the GNU General Public License, v2
8# 8#
9# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.94 2007/10/04 09:59:29 ali_bush Exp $ 9# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.157 2015/04/04 21:04:49 chewi Exp $
10 10
11# ----------------------------------------------------------------------------- 11# @ECLASS: java-utils-2.eclass
12# @eclass-begin 12# @MAINTAINER:
13# @eclass-shortdesc Java Utility eclass 13# java@gentoo.org
14# @eclass-maintainer java@gentoo.org 14# @AUTHOR:
15# 15# Thomas Matthijs <axxo@gentoo.org>, Karl Trygve Kalleberg <karltk@gentoo.org>
16# @BLURB: Base eclass for Java packages
17# @DESCRIPTION:
16# This eclass provides functionality which is used by 18# This eclass provides functionality which is used by java-pkg-2.eclass,
17# java-pkg.eclass and java-pkg-opt.eclass as well as from ebuilds. 19# java-pkg-opt-2.eclass and java-ant-2 eclass, as well as from ebuilds.
18# 20#
19# @warning 21# This eclass should not be inherited this directly from an ebuild. Instead,
20# You probably don't want to inherit this directly from an ebuild. Instead, 22# you should inherit java-pkg-2 for Java packages or java-pkg-opt-2 for packages
21# you should inherit java-ant for Ant-based Java packages, java-pkg for other 23# that have optional Java support. In addition you can inherit java-ant-2 for
22# Java packages, or java-pkg-opt for packages that have optional Java support. 24# Ant-based packages.
23#
24# -----------------------------------------------------------------------------
25
26inherit eutils versionator multilib 25inherit eutils versionator multilib
27 26
28IUSE="elibc_FreeBSD" 27IUSE="elibc_FreeBSD"
29
30# -----------------------------------------------------------------------------
31# @section-begin variables
32# @section-title Variables
33#
34# Summary of variables which control the behavior of building Java packges.
35# -----------------------------------------------------------------------------
36 28
37# Make sure we use java-config-2 29# Make sure we use java-config-2
38export WANT_JAVA_CONFIG="2" 30export WANT_JAVA_CONFIG="2"
39 31
40# ----------------------------------------------------------------------------- 32# @VARIABLE: JAVA_PKG_PORTAGE_DEP
41# @variable-external WANT_ANT_TASKS 33# @INTERNAL
42# @variable-default "" 34# @DESCRIPTION:
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 35# 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 36# portage with phase hooks support but now we use a version with proper env
64# saving. 37# saving. For EAPI 2 we have new enough stuff so let's have cleaner deps.
65# -----------------------------------------------------------------------------
66JAVA_PKG_PORTAGE_DEP=">=sys-apps/portage-2.1.2.7" 38has "${EAPI}" 0 1 && JAVA_PKG_PORTAGE_DEP=">=sys-apps/portage-2.1.2.7"
67 39
68# ----------------------------------------------------------------------------- 40# @VARIABLE: JAVA_PKG_E_DEPEND
69# @variable-internal JAVA_PKG_E_DEPEND 41# @INTERNAL
70# 42# @DESCRIPTION:
71# This is a convience variable to be used from the other java eclasses. This is 43# This is a convience variable to be used from the other java eclasses. This is
72# the version of java-config we want to use. Usually the latest stable version 44# the version of java-config we want to use. Usually the latest stable version
73# so that ebuilds can use new features without depending on specific versions. 45# so that ebuilds can use new features without depending on specific versions.
74# -----------------------------------------------------------------------------
75JAVA_PKG_E_DEPEND=">=dev-java/java-config-2.0.33-r1 ${JAVA_PKG_PORTAGE_DEP}" 46JAVA_PKG_E_DEPEND=">=dev-java/java-config-2.1.9-r1 ${JAVA_PKG_PORTAGE_DEP}"
47has source ${JAVA_PKG_IUSE} && JAVA_PKG_E_DEPEND="${JAVA_PKG_E_DEPEND} source? ( app-arch/zip )"
76 48
77# ----------------------------------------------------------------------------- 49# @ECLASS-VARIABLE: JAVA_PKG_WANT_BOOTCLASSPATH
78# @variable-external JAVA_PKG_ALLOW_VM_CHANGE 50# @DEFAULT_UNSET
79# @variable-default yes 51# @DESCRIPTION:
80# 52# The version of bootclasspath the package needs to work. Translates to a proper
53# dependency. The bootclasspath can then be obtained by java-ant_rewrite-bootclasspath
54if [[ -n "${JAVA_PKG_WANT_BOOTCLASSPATH}" ]]; then
55 if [[ "${JAVA_PKG_WANT_BOOTCLASSPATH}" == "1.5" ]]; then
56 JAVA_PKG_E_DEPEND="${JAVA_PKG_E_DEPEND} >=dev-java/gnu-classpath-0.98-r1:0.98"
57 else
58 eerror "Unknown value of JAVA_PKG_WANT_BOOTCLASSPATH"
59 # since die in global scope doesn't work, this will make repoman fail
60 JAVA_PKG_E_DEPEND="${JAVA_PKG_E_DEPEND} BAD_JAVA_PKG_WANT_BOOTCLASSPATH"
61 fi
62fi
63
64# @ECLASS-VARIABLE: JAVA_PKG_ALLOW_VM_CHANGE
65# @DESCRIPTION:
81# Allow this eclass to change the active VM? 66# Allow this eclass to change the active VM?
82# If your system VM isn't sufficient for the package, the build will fail. 67# If your system VM isn't sufficient for the package, the build will fail
83# @note This is useful for testing specific VMs. 68# instead of trying to switch to another VM.
84# ----------------------------------------------------------------------------- 69#
70# Overriding the default can be useful for testing specific VMs locally, but
71# should not be used in the final ebuild.
85JAVA_PKG_ALLOW_VM_CHANGE=${JAVA_PKG_ALLOW_VM_CHANGE:="yes"} 72JAVA_PKG_ALLOW_VM_CHANGE=${JAVA_PKG_ALLOW_VM_CHANGE:="yes"}
86 73
87# ----------------------------------------------------------------------------- 74# @ECLASS-VARIABLE: JAVA_PKG_FORCE_VM
88# @variable-external JAVA_PKG_FORCE_VM 75# @DEFAULT_UNSET
89# 76# @DESCRIPTION:
90# Explicitly set a particular VM to use. If its not valid, it'll fall back to 77# Explicitly set a particular VM to use. If its not valid, it'll fall back to
91# whatever /etc/java-config-2/build/jdk.conf would elect to use. 78# whatever /etc/java-config-2/build/jdk.conf would elect to use.
92# 79#
93# Should only be used for testing and debugging. 80# Should only be used for testing and debugging.
94# 81#
95# @example Use sun-jdk-1.5 to emerge foo 82# Example: use sun-jdk-1.5 to emerge foo:
83# @CODE
96# JAVA_PKG_FORCE_VM=sun-jdk-1.5 emerge foo 84# JAVA_PKG_FORCE_VM=sun-jdk-1.5 emerge foo
97# 85# @CODE
98# -----------------------------------------------------------------------------
99 86
100# ----------------------------------------------------------------------------- 87# @ECLASS-VARIABLE: JAVA_PKG_WANT_BUILD_VM
101# @variable-external JAVA_PKG_WANT_SOURCE 88# @DEFAULT_UNSET
89# @DESCRIPTION:
90# A list of VM handles to choose a build VM from. If the list contains the
91# currently active VM use that one, otherwise step through the list till a
92# usable/installed VM is found.
102# 93#
103# Specify a specific VM version to compile for to use for -source. 94# This allows to use an explicit list of JDKs in DEPEND instead of a virtual.
104# Normally this is determined from DEPEND. 95# Users of this variable must make sure at least one of the listed handles is
96# covered by DEPEND.
97# Requires JAVA_PKG_WANT_SOURCE and JAVA_PKG_WANT_TARGET to be set as well.
98
99# @ECLASS-VARIABLE: JAVA_PKG_WANT_SOURCE
100# @DEFAULT_UNSET
101# @DESCRIPTION:
102# Specify a non-standard Java source version for compilation (via javac -source
103# parameter or Ant equivalent via build.xml rewriting done by java-ant-2 eclass).
104# Normally this is determined from the jdk version specified in DEPEND.
105# See java-pkg_get-source function below. 105# See java-pkg_get-source function below.
106# 106#
107# Should only be used for testing and debugging. 107# Should generally only be used for testing and debugging.
108# 108#
109# @seealso java-pkg_get-source
110#
111# @example Use 1.4 source to emerge baz 109# Use 1.4 source to emerge baz
110# @CODE
112# JAVA_PKG_WANT_SOURCE=1.4 emerge baz 111# JAVA_PKG_WANT_SOURCE=1.4 emerge baz
113# ----------------------------------------------------------------------------- 112# @CODE
114 113
115# ----------------------------------------------------------------------------- 114# @ECLASS-VARIABLE: JAVA_PKG_WANT_TARGET
116# @variable-external JAVA_PKG_WANT_TARGET 115# @DEFAULT_UNSET
117# 116# @DESCRIPTION:
118# Same as JAVA_PKG_WANT_SOURCE above but for -target. 117# Same as JAVA_PKG_WANT_SOURCE (see above) but for javac -target parameter,
118# which affects the version of generated bytecode.
119# Normally this is determined from the jre/jdk version specified in RDEPEND.
119# See java-pkg_get-target function below. 120# See java-pkg_get-target function below.
120# 121#
121# Should only be used for testing and debugging. 122# Should generallyonly be used for testing and debugging.
122# 123#
123# @seealso java-pkg_get-target
124#
125# @example emerge bar to be compatible with 1.3 124# emerge bar to be compatible with 1.3
125# @CODE
126# JAVA_PKG_WANT_TARGET=1.3 emerge bar 126# JAVA_PKG_WANT_TARGET=1.3 emerge bar
127# ----------------------------------------------------------------------------- 127# @CODE
128 128
129# ----------------------------------------------------------------------------- 129# @VARIABLE: JAVA_PKG_COMPILER_DIR
130# @variable-internal JAVA_PKG_COMPILER_DIR 130# @INTERNAL
131# @default /usr/share/java-config-2/compiler 131# @DESCRIPTION:
132#
133# Directory where compiler settings are saved, without trailing slash. 132# Directory where compiler settings are saved, without trailing slash.
134# Probably shouldn't touch this variable. 133# You probably shouldn't touch this variable except local testing.
135# -----------------------------------------------------------------------------
136JAVA_PKG_COMPILER_DIR=${JAVA_PKG_COMPILER_DIR:="/usr/share/java-config-2/compiler"} 134JAVA_PKG_COMPILER_DIR=${JAVA_PKG_COMPILER_DIR:="/usr/share/java-config-2/compiler"}
137 135
138 136# @VARIABLE: JAVA_PKG_COMPILERS_CONF
139# ----------------------------------------------------------------------------- 137# @INTERNAL
140# @variable-internal JAVA_PKG_COMPILERS_CONF 138# @DESCRIPTION:
141# @variable-default /etc/java-config-2/build/compilers.conf
142#
143# Path to file containing information about which compiler to use. 139# Path to file containing information about which compiler to use.
144# Can be overloaded, but it should be overloaded for testing. 140# Can be overloaded, but it should be overloaded only for local testing.
145# -----------------------------------------------------------------------------
146JAVA_PKG_COMPILERS_CONF=${JAVA_PKG_COMPILERS_CONF:="/etc/java-config-2/build/compilers.conf"} 141JAVA_PKG_COMPILERS_CONF=${JAVA_PKG_COMPILERS_CONF:="/etc/java-config-2/build/compilers.conf"}
147 142
148# ----------------------------------------------------------------------------- 143# @ECLASS-VARIABLE: JAVA_PKG_FORCE_COMPILER
149# @variable-external JAVA_PKG_FORCE_COMPILER 144# @INTERNAL
150# 145# @DEFAULT_UNSET
146# @DESCRIPTION:
151# Explicitly set a list of compilers to use. This is normally read from 147# Explicitly set a list of compilers to choose from. This is normally read from
152# JAVA_PKG_COMPILERS_CONF. 148# JAVA_PKG_COMPILERS_CONF.
153# 149#
154# @note This should only be used internally or for testing. 150# Useful for local testing.
151#
155# @example Use jikes and javac, in that order 152# Use jikes and javac, in that order
153# @CODE
156# JAVA_PKG_FORCE_COMPILER="jikes javac" 154# JAVA_PKG_FORCE_COMPILER="jikes javac"
157# ----------------------------------------------------------------------------- 155# @CODE
158 156
159# ----------------------------------------------------------------------------- 157# @ECLASS-VARIABLE: JAVA_PKG_FORCE_ANT_TASKS
160# @variable-external JAVA_PKG_FORCE_ANT_TASKS 158# @DEFAULT_UNSET
161# 159# @DESCRIPTION:
162# An $IFS separated list of ant tasks. Can be set in environment before calling 160# An $IFS separated list of ant tasks. Can be set in environment before calling
163# emerge/ebuild to override variables set in ebuild, mainly for testing before 161# emerge/ebuild to override variables set in ebuild, mainly for testing before
164# putting the resulting (WANT_)ANT_TASKS into ebuild. Affects only ANT_TASKS in 162# putting the resulting (WANT_)ANT_TASKS into ebuild. Affects only ANT_TASKS in
165# eant() call, not the dependencies specified in WANT_ANT_TASKS. 163# eant() call, not the dependencies specified in WANT_ANT_TASKS.
166# 164#
165# @CODE
167# @example JAVA_PKG_FORCE_ANT_TASKS="ant-junit ant-trax" \ 166# JAVA_PKG_FORCE_ANT_TASKS="ant-junit ant-trax" \
168# ebuild foo.ebuild compile 167# ebuild foo.ebuild compile
169# 168# @CODE
170# @seealso WANT_ANT_TASKS
171# -----------------------------------------------------------------------------
172 169
173# TODO document me 170# TODO document me
174JAVA_PKG_QA_VIOLATIONS=0 171JAVA_PKG_QA_VIOLATIONS=0
175 172
176# ----------------------------------------------------------------------------- 173# @FUNCTION: java-pkg_doexamples
177# @section-end variables 174# @USAGE: [--subdir <subdir>] <file1/dir1> [<file2> ...]
178# ----------------------------------------------------------------------------- 175# @DESCRIPTION:
179
180
181# -----------------------------------------------------------------------------
182# @section-begin install
183# @section-summary Install functions
184#
185# These are used to install Java-related things, such as jars, Javadocs, JNI
186# libraries, etc.
187# -----------------------------------------------------------------------------
188
189# -----------------------------------------------------------------------------
190# @ebuild-function java-pkg_doexamples
191#
192# Installs given arguments to /usr/share/doc/${PF}/examples 176# Installs given arguments to /usr/share/doc/${PF}/examples
193# If you give it only one parameter and it is a directory it will install 177# If you give it only one parameter and it is a directory it will install
194# everything in that directory to the examples directory. 178# everything in that directory to the examples directory.
195# 179#
180# @CODE
181# Parameters:
182# --subdir - If the examples need a certain directory structure
183# $* - list of files to install
184#
196# @example 185# Examples:
197# java-pkg_doexamples demo 186# java-pkg_doexamples demo
198# java-pkg_doexamples demo/* examples/* 187# java-pkg_doexamples demo/* examples/*
199# 188# @CODE
200# @param --subdir - If the examples need a certain directory structure
201# @param $* - list of files to install
202# ------------------------------------------------------------------------------
203java-pkg_doexamples() { 189java-pkg_doexamples() {
204 debug-print-function ${FUNCNAME} $* 190 debug-print-function ${FUNCNAME} $*
205 191
206 [[ ${#} -lt 1 ]] && die "At least one argument needed" 192 [[ ${#} -lt 1 ]] && die "At least one argument needed"
207 193
208 java-pkg_check-phase install 194 java-pkg_check-phase install
195 java-pkg_init_paths_
209 196
210 local dest=/usr/share/doc/${PF}/examples 197 local dest=/usr/share/doc/${PF}/examples
211 if [[ ${1} == --subdir ]]; then 198 if [[ ${1} == --subdir ]]; then
212 local dest=${dest}/${2} 199 local dest=${dest}/${2}
213 dodir ${dest} 200 dodir ${dest}
223 ( # dont want to pollute calling env 210 ( # dont want to pollute calling env
224 insinto "${dest}" 211 insinto "${dest}"
225 doins -r "$@" 212 doins -r "$@"
226 ) || die "Installing examples failed" 213 ) || die "Installing examples failed"
227 fi 214 fi
228}
229 215
230# ----------------------------------------------------------------------------- 216 # Let's make a symlink to the directory we have everything else under
231# @ebuild-function java-pkg_dojar 217 dosym "${dest}" "${JAVA_PKG_SHAREPATH}/examples" || die
232# 218}
219
220# @FUNCTION: java-pkg_dojar
221# @USAGE: <jar1> [<jar2> ...]
222# @DESCRIPTION:
233# Installs any number of jars. 223# Installs any number of jars.
234# Jar's will be installed into /usr/share/${PN}(-${SLOT})/lib/ by default. 224# Jar's will be installed into /usr/share/${PN}(-${SLOT})/lib/ by default.
235# You can use java-pkg_jarinto to change this path. 225# You can use java-pkg_jarinto to change this path.
236# You should never install a jar with a package version in the filename. 226# You should never install a jar with a package version in the filename.
237# Instead, use java-pkg_newjar defined below. 227# Instead, use java-pkg_newjar defined below.
238# 228#
239# @example 229# @CODE
240# java-pkg_dojar dist/${PN}.jar dist/${PN}-core.jar 230# java-pkg_dojar dist/${PN}.jar dist/${PN}-core.jar
231# @CODE
241# 232#
242# @param $* - list of jars to install 233# @param $* - list of jars to install
243# ------------------------------------------------------------------------------
244java-pkg_dojar() { 234java-pkg_dojar() {
245 debug-print-function ${FUNCNAME} $* 235 debug-print-function ${FUNCNAME} $*
246 236
247 [[ ${#} -lt 1 ]] && die "At least one argument needed" 237 [[ ${#} -lt 1 ]] && die "At least one argument needed"
248 238
290 done 280 done
291 281
292 java-pkg_do_write_ 282 java-pkg_do_write_
293} 283}
294 284
295 285# @FUNCTION: depend-java-query
296# ------------------------------------------------------------------------------ 286# @INTERNAL
297# @internal-function depend-java-query 287# @DESCRIPTION:
298#
299# Wrapper for the depend-java-query binary to enable passing USE in env. 288# 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 289# Using env variables keeps this eclass working with java-config versions that
301# do not handle use flags. 290# do not handle use flags.
302# ------------------------------------------------------------------------------
303
304depend-java-query() { 291depend-java-query() {
305 # Used to have a which call here but it caused endless loops for some people 292 # Used to have a which call here but it caused endless loops for some people
306 # that had some weird bashrc voodoo for which. 293 # that had some weird bashrc voodoo for which.
307 USE="${USE}" /usr/bin/depend-java-query "${@}" 294 USE="${USE}" /usr/bin/depend-java-query "${@}"
308} 295}
309 296
310# ------------------------------------------------------------------------------ 297# @FUNCTION: java-pkg_regjar
311# @ebuild-function java-pkg_regjar 298# @USAGE: </path/to/installed/jar>
312# 299# @DESCRIPTION:
313# Records an already installed jar in the package.env 300# Records an already installed (in ${D}) jar in the package.env
314# This would mostly be used if the package has make or a custom script to 301# This would mostly be used if the package has make or a custom script to
315# install things. 302# install things.
316# 303#
317# Example:
318# java-pkg_regjar ${D}/opt/foo/lib/foo.jar
319#
320# WARNING: 304# WARNING:
321# if you want to use shell expansion, you have to use ${D}/... as the for in 305# 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: 306# this function will not be able to expand the path, here's an example:
323# 307#
324# java-pkg_regjar /opt/my-java/lib/*.jar 308# @CODE
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 309# java-pkg_regjar ${D}/opt/my-java/lib/*.jar
310# @CODE
335# 311#
336# @param $@ - jars to record 312
337# ------------------------------------------------------------------------------
338# TODO should we be making sure the jar is present on ${D} or wherever? 313# TODO should we be making sure the jar is present on ${D} or wherever?
339java-pkg_regjar() { 314java-pkg_regjar() {
340 debug-print-function ${FUNCNAME} $* 315 debug-print-function ${FUNCNAME} $*
341 316
342 java-pkg_check-phase install 317 java-pkg_check-phase install
365 if [[ ${jar} = *\** ]]; then 340 if [[ ${jar} = *\** ]]; then
366 eerror "The argument ${jar} to ${FUNCNAME}" 341 eerror "The argument ${jar} to ${FUNCNAME}"
367 eerror "has * in it. If you want it to glob in" 342 eerror "has * in it. If you want it to glob in"
368 eerror '${D} add ${D} to the argument.' 343 eerror '${D} add ${D} to the argument.'
369 fi 344 fi
345 debug-print "${jar} or ${D}${jar} not found"
370 die "${jar} does not exist" 346 die "${jar} does not exist"
371 fi 347 fi
372 done 348 done
373 349
374 java-pkg_do_write_ 350 java-pkg_do_write_
375} 351}
376 352
377# ------------------------------------------------------------------------------ 353# @FUNCTION: java-pkg_newjar
378# @ebuild-function java-pkg_newjar 354# @USAGE: <path/to/oldname.jar> [<newname.jar>]
355# @DESCRIPTION:
356# Installs a jar with a new name (defaults to $PN.jar)
379# 357#
380# Installs a jar with a new name
381#
382# @example: install a versioned jar without the version 358# For example, installs a versioned jar without the version
383# java-pkg_newjar dist/${P}.jar ${PN}.jar
384#
385# @param $1 - jar to install
386# @param $2 - new name for jar - defaults to ${PN}.jar if not specified
387# ------------------------------------------------------------------------------
388java-pkg_newjar() { 359java-pkg_newjar() {
389 debug-print-function ${FUNCNAME} $* 360 debug-print-function ${FUNCNAME} $*
390 361
391 local original_jar="${1}" 362 local original_jar="${1}"
392 local new_jar="${2:-${PN}.jar}" 363 local new_jar="${2:-${PN}.jar}"
400 cp "${original_jar}" "${new_jar_dest}" \ 371 cp "${original_jar}" "${new_jar_dest}" \
401 || die "Failed to copy ${original_jar} to ${new_jar_dest}" 372 || die "Failed to copy ${original_jar} to ${new_jar_dest}"
402 java-pkg_dojar "${new_jar_dest}" 373 java-pkg_dojar "${new_jar_dest}"
403} 374}
404 375
405# ------------------------------------------------------------------------------ 376# @FUNCTION: java-pkg_addcp
406# @ebuild-function java-pkg_addcp 377# @USAGE: <classpath>
407# 378# @DESCRIPTION:
408# Add something to the package's classpath. For jars, you should use dojar, 379# Add something to the package's classpath. For jars, you should use dojar,
409# newjar, or regjar. This is typically used to add directories to the classpath. 380# newjar, or regjar. This is typically used to add directories to the classpath.
410# 381# The parameters of this function are appended to JAVA_PKG_CLASSPATH
411# TODO add example
412# @param $@ - value to append to JAVA_PKG_CLASSPATH
413# ------------------------------------------------------------------------------
414java-pkg_addcp() { 382java-pkg_addcp() {
415 java-pkg_append_ JAVA_PKG_CLASSPATH "${@}" 383 java-pkg_append_ JAVA_PKG_CLASSPATH "${@}"
416 java-pkg_do_write_ 384 java-pkg_do_write_
417} 385}
418 386
419# ------------------------------------------------------------------------------ 387# @FUNCTION: java-pkg_doso
420# @ebuild-function java-pkg_doso 388# @USAGE: <path/to/file1.so> [...]
421# 389# @DESCRIPTION:
422# Installs any number of JNI libraries 390# Installs any number of JNI libraries
423# They will be installed into /usr/lib by default, but java-pkg_sointo 391# They will be installed into /usr/lib by default, but java-pkg_sointo
424# can be used change this path 392# can be used change this path
425# 393#
394# @CODE
426# Example: 395# Example:
427# java-pkg_doso *.so 396# java-pkg_doso *.so
428# 397# @CODE
429# @param $@ - JNI libraries to install
430# ------------------------------------------------------------------------------
431java-pkg_doso() { 398java-pkg_doso() {
432 debug-print-function ${FUNCNAME} $* 399 debug-print-function ${FUNCNAME} $*
433 400
434 [[ ${#} -lt 1 ]] && "At least one argument required for ${FUNCNAME}"
435 java-pkg_check-phase install 401 java-pkg_check-phase install
436 402
437 [[ ${#} -lt 1 ]] && die "At least one argument required for ${FUNCNAME}" 403 [[ ${#} -lt 1 ]] && die "${FUNCNAME} requires at least one argument"
438 404
439 java-pkg_init_paths_ 405 java-pkg_init_paths_
440 406
441 local lib 407 local lib
442 # for each lib 408 # for each lib
445 if [[ -e "${lib}" ]] ; then 411 if [[ -e "${lib}" ]] ; then
446 # install if it isn't a symlink 412 # install if it isn't a symlink
447 if [[ ! -L "${lib}" ]] ; then 413 if [[ ! -L "${lib}" ]] ; then
448 INSDESTTREE="${JAVA_PKG_LIBDEST}" \ 414 INSDESTTREE="${JAVA_PKG_LIBDEST}" \
449 INSOPTIONS="${LIBOPTIONS}" \ 415 INSOPTIONS="${LIBOPTIONS}" \
450 doins "${lib}" || "failed to install ${lib}" 416 doins "${lib}" || die "failed to install ${lib}"
451 java-pkg_append_ JAVA_PKG_LIBRARY "${JAVA_PKG_LIBDEST}" 417 java-pkg_append_ JAVA_PKG_LIBRARY "${JAVA_PKG_LIBDEST}"
452 debug-print "Installing ${lib} to ${JAVA_PKG_LIBDEST}" 418 debug-print "Installing ${lib} to ${JAVA_PKG_LIBDEST}"
453 # otherwise make a symlink to the symlink's origin 419 # otherwise make a symlink to the symlink's origin
454 else 420 else
455 # TODO use dosym 421 dosym "$(readlink "${lib}")" "${JAVA_PKG_LIBDEST}/${lib##*/}"
456 ln -s "$(readlink "${lib}")" \
457 "${D}${JAVA_PKG_LIBDEST}/$(basename "${lib}")"
458 debug-print "${lib} is a symlink, linking accordanly" 422 debug-print "${lib} is a symlink, linking accordantly"
459 fi 423 fi
460 # otherwise die 424 # otherwise die
461 else 425 else
462 die "${lib} does not exist" 426 die "${lib} does not exist"
463 fi 427 fi
464 done 428 done
465 429
466 java-pkg_do_write_ 430 java-pkg_do_write_
467} 431}
468 432
469# ------------------------------------------------------------------------------ 433# @FUNCTION: java-pkg_regso
470# @ebuild-function java-pkg_regso 434# @USAGE: <file1.so> [...]
471# 435# @DESCRIPTION:
472# Registers an already JNI library in package.env. 436# Registers an already installed JNI library in package.env.
437#
438# @CODE
439# Parameters:
440# $@ - JNI libraries to register
473# 441#
474# Example: 442# Example:
475# java-pkg_regso *.so /path/*.so 443# java-pkg_regso *.so /path/*.so
476# 444# @CODE
477# @param $@ - JNI libraries to register
478# ------------------------------------------------------------------------------
479java-pkg_regso() { 445java-pkg_regso() {
480 debug-print-function ${FUNCNAME} $* 446 debug-print-function ${FUNCNAME} $*
481 447
482 java-pkg_check-phase install 448 java-pkg_check-phase install
483 449
484 [[ ${#} -lt 1 ]] && "at least one argument needed" 450 [[ ${#} -lt 1 ]] && die "${FUNCNAME} requires at least one argument"
485 451
486 java-pkg_init_paths_ 452 java-pkg_init_paths_
487 453
488 local lib target_dir 454 local lib target_dir
489 for lib in "$@" ; do 455 for lib in "$@" ; do
501 done 467 done
502 468
503 java-pkg_do_write_ 469 java-pkg_do_write_
504} 470}
505 471
506# ------------------------------------------------------------------------------ 472# @FUNCTION: java-pkg_jarinto
507# @ebuild-function java-pkg_jarinto 473# @USAGE: </path/to/install/jars/into>
508# 474# @DESCRIPTION:
509# Changes the path jars are installed into 475# Changes the path jars are installed into via subsequent java-pkg_dojar calls.
510#
511# @param $1 - new location to install jars into.
512# -----------------------------------------------------------------------------
513java-pkg_jarinto() { 476java-pkg_jarinto() {
514 debug-print-function ${FUNCNAME} $* 477 debug-print-function ${FUNCNAME} $*
515 478
516 JAVA_PKG_JARDEST="${1}" 479 JAVA_PKG_JARDEST="${1}"
517} 480}
518 481
519# ------------------------------------------------------------------------------ 482# @FUNCTION: java-pkg_sointo
520# @ebuild-function java-pkg_sointo 483# @USAGE: </path/to/install/sofiles/into>
521# 484# @DESCRIPTION:
522# Changes the path that JNI libraries are installed into. 485# Changes the path that JNI libraries are installed into via subsequent
523# 486# java-pkg_doso calls.
524# @param $1 - new location to install JNI libraries into.
525# ------------------------------------------------------------------------------
526java-pkg_sointo() { 487java-pkg_sointo() {
527 debug-print-function ${FUNCNAME} $* 488 debug-print-function ${FUNCNAME} $*
528 489
529 JAVA_PKG_LIBDEST="${1}" 490 JAVA_PKG_LIBDEST="${1}"
530} 491}
531 492
532# ------------------------------------------------------------------------------ 493# @FUNCTION: java-pkg_dohtml
533# @ebuild-function java-pkg_dohtml 494# @USAGE: <path/to/javadoc/documentation> [...]
495# @DESCRIPTION:
496# Install Javadoc HTML documentation. Usage of java-pkg_dojavadoc is preferred.
534# 497#
535# Install Javadoc HTML documentation 498# @CODE
536#
537# @example
538# java-pkg_dohtml dist/docs/ 499# java-pkg_dohtml dist/docs/
539# 500# @CODE
540# ------------------------------------------------------------------------------
541java-pkg_dohtml() { 501java-pkg_dohtml() {
542 debug-print-function ${FUNCNAME} $* 502 debug-print-function ${FUNCNAME} $*
543 503
544 [[ ${#} -lt 1 ]] && die "At least one argument required for ${FUNCNAME}" 504 [[ ${#} -lt 1 ]] && die "At least one argument required for ${FUNCNAME}"
545 505
551 # a reasonable way to catch # docs for all of the 511 # a reasonable way to catch # docs for all of the
552 # old ebuilds. 512 # old ebuilds.
553 java-pkg_recordjavadoc 513 java-pkg_recordjavadoc
554} 514}
555 515
556# ------------------------------------------------------------------------------ 516# @FUNCTION: java-pkg_dojavadoc
557# @ebuild-function java-pkg_dojavadoc 517# @USAGE: [--symlink destination] <path/to/javadocs/root>
558# 518# @DESCRIPTION:
559# Installs javadoc documentation. This should be controlled by the doc use flag. 519# Installs javadoc documentation. This should be controlled by the doc use flag.
560# 520#
521# @CODE
522# Parameters:
523# $1: optional --symlink creates to symlink like this for html
524# documentation bundles.
561# @param $1: - The javadoc root directory. 525# $2: - The javadoc root directory.
562# 526#
563# @example: 527# Examples:
564# java-pkg_dojavadoc docs/api 528# java-pkg_dojavadoc docs/api
565# 529# java-pkg_dojavadoc --symlink apidocs docs/api
566# ------------------------------------------------------------------------------ 530# @CODE
567java-pkg_dojavadoc() { 531java-pkg_dojavadoc() {
568 debug-print-function ${FUNCNAME} $* 532 debug-print-function ${FUNCNAME} $*
533
534 # For html documentation bundles that link to Javadoc
535 local symlink
536 if [[ ${1} = --symlink ]]; then
537 symlink=${2}
538 shift 2
539 fi
540
569 local dir="$1" 541 local dir="$1"
542 local dest=/usr/share/doc/${PF}/html
570 543
571 # QA checks 544 # QA checks
572 545
573 java-pkg_check-phase install 546 java-pkg_check-phase install
547 java-pkg_init_paths_
574 548
575 [[ -z "${dir}" ]] && die "Must specify a directory!" 549 [[ -z "${dir}" ]] && die "Must specify a directory!"
576 [[ ! -d "${dir}" ]] && die "${dir} does not exist, or isn't a directory!" 550 [[ ! -d "${dir}" ]] && die "${dir} does not exist, or isn't a directory!"
577 if [[ ! -e "${dir}/index.html" ]]; then 551 if [[ ! -e "${dir}/index.html" ]]; then
578 local msg="No index.html in javadoc directory" 552 local msg="No index.html in javadoc directory"
579 ewarn "${msg}" 553 ewarn "${msg}"
580 is-java-strict && die "${msg}" 554 is-java-strict && die "${msg}"
581 fi 555 fi
582 556
557 if [[ -e ${D}/${dest}/api ]]; then
558 eerror "${dest} already exists. Will not overwrite."
559 die "${dest}"
560 fi
561
583 # Renaming to match our directory layout 562 # Renaming to match our directory layout
584 563
585 local dir_to_install="${dir}" 564 local dir_to_install="${dir}"
586 if [[ "$(basename "${dir}")" != "api" ]]; then 565 if [[ "$(basename "${dir}")" != "api" ]]; then
587 dir_to_install="${T}/api" 566 dir_to_install="${T}/api"
589 cp -r "${dir}" "${dir_to_install}" || die "cp failed" 568 cp -r "${dir}" "${dir_to_install}" || die "cp failed"
590 fi 569 fi
591 570
592 # Actual installation 571 # Actual installation
593 572
594 java-pkg_dohtml -r ${dir_to_install} 573 java-pkg_dohtml -r "${dir_to_install}"
595}
596 574
597# ------------------------------------------------------------------------------ 575 # Let's make a symlink to the directory we have everything else under
598# @ebuild-function java-pkg_dosrc 576 dosym ${dest}/api "${JAVA_PKG_SHAREPATH}/api" || die
599# 577
578 if [[ ${symlink} ]]; then
579 debug-print "symlinking ${dest}/{api,${symlink}}"
580 dosym ${dest}/{api,${symlink}} || die
581 fi
582}
583
584# @FUNCTION: java-pkg_dosrc
585# @USAGE: <path/to/sources> [...]
586# @DESCRIPTION:
600# Installs a zip containing the source for a package, so it can used in 587# Installs a zip containing the source for a package, so it can used in
601# from IDEs like eclipse and netbeans. 588# from IDEs like eclipse and netbeans.
589# Ebuild needs to DEPEND on app-arch/zip to use this. It also should be controlled by USE=source.
602# 590#
603# Ebuild needs to DEPEND on app-arch/zip to use this. 591# @CODE
604#
605# It also should be controlled by USE=source.
606#
607# @example: 592# Example:
608# java-pkg_dosrc src/* 593# java-pkg_dosrc src/*
609# 594# @CODE
610# ------------------------------------------------------------------------------ 595
611# TODO change so it the arguments it takes are the base directories containing 596# TODO change so it the arguments it takes are the base directories containing
612# source -nichoj 597# source -nichoj
598#
613# TODO should we be able to handle multiple calls to dosrc? -nichoj 599# TODO should we be able to handle multiple calls to dosrc? -nichoj
600#
614# TODO maybe we can take an existing zip/jar? -nichoj 601# TODO maybe we can take an existing zip/jar? -nichoj
602#
615# FIXME apparently this fails if you give it an empty directories 603# FIXME apparently this fails if you give it an empty directories
616java-pkg_dosrc() { 604java-pkg_dosrc() {
617 debug-print-function ${FUNCNAME} $* 605 debug-print-function ${FUNCNAME} $*
618 606
619 [ ${#} -lt 1 ] && die "At least one argument needed" 607 [ ${#} -lt 1 ] && die "At least one argument needed"
622 610
623 [[ ${#} -lt 1 ]] && die "At least one argument needed" 611 [[ ${#} -lt 1 ]] && die "At least one argument needed"
624 612
625 if ! [[ ${DEPEND} = *app-arch/zip* ]]; then 613 if ! [[ ${DEPEND} = *app-arch/zip* ]]; then
626 local msg="${FUNCNAME} called without app-arch/zip in DEPEND" 614 local msg="${FUNCNAME} called without app-arch/zip in DEPEND"
627 if is-java-strict; then 615 java-pkg_announce-qa-violation ${msg}
628 eerror "${msg}"
629 die "${msg}"
630 else
631 echo "${msg}"
632 echo "Please report this to http://bugs.gentoo.org."
633 fi
634 fi 616 fi
635 617
636 java-pkg_init_paths_ 618 java-pkg_init_paths_
637 619
638 local zip_name="${PN}-src.zip" 620 local zip_name="${PN}-src.zip"
657 639
658 JAVA_SOURCES="${JAVA_PKG_SOURCESPATH}/${zip_name}" 640 JAVA_SOURCES="${JAVA_PKG_SOURCESPATH}/${zip_name}"
659 java-pkg_do_write_ 641 java-pkg_do_write_
660} 642}
661 643
662# ------------------------------------------------------------------------------ 644# @FUNCTION: java-pkg_dolauncher
663# @ebuild-function java-pkg_dolauncher 645# @USAGE: <filename> [options]
664# 646# @DESCRIPTION:
665# Make a wrapper script to lauch/start this package 647# Make a wrapper script to lauch/start this package
666# If necessary, the wrapper will switch to the appropriate VM. 648# If necessary, the wrapper will switch to the appropriate VM.
667# 649#
668# Can be called without parameters if the package installs only one jar 650# Can be called without parameters if the package installs only one jar
669# that has the Main-class attribute set. The wrapper will be named ${PN}. 651# that has the Main-class attribute set. The wrapper will be named ${PN}.
670# 652#
653# @CODE
654# Parameters:
671# @param $1 - filename of launcher to create 655# $1 - filename of launcher to create
672# @param $2 - options, as follows: 656# $2 - options, as follows:
673# --main the.main.class.too.start 657# --main the.main.class.to.start
674# --jar /the/jar/too/launch.jar or just <name>.jar 658# --jar /the/jar/too/launch.jar or just <name>.jar
675# --java_args 'Extra arguments to pass to java' 659# --java_args 'Extra arguments to pass to java'
676# --pkg_args 'Extra arguments to pass to the package' 660# --pkg_args 'Extra arguments to pass to the package'
677# --pwd Directory the launcher changes to before executing java 661# --pwd Directory the launcher changes to before executing java
678# -into Directory to install the launcher to, instead of /usr/bin 662# -into Directory to install the launcher to, instead of /usr/bin
679# -pre Prepend contents of this file to the launcher 663# -pre Prepend contents of this file to the launcher
680# ------------------------------------------------------------------------------ 664# @CODE
681java-pkg_dolauncher() { 665java-pkg_dolauncher() {
682 debug-print-function ${FUNCNAME} $* 666 debug-print-function ${FUNCNAME} $*
683 667
684 java-pkg_check-phase install 668 java-pkg_check-phase install
685 java-pkg_init_paths_ 669 java-pkg_init_paths_
746 else 730 else
747 dobin "${target}" 731 dobin "${target}"
748 fi 732 fi
749} 733}
750 734
751# ------------------------------------------------------------------------------ 735# @FUNCTION: java-pkg_dowar
736# @DESCRIPTION:
752# Install war files. 737# Install war files.
753# TODO document 738# TODO document
754# ------------------------------------------------------------------------------
755java-pkg_dowar() { 739java-pkg_dowar() {
756 debug-print-function ${FUNCNAME} $* 740 debug-print-function ${FUNCNAME} $*
757 741
758 # Check for arguments 742 # Check for arguments
759 [[ ${#} -lt 1 ]] && die "At least one argument needed" 743 [[ ${#} -lt 1 ]] && die "At least one argument needed"
783 INSDESTTREE=${JAVA_PKG_WARDEST} \ 767 INSDESTTREE=${JAVA_PKG_WARDEST} \
784 doins ${warpath} 768 doins ${warpath}
785 done 769 done
786} 770}
787 771
788# ------------------------------------------------------------------------------ 772# @FUNCTION: java-pkg_recordjavadoc
789# @internal-function java-pkg_recordjavadoc 773# @INTERNAL
774# @DESCRIPTION:
790# Scan for JavaDocs, and record their existence in the package.env file 775# Scan for JavaDocs, and record their existence in the package.env file
791# 776
792# TODO make sure this in the proper section 777# TODO make sure this in the proper section
793# ------------------------------------------------------------------------------
794java-pkg_recordjavadoc() 778java-pkg_recordjavadoc()
795{ 779{
796 debug-print-function ${FUNCNAME} $* 780 debug-print-function ${FUNCNAME} $*
797 # the find statement is important 781 # the find statement is important
798 # as some packages include multiple trees of javadoc 782 # as some packages include multiple trees of javadoc
805 else 789 else
806 debug-print "No javadocs found" 790 debug-print "No javadocs found"
807 fi 791 fi
808} 792}
809 793
810# ------------------------------------------------------------------------------
811# @section-end install
812# ------------------------------------------------------------------------------
813 794
814# ------------------------------------------------------------------------------ 795# @FUNCTION: java-pkg_jar-from
815# @begin-section query 796# @USAGE: [--build-only] [--with-dependencies] [--virtual] [--into dir] <package> [<package.jar>] [<destination.jar>]
816# Use these to build the classpath for building a package. 797# @DESCRIPTION:
817# ------------------------------------------------------------------------------
818
819# ------------------------------------------------------------------------------
820# @ebuild-function java-pkg_jar-from
821#
822# Makes a symlink to a jar from a certain package 798# Makes a symlink to a jar from a certain package
823# A lot of java packages include dependencies in a lib/ directory 799# A lot of java packages include dependencies in a lib/ directory
824# You can use this function to replace these bundled dependencies. 800# You can use this function to replace these bundled dependencies.
825# The dependency is recorded into package.env DEPEND line, unless "--build-only" 801# The dependency is recorded into package.env DEPEND line, unless "--build-only"
826# is passed as the very first argument, for jars that have to be present only 802# is passed as the very first argument, for jars that have to be present only
827# at build time and are not needed on runtime (junit testing etc). 803# at build time and are not needed on runtime (junit testing etc).
828# 804#
805# @CODE
829# Example: get all jars from xerces slot 2 806# Example: get all jars from xerces slot 2
830# java-pkg_jar-from xerces-2 807# java-pkg_jar-from xerces-2
808#
831# Example: get a specific jar from xerces slot 2 809# Example: get a specific jar from xerces slot 2
832# java-pkg_jar-from xerces-2 xml-apis.jar 810# java-pkg_jar-from xerces-2 xml-apis.jar
811#
833# Example: get a specific jar from xerces slot 2, and name it diffrently 812# Example: get a specific jar from xerces slot 2, and name it diffrently
834# java-pkg_jar-from xerces-2 xml-apis.jar xml.jar 813# java-pkg_jar-from xerces-2 xml-apis.jar xml.jar
814#
835# Example: get junit.jar which is needed only for building 815# Example: get junit.jar which is needed only for building
836# java-pkg_jar-from --build-only junit junit.jar 816# java-pkg_jar-from --build-only junit junit.jar
817# @CODE
837# 818#
838# @param $opt 819# @CODE
820# Parameters
839# --build-only - makes the jar(s) not added into package.env DEPEND line. 821# --build-only - makes the jar(s) not added into package.env DEPEND line.
840# (assumed automatically when called inside src_test) 822# (assumed automatically when called inside src_test)
841# --with-dependencies - get jars also from requested package's dependencies 823# --with-dependencies - get jars also from requested package's dependencies
842# transitively. 824# transitively.
843# --virtual - Packages passed to this function are to be handled as virtuals 825# --virtual - Packages passed to this function are to be handled as virtuals
844# and will not have individual jar dependencies recorded. 826# and will not have individual jar dependencies recorded.
845# --into $dir - symlink jar(s) into $dir (must exist) instead of . 827# --into $dir - symlink jar(s) into $dir (must exist) instead of .
846# @param $1 - Package to get jars from, or comma-separated list of packages in 828# $1 - Package to get jars from, or comma-separated list of packages in
847# case other parameters are not used. 829# case other parameters are not used.
848# @param $2 - jar from package. If not specified, all jars will be used. 830# $2 - jar from package. If not specified, all jars will be used.
849# @param $3 - When a single jar is specified, destination filename of the 831# $3 - When a single jar is specified, destination filename of the
850# symlink. Defaults to the name of the jar. 832# symlink. Defaults to the name of the jar.
851# ------------------------------------------------------------------------------ 833# @CODE
834
852# TODO could probably be cleaned up a little 835# TODO could probably be cleaned up a little
853java-pkg_jar-from() { 836java-pkg_jar-from() {
854 debug-print-function ${FUNCNAME} $* 837 debug-print-function ${FUNCNAME} $*
855 838
856 local build_only="" 839 local build_only=""
857 local destdir="." 840 local destdir="."
858 local deep="" 841 local deep=""
859 local virtual="" 842 local virtual=""
843 local record_jar=""
860 844
861 [[ "${EBUILD_PHASE}" == "test" ]] && build_only="build" 845 [[ "${EBUILD_PHASE}" == "test" ]] && build_only="build"
862 846
863 while [[ "${1}" == --* ]]; do 847 while [[ "${1}" == --* ]]; do
864 if [[ "${1}" = "--build-only" ]]; then 848 if [[ "${1}" = "--build-only" ]]; then
878 862
879 local target_pkg="${1}" target_jar="${2}" destjar="${3}" 863 local target_pkg="${1}" target_jar="${2}" destjar="${3}"
880 864
881 [[ -z ${target_pkg} ]] && die "Must specify a package" 865 [[ -z ${target_pkg} ]] && die "Must specify a package"
882 866
867 if [[ "${EAPI}" == "1" ]]; then
868 target_pkg="${target_pkg//:/-}"
869 fi
870
883 # default destjar to the target jar 871 # default destjar to the target jar
884 [[ -z "${destjar}" ]] && destjar="${target_jar}" 872 [[ -z "${destjar}" ]] && destjar="${target_jar}"
885 873
886 local error_msg="There was a problem getting the classpath for ${target_pkg}." 874 local error_msg="There was a problem getting the classpath for ${target_pkg}."
887 local classpath 875 local classpath
895 for pkg in ${target_pkg//,/ }; do 883 for pkg in ${target_pkg//,/ }; do
896 java-pkg_ensure-dep "${build_only}" "${pkg}" 884 java-pkg_ensure-dep "${build_only}" "${pkg}"
897 [[ -z "${build_only}" ]] && java-pkg_record-jar_ "${pkg}" 885 [[ -z "${build_only}" ]] && java-pkg_record-jar_ "${pkg}"
898 done 886 done
899 # setting this disables further record-jar_ calls later 887 # setting this disables further record-jar_ calls later
900 build_only="build" 888 record_jar="true"
901 else 889 else
902 java-pkg_ensure-dep "${build_only}" "${target_pkg}" 890 java-pkg_ensure-dep "${build_only}" "${target_pkg}"
903 fi 891 fi
904 892
905 # Record the entire virtual as a dependency so that 893 # Record the entire virtual as a dependency so that
906 # no jars are missed. 894 # no jars are missed.
907 if [[ -z "${build_only}" && -n "${virtual}" ]]; then 895 if [[ -z "${build_only}" && -n "${virtual}" ]]; then
908 java-pkg_record-jar_ "${target_pkg}" 896 java-pkg_record-jar_ "${target_pkg}"
909 # setting this disables further record-jars_ calls later 897 # setting this disables further record-jars_ calls later
910 build_only="build" 898 record_jar="true"
911 fi 899 fi
912 900
913 pushd ${destdir} > /dev/null \ 901 pushd ${destdir} > /dev/null \
914 || die "failed to change directory to ${destdir}" 902 || die "failed to change directory to ${destdir}"
915 903
923 # If no specific target jar was indicated, link it 911 # If no specific target jar was indicated, link it
924 if [[ -z "${target_jar}" ]] ; then 912 if [[ -z "${target_jar}" ]] ; then
925 [[ -f "${target_jar}" ]] && rm "${target_jar}" 913 [[ -f "${target_jar}" ]] && rm "${target_jar}"
926 ln -snf "${jar}" \ 914 ln -snf "${jar}" \
927 || die "Failed to make symlink from ${jar} to ${jar_name}" 915 || die "Failed to make symlink from ${jar} to ${jar_name}"
916 if [[ -z "${record_jar}" ]]; then
917 if [[ -z "${build_only}" ]]; then
928 [[ -z "${build_only}" ]] && java-pkg_record-jar_ "${target_pkg}" "${jar}" 918 java-pkg_record-jar_ "${target_pkg}" "${jar}"
919 else
920 java-pkg_record-jar_ --build-only "${target_pkg}" "${jar}"
921 fi
922 fi
929 # otherwise, if the current jar is the target jar, link it 923 # otherwise, if the current jar is the target jar, link it
930 elif [[ "${jar_name}" == "${target_jar}" ]] ; then 924 elif [[ "${jar_name}" == "${target_jar}" ]] ; then
931 [[ -f "${destjar}" ]] && rm "${destjar}" 925 [[ -f "${destjar}" ]] && rm "${destjar}"
932 ln -snf "${jar}" "${destjar}" \ 926 ln -snf "${jar}" "${destjar}" \
933 || die "Failed to make symlink from ${jar} to ${destjar}" 927 || die "Failed to make symlink from ${jar} to ${destjar}"
928 if [[ -z "${record_jar}" ]]; then
929 if [[ -z "${build_only}" ]]; then
934 [[ -z "${build_only}" ]] && java-pkg_record-jar_ "${target_pkg}" "${jar}" 930 java-pkg_record-jar_ "${target_pkg}" "${jar}"
931 else
932 java-pkg_record-jar_ --build-only "${target_jar}" "${jar}"
933 fi
934 fi
935 popd > /dev/null 935 popd > /dev/null
936 return 0 936 return 0
937 fi 937 fi
938 done 938 done
939 popd > /dev/null 939 popd > /dev/null
944 else 944 else
945 die "Failed to find ${target_jar:-jar} in ${target_pkg}" 945 die "Failed to find ${target_jar:-jar} in ${target_pkg}"
946 fi 946 fi
947} 947}
948 948
949# ------------------------------------------------------------------------------ 949# @FUNCTION: java-pkg_jarfrom
950# @ebuild-function java-pkg_jarfrom 950# @DESCRIPTION:
951#
952# See java-pkg_jar-from 951# See java-pkg_jar-from
953# ------------------------------------------------------------------------------
954java-pkg_jarfrom() { 952java-pkg_jarfrom() {
955 java-pkg_jar-from "$@" 953 java-pkg_jar-from "$@"
956} 954}
957 955
958# ------------------------------------------------------------------------------ 956# @FUNCTION: java-pkg_getjars
959# @ebuild-function java-pkg_getjars 957# @USAGE: [--build-only] [--with-dependencies] <package1>[,<package2>...]
960# 958# @DESCRIPTION:
961# Get the classpath provided by any number of packages 959# Get the classpath provided by any number of packages
962# Among other things, this can be passed to 'javac -classpath' or 'ant -lib'. 960# Among other things, this can be passed to 'javac -classpath' or 'ant -lib'.
963# The providing packages are recorded as dependencies into package.env DEPEND 961# The providing packages are recorded as dependencies into package.env DEPEND
964# line, unless "--build-only" is passed as the very first argument, for jars 962# line, unless "--build-only" is passed as the very first argument, for jars
965# that have to be present only at build time and are not needed on runtime 963# that have to be present only at build time and are not needed on runtime
966# (junit testing etc). 964# (junit testing etc).
967# 965#
966# @CODE
968# Example: Get the classpath for xerces-2 and xalan, 967# Example: Get the classpath for xerces-2 and xalan,
969# java-pkg_getjars xerces-2,xalan 968# java-pkg_getjars xerces-2,xalan
969#
970# Example Return: 970# Example Return:
971# /usr/share/xerces-2/lib/xml-apis.jar:/usr/share/xerces-2/lib/xmlParserAPIs.jar:/usr/share/xalan/lib/xalan.jar 971# /usr/share/xerces-2/lib/xml-apis.jar:/usr/share/xerces-2/lib/xmlParserAPIs.jar:/usr/share/xalan/lib/xalan.jar
972# 972#
973# @param $opt 973#
974# Parameters:
974# --build-only - makes the jar(s) not added into package.env DEPEND line. 975# --build-only - makes the jar(s) not added into package.env DEPEND line.
975# (assumed automatically when called inside src_test) 976# (assumed automatically when called inside src_test)
976# --with-dependencies - get jars also from requested package's dependencies 977# --with-dependencies - get jars also from requested package's dependencies
977# transitively. 978# transitively.
978# @param $1 - list of packages to get jars from 979# $1 - list of packages to get jars from
979# (passed to java-config --classpath) 980# (passed to java-config --classpath)
980# ------------------------------------------------------------------------------ 981# @CODE
981java-pkg_getjars() { 982java-pkg_getjars() {
982 debug-print-function ${FUNCNAME} $* 983 debug-print-function ${FUNCNAME} $*
983 984
984 local build_only="" 985 local build_only=""
985 local deep="" 986 local deep=""
998 done 999 done
999 1000
1000 [[ ${#} -ne 1 ]] && die "${FUNCNAME} takes only one argument besides --*" 1001 [[ ${#} -ne 1 ]] && die "${FUNCNAME} takes only one argument besides --*"
1001 1002
1002 1003
1003 local classpath pkgs="${1}" 1004 local pkgs="${1}"
1005
1006 if [[ "${EAPI}" == "1" ]]; then
1007 pkgs="${pkgs//:/-}"
1008 fi
1009
1004 jars="$(java-config ${deep} --classpath=${pkgs})" 1010 jars="$(java-config ${deep} --classpath=${pkgs})"
1005 [[ $? != 0 || -z "${jars}" ]] && die "java-config --classpath=${pkgs} failed" 1011 [[ $? != 0 ]] && die "java-config --classpath=${pkgs} failed"
1006 debug-print "${pkgs}:${jars}" 1012 debug-print "${pkgs}:${jars}"
1007 1013
1008 for pkg in ${pkgs//,/ }; do 1014 for pkg in ${pkgs//,/ }; do
1009 java-pkg_ensure-dep "${build_only}" "${pkg}" 1015 java-pkg_ensure-dep "${build_only}" "${pkg}"
1010 done 1016 done
1011 1017
1012 if [[ -z "${classpath}" ]]; then 1018 for pkg in ${pkgs//,/ }; do
1013 classpath="${jars}"
1014 else
1015 classpath="${classpath}:${jars}"
1016 fi
1017
1018 # Only record jars that aren't build-only
1019 if [[ -z "${build_only}" ]]; then 1019 if [[ -z "${build_only}" ]]; then
1020 for pkg in ${pkgs//,/ }; do
1021 java-pkg_record-jar_ "${pkg}" 1020 java-pkg_record-jar_ "${pkg}"
1021 else
1022 java-pkg_record-jar_ --build-only "${pkg}"
1023 fi
1022 done 1024 done
1023 fi
1024 1025
1025 echo "${classpath}" 1026 echo "${jars}"
1026} 1027}
1027 1028
1028# ------------------------------------------------------------------------------ 1029# @FUNCTION: java-pkg_getjar
1029# @ebuild-function java-pkg_getjar 1030# @USAGE: [--build-only] [--virtual] <package> <jarfile>
1030# 1031# @DESCRIPTION:
1031# Get the filename of a single jar from a package 1032# Get the complete path of a single jar from a package
1032# The providing package is recorded as runtime dependency into package.env 1033# The providing package is recorded as runtime dependency into package.env
1033# DEPEND line, unless "--build-only" is passed as the very first argument, for 1034# DEPEND line, unless "--build-only" is passed as the very first argument, for
1034# jars that have to be present only at build time and are not needed on runtime 1035# jars that have to be present only at build time and are not needed on runtime
1035# (junit testing etc). 1036# (junit testing etc).
1036# 1037#
1038# @CODE
1037# @example 1039# Example:
1038# java-pkg_getjar xerces-2 xml-apis.jar 1040# java-pkg_getjar xerces-2 xml-apis.jar
1039# @example-return 1041# returns
1040# /usr/share/xerces-2/lib/xml-apis.jar 1042# /usr/share/xerces-2/lib/xml-apis.jar
1041# 1043#
1042# @param $opt 1044# Parameters:
1043# --build-only - makes the jar not added into package.env DEPEND line. 1045# --build-only - makes the jar not added into package.env DEPEND line.
1044# --virtual - Packages passed to this function are to be handled as virtuals 1046# --virtual - Packages passed to this function are to be handled as virtuals
1045# and will not have individual jar dependencies recorded. 1047# and will not have individual jar dependencies recorded.
1046# @param $1 - package to use 1048# $1 - package to use
1047# @param $2 - jar to get 1049# $2 - jar to get
1048# ------------------------------------------------------------------------------ 1050# @CODE
1049java-pkg_getjar() { 1051java-pkg_getjar() {
1050 debug-print-function ${FUNCNAME} $* 1052 debug-print-function ${FUNCNAME} $*
1051 1053
1052 local build_only="" 1054 local build_only=""
1053 local virtual="" 1055 local virtual=""
1056 local record_jar=""
1054 1057
1055 [[ "${EBUILD_PHASE}" == "test" ]] && build_only="build" 1058 [[ "${EBUILD_PHASE}" == "test" ]] && build_only="build"
1056 1059
1057 while [[ "${1}" == --* ]]; do 1060 while [[ "${1}" == --* ]]; do
1058 if [[ "${1}" = "--build-only" ]]; then 1061 if [[ "${1}" = "--build-only" ]]; then
1059 build_only="build" 1062 build_only="build"
1060 elif [[ "${1}" == --* ]]; then 1063 elif [[ "${1}" == "--virtual" ]]; then
1061 virtual="true" 1064 virtual="true"
1062 else 1065 else
1063 die "java-pkg_jar-from called with unknown parameter: ${1}" 1066 die "java-pkg_getjar called with unknown parameter: ${1}"
1064 fi 1067 fi
1065 shift 1068 shift
1066 done 1069 done
1067 1070
1068 [[ ${#} -ne 2 ]] && die "${FUNCNAME} takes only two arguments besides --*" 1071 [[ ${#} -ne 2 ]] && die "${FUNCNAME} takes only two arguments besides --*"
1069 1072
1070 local pkg="${1}" target_jar="${2}" jar 1073 local pkg="${1}" target_jar="${2}" jar
1074
1075 if [[ "${EAPI}" == "1" ]]; then
1076 pkg="${pkg//:/-}"
1077 fi
1078
1071 [[ -z ${pkg} ]] && die "Must specify package to get a jar from" 1079 [[ -z ${pkg} ]] && die "Must specify package to get a jar from"
1072 [[ -z ${target_jar} ]] && die "Must specify jar to get" 1080 [[ -z ${target_jar} ]] && die "Must specify jar to get"
1073 1081
1074 local error_msg="Could not find classpath for ${pkg}. Are you sure its installed?" 1082 local error_msg="Could not find classpath for ${pkg}. Are you sure its installed?"
1075 local classpath 1083 local classpath
1079 java-pkg_ensure-dep "${build_only}" "${pkg}" 1087 java-pkg_ensure-dep "${build_only}" "${pkg}"
1080 1088
1081 # Record the package(Virtual) as a dependency and then set build_only 1089 # Record the package(Virtual) as a dependency and then set build_only
1082 # So that individual jars are not recorded. 1090 # So that individual jars are not recorded.
1083 if [[ -n "${virtual}" ]]; then 1091 if [[ -n "${virtual}" ]]; then
1092 if [[ -z "${build_only}" ]]; then
1084 java-pkg_record-jar_ "${pkg}" 1093 java-pkg_record-jar_ "${pkg}"
1085 build_only="true" 1094 else
1095 java-pkg_record-jar_ --build-only "${pkg}"
1096 fi
1097 record_jar="true"
1086 fi 1098 fi
1087 1099
1088 for jar in ${classpath//:/ }; do 1100 for jar in ${classpath//:/ }; do
1089 if [[ ! -f "${jar}" ]] ; then 1101 if [[ ! -f "${jar}" ]] ; then
1090 die "Installation problem with jar ${jar} in ${pkg} - is it installed?" 1102 die "Installation problem with jar ${jar} in ${pkg} - is it installed?"
1091 fi 1103 fi
1092 1104
1093 if [[ "$(basename ${jar})" == "${target_jar}" ]] ; then 1105 if [[ "$(basename ${jar})" == "${target_jar}" ]] ; then
1094 # Only record jars that aren't build-only 1106 # Only record jars that aren't build-only
1095 [[ -z "${build_only}" ]] && java-pkg_record-jar_ "${pkg}" "${jar}" 1107 if [[ -z "${record_jar}" ]]; then
1108 if [[ -z "${build_only}" ]]; then
1109 java-pkg_record-jar_ "${pkg}" "${jar}"
1110 else
1111 java-pkg_record-jar_ --build-only "${pkg}" "${jar}"
1112 fi
1113 fi
1096 echo "${jar}" 1114 echo "${jar}"
1097 return 0 1115 return 0
1098 fi 1116 fi
1099 done 1117 done
1100 1118
1101 die "Could not find ${target_jar} in ${pkg}" 1119 die "Could not find ${target_jar} in ${pkg}"
1102 return 1 1120 return 1
1103} 1121}
1104 1122
1105# ------------------------------------------------------------------------------ 1123# @FUNCTION: java-pkg_register-dependency
1106# @ebuild-function java-pkg_register-dependency 1124# @USAGE: <package>[,<package2>...] [<jarfile>]
1107# 1125# @DESCRIPTION:
1108# Registers runtime dependency on a package, list of packages, or a single jar 1126# Registers runtime dependency on a package, list of packages, or a single jar
1109# from a package, into package.env DEPEND line. Can only be called in 1127# from a package, into package.env DEPEND line. Can only be called in
1110# src_install phase. 1128# src_install phase.
1111# Intended for binary packages where you don't need to symlink the jars or get 1129# Intended for binary packages where you don't need to symlink the jars or get
1112# their classpath during build. As such, the dependencies only need to be 1130# their classpath during build. As such, the dependencies only need to be
1113# specified in ebuild's RDEPEND, and should be omitted in DEPEND. 1131# specified in ebuild's RDEPEND, and should be omitted in DEPEND.
1114# 1132#
1133# @CODE
1134# Parameters:
1115# @param $1 - comma-separated list of packages, or a single package 1135# $1 - comma-separated list of packages, or a single package
1116# @param $2 - if param $1 is a single package, optionally specify the jar 1136# $2 - if param $1 is a single package, optionally specify the jar
1117# to depend on 1137# to depend on
1118# 1138#
1139# Examples:
1119# Example: Record the dependency on whole xerces-2 and xalan, 1140# Record the dependency on whole xerces-2 and xalan,
1120# java-pkg_register-dependency xerces-2,xalan 1141# java-pkg_register-dependency xerces-2,xalan
1142#
1121# Example: Record the dependency on ant.jar from ant-core 1143# Record the dependency on ant.jar from ant-core
1122# java-pkg_register-dependency ant-core ant.jar 1144# java-pkg_register-dependency ant-core ant.jar
1145# @CODE
1123# 1146#
1124# Note: Passing both list of packages as the first parameter AND specifying the 1147# Note: Passing both list of packages as the first parameter AND specifying the
1125# jar as the second is not allowed and will cause the function to die. We assume 1148# jar as the second is not allowed and will cause the function to die. We assume
1126# that there's more chance one passes such combination as a mistake, than that 1149# that there's more chance one passes such combination as a mistake, than that
1127# there are more packages providing identically named jar without class 1150# there are more packages providing identically named jar without class
1128# collisions. 1151# collisions.
1129# ------------------------------------------------------------------------------
1130java-pkg_register-dependency() { 1152java-pkg_register-dependency() {
1131 debug-print-function ${FUNCNAME} $* 1153 debug-print-function ${FUNCNAME} $*
1132 1154
1133 java-pkg_check-phase install 1155 java-pkg_check-phase install
1134 1156
1136 1158
1137 local pkgs="${1}" 1159 local pkgs="${1}"
1138 local jar="${2}" 1160 local jar="${2}"
1139 1161
1140 [[ -z "${pkgs}" ]] && die "${FUNCNAME} called with no package(s) specified" 1162 [[ -z "${pkgs}" ]] && die "${FUNCNAME} called with no package(s) specified"
1163
1164 if [[ "${EAPI}" == "1" ]]; then
1165 pkgs="${pkgs//:/-}"
1166 fi
1141 1167
1142 if [[ -z "${jar}" ]]; then 1168 if [[ -z "${jar}" ]]; then
1143 for pkg in ${pkgs//,/ }; do 1169 for pkg in ${pkgs//,/ }; do
1144 java-pkg_ensure-dep runtime "${pkg}" 1170 java-pkg_ensure-dep runtime "${pkg}"
1145 java-pkg_record-jar_ "${pkg}" 1171 java-pkg_record-jar_ "${pkg}"
1152 fi 1178 fi
1153 1179
1154 java-pkg_do_write_ 1180 java-pkg_do_write_
1155} 1181}
1156 1182
1157# ------------------------------------------------------------------------------
1158# @ebuild-function java-pkg_register-optional-dependency 1183# @FUNCTION: java-pkg_register-optional-dependency
1159# 1184# @USAGE: <package>[,<package2>...] [<jarfile>]
1185# @DESCRIPTION:
1160# Registers optional runtime dependency on a package, list of packages, or a 1186# Registers optional runtime dependency on a package, list of packages, or a
1161# single jar from a package, into package.env OPTIONAL_DEPEND line. Can only be 1187# single jar from a package, into package.env OPTIONAL_DEPEND line. Can only be
1162# called in src_install phase. 1188# called in src_install phase.
1163# Intended for packages that can use other packages when those are in classpath. 1189# Intended for packages that can use other packages when those are in classpath.
1164# Will be put on classpath by launcher if they are installed. Typical case is 1190# Will be put on classpath by launcher if they are installed. Typical case is
1165# JDBC implementations for various databases. It's better than having USE flag 1191# JDBC implementations for various databases. It's better than having USE flag
1166# for each implementation triggering hard dependency. 1192# for each implementation triggering hard dependency.
1167# 1193#
1194# @CODE
1195# Parameters:
1168# @param $1 - comma-separated list of packages, or a single package 1196# $1 - comma-separated list of packages, or a single package
1169# @param $2 - if param $1 is a single package, optionally specify the jar 1197# $2 - if param $1 is a single package, optionally specify the jar to depend on
1170# to depend on
1171# 1198#
1199# Example:
1172# Example: Record the optional dependency on some jdbc providers 1200# Record the optional dependency on some jdbc providers
1173# java-pkg_register-optional-dependency jdbc-jaybird,jtds-1.2,jdbc-mysql 1201# java-pkg_register-optional-dependency jdbc-jaybird,jtds-1.2,jdbc-mysql
1202# @CODE
1174# 1203#
1175# Note: Passing both list of packages as the first parameter AND specifying the 1204# Note: Passing both list of packages as the first parameter AND specifying the
1176# jar as the second is not allowed and will cause the function to die. We assume 1205# jar as the second is not allowed and will cause the function to die. We assume
1177# that there's more chance one passes such combination as a mistake, than that 1206# that there's more chance one passes such combination as a mistake, than that
1178# there are more packages providing identically named jar without class 1207# there are more packages providing identically named jar without class
1179# collisions. 1208# collisions.
1180# ------------------------------------------------------------------------------
1181java-pkg_register-optional-dependency() { 1209java-pkg_register-optional-dependency() {
1182 debug-print-function ${FUNCNAME} $* 1210 debug-print-function ${FUNCNAME} $*
1183 1211
1184 java-pkg_check-phase install 1212 java-pkg_check-phase install
1185 1213
1187 1215
1188 local pkgs="${1}" 1216 local pkgs="${1}"
1189 local jar="${2}" 1217 local jar="${2}"
1190 1218
1191 [[ -z "${pkgs}" ]] && die "${FUNCNAME} called with no package(s) specified" 1219 [[ -z "${pkgs}" ]] && die "${FUNCNAME} called with no package(s) specified"
1220
1221 if [[ "${EAPI}" == "1" ]]; then
1222 pkgs="${pkgs//:/-}"
1223 fi
1192 1224
1193 if [[ -z "${jar}" ]]; then 1225 if [[ -z "${jar}" ]]; then
1194 for pkg in ${pkgs//,/ }; do 1226 for pkg in ${pkgs//,/ }; do
1195 java-pkg_record-jar_ --optional "${pkg}" 1227 java-pkg_record-jar_ --optional "${pkg}"
1196 done 1228 done
1201 fi 1233 fi
1202 1234
1203 java-pkg_do_write_ 1235 java-pkg_do_write_
1204} 1236}
1205 1237
1206# ------------------------------------------------------------------------------
1207# @ebuild-function java-pkg_register-environment-variable 1238# @FUNCTION: java-pkg_register-environment-variable
1208# 1239# @USAGE: <name> <value>
1240# @DESCRIPTION:
1209# Register an arbitrary environment variable into package.env. The gjl launcher 1241# Register an arbitrary environment variable into package.env. The gjl launcher
1210# for this package or any package depending on this will export it into 1242# for this package or any package depending on this will export it into
1211# environement before executing java command. 1243# environement before executing java command.
1212# Must only be called in src_install phase. 1244# Must only be called in src_install phase.
1213#
1214# @param $1 - variable name
1215# @param $2 - variable value
1216# ------------------------------------------------------------------------------
1217JAVA_PKG_EXTRA_ENV="${T}/java-pkg-extra-env" 1245JAVA_PKG_EXTRA_ENV="${T}/java-pkg-extra-env"
1218JAVA_PKG_EXTRA_ENV_VARS="" 1246JAVA_PKG_EXTRA_ENV_VARS=""
1219java-pkg_register-environment-variable() { 1247java-pkg_register-environment-variable() {
1220 debug-print-function ${FUNCNAME} $* 1248 debug-print-function ${FUNCNAME} $*
1221 1249
1226 echo "${1}=\"${2}\"" >> ${JAVA_PKG_EXTRA_ENV} 1254 echo "${1}=\"${2}\"" >> ${JAVA_PKG_EXTRA_ENV}
1227 JAVA_PKG_EXTRA_ENV_VARS="${JAVA_PKG_EXTRA_ENV_VARS} ${1}" 1255 JAVA_PKG_EXTRA_ENV_VARS="${JAVA_PKG_EXTRA_ENV_VARS} ${1}"
1228 1256
1229 java-pkg_do_write_ 1257 java-pkg_do_write_
1230} 1258}
1259
1260# @FUNCTION: java-pkg_get-bootclasspath
1261# @USAGE: <version>
1262# @DESCRIPTION:
1263# Returns classpath of a given bootclasspath-providing package version.
1264#
1265# @param $1 - the version of bootclasspath (e.g. 1.5), 'auto' for bootclasspath
1266# of the current JDK
1267java-pkg_get-bootclasspath() {
1268 local version="${1}"
1269
1270 local bcp
1271 case "${version}" in
1272 auto)
1273 bcp="$(java-config -g BOOTCLASSPATH)"
1274 ;;
1275 1.5)
1276 bcp="$(java-pkg_getjars --build-only gnu-classpath-0.98)"
1277 ;;
1278 *)
1279 eerror "unknown parameter of java-pkg_get-bootclasspath"
1280 die "unknown parameter of java-pkg_get-bootclasspath"
1281 ;;
1282 esac
1283
1284 echo "${bcp}"
1285}
1286
1231 1287
1232# This function reads stdin, and based on that input, figures out how to 1288# This function reads stdin, and based on that input, figures out how to
1233# populate jars from the filesystem. 1289# populate jars from the filesystem.
1234# Need to figure out a good way of making use of this, ie be able to use a 1290# Need to figure out a good way of making use of this, ie be able to use a
1235# string that was built instead of stdin 1291# string that was built instead of stdin
1263# 1319#
1264# read line 1320# read line
1265# done 1321# done
1266#} 1322#}
1267 1323
1268# ------------------------------------------------------------------------------ 1324# @FUNCTION: java-pkg_find-normal-jars
1269# @section-end query 1325# @USAGE: [<path/to/directory>]
1270# ------------------------------------------------------------------------------ 1326# @DESCRIPTION:
1271
1272# ------------------------------------------------------------------------------
1273# @section-begin helper
1274# @section-summary Helper functions
1275#
1276# Various other functions to use from an ebuild
1277# ------------------------------------------------------------------------------
1278
1279# ------------------------------------------------------------------------------
1280# @ebuild-function java-pkg_need
1281#
1282# Adds virtual dependencies, which can optionally be controlled by a USE flag.
1283# Currently supported virtuals are:
1284# javamail
1285# jdbc-stdext
1286# jaf
1287# jdbc-rowset
1288# jms
1289#
1290# @param $1 - Optionally indicate that the dependencies are controlled by
1291# a use flag by specifying '--use' Requires $2.
1292# @param $2 - USE flag which will enable the dependencies.
1293# @param $@ - virtual packages to add depenedencies for
1294# ------------------------------------------------------------------------------
1295# TODO rewrite to parse a line based declaration file instead -- karltk
1296#java-pkg_need() {
1297# debug-print-function ${FUNCNAME} $*
1298# local useflag
1299# if [[ ${1} == "--use" ]]; then
1300# useflag="${2}"
1301# shift 2
1302# fi
1303#
1304# if [[ -z ${1} ]]; then
1305# die "Must specify at least one virtual package."
1306# fi
1307#
1308# local depstr newdepstr
1309#
1310# for virtual in ${@}; do
1311# if has ${virtual} ${JAVA_PKG_VNEED}; then
1312# debug-print "Already registered virtual ${virtual}"
1313# continue
1314# fi
1315# case ${virtual} in
1316# javamail)
1317# debug-print "java-pkg_need: adding javamail dependencies"
1318# newdepstr="|| ( dev-java/gnu-javamail dev-java/sun-javamail-bin )"
1319# ;;
1320# jdbc-stdext)
1321# debug-print "java-pkg_need: adding jdbc-stdext dependencies"
1322# newdepstr="|| ( >=virtual/jdk-1.4 dev-java/jdbc2-stdext )"
1323# ;;
1324# jaf)
1325# debug-print "java-pkg_need: adding jaf dependencies"
1326# newdepstr="|| ( dev-java/gnu-jaf dev-java/sun-jaf-bin )"
1327# ;;
1328# jdbc-rowset)
1329# debug-print "java-pkg_need: adding jdbc-rowset dependencies"
1330# newdepstr="|| ( >=virtual/jdk-1.5 dev-java/sun-jdbc-rowset )"
1331# ;;
1332# jms)
1333# debug-print "java-pkg_need: adding jms dependencies"
1334# newdepstr="|| ( dev-java/sun-jms dev-java/openjms )"
1335# ;;
1336# *)
1337# die "Invalid virtual: ${virtual}"
1338# esac
1339#
1340# export JAVA_PKG_VNEED="${JAVA_PKG_VNEED} ${virtual}"
1341#
1342# if [[ -n ${useflag} ]]; then
1343# depstr="${depstr} ${useflag}? ( ${newdepstr} )"
1344# else
1345# depstr="${depstr} ${newdepstr}"
1346# fi
1347# done
1348#
1349# [[ -z ${JAVA_PKG_NV_DEPEND} ]] && export JAVA_PKG_NV_DEPEND="${DEPEND}"
1350# [[ -z ${JAVA_PKG_NV_RDEPEND} ]] && export JAVA_PKG_NV_RDEPEND="${RDEPEND}"
1351#
1352# export DEPEND="${DEPEND} ${depstr}"
1353# export RDEPEND="${RDEPEND} ${depstr}"
1354#}
1355
1356# ------------------------------------------------------------------------------
1357# @ebuild-function java-pkg_find-normal-jars
1358#
1359# Find the files with suffix .jar file in the given directory or $WORKDIR 1327# Find the files with suffix .jar file in the given directory (default: $WORKDIR)
1360#
1361# @param $1 - The directory to search for jar files (default: ${WORKDIR})
1362# ------------------------------------------------------------------------------
1363java-pkg_find-normal-jars() { 1328java-pkg_find-normal-jars() {
1364 local dir=$1 1329 local dir=$1
1365 [[ "${dir}" ]] || dir="${WORKDIR}" 1330 [[ "${dir}" ]] || dir="${WORKDIR}"
1366 local found 1331 local found
1367 for jar in $(find "${dir}" -name "*.jar" -type f); do 1332 for jar in $(find "${dir}" -name "*.jar" -type f); do
1370 done 1335 done
1371 [[ "${found}" ]] 1336 [[ "${found}" ]]
1372 return $? 1337 return $?
1373} 1338}
1374 1339
1375# ------------------------------------------------------------------------------ 1340# @FUNCTION: java-pkg_ensure-no-bundled-jars
1376# @ebuild-function java-pkg_ensure-no-bundled-jars 1341# @DESCRIPTION:
1377#
1378# Try to locate bundled jar files in ${WORKDIR} and die if found. 1342# Try to locate bundled jar files in ${WORKDIR} and die if found.
1379# This function should be called after WORKDIR has been populated with symlink 1343# This function should be called after WORKDIR has been populated with symlink
1380# to system jar files or bundled jars removed. 1344# to system jar files or bundled jars removed.
1381# ------------------------------------------------------------------------------
1382java-pkg_ensure-no-bundled-jars() { 1345java-pkg_ensure-no-bundled-jars() {
1383 debug-print-function ${FUNCNAME} $* 1346 debug-print-function ${FUNCNAME} $*
1384 1347
1385 local bundled_jars=$(java-pkg_find-normal-jars) 1348 local bundled_jars=$(java-pkg_find-normal-jars)
1386 if [[ -n ${bundled_jars} ]]; then 1349 if [[ -n ${bundled_jars} ]]; then
1391 done 1354 done
1392 die "Bundled jars found!" 1355 die "Bundled jars found!"
1393 fi 1356 fi
1394} 1357}
1395 1358
1396# ------------------------------------------------------------------------------
1397# @internal-function java-pkg_ensure-vm-version-sufficient 1359# @FUNCTION: java-pkg_ensure-vm-version-sufficient
1398# 1360# @INTERNAL
1361# @DESCRIPTION:
1399# Checks if we have a sufficient VM and dies if we don't. 1362# Checks if we have a sufficient VM and dies if we don't.
1400#
1401# ------------------------------------------------------------------------------
1402java-pkg_ensure-vm-version-sufficient() { 1363java-pkg_ensure-vm-version-sufficient() {
1403 debug-print-function ${FUNCNAME} $* 1364 debug-print-function ${FUNCNAME} $*
1404 1365
1405 if ! java-pkg_is-vm-version-sufficient; then 1366 if ! java-pkg_is-vm-version-sufficient; then
1406 debug-print "VM is not suffient" 1367 debug-print "VM is not suffient"
1408 einfo "Please use java-config -S to set the correct one" 1369 einfo "Please use java-config -S to set the correct one"
1409 die "Active Java VM cannot build this package" 1370 die "Active Java VM cannot build this package"
1410 fi 1371 fi
1411} 1372}
1412 1373
1413# ------------------------------------------------------------------------------ 1374# @FUNCTION: java-pkg_is-vm-version-sufficient
1414# @internal-function java-pkg_is-vm-version-sufficient 1375# @INTERNAL
1415# 1376# @DESCRIPTION:
1416# @return zero - VM is sufficient 1377# @RETURN: zero - VM is sufficient; non-zero - VM is not sufficient
1417# @return non-zero - VM is not sufficient
1418# ------------------------------------------------------------------------------
1419java-pkg_is-vm-version-sufficient() { 1378java-pkg_is-vm-version-sufficient() {
1420 debug-print-function ${FUNCNAME} $* 1379 debug-print-function ${FUNCNAME} $*
1421 1380
1422 depend-java-query --is-sufficient "${DEPEND}" > /dev/null 1381 depend-java-query --is-sufficient "${DEPEND}" > /dev/null
1423 return $? 1382 return $?
1424} 1383}
1425 1384
1426# ------------------------------------------------------------------------------ 1385# @FUNCTION: java-pkg_ensure-vm-version-eq
1427# @internal-function java-pkg_ensure-vm-version-eq 1386# @INTERNAL
1428# 1387# @DESCRIPTION:
1429# Die if the current VM is not equal to the argument passed. 1388# Die if the current VM is not equal to the argument passed.
1430# 1389#
1431# @param $@ - Desired VM version to ensure 1390# @param $@ - Desired VM version to ensure
1432# ------------------------------------------------------------------------------
1433java-pkg_ensure-vm-version-eq() { 1391java-pkg_ensure-vm-version-eq() {
1434 debug-print-function ${FUNCNAME} $* 1392 debug-print-function ${FUNCNAME} $*
1435 1393
1436 if ! java-pkg_is-vm-version-eq $@ ; then 1394 if ! java-pkg_is-vm-version-eq $@ ; then
1437 debug-print "VM is not suffient" 1395 debug-print "VM is not suffient"
1439 einfo "Please use java-config -S to set the correct one" 1397 einfo "Please use java-config -S to set the correct one"
1440 die "Active Java VM too old" 1398 die "Active Java VM too old"
1441 fi 1399 fi
1442} 1400}
1443 1401
1444# ------------------------------------------------------------------------------ 1402# @FUNCTION: java-pkg_is-vm-version-eq
1445# @internal-function java-pkg_is-vm-version-eq 1403# @USAGE: <version>
1446# 1404# @INTERNAL
1447# @param $@ - VM version to compare current VM to 1405# @RETURN: zero - VM versions are equal; non-zero - VM version are not equal
1448# @return zero - VM versions are equal
1449# @return non-zero - VM version are not equal
1450# ------------------------------------------------------------------------------
1451java-pkg_is-vm-version-eq() { 1406java-pkg_is-vm-version-eq() {
1452 debug-print-function ${FUNCNAME} $* 1407 debug-print-function ${FUNCNAME} $*
1453 1408
1454 local needed_version="$@" 1409 local needed_version="$@"
1455 1410
1472 return 1 1427 return 1
1473 fi 1428 fi
1474 fi 1429 fi
1475} 1430}
1476 1431
1477# ------------------------------------------------------------------------------ 1432# @FUNCTION: java-pkg_ensure-vm-version-ge
1478# @internal-function java-pkg_ensure-vm-version-ge 1433# @INTERNAL
1479# 1434# @DESCRIPTION:
1480# Die if the current VM is not greater than the desired version 1435# Die if the current VM is not greater than the desired version
1481# 1436#
1482# @param $@ - VM version to compare current to 1437# @param $@ - VM version to compare current to
1483# ------------------------------------------------------------------------------
1484java-pkg_ensure-vm-version-ge() { 1438java-pkg_ensure-vm-version-ge() {
1485 debug-print-function ${FUNCNAME} $* 1439 debug-print-function ${FUNCNAME} $*
1486 1440
1487 if ! java-pkg_is-vm-version-ge "$@" ; then 1441 if ! java-pkg_is-vm-version-ge "$@" ; then
1488 debug-print "vm is not suffient" 1442 debug-print "vm is not suffient"
1490 einfo "Please use java-config -S to set the correct one" 1444 einfo "Please use java-config -S to set the correct one"
1491 die "Active Java VM too old" 1445 die "Active Java VM too old"
1492 fi 1446 fi
1493} 1447}
1494 1448
1495# ------------------------------------------------------------------------------ 1449# @FUNCTION: java-pkg_is-vm-version-ge
1496# @internal-function java-pkg_is-vm-version-ge 1450# @INTERNAL
1497# 1451# @DESCRIPTION:
1452# @CODE
1453# Parameters:
1498# @param $@ - VM version to compare current VM to 1454# $@ - VM version to compare current VM to
1455# @CODE
1499# @return zero - current VM version is greater than checked version 1456# @RETURN: zero - current VM version is greater than checked version;
1500# @return non-zero - current VM version is not greater than checked version 1457# non-zero - current VM version is not greater than checked version
1501# ------------------------------------------------------------------------------
1502java-pkg_is-vm-version-ge() { 1458java-pkg_is-vm-version-ge() {
1503 debug-print-function ${FUNCNAME} $* 1459 debug-print-function ${FUNCNAME} $*
1504 1460
1505 local needed_version=$@ 1461 local needed_version=$@
1506 local vm_version=$(java-pkg_get-vm-version) 1462 local vm_version=$(java-pkg_get-vm-version)
1525java-pkg_get-current-vm() { 1481java-pkg_get-current-vm() {
1526 echo ${GENTOO_VM} 1482 echo ${GENTOO_VM}
1527} 1483}
1528 1484
1529java-pkg_current-vm-matches() { 1485java-pkg_current-vm-matches() {
1530 hasq $(java-pkg_get-current-vm) ${@} 1486 has $(java-pkg_get-current-vm) ${@}
1531 return $? 1487 return $?
1532} 1488}
1533 1489
1534# ------------------------------------------------------------------------------ 1490# @FUNCTION: java-pkg_get-source
1535# @ebuild-function java-pkg_get-source 1491# @DESCRIPTION:
1536#
1537# Determines what source version should be used, for passing to -source. 1492# Determines what source version should be used, for passing to -source.
1538# Unless you want to break things you probably shouldn't set _WANT_SOURCE 1493# Unless you want to break things you probably shouldn't set _WANT_SOURCE
1539# 1494#
1540# @return string - Either the lowest possible source, or JAVA_PKG_WANT_SOURCE 1495# @RETURN: string - Either the lowest possible source, or JAVA_PKG_WANT_SOURCE
1541# ------------------------------------------------------------------------------
1542java-pkg_get-source() { 1496java-pkg_get-source() {
1543 echo ${JAVA_PKG_WANT_SOURCE:-$(depend-java-query --get-lowest "${DEPEND} ${RDEPEND}")} 1497 echo ${JAVA_PKG_WANT_SOURCE:-$(depend-java-query --get-lowest "${DEPEND} ${RDEPEND}")}
1544} 1498}
1545 1499
1546# ------------------------------------------------------------------------------ 1500# @FUNCTION: java-pkg_get-target
1547# @ebuild-function java-pkg_get-target 1501# @DESCRIPTION:
1548#
1549# Determines what target version should be used, for passing to -target. 1502# Determines what target version should be used, for passing to -target.
1550# If you don't care about lower versions, you can set _WANT_TARGET to the 1503# If you don't care about lower versions, you can set _WANT_TARGET to the
1551# version of your JDK. 1504# version of your JDK.
1552# 1505#
1553# @return string - Either the lowest possible target, or JAVA_PKG_WANT_TARGET 1506# @RETURN: string - Either the lowest possible target, or JAVA_PKG_WANT_TARGET
1554# ------------------------------------------------------------------------------
1555java-pkg_get-target() { 1507java-pkg_get-target() {
1556 echo ${JAVA_PKG_WANT_TARGET:-$(depend-java-query --get-lowest "${DEPEND} ${RDEPEND}")} 1508 echo ${JAVA_PKG_WANT_TARGET:-$(depend-java-query --get-lowest "${DEPEND} ${RDEPEND}")}
1557} 1509}
1558 1510
1511# @FUNCTION: java-pkg_get-javac
1512# @DESCRIPTION:
1513# Returns the compiler executable
1559java-pkg_get-javac() { 1514java-pkg_get-javac() {
1560 debug-print-function ${FUNCNAME} $* 1515 debug-print-function ${FUNCNAME} $*
1561 1516
1562 1517
1563 local compiler="${GENTOO_COMPILER}" 1518 local compiler="${GENTOO_COMPILER}"
1593 fi 1548 fi
1594 fi 1549 fi
1595 echo ${compiler_executable} 1550 echo ${compiler_executable}
1596} 1551}
1597 1552
1598# ------------------------------------------------------------------------------ 1553# @FUNCTION: java-pkg_javac-args
1599# @ebuild-function java-pkg_javac-args 1554# @DESCRIPTION:
1600#
1601# If an ebuild uses javac directly, instead of using ejavac, it should call this 1555# If an ebuild uses javac directly, instead of using ejavac, it should call this
1602# to know what -source/-target to use. 1556# to know what -source/-target to use.
1603# 1557#
1604# @return string - arguments to pass to javac, complete with -target and -source 1558# @RETURN: string - arguments to pass to javac, complete with -target and -source
1605# ------------------------------------------------------------------------------
1606java-pkg_javac-args() { 1559java-pkg_javac-args() {
1607 debug-print-function ${FUNCNAME} $* 1560 debug-print-function ${FUNCNAME} $*
1608 1561
1609 local want_source="$(java-pkg_get-source)" 1562 local want_source="$(java-pkg_get-source)"
1610 local want_target="$(java-pkg_get-target)" 1563 local want_target="$(java-pkg_get-target)"
1626 echo "${target_str}" 1579 echo "${target_str}"
1627 fi 1580 fi
1628 fi 1581 fi
1629} 1582}
1630 1583
1631# TODO document 1584# @FUNCTION: java-pkg_get-jni-cflags
1585# @DESCRIPTION:
1586# Echos the CFLAGS for JNI compilations
1632java-pkg_get-jni-cflags() { 1587java-pkg_get-jni-cflags() {
1633 local flags="-I${JAVA_HOME}/include" 1588 local flags="-I${JAVA_HOME}/include"
1634 1589
1635 local platform="linux" 1590 local platform="linux"
1636 use elibc_FreeBSD && platform="freebsd" 1591 use elibc_FreeBSD && platform="freebsd"
1640 1595
1641 echo ${flags} 1596 echo ${flags}
1642} 1597}
1643 1598
1644java-pkg_ensure-gcj() { 1599java-pkg_ensure-gcj() {
1645 if ! built_with_use sys-devel/gcc gcj ; then 1600 # was enforcing sys-devel/gcc[gcj]
1646 ewarn 1601 die "${FUNCNAME} was removed. Use use-deps available as of EAPI 2 instead. #261562"
1647 ewarn "You must build gcc with the gcj support to build with gcj"
1648 ewarn
1649 ebeep 5
1650 die "No GCJ support found!"
1651 fi
1652} 1602}
1653 1603
1654java-pkg_ensure-test() { 1604java-pkg_ensure-test() {
1655 if hasq test ${FEATURES} && ! hasq -test ${FEATURES} \ 1605 # was enforcing USE=test if FEATURES=test
1656 && hasq test ${IUSE} && ! use test; 1606 die "${FUNCNAME} was removed. Package mangers handle this already. #278965"
1657 then
1658 eerror "You specified FEATURES=test, but USE=test is needed"
1659 eerror "to pull in the additional dependencies for testing"
1660 die "Need USE=test enabled"
1661 fi
1662} 1607}
1663 1608
1664# ------------------------------------------------------------------------------ 1609# @FUNCTION: java-pkg_register-ant-task
1665# @ebuild-function java-pkg_register-ant-task 1610# @USAGE: [--version x.y] [<name>]
1666# 1611# @DESCRIPTION:
1667# Register this package as ant task, so that ant will load it when no specific 1612# Register this package as ant task, so that ant will load it when no specific
1668# ANT_TASKS are specified. Note that even without this registering, all packages 1613# ANT_TASKS are specified. Note that even without this registering, all packages
1669# specified in ANT_TASKS will be loaded. Mostly used by the actual ant tasks 1614# specified in ANT_TASKS will be loaded. Mostly used by the actual ant tasks
1670# packages, but can be also used by other ebuilds that used to symlink their 1615# packages, but can be also used by other ebuilds that used to symlink their
1671# .jar into /usr/share/ant-core/lib to get autoloaded, for backwards 1616# .jar into /usr/share/ant-core/lib to get autoloaded, for backwards
1672# compatibility. 1617# compatibility.
1673# 1618#
1619# @CODE
1620# Parameters
1674# @param --version x.y Register only for ant version x.y (otherwise for any ant 1621# --version x.y Register only for ant version x.y (otherwise for any ant
1675# version). Used by the ant-* packages to prevent loading of mismatched 1622# version). Used by the ant-* packages to prevent loading of mismatched
1676# ant-core ant tasks after core was updated, before the tasks are updated, 1623# ant-core ant tasks after core was updated, before the tasks are updated,
1677# without a need for blockers. 1624# without a need for blockers.
1678# @param $1 Name to register as. Defaults to JAVA_PKG_NAME ($PN[-$SLOT]) 1625# $1 Name to register as. Defaults to JAVA_PKG_NAME ($PN[-$SLOT])
1679# ------------------------------------------------------------------------------ 1626# @CODE
1680java-pkg_register-ant-task() { 1627java-pkg_register-ant-task() {
1681 local TASKS_DIR="tasks" 1628 local TASKS_DIR="tasks"
1682 1629
1683 # check for --version x.y parameters 1630 # check for --version x.y parameters
1684 while [[ -n "${1}" && -n "${2}" ]]; do 1631 while [[ -n "${1}" && -n "${2}" ]]; do
1696 1643
1697 dodir /usr/share/ant/${TASKS_DIR} 1644 dodir /usr/share/ant/${TASKS_DIR}
1698 touch "${D}/usr/share/ant/${TASKS_DIR}/${TASK_NAME}" 1645 touch "${D}/usr/share/ant/${TASKS_DIR}/${TASK_NAME}"
1699} 1646}
1700 1647
1701# ------------------------------------------------------------------------------ 1648# @FUNCTION: java-pkg_ant-tasks-depend
1702# @internal-function java-pkg_ant-tasks-from-deps 1649# @INTERNAL
1703# 1650# @DESCRIPTION:
1704# Function to determine ANT_TASKS from DEPEND variable for backwards
1705# compatibility with ebuilds that don't set ANT_TASKS before calling eant() or
1706# WANT_ANT_TASKS before inheriting java-pkg-2. If the DEPEND string contains
1707# "dev-java/ant" or "dev-java/ant-tasks", then it returns "all", otherwise
1708# "none". It's not smart enough to cope with USE flag depends but that shouldn't
1709# be a problem, the worst it can do is activace all tasks when not needed.
1710# Note that this is called only with JAVA_PKG_STRICT=1, to find ebuilds with
1711# insufficient dependencies, otherwise all available tasks are used for
1712# backwards compatilbility.
1713#
1714# @return "all" or "none"
1715# ------------------------------------------------------------------------------
1716java-pkg_ant-tasks-from-deps() {
1717 local found_ant found_ant_tasks
1718
1719 for dep in ${DEPEND}
1720 do
1721 local ant="$(awk '/(dev-java\/ant)/ { if (match($1, "(dev-java/ant)((-[0-9])+|$)", m)) print m[1] }' <<< ${dep})"
1722 [[ "${ant}" == "dev-java/ant" ]] && found_ant=true
1723 [[ "${dep}" == *"ant-tasks"* ]] && found_ant_tasks=true
1724 done
1725
1726 if [[ -n "${found_ant}" || -n "${found_ant_tasks}" ]]; then
1727 java-pkg_announce-qa-violation --nodie "The ebuild DEPENDS on deprecated ant or ant-tasks"
1728 echo "all"
1729 else
1730 # ebuild doesn't set ANT_TASKS and doesn't depend on ant-tasks or ant
1731 # so we deactivate all tasks that may be installed
1732 echo "none"
1733 fi
1734}
1735
1736# ------------------------------------------------------------------------------
1737# @internal-function java-pkg_ant-tasks-depend
1738#
1739# Translates the WANT_ANT_TASKS variable into valid dependencies. 1651# Translates the WANT_ANT_TASKS variable into valid dependencies.
1740# ------------------------------------------------------------------------------
1741java-pkg_ant-tasks-depend() { 1652java-pkg_ant-tasks-depend() {
1742 debug-print-function ${FUNCNAME} ${WANT_ANT_TASKS} 1653 debug-print-function ${FUNCNAME} ${WANT_ANT_TASKS}
1743 1654
1744 if [[ -n "${WANT_ANT_TASKS}" ]]; then 1655 if [[ -n "${WANT_ANT_TASKS}" ]]; then
1745 local DEP="" 1656 local DEP=""
1746 for i in ${WANT_ANT_TASKS} 1657 for i in ${WANT_ANT_TASKS}
1747 do 1658 do
1748 if [[ ${i} != ant-* ]]; then 1659 if [[ ${i} = ant-* ]]; then
1660 DEP="${DEP}dev-java/${i} "
1661 elif [[ ${i} = */*:* ]]; then
1662 DEP="${DEP}${i} "
1663 else
1749 echo "Invalid atom in WANT_ANT_TASKS: ${i}" 1664 echo "Invalid atom in WANT_ANT_TASKS: ${i}"
1750 return 1 1665 return 1
1751 fi 1666 fi
1752 DEP="${DEP}dev-java/${i} "
1753 done 1667 done
1754 echo ${DEP} 1668 echo ${DEP}
1755 return 0 1669 return 0
1756 else 1670 else
1757 return 0 1671 return 0
1758 fi 1672 fi
1759} 1673}
1760 1674
1761# ------------------------------------------------------------------------------ 1675
1762# @ebuild-function ejunit 1676# @FUNCTION: ejunit_
1763# 1677# @INTERNAL
1678# @DESCRIPTION:
1764# Junit wrapper function. Makes it easier to run the tests and checks for 1679# Internal 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. 1680# dev-java/junit in DEPEND. Launches the tests using junit.textui.TestRunner.
1766# 1681# @CODE
1767# Examples: 1682# Parameters:
1768# ejunit -cp build/classes org.blinkenlights.jid3.test.AllTests 1683# $1 - junit package (junit or junit-4)
1769# ejunit org.blinkenlights.jid3.test.AllTests
1770#
1771# @param $1 - -cp or -classpath 1684# $2 - -cp or -classpath
1772# @param $2 - classpath; junit and recorded dependencies get appended 1685# $3 - classpath; junit and recorded dependencies get appended
1773# @param $@ - the rest of the parameters are passed to java 1686# $@ - the rest of the parameters are passed to java
1774# ------------------------------------------------------------------------------ 1687# @CODE
1775ejunit() { 1688ejunit_() {
1776 debug-print-function ${FUNCNAME} $* 1689 debug-print-function ${FUNCNAME} $*
1777 1690
1778 local pkgs 1691 local pkgs
1692 if [[ -f ${JAVA_PKG_DEPEND_FILE} ]]; then
1779 for atom in $(cat ${JAVA_PKG_DEPEND_FILE} | tr : ' '); do 1693 for atom in $(cat ${JAVA_PKG_DEPEND_FILE} | tr : ' '); do
1780 pkgs=${pkgs},$(echo ${atom} | sed -re "s/^.*@//") 1694 pkgs=${pkgs},$(echo ${atom} | sed -re "s/^.*@//")
1781 done 1695 done
1696 fi
1782 1697
1698 local junit=${1}
1699 shift 1
1700
1783 local cp=$(java-pkg_getjars --with-dependencies junit${pkgs}) 1701 local cp=$(java-pkg_getjars --with-dependencies ${junit}${pkgs})
1784 if [[ ${1} = -cp || ${1} = -classpath ]]; then 1702 if [[ ${1} = -cp || ${1} = -classpath ]]; then
1785 cp="${2}:${cp}" 1703 cp="${2}:${cp}"
1786 shift 2 1704 shift 2
1787 else 1705 else
1788 cp=".:${cp}" 1706 cp=".:${cp}"
1789 fi 1707 fi
1790 1708
1791 local runner=junit.textui.TestRunner 1709 local runner=junit.textui.TestRunner
1710 if [[ "${junit}" == "junit-4" ]] ; then
1711 runner=org.junit.runner.JUnitCore
1712 fi
1792 debug-print "Calling: java -cp \"${cp}\" -Djava.awt.headless=true ${runner} ${@}" 1713 debug-print "Calling: java -cp \"${cp}\" -Djava.awt.headless=true ${runner} ${@}"
1793 java -cp "${cp}" -Djava.awt.headless=true ${runner} "${@}" || die "Running junit failed" 1714 java -cp "${cp}" -Djava.awt.headless=true ${runner} "${@}" || die "Running junit failed"
1794} 1715}
1795 1716
1796# ------------------------------------------------------------------------------ 1717# @FUNCTION: ejunit
1797# @section-end helper 1718# @DESCRIPTION:
1798# ------------------------------------------------------------------------------ 1719# Junit wrapper function. Makes it easier to run the tests and checks for
1799 1720# dev-java/junit in DEPEND. Launches the tests using org.junit.runner.JUnitCore.
1800# ------------------------------------------------------------------------------
1801# @section-begin build
1802# @section-summary Build functions
1803# 1721#
1804# These are some functions for building a package. In particular, it consists of 1722# @CODE
1805# wrappers for javac and ant. 1723# Parameters:
1806# ------------------------------------------------------------------------------ 1724# $1 - -cp or -classpath
1807 1725# $2 - classpath; junit and recorded dependencies get appended
1808# ------------------------------------------------------------------------------ 1726# $@ - the rest of the parameters are passed to java
1809# @ebuild-function eant
1810# 1727#
1728# Examples:
1729# ejunit -cp build/classes org.blinkenlights.jid3.test.AllTests
1730# ejunit org.blinkenlights.jid3.test.AllTests
1731# ejunit org.blinkenlights.jid3.test.FirstTest org.blinkenlights.jid3.test.SecondTest
1732# @CODE
1733ejunit() {
1734 debug-print-function ${FUNCNAME} $*
1735
1736 ejunit_ "junit" "${@}"
1737}
1738
1739# @FUNCTION: ejunit4
1740# @DESCRIPTION:
1741# Junit4 wrapper function. Makes it easier to run the tests and checks for
1742# dev-java/junit:4 in DEPEND. Launches the tests using junit.textui.TestRunner.
1743#
1744# @CODE
1745# Parameters:
1746# $1 - -cp or -classpath
1747# $2 - classpath; junit and recorded dependencies get appended
1748# $@ - the rest of the parameters are passed to java
1749#
1750# Examples:
1751# ejunit4 -cp build/classes org.blinkenlights.jid3.test.AllTests
1752# ejunit4 org.blinkenlights.jid3.test.AllTests
1753# ejunit4 org.blinkenlights.jid3.test.FirstTest \
1754# org.blinkenlights.jid3.test.SecondTest
1755# @CODE
1756ejunit4() {
1757 debug-print-function ${FUNCNAME} $*
1758
1759 ejunit_ "junit-4" "${@}"
1760}
1761
1762# @FUNCTION: java-utils-2_src_prepare
1763# @DESCRIPTION:
1764# src_prepare Searches for bundled jars
1765# Don't call directly, but via java-pkg-2_src_prepare!
1766java-utils-2_src_prepare() {
1767 [[ ${EBUILD_PHASE} == prepare ]] &&
1768 java-pkg_func-exists java_prepare && java_prepare
1769
1770 # Remember that eant will call this unless called via Portage
1771 if [[ ! -e "${T}/java-utils-2_src_prepare-run" ]] && is-java-strict; then
1772 echo "Searching for bundled jars:"
1773 java-pkg_find-normal-jars || echo "None found."
1774 echo "Searching for bundled classes (no output if none found):"
1775 find "${WORKDIR}" -name "*.class"
1776 echo "Search done."
1777 fi
1778 touch "${T}/java-utils-2_src_prepare-run"
1779}
1780
1781# @FUNCTION: java-utils-2_pkg_preinst
1782# @DESCRIPTION:
1783# pkg_preinst Searches for missing and unneeded dependencies
1784# Don't call directly, but via java-pkg-2_pkg_preinst!
1785java-utils-2_pkg_preinst() {
1786 if is-java-strict; then
1787 if has_version dev-java/java-dep-check; then
1788 [[ -e "${JAVA_PKG_ENV}" ]] || return
1789 local output=$(GENTOO_VM= java-dep-check --image "${D}" "${JAVA_PKG_ENV}")
1790 if [[ ${output} && has_version <=dev-java/java-dep-check-0.2 ]]; then
1791 ewarn "Possibly unneeded dependencies found in package.env:"
1792 for dep in ${output}; do
1793 ewarn "\t${dep}"
1794 done
1795 fi
1796 if [[ ${output} && has_version >dev-java/java-dep-check-0.2 ]]; then
1797 ewarn "${output}"
1798 fi
1799 else
1800 eerror "Install dev-java/java-dep-check for dependency checking"
1801 fi
1802 fi
1803}
1804
1805# @FUNCTION: eant
1806# @USAGE: <ant_build_target(s)>
1807# @DESCRIPTION:
1811# Ant wrapper function. Will use the appropriate compiler, based on user-defined 1808# Ant wrapper function. Will use the appropriate compiler, based on user-defined
1812# compiler. Will also set proper ANT_TASKS from the variable ANT_TASKS, 1809# compiler. Will also set proper ANT_TASKS from the variable ANT_TASKS,
1813# variables: 1810# variables:
1811#
1812# @CODE
1813# Variables:
1814# EANT_GENTOO_CLASSPATH - calls java-pkg_getjars for the value and adds to the 1814# EANT_GENTOO_CLASSPATH - calls java-pkg_getjars for the value and adds to the
1815# gentoo.classpath property. Be sure to call 1815# gentoo.classpath property. Be sure to call java-ant_rewrite-classpath in src_unpack.
1816# java-ant_rewrite-classpath in src_unpack. 1816# EANT_NEEDS_TOOLS - add tools.jar to the gentoo.classpath. Should only be used
1817# JAVA_PKG_NO_BUNDLED_SEARCH - Don't search for bundled jars or class files 1817# for build-time purposes, the dependency is not recorded to
1818# package.env!
1818# *ANT_TASKS - used to determine ANT_TASKS before calling Ant. 1819# ANT_TASKS - used to determine ANT_TASKS before calling Ant.
1819# ------------------------------------------------------------------------------ 1820# @CODE
1820eant() { 1821eant() {
1821 debug-print-function ${FUNCNAME} $* 1822 debug-print-function ${FUNCNAME} $*
1822 1823
1823 if [[ ${EBUILD_PHASE} = compile ]]; then 1824 if [[ ${EBUILD_PHASE} = compile ]]; then
1824 # Used to be done in hooks in java-ant-2.eclass but moved here so that we can 1825 java-ant-2_src_configure
1825 # finally get rid of the hooks without breaking stuff 1826 java-utils-2_src_prepare
1826
1827 [[ "${JAVA_ANT_IGNORE_SYSTEM_CLASSES}" && "${JAVA_PKG_BSFIX}" ]] \
1828 && java-ant_ignore-system-classes "${S}/build.xml"
1829
1830 if hasq java-ant-2 ${INHERITED}; then
1831 java-ant_bsfix
1832 fi 1827 fi
1833 1828
1834 # eant can be called multiple times
1835 JAVA_PKG_BSFIX="off"
1836
1837 if [[ -z ${JAVA_PKG_NO_BUNDLED_SEARCH} ]] && is-java-strict; then
1838 echo "Searching for bundled jars:"
1839 java-pkg_find-normal-jars || echo "None found."
1840 echo "Searching for bundled classes (no output if none found):"
1841 find "${WORKDIR}" -name "*.class"
1842 echo "Search done."
1843 JAVA_PKG_NO_BUNDLED_SEARCH=true # eant can be called many times
1844 fi
1845 fi
1846
1847 if ! hasq java-ant-2 ${INHERITED}; then 1829 if ! has java-ant-2 ${INHERITED}; then
1848 local msg="You should inherit java-ant-2 when using eant" 1830 local msg="You should inherit java-ant-2 when using eant"
1849 java-pkg_announce-qa-violation "${msg}" 1831 java-pkg_announce-qa-violation "${msg}"
1850 fi 1832 fi
1851 1833
1852 local antflags="-Dnoget=true -Dmaven.mode.offline=true" 1834 local antflags="-Dnoget=true -Dmaven.mode.offline=true -Dbuild.sysclasspath=ignore"
1853 1835
1854 java-pkg_init-compiler_ 1836 java-pkg_init-compiler_
1855 local compiler="${GENTOO_COMPILER}" 1837 local compiler="${GENTOO_COMPILER}"
1856 1838
1857 local compiler_env="${JAVA_PKG_COMPILER_DIR}/${compiler}" 1839 local compiler_env="${JAVA_PKG_COMPILER_DIR}/${compiler}"
1868 # java-config -p 1850 # java-config -p
1869 local build_compiler_deps="$(source ${JAVA_PKG_COMPILER_DIR}/${compiler} 1>/dev/null 2>&1; echo ${ANT_BUILD_COMPILER_DEPS})" 1851 local build_compiler_deps="$(source ${JAVA_PKG_COMPILER_DIR}/${compiler} 1>/dev/null 2>&1; echo ${ANT_BUILD_COMPILER_DEPS})"
1870 if [[ -n ${build_compiler_deps} ]]; then 1852 if [[ -n ${build_compiler_deps} ]]; then
1871 antflags="${antflags} -lib $(java-config -p ${build_compiler_deps})" 1853 antflags="${antflags} -lib $(java-config -p ${build_compiler_deps})"
1872 fi 1854 fi
1873 fi
1874
1875 if is-java-strict; then
1876 einfo "Disabling system classpath for ant"
1877 antflags="${antflags} -Dbuild.sysclasspath=ignore"
1878 fi 1855 fi
1879 1856
1880 for arg in "${@}"; do 1857 for arg in "${@}"; do
1881 if [[ ${arg} = -lib ]]; then 1858 if [[ ${arg} = -lib ]]; then
1882 if is-java-strict; then 1859 if is-java-strict; then
1891 echo "more info." 1868 echo "more info."
1892 fi 1869 fi
1893 fi 1870 fi
1894 done 1871 done
1895 1872
1896 # we use this in src_* so we run ant from / 1873 # parse WANT_ANT_TASKS for atoms
1897 if ROOT=/ has_version ">=dev-java/ant-core-1.7.0"; then 1874 local want_ant_tasks
1898 # default ANT_TASKS to WANT_ANT_TASKS, if ANT_TASKS is not set explicitly 1875 for i in ${WANT_ANT_TASKS}; do
1899 ANT_TASKS="${ANT_TASKS:-${WANT_ANT_TASKS}}" 1876 if [[ ${i} = */*:* ]]; then
1900 1877 i=${i#*/}
1901 # override ANT_TASKS with JAVA_PKG_FORCE_ANT_TASKS if it's set 1878 i=${i%:0}
1902 ANT_TASKS="${JAVA_PKG_FORCE_ANT_TASKS:-${ANT_TASKS}}" 1879 want_ant_tasks+="${i/:/-} "
1903
1904 if is-java-strict; then
1905 # if ant-tasks were not set by ebuild or forced, try to determine them from depends
1906 if [[ -z "${ANT_TASKS}" ]]; then
1907 ANT_TASKS="$(java-pkg_ant-tasks-from-deps)"
1908 fi
1909 else 1880 else
1881 want_ant_tasks+="${i} "
1882 fi
1883 done
1884 # default ANT_TASKS to WANT_ANT_TASKS, if ANT_TASKS is not set explicitly
1885 ANT_TASKS="${ANT_TASKS:-${want_ant_tasks% }}"
1886
1887 # override ANT_TASKS with JAVA_PKG_FORCE_ANT_TASKS if it's set
1888 ANT_TASKS="${JAVA_PKG_FORCE_ANT_TASKS:-${ANT_TASKS}}"
1889
1910 # if ant-tasks is not set by ebuild or forced, activate all of them 1890 # if ant-tasks is not set by ebuild or forced, use none
1911 ANT_TASKS="${ANT_TASKS:-all}" 1891 ANT_TASKS="${ANT_TASKS:-none}"
1912 fi
1913 1892
1914 # at this point, ANT_TASKS should be "all", "none" or explicit list 1893 # at this point, ANT_TASKS should be "all", "none" or explicit list
1915 if [[ "${ANT_TASKS}" == "all" ]]; then 1894 if [[ "${ANT_TASKS}" == "all" ]]; then
1916 einfo "Using all available ANT_TASKS" 1895 einfo "Using all available ANT_TASKS"
1917 elif [[ "${ANT_TASKS}" == "none" ]]; then 1896 elif [[ "${ANT_TASKS}" == "none" ]]; then
1918 einfo "Disabling all optional ANT_TASKS" 1897 einfo "Disabling all optional ANT_TASKS"
1919 else 1898 else
1920 einfo "Using following ANT_TASKS: ${ANT_TASKS}" 1899 einfo "Using following ANT_TASKS: ${ANT_TASKS}"
1921 fi 1900 fi
1922 1901
1923 export ANT_TASKS 1902 export ANT_TASKS
1924 fi
1925 1903
1926 [[ -n ${JAVA_PKG_DEBUG} ]] && antflags="${antflags} --execdebug -debug" 1904 [[ -n ${JAVA_PKG_DEBUG} ]] && antflags="${antflags} --execdebug -debug"
1927 [[ -n ${PORTAGE_QUIET} ]] && antflags="${antflags} -q" 1905 [[ -n ${PORTAGE_QUIET} ]] && antflags="${antflags} -q"
1928 1906
1929 local gcp="${EANT_GENTOO_CLASSPATH}" 1907 local gcp="${EANT_GENTOO_CLASSPATH}"
1930 local getjarsarg="" 1908 local getjarsarg=""
1931 1909
1932 if [[ ${EBUILD_PHASE} = "test" ]]; then 1910 if [[ ${EBUILD_PHASE} = "test" ]]; then
1933 antflags="${antflags} -DJunit.present=true" 1911 antflags="${antflags} -DJunit.present=true"
1934 [[ ${gcp} && ${ANT_TASKS} = *ant-junit* ]] && gcp="${gcp} junit" 1912 [[ ${ANT_TASKS} = *ant-junit* ]] && gcp="${gcp} junit"
1935 getjarsarg="--with-dependencies" 1913 getjarsarg="--with-dependencies"
1914 else
1915 antflags="${antflags} -Dmaven.test.skip=true"
1936 fi 1916 fi
1937 1917
1938 local cp 1918 local cp
1939 1919
1940 for atom in ${gcp}; do 1920 for atom in ${gcp}; do
1941 cp="${cp}:$(java-pkg_getjars ${getjarsarg} ${atom})" 1921 cp="${cp}:$(java-pkg_getjars ${getjarsarg} ${atom})"
1942 done 1922 done
1943 1923
1924 [[ -n "${EANT_NEEDS_TOOLS}" ]] && cp="${cp}:$(java-config --tools)"
1925
1944 if [[ ${cp} ]]; then 1926 if [[ ${cp} ]]; then
1945 # It seems ant does not like single quotes around ${cp} 1927 # It seems ant does not like single quotes around ${cp}
1928 cp=${cp#:}
1929 [[ ${EANT_GENTOO_CLASSPATH_EXTRA} ]] && \
1930 cp="${cp}:${EANT_GENTOO_CLASSPATH_EXTRA}"
1946 antflags="${antflags} -Dgentoo.classpath=\"${cp#:}\"" 1931 antflags="${antflags} -Dgentoo.classpath=\"${cp}\""
1947 fi 1932 fi
1948 1933
1949 [[ -n ${JAVA_PKG_DEBUG} ]] && echo ant ${antflags} "${@}" 1934 [[ -n ${JAVA_PKG_DEBUG} ]] && echo ant ${antflags} "${@}"
1950 debug-print "Calling ant (GENTOO_VM: ${GENTOO_VM}): ${antflags} ${@}" 1935 debug-print "Calling ant (GENTOO_VM: ${GENTOO_VM}): ${antflags} ${@}"
1951 ant ${antflags} "${@}" || die "eant failed" 1936 ant ${antflags} "${@}" || die "eant failed"
1952} 1937}
1953 1938
1954# ------------------------------------------------------------------------------ 1939# @FUNCTION: ejavac
1955# @ebuild-function ejavac 1940# @USAGE: <javac_arguments>
1956# 1941# @DESCRIPTION:
1957# Javac wrapper function. Will use the appropriate compiler, based on 1942# Javac wrapper function. Will use the appropriate compiler, based on
1958# /etc/java-config/compilers.conf 1943# /etc/java-config/compilers.conf
1959#
1960# @param $@ - Arguments to be passed to the compiler
1961# ------------------------------------------------------------------------------
1962ejavac() { 1944ejavac() {
1963 debug-print-function ${FUNCNAME} $* 1945 debug-print-function ${FUNCNAME} $*
1964 1946
1965 java-pkg_init-compiler_ 1947 java-pkg_init-compiler_
1966 1948
1980 1962
1981 [[ -n ${JAVA_PKG_DEBUG} ]] && echo ${compiler_executable} ${javac_args} "${@}" 1963 [[ -n ${JAVA_PKG_DEBUG} ]] && echo ${compiler_executable} ${javac_args} "${@}"
1982 ${compiler_executable} ${javac_args} "${@}" || die "ejavac failed" 1964 ${compiler_executable} ${javac_args} "${@}" || die "ejavac failed"
1983} 1965}
1984 1966
1985# ------------------------------------------------------------------------------ 1967# @FUNCTION: ejavadoc
1986# @ebuild-function java-pkg_filter-compiler 1968# @USAGE: <javadoc_arguments>
1987# 1969# @DESCRIPTION:
1970# javadoc wrapper function. Will set some flags based on the VM version
1971# due to strict javadoc rules in 1.8.
1972ejavadoc() {
1973 debug-print-function ${FUNCNAME} $*
1974
1975 local javadoc_args=""
1976
1977 if java-pkg_is-vm-version-ge "1.8" ; then
1978 javadoc_args="-Xdoclint:none"
1979 fi
1980
1981 javadoc ${javadoc_args} "${@}" || die "ejavadoc failed"
1982}
1983
1984# @FUNCTION: java-pkg_filter-compiler
1985# @USAGE: <compiler(s)_to_filter>
1986# @DESCRIPTION:
1988# Used to prevent the use of some compilers. Should be used in src_compile. 1987# Used to prevent the use of some compilers. Should be used in src_compile.
1989# Basically, it just appends onto JAVA_PKG_FILTER_COMPILER 1988# Basically, it just appends onto JAVA_PKG_FILTER_COMPILER
1990#
1991# @param $@ - compilers to filter
1992# ------------------------------------------------------------------------------
1993java-pkg_filter-compiler() { 1989java-pkg_filter-compiler() {
1994 JAVA_PKG_FILTER_COMPILER="${JAVA_PKG_FILTER_COMPILER} $@" 1990 JAVA_PKG_FILTER_COMPILER="${JAVA_PKG_FILTER_COMPILER} $@"
1995} 1991}
1996 1992
1997# ------------------------------------------------------------------------------ 1993# @FUNCTION: java-pkg_force-compiler
1998# @ebuild-function java-pkg_force-compiler 1994# @USAGE: <compiler(s)_to_force>
1999# 1995# @DESCRIPTION:
2000# Used to force the use of particular compilers. Should be used in src_compile. 1996# Used to force the use of particular compilers. Should be used in src_compile.
2001# A common use of this would be to force ecj-3.1 to be used on amd64, to avoid 1997# A common use of this would be to force ecj-3.1 to be used on amd64, to avoid
2002# OutOfMemoryErrors that may come up. 1998# OutOfMemoryErrors that may come up.
2003#
2004# @param $@ - compilers to force
2005# ------------------------------------------------------------------------------
2006java-pkg_force-compiler() { 1999java-pkg_force-compiler() {
2007 JAVA_PKG_FORCE_COMPILER="$@" 2000 JAVA_PKG_FORCE_COMPILER="$@"
2008} 2001}
2009 2002
2010# ------------------------------------------------------------------------------ 2003# @FUNCTION: use_doc
2011# @ebuild-function use_doc 2004# @DESCRIPTION:
2012# 2005#
2013# Helper function for getting ant to build javadocs. If the user has USE=doc, 2006# Helper function for getting ant to build javadocs. If the user has USE=doc,
2014# then 'javadoc' or the argument are returned. Otherwise, there is no return. 2007# then 'javadoc' or the argument are returned. Otherwise, there is no return.
2015# 2008#
2016# The output of this should be passed to ant. 2009# The output of this should be passed to ant.
2010# @CODE
2011# Parameters:
2012# $@ - Option value to return. Defaults to 'javadoc'
2017# 2013#
2014# Examples:
2018# Example: build javadocs by calling 'javadoc' target 2015# build javadocs by calling 'javadoc' target
2019# eant $(use_doc) 2016# eant $(use_doc)
2017#
2020# Example: build javadocs by calling 'apidoc' target 2018# build javadocs by calling 'apidoc' target
2021# eant $(use_doc apidoc) 2019# eant $(use_doc apidoc)
2022# 2020# @CODE
2023# @param $@ - Option value to return. Defaults to 'javadoc'
2024# @return string - Name of the target to create javadocs 2021# @RETURN string - Name of the target to create javadocs
2025# ------------------------------------------------------------------------------
2026use_doc() { 2022use_doc() {
2027 use doc && echo ${@:-javadoc} 2023 use doc && echo ${@:-javadoc}
2028} 2024}
2029 2025
2030 2026
2031# ------------------------------------------------------------------------------ 2027# @FUNCTION: java-pkg_init
2032# @section-end build 2028# @INTERNAL
2033# ------------------------------------------------------------------------------ 2029# @DESCRIPTION:
2034
2035# ------------------------------------------------------------------------------
2036# @section-begin internal
2037# @section-summary Internal functions
2038#
2039# Do __NOT__ use any of these from an ebuild! These are only to be used from
2040# within the java eclasses.
2041# ------------------------------------------------------------------------------
2042
2043# -----------------------------------------------------------------------------
2044# @function-internal java-pkg_init
2045#
2046# The purpose of this function, as the name might imply, is to initialize the 2030# The purpose of this function, as the name might imply, is to initialize the
2047# Java environment. It ensures that that there aren't any environment variables 2031# Java environment. It ensures that that there aren't any environment variables
2048# that'll muss things up. It initializes some variables, which are used 2032# that'll muss things up. It initializes some variables, which are used
2049# internally. And most importantly, it'll switch the VM if necessary. 2033# internally. And most importantly, it'll switch the VM if necessary.
2050# 2034#
2051# This shouldn't be used directly. Instead, java-pkg and java-pkg-opt will 2035# This shouldn't be used directly. Instead, java-pkg and java-pkg-opt will
2052# call it during each of the phases of the merge process. 2036# call it during each of the phases of the merge process.
2053#
2054# -----------------------------------------------------------------------------
2055java-pkg_init() { 2037java-pkg_init() {
2038 debug-print-function ${FUNCNAME} $*
2039
2040 # Don't set up build environment if installing from binary. #206024 #258423
2041 [[ "${MERGE_TYPE}" == "binary" ]] && return
2042 # Also try Portage's nonstandard EMERGE_FROM for old EAPIs, if it doesn't
2043 # work nothing is lost.
2044 has ${EAPI:-0} 0 1 2 3 && [[ "${EMERGE_FROM}" == "binary" ]] && return
2045
2056 unset JAVAC 2046 unset JAVAC
2057 unset JAVA_HOME 2047 unset JAVA_HOME
2048
2049 java-config --help >/dev/null || {
2050 eerror ""
2051 eerror "Can't run java-config --help"
2052 eerror "Have you upgraded python recently but haven't"
2053 eerror "run python-updater yet?"
2054 die "Can't run java-config --help"
2055 }
2058 2056
2059 # People do all kinds of weird things. 2057 # People do all kinds of weird things.
2060 # http://forums.gentoo.org/viewtopic-p-3943166.html 2058 # http://forums.gentoo.org/viewtopic-p-3943166.html
2061 local silence="${SILENCE_JAVA_OPTIONS_WARNING}" 2059 local silence="${SILENCE_JAVA_OPTIONS_WARNING}"
2062 local accept="${I_WANT_GLOBAL_JAVA_OPTIONS}" 2060 local accept="${I_WANT_GLOBAL_JAVA_OPTIONS}"
2068 ewarn "make.conf for example) to silence this warning or" 2066 ewarn "make.conf for example) to silence this warning or"
2069 ewarn "I_WANT_GLOBAL_JAVA_OPTIONS to not filter it." 2067 ewarn "I_WANT_GLOBAL_JAVA_OPTIONS to not filter it."
2070 fi 2068 fi
2071 2069
2072 if [[ -z ${accept} ]]; then 2070 if [[ -z ${accept} ]]; then
2071 # export _JAVA_OPTIONS= doesn't work because it will show up in java
2072 # -version output
2073 unset _JAVA_OPTIONS 2073 unset _JAVA_OPTIONS
2074 # phase hooks make this run many times without this 2074 # phase hooks make this run many times without this
2075 I_WANT_GLOBAL_JAVA_OPTIONS="true" 2075 I_WANT_GLOBAL_JAVA_OPTIONS="true"
2076 fi 2076 fi
2077 2077
2078 if java-pkg_func-exists ant_src_unpack; then 2078 if java-pkg_func-exists ant_src_unpack; then
2079 java-pkg_announce-qa-violation "Using old ant_src_unpack. Should be src_unpack" 2079 java-pkg_announce-qa-violation "Using old ant_src_unpack. Should be src_unpack"
2080 fi 2080 fi
2081 2081
2082 java-pkg_init_paths_
2083 java-pkg_switch-vm 2082 java-pkg_switch-vm
2084 PATH=${JAVA_HOME}/bin:${PATH} 2083 PATH=${JAVA_HOME}/bin:${PATH}
2085 2084
2086 # TODO we will probably want to set JAVAC and JAVACFLAGS 2085 # TODO we will probably want to set JAVAC and JAVACFLAGS
2087 2086
2088 # Do some QA checks 2087 # Do some QA checks
2089 java-pkg_check-jikes 2088 java-pkg_check-jikes
2089
2090 # Can't use unset here because Portage does not save the unset
2091 # see https://bugs.gentoo.org/show_bug.cgi?id=189417#c11
2090 2092
2091 # When users have crazy classpaths some packages can fail to compile. 2093 # When users have crazy classpaths some packages can fail to compile.
2092 # and everything should work with empty CLASSPATH. 2094 # and everything should work with empty CLASSPATH.
2093 # This also helps prevent unexpected dependencies on random things 2095 # This also helps prevent unexpected dependencies on random things
2094 # from the CLASSPATH. 2096 # from the CLASSPATH.
2095 unset CLASSPATH 2097 export CLASSPATH=
2096 2098
2097 # Unset external ANT_ stuff 2099 # Unset external ANT_ stuff
2098 unset ANT_TASKS 2100 export ANT_TASKS=
2099 unset ANT_OPTS 2101 export ANT_OPTS=
2102 export ANT_RESPECT_JAVA_HOME=
2100} 2103}
2101 2104
2102# ------------------------------------------------------------------------------ 2105# @FUNCTION: java-pkg-init-compiler_
2103# @function-internal java-pkg-init-compiler_ 2106# @INTERNAL
2104# 2107# @DESCRIPTION:
2105# This function attempts to figure out what compiler should be used. It does 2108# This function attempts to figure out what compiler should be used. It does
2106# this by reading the file at JAVA_PKG_COMPILERS_CONF, and checking the 2109# this by reading the file at JAVA_PKG_COMPILERS_CONF, and checking the
2107# COMPILERS variable defined there. 2110# COMPILERS variable defined there.
2108# This can be overridden by a list in JAVA_PKG_FORCE_COMPILER 2111# This can be overridden by a list in JAVA_PKG_FORCE_COMPILER
2109# 2112#
2120# If the user doesn't defined anything in JAVA_PKG_COMPILERS_CONF, or no 2123# If the user doesn't defined anything in JAVA_PKG_COMPILERS_CONF, or no
2121# suitable compiler was found there, then the default is to use javac provided 2124# suitable compiler was found there, then the default is to use javac provided
2122# by the current VM. 2125# by the current VM.
2123# 2126#
2124# 2127#
2125# @return name of the compiler to use 2128# @RETURN name of the compiler to use
2126# ------------------------------------------------------------------------------
2127java-pkg_init-compiler_() { 2129java-pkg_init-compiler_() {
2128 debug-print-function ${FUNCNAME} $* 2130 debug-print-function ${FUNCNAME} $*
2129 2131
2130 if [[ -n ${GENTOO_COMPILER} ]]; then 2132 if [[ -n ${GENTOO_COMPILER} ]]; then
2131 debug-print "GENTOO_COMPILER already set" 2133 debug-print "GENTOO_COMPILER already set"
2195 done 2197 done
2196 2198
2197 # If it hasn't been defined already, default to javac 2199 # If it hasn't been defined already, default to javac
2198 if [[ -z ${GENTOO_COMPILER} ]]; then 2200 if [[ -z ${GENTOO_COMPILER} ]]; then
2199 if [[ -n ${compilers} ]]; then 2201 if [[ -n ${compilers} ]]; then
2200 einfo "No suitable compiler found: defaulting javac for compilation" 2202 einfo "No suitable compiler found: defaulting to JDK default for compilation"
2201 else 2203 else
2202 # probably don't need to notify users about the default. 2204 # probably don't need to notify users about the default.
2203 :;#einfo "Defaulting to javac for compilation" 2205 :;#einfo "Defaulting to javac for compilation"
2204 fi 2206 fi
2207 if java-config -g GENTOO_COMPILER 2> /dev/null; then
2208 export GENTOO_COMPILER=$(java-config -g GENTOO_COMPILER)
2209 else
2205 export GENTOO_COMPILER=javac 2210 export GENTOO_COMPILER=javac
2211 fi
2206 else 2212 else
2207 einfo "Using ${GENTOO_COMPILER} for compilation" 2213 einfo "Using ${GENTOO_COMPILER} for compilation"
2208 fi 2214 fi
2209 2215
2210} 2216}
2211 2217
2212# ------------------------------------------------------------------------------ 2218# @FUNCTION: init_paths_
2213# @internal-function init_paths_ 2219# @INTERNAL
2214# 2220# @DESCRIPTION:
2215# Initializes some variables that will be used. These variables are mostly used 2221# Initializes some variables that will be used. These variables are mostly used
2216# to determine where things will eventually get installed. 2222# to determine where things will eventually get installed.
2217# ------------------------------------------------------------------------------
2218java-pkg_init_paths_() { 2223java-pkg_init_paths_() {
2219 debug-print-function ${FUNCNAME} $* 2224 debug-print-function ${FUNCNAME} $*
2220 2225
2221 local pkg_name 2226 local pkg_name
2222 if [[ "$SLOT" == "0" ]] ; then 2227 if [[ "${SLOT%/*}" == "0" ]] ; then
2223 JAVA_PKG_NAME="${PN}" 2228 JAVA_PKG_NAME="${PN}"
2224 else 2229 else
2225 JAVA_PKG_NAME="${PN}-${SLOT}" 2230 JAVA_PKG_NAME="${PN}-${SLOT%/*}"
2226 fi 2231 fi
2227 2232
2228 JAVA_PKG_SHAREPATH="${DESTTREE}/share/${JAVA_PKG_NAME}" 2233 JAVA_PKG_SHAREPATH="${DESTTREE}/share/${JAVA_PKG_NAME}"
2229 JAVA_PKG_SOURCESPATH="${JAVA_PKG_SHAREPATH}/sources/" 2234 JAVA_PKG_SOURCESPATH="${JAVA_PKG_SHAREPATH}/sources/"
2230 JAVA_PKG_ENV="${D}${JAVA_PKG_SHAREPATH}/package.env" 2235 JAVA_PKG_ENV="${D}${JAVA_PKG_SHAREPATH}/package.env"
2232 JAVA_PKG_VIRTUAL_PROVIDER="${D}/${JAVA_PKG_VIRTUALS_PATH}/${JAVA_PKG_NAME}" 2237 JAVA_PKG_VIRTUAL_PROVIDER="${D}/${JAVA_PKG_VIRTUALS_PATH}/${JAVA_PKG_NAME}"
2233 2238
2234 [[ -z "${JAVA_PKG_JARDEST}" ]] && JAVA_PKG_JARDEST="${JAVA_PKG_SHAREPATH}/lib" 2239 [[ -z "${JAVA_PKG_JARDEST}" ]] && JAVA_PKG_JARDEST="${JAVA_PKG_SHAREPATH}/lib"
2235 [[ -z "${JAVA_PKG_LIBDEST}" ]] && JAVA_PKG_LIBDEST="${DESTTREE}/$(get_libdir)/${JAVA_PKG_NAME}" 2240 [[ -z "${JAVA_PKG_LIBDEST}" ]] && JAVA_PKG_LIBDEST="${DESTTREE}/$(get_libdir)/${JAVA_PKG_NAME}"
2236 [[ -z "${JAVA_PKG_WARDEST}" ]] && JAVA_PKG_WARDEST="${JAVA_PKG_SHAREPATH}/webapps" 2241 [[ -z "${JAVA_PKG_WARDEST}" ]] && JAVA_PKG_WARDEST="${JAVA_PKG_SHAREPATH}/webapps"
2237
2238 2242
2239 # TODO maybe only print once? 2243 # TODO maybe only print once?
2240 debug-print "JAVA_PKG_SHAREPATH: ${JAVA_PKG_SHAREPATH}" 2244 debug-print "JAVA_PKG_SHAREPATH: ${JAVA_PKG_SHAREPATH}"
2241 debug-print "JAVA_PKG_ENV: ${JAVA_PKG_ENV}" 2245 debug-print "JAVA_PKG_ENV: ${JAVA_PKG_ENV}"
2242 debug-print "JAVA_PKG_JARDEST: ${JAVA_PKG_JARDEST}" 2246 debug-print "JAVA_PKG_JARDEST: ${JAVA_PKG_JARDEST}"
2243 debug-print "JAVA_PKG_LIBDEST: ${JAVA_PKG_LIBDEST}" 2247 debug-print "JAVA_PKG_LIBDEST: ${JAVA_PKG_LIBDEST}"
2244 debug-print "JAVA_PKG_WARDEST: ${JAVA_PKG_WARDEST}" 2248 debug-print "JAVA_PKG_WARDEST: ${JAVA_PKG_WARDEST}"
2245} 2249}
2246 2250
2247# ------------------------------------------------------------------------------ 2251# @FUNCTION: java-pkg_do_write_
2248# @internal-function java-pkg_do_write_ 2252# @INTERNAL
2249# 2253# @DESCRIPTION:
2250# Writes the package.env out to disk. 2254# Writes the package.env out to disk.
2251# 2255#
2252# ------------------------------------------------------------------------------
2253# TODO change to do-write, to match everything else 2256# TODO change to do-write, to match everything else
2254java-pkg_do_write_() { 2257java-pkg_do_write_() {
2255 debug-print-function ${FUNCNAME} $* 2258 debug-print-function ${FUNCNAME} $*
2256 java-pkg_init_paths_ 2259 java-pkg_init_paths_
2257 # Create directory for package.env 2260 # Create directory for package.env
2261 "${JAVA_PKG_OPTIONAL_DEPEND_FILE}" ]]; then 2264 "${JAVA_PKG_OPTIONAL_DEPEND_FILE}" ]]; then
2262 # Create package.env 2265 # Create package.env
2263 ( 2266 (
2264 echo "DESCRIPTION=\"${DESCRIPTION}\"" 2267 echo "DESCRIPTION=\"${DESCRIPTION}\""
2265 echo "GENERATION=\"2\"" 2268 echo "GENERATION=\"2\""
2269 echo "SLOT=\"${SLOT}\""
2270 echo "CATEGORY=\"${CATEGORY}\""
2271 echo "PVR=\"${PVR}\""
2266 2272
2267 [[ -n "${JAVA_PKG_CLASSPATH}" ]] && echo "CLASSPATH=\"${JAVA_PKG_CLASSPATH}\"" 2273 [[ -n "${JAVA_PKG_CLASSPATH}" ]] && echo "CLASSPATH=\"${JAVA_PKG_CLASSPATH}\""
2268 [[ -n "${JAVA_PKG_LIBRARY}" ]] && echo "LIBRARY_PATH=\"${JAVA_PKG_LIBRARY}\"" 2274 [[ -n "${JAVA_PKG_LIBRARY}" ]] && echo "LIBRARY_PATH=\"${JAVA_PKG_LIBRARY}\""
2269 [[ -n "${JAVA_PROVIDE}" ]] && echo "PROVIDES=\"${JAVA_PROVIDE}\"" 2275 [[ -n "${JAVA_PROVIDE}" ]] && echo "PROVIDES=\"${JAVA_PROVIDE}\""
2270 [[ -f "${JAVA_PKG_DEPEND_FILE}" ]] \ 2276 [[ -f "${JAVA_PKG_DEPEND_FILE}" ]] \
2271 && echo "DEPEND=\"$(cat "${JAVA_PKG_DEPEND_FILE}" | uniq | tr '\n' ':')\"" 2277 && echo "DEPEND=\"$(sort -u "${JAVA_PKG_DEPEND_FILE}" | tr '\n' ':')\""
2272 [[ -f "${JAVA_PKG_OPTIONAL_DEPEND_FILE}" ]] \ 2278 [[ -f "${JAVA_PKG_OPTIONAL_DEPEND_FILE}" ]] \
2273 && echo "OPTIONAL_DEPEND=\"$(cat "${JAVA_PKG_OPTIONAL_DEPEND_FILE}" | uniq | tr '\n' ':')\"" 2279 && echo "OPTIONAL_DEPEND=\"$(sort -u "${JAVA_PKG_OPTIONAL_DEPEND_FILE}" | tr '\n' ':')\""
2274 echo "VM=\"$(echo ${RDEPEND} ${DEPEND} | sed -e 's/ /\n/g' | sed -n -e '/virtual\/\(jre\|jdk\)/ { p;q }')\"" # TODO cleanup ! 2280 echo "VM=\"$(echo ${RDEPEND} ${DEPEND} | sed -e 's/ /\n/g' | sed -n -e '/virtual\/\(jre\|jdk\)/ { p;q }')\"" # TODO cleanup !
2281 [[ -f "${JAVA_PKG_BUILD_DEPEND_FILE}" ]] \
2282 && echo "BUILD_DEPEND=\"$(sort -u "${JAVA_PKG_BUILD_DEPEND_FILE}" | tr '\n' ':')\""
2275 ) > "${JAVA_PKG_ENV}" 2283 ) > "${JAVA_PKG_ENV}"
2276 2284
2277 # register target/source 2285 # register target/source
2278 local target="$(java-pkg_get-target)" 2286 local target="$(java-pkg_get-target)"
2279 local source="$(java-pkg_get-source)" 2287 local source="$(java-pkg_get-source)"
2307 debug-print "or JAVA_PKG_OPTIONAL_DEPEND_FILE not defined so can't" 2315 debug-print "or JAVA_PKG_OPTIONAL_DEPEND_FILE not defined so can't"
2308 debug-print "write package.env." 2316 debug-print "write package.env."
2309 fi 2317 fi
2310} 2318}
2311 2319
2312# ------------------------------------------------------------------------------ 2320# @FUNCTION: java-pkg_record-jar_
2313# @internal-function java-pkg_record-jar_ 2321# @INTERNAL
2314# 2322# @DESCRIPTION:
2315# Record an (optional) dependency to the package.env 2323# Record an (optional) dependency to the package.env
2324# @CODE
2325# Parameters:
2316# @param --optional - record dependency as optional 2326# --optional - record dependency as optional
2327# --build - record dependency as build_only
2317# @param $1 - package to record 2328# $1 - package to record
2318# @param $2 - (optional) jar of package to record 2329# $2 - (optional) jar of package to record
2319# ------------------------------------------------------------------------------ 2330# @CODE
2320JAVA_PKG_DEPEND_FILE="${T}/java-pkg-depend" 2331JAVA_PKG_DEPEND_FILE="${T}/java-pkg-depend"
2321JAVA_PKG_OPTIONAL_DEPEND_FILE="${T}/java-pkg-optional-depend" 2332JAVA_PKG_OPTIONAL_DEPEND_FILE="${T}/java-pkg-optional-depend"
2333JAVA_PKG_BUILD_DEPEND_FILE="${T}/java-pkg-build-depend"
2322 2334
2323java-pkg_record-jar_() { 2335java-pkg_record-jar_() {
2324 debug-print-function ${FUNCNAME} $* 2336 debug-print-function ${FUNCNAME} $*
2325 2337
2326 local depend_file="${JAVA_PKG_DEPEND_FILE}" 2338 local depend_file="${JAVA_PKG_DEPEND_FILE}"
2327 if [[ "${1}" == "--optional" ]]; then 2339 case "${1}" in
2328 depend_file="${JAVA_PKG_OPTIONAL_DEPEND_FILE}" 2340 "--optional") depend_file="${JAVA_PKG_OPTIONAL_DEPEND_FILE}"; shift;;
2329 shift 2341 "--build-only") depend_file="${JAVA_PKG_BUILD_DEPEND_FILE}"; shift;;
2330 fi 2342 esac
2331 2343
2332 local pkg=${1} jar=${2} append 2344 local pkg=${1} jar=${2} append
2333 if [[ -z "${jar}" ]]; then 2345 if [[ -z "${jar}" ]]; then
2334 append="${pkg}" 2346 append="${pkg}"
2335 else 2347 else
2337 fi 2349 fi
2338 2350
2339 echo "${append}" >> "${depend_file}" 2351 echo "${append}" >> "${depend_file}"
2340} 2352}
2341 2353
2342# ------------------------------------------------------------------------------ 2354# @FUNCTION: java-pkg_append_
2343# @internal-function java-pkg_append_ 2355# @INTERNAL
2344# 2356# @DESCRIPTION:
2345# Appends a value to a variable 2357# Appends a value to a variable
2346# 2358#
2347# Example: java-pkg_append_ CLASSPATH foo.jar 2359# @CODE
2360# Parameters:
2348# @param $1 variable name to modify 2361# $1 variable name to modify
2349# @param $2 value to append 2362# $2 value to append
2350# ------------------------------------------------------------------------------ 2363#
2364# Examples:
2365# java-pkg_append_ CLASSPATH foo.jar
2366# @CODE
2351java-pkg_append_() { 2367java-pkg_append_() {
2352 debug-print-function ${FUNCNAME} $* 2368 debug-print-function ${FUNCNAME} $*
2353 2369
2354 local var="${1}" value="${2}" 2370 local var="${1}" value="${2}"
2355 if [[ -z "${!var}" ]] ; then 2371 if [[ -z "${!var}" ]] ; then
2366 [[ -z ${haveit} ]] && export ${var}="${!var}:${value}" 2382 [[ -z ${haveit} ]] && export ${var}="${!var}:${value}"
2367 IFS=${oldIFS} 2383 IFS=${oldIFS}
2368 fi 2384 fi
2369} 2385}
2370 2386
2371# ------------------------------------------------------------------------------ 2387# @FUNCTION: java-pkg_expand_dir_
2372# @internal-function java-pkg_expand_dir_ 2388# @INTERNAL
2373# 2389# @DESCRIPTION:
2374# Gets the full path of the file/directory's parent. 2390# Gets the full path of the file/directory's parent.
2391# @CODE
2392# Parameters:
2375# @param $1 - file/directory to find parent directory for 2393# $1 - file/directory to find parent directory for
2394# @CODE
2376# @return - path to $1's parent directory 2395# @RETURN: path to $1's parent directory
2377# ------------------------------------------------------------------------------
2378java-pkg_expand_dir_() { 2396java-pkg_expand_dir_() {
2379 pushd "$(dirname "${1}")" >/dev/null 2>&1 2397 pushd "$(dirname "${1}")" >/dev/null 2>&1
2380 pwd 2398 pwd
2381 popd >/dev/null 2>&1 2399 popd >/dev/null 2>&1
2382} 2400}
2383 2401
2384# ------------------------------------------------------------------------------ 2402# @FUNCTION: java-pkg_func-exists
2385# @internal-function java-pkg_func-exists 2403# @INTERNAL
2386# 2404# @DESCRIPTION:
2387# Does the indicated function exist? 2405# Does the indicated function exist?
2388# 2406# @RETURN: 0 - function is declared, 1 - function is undeclared
2389# @return 0 - function is declared
2390# @return 1 - function is undeclared
2391# ------------------------------------------------------------------------------
2392java-pkg_func-exists() { 2407java-pkg_func-exists() {
2393 if [[ -n "$(declare -f ${1})" ]]; then 2408 declare -F ${1} > /dev/null
2394 return 0
2395 else
2396 return 1
2397 fi
2398} 2409}
2399 2410
2400# ------------------------------------------------------------------------------ 2411# @FUNCTION: java-pkg_setup-vm
2401# @internal-function java-pkg_setup-vm 2412# @INTERNAL
2402# 2413# @DESCRIPTION:
2403# Sets up the environment for a specific VM 2414# Sets up the environment for a specific VM
2404#
2405# ------------------------------------------------------------------------------
2406java-pkg_setup-vm() { 2415java-pkg_setup-vm() {
2407 debug-print-function ${FUNCNAME} $* 2416 debug-print-function ${FUNCNAME} $*
2408
2409 export LANG="C" LC_ALL="C"
2410 2417
2411 local vendor="$(java-pkg_get-vm-vendor)" 2418 local vendor="$(java-pkg_get-vm-vendor)"
2412 if [[ "${vendor}" == "sun" ]] && java-pkg_is-vm-version-ge "1.5" ; then 2419 if [[ "${vendor}" == "sun" ]] && java-pkg_is-vm-version-ge "1.5" ; then
2413 addpredict "/dev/random" 2420 addpredict "/dev/random"
2414 elif [[ "${vendor}" == "ibm" ]]; then 2421 elif [[ "${vendor}" == "ibm" ]]; then
2415 addpredict "/proc/self/maps" 2422 addpredict "/proc/self/maps"
2416 addpredict "/proc/cpuinfo" 2423 addpredict "/proc/cpuinfo"
2424 addpredict "/proc/self/coredump_filter"
2425 elif [[ "${vendor}" == "oracle" ]]; then
2426 addpredict "/dev/random"
2427 addpredict "/proc/self/coredump_filter"
2428 elif [[ "${vendor}" == icedtea* ]] && java-pkg_is-vm-version-ge "1.7" ; then
2429 addpredict "/dev/random"
2430 addpredict "/proc/self/coredump_filter"
2417 elif [[ "${vendor}" == "jrockit" ]]; then 2431 elif [[ "${vendor}" == "jrockit" ]]; then
2418 addpredict "/proc/cpuinfo" 2432 addpredict "/proc/cpuinfo"
2419 fi 2433 fi
2420} 2434}
2421 2435
2422# ------------------------------------------------------------------------------ 2436# @FUNCTION: java-pkg_needs-vm
2423# @internal-function java-pkg_needs-vm 2437# @INTERNAL
2424# 2438# @DESCRIPTION:
2425# Does the current package depend on virtual/jdk? 2439# Does the current package depend on virtual/jdk or does it set
2440# JAVA_PKG_WANT_BUILD_VM?
2426# 2441#
2427# @return 0 - Package depends on virtual/jdk 2442# @RETURN: 0 - Package depends on virtual/jdk; 1 - Package does not depend on virtual/jdk
2428# @return 1 - Package does not depend on virtual/jdk
2429# ------------------------------------------------------------------------------
2430java-pkg_needs-vm() { 2443java-pkg_needs-vm() {
2431 debug-print-function ${FUNCNAME} $* 2444 debug-print-function ${FUNCNAME} $*
2432 2445
2433 if [[ -n "$(echo ${DEPEND} | sed -e '\:virtual/jdk:!d')" ]]; then 2446 if [[ -n "$(echo ${JAVA_PKG_NV_DEPEND:-${DEPEND}} | sed -e '\:virtual/jdk:!d')" ]]; then
2434 return 0 2447 return 0
2435 fi 2448 fi
2436 2449
2450 [[ -n "${JAVA_PKG_WANT_BUILD_VM}" ]] && return 0
2451
2437 return 1 2452 return 1
2438} 2453}
2439 2454
2440# ------------------------------------------------------------------------------ 2455# @FUNCTION: java-pkg_get-current-vm
2441# @internal-function java-pkg_get-current-vm 2456# @INTERNAL
2442#
2443# @return - The current VM being used 2457# @RETURN - The current VM being used
2444# ------------------------------------------------------------------------------
2445java-pkg_get-current-vm() { 2458java-pkg_get-current-vm() {
2446 java-config -f 2459 java-config -f
2447} 2460}
2448 2461
2449# ------------------------------------------------------------------------------ 2462# @FUNCTION: java-pkg_get-vm-vendor
2450# @internal-function java-pkg_get-vm-vendor 2463# @INTERNAL
2451#
2452# @return - The vendor of the current VM 2464# @RETURN - The vendor of the current VM
2453# ------------------------------------------------------------------------------
2454java-pkg_get-vm-vendor() { 2465java-pkg_get-vm-vendor() {
2455 debug-print-function ${FUNCNAME} $* 2466 debug-print-function ${FUNCNAME} $*
2456 2467
2457 local vm="$(java-pkg_get-current-vm)" 2468 local vm="$(java-pkg_get-current-vm)"
2458 vm="${vm/-*/}" 2469 vm="${vm/-*/}"
2459 echo "${vm}" 2470 echo "${vm}"
2460} 2471}
2461 2472
2462# ------------------------------------------------------------------------------ 2473# @FUNCTION: java-pkg_get-vm-version
2463# @internal-function java-pkg_get-vm-version 2474# @INTERNAL
2464#
2465# @return - The version of the current VM 2475# @RETURN - The version of the current VM
2466# ------------------------------------------------------------------------------
2467java-pkg_get-vm-version() { 2476java-pkg_get-vm-version() {
2468 debug-print-function ${FUNCNAME} $* 2477 debug-print-function ${FUNCNAME} $*
2469 2478
2470 java-config -g PROVIDES_VERSION 2479 java-config -g PROVIDES_VERSION
2471} 2480}
2472 2481
2473# ------------------------------------------------------------------------------ 2482# @FUNCTION: java-pkg_build-vm-from-handle
2474# @internal-function java-pkg_switch-vm 2483# @INTERNAL
2484# @DESCRIPTION:
2485# Selects a build vm from a list of vm handles. First checks for the system-vm
2486# beeing usable, then steps through the listed handles till a suitable vm is
2487# found.
2475# 2488#
2489# @RETURN - VM handle of an available JDK
2490java-pkg_build-vm-from-handle() {
2491 debug-print-function ${FUNCNAME} "$*"
2492
2493 local vm
2494 vm=$(java-pkg_get-current-vm 2>/dev/null)
2495 if [[ $? -eq 0 ]]; then
2496 if has ${vm} ${JAVA_PKG_WANT_BUILD_VM}; then
2497 echo ${vm}
2498 return 0
2499 fi
2500 fi
2501
2502 for vm in ${JAVA_PKG_WANT_BUILD_VM}; do
2503 if java-config-2 --select-vm=${vm} 2>/dev/null; then
2504 echo ${vm}
2505 return 0
2506 fi
2507 done
2508
2509 eerror "${FUNCNAME}: No vm found for handles: ${JAVA_PKG_WANT_BUILD_VM}"
2510 return 1
2511}
2512
2513# @FUNCTION: java-pkg_switch-vm
2514# @INTERNAL
2515# @DESCRIPTION:
2476# Switch VM if we're allowed to (controlled by JAVA_PKG_ALLOW_VM_CHANGE), and 2516# Switch VM if we're allowed to (controlled by JAVA_PKG_ALLOW_VM_CHANGE), and
2477# verify that the current VM is sufficient. 2517# verify that the current VM is sufficient.
2478# Setup the environment for the VM being used. 2518# Setup the environment for the VM being used.
2479# ------------------------------------------------------------------------------
2480java-pkg_switch-vm() { 2519java-pkg_switch-vm() {
2481 debug-print-function ${FUNCNAME} $* 2520 debug-print-function ${FUNCNAME} $*
2482 2521
2483 if java-pkg_needs-vm; then 2522 if java-pkg_needs-vm; then
2484 # Use the VM specified by JAVA_PKG_FORCE_VM 2523 # Use the VM specified by JAVA_PKG_FORCE_VM
2486 # If you're forcing the VM, I hope you know what your doing... 2525 # If you're forcing the VM, I hope you know what your doing...
2487 debug-print "JAVA_PKG_FORCE_VM used: ${JAVA_PKG_FORCE_VM}" 2526 debug-print "JAVA_PKG_FORCE_VM used: ${JAVA_PKG_FORCE_VM}"
2488 export GENTOO_VM="${JAVA_PKG_FORCE_VM}" 2527 export GENTOO_VM="${JAVA_PKG_FORCE_VM}"
2489 # if we're allowed to switch the vm... 2528 # if we're allowed to switch the vm...
2490 elif [[ "${JAVA_PKG_ALLOW_VM_CHANGE}" == "yes" ]]; then 2529 elif [[ "${JAVA_PKG_ALLOW_VM_CHANGE}" == "yes" ]]; then
2491 debug-print "depend-java-query: NV_DEPEND: ${JAVA_PKG_NV_DEPEND:-${DEPEND}} VNEED: ${JAVA_PKG_VNEED}" 2530 # if there is an explicit list of handles to choose from
2492 if [[ -n ${JAVA_PKG_VNEED} ]]; then 2531 if [[ -n "${JAVA_PKG_WANT_BUILD_VM}" ]]; then
2493 GENTOO_VM="$(depend-java-query --need-virtual "${JAVA_PKG_VNEED}" --get-vm "${JAVA_PKG_NV_DEPEND:-${DEPEND}}")" 2532 debug-print "JAVA_PKG_WANT_BUILD_VM used: ${JAVA_PKG_WANT_BUILD_VM}"
2533 GENTOO_VM=$(java-pkg_build-vm-from-handle)
2534 if [[ $? != 0 ]]; then
2535 eerror "${FUNCNAME}: No VM found for handles: ${JAVA_PKG_WANT_BUILD_VM}"
2536 die "${FUNCNAME}: Failed to determine VM for building"
2537 fi
2538 # JAVA_PKG_WANT_SOURCE and JAVA_PKG_WANT_TARGET are required as
2539 # they can't be deduced from handles.
2540 if [[ -z "${JAVA_PKG_WANT_SOURCE}" ]]; then
2541 eerror "JAVA_PKG_WANT_BUILD_VM specified but not JAVA_PKG_WANT_SOURCE"
2542 die "Specify JAVA_PKG_WANT_SOURCE"
2543 fi
2544 if [[ -z "${JAVA_PKG_WANT_TARGET}" ]]; then
2545 eerror "JAVA_PKG_WANT_BUILD_VM specified but not JAVA_PKG_WANT_TARGET"
2546 die "Specify JAVA_PKG_WANT_TARGET"
2547 fi
2548 # otherwise determine a vm from dep string
2494 else 2549 else
2550 debug-print "depend-java-query: NV_DEPEND: ${JAVA_PKG_NV_DEPEND:-${DEPEND}}"
2495 GENTOO_VM="$(depend-java-query --get-vm "${JAVA_PKG_NV_DEPEND:-${DEPEND}}")" 2551 GENTOO_VM="$(depend-java-query --get-vm "${JAVA_PKG_NV_DEPEND:-${DEPEND}}")"
2552 if [[ -z "${GENTOO_VM}" || "${GENTOO_VM}" == "None" ]]; then
2553 eerror "Unable to determine VM for building from dependencies:"
2554 echo "NV_DEPEND: ${JAVA_PKG_NV_DEPEND:-${DEPEND}}"
2555 die "Failed to determine VM for building."
2556 fi
2496 fi 2557 fi
2497 if [[ -z "${GENTOO_VM}" || "${GENTOO_VM}" == "None" ]]; then
2498 eerror "Unable to determine VM for building from dependencies:"
2499 echo "NV_DEPEND: ${JAVA_PKG_NV_DEPEND:-${DEPEND}}"
2500 echo "VNEED: ${JAVA_PKG_VNEED}"
2501 die "Failed to determine VM for building."
2502 else
2503 export GENTOO_VM 2558 export GENTOO_VM
2504 fi
2505 # otherwise just make sure the current VM is sufficient 2559 # otherwise just make sure the current VM is sufficient
2506 else 2560 else
2507 java-pkg_ensure-vm-version-sufficient 2561 java-pkg_ensure-vm-version-sufficient
2508 fi 2562 fi
2509 debug-print "Using: $(java-config -f)" 2563 debug-print "Using: $(java-config -f)"
2537 else 2591 else
2538 [[ -n "${JAVA_PKG_DEBUG}" ]] && ewarn "!!! This package inherits java-pkg but doesn't depend on a JDK. -bin or broken dependency!!!" 2592 [[ -n "${JAVA_PKG_DEBUG}" ]] && ewarn "!!! This package inherits java-pkg but doesn't depend on a JDK. -bin or broken dependency!!!"
2539 fi 2593 fi
2540} 2594}
2541 2595
2542# ------------------------------------------------------------------------------ 2596# @FUNCTION: java-pkg_die
2543# @internal-function java-pkg_die 2597# @INTERNAL
2544# 2598# @DESCRIPTION:
2545# Enhanced die for Java packages, which displays some information that may be 2599# Enhanced die for Java packages, which displays some information that may be
2546# useful for debugging bugs on bugzilla. 2600# useful for debugging bugs on bugzilla.
2547# ------------------------------------------------------------------------------
2548#register_die_hook java-pkg_die 2601#register_die_hook java-pkg_die
2549if ! hasq java-pkg_die ${EBUILD_DEATH_HOOKS}; then 2602if ! has java-pkg_die ${EBUILD_DEATH_HOOKS}; then
2550 EBUILD_DEATH_HOOKS="${EBUILD_DEATH_HOOKS} java-pkg_die" 2603 EBUILD_DEATH_HOOKS="${EBUILD_DEATH_HOOKS} java-pkg_die"
2551fi 2604fi
2552 2605
2553java-pkg_die() { 2606java-pkg_die() {
2554 echo "!!! When you file a bug report, please include the following information:" >&2 2607 echo "!!! When you file a bug report, please include the following information:" >&2
2555 echo "GENTOO_VM=${GENTOO_VM} CLASSPATH=\"${CLASSPATH}\" JAVA_HOME=\"${JAVA_HOME}\"" >&2 2608 echo "GENTOO_VM=${GENTOO_VM} CLASSPATH=\"${CLASSPATH}\" JAVA_HOME=\"${JAVA_HOME}\"" >&2
2556 echo "JAVACFLAGS=\"${JAVACFLAGS}\" COMPILER=\"${GENTOO_COMPILER}\"" >&2 2609 echo "JAVACFLAGS=\"${JAVACFLAGS}\" COMPILER=\"${GENTOO_COMPILER}\"" >&2
2557 echo "and of course, the output of emerge --info" >&2 2610 echo "and of course, the output of emerge --info =${P}" >&2
2558} 2611}
2559 2612
2560 2613
2561# TODO document 2614# TODO document
2562# List jars in the source directory, ${S} 2615# List jars in the source directory, ${S}
2569 einfo "Classes" 2622 einfo "Classes"
2570 find "${S}" -type f -name '*.class' -print0 | xargs -0 -r -n 500 ls -ald | sed -e "s,${WORKDIR},\${WORKDIR}," 2623 find "${S}" -type f -name '*.class' -print0 | xargs -0 -r -n 500 ls -ald | sed -e "s,${WORKDIR},\${WORKDIR},"
2571 fi 2624 fi
2572} 2625}
2573 2626
2574# ------------------------------------------------------------------------------ 2627# @FUNCTION: java-pkg_verify-classes
2575# @internal-function java-pkg_verify-classes 2628# @INTERNAL
2576# 2629# @DESCRIPTION:
2577# Verify that the classes were compiled for the right source / target. Dies if 2630# Verify that the classes were compiled for the right source / target. Dies if
2578# not. 2631# not.
2632# @CODE
2579# @param $1 (optional) - the file to check, otherwise checks whole ${D} 2633# $1 (optional) - the file to check, otherwise checks whole ${D}
2580# ------------------------------------------------------------------------------ 2634# @CODE
2581java-pkg_verify-classes() { 2635java-pkg_verify-classes() {
2582 #$(find ${D} -type f -name '*.jar' -o -name '*.class') 2636 #$(find ${D} -type f -name '*.jar' -o -name '*.class')
2637
2638 local version_verify="/usr/bin/class-version-verify.py"
2639
2640 if [[ ! -x "${version_verify}" ]]; then
2641 version_verify="/usr/$(get_libdir)/javatoolkit/bin/class-version-verify.py"
2642 fi
2643
2644 if [[ ! -x "${version_verify}" ]]; then
2645 ewarn "Unable to perform class version checks as"
2646 ewarn "class-version-verify.py is unavailable"
2647 ewarn "Please install dev-java/javatoolkit."
2648 return
2649 fi
2650
2583 local target=$(java-pkg_get-target) 2651 local target=$(java-pkg_get-target)
2584 local result 2652 local result
2585 local log="${T}/class-version-verify.log" 2653 local log="${T}/class-version-verify.log"
2586 if [[ -n "${1}" ]]; then 2654 if [[ -n "${1}" ]]; then
2587 class-version-verify.py -v -t ${target} "${1}" > "${log}" 2655 ${version_verify} -v -t ${target} "${1}" > "${log}"
2588 result=$? 2656 result=$?
2589 else 2657 else
2590 ebegin "Verifying java class versions (target: ${target})" 2658 ebegin "Verifying java class versions (target: ${target})"
2591 class-version-verify.py -v -t ${target} -r "${D}" > "${log}" 2659 ${version_verify} -v -t ${target} -r "${D}" > "${log}"
2592 result=$? 2660 result=$?
2593 eend ${result} 2661 eend ${result}
2594 fi 2662 fi
2595 [[ -n ${JAVA_PKG_DEBUG} ]] && cat "${log}" 2663 [[ -n ${JAVA_PKG_DEBUG} ]] && cat "${log}"
2596 if [[ ${result} != 0 ]]; then 2664 if [[ ${result} != 0 ]]; then
2599 eerror "See ${log} for more details." 2667 eerror "See ${log} for more details."
2600 die "Incorrect bytecode found" 2668 die "Incorrect bytecode found"
2601 fi 2669 fi
2602} 2670}
2603 2671
2604# ---------------------------------------------------------------------------- 2672# @FUNCTION: java-pkg_ensure-dep
2605# @internal-function java-pkg_ensure-dep 2673# @INTERNAL
2674# @DESCRIPTION:
2606# Check that a package being used in jarfrom, getjars and getjar is contained 2675# Check that a package being used in jarfrom, getjars and getjar is contained
2607# within DEPEND or RDEPEND. 2676# within DEPEND or RDEPEND.
2677# @CODE
2678# Parameters:
2608# @param $1 - empty - check both vars; "runtime" or "build" - check only 2679# $1 - empty - check both vars; "runtime" or "build" - check only
2609# RDEPEND, resp. DEPEND 2680# RDEPEND, resp. DEPEND
2610# @param $2 - Package name and slot. 2681# $2 - Package name and slot.
2611 2682# @CODE
2612java-pkg_ensure-dep() { 2683java-pkg_ensure-dep() {
2613 debug-print-function ${FUNCNAME} $* 2684 debug-print-function ${FUNCNAME} $*
2614 2685
2615 local limit_to="${1}" 2686 local limit_to="${1}"
2616 local target_pkg="${2}" 2687 local target_pkg="${2}"
2617 local dev_error="" 2688 local dev_error=""
2618 2689
2690 # remove the version specification, which may include globbing (* and [123])
2619 local stripped_pkg=$(echo "${target_pkg}" | sed \ 2691 local stripped_pkg=$(echo "${target_pkg}" | sed \
2620 's/-[0-9]*\(\.[0-9]\)*$//') 2692 's/-\([0-9*]*\(\[[0-9]*\]\)*\)*\(\.\([0-9*]*\(\[[0-9]*\]\)*\)*\)*$//')
2621 2693
2622 debug-print "Matching against: ${stripped_pkg}" 2694 debug-print "Matching against: ${stripped_pkg}"
2623 2695
2624 if [[ ${limit_to} != runtime && ! ( "${DEPEND}" =~ "$stripped_pkg" ) ]]; then 2696 if [[ ${limit_to} != runtime && ! ( "${DEPEND}" =~ "$stripped_pkg" ) ]]; then
2625 dev_error="The ebuild is attempting to use ${target_pkg} that is not" 2697 dev_error="The ebuild is attempting to use ${target_pkg} that is not"
2653 fi 2725 fi
2654 fi 2726 fi
2655 fi 2727 fi
2656} 2728}
2657 2729
2658# ------------------------------------------------------------------------------
2659# @section-end internal
2660# ------------------------------------------------------------------------------
2661
2662java-pkg_check-phase() { 2730java-pkg_check-phase() {
2663 local phase=${1} 2731 local phase=${1}
2664 local funcname=${FUNCNAME[1]} 2732 local funcname=${FUNCNAME[1]}
2665 if [[ ${EBUILD_PHASE} != ${phase} ]]; then 2733 if [[ ${EBUILD_PHASE} != ${phase} ]]; then
2666 local msg="${funcname} used outside of src_${phase}" 2734 local msg="${funcname} used outside of src_${phase}"
2675 java-pkg_announce-qa-violation "installing versioned jar '${jar}'" 2743 java-pkg_announce-qa-violation "installing versioned jar '${jar}'"
2676 fi 2744 fi
2677} 2745}
2678 2746
2679java-pkg_check-jikes() { 2747java-pkg_check-jikes() {
2680 if hasq jikes ${IUSE}; then 2748 if has jikes ${IUSE}; then
2681 java-pkg_announce-qa-violation "deprecated USE flag 'jikes' in IUSE" 2749 java-pkg_announce-qa-violation "deprecated USE flag 'jikes' in IUSE"
2682 fi 2750 fi
2683} 2751}
2684 2752
2685java-pkg_announce-qa-violation() { 2753java-pkg_announce-qa-violation() {
2700 2768
2701is-java-strict() { 2769is-java-strict() {
2702 [[ -n ${JAVA_PKG_STRICT} ]] 2770 [[ -n ${JAVA_PKG_STRICT} ]]
2703 return $? 2771 return $?
2704} 2772}
2705
2706# ------------------------------------------------------------------------------
2707# @eclass-end
2708# ------------------------------------------------------------------------------

Legend:
Removed from v.1.94  
changed lines
  Added in v.1.157

  ViewVC Help
Powered by ViewVC 1.1.20