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

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

  ViewVC Help
Powered by ViewVC 1.1.20