/[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.110 Revision 1.158
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-2015, 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.110 2008/07/09 21:16:40 betelgeuse Exp $ 9# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.158 2015/04/14 14:08:34 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# @internal-function depend-java-query 286# @INTERNAL
298# 287# @DESCRIPTION:
299# Wrapper for the depend-java-query binary to enable passing USE in env. 288# Wrapper for the depend-java-query binary to enable passing USE in env.
300# Using env variables keeps this eclass working with java-config versions that 289# Using env variables keeps this eclass working with java-config versions that
301# do not handle use flags. 290# do not handle use flags.
302# ------------------------------------------------------------------------------
303
304depend-java-query() { 291depend-java-query() {
305 # Used to have a which call here but it caused endless loops for some people 292 # Used to have a which call here but it caused endless loops for some people
306 # that had some weird bashrc voodoo for which. 293 # that had some weird bashrc voodoo for which.
307 USE="${USE}" /usr/bin/depend-java-query "${@}" 294 USE="${USE}" /usr/bin/depend-java-query "${@}"
308} 295}
309 296
310# ------------------------------------------------------------------------------ 297# @FUNCTION: java-pkg_regjar
311# @ebuild-function java-pkg_regjar 298# @USAGE: </path/to/installed/jar>
312# 299# @DESCRIPTION:
313# Records an already installed jar in the package.env 300# Records an already installed (in ${D}) jar in the package.env
314# This would mostly be used if the package has make or a custom script to 301# This would mostly be used if the package has make or a custom script to
315# install things. 302# install things.
316# 303#
317# Example:
318# java-pkg_regjar ${D}/opt/foo/lib/foo.jar
319#
320# WARNING: 304# WARNING:
321# if you want to use shell expansion, you have to use ${D}/... as the for in 305# if you want to use shell expansion, you have to use ${D}/... as the for in
322# this function will not be able to expand the path, here's an example: 306# this function will not be able to expand the path, here's an example:
323# 307#
324# java-pkg_regjar /opt/my-java/lib/*.jar 308# @CODE
325#
326# will not work, because:
327# * the `for jar in "$@"` can't expand the path to jar file names, as they
328# don't exist yet
329# * all `if ...` inside for will fail - the file '/opt/my-java/lib/*.jar'
330# doesn't exist
331#
332# you have to use it as:
333#
334# java-pkg_regjar ${D}/opt/my-java/lib/*.jar 309# java-pkg_regjar ${D}/opt/my-java/lib/*.jar
310# @CODE
335# 311#
336# @param $@ - jars to record 312
337# ------------------------------------------------------------------------------
338# TODO should we be making sure the jar is present on ${D} or wherever? 313# TODO should we be making sure the jar is present on ${D} or wherever?
339java-pkg_regjar() { 314java-pkg_regjar() {
340 debug-print-function ${FUNCNAME} $* 315 debug-print-function ${FUNCNAME} $*
341 316
342 java-pkg_check-phase install 317 java-pkg_check-phase install
365 if [[ ${jar} = *\** ]]; then 340 if [[ ${jar} = *\** ]]; then
366 eerror "The argument ${jar} to ${FUNCNAME}" 341 eerror "The argument ${jar} to ${FUNCNAME}"
367 eerror "has * in it. If you want it to glob in" 342 eerror "has * in it. If you want it to glob in"
368 eerror '${D} add ${D} to the argument.' 343 eerror '${D} add ${D} to the argument.'
369 fi 344 fi
345 debug-print "${jar} or ${D}${jar} not found"
370 die "${jar} does not exist" 346 die "${jar} does not exist"
371 fi 347 fi
372 done 348 done
373 349
374 java-pkg_do_write_ 350 java-pkg_do_write_
375} 351}
376 352
377# ------------------------------------------------------------------------------ 353# @FUNCTION: java-pkg_newjar
378# @ebuild-function java-pkg_newjar 354# @USAGE: <path/to/oldname.jar> [<newname.jar>]
355# @DESCRIPTION:
356# Installs a jar with a new name (defaults to $PN.jar)
379# 357#
380# Installs a jar with a new name
381#
382# @example: install a versioned jar without the version 358# For example, installs a versioned jar without the version
383# java-pkg_newjar dist/${P}.jar ${PN}.jar
384#
385# @param $1 - jar to install
386# @param $2 - new name for jar - defaults to ${PN}.jar if not specified
387# ------------------------------------------------------------------------------
388java-pkg_newjar() { 359java-pkg_newjar() {
389 debug-print-function ${FUNCNAME} $* 360 debug-print-function ${FUNCNAME} $*
390 361
391 local original_jar="${1}" 362 local original_jar="${1}"
392 local new_jar="${2:-${PN}.jar}" 363 local new_jar="${2:-${PN}.jar}"
400 cp "${original_jar}" "${new_jar_dest}" \ 371 cp "${original_jar}" "${new_jar_dest}" \
401 || die "Failed to copy ${original_jar} to ${new_jar_dest}" 372 || die "Failed to copy ${original_jar} to ${new_jar_dest}"
402 java-pkg_dojar "${new_jar_dest}" 373 java-pkg_dojar "${new_jar_dest}"
403} 374}
404 375
405# ------------------------------------------------------------------------------ 376# @FUNCTION: java-pkg_addcp
406# @ebuild-function java-pkg_addcp 377# @USAGE: <classpath>
407# 378# @DESCRIPTION:
408# Add something to the package's classpath. For jars, you should use dojar, 379# Add something to the package's classpath. For jars, you should use dojar,
409# newjar, or regjar. This is typically used to add directories to the classpath. 380# newjar, or regjar. This is typically used to add directories to the classpath.
410# 381# The parameters of this function are appended to JAVA_PKG_CLASSPATH
411# TODO add example
412# @param $@ - value to append to JAVA_PKG_CLASSPATH
413# ------------------------------------------------------------------------------
414java-pkg_addcp() { 382java-pkg_addcp() {
415 java-pkg_append_ JAVA_PKG_CLASSPATH "${@}" 383 java-pkg_append_ JAVA_PKG_CLASSPATH "${@}"
416 java-pkg_do_write_ 384 java-pkg_do_write_
417} 385}
418 386
419# ------------------------------------------------------------------------------ 387# @FUNCTION: java-pkg_doso
420# @ebuild-function java-pkg_doso 388# @USAGE: <path/to/file1.so> [...]
421# 389# @DESCRIPTION:
422# Installs any number of JNI libraries 390# Installs any number of JNI libraries
423# They will be installed into /usr/lib by default, but java-pkg_sointo 391# They will be installed into /usr/lib by default, but java-pkg_sointo
424# can be used change this path 392# can be used change this path
425# 393#
394# @CODE
426# Example: 395# Example:
427# java-pkg_doso *.so 396# java-pkg_doso *.so
428# 397# @CODE
429# @param $@ - JNI libraries to install
430# ------------------------------------------------------------------------------
431java-pkg_doso() { 398java-pkg_doso() {
432 debug-print-function ${FUNCNAME} $* 399 debug-print-function ${FUNCNAME} $*
433 400
434 [[ ${#} -lt 1 ]] && "At least one argument required for ${FUNCNAME}"
435 java-pkg_check-phase install 401 java-pkg_check-phase install
436 402
437 [[ ${#} -lt 1 ]] && die "At least one argument required for ${FUNCNAME}" 403 [[ ${#} -lt 1 ]] && die "${FUNCNAME} requires at least one argument"
438 404
439 java-pkg_init_paths_ 405 java-pkg_init_paths_
440 406
441 local lib 407 local lib
442 # for each lib 408 # for each lib
445 if [[ -e "${lib}" ]] ; then 411 if [[ -e "${lib}" ]] ; then
446 # install if it isn't a symlink 412 # install if it isn't a symlink
447 if [[ ! -L "${lib}" ]] ; then 413 if [[ ! -L "${lib}" ]] ; then
448 INSDESTTREE="${JAVA_PKG_LIBDEST}" \ 414 INSDESTTREE="${JAVA_PKG_LIBDEST}" \
449 INSOPTIONS="${LIBOPTIONS}" \ 415 INSOPTIONS="${LIBOPTIONS}" \
450 doins "${lib}" || "failed to install ${lib}" 416 doins "${lib}" || die "failed to install ${lib}"
451 java-pkg_append_ JAVA_PKG_LIBRARY "${JAVA_PKG_LIBDEST}" 417 java-pkg_append_ JAVA_PKG_LIBRARY "${JAVA_PKG_LIBDEST}"
452 debug-print "Installing ${lib} to ${JAVA_PKG_LIBDEST}" 418 debug-print "Installing ${lib} to ${JAVA_PKG_LIBDEST}"
453 # otherwise make a symlink to the symlink's origin 419 # otherwise make a symlink to the symlink's origin
454 else 420 else
455 # TODO use dosym 421 dosym "$(readlink "${lib}")" "${JAVA_PKG_LIBDEST}/${lib##*/}"
456 ln -s "$(readlink "${lib}")" \
457 "${D}${JAVA_PKG_LIBDEST}/$(basename "${lib}")"
458 debug-print "${lib} is a symlink, linking accordanly" 422 debug-print "${lib} is a symlink, linking accordantly"
459 fi 423 fi
460 # otherwise die 424 # otherwise die
461 else 425 else
462 die "${lib} does not exist" 426 die "${lib} does not exist"
463 fi 427 fi
464 done 428 done
465 429
466 java-pkg_do_write_ 430 java-pkg_do_write_
467} 431}
468 432
469# ------------------------------------------------------------------------------ 433# @FUNCTION: java-pkg_regso
470# @ebuild-function java-pkg_regso 434# @USAGE: <file1.so> [...]
471# 435# @DESCRIPTION:
472# Registers an already JNI library in package.env. 436# Registers an already installed JNI library in package.env.
437#
438# @CODE
439# Parameters:
440# $@ - JNI libraries to register
473# 441#
474# Example: 442# Example:
475# java-pkg_regso *.so /path/*.so 443# java-pkg_regso *.so /path/*.so
476# 444# @CODE
477# @param $@ - JNI libraries to register
478# ------------------------------------------------------------------------------
479java-pkg_regso() { 445java-pkg_regso() {
480 debug-print-function ${FUNCNAME} $* 446 debug-print-function ${FUNCNAME} $*
481 447
482 java-pkg_check-phase install 448 java-pkg_check-phase install
483 449
484 [[ ${#} -lt 1 ]] && "at least one argument needed" 450 [[ ${#} -lt 1 ]] && die "${FUNCNAME} requires at least one argument"
485 451
486 java-pkg_init_paths_ 452 java-pkg_init_paths_
487 453
488 local lib target_dir 454 local lib target_dir
489 for lib in "$@" ; do 455 for lib in "$@" ; do
501 done 467 done
502 468
503 java-pkg_do_write_ 469 java-pkg_do_write_
504} 470}
505 471
506# ------------------------------------------------------------------------------ 472# @FUNCTION: java-pkg_jarinto
507# @ebuild-function java-pkg_jarinto 473# @USAGE: </path/to/install/jars/into>
508# 474# @DESCRIPTION:
509# Changes the path jars are installed into 475# Changes the path jars are installed into via subsequent java-pkg_dojar calls.
510#
511# @param $1 - new location to install jars into.
512# -----------------------------------------------------------------------------
513java-pkg_jarinto() { 476java-pkg_jarinto() {
514 debug-print-function ${FUNCNAME} $* 477 debug-print-function ${FUNCNAME} $*
515 478
516 JAVA_PKG_JARDEST="${1}" 479 JAVA_PKG_JARDEST="${1}"
517} 480}
518 481
519# ------------------------------------------------------------------------------ 482# @FUNCTION: java-pkg_sointo
520# @ebuild-function java-pkg_sointo 483# @USAGE: </path/to/install/sofiles/into>
521# 484# @DESCRIPTION:
522# Changes the path that JNI libraries are installed into. 485# Changes the path that JNI libraries are installed into via subsequent
523# 486# java-pkg_doso calls.
524# @param $1 - new location to install JNI libraries into.
525# ------------------------------------------------------------------------------
526java-pkg_sointo() { 487java-pkg_sointo() {
527 debug-print-function ${FUNCNAME} $* 488 debug-print-function ${FUNCNAME} $*
528 489
529 JAVA_PKG_LIBDEST="${1}" 490 JAVA_PKG_LIBDEST="${1}"
530} 491}
531 492
532# ------------------------------------------------------------------------------ 493# @FUNCTION: java-pkg_dohtml
533# @ebuild-function java-pkg_dohtml 494# @USAGE: <path/to/javadoc/documentation> [...]
495# @DESCRIPTION:
496# Install Javadoc HTML documentation. Usage of java-pkg_dojavadoc is preferred.
534# 497#
535# Install Javadoc HTML documentation 498# @CODE
536#
537# @example
538# java-pkg_dohtml dist/docs/ 499# java-pkg_dohtml dist/docs/
539# 500# @CODE
540# ------------------------------------------------------------------------------
541java-pkg_dohtml() { 501java-pkg_dohtml() {
542 debug-print-function ${FUNCNAME} $* 502 debug-print-function ${FUNCNAME} $*
543 503
544 [[ ${#} -lt 1 ]] && die "At least one argument required for ${FUNCNAME}" 504 [[ ${#} -lt 1 ]] && die "At least one argument required for ${FUNCNAME}"
545 505
551 # a reasonable way to catch # docs for all of the 511 # a reasonable way to catch # docs for all of the
552 # old ebuilds. 512 # old ebuilds.
553 java-pkg_recordjavadoc 513 java-pkg_recordjavadoc
554} 514}
555 515
556# ------------------------------------------------------------------------------ 516# @FUNCTION: java-pkg_dojavadoc
557# @ebuild-function java-pkg_dojavadoc 517# @USAGE: [--symlink destination] <path/to/javadocs/root>
558# 518# @DESCRIPTION:
559# Installs javadoc documentation. This should be controlled by the doc use flag. 519# Installs javadoc documentation. This should be controlled by the doc use flag.
560# 520#
521# @CODE
522# Parameters:
561# @param $1: optional --symlink creates to symlink like this for html 523# $1: optional --symlink creates to symlink like this for html
562# documentation bundles. 524# documentation bundles.
563# @param $2: - The javadoc root directory. 525# $2: - The javadoc root directory.
564# 526#
565# @example: 527# Examples:
566# java-pkg_dojavadoc docs/api 528# java-pkg_dojavadoc docs/api
567# java-pkg_dojavadoc --symlink apidocs docs/api 529# java-pkg_dojavadoc --symlink apidocs docs/api
568# 530# @CODE
569# ------------------------------------------------------------------------------
570java-pkg_dojavadoc() { 531java-pkg_dojavadoc() {
571 debug-print-function ${FUNCNAME} $* 532 debug-print-function ${FUNCNAME} $*
572 533
573 # For html documentation bundles that link to Javadoc 534 # For html documentation bundles that link to Javadoc
574 local symlink 535 local symlink
581 local dest=/usr/share/doc/${PF}/html 542 local dest=/usr/share/doc/${PF}/html
582 543
583 # QA checks 544 # QA checks
584 545
585 java-pkg_check-phase install 546 java-pkg_check-phase install
547 java-pkg_init_paths_
586 548
587 [[ -z "${dir}" ]] && die "Must specify a directory!" 549 [[ -z "${dir}" ]] && die "Must specify a directory!"
588 [[ ! -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!"
589 if [[ ! -e "${dir}/index.html" ]]; then 551 if [[ ! -e "${dir}/index.html" ]]; then
590 local msg="No index.html in javadoc directory" 552 local msg="No index.html in javadoc directory"
617 debug-print "symlinking ${dest}/{api,${symlink}}" 579 debug-print "symlinking ${dest}/{api,${symlink}}"
618 dosym ${dest}/{api,${symlink}} || die 580 dosym ${dest}/{api,${symlink}} || die
619 fi 581 fi
620} 582}
621 583
622# ------------------------------------------------------------------------------ 584# @FUNCTION: java-pkg_dosrc
623# @ebuild-function java-pkg_dosrc 585# @USAGE: <path/to/sources> [...]
624# 586# @DESCRIPTION:
625# 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
626# 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.
627# 590#
628# Ebuild needs to DEPEND on app-arch/zip to use this. 591# @CODE
629#
630# It also should be controlled by USE=source.
631#
632# @example: 592# Example:
633# java-pkg_dosrc src/* 593# java-pkg_dosrc src/*
634# 594# @CODE
635# ------------------------------------------------------------------------------ 595
636# 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
637# source -nichoj 597# source -nichoj
598#
638# 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#
639# TODO maybe we can take an existing zip/jar? -nichoj 601# TODO maybe we can take an existing zip/jar? -nichoj
602#
640# FIXME apparently this fails if you give it an empty directories 603# FIXME apparently this fails if you give it an empty directories
641java-pkg_dosrc() { 604java-pkg_dosrc() {
642 debug-print-function ${FUNCNAME} $* 605 debug-print-function ${FUNCNAME} $*
643 606
644 [ ${#} -lt 1 ] && die "At least one argument needed" 607 [ ${#} -lt 1 ] && die "At least one argument needed"
676 639
677 JAVA_SOURCES="${JAVA_PKG_SOURCESPATH}/${zip_name}" 640 JAVA_SOURCES="${JAVA_PKG_SOURCESPATH}/${zip_name}"
678 java-pkg_do_write_ 641 java-pkg_do_write_
679} 642}
680 643
681# ------------------------------------------------------------------------------ 644# @FUNCTION: java-pkg_dolauncher
682# @ebuild-function java-pkg_dolauncher 645# @USAGE: <filename> [options]
683# 646# @DESCRIPTION:
684# Make a wrapper script to lauch/start this package 647# Make a wrapper script to lauch/start this package
685# If necessary, the wrapper will switch to the appropriate VM. 648# If necessary, the wrapper will switch to the appropriate VM.
686# 649#
687# 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
688# 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}.
689# 652#
653# @CODE
654# Parameters:
690# @param $1 - filename of launcher to create 655# $1 - filename of launcher to create
691# @param $2 - options, as follows: 656# $2 - options, as follows:
692# --main the.main.class.too.start 657# --main the.main.class.to.start
693# --jar /the/jar/too/launch.jar or just <name>.jar 658# --jar /the/jar/too/launch.jar or just <name>.jar
694# --java_args 'Extra arguments to pass to java' 659# --java_args 'Extra arguments to pass to java'
695# --pkg_args 'Extra arguments to pass to the package' 660# --pkg_args 'Extra arguments to pass to the package'
696# --pwd Directory the launcher changes to before executing java 661# --pwd Directory the launcher changes to before executing java
697# -into Directory to install the launcher to, instead of /usr/bin 662# -into Directory to install the launcher to, instead of /usr/bin
698# -pre Prepend contents of this file to the launcher 663# -pre Prepend contents of this file to the launcher
699# ------------------------------------------------------------------------------ 664# @CODE
700java-pkg_dolauncher() { 665java-pkg_dolauncher() {
701 debug-print-function ${FUNCNAME} $* 666 debug-print-function ${FUNCNAME} $*
702 667
703 java-pkg_check-phase install 668 java-pkg_check-phase install
704 java-pkg_init_paths_ 669 java-pkg_init_paths_
765 else 730 else
766 dobin "${target}" 731 dobin "${target}"
767 fi 732 fi
768} 733}
769 734
770# ------------------------------------------------------------------------------ 735# @FUNCTION: java-pkg_dowar
736# @DESCRIPTION:
771# Install war files. 737# Install war files.
772# TODO document 738# TODO document
773# ------------------------------------------------------------------------------
774java-pkg_dowar() { 739java-pkg_dowar() {
775 debug-print-function ${FUNCNAME} $* 740 debug-print-function ${FUNCNAME} $*
776 741
777 # Check for arguments 742 # Check for arguments
778 [[ ${#} -lt 1 ]] && die "At least one argument needed" 743 [[ ${#} -lt 1 ]] && die "At least one argument needed"
802 INSDESTTREE=${JAVA_PKG_WARDEST} \ 767 INSDESTTREE=${JAVA_PKG_WARDEST} \
803 doins ${warpath} 768 doins ${warpath}
804 done 769 done
805} 770}
806 771
807# ------------------------------------------------------------------------------ 772# @FUNCTION: java-pkg_recordjavadoc
808# @internal-function java-pkg_recordjavadoc 773# @INTERNAL
774# @DESCRIPTION:
809# 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
810# 776
811# TODO make sure this in the proper section 777# TODO make sure this in the proper section
812# ------------------------------------------------------------------------------
813java-pkg_recordjavadoc() 778java-pkg_recordjavadoc()
814{ 779{
815 debug-print-function ${FUNCNAME} $* 780 debug-print-function ${FUNCNAME} $*
816 # the find statement is important 781 # the find statement is important
817 # as some packages include multiple trees of javadoc 782 # as some packages include multiple trees of javadoc
824 else 789 else
825 debug-print "No javadocs found" 790 debug-print "No javadocs found"
826 fi 791 fi
827} 792}
828 793
829# ------------------------------------------------------------------------------
830# @section-end install
831# ------------------------------------------------------------------------------
832 794
833# ------------------------------------------------------------------------------ 795# @FUNCTION: java-pkg_jar-from
834# @begin-section query 796# @USAGE: [--build-only] [--with-dependencies] [--virtual] [--into dir] <package> [<package.jar>] [<destination.jar>]
835# Use these to build the classpath for building a package. 797# @DESCRIPTION:
836# ------------------------------------------------------------------------------
837
838# ------------------------------------------------------------------------------
839# @ebuild-function java-pkg_jar-from
840#
841# Makes a symlink to a jar from a certain package 798# Makes a symlink to a jar from a certain package
842# A lot of java packages include dependencies in a lib/ directory 799# A lot of java packages include dependencies in a lib/ directory
843# You can use this function to replace these bundled dependencies. 800# You can use this function to replace these bundled dependencies.
844# 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"
845# 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
846# 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).
847# 804#
805# @CODE
848# Example: get all jars from xerces slot 2 806# Example: get all jars from xerces slot 2
849# java-pkg_jar-from xerces-2 807# java-pkg_jar-from xerces-2
808#
850# Example: get a specific jar from xerces slot 2 809# Example: get a specific jar from xerces slot 2
851# java-pkg_jar-from xerces-2 xml-apis.jar 810# java-pkg_jar-from xerces-2 xml-apis.jar
811#
852# 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
853# java-pkg_jar-from xerces-2 xml-apis.jar xml.jar 813# java-pkg_jar-from xerces-2 xml-apis.jar xml.jar
814#
854# Example: get junit.jar which is needed only for building 815# Example: get junit.jar which is needed only for building
855# java-pkg_jar-from --build-only junit junit.jar 816# java-pkg_jar-from --build-only junit junit.jar
817# @CODE
856# 818#
857# @param $opt 819# @CODE
820# Parameters
858# --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.
859# (assumed automatically when called inside src_test) 822# (assumed automatically when called inside src_test)
860# --with-dependencies - get jars also from requested package's dependencies 823# --with-dependencies - get jars also from requested package's dependencies
861# transitively. 824# transitively.
862# --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
863# and will not have individual jar dependencies recorded. 826# and will not have individual jar dependencies recorded.
864# --into $dir - symlink jar(s) into $dir (must exist) instead of . 827# --into $dir - symlink jar(s) into $dir (must exist) instead of .
865# @param $1 - Package to get jars from, or comma-separated list of packages in 828# $1 - Package to get jars from, or comma-separated list of packages in
866# case other parameters are not used. 829# case other parameters are not used.
867# @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.
868# @param $3 - When a single jar is specified, destination filename of the 831# $3 - When a single jar is specified, destination filename of the
869# symlink. Defaults to the name of the jar. 832# symlink. Defaults to the name of the jar.
870# ------------------------------------------------------------------------------ 833# @CODE
834
871# TODO could probably be cleaned up a little 835# TODO could probably be cleaned up a little
872java-pkg_jar-from() { 836java-pkg_jar-from() {
873 debug-print-function ${FUNCNAME} $* 837 debug-print-function ${FUNCNAME} $*
874 838
875 local build_only="" 839 local build_only=""
876 local destdir="." 840 local destdir="."
877 local deep="" 841 local deep=""
878 local virtual="" 842 local virtual=""
843 local record_jar=""
879 844
880 [[ "${EBUILD_PHASE}" == "test" ]] && build_only="build" 845 [[ "${EBUILD_PHASE}" == "test" ]] && build_only="build"
881 846
882 while [[ "${1}" == --* ]]; do 847 while [[ "${1}" == --* ]]; do
883 if [[ "${1}" = "--build-only" ]]; then 848 if [[ "${1}" = "--build-only" ]]; then
918 for pkg in ${target_pkg//,/ }; do 883 for pkg in ${target_pkg//,/ }; do
919 java-pkg_ensure-dep "${build_only}" "${pkg}" 884 java-pkg_ensure-dep "${build_only}" "${pkg}"
920 [[ -z "${build_only}" ]] && java-pkg_record-jar_ "${pkg}" 885 [[ -z "${build_only}" ]] && java-pkg_record-jar_ "${pkg}"
921 done 886 done
922 # setting this disables further record-jar_ calls later 887 # setting this disables further record-jar_ calls later
923 build_only="build" 888 record_jar="true"
924 else 889 else
925 java-pkg_ensure-dep "${build_only}" "${target_pkg}" 890 java-pkg_ensure-dep "${build_only}" "${target_pkg}"
926 fi 891 fi
927 892
928 # Record the entire virtual as a dependency so that 893 # Record the entire virtual as a dependency so that
929 # no jars are missed. 894 # no jars are missed.
930 if [[ -z "${build_only}" && -n "${virtual}" ]]; then 895 if [[ -z "${build_only}" && -n "${virtual}" ]]; then
931 java-pkg_record-jar_ "${target_pkg}" 896 java-pkg_record-jar_ "${target_pkg}"
932 # setting this disables further record-jars_ calls later 897 # setting this disables further record-jars_ calls later
933 build_only="build" 898 record_jar="true"
934 fi 899 fi
935 900
936 pushd ${destdir} > /dev/null \ 901 pushd ${destdir} > /dev/null \
937 || die "failed to change directory to ${destdir}" 902 || die "failed to change directory to ${destdir}"
938 903
946 # If no specific target jar was indicated, link it 911 # If no specific target jar was indicated, link it
947 if [[ -z "${target_jar}" ]] ; then 912 if [[ -z "${target_jar}" ]] ; then
948 [[ -f "${target_jar}" ]] && rm "${target_jar}" 913 [[ -f "${target_jar}" ]] && rm "${target_jar}"
949 ln -snf "${jar}" \ 914 ln -snf "${jar}" \
950 || 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
951 [[ -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
952 # otherwise, if the current jar is the target jar, link it 923 # otherwise, if the current jar is the target jar, link it
953 elif [[ "${jar_name}" == "${target_jar}" ]] ; then 924 elif [[ "${jar_name}" == "${target_jar}" ]] ; then
954 [[ -f "${destjar}" ]] && rm "${destjar}" 925 [[ -f "${destjar}" ]] && rm "${destjar}"
955 ln -snf "${jar}" "${destjar}" \ 926 ln -snf "${jar}" "${destjar}" \
956 || 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
957 [[ -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
958 popd > /dev/null 935 popd > /dev/null
959 return 0 936 return 0
960 fi 937 fi
961 done 938 done
962 popd > /dev/null 939 popd > /dev/null
967 else 944 else
968 die "Failed to find ${target_jar:-jar} in ${target_pkg}" 945 die "Failed to find ${target_jar:-jar} in ${target_pkg}"
969 fi 946 fi
970} 947}
971 948
972# ------------------------------------------------------------------------------ 949# @FUNCTION: java-pkg_jarfrom
973# @ebuild-function java-pkg_jarfrom 950# @DESCRIPTION:
974#
975# See java-pkg_jar-from 951# See java-pkg_jar-from
976# ------------------------------------------------------------------------------
977java-pkg_jarfrom() { 952java-pkg_jarfrom() {
978 java-pkg_jar-from "$@" 953 java-pkg_jar-from "$@"
979} 954}
980 955
981# ------------------------------------------------------------------------------ 956# @FUNCTION: java-pkg_getjars
982# @ebuild-function java-pkg_getjars 957# @USAGE: [--build-only] [--with-dependencies] <package1>[,<package2>...]
983# 958# @DESCRIPTION:
984# Get the classpath provided by any number of packages 959# Get the classpath provided by any number of packages
985# 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'.
986# The providing packages are recorded as dependencies into package.env DEPEND 961# The providing packages are recorded as dependencies into package.env DEPEND
987# line, unless "--build-only" is passed as the very first argument, for jars 962# line, unless "--build-only" is passed as the very first argument, for jars
988# that have to be present only at build time and are not needed on runtime 963# that have to be present only at build time and are not needed on runtime
989# (junit testing etc). 964# (junit testing etc).
990# 965#
966# @CODE
991# Example: Get the classpath for xerces-2 and xalan, 967# Example: Get the classpath for xerces-2 and xalan,
992# java-pkg_getjars xerces-2,xalan 968# java-pkg_getjars xerces-2,xalan
969#
993# Example Return: 970# Example Return:
994# /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
995# 972#
996# @param $opt 973#
974# Parameters:
997# --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.
998# (assumed automatically when called inside src_test) 976# (assumed automatically when called inside src_test)
999# --with-dependencies - get jars also from requested package's dependencies 977# --with-dependencies - get jars also from requested package's dependencies
1000# transitively. 978# transitively.
1001# @param $1 - list of packages to get jars from 979# $1 - list of packages to get jars from
1002# (passed to java-config --classpath) 980# (passed to java-config --classpath)
1003# ------------------------------------------------------------------------------ 981# @CODE
1004java-pkg_getjars() { 982java-pkg_getjars() {
1005 debug-print-function ${FUNCNAME} $* 983 debug-print-function ${FUNCNAME} $*
1006 984
1007 local build_only="" 985 local build_only=""
1008 local deep="" 986 local deep=""
1035 1013
1036 for pkg in ${pkgs//,/ }; do 1014 for pkg in ${pkgs//,/ }; do
1037 java-pkg_ensure-dep "${build_only}" "${pkg}" 1015 java-pkg_ensure-dep "${build_only}" "${pkg}"
1038 done 1016 done
1039 1017
1040 # Only record jars that aren't build-only 1018 for pkg in ${pkgs//,/ }; do
1041 if [[ -z "${build_only}" ]]; then 1019 if [[ -z "${build_only}" ]]; then
1042 for pkg in ${pkgs//,/ }; do
1043 java-pkg_record-jar_ "${pkg}" 1020 java-pkg_record-jar_ "${pkg}"
1021 else
1022 java-pkg_record-jar_ --build-only "${pkg}"
1023 fi
1044 done 1024 done
1045 fi
1046 1025
1047 echo "${jars}" 1026 echo "${jars}"
1048} 1027}
1049 1028
1050# ------------------------------------------------------------------------------ 1029# @FUNCTION: java-pkg_getjar
1051# @ebuild-function java-pkg_getjar 1030# @USAGE: [--build-only] [--virtual] <package> <jarfile>
1052# 1031# @DESCRIPTION:
1053# Get the filename of a single jar from a package 1032# Get the complete path of a single jar from a package
1054# The providing package is recorded as runtime dependency into package.env 1033# The providing package is recorded as runtime dependency into package.env
1055# DEPEND line, unless "--build-only" is passed as the very first argument, for 1034# DEPEND line, unless "--build-only" is passed as the very first argument, for
1056# jars that have to be present only at build time and are not needed on runtime 1035# jars that have to be present only at build time and are not needed on runtime
1057# (junit testing etc). 1036# (junit testing etc).
1058# 1037#
1038# @CODE
1059# @example 1039# Example:
1060# java-pkg_getjar xerces-2 xml-apis.jar 1040# java-pkg_getjar xerces-2 xml-apis.jar
1061# @example-return 1041# returns
1062# /usr/share/xerces-2/lib/xml-apis.jar 1042# /usr/share/xerces-2/lib/xml-apis.jar
1063# 1043#
1064# @param $opt 1044# Parameters:
1065# --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.
1066# --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
1067# and will not have individual jar dependencies recorded. 1047# and will not have individual jar dependencies recorded.
1068# @param $1 - package to use 1048# $1 - package to use
1069# @param $2 - jar to get 1049# $2 - jar to get
1070# ------------------------------------------------------------------------------ 1050# @CODE
1071java-pkg_getjar() { 1051java-pkg_getjar() {
1072 debug-print-function ${FUNCNAME} $* 1052 debug-print-function ${FUNCNAME} $*
1073 1053
1074 local build_only="" 1054 local build_only=""
1075 local virtual="" 1055 local virtual=""
1056 local record_jar=""
1076 1057
1077 [[ "${EBUILD_PHASE}" == "test" ]] && build_only="build" 1058 [[ "${EBUILD_PHASE}" == "test" ]] && build_only="build"
1078 1059
1079 while [[ "${1}" == --* ]]; do 1060 while [[ "${1}" == --* ]]; do
1080 if [[ "${1}" = "--build-only" ]]; then 1061 if [[ "${1}" = "--build-only" ]]; then
1106 java-pkg_ensure-dep "${build_only}" "${pkg}" 1087 java-pkg_ensure-dep "${build_only}" "${pkg}"
1107 1088
1108 # 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
1109 # So that individual jars are not recorded. 1090 # So that individual jars are not recorded.
1110 if [[ -n "${virtual}" ]]; then 1091 if [[ -n "${virtual}" ]]; then
1092 if [[ -z "${build_only}" ]]; then
1111 java-pkg_record-jar_ "${pkg}" 1093 java-pkg_record-jar_ "${pkg}"
1112 build_only="true" 1094 else
1095 java-pkg_record-jar_ --build-only "${pkg}"
1096 fi
1097 record_jar="true"
1113 fi 1098 fi
1114 1099
1115 for jar in ${classpath//:/ }; do 1100 for jar in ${classpath//:/ }; do
1116 if [[ ! -f "${jar}" ]] ; then 1101 if [[ ! -f "${jar}" ]] ; then
1117 die "Installation problem with jar ${jar} in ${pkg} - is it installed?" 1102 die "Installation problem with jar ${jar} in ${pkg} - is it installed?"
1118 fi 1103 fi
1119 1104
1120 if [[ "$(basename ${jar})" == "${target_jar}" ]] ; then 1105 if [[ "$(basename ${jar})" == "${target_jar}" ]] ; then
1121 # Only record jars that aren't build-only 1106 # Only record jars that aren't build-only
1122 [[ -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
1123 echo "${jar}" 1114 echo "${jar}"
1124 return 0 1115 return 0
1125 fi 1116 fi
1126 done 1117 done
1127 1118
1128 die "Could not find ${target_jar} in ${pkg}" 1119 die "Could not find ${target_jar} in ${pkg}"
1129 return 1 1120 return 1
1130} 1121}
1131 1122
1132# ------------------------------------------------------------------------------ 1123# @FUNCTION: java-pkg_register-dependency
1133# @ebuild-function java-pkg_register-dependency 1124# @USAGE: <package>[,<package2>...] [<jarfile>]
1134# 1125# @DESCRIPTION:
1135# 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
1136# 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
1137# src_install phase. 1128# src_install phase.
1138# 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
1139# 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
1140# specified in ebuild's RDEPEND, and should be omitted in DEPEND. 1131# specified in ebuild's RDEPEND, and should be omitted in DEPEND.
1141# 1132#
1133# @CODE
1134# Parameters:
1142# @param $1 - comma-separated list of packages, or a single package 1135# $1 - comma-separated list of packages, or a single package
1143# @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
1144# to depend on 1137# to depend on
1145# 1138#
1139# Examples:
1146# Example: Record the dependency on whole xerces-2 and xalan, 1140# Record the dependency on whole xerces-2 and xalan,
1147# java-pkg_register-dependency xerces-2,xalan 1141# java-pkg_register-dependency xerces-2,xalan
1142#
1148# Example: Record the dependency on ant.jar from ant-core 1143# Record the dependency on ant.jar from ant-core
1149# java-pkg_register-dependency ant-core ant.jar 1144# java-pkg_register-dependency ant-core ant.jar
1145# @CODE
1150# 1146#
1151# 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
1152# 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
1153# 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
1154# there are more packages providing identically named jar without class 1150# there are more packages providing identically named jar without class
1155# collisions. 1151# collisions.
1156# ------------------------------------------------------------------------------
1157java-pkg_register-dependency() { 1152java-pkg_register-dependency() {
1158 debug-print-function ${FUNCNAME} $* 1153 debug-print-function ${FUNCNAME} $*
1159 1154
1160 java-pkg_check-phase install 1155 java-pkg_check-phase install
1161 1156
1183 fi 1178 fi
1184 1179
1185 java-pkg_do_write_ 1180 java-pkg_do_write_
1186} 1181}
1187 1182
1188# ------------------------------------------------------------------------------
1189# @ebuild-function java-pkg_register-optional-dependency 1183# @FUNCTION: java-pkg_register-optional-dependency
1190# 1184# @USAGE: <package>[,<package2>...] [<jarfile>]
1185# @DESCRIPTION:
1191# 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
1192# 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
1193# called in src_install phase. 1188# called in src_install phase.
1194# 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.
1195# 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
1196# 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
1197# for each implementation triggering hard dependency. 1192# for each implementation triggering hard dependency.
1198# 1193#
1194# @CODE
1195# Parameters:
1199# @param $1 - comma-separated list of packages, or a single package 1196# $1 - comma-separated list of packages, or a single package
1200# @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
1201# to depend on
1202# 1198#
1199# Example:
1203# Example: Record the optional dependency on some jdbc providers 1200# Record the optional dependency on some jdbc providers
1204# 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
1205# 1203#
1206# 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
1207# 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
1208# 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
1209# there are more packages providing identically named jar without class 1207# there are more packages providing identically named jar without class
1210# collisions. 1208# collisions.
1211# ------------------------------------------------------------------------------
1212java-pkg_register-optional-dependency() { 1209java-pkg_register-optional-dependency() {
1213 debug-print-function ${FUNCNAME} $* 1210 debug-print-function ${FUNCNAME} $*
1214 1211
1215 java-pkg_check-phase install 1212 java-pkg_check-phase install
1216 1213
1236 fi 1233 fi
1237 1234
1238 java-pkg_do_write_ 1235 java-pkg_do_write_
1239} 1236}
1240 1237
1241# ------------------------------------------------------------------------------
1242# @ebuild-function java-pkg_register-environment-variable 1238# @FUNCTION: java-pkg_register-environment-variable
1243# 1239# @USAGE: <name> <value>
1240# @DESCRIPTION:
1244# Register an arbitrary environment variable into package.env. The gjl launcher 1241# Register an arbitrary environment variable into package.env. The gjl launcher
1245# for this package or any package depending on this will export it into 1242# for this package or any package depending on this will export it into
1246# environement before executing java command. 1243# environement before executing java command.
1247# Must only be called in src_install phase. 1244# Must only be called in src_install phase.
1248#
1249# @param $1 - variable name
1250# @param $2 - variable value
1251# ------------------------------------------------------------------------------
1252JAVA_PKG_EXTRA_ENV="${T}/java-pkg-extra-env" 1245JAVA_PKG_EXTRA_ENV="${T}/java-pkg-extra-env"
1253JAVA_PKG_EXTRA_ENV_VARS="" 1246JAVA_PKG_EXTRA_ENV_VARS=""
1254java-pkg_register-environment-variable() { 1247java-pkg_register-environment-variable() {
1255 debug-print-function ${FUNCNAME} $* 1248 debug-print-function ${FUNCNAME} $*
1256 1249
1261 echo "${1}=\"${2}\"" >> ${JAVA_PKG_EXTRA_ENV} 1254 echo "${1}=\"${2}\"" >> ${JAVA_PKG_EXTRA_ENV}
1262 JAVA_PKG_EXTRA_ENV_VARS="${JAVA_PKG_EXTRA_ENV_VARS} ${1}" 1255 JAVA_PKG_EXTRA_ENV_VARS="${JAVA_PKG_EXTRA_ENV_VARS} ${1}"
1263 1256
1264 java-pkg_do_write_ 1257 java-pkg_do_write_
1265} 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
1266 1287
1267# 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
1268# populate jars from the filesystem. 1289# populate jars from the filesystem.
1269# 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
1270# string that was built instead of stdin 1291# string that was built instead of stdin
1298# 1319#
1299# read line 1320# read line
1300# done 1321# done
1301#} 1322#}
1302 1323
1303# ------------------------------------------------------------------------------ 1324# @FUNCTION: java-pkg_find-normal-jars
1304# @section-end query 1325# @USAGE: [<path/to/directory>]
1305# ------------------------------------------------------------------------------ 1326# @DESCRIPTION:
1306
1307# ------------------------------------------------------------------------------
1308# @section-begin helper
1309# @section-summary Helper functions
1310#
1311# Various other functions to use from an ebuild
1312# ------------------------------------------------------------------------------
1313
1314# ------------------------------------------------------------------------------
1315# @ebuild-function java-pkg_need
1316#
1317# Adds virtual dependencies, which can optionally be controlled by a USE flag.
1318# Currently supported virtuals are:
1319# javamail
1320# jdbc-stdext
1321# jaf
1322# jdbc-rowset
1323# jms
1324#
1325# @param $1 - Optionally indicate that the dependencies are controlled by
1326# a use flag by specifying '--use' Requires $2.
1327# @param $2 - USE flag which will enable the dependencies.
1328# @param $@ - virtual packages to add depenedencies for
1329# ------------------------------------------------------------------------------
1330# TODO rewrite to parse a line based declaration file instead -- karltk
1331#java-pkg_need() {
1332# debug-print-function ${FUNCNAME} $*
1333# local useflag
1334# if [[ ${1} == "--use" ]]; then
1335# useflag="${2}"
1336# shift 2
1337# fi
1338#
1339# if [[ -z ${1} ]]; then
1340# die "Must specify at least one virtual package."
1341# fi
1342#
1343# local depstr newdepstr
1344#
1345# for virtual in ${@}; do
1346# if has ${virtual} ${JAVA_PKG_VNEED}; then
1347# debug-print "Already registered virtual ${virtual}"
1348# continue
1349# fi
1350# case ${virtual} in
1351# javamail)
1352# debug-print "java-pkg_need: adding javamail dependencies"
1353# newdepstr="|| ( dev-java/gnu-javamail dev-java/sun-javamail-bin )"
1354# ;;
1355# jdbc-stdext)
1356# debug-print "java-pkg_need: adding jdbc-stdext dependencies"
1357# newdepstr="|| ( >=virtual/jdk-1.4 dev-java/jdbc2-stdext )"
1358# ;;
1359# jaf)
1360# debug-print "java-pkg_need: adding jaf dependencies"
1361# newdepstr="|| ( dev-java/gnu-jaf dev-java/sun-jaf-bin )"
1362# ;;
1363# jdbc-rowset)
1364# debug-print "java-pkg_need: adding jdbc-rowset dependencies"
1365# newdepstr="|| ( >=virtual/jdk-1.5 dev-java/sun-jdbc-rowset )"
1366# ;;
1367# jms)
1368# debug-print "java-pkg_need: adding jms dependencies"
1369# newdepstr="|| ( dev-java/sun-jms dev-java/openjms )"
1370# ;;
1371# *)
1372# die "Invalid virtual: ${virtual}"
1373# esac
1374#
1375# export JAVA_PKG_VNEED="${JAVA_PKG_VNEED} ${virtual}"
1376#
1377# if [[ -n ${useflag} ]]; then
1378# depstr="${depstr} ${useflag}? ( ${newdepstr} )"
1379# else
1380# depstr="${depstr} ${newdepstr}"
1381# fi
1382# done
1383#
1384# [[ -z ${JAVA_PKG_NV_DEPEND} ]] && export JAVA_PKG_NV_DEPEND="${DEPEND}"
1385# [[ -z ${JAVA_PKG_NV_RDEPEND} ]] && export JAVA_PKG_NV_RDEPEND="${RDEPEND}"
1386#
1387# export DEPEND="${DEPEND} ${depstr}"
1388# export RDEPEND="${RDEPEND} ${depstr}"
1389#}
1390
1391# ------------------------------------------------------------------------------
1392# @ebuild-function java-pkg_find-normal-jars
1393#
1394# Find the files with suffix .jar file in the given directory or $WORKDIR 1327# Find the files with suffix .jar file in the given directory (default: $WORKDIR)
1395#
1396# @param $1 - The directory to search for jar files (default: ${WORKDIR})
1397# ------------------------------------------------------------------------------
1398java-pkg_find-normal-jars() { 1328java-pkg_find-normal-jars() {
1399 local dir=$1 1329 local dir=$1
1400 [[ "${dir}" ]] || dir="${WORKDIR}" 1330 [[ "${dir}" ]] || dir="${WORKDIR}"
1401 local found 1331 local found
1402 for jar in $(find "${dir}" -name "*.jar" -type f); do 1332 for jar in $(find "${dir}" -name "*.jar" -type f); do
1405 done 1335 done
1406 [[ "${found}" ]] 1336 [[ "${found}" ]]
1407 return $? 1337 return $?
1408} 1338}
1409 1339
1410# ------------------------------------------------------------------------------ 1340# @FUNCTION: java-pkg_ensure-no-bundled-jars
1411# @ebuild-function java-pkg_ensure-no-bundled-jars 1341# @DESCRIPTION:
1412#
1413# 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.
1414# 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
1415# to system jar files or bundled jars removed. 1344# to system jar files or bundled jars removed.
1416# ------------------------------------------------------------------------------
1417java-pkg_ensure-no-bundled-jars() { 1345java-pkg_ensure-no-bundled-jars() {
1418 debug-print-function ${FUNCNAME} $* 1346 debug-print-function ${FUNCNAME} $*
1419 1347
1420 local bundled_jars=$(java-pkg_find-normal-jars) 1348 local bundled_jars=$(java-pkg_find-normal-jars)
1421 if [[ -n ${bundled_jars} ]]; then 1349 if [[ -n ${bundled_jars} ]]; then
1426 done 1354 done
1427 die "Bundled jars found!" 1355 die "Bundled jars found!"
1428 fi 1356 fi
1429} 1357}
1430 1358
1431# ------------------------------------------------------------------------------
1432# @internal-function java-pkg_ensure-vm-version-sufficient 1359# @FUNCTION: java-pkg_ensure-vm-version-sufficient
1433# 1360# @INTERNAL
1361# @DESCRIPTION:
1434# 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.
1435#
1436# ------------------------------------------------------------------------------
1437java-pkg_ensure-vm-version-sufficient() { 1363java-pkg_ensure-vm-version-sufficient() {
1438 debug-print-function ${FUNCNAME} $* 1364 debug-print-function ${FUNCNAME} $*
1439 1365
1440 if ! java-pkg_is-vm-version-sufficient; then 1366 if ! java-pkg_is-vm-version-sufficient; then
1441 debug-print "VM is not suffient" 1367 debug-print "VM is not suffient"
1443 einfo "Please use java-config -S to set the correct one" 1369 einfo "Please use java-config -S to set the correct one"
1444 die "Active Java VM cannot build this package" 1370 die "Active Java VM cannot build this package"
1445 fi 1371 fi
1446} 1372}
1447 1373
1448# ------------------------------------------------------------------------------ 1374# @FUNCTION: java-pkg_is-vm-version-sufficient
1449# @internal-function java-pkg_is-vm-version-sufficient 1375# @INTERNAL
1450# 1376# @DESCRIPTION:
1451# @return zero - VM is sufficient 1377# @RETURN: zero - VM is sufficient; non-zero - VM is not sufficient
1452# @return non-zero - VM is not sufficient
1453# ------------------------------------------------------------------------------
1454java-pkg_is-vm-version-sufficient() { 1378java-pkg_is-vm-version-sufficient() {
1455 debug-print-function ${FUNCNAME} $* 1379 debug-print-function ${FUNCNAME} $*
1456 1380
1457 depend-java-query --is-sufficient "${DEPEND}" > /dev/null 1381 depend-java-query --is-sufficient "${DEPEND}" > /dev/null
1458 return $? 1382 return $?
1459} 1383}
1460 1384
1461# ------------------------------------------------------------------------------ 1385# @FUNCTION: java-pkg_ensure-vm-version-eq
1462# @internal-function java-pkg_ensure-vm-version-eq 1386# @INTERNAL
1463# 1387# @DESCRIPTION:
1464# 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.
1465# 1389#
1466# @param $@ - Desired VM version to ensure 1390# @param $@ - Desired VM version to ensure
1467# ------------------------------------------------------------------------------
1468java-pkg_ensure-vm-version-eq() { 1391java-pkg_ensure-vm-version-eq() {
1469 debug-print-function ${FUNCNAME} $* 1392 debug-print-function ${FUNCNAME} $*
1470 1393
1471 if ! java-pkg_is-vm-version-eq $@ ; then 1394 if ! java-pkg_is-vm-version-eq $@ ; then
1472 debug-print "VM is not suffient" 1395 debug-print "VM is not suffient"
1474 einfo "Please use java-config -S to set the correct one" 1397 einfo "Please use java-config -S to set the correct one"
1475 die "Active Java VM too old" 1398 die "Active Java VM too old"
1476 fi 1399 fi
1477} 1400}
1478 1401
1479# ------------------------------------------------------------------------------ 1402# @FUNCTION: java-pkg_is-vm-version-eq
1480# @internal-function java-pkg_is-vm-version-eq 1403# @USAGE: <version>
1481# 1404# @INTERNAL
1482# @param $@ - VM version to compare current VM to 1405# @RETURN: zero - VM versions are equal; non-zero - VM version are not equal
1483# @return zero - VM versions are equal
1484# @return non-zero - VM version are not equal
1485# ------------------------------------------------------------------------------
1486java-pkg_is-vm-version-eq() { 1406java-pkg_is-vm-version-eq() {
1487 debug-print-function ${FUNCNAME} $* 1407 debug-print-function ${FUNCNAME} $*
1488 1408
1489 local needed_version="$@" 1409 local needed_version="$@"
1490 1410
1507 return 1 1427 return 1
1508 fi 1428 fi
1509 fi 1429 fi
1510} 1430}
1511 1431
1512# ------------------------------------------------------------------------------ 1432# @FUNCTION: java-pkg_ensure-vm-version-ge
1513# @internal-function java-pkg_ensure-vm-version-ge 1433# @INTERNAL
1514# 1434# @DESCRIPTION:
1515# 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
1516# 1436#
1517# @param $@ - VM version to compare current to 1437# @param $@ - VM version to compare current to
1518# ------------------------------------------------------------------------------
1519java-pkg_ensure-vm-version-ge() { 1438java-pkg_ensure-vm-version-ge() {
1520 debug-print-function ${FUNCNAME} $* 1439 debug-print-function ${FUNCNAME} $*
1521 1440
1522 if ! java-pkg_is-vm-version-ge "$@" ; then 1441 if ! java-pkg_is-vm-version-ge "$@" ; then
1523 debug-print "vm is not suffient" 1442 debug-print "vm is not suffient"
1525 einfo "Please use java-config -S to set the correct one" 1444 einfo "Please use java-config -S to set the correct one"
1526 die "Active Java VM too old" 1445 die "Active Java VM too old"
1527 fi 1446 fi
1528} 1447}
1529 1448
1530# ------------------------------------------------------------------------------ 1449# @FUNCTION: java-pkg_is-vm-version-ge
1531# @internal-function java-pkg_is-vm-version-ge 1450# @INTERNAL
1532# 1451# @DESCRIPTION:
1452# @CODE
1453# Parameters:
1533# @param $@ - VM version to compare current VM to 1454# $@ - VM version to compare current VM to
1455# @CODE
1534# @return zero - current VM version is greater than checked version 1456# @RETURN: zero - current VM version is greater than checked version;
1535# @return non-zero - current VM version is not greater than checked version 1457# non-zero - current VM version is not greater than checked version
1536# ------------------------------------------------------------------------------
1537java-pkg_is-vm-version-ge() { 1458java-pkg_is-vm-version-ge() {
1538 debug-print-function ${FUNCNAME} $* 1459 debug-print-function ${FUNCNAME} $*
1539 1460
1540 local needed_version=$@ 1461 local needed_version=$@
1541 local vm_version=$(java-pkg_get-vm-version) 1462 local vm_version=$(java-pkg_get-vm-version)
1560java-pkg_get-current-vm() { 1481java-pkg_get-current-vm() {
1561 echo ${GENTOO_VM} 1482 echo ${GENTOO_VM}
1562} 1483}
1563 1484
1564java-pkg_current-vm-matches() { 1485java-pkg_current-vm-matches() {
1565 hasq $(java-pkg_get-current-vm) ${@} 1486 has $(java-pkg_get-current-vm) ${@}
1566 return $? 1487 return $?
1567} 1488}
1568 1489
1569# ------------------------------------------------------------------------------ 1490# @FUNCTION: java-pkg_get-source
1570# @ebuild-function java-pkg_get-source 1491# @DESCRIPTION:
1571#
1572# Determines what source version should be used, for passing to -source. 1492# Determines what source version should be used, for passing to -source.
1573# 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
1574# 1494#
1575# @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
1576# ------------------------------------------------------------------------------
1577java-pkg_get-source() { 1496java-pkg_get-source() {
1578 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}")}
1579} 1498}
1580 1499
1581# ------------------------------------------------------------------------------ 1500# @FUNCTION: java-pkg_get-target
1582# @ebuild-function java-pkg_get-target 1501# @DESCRIPTION:
1583#
1584# Determines what target version should be used, for passing to -target. 1502# Determines what target version should be used, for passing to -target.
1585# 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
1586# version of your JDK. 1504# version of your JDK.
1587# 1505#
1588# @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
1589# ------------------------------------------------------------------------------
1590java-pkg_get-target() { 1507java-pkg_get-target() {
1591 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}")}
1592} 1509}
1593 1510
1511# @FUNCTION: java-pkg_get-javac
1512# @DESCRIPTION:
1513# Returns the compiler executable
1594java-pkg_get-javac() { 1514java-pkg_get-javac() {
1595 debug-print-function ${FUNCNAME} $* 1515 debug-print-function ${FUNCNAME} $*
1596 1516
1597 1517
1598 local compiler="${GENTOO_COMPILER}" 1518 local compiler="${GENTOO_COMPILER}"
1628 fi 1548 fi
1629 fi 1549 fi
1630 echo ${compiler_executable} 1550 echo ${compiler_executable}
1631} 1551}
1632 1552
1633# ------------------------------------------------------------------------------ 1553# @FUNCTION: java-pkg_javac-args
1634# @ebuild-function java-pkg_javac-args 1554# @DESCRIPTION:
1635#
1636# 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
1637# to know what -source/-target to use. 1556# to know what -source/-target to use.
1638# 1557#
1639# @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
1640# ------------------------------------------------------------------------------
1641java-pkg_javac-args() { 1559java-pkg_javac-args() {
1642 debug-print-function ${FUNCNAME} $* 1560 debug-print-function ${FUNCNAME} $*
1643 1561
1644 local want_source="$(java-pkg_get-source)" 1562 local want_source="$(java-pkg_get-source)"
1645 local want_target="$(java-pkg_get-target)" 1563 local want_target="$(java-pkg_get-target)"
1661 echo "${target_str}" 1579 echo "${target_str}"
1662 fi 1580 fi
1663 fi 1581 fi
1664} 1582}
1665 1583
1666# TODO document 1584# @FUNCTION: java-pkg_get-jni-cflags
1585# @DESCRIPTION:
1586# Echos the CFLAGS for JNI compilations
1667java-pkg_get-jni-cflags() { 1587java-pkg_get-jni-cflags() {
1668 local flags="-I${JAVA_HOME}/include" 1588 local flags="-I${JAVA_HOME}/include"
1669 1589
1670 local platform="linux" 1590 local platform="linux"
1671 use elibc_FreeBSD && platform="freebsd" 1591 use elibc_FreeBSD && platform="freebsd"
1675 1595
1676 echo ${flags} 1596 echo ${flags}
1677} 1597}
1678 1598
1679java-pkg_ensure-gcj() { 1599java-pkg_ensure-gcj() {
1680 if ! built_with_use sys-devel/gcc gcj ; then 1600 # was enforcing sys-devel/gcc[gcj]
1681 ewarn 1601 die "${FUNCNAME} was removed. Use use-deps available as of EAPI 2 instead. #261562"
1682 ewarn "You must build gcc with the gcj support to build with gcj"
1683 ewarn
1684 ebeep 5
1685 die "No GCJ support found!"
1686 fi
1687} 1602}
1688 1603
1689java-pkg_ensure-test() { 1604java-pkg_ensure-test() {
1690 if hasq test ${FEATURES} && ! hasq -test ${FEATURES} \ 1605 # was enforcing USE=test if FEATURES=test
1691 && hasq test ${IUSE} && ! use test; 1606 die "${FUNCNAME} was removed. Package mangers handle this already. #278965"
1692 then
1693 eerror "You specified FEATURES=test, but USE=test is needed"
1694 eerror "to pull in the additional dependencies for testing"
1695 die "Need USE=test enabled"
1696 fi
1697} 1607}
1698 1608
1699# ------------------------------------------------------------------------------ 1609# @FUNCTION: java-pkg_register-ant-task
1700# @ebuild-function java-pkg_register-ant-task 1610# @USAGE: [--version x.y] [<name>]
1701# 1611# @DESCRIPTION:
1702# 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
1703# 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
1704# 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
1705# 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
1706# .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
1707# compatibility. 1617# compatibility.
1708# 1618#
1619# @CODE
1620# Parameters
1709# @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
1710# version). Used by the ant-* packages to prevent loading of mismatched 1622# version). Used by the ant-* packages to prevent loading of mismatched
1711# ant-core ant tasks after core was updated, before the tasks are updated, 1623# ant-core ant tasks after core was updated, before the tasks are updated,
1712# without a need for blockers. 1624# without a need for blockers.
1713# @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])
1714# ------------------------------------------------------------------------------ 1626# @CODE
1715java-pkg_register-ant-task() { 1627java-pkg_register-ant-task() {
1716 local TASKS_DIR="tasks" 1628 local TASKS_DIR="tasks"
1717 1629
1718 # check for --version x.y parameters 1630 # check for --version x.y parameters
1719 while [[ -n "${1}" && -n "${2}" ]]; do 1631 while [[ -n "${1}" && -n "${2}" ]]; do
1731 1643
1732 dodir /usr/share/ant/${TASKS_DIR} 1644 dodir /usr/share/ant/${TASKS_DIR}
1733 touch "${D}/usr/share/ant/${TASKS_DIR}/${TASK_NAME}" 1645 touch "${D}/usr/share/ant/${TASKS_DIR}/${TASK_NAME}"
1734} 1646}
1735 1647
1736# ------------------------------------------------------------------------------ 1648# @FUNCTION: java-pkg_ant-tasks-depend
1737# @internal-function java-pkg_ant-tasks-depend 1649# @INTERNAL
1738# 1650# @DESCRIPTION:
1739# Translates the WANT_ANT_TASKS variable into valid dependencies. 1651# Translates the WANT_ANT_TASKS variable into valid dependencies.
1740# ------------------------------------------------------------------------------
1741java-pkg_ant-tasks-depend() { 1652java-pkg_ant-tasks-depend() {
1742 debug-print-function ${FUNCNAME} ${WANT_ANT_TASKS} 1653 debug-print-function ${FUNCNAME} ${WANT_ANT_TASKS}
1743 1654
1744 if [[ -n "${WANT_ANT_TASKS}" ]]; then 1655 if [[ -n "${WANT_ANT_TASKS}" ]]; then
1745 local DEP="" 1656 local DEP=""
1759 else 1670 else
1760 return 0 1671 return 0
1761 fi 1672 fi
1762} 1673}
1763 1674
1764# ------------------------------------------------------------------------------ 1675
1765# @ebuild-function ejunit 1676# @FUNCTION: ejunit_
1766# 1677# @INTERNAL
1678# @DESCRIPTION:
1767# 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
1768# 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.
1769# 1681# @CODE
1770# Examples: 1682# Parameters:
1771# ejunit -cp build/classes org.blinkenlights.jid3.test.AllTests 1683# $1 - junit package (junit or junit-4)
1772# ejunit org.blinkenlights.jid3.test.AllTests
1773#
1774# @param $1 - -cp or -classpath 1684# $2 - -cp or -classpath
1775# @param $2 - classpath; junit and recorded dependencies get appended 1685# $3 - classpath; junit and recorded dependencies get appended
1776# @param $@ - the rest of the parameters are passed to java 1686# $@ - the rest of the parameters are passed to java
1777# ------------------------------------------------------------------------------ 1687# @CODE
1778ejunit() { 1688ejunit_() {
1779 debug-print-function ${FUNCNAME} $* 1689 debug-print-function ${FUNCNAME} $*
1780 1690
1781 local pkgs 1691 local pkgs
1782 if [[ -f ${JAVA_PKG_DEPEND_FILE} ]]; then 1692 if [[ -f ${JAVA_PKG_DEPEND_FILE} ]]; then
1783 for atom in $(cat ${JAVA_PKG_DEPEND_FILE} | tr : ' '); do 1693 for atom in $(cat ${JAVA_PKG_DEPEND_FILE} | tr : ' '); do
1784 pkgs=${pkgs},$(echo ${atom} | sed -re "s/^.*@//") 1694 pkgs=${pkgs},$(echo ${atom} | sed -re "s/^.*@//")
1785 done 1695 done
1786 fi 1696 fi
1787 1697
1698 local junit=${1}
1699 shift 1
1700
1788 local cp=$(java-pkg_getjars --with-dependencies junit${pkgs}) 1701 local cp=$(java-pkg_getjars --with-dependencies ${junit}${pkgs})
1789 if [[ ${1} = -cp || ${1} = -classpath ]]; then 1702 if [[ ${1} = -cp || ${1} = -classpath ]]; then
1790 cp="${2}:${cp}" 1703 cp="${2}:${cp}"
1791 shift 2 1704 shift 2
1792 else 1705 else
1793 cp=".:${cp}" 1706 cp=".:${cp}"
1794 fi 1707 fi
1795 1708
1796 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
1797 debug-print "Calling: java -cp \"${cp}\" -Djava.awt.headless=true ${runner} ${@}" 1713 debug-print "Calling: java -cp \"${cp}\" -Djava.awt.headless=true ${runner} ${@}"
1798 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"
1799} 1715}
1800 1716
1801# ------------------------------------------------------------------------------ 1717# @FUNCTION: ejunit
1802# @section-end helper 1718# @DESCRIPTION:
1803# ------------------------------------------------------------------------------ 1719# Junit wrapper function. Makes it easier to run the tests and checks for
1804 1720# dev-java/junit in DEPEND. Launches the tests using org.junit.runner.JUnitCore.
1805# ------------------------------------------------------------------------------
1806# @section-begin build
1807# @section-summary Build functions
1808# 1721#
1809# These are some functions for building a package. In particular, it consists of 1722# @CODE
1810# wrappers for javac and ant. 1723# Parameters:
1811# ------------------------------------------------------------------------------ 1724# $1 - -cp or -classpath
1812 1725# $2 - classpath; junit and recorded dependencies get appended
1813# ------------------------------------------------------------------------------ 1726# $@ - the rest of the parameters are passed to java
1814# @ebuild-function eant
1815# 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:
1816# 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
1817# 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,
1818# variables: 1810# variables:
1811#
1812# @CODE
1813# Variables:
1819# 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
1820# gentoo.classpath property. Be sure to call 1815# gentoo.classpath property. Be sure to call java-ant_rewrite-classpath in src_unpack.
1821# java-ant_rewrite-classpath in src_unpack. 1816# EANT_NEEDS_TOOLS - add tools.jar to the gentoo.classpath. Should only be used
1822# 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!
1823# *ANT_TASKS - used to determine ANT_TASKS before calling Ant. 1819# ANT_TASKS - used to determine ANT_TASKS before calling Ant.
1824# ------------------------------------------------------------------------------ 1820# @CODE
1825eant() { 1821eant() {
1826 debug-print-function ${FUNCNAME} $* 1822 debug-print-function ${FUNCNAME} $*
1827 1823
1828 if [[ ${EBUILD_PHASE} = compile ]]; then 1824 if [[ ${EBUILD_PHASE} = compile ]]; then
1829 # Used to be done in hooks in java-ant-2.eclass but moved here so that we can 1825 java-ant-2_src_configure
1830 # finally get rid of the hooks without breaking stuff 1826 java-utils-2_src_prepare
1831
1832 [[ "${JAVA_ANT_IGNORE_SYSTEM_CLASSES}" && "${JAVA_PKG_BSFIX}" ]] \
1833 && java-ant_ignore-system-classes "${S}/build.xml"
1834
1835 if hasq java-ant-2 ${INHERITED}; then
1836 java-ant_bsfix
1837 fi 1827 fi
1838 1828
1839 # eant can be called multiple times
1840 JAVA_PKG_BSFIX="off"
1841
1842 if [[ -z ${JAVA_PKG_NO_BUNDLED_SEARCH} ]] && is-java-strict; then
1843 echo "Searching for bundled jars:"
1844 java-pkg_find-normal-jars || echo "None found."
1845 echo "Searching for bundled classes (no output if none found):"
1846 find "${WORKDIR}" -name "*.class"
1847 echo "Search done."
1848 JAVA_PKG_NO_BUNDLED_SEARCH=true # eant can be called many times
1849 fi
1850 fi
1851
1852 if ! hasq java-ant-2 ${INHERITED}; then 1829 if ! has java-ant-2 ${INHERITED}; then
1853 local msg="You should inherit java-ant-2 when using eant" 1830 local msg="You should inherit java-ant-2 when using eant"
1854 java-pkg_announce-qa-violation "${msg}" 1831 java-pkg_announce-qa-violation "${msg}"
1855 fi 1832 fi
1856 1833
1857 local antflags="-Dnoget=true -Dmaven.mode.offline=true -Dbuild.sysclasspath=ignore" 1834 local antflags="-Dnoget=true -Dmaven.mode.offline=true -Dbuild.sysclasspath=ignore"
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 [[ ${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() {
2057 debug-print-function ${FUNCNAME} $* 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
2058 unset JAVAC 2046 unset JAVAC
2059 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 }
2060 2056
2061 # People do all kinds of weird things. 2057 # People do all kinds of weird things.
2062 # http://forums.gentoo.org/viewtopic-p-3943166.html 2058 # http://forums.gentoo.org/viewtopic-p-3943166.html
2063 local silence="${SILENCE_JAVA_OPTIONS_WARNING}" 2059 local silence="${SILENCE_JAVA_OPTIONS_WARNING}"
2064 local accept="${I_WANT_GLOBAL_JAVA_OPTIONS}" 2060 local accept="${I_WANT_GLOBAL_JAVA_OPTIONS}"
2081 2077
2082 if java-pkg_func-exists ant_src_unpack; then 2078 if java-pkg_func-exists ant_src_unpack; then
2083 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"
2084 fi 2080 fi
2085 2081
2086 java-pkg_init_paths_
2087 java-pkg_switch-vm 2082 java-pkg_switch-vm
2088 PATH=${JAVA_HOME}/bin:${PATH} 2083 PATH=${JAVA_HOME}/bin:${PATH}
2089 2084
2090 # TODO we will probably want to set JAVAC and JAVACFLAGS 2085 # TODO we will probably want to set JAVAC and JAVACFLAGS
2091 2086
2102 export CLASSPATH= 2097 export CLASSPATH=
2103 2098
2104 # Unset external ANT_ stuff 2099 # Unset external ANT_ stuff
2105 export ANT_TASKS= 2100 export ANT_TASKS=
2106 export ANT_OPTS= 2101 export ANT_OPTS=
2102 export ANT_RESPECT_JAVA_HOME=
2107} 2103}
2108 2104
2109# ------------------------------------------------------------------------------ 2105# @FUNCTION: java-pkg-init-compiler_
2110# @function-internal java-pkg-init-compiler_ 2106# @INTERNAL
2111# 2107# @DESCRIPTION:
2112# 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
2113# 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
2114# COMPILERS variable defined there. 2110# COMPILERS variable defined there.
2115# 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
2116# 2112#
2127# 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
2128# 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
2129# by the current VM. 2125# by the current VM.
2130# 2126#
2131# 2127#
2132# @return name of the compiler to use 2128# @RETURN name of the compiler to use
2133# ------------------------------------------------------------------------------
2134java-pkg_init-compiler_() { 2129java-pkg_init-compiler_() {
2135 debug-print-function ${FUNCNAME} $* 2130 debug-print-function ${FUNCNAME} $*
2136 2131
2137 if [[ -n ${GENTOO_COMPILER} ]]; then 2132 if [[ -n ${GENTOO_COMPILER} ]]; then
2138 debug-print "GENTOO_COMPILER already set" 2133 debug-print "GENTOO_COMPILER already set"
2218 einfo "Using ${GENTOO_COMPILER} for compilation" 2213 einfo "Using ${GENTOO_COMPILER} for compilation"
2219 fi 2214 fi
2220 2215
2221} 2216}
2222 2217
2223# ------------------------------------------------------------------------------ 2218# @FUNCTION: init_paths_
2224# @internal-function init_paths_ 2219# @INTERNAL
2225# 2220# @DESCRIPTION:
2226# 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
2227# to determine where things will eventually get installed. 2222# to determine where things will eventually get installed.
2228# ------------------------------------------------------------------------------
2229java-pkg_init_paths_() { 2223java-pkg_init_paths_() {
2230 debug-print-function ${FUNCNAME} $* 2224 debug-print-function ${FUNCNAME} $*
2231 2225
2232 local pkg_name 2226 local pkg_name
2233 if [[ "$SLOT" == "0" ]] ; then 2227 if [[ "${SLOT%/*}" == "0" ]] ; then
2234 JAVA_PKG_NAME="${PN}" 2228 JAVA_PKG_NAME="${PN}"
2235 else 2229 else
2236 JAVA_PKG_NAME="${PN}-${SLOT}" 2230 JAVA_PKG_NAME="${PN}-${SLOT%/*}"
2237 fi 2231 fi
2238 2232
2239 JAVA_PKG_SHAREPATH="${DESTTREE}/share/${JAVA_PKG_NAME}" 2233 JAVA_PKG_SHAREPATH="${DESTTREE}/share/${JAVA_PKG_NAME}"
2240 JAVA_PKG_SOURCESPATH="${JAVA_PKG_SHAREPATH}/sources/" 2234 JAVA_PKG_SOURCESPATH="${JAVA_PKG_SHAREPATH}/sources/"
2241 JAVA_PKG_ENV="${D}${JAVA_PKG_SHAREPATH}/package.env" 2235 JAVA_PKG_ENV="${D}${JAVA_PKG_SHAREPATH}/package.env"
2243 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}"
2244 2238
2245 [[ -z "${JAVA_PKG_JARDEST}" ]] && JAVA_PKG_JARDEST="${JAVA_PKG_SHAREPATH}/lib" 2239 [[ -z "${JAVA_PKG_JARDEST}" ]] && JAVA_PKG_JARDEST="${JAVA_PKG_SHAREPATH}/lib"
2246 [[ -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}"
2247 [[ -z "${JAVA_PKG_WARDEST}" ]] && JAVA_PKG_WARDEST="${JAVA_PKG_SHAREPATH}/webapps" 2241 [[ -z "${JAVA_PKG_WARDEST}" ]] && JAVA_PKG_WARDEST="${JAVA_PKG_SHAREPATH}/webapps"
2248
2249 2242
2250 # TODO maybe only print once? 2243 # TODO maybe only print once?
2251 debug-print "JAVA_PKG_SHAREPATH: ${JAVA_PKG_SHAREPATH}" 2244 debug-print "JAVA_PKG_SHAREPATH: ${JAVA_PKG_SHAREPATH}"
2252 debug-print "JAVA_PKG_ENV: ${JAVA_PKG_ENV}" 2245 debug-print "JAVA_PKG_ENV: ${JAVA_PKG_ENV}"
2253 debug-print "JAVA_PKG_JARDEST: ${JAVA_PKG_JARDEST}" 2246 debug-print "JAVA_PKG_JARDEST: ${JAVA_PKG_JARDEST}"
2254 debug-print "JAVA_PKG_LIBDEST: ${JAVA_PKG_LIBDEST}" 2247 debug-print "JAVA_PKG_LIBDEST: ${JAVA_PKG_LIBDEST}"
2255 debug-print "JAVA_PKG_WARDEST: ${JAVA_PKG_WARDEST}" 2248 debug-print "JAVA_PKG_WARDEST: ${JAVA_PKG_WARDEST}"
2256} 2249}
2257 2250
2258# ------------------------------------------------------------------------------ 2251# @FUNCTION: java-pkg_do_write_
2259# @internal-function java-pkg_do_write_ 2252# @INTERNAL
2260# 2253# @DESCRIPTION:
2261# Writes the package.env out to disk. 2254# Writes the package.env out to disk.
2262# 2255#
2263# ------------------------------------------------------------------------------
2264# TODO change to do-write, to match everything else 2256# TODO change to do-write, to match everything else
2265java-pkg_do_write_() { 2257java-pkg_do_write_() {
2266 debug-print-function ${FUNCNAME} $* 2258 debug-print-function ${FUNCNAME} $*
2267 java-pkg_init_paths_ 2259 java-pkg_init_paths_
2268 # Create directory for package.env 2260 # Create directory for package.env
2273 # Create package.env 2265 # Create package.env
2274 ( 2266 (
2275 echo "DESCRIPTION=\"${DESCRIPTION}\"" 2267 echo "DESCRIPTION=\"${DESCRIPTION}\""
2276 echo "GENERATION=\"2\"" 2268 echo "GENERATION=\"2\""
2277 echo "SLOT=\"${SLOT}\"" 2269 echo "SLOT=\"${SLOT}\""
2270 echo "CATEGORY=\"${CATEGORY}\""
2271 echo "PVR=\"${PVR}\""
2278 2272
2279 [[ -n "${JAVA_PKG_CLASSPATH}" ]] && echo "CLASSPATH=\"${JAVA_PKG_CLASSPATH}\"" 2273 [[ -n "${JAVA_PKG_CLASSPATH}" ]] && echo "CLASSPATH=\"${JAVA_PKG_CLASSPATH}\""
2280 [[ -n "${JAVA_PKG_LIBRARY}" ]] && echo "LIBRARY_PATH=\"${JAVA_PKG_LIBRARY}\"" 2274 [[ -n "${JAVA_PKG_LIBRARY}" ]] && echo "LIBRARY_PATH=\"${JAVA_PKG_LIBRARY}\""
2281 [[ -n "${JAVA_PROVIDE}" ]] && echo "PROVIDES=\"${JAVA_PROVIDE}\"" 2275 [[ -n "${JAVA_PROVIDE}" ]] && echo "PROVIDES=\"${JAVA_PROVIDE}\""
2282 [[ -f "${JAVA_PKG_DEPEND_FILE}" ]] \ 2276 [[ -f "${JAVA_PKG_DEPEND_FILE}" ]] \
2283 && echo "DEPEND=\"$(cat "${JAVA_PKG_DEPEND_FILE}" | uniq | tr '\n' ':')\"" 2277 && echo "DEPEND=\"$(sort -u "${JAVA_PKG_DEPEND_FILE}" | tr '\n' ':')\""
2284 [[ -f "${JAVA_PKG_OPTIONAL_DEPEND_FILE}" ]] \ 2278 [[ -f "${JAVA_PKG_OPTIONAL_DEPEND_FILE}" ]] \
2285 && 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' ':')\""
2286 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' ':')\""
2287 ) > "${JAVA_PKG_ENV}" 2283 ) > "${JAVA_PKG_ENV}"
2288 2284
2289 # register target/source 2285 # register target/source
2290 local target="$(java-pkg_get-target)" 2286 local target="$(java-pkg_get-target)"
2291 local source="$(java-pkg_get-source)" 2287 local source="$(java-pkg_get-source)"
2319 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"
2320 debug-print "write package.env." 2316 debug-print "write package.env."
2321 fi 2317 fi
2322} 2318}
2323 2319
2324# ------------------------------------------------------------------------------ 2320# @FUNCTION: java-pkg_record-jar_
2325# @internal-function java-pkg_record-jar_ 2321# @INTERNAL
2326# 2322# @DESCRIPTION:
2327# Record an (optional) dependency to the package.env 2323# Record an (optional) dependency to the package.env
2324# @CODE
2325# Parameters:
2328# @param --optional - record dependency as optional 2326# --optional - record dependency as optional
2327# --build - record dependency as build_only
2329# @param $1 - package to record 2328# $1 - package to record
2330# @param $2 - (optional) jar of package to record 2329# $2 - (optional) jar of package to record
2331# ------------------------------------------------------------------------------ 2330# @CODE
2332JAVA_PKG_DEPEND_FILE="${T}/java-pkg-depend" 2331JAVA_PKG_DEPEND_FILE="${T}/java-pkg-depend"
2333JAVA_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"
2334 2334
2335java-pkg_record-jar_() { 2335java-pkg_record-jar_() {
2336 debug-print-function ${FUNCNAME} $* 2336 debug-print-function ${FUNCNAME} $*
2337 2337
2338 local depend_file="${JAVA_PKG_DEPEND_FILE}" 2338 local depend_file="${JAVA_PKG_DEPEND_FILE}"
2339 if [[ "${1}" == "--optional" ]]; then 2339 case "${1}" in
2340 depend_file="${JAVA_PKG_OPTIONAL_DEPEND_FILE}" 2340 "--optional") depend_file="${JAVA_PKG_OPTIONAL_DEPEND_FILE}"; shift;;
2341 shift 2341 "--build-only") depend_file="${JAVA_PKG_BUILD_DEPEND_FILE}"; shift;;
2342 fi 2342 esac
2343 2343
2344 local pkg=${1} jar=${2} append 2344 local pkg=${1} jar=${2} append
2345 if [[ -z "${jar}" ]]; then 2345 if [[ -z "${jar}" ]]; then
2346 append="${pkg}" 2346 append="${pkg}"
2347 else 2347 else
2349 fi 2349 fi
2350 2350
2351 echo "${append}" >> "${depend_file}" 2351 echo "${append}" >> "${depend_file}"
2352} 2352}
2353 2353
2354# ------------------------------------------------------------------------------ 2354# @FUNCTION: java-pkg_append_
2355# @internal-function java-pkg_append_ 2355# @INTERNAL
2356# 2356# @DESCRIPTION:
2357# Appends a value to a variable 2357# Appends a value to a variable
2358# 2358#
2359# Example: java-pkg_append_ CLASSPATH foo.jar 2359# @CODE
2360# Parameters:
2360# @param $1 variable name to modify 2361# $1 variable name to modify
2361# @param $2 value to append 2362# $2 value to append
2362# ------------------------------------------------------------------------------ 2363#
2364# Examples:
2365# java-pkg_append_ CLASSPATH foo.jar
2366# @CODE
2363java-pkg_append_() { 2367java-pkg_append_() {
2364 debug-print-function ${FUNCNAME} $* 2368 debug-print-function ${FUNCNAME} $*
2365 2369
2366 local var="${1}" value="${2}" 2370 local var="${1}" value="${2}"
2367 if [[ -z "${!var}" ]] ; then 2371 if [[ -z "${!var}" ]] ; then
2378 [[ -z ${haveit} ]] && export ${var}="${!var}:${value}" 2382 [[ -z ${haveit} ]] && export ${var}="${!var}:${value}"
2379 IFS=${oldIFS} 2383 IFS=${oldIFS}
2380 fi 2384 fi
2381} 2385}
2382 2386
2383# ------------------------------------------------------------------------------ 2387# @FUNCTION: java-pkg_expand_dir_
2384# @internal-function java-pkg_expand_dir_ 2388# @INTERNAL
2385# 2389# @DESCRIPTION:
2386# 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:
2387# @param $1 - file/directory to find parent directory for 2393# $1 - file/directory to find parent directory for
2394# @CODE
2388# @return - path to $1's parent directory 2395# @RETURN: path to $1's parent directory
2389# ------------------------------------------------------------------------------
2390java-pkg_expand_dir_() { 2396java-pkg_expand_dir_() {
2391 pushd "$(dirname "${1}")" >/dev/null 2>&1 2397 pushd "$(dirname "${1}")" >/dev/null 2>&1
2392 pwd 2398 pwd
2393 popd >/dev/null 2>&1 2399 popd >/dev/null 2>&1
2394} 2400}
2395 2401
2396# ------------------------------------------------------------------------------ 2402# @FUNCTION: java-pkg_func-exists
2397# @internal-function java-pkg_func-exists 2403# @INTERNAL
2398# 2404# @DESCRIPTION:
2399# Does the indicated function exist? 2405# Does the indicated function exist?
2400# 2406# @RETURN: 0 - function is declared, 1 - function is undeclared
2401# @return 0 - function is declared
2402# @return 1 - function is undeclared
2403# ------------------------------------------------------------------------------
2404java-pkg_func-exists() { 2407java-pkg_func-exists() {
2405 if [[ -n "$(declare -f ${1})" ]]; then 2408 declare -F ${1} > /dev/null
2406 return 0
2407 else
2408 return 1
2409 fi
2410} 2409}
2411 2410
2412# ------------------------------------------------------------------------------ 2411# @FUNCTION: java-pkg_setup-vm
2413# @internal-function java-pkg_setup-vm 2412# @INTERNAL
2414# 2413# @DESCRIPTION:
2415# Sets up the environment for a specific VM 2414# Sets up the environment for a specific VM
2416#
2417# ------------------------------------------------------------------------------
2418java-pkg_setup-vm() { 2415java-pkg_setup-vm() {
2419 debug-print-function ${FUNCNAME} $* 2416 debug-print-function ${FUNCNAME} $*
2420
2421 export LANG="C" LC_ALL="C"
2422 2417
2423 local vendor="$(java-pkg_get-vm-vendor)" 2418 local vendor="$(java-pkg_get-vm-vendor)"
2424 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
2425 addpredict "/dev/random" 2420 addpredict "/dev/random"
2426 elif [[ "${vendor}" == "ibm" ]]; then 2421 elif [[ "${vendor}" == "ibm" ]]; then
2427 addpredict "/proc/self/maps" 2422 addpredict "/proc/self/maps"
2428 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"
2429 elif [[ "${vendor}" == "jrockit" ]]; then 2431 elif [[ "${vendor}" == "jrockit" ]]; then
2430 addpredict "/proc/cpuinfo" 2432 addpredict "/proc/cpuinfo"
2431 fi 2433 fi
2432} 2434}
2433 2435
2434# ------------------------------------------------------------------------------ 2436# @FUNCTION: java-pkg_needs-vm
2435# @internal-function java-pkg_needs-vm 2437# @INTERNAL
2436# 2438# @DESCRIPTION:
2437# 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?
2438# 2441#
2439# @return 0 - Package depends on virtual/jdk 2442# @RETURN: 0 - Package depends on virtual/jdk; 1 - Package does not depend on virtual/jdk
2440# @return 1 - Package does not depend on virtual/jdk
2441# ------------------------------------------------------------------------------
2442java-pkg_needs-vm() { 2443java-pkg_needs-vm() {
2443 debug-print-function ${FUNCNAME} $* 2444 debug-print-function ${FUNCNAME} $*
2444 2445
2445 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
2446 return 0 2447 return 0
2447 fi 2448 fi
2448 2449
2450 [[ -n "${JAVA_PKG_WANT_BUILD_VM}" ]] && return 0
2451
2449 return 1 2452 return 1
2450} 2453}
2451 2454
2452# ------------------------------------------------------------------------------ 2455# @FUNCTION: java-pkg_get-current-vm
2453# @internal-function java-pkg_get-current-vm 2456# @INTERNAL
2454#
2455# @return - The current VM being used 2457# @RETURN - The current VM being used
2456# ------------------------------------------------------------------------------
2457java-pkg_get-current-vm() { 2458java-pkg_get-current-vm() {
2458 java-config -f 2459 java-config -f
2459} 2460}
2460 2461
2461# ------------------------------------------------------------------------------ 2462# @FUNCTION: java-pkg_get-vm-vendor
2462# @internal-function java-pkg_get-vm-vendor 2463# @INTERNAL
2463#
2464# @return - The vendor of the current VM 2464# @RETURN - The vendor of the current VM
2465# ------------------------------------------------------------------------------
2466java-pkg_get-vm-vendor() { 2465java-pkg_get-vm-vendor() {
2467 debug-print-function ${FUNCNAME} $* 2466 debug-print-function ${FUNCNAME} $*
2468 2467
2469 local vm="$(java-pkg_get-current-vm)" 2468 local vm="$(java-pkg_get-current-vm)"
2470 vm="${vm/-*/}" 2469 vm="${vm/-*/}"
2471 echo "${vm}" 2470 echo "${vm}"
2472} 2471}
2473 2472
2474# ------------------------------------------------------------------------------ 2473# @FUNCTION: java-pkg_get-vm-version
2475# @internal-function java-pkg_get-vm-version 2474# @INTERNAL
2476#
2477# @return - The version of the current VM 2475# @RETURN - The version of the current VM
2478# ------------------------------------------------------------------------------
2479java-pkg_get-vm-version() { 2476java-pkg_get-vm-version() {
2480 debug-print-function ${FUNCNAME} $* 2477 debug-print-function ${FUNCNAME} $*
2481 2478
2482 java-config -g PROVIDES_VERSION 2479 java-config -g PROVIDES_VERSION
2483} 2480}
2484 2481
2485# ------------------------------------------------------------------------------ 2482# @FUNCTION: java-pkg_build-vm-from-handle
2486# @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.
2487# 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:
2488# 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
2489# verify that the current VM is sufficient. 2517# verify that the current VM is sufficient.
2490# Setup the environment for the VM being used. 2518# Setup the environment for the VM being used.
2491# ------------------------------------------------------------------------------
2492java-pkg_switch-vm() { 2519java-pkg_switch-vm() {
2493 debug-print-function ${FUNCNAME} $* 2520 debug-print-function ${FUNCNAME} $*
2494 2521
2495 if java-pkg_needs-vm; then 2522 if java-pkg_needs-vm; then
2496 # Use the VM specified by JAVA_PKG_FORCE_VM 2523 # Use the VM specified by JAVA_PKG_FORCE_VM
2498 # 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...
2499 debug-print "JAVA_PKG_FORCE_VM used: ${JAVA_PKG_FORCE_VM}" 2526 debug-print "JAVA_PKG_FORCE_VM used: ${JAVA_PKG_FORCE_VM}"
2500 export GENTOO_VM="${JAVA_PKG_FORCE_VM}" 2527 export GENTOO_VM="${JAVA_PKG_FORCE_VM}"
2501 # if we're allowed to switch the vm... 2528 # if we're allowed to switch the vm...
2502 elif [[ "${JAVA_PKG_ALLOW_VM_CHANGE}" == "yes" ]]; then 2529 elif [[ "${JAVA_PKG_ALLOW_VM_CHANGE}" == "yes" ]]; then
2503 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
2504 if [[ -n ${JAVA_PKG_VNEED} ]]; then 2531 if [[ -n "${JAVA_PKG_WANT_BUILD_VM}" ]]; then
2505 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
2506 else 2549 else
2550 debug-print "depend-java-query: NV_DEPEND: ${JAVA_PKG_NV_DEPEND:-${DEPEND}}"
2507 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
2508 fi 2557 fi
2509 if [[ -z "${GENTOO_VM}" || "${GENTOO_VM}" == "None" ]]; then
2510 eerror "Unable to determine VM for building from dependencies:"
2511 echo "NV_DEPEND: ${JAVA_PKG_NV_DEPEND:-${DEPEND}}"
2512 echo "VNEED: ${JAVA_PKG_VNEED}"
2513 die "Failed to determine VM for building."
2514 else
2515 export GENTOO_VM 2558 export GENTOO_VM
2516 fi
2517 # otherwise just make sure the current VM is sufficient 2559 # otherwise just make sure the current VM is sufficient
2518 else 2560 else
2519 java-pkg_ensure-vm-version-sufficient 2561 java-pkg_ensure-vm-version-sufficient
2520 fi 2562 fi
2521 debug-print "Using: $(java-config -f)" 2563 debug-print "Using: $(java-config -f)"
2549 else 2591 else
2550 [[ -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!!!"
2551 fi 2593 fi
2552} 2594}
2553 2595
2554# ------------------------------------------------------------------------------ 2596# @FUNCTION: java-pkg_die
2555# @internal-function java-pkg_die 2597# @INTERNAL
2556# 2598# @DESCRIPTION:
2557# 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
2558# useful for debugging bugs on bugzilla. 2600# useful for debugging bugs on bugzilla.
2559# ------------------------------------------------------------------------------
2560#register_die_hook java-pkg_die 2601#register_die_hook java-pkg_die
2561if ! hasq java-pkg_die ${EBUILD_DEATH_HOOKS}; then 2602if ! has java-pkg_die ${EBUILD_DEATH_HOOKS}; then
2562 EBUILD_DEATH_HOOKS="${EBUILD_DEATH_HOOKS} java-pkg_die" 2603 EBUILD_DEATH_HOOKS="${EBUILD_DEATH_HOOKS} java-pkg_die"
2563fi 2604fi
2564 2605
2565java-pkg_die() { 2606java-pkg_die() {
2566 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
2567 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
2568 echo "JAVACFLAGS=\"${JAVACFLAGS}\" COMPILER=\"${GENTOO_COMPILER}\"" >&2 2609 echo "JAVACFLAGS=\"${JAVACFLAGS}\" COMPILER=\"${GENTOO_COMPILER}\"" >&2
2569 echo "and of course, the output of emerge --info" >&2 2610 echo "and of course, the output of emerge --info =${P}" >&2
2570} 2611}
2571 2612
2572 2613
2573# TODO document 2614# TODO document
2574# List jars in the source directory, ${S} 2615# List jars in the source directory, ${S}
2581 einfo "Classes" 2622 einfo "Classes"
2582 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},"
2583 fi 2624 fi
2584} 2625}
2585 2626
2586# ------------------------------------------------------------------------------ 2627# @FUNCTION: java-pkg_verify-classes
2587# @internal-function java-pkg_verify-classes 2628# @INTERNAL
2588# 2629# @DESCRIPTION:
2589# 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
2590# not. 2631# not.
2632# @CODE
2591# @param $1 (optional) - the file to check, otherwise checks whole ${D} 2633# $1 (optional) - the file to check, otherwise checks whole ${D}
2592# ------------------------------------------------------------------------------ 2634# @CODE
2593java-pkg_verify-classes() { 2635java-pkg_verify-classes() {
2594 #$(find ${D} -type f -name '*.jar' -o -name '*.class') 2636 #$(find ${D} -type f -name '*.jar' -o -name '*.class')
2595 2637
2596 local version_verify="/usr/bin/class-version-verify.py" 2638 local version_verify="/usr/bin/class-version-verify.py"
2597 2639
2625 eerror "See ${log} for more details." 2667 eerror "See ${log} for more details."
2626 die "Incorrect bytecode found" 2668 die "Incorrect bytecode found"
2627 fi 2669 fi
2628} 2670}
2629 2671
2630# ---------------------------------------------------------------------------- 2672# @FUNCTION: java-pkg_ensure-dep
2631# @internal-function java-pkg_ensure-dep 2673# @INTERNAL
2674# @DESCRIPTION:
2632# 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
2633# within DEPEND or RDEPEND. 2676# within DEPEND or RDEPEND.
2677# @CODE
2678# Parameters:
2634# @param $1 - empty - check both vars; "runtime" or "build" - check only 2679# $1 - empty - check both vars; "runtime" or "build" - check only
2635# RDEPEND, resp. DEPEND 2680# RDEPEND, resp. DEPEND
2636# @param $2 - Package name and slot. 2681# $2 - Package name and slot.
2637 2682# @CODE
2638java-pkg_ensure-dep() { 2683java-pkg_ensure-dep() {
2639 debug-print-function ${FUNCNAME} $* 2684 debug-print-function ${FUNCNAME} $*
2640 2685
2641 local limit_to="${1}" 2686 local limit_to="${1}"
2642 local target_pkg="${2}" 2687 local target_pkg="${2}"
2643 local dev_error="" 2688 local dev_error=""
2644 2689
2645 local stripped_pkg=$(echo "${target_pkg}" | sed \ 2690 # Transform into a regular expression to look for a matching package
2646 's/-[0-9]*\(\.[0-9]\)*$//') 2691 # and SLOT. SLOTs don't have to be numeric so foo-bar could either
2692 # mean foo-bar:0 or foo:bar. So you want to get your head around the
2693 # line below?
2694 #
2695 # * The target package first has any dots escaped, e.g. foo-1.2
2696 # becomes foo-1\.2.
2697 #
2698 # * sed then looks at the component following the last - character,
2699 # or the whole string if there is no - character. It uses this to
2700 # build a new regexp with two significant branches.
2701 #
2702 # * The first checks for the whole target package string, optionally
2703 # followed by a version number, and then :0.
2704 #
2705 # * The second checks for the first part of the target package
2706 # string, optionally followed by a version number, followed by the
2707 # aforementioned component, treating that as a SLOT.
2708 #
2709 local stripped_pkg=/$(sed -r 's/-?([^-]+)$/(\0(-[^:]+)?:0|(-[^:]+)?:\1)/' <<< "${target_pkg//./\\.}")\\b
2647 2710
2648 debug-print "Matching against: ${stripped_pkg}" 2711 debug-print "Matching against: ${stripped_pkg}"
2649 2712
2650 if [[ ${limit_to} != runtime && ! ( "${DEPEND}" =~ "$stripped_pkg" ) ]]; then 2713 if [[ ${limit_to} != runtime && ! ( "${DEPEND}" =~ $stripped_pkg ) ]]; then
2651 dev_error="The ebuild is attempting to use ${target_pkg} that is not" 2714 dev_error="The ebuild is attempting to use ${target_pkg}, which is not "
2652 dev_error="${dev_error} declared in DEPEND." 2715 dev_error+="declared with a SLOT in DEPEND."
2653 if is-java-strict; then 2716 if is-java-strict; then
2654 eerror "${dev_error}"
2655 die "${dev_error}" 2717 die "${dev_error}"
2656 elif [[ ${BASH_SUBSHELL} = 0 ]]; then 2718 else
2657 eerror "${dev_error}" 2719 eqawarn "${dev_error}"
2658 elog "Because you have this package installed the package will" 2720 # Uncomment this once we've dealt with more of these or
2659 elog "build without problems, but please report this to" 2721 # we'll get hit with a wave of bug reports. :(
2660 elog "http://bugs.gentoo.org" 2722# eerror "Because you have ${target_pkg} installed,"
2661 fi 2723# eerror "the package will build without problems, but please"
2724# eerror "report this to http://bugs.gentoo.org."
2662 fi 2725 fi
2663 2726 elif [[ ${limit_to} != build && ! ( "${RDEPEND}${PDEPEND}" =~ ${stripped_pkg} ) ]]; then
2664 if [[ ${limit_to} != build ]]; then
2665 if [[ ! ( ${RDEPEND} =~ "${stripped_pkg}" ) ]]; then
2666 if [[ ! ( ${PDEPEND} =~ "${stripped_pkg}" ) ]]; then
2667 dev_error="The ebuild is attempting to use ${target_pkg}," 2727 dev_error="The ebuild is attempting to use ${target_pkg}, which is not "
2668 dev_error="${dev_error} without specifying --build-only, that is not declared in RDEPEND" 2728 dev_error+="declared with a SLOT in [RP]DEPEND and --build-only wasn't given."
2669 dev_error="${dev_error} or PDEPEND."
2670 if is-java-strict; then 2729 if is-java-strict; then
2671 eerror "${dev_error}"
2672 die "${dev_error}" 2730 die "${dev_error}"
2673 elif [[ ${BASH_SUBSHELL} = 0 ]]; then 2731 else
2674 eerror "${dev_error}" 2732 eqawarn "${dev_error}"
2733 # Uncomment this once we've dealt with more of these or
2734 # we'll get hit with a wave of bug reports. :(
2675 elog "The package will build without problems, but may fail to run" 2735# eerror "The package will build without problems, but may fail to run"
2676 elog "if you don't have ${target_pkg} installed, so please report" 2736# eerror "if you don't have ${target_pkg} installed,"
2677 elog "this to http://bugs.gentoo.org" 2737# eerror "so please report this to http://bugs.gentoo.org."
2678 fi
2679 fi 2738 fi
2680 fi 2739 fi
2681 fi
2682} 2740}
2683
2684# ------------------------------------------------------------------------------
2685# @section-end internal
2686# ------------------------------------------------------------------------------
2687 2741
2688java-pkg_check-phase() { 2742java-pkg_check-phase() {
2689 local phase=${1} 2743 local phase=${1}
2690 local funcname=${FUNCNAME[1]} 2744 local funcname=${FUNCNAME[1]}
2691 if [[ ${EBUILD_PHASE} != ${phase} ]]; then 2745 if [[ ${EBUILD_PHASE} != ${phase} ]]; then
2701 java-pkg_announce-qa-violation "installing versioned jar '${jar}'" 2755 java-pkg_announce-qa-violation "installing versioned jar '${jar}'"
2702 fi 2756 fi
2703} 2757}
2704 2758
2705java-pkg_check-jikes() { 2759java-pkg_check-jikes() {
2706 if hasq jikes ${IUSE}; then 2760 if has jikes ${IUSE}; then
2707 java-pkg_announce-qa-violation "deprecated USE flag 'jikes' in IUSE" 2761 java-pkg_announce-qa-violation "deprecated USE flag 'jikes' in IUSE"
2708 fi 2762 fi
2709} 2763}
2710 2764
2711java-pkg_announce-qa-violation() { 2765java-pkg_announce-qa-violation() {
2726 2780
2727is-java-strict() { 2781is-java-strict() {
2728 [[ -n ${JAVA_PKG_STRICT} ]] 2782 [[ -n ${JAVA_PKG_STRICT} ]]
2729 return $? 2783 return $?
2730} 2784}
2731
2732# ------------------------------------------------------------------------------
2733# @eclass-end
2734# ------------------------------------------------------------------------------

Legend:
Removed from v.1.110  
changed lines
  Added in v.1.158

  ViewVC Help
Powered by ViewVC 1.1.20