/[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.113 Revision 1.162
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.113 2008/10/01 15:23:17 betelgeuse Exp $ 9# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.162 2015/05/24 22:44:37 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.2.0 ${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: java-pkg_regjar
297# @internal-function depend-java-query 286# @USAGE: </path/to/installed/jar>
298# 287# @DESCRIPTION:
299# Wrapper for the depend-java-query binary to enable passing USE in env.
300# Using env variables keeps this eclass working with java-config versions that
301# do not handle use flags.
302# ------------------------------------------------------------------------------
303
304depend-java-query() {
305 # Used to have a which call here but it caused endless loops for some people
306 # that had some weird bashrc voodoo for which.
307 USE="${USE}" /usr/bin/depend-java-query "${@}"
308}
309
310# ------------------------------------------------------------------------------
311# @ebuild-function java-pkg_regjar
312#
313# Records an already installed jar in the package.env 288# 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 289# This would mostly be used if the package has make or a custom script to
315# install things. 290# install things.
316# 291#
317# Example:
318# java-pkg_regjar ${D}/opt/foo/lib/foo.jar
319#
320# WARNING: 292# WARNING:
321# if you want to use shell expansion, you have to use ${D}/... as the for in 293# 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: 294# this function will not be able to expand the path, here's an example:
323# 295#
324# java-pkg_regjar /opt/my-java/lib/*.jar 296# @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 297# java-pkg_regjar ${D}/opt/my-java/lib/*.jar
298# @CODE
335# 299#
336# @param $@ - jars to record 300
337# ------------------------------------------------------------------------------
338# TODO should we be making sure the jar is present on ${D} or wherever? 301# TODO should we be making sure the jar is present on ${D} or wherever?
339java-pkg_regjar() { 302java-pkg_regjar() {
340 debug-print-function ${FUNCNAME} $* 303 debug-print-function ${FUNCNAME} $*
341 304
342 java-pkg_check-phase install 305 java-pkg_check-phase install
365 if [[ ${jar} = *\** ]]; then 328 if [[ ${jar} = *\** ]]; then
366 eerror "The argument ${jar} to ${FUNCNAME}" 329 eerror "The argument ${jar} to ${FUNCNAME}"
367 eerror "has * in it. If you want it to glob in" 330 eerror "has * in it. If you want it to glob in"
368 eerror '${D} add ${D} to the argument.' 331 eerror '${D} add ${D} to the argument.'
369 fi 332 fi
333 debug-print "${jar} or ${D}${jar} not found"
370 die "${jar} does not exist" 334 die "${jar} does not exist"
371 fi 335 fi
372 done 336 done
373 337
374 java-pkg_do_write_ 338 java-pkg_do_write_
375} 339}
376 340
377# ------------------------------------------------------------------------------ 341# @FUNCTION: java-pkg_newjar
378# @ebuild-function java-pkg_newjar 342# @USAGE: <path/to/oldname.jar> [<newname.jar>]
343# @DESCRIPTION:
344# Installs a jar with a new name (defaults to $PN.jar)
379# 345#
380# Installs a jar with a new name
381#
382# @example: install a versioned jar without the version 346# 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() { 347java-pkg_newjar() {
389 debug-print-function ${FUNCNAME} $* 348 debug-print-function ${FUNCNAME} $*
390 349
391 local original_jar="${1}" 350 local original_jar="${1}"
392 local new_jar="${2:-${PN}.jar}" 351 local new_jar="${2:-${PN}.jar}"
400 cp "${original_jar}" "${new_jar_dest}" \ 359 cp "${original_jar}" "${new_jar_dest}" \
401 || die "Failed to copy ${original_jar} to ${new_jar_dest}" 360 || die "Failed to copy ${original_jar} to ${new_jar_dest}"
402 java-pkg_dojar "${new_jar_dest}" 361 java-pkg_dojar "${new_jar_dest}"
403} 362}
404 363
405# ------------------------------------------------------------------------------ 364# @FUNCTION: java-pkg_addcp
406# @ebuild-function java-pkg_addcp 365# @USAGE: <classpath>
407# 366# @DESCRIPTION:
408# Add something to the package's classpath. For jars, you should use dojar, 367# 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. 368# newjar, or regjar. This is typically used to add directories to the classpath.
410# 369# 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() { 370java-pkg_addcp() {
415 java-pkg_append_ JAVA_PKG_CLASSPATH "${@}" 371 java-pkg_append_ JAVA_PKG_CLASSPATH "${@}"
416 java-pkg_do_write_ 372 java-pkg_do_write_
417} 373}
418 374
419# ------------------------------------------------------------------------------ 375# @FUNCTION: java-pkg_doso
420# @ebuild-function java-pkg_doso 376# @USAGE: <path/to/file1.so> [...]
421# 377# @DESCRIPTION:
422# Installs any number of JNI libraries 378# Installs any number of JNI libraries
423# They will be installed into /usr/lib by default, but java-pkg_sointo 379# They will be installed into /usr/lib by default, but java-pkg_sointo
424# can be used change this path 380# can be used change this path
425# 381#
382# @CODE
426# Example: 383# Example:
427# java-pkg_doso *.so 384# java-pkg_doso *.so
428# 385# @CODE
429# @param $@ - JNI libraries to install
430# ------------------------------------------------------------------------------
431java-pkg_doso() { 386java-pkg_doso() {
432 debug-print-function ${FUNCNAME} $* 387 debug-print-function ${FUNCNAME} $*
433 388
434 [[ ${#} -lt 1 ]] && "At least one argument required for ${FUNCNAME}"
435 java-pkg_check-phase install 389 java-pkg_check-phase install
436 390
437 [[ ${#} -lt 1 ]] && die "At least one argument required for ${FUNCNAME}" 391 [[ ${#} -lt 1 ]] && die "${FUNCNAME} requires at least one argument"
438 392
439 java-pkg_init_paths_ 393 java-pkg_init_paths_
440 394
441 local lib 395 local lib
442 # for each lib 396 # for each lib
444 # if the lib exists... 398 # if the lib exists...
445 if [[ -e "${lib}" ]] ; then 399 if [[ -e "${lib}" ]] ; then
446 # install if it isn't a symlink 400 # install if it isn't a symlink
447 if [[ ! -L "${lib}" ]] ; then 401 if [[ ! -L "${lib}" ]] ; then
448 INSDESTTREE="${JAVA_PKG_LIBDEST}" \ 402 INSDESTTREE="${JAVA_PKG_LIBDEST}" \
449 INSOPTIONS="${LIBOPTIONS}" \ 403 INSOPTIONS="-m0755" \
450 doins "${lib}" || die "failed to install ${lib}" 404 doins "${lib}" || die "failed to install ${lib}"
451 java-pkg_append_ JAVA_PKG_LIBRARY "${JAVA_PKG_LIBDEST}" 405 java-pkg_append_ JAVA_PKG_LIBRARY "${JAVA_PKG_LIBDEST}"
452 debug-print "Installing ${lib} to ${JAVA_PKG_LIBDEST}" 406 debug-print "Installing ${lib} to ${JAVA_PKG_LIBDEST}"
453 # otherwise make a symlink to the symlink's origin 407 # otherwise make a symlink to the symlink's origin
454 else 408 else
455 # TODO use dosym 409 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" 410 debug-print "${lib} is a symlink, linking accordantly"
459 fi 411 fi
460 # otherwise die 412 # otherwise die
461 else 413 else
462 die "${lib} does not exist" 414 die "${lib} does not exist"
463 fi 415 fi
464 done 416 done
465 417
466 java-pkg_do_write_ 418 java-pkg_do_write_
467} 419}
468 420
469# ------------------------------------------------------------------------------ 421# @FUNCTION: java-pkg_regso
470# @ebuild-function java-pkg_regso 422# @USAGE: <file1.so> [...]
471# 423# @DESCRIPTION:
472# Registers an already JNI library in package.env. 424# Registers an already installed JNI library in package.env.
425#
426# @CODE
427# Parameters:
428# $@ - JNI libraries to register
473# 429#
474# Example: 430# Example:
475# java-pkg_regso *.so /path/*.so 431# java-pkg_regso *.so /path/*.so
476# 432# @CODE
477# @param $@ - JNI libraries to register
478# ------------------------------------------------------------------------------
479java-pkg_regso() { 433java-pkg_regso() {
480 debug-print-function ${FUNCNAME} $* 434 debug-print-function ${FUNCNAME} $*
481 435
482 java-pkg_check-phase install 436 java-pkg_check-phase install
483 437
484 [[ ${#} -lt 1 ]] && "at least one argument needed" 438 [[ ${#} -lt 1 ]] && die "${FUNCNAME} requires at least one argument"
485 439
486 java-pkg_init_paths_ 440 java-pkg_init_paths_
487 441
488 local lib target_dir 442 local lib target_dir
489 for lib in "$@" ; do 443 for lib in "$@" ; do
501 done 455 done
502 456
503 java-pkg_do_write_ 457 java-pkg_do_write_
504} 458}
505 459
506# ------------------------------------------------------------------------------ 460# @FUNCTION: java-pkg_jarinto
507# @ebuild-function java-pkg_jarinto 461# @USAGE: </path/to/install/jars/into>
508# 462# @DESCRIPTION:
509# Changes the path jars are installed into 463# 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() { 464java-pkg_jarinto() {
514 debug-print-function ${FUNCNAME} $* 465 debug-print-function ${FUNCNAME} $*
515 466
516 JAVA_PKG_JARDEST="${1}" 467 JAVA_PKG_JARDEST="${1}"
517} 468}
518 469
519# ------------------------------------------------------------------------------ 470# @FUNCTION: java-pkg_sointo
520# @ebuild-function java-pkg_sointo 471# @USAGE: </path/to/install/sofiles/into>
521# 472# @DESCRIPTION:
522# Changes the path that JNI libraries are installed into. 473# Changes the path that JNI libraries are installed into via subsequent
523# 474# java-pkg_doso calls.
524# @param $1 - new location to install JNI libraries into.
525# ------------------------------------------------------------------------------
526java-pkg_sointo() { 475java-pkg_sointo() {
527 debug-print-function ${FUNCNAME} $* 476 debug-print-function ${FUNCNAME} $*
528 477
529 JAVA_PKG_LIBDEST="${1}" 478 JAVA_PKG_LIBDEST="${1}"
530} 479}
531 480
532# ------------------------------------------------------------------------------ 481# @FUNCTION: java-pkg_dohtml
533# @ebuild-function java-pkg_dohtml 482# @USAGE: <path/to/javadoc/documentation> [...]
483# @DESCRIPTION:
484# Install Javadoc HTML documentation. Usage of java-pkg_dojavadoc is preferred.
534# 485#
535# Install Javadoc HTML documentation 486# @CODE
536#
537# @example
538# java-pkg_dohtml dist/docs/ 487# java-pkg_dohtml dist/docs/
539# 488# @CODE
540# ------------------------------------------------------------------------------
541java-pkg_dohtml() { 489java-pkg_dohtml() {
542 debug-print-function ${FUNCNAME} $* 490 debug-print-function ${FUNCNAME} $*
543 491
544 [[ ${#} -lt 1 ]] && die "At least one argument required for ${FUNCNAME}" 492 [[ ${#} -lt 1 ]] && die "At least one argument required for ${FUNCNAME}"
545 493
551 # a reasonable way to catch # docs for all of the 499 # a reasonable way to catch # docs for all of the
552 # old ebuilds. 500 # old ebuilds.
553 java-pkg_recordjavadoc 501 java-pkg_recordjavadoc
554} 502}
555 503
556# ------------------------------------------------------------------------------ 504# @FUNCTION: java-pkg_dojavadoc
557# @ebuild-function java-pkg_dojavadoc 505# @USAGE: [--symlink destination] <path/to/javadocs/root>
558# 506# @DESCRIPTION:
559# Installs javadoc documentation. This should be controlled by the doc use flag. 507# Installs javadoc documentation. This should be controlled by the doc use flag.
560# 508#
509# @CODE
510# Parameters:
561# @param $1: optional --symlink creates to symlink like this for html 511# $1: optional --symlink creates to symlink like this for html
562# documentation bundles. 512# documentation bundles.
563# @param $2: - The javadoc root directory. 513# $2: - The javadoc root directory.
564# 514#
565# @example: 515# Examples:
566# java-pkg_dojavadoc docs/api 516# java-pkg_dojavadoc docs/api
567# java-pkg_dojavadoc --symlink apidocs docs/api 517# java-pkg_dojavadoc --symlink apidocs docs/api
568# 518# @CODE
569# ------------------------------------------------------------------------------
570java-pkg_dojavadoc() { 519java-pkg_dojavadoc() {
571 debug-print-function ${FUNCNAME} $* 520 debug-print-function ${FUNCNAME} $*
572 521
573 # For html documentation bundles that link to Javadoc 522 # For html documentation bundles that link to Javadoc
574 local symlink 523 local symlink
581 local dest=/usr/share/doc/${PF}/html 530 local dest=/usr/share/doc/${PF}/html
582 531
583 # QA checks 532 # QA checks
584 533
585 java-pkg_check-phase install 534 java-pkg_check-phase install
535 java-pkg_init_paths_
586 536
587 [[ -z "${dir}" ]] && die "Must specify a directory!" 537 [[ -z "${dir}" ]] && die "Must specify a directory!"
588 [[ ! -d "${dir}" ]] && die "${dir} does not exist, or isn't a directory!" 538 [[ ! -d "${dir}" ]] && die "${dir} does not exist, or isn't a directory!"
589 if [[ ! -e "${dir}/index.html" ]]; then 539 if [[ ! -e "${dir}/index.html" ]]; then
590 local msg="No index.html in javadoc directory" 540 local msg="No index.html in javadoc directory"
617 debug-print "symlinking ${dest}/{api,${symlink}}" 567 debug-print "symlinking ${dest}/{api,${symlink}}"
618 dosym ${dest}/{api,${symlink}} || die 568 dosym ${dest}/{api,${symlink}} || die
619 fi 569 fi
620} 570}
621 571
622# ------------------------------------------------------------------------------ 572# @FUNCTION: java-pkg_dosrc
623# @ebuild-function java-pkg_dosrc 573# @USAGE: <path/to/sources> [...]
624# 574# @DESCRIPTION:
625# Installs a zip containing the source for a package, so it can used in 575# Installs a zip containing the source for a package, so it can used in
626# from IDEs like eclipse and netbeans. 576# from IDEs like eclipse and netbeans.
577# Ebuild needs to DEPEND on app-arch/zip to use this. It also should be controlled by USE=source.
627# 578#
628# Ebuild needs to DEPEND on app-arch/zip to use this. 579# @CODE
629#
630# It also should be controlled by USE=source.
631#
632# @example: 580# Example:
633# java-pkg_dosrc src/* 581# java-pkg_dosrc src/*
634# 582# @CODE
635# ------------------------------------------------------------------------------ 583
636# TODO change so it the arguments it takes are the base directories containing 584# TODO change so it the arguments it takes are the base directories containing
637# source -nichoj 585# source -nichoj
586#
638# TODO should we be able to handle multiple calls to dosrc? -nichoj 587# TODO should we be able to handle multiple calls to dosrc? -nichoj
588#
639# TODO maybe we can take an existing zip/jar? -nichoj 589# TODO maybe we can take an existing zip/jar? -nichoj
590#
640# FIXME apparently this fails if you give it an empty directories 591# FIXME apparently this fails if you give it an empty directories
641java-pkg_dosrc() { 592java-pkg_dosrc() {
642 debug-print-function ${FUNCNAME} $* 593 debug-print-function ${FUNCNAME} $*
643 594
644 [ ${#} -lt 1 ] && die "At least one argument needed" 595 [ ${#} -lt 1 ] && die "At least one argument needed"
676 627
677 JAVA_SOURCES="${JAVA_PKG_SOURCESPATH}/${zip_name}" 628 JAVA_SOURCES="${JAVA_PKG_SOURCESPATH}/${zip_name}"
678 java-pkg_do_write_ 629 java-pkg_do_write_
679} 630}
680 631
681# ------------------------------------------------------------------------------ 632# @FUNCTION: java-pkg_dolauncher
682# @ebuild-function java-pkg_dolauncher 633# @USAGE: <filename> [options]
683# 634# @DESCRIPTION:
684# Make a wrapper script to lauch/start this package 635# Make a wrapper script to lauch/start this package
685# If necessary, the wrapper will switch to the appropriate VM. 636# If necessary, the wrapper will switch to the appropriate VM.
686# 637#
687# Can be called without parameters if the package installs only one jar 638# 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}. 639# that has the Main-class attribute set. The wrapper will be named ${PN}.
689# 640#
641# @CODE
642# Parameters:
690# @param $1 - filename of launcher to create 643# $1 - filename of launcher to create
691# @param $2 - options, as follows: 644# $2 - options, as follows:
692# --main the.main.class.too.start 645# --main the.main.class.to.start
693# --jar /the/jar/too/launch.jar or just <name>.jar 646# --jar /the/jar/too/launch.jar or just <name>.jar
694# --java_args 'Extra arguments to pass to java' 647# --java_args 'Extra arguments to pass to java'
695# --pkg_args 'Extra arguments to pass to the package' 648# --pkg_args 'Extra arguments to pass to the package'
696# --pwd Directory the launcher changes to before executing java 649# --pwd Directory the launcher changes to before executing java
697# -into Directory to install the launcher to, instead of /usr/bin 650# -into Directory to install the launcher to, instead of /usr/bin
698# -pre Prepend contents of this file to the launcher 651# -pre Prepend contents of this file to the launcher
699# ------------------------------------------------------------------------------ 652# @CODE
700java-pkg_dolauncher() { 653java-pkg_dolauncher() {
701 debug-print-function ${FUNCNAME} $* 654 debug-print-function ${FUNCNAME} $*
702 655
703 java-pkg_check-phase install 656 java-pkg_check-phase install
704 java-pkg_init_paths_ 657 java-pkg_init_paths_
765 else 718 else
766 dobin "${target}" 719 dobin "${target}"
767 fi 720 fi
768} 721}
769 722
770# ------------------------------------------------------------------------------ 723# @FUNCTION: java-pkg_dowar
724# @DESCRIPTION:
771# Install war files. 725# Install war files.
772# TODO document 726# TODO document
773# ------------------------------------------------------------------------------
774java-pkg_dowar() { 727java-pkg_dowar() {
775 debug-print-function ${FUNCNAME} $* 728 debug-print-function ${FUNCNAME} $*
776 729
777 # Check for arguments 730 # Check for arguments
778 [[ ${#} -lt 1 ]] && die "At least one argument needed" 731 [[ ${#} -lt 1 ]] && die "At least one argument needed"
802 INSDESTTREE=${JAVA_PKG_WARDEST} \ 755 INSDESTTREE=${JAVA_PKG_WARDEST} \
803 doins ${warpath} 756 doins ${warpath}
804 done 757 done
805} 758}
806 759
807# ------------------------------------------------------------------------------ 760# @FUNCTION: java-pkg_recordjavadoc
808# @internal-function java-pkg_recordjavadoc 761# @INTERNAL
762# @DESCRIPTION:
809# Scan for JavaDocs, and record their existence in the package.env file 763# Scan for JavaDocs, and record their existence in the package.env file
810# 764
811# TODO make sure this in the proper section 765# TODO make sure this in the proper section
812# ------------------------------------------------------------------------------
813java-pkg_recordjavadoc() 766java-pkg_recordjavadoc()
814{ 767{
815 debug-print-function ${FUNCNAME} $* 768 debug-print-function ${FUNCNAME} $*
816 # the find statement is important 769 # the find statement is important
817 # as some packages include multiple trees of javadoc 770 # as some packages include multiple trees of javadoc
824 else 777 else
825 debug-print "No javadocs found" 778 debug-print "No javadocs found"
826 fi 779 fi
827} 780}
828 781
829# ------------------------------------------------------------------------------
830# @section-end install
831# ------------------------------------------------------------------------------
832 782
833# ------------------------------------------------------------------------------ 783# @FUNCTION: java-pkg_jar-from
834# @begin-section query 784# @USAGE: [--build-only] [--with-dependencies] [--virtual] [--into dir] <package> [<package.jar>] [<destination.jar>]
835# Use these to build the classpath for building a package. 785# @DESCRIPTION:
836# ------------------------------------------------------------------------------
837
838# ------------------------------------------------------------------------------
839# @ebuild-function java-pkg_jar-from
840#
841# Makes a symlink to a jar from a certain package 786# Makes a symlink to a jar from a certain package
842# A lot of java packages include dependencies in a lib/ directory 787# A lot of java packages include dependencies in a lib/ directory
843# You can use this function to replace these bundled dependencies. 788# You can use this function to replace these bundled dependencies.
844# The dependency is recorded into package.env DEPEND line, unless "--build-only" 789# 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 790# 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). 791# at build time and are not needed on runtime (junit testing etc).
847# 792#
793# @CODE
848# Example: get all jars from xerces slot 2 794# Example: get all jars from xerces slot 2
849# java-pkg_jar-from xerces-2 795# java-pkg_jar-from xerces-2
796#
850# Example: get a specific jar from xerces slot 2 797# Example: get a specific jar from xerces slot 2
851# java-pkg_jar-from xerces-2 xml-apis.jar 798# java-pkg_jar-from xerces-2 xml-apis.jar
799#
852# Example: get a specific jar from xerces slot 2, and name it diffrently 800# 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 801# java-pkg_jar-from xerces-2 xml-apis.jar xml.jar
802#
854# Example: get junit.jar which is needed only for building 803# Example: get junit.jar which is needed only for building
855# java-pkg_jar-from --build-only junit junit.jar 804# java-pkg_jar-from --build-only junit junit.jar
805# @CODE
856# 806#
857# @param $opt 807# @CODE
808# Parameters
858# --build-only - makes the jar(s) not added into package.env DEPEND line. 809# --build-only - makes the jar(s) not added into package.env DEPEND line.
859# (assumed automatically when called inside src_test) 810# (assumed automatically when called inside src_test)
860# --with-dependencies - get jars also from requested package's dependencies 811# --with-dependencies - get jars also from requested package's dependencies
861# transitively. 812# transitively.
862# --virtual - Packages passed to this function are to be handled as virtuals 813# --virtual - Packages passed to this function are to be handled as virtuals
863# and will not have individual jar dependencies recorded. 814# and will not have individual jar dependencies recorded.
864# --into $dir - symlink jar(s) into $dir (must exist) instead of . 815# --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 816# $1 - Package to get jars from, or comma-separated list of packages in
866# case other parameters are not used. 817# case other parameters are not used.
867# @param $2 - jar from package. If not specified, all jars will be used. 818# $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 819# $3 - When a single jar is specified, destination filename of the
869# symlink. Defaults to the name of the jar. 820# symlink. Defaults to the name of the jar.
870# ------------------------------------------------------------------------------ 821# @CODE
822
871# TODO could probably be cleaned up a little 823# TODO could probably be cleaned up a little
872java-pkg_jar-from() { 824java-pkg_jar-from() {
873 debug-print-function ${FUNCNAME} $* 825 debug-print-function ${FUNCNAME} $*
874 826
875 local build_only="" 827 local build_only=""
876 local destdir="." 828 local destdir="."
877 local deep="" 829 local deep=""
878 local virtual="" 830 local virtual=""
831 local record_jar=""
879 832
880 [[ "${EBUILD_PHASE}" == "test" ]] && build_only="build" 833 [[ "${EBUILD_PHASE}" == "test" ]] && build_only="build"
881 834
882 while [[ "${1}" == --* ]]; do 835 while [[ "${1}" == --* ]]; do
883 if [[ "${1}" = "--build-only" ]]; then 836 if [[ "${1}" = "--build-only" ]]; then
918 for pkg in ${target_pkg//,/ }; do 871 for pkg in ${target_pkg//,/ }; do
919 java-pkg_ensure-dep "${build_only}" "${pkg}" 872 java-pkg_ensure-dep "${build_only}" "${pkg}"
920 [[ -z "${build_only}" ]] && java-pkg_record-jar_ "${pkg}" 873 [[ -z "${build_only}" ]] && java-pkg_record-jar_ "${pkg}"
921 done 874 done
922 # setting this disables further record-jar_ calls later 875 # setting this disables further record-jar_ calls later
923 build_only="build" 876 record_jar="true"
924 else 877 else
925 java-pkg_ensure-dep "${build_only}" "${target_pkg}" 878 java-pkg_ensure-dep "${build_only}" "${target_pkg}"
926 fi 879 fi
927 880
928 # Record the entire virtual as a dependency so that 881 # Record the entire virtual as a dependency so that
929 # no jars are missed. 882 # no jars are missed.
930 if [[ -z "${build_only}" && -n "${virtual}" ]]; then 883 if [[ -z "${build_only}" && -n "${virtual}" ]]; then
931 java-pkg_record-jar_ "${target_pkg}" 884 java-pkg_record-jar_ "${target_pkg}"
932 # setting this disables further record-jars_ calls later 885 # setting this disables further record-jars_ calls later
933 build_only="build" 886 record_jar="true"
934 fi 887 fi
935 888
936 pushd ${destdir} > /dev/null \ 889 pushd ${destdir} > /dev/null \
937 || die "failed to change directory to ${destdir}" 890 || die "failed to change directory to ${destdir}"
938 891
946 # If no specific target jar was indicated, link it 899 # If no specific target jar was indicated, link it
947 if [[ -z "${target_jar}" ]] ; then 900 if [[ -z "${target_jar}" ]] ; then
948 [[ -f "${target_jar}" ]] && rm "${target_jar}" 901 [[ -f "${target_jar}" ]] && rm "${target_jar}"
949 ln -snf "${jar}" \ 902 ln -snf "${jar}" \
950 || die "Failed to make symlink from ${jar} to ${jar_name}" 903 || die "Failed to make symlink from ${jar} to ${jar_name}"
904 if [[ -z "${record_jar}" ]]; then
905 if [[ -z "${build_only}" ]]; then
951 [[ -z "${build_only}" ]] && java-pkg_record-jar_ "${target_pkg}" "${jar}" 906 java-pkg_record-jar_ "${target_pkg}" "${jar}"
907 else
908 java-pkg_record-jar_ --build-only "${target_pkg}" "${jar}"
909 fi
910 fi
952 # otherwise, if the current jar is the target jar, link it 911 # otherwise, if the current jar is the target jar, link it
953 elif [[ "${jar_name}" == "${target_jar}" ]] ; then 912 elif [[ "${jar_name}" == "${target_jar}" ]] ; then
954 [[ -f "${destjar}" ]] && rm "${destjar}" 913 [[ -f "${destjar}" ]] && rm "${destjar}"
955 ln -snf "${jar}" "${destjar}" \ 914 ln -snf "${jar}" "${destjar}" \
956 || die "Failed to make symlink from ${jar} to ${destjar}" 915 || die "Failed to make symlink from ${jar} to ${destjar}"
916 if [[ -z "${record_jar}" ]]; then
917 if [[ -z "${build_only}" ]]; then
957 [[ -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
958 popd > /dev/null 923 popd > /dev/null
959 return 0 924 return 0
960 fi 925 fi
961 done 926 done
962 popd > /dev/null 927 popd > /dev/null
967 else 932 else
968 die "Failed to find ${target_jar:-jar} in ${target_pkg}" 933 die "Failed to find ${target_jar:-jar} in ${target_pkg}"
969 fi 934 fi
970} 935}
971 936
972# ------------------------------------------------------------------------------ 937# @FUNCTION: java-pkg_jarfrom
973# @ebuild-function java-pkg_jarfrom 938# @DESCRIPTION:
974#
975# See java-pkg_jar-from 939# See java-pkg_jar-from
976# ------------------------------------------------------------------------------
977java-pkg_jarfrom() { 940java-pkg_jarfrom() {
978 java-pkg_jar-from "$@" 941 java-pkg_jar-from "$@"
979} 942}
980 943
981# ------------------------------------------------------------------------------ 944# @FUNCTION: java-pkg_getjars
982# @ebuild-function java-pkg_getjars 945# @USAGE: [--build-only] [--with-dependencies] <package1>[,<package2>...]
983# 946# @DESCRIPTION:
984# Get the classpath provided by any number of packages 947# Get the classpath provided by any number of packages
985# Among other things, this can be passed to 'javac -classpath' or 'ant -lib'. 948# 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 949# 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 950# 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 951# that have to be present only at build time and are not needed on runtime
989# (junit testing etc). 952# (junit testing etc).
990# 953#
954# @CODE
991# Example: Get the classpath for xerces-2 and xalan, 955# Example: Get the classpath for xerces-2 and xalan,
992# java-pkg_getjars xerces-2,xalan 956# java-pkg_getjars xerces-2,xalan
957#
993# Example Return: 958# Example Return:
994# /usr/share/xerces-2/lib/xml-apis.jar:/usr/share/xerces-2/lib/xmlParserAPIs.jar:/usr/share/xalan/lib/xalan.jar 959# /usr/share/xerces-2/lib/xml-apis.jar:/usr/share/xerces-2/lib/xmlParserAPIs.jar:/usr/share/xalan/lib/xalan.jar
995# 960#
996# @param $opt 961#
962# Parameters:
997# --build-only - makes the jar(s) not added into package.env DEPEND line. 963# --build-only - makes the jar(s) not added into package.env DEPEND line.
998# (assumed automatically when called inside src_test) 964# (assumed automatically when called inside src_test)
999# --with-dependencies - get jars also from requested package's dependencies 965# --with-dependencies - get jars also from requested package's dependencies
1000# transitively. 966# transitively.
1001# @param $1 - list of packages to get jars from 967# $1 - list of packages to get jars from
1002# (passed to java-config --classpath) 968# (passed to java-config --classpath)
1003# ------------------------------------------------------------------------------ 969# @CODE
1004java-pkg_getjars() { 970java-pkg_getjars() {
1005 debug-print-function ${FUNCNAME} $* 971 debug-print-function ${FUNCNAME} $*
1006 972
1007 local build_only="" 973 local build_only=""
1008 local deep="" 974 local deep=""
1035 1001
1036 for pkg in ${pkgs//,/ }; do 1002 for pkg in ${pkgs//,/ }; do
1037 java-pkg_ensure-dep "${build_only}" "${pkg}" 1003 java-pkg_ensure-dep "${build_only}" "${pkg}"
1038 done 1004 done
1039 1005
1040 # Only record jars that aren't build-only 1006 for pkg in ${pkgs//,/ }; do
1041 if [[ -z "${build_only}" ]]; then 1007 if [[ -z "${build_only}" ]]; then
1042 for pkg in ${pkgs//,/ }; do
1043 java-pkg_record-jar_ "${pkg}" 1008 java-pkg_record-jar_ "${pkg}"
1009 else
1010 java-pkg_record-jar_ --build-only "${pkg}"
1011 fi
1044 done 1012 done
1045 fi
1046 1013
1047 echo "${jars}" 1014 echo "${jars}"
1048} 1015}
1049 1016
1050# ------------------------------------------------------------------------------ 1017# @FUNCTION: java-pkg_getjar
1051# @ebuild-function java-pkg_getjar 1018# @USAGE: [--build-only] [--virtual] <package> <jarfile>
1052# 1019# @DESCRIPTION:
1053# Get the filename of a single jar from a package 1020# Get the complete path of a single jar from a package
1054# The providing package is recorded as runtime dependency into package.env 1021# 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 1022# 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 1023# jars that have to be present only at build time and are not needed on runtime
1057# (junit testing etc). 1024# (junit testing etc).
1058# 1025#
1026# @CODE
1059# @example 1027# Example:
1060# java-pkg_getjar xerces-2 xml-apis.jar 1028# java-pkg_getjar xerces-2 xml-apis.jar
1061# @example-return 1029# returns
1062# /usr/share/xerces-2/lib/xml-apis.jar 1030# /usr/share/xerces-2/lib/xml-apis.jar
1063# 1031#
1064# @param $opt 1032# Parameters:
1065# --build-only - makes the jar not added into package.env DEPEND line. 1033# --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 1034# --virtual - Packages passed to this function are to be handled as virtuals
1067# and will not have individual jar dependencies recorded. 1035# and will not have individual jar dependencies recorded.
1068# @param $1 - package to use 1036# $1 - package to use
1069# @param $2 - jar to get 1037# $2 - jar to get
1070# ------------------------------------------------------------------------------ 1038# @CODE
1071java-pkg_getjar() { 1039java-pkg_getjar() {
1072 debug-print-function ${FUNCNAME} $* 1040 debug-print-function ${FUNCNAME} $*
1073 1041
1074 local build_only="" 1042 local build_only=""
1075 local virtual="" 1043 local virtual=""
1044 local record_jar=""
1076 1045
1077 [[ "${EBUILD_PHASE}" == "test" ]] && build_only="build" 1046 [[ "${EBUILD_PHASE}" == "test" ]] && build_only="build"
1078 1047
1079 while [[ "${1}" == --* ]]; do 1048 while [[ "${1}" == --* ]]; do
1080 if [[ "${1}" = "--build-only" ]]; then 1049 if [[ "${1}" = "--build-only" ]]; then
1106 java-pkg_ensure-dep "${build_only}" "${pkg}" 1075 java-pkg_ensure-dep "${build_only}" "${pkg}"
1107 1076
1108 # Record the package(Virtual) as a dependency and then set build_only 1077 # Record the package(Virtual) as a dependency and then set build_only
1109 # So that individual jars are not recorded. 1078 # So that individual jars are not recorded.
1110 if [[ -n "${virtual}" ]]; then 1079 if [[ -n "${virtual}" ]]; then
1080 if [[ -z "${build_only}" ]]; then
1111 java-pkg_record-jar_ "${pkg}" 1081 java-pkg_record-jar_ "${pkg}"
1112 build_only="true" 1082 else
1083 java-pkg_record-jar_ --build-only "${pkg}"
1084 fi
1085 record_jar="true"
1113 fi 1086 fi
1114 1087
1115 for jar in ${classpath//:/ }; do 1088 for jar in ${classpath//:/ }; do
1116 if [[ ! -f "${jar}" ]] ; then 1089 if [[ ! -f "${jar}" ]] ; then
1117 die "Installation problem with jar ${jar} in ${pkg} - is it installed?" 1090 die "Installation problem with jar ${jar} in ${pkg} - is it installed?"
1118 fi 1091 fi
1119 1092
1120 if [[ "$(basename ${jar})" == "${target_jar}" ]] ; then 1093 if [[ "$(basename ${jar})" == "${target_jar}" ]] ; then
1121 # Only record jars that aren't build-only 1094 # Only record jars that aren't build-only
1122 [[ -z "${build_only}" ]] && java-pkg_record-jar_ "${pkg}" "${jar}" 1095 if [[ -z "${record_jar}" ]]; then
1096 if [[ -z "${build_only}" ]]; then
1097 java-pkg_record-jar_ "${pkg}" "${jar}"
1098 else
1099 java-pkg_record-jar_ --build-only "${pkg}" "${jar}"
1100 fi
1101 fi
1123 echo "${jar}" 1102 echo "${jar}"
1124 return 0 1103 return 0
1125 fi 1104 fi
1126 done 1105 done
1127 1106
1128 die "Could not find ${target_jar} in ${pkg}" 1107 die "Could not find ${target_jar} in ${pkg}"
1129 return 1 1108 return 1
1130} 1109}
1131 1110
1132# ------------------------------------------------------------------------------ 1111# @FUNCTION: java-pkg_register-dependency
1133# @ebuild-function java-pkg_register-dependency 1112# @USAGE: <package>[,<package2>...] [<jarfile>]
1134# 1113# @DESCRIPTION:
1135# Registers runtime dependency on a package, list of packages, or a single jar 1114# 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 1115# from a package, into package.env DEPEND line. Can only be called in
1137# src_install phase. 1116# src_install phase.
1138# Intended for binary packages where you don't need to symlink the jars or get 1117# 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 1118# their classpath during build. As such, the dependencies only need to be
1140# specified in ebuild's RDEPEND, and should be omitted in DEPEND. 1119# specified in ebuild's RDEPEND, and should be omitted in DEPEND.
1141# 1120#
1121# @CODE
1122# Parameters:
1142# @param $1 - comma-separated list of packages, or a single package 1123# $1 - comma-separated list of packages, or a single package
1143# @param $2 - if param $1 is a single package, optionally specify the jar 1124# $2 - if param $1 is a single package, optionally specify the jar
1144# to depend on 1125# to depend on
1145# 1126#
1127# Examples:
1146# Example: Record the dependency on whole xerces-2 and xalan, 1128# Record the dependency on whole xerces-2 and xalan,
1147# java-pkg_register-dependency xerces-2,xalan 1129# java-pkg_register-dependency xerces-2,xalan
1130#
1148# Example: Record the dependency on ant.jar from ant-core 1131# Record the dependency on ant.jar from ant-core
1149# java-pkg_register-dependency ant-core ant.jar 1132# java-pkg_register-dependency ant-core ant.jar
1133# @CODE
1150# 1134#
1151# Note: Passing both list of packages as the first parameter AND specifying the 1135# 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 1136# 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 1137# 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 1138# there are more packages providing identically named jar without class
1155# collisions. 1139# collisions.
1156# ------------------------------------------------------------------------------
1157java-pkg_register-dependency() { 1140java-pkg_register-dependency() {
1158 debug-print-function ${FUNCNAME} $* 1141 debug-print-function ${FUNCNAME} $*
1159 1142
1160 java-pkg_check-phase install 1143 java-pkg_check-phase install
1161 1144
1183 fi 1166 fi
1184 1167
1185 java-pkg_do_write_ 1168 java-pkg_do_write_
1186} 1169}
1187 1170
1188# ------------------------------------------------------------------------------
1189# @ebuild-function java-pkg_register-optional-dependency 1171# @FUNCTION: java-pkg_register-optional-dependency
1190# 1172# @USAGE: <package>[,<package2>...] [<jarfile>]
1173# @DESCRIPTION:
1191# Registers optional runtime dependency on a package, list of packages, or a 1174# 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 1175# single jar from a package, into package.env OPTIONAL_DEPEND line. Can only be
1193# called in src_install phase. 1176# called in src_install phase.
1194# Intended for packages that can use other packages when those are in classpath. 1177# 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 1178# 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 1179# JDBC implementations for various databases. It's better than having USE flag
1197# for each implementation triggering hard dependency. 1180# for each implementation triggering hard dependency.
1198# 1181#
1182# @CODE
1183# Parameters:
1199# @param $1 - comma-separated list of packages, or a single package 1184# $1 - comma-separated list of packages, or a single package
1200# @param $2 - if param $1 is a single package, optionally specify the jar 1185# $2 - if param $1 is a single package, optionally specify the jar to depend on
1201# to depend on
1202# 1186#
1187# Example:
1203# Example: Record the optional dependency on some jdbc providers 1188# Record the optional dependency on some jdbc providers
1204# java-pkg_register-optional-dependency jdbc-jaybird,jtds-1.2,jdbc-mysql 1189# java-pkg_register-optional-dependency jdbc-jaybird,jtds-1.2,jdbc-mysql
1190# @CODE
1205# 1191#
1206# Note: Passing both list of packages as the first parameter AND specifying the 1192# 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 1193# 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 1194# 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 1195# there are more packages providing identically named jar without class
1210# collisions. 1196# collisions.
1211# ------------------------------------------------------------------------------
1212java-pkg_register-optional-dependency() { 1197java-pkg_register-optional-dependency() {
1213 debug-print-function ${FUNCNAME} $* 1198 debug-print-function ${FUNCNAME} $*
1214 1199
1215 java-pkg_check-phase install 1200 java-pkg_check-phase install
1216 1201
1236 fi 1221 fi
1237 1222
1238 java-pkg_do_write_ 1223 java-pkg_do_write_
1239} 1224}
1240 1225
1241# ------------------------------------------------------------------------------
1242# @ebuild-function java-pkg_register-environment-variable 1226# @FUNCTION: java-pkg_register-environment-variable
1243# 1227# @USAGE: <name> <value>
1228# @DESCRIPTION:
1244# Register an arbitrary environment variable into package.env. The gjl launcher 1229# 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 1230# for this package or any package depending on this will export it into
1246# environement before executing java command. 1231# environement before executing java command.
1247# Must only be called in src_install phase. 1232# 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" 1233JAVA_PKG_EXTRA_ENV="${T}/java-pkg-extra-env"
1253JAVA_PKG_EXTRA_ENV_VARS="" 1234JAVA_PKG_EXTRA_ENV_VARS=""
1254java-pkg_register-environment-variable() { 1235java-pkg_register-environment-variable() {
1255 debug-print-function ${FUNCNAME} $* 1236 debug-print-function ${FUNCNAME} $*
1256 1237
1261 echo "${1}=\"${2}\"" >> ${JAVA_PKG_EXTRA_ENV} 1242 echo "${1}=\"${2}\"" >> ${JAVA_PKG_EXTRA_ENV}
1262 JAVA_PKG_EXTRA_ENV_VARS="${JAVA_PKG_EXTRA_ENV_VARS} ${1}" 1243 JAVA_PKG_EXTRA_ENV_VARS="${JAVA_PKG_EXTRA_ENV_VARS} ${1}"
1263 1244
1264 java-pkg_do_write_ 1245 java-pkg_do_write_
1265} 1246}
1247
1248# @FUNCTION: java-pkg_get-bootclasspath
1249# @USAGE: <version>
1250# @DESCRIPTION:
1251# Returns classpath of a given bootclasspath-providing package version.
1252#
1253# @param $1 - the version of bootclasspath (e.g. 1.5), 'auto' for bootclasspath
1254# of the current JDK
1255java-pkg_get-bootclasspath() {
1256 local version="${1}"
1257
1258 local bcp
1259 case "${version}" in
1260 auto)
1261 bcp="$(java-config -g BOOTCLASSPATH)"
1262 ;;
1263 1.5)
1264 bcp="$(java-pkg_getjars --build-only gnu-classpath-0.98)"
1265 ;;
1266 *)
1267 eerror "unknown parameter of java-pkg_get-bootclasspath"
1268 die "unknown parameter of java-pkg_get-bootclasspath"
1269 ;;
1270 esac
1271
1272 echo "${bcp}"
1273}
1274
1266 1275
1267# This function reads stdin, and based on that input, figures out how to 1276# This function reads stdin, and based on that input, figures out how to
1268# populate jars from the filesystem. 1277# populate jars from the filesystem.
1269# Need to figure out a good way of making use of this, ie be able to use a 1278# 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 1279# string that was built instead of stdin
1298# 1307#
1299# read line 1308# read line
1300# done 1309# done
1301#} 1310#}
1302 1311
1303# ------------------------------------------------------------------------------ 1312# @FUNCTION: java-pkg_find-normal-jars
1304# @section-end query 1313# @USAGE: [<path/to/directory>]
1305# ------------------------------------------------------------------------------ 1314# @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 1315# 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() { 1316java-pkg_find-normal-jars() {
1399 local dir=$1 1317 local dir=$1
1400 [[ "${dir}" ]] || dir="${WORKDIR}" 1318 [[ "${dir}" ]] || dir="${WORKDIR}"
1401 local found 1319 local found
1402 for jar in $(find "${dir}" -name "*.jar" -type f); do 1320 for jar in $(find "${dir}" -name "*.jar" -type f); do
1405 done 1323 done
1406 [[ "${found}" ]] 1324 [[ "${found}" ]]
1407 return $? 1325 return $?
1408} 1326}
1409 1327
1410# ------------------------------------------------------------------------------ 1328# @FUNCTION: java-pkg_ensure-no-bundled-jars
1411# @ebuild-function java-pkg_ensure-no-bundled-jars 1329# @DESCRIPTION:
1412#
1413# Try to locate bundled jar files in ${WORKDIR} and die if found. 1330# 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 1331# This function should be called after WORKDIR has been populated with symlink
1415# to system jar files or bundled jars removed. 1332# to system jar files or bundled jars removed.
1416# ------------------------------------------------------------------------------
1417java-pkg_ensure-no-bundled-jars() { 1333java-pkg_ensure-no-bundled-jars() {
1418 debug-print-function ${FUNCNAME} $* 1334 debug-print-function ${FUNCNAME} $*
1419 1335
1420 local bundled_jars=$(java-pkg_find-normal-jars) 1336 local bundled_jars=$(java-pkg_find-normal-jars)
1421 if [[ -n ${bundled_jars} ]]; then 1337 if [[ -n ${bundled_jars} ]]; then
1426 done 1342 done
1427 die "Bundled jars found!" 1343 die "Bundled jars found!"
1428 fi 1344 fi
1429} 1345}
1430 1346
1431# ------------------------------------------------------------------------------
1432# @internal-function java-pkg_ensure-vm-version-sufficient 1347# @FUNCTION: java-pkg_ensure-vm-version-sufficient
1433# 1348# @INTERNAL
1349# @DESCRIPTION:
1434# Checks if we have a sufficient VM and dies if we don't. 1350# Checks if we have a sufficient VM and dies if we don't.
1435#
1436# ------------------------------------------------------------------------------
1437java-pkg_ensure-vm-version-sufficient() { 1351java-pkg_ensure-vm-version-sufficient() {
1438 debug-print-function ${FUNCNAME} $* 1352 debug-print-function ${FUNCNAME} $*
1439 1353
1440 if ! java-pkg_is-vm-version-sufficient; then 1354 if ! java-pkg_is-vm-version-sufficient; then
1441 debug-print "VM is not suffient" 1355 debug-print "VM is not suffient"
1443 einfo "Please use java-config -S to set the correct one" 1357 einfo "Please use java-config -S to set the correct one"
1444 die "Active Java VM cannot build this package" 1358 die "Active Java VM cannot build this package"
1445 fi 1359 fi
1446} 1360}
1447 1361
1448# ------------------------------------------------------------------------------ 1362# @FUNCTION: java-pkg_is-vm-version-sufficient
1449# @internal-function java-pkg_is-vm-version-sufficient 1363# @INTERNAL
1450# 1364# @DESCRIPTION:
1451# @return zero - VM is sufficient 1365# @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() { 1366java-pkg_is-vm-version-sufficient() {
1455 debug-print-function ${FUNCNAME} $* 1367 debug-print-function ${FUNCNAME} $*
1456 1368
1457 depend-java-query --is-sufficient "${DEPEND}" > /dev/null 1369 depend-java-query --is-sufficient "${DEPEND}" > /dev/null
1458 return $? 1370 return $?
1459} 1371}
1460 1372
1461# ------------------------------------------------------------------------------ 1373# @FUNCTION: java-pkg_ensure-vm-version-eq
1462# @internal-function java-pkg_ensure-vm-version-eq 1374# @INTERNAL
1463# 1375# @DESCRIPTION:
1464# Die if the current VM is not equal to the argument passed. 1376# Die if the current VM is not equal to the argument passed.
1465# 1377#
1466# @param $@ - Desired VM version to ensure 1378# @param $@ - Desired VM version to ensure
1467# ------------------------------------------------------------------------------
1468java-pkg_ensure-vm-version-eq() { 1379java-pkg_ensure-vm-version-eq() {
1469 debug-print-function ${FUNCNAME} $* 1380 debug-print-function ${FUNCNAME} $*
1470 1381
1471 if ! java-pkg_is-vm-version-eq $@ ; then 1382 if ! java-pkg_is-vm-version-eq $@ ; then
1472 debug-print "VM is not suffient" 1383 debug-print "VM is not suffient"
1474 einfo "Please use java-config -S to set the correct one" 1385 einfo "Please use java-config -S to set the correct one"
1475 die "Active Java VM too old" 1386 die "Active Java VM too old"
1476 fi 1387 fi
1477} 1388}
1478 1389
1479# ------------------------------------------------------------------------------ 1390# @FUNCTION: java-pkg_is-vm-version-eq
1480# @internal-function java-pkg_is-vm-version-eq 1391# @USAGE: <version>
1481# 1392# @INTERNAL
1482# @param $@ - VM version to compare current VM to 1393# @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() { 1394java-pkg_is-vm-version-eq() {
1487 debug-print-function ${FUNCNAME} $* 1395 debug-print-function ${FUNCNAME} $*
1488 1396
1489 local needed_version="$@" 1397 local needed_version="$@"
1490 1398
1507 return 1 1415 return 1
1508 fi 1416 fi
1509 fi 1417 fi
1510} 1418}
1511 1419
1512# ------------------------------------------------------------------------------ 1420# @FUNCTION: java-pkg_ensure-vm-version-ge
1513# @internal-function java-pkg_ensure-vm-version-ge 1421# @INTERNAL
1514# 1422# @DESCRIPTION:
1515# Die if the current VM is not greater than the desired version 1423# Die if the current VM is not greater than the desired version
1516# 1424#
1517# @param $@ - VM version to compare current to 1425# @param $@ - VM version to compare current to
1518# ------------------------------------------------------------------------------
1519java-pkg_ensure-vm-version-ge() { 1426java-pkg_ensure-vm-version-ge() {
1520 debug-print-function ${FUNCNAME} $* 1427 debug-print-function ${FUNCNAME} $*
1521 1428
1522 if ! java-pkg_is-vm-version-ge "$@" ; then 1429 if ! java-pkg_is-vm-version-ge "$@" ; then
1523 debug-print "vm is not suffient" 1430 debug-print "vm is not suffient"
1525 einfo "Please use java-config -S to set the correct one" 1432 einfo "Please use java-config -S to set the correct one"
1526 die "Active Java VM too old" 1433 die "Active Java VM too old"
1527 fi 1434 fi
1528} 1435}
1529 1436
1530# ------------------------------------------------------------------------------ 1437# @FUNCTION: java-pkg_is-vm-version-ge
1531# @internal-function java-pkg_is-vm-version-ge 1438# @INTERNAL
1532# 1439# @DESCRIPTION:
1440# @CODE
1441# Parameters:
1533# @param $@ - VM version to compare current VM to 1442# $@ - VM version to compare current VM to
1443# @CODE
1534# @return zero - current VM version is greater than checked version 1444# @RETURN: zero - current VM version is greater than checked version;
1535# @return non-zero - current VM version is not greater than checked version 1445# non-zero - current VM version is not greater than checked version
1536# ------------------------------------------------------------------------------
1537java-pkg_is-vm-version-ge() { 1446java-pkg_is-vm-version-ge() {
1538 debug-print-function ${FUNCNAME} $* 1447 debug-print-function ${FUNCNAME} $*
1539 1448
1540 local needed_version=$@ 1449 local needed_version=$@
1541 local vm_version=$(java-pkg_get-vm-version) 1450 local vm_version=$(java-pkg_get-vm-version)
1560java-pkg_get-current-vm() { 1469java-pkg_get-current-vm() {
1561 echo ${GENTOO_VM} 1470 echo ${GENTOO_VM}
1562} 1471}
1563 1472
1564java-pkg_current-vm-matches() { 1473java-pkg_current-vm-matches() {
1565 hasq $(java-pkg_get-current-vm) ${@} 1474 has $(java-pkg_get-current-vm) ${@}
1566 return $? 1475 return $?
1567} 1476}
1568 1477
1569# ------------------------------------------------------------------------------ 1478# @FUNCTION: java-pkg_get-source
1570# @ebuild-function java-pkg_get-source 1479# @DESCRIPTION:
1571#
1572# Determines what source version should be used, for passing to -source. 1480# 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 1481# Unless you want to break things you probably shouldn't set _WANT_SOURCE
1574# 1482#
1575# @return string - Either the lowest possible source, or JAVA_PKG_WANT_SOURCE 1483# @RETURN: string - Either the lowest possible source, or JAVA_PKG_WANT_SOURCE
1576# ------------------------------------------------------------------------------
1577java-pkg_get-source() { 1484java-pkg_get-source() {
1578 echo ${JAVA_PKG_WANT_SOURCE:-$(depend-java-query --get-lowest "${DEPEND} ${RDEPEND}")} 1485 echo ${JAVA_PKG_WANT_SOURCE:-$(depend-java-query --get-lowest "${DEPEND} ${RDEPEND}")}
1579} 1486}
1580 1487
1581# ------------------------------------------------------------------------------ 1488# @FUNCTION: java-pkg_get-target
1582# @ebuild-function java-pkg_get-target 1489# @DESCRIPTION:
1583#
1584# Determines what target version should be used, for passing to -target. 1490# 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 1491# If you don't care about lower versions, you can set _WANT_TARGET to the
1586# version of your JDK. 1492# version of your JDK.
1587# 1493#
1588# @return string - Either the lowest possible target, or JAVA_PKG_WANT_TARGET 1494# @RETURN: string - Either the lowest possible target, or JAVA_PKG_WANT_TARGET
1589# ------------------------------------------------------------------------------
1590java-pkg_get-target() { 1495java-pkg_get-target() {
1591 echo ${JAVA_PKG_WANT_TARGET:-$(depend-java-query --get-lowest "${DEPEND} ${RDEPEND}")} 1496 echo ${JAVA_PKG_WANT_TARGET:-$(depend-java-query --get-lowest "${DEPEND} ${RDEPEND}")}
1592} 1497}
1593 1498
1499# @FUNCTION: java-pkg_get-javac
1500# @DESCRIPTION:
1501# Returns the compiler executable
1594java-pkg_get-javac() { 1502java-pkg_get-javac() {
1595 debug-print-function ${FUNCNAME} $* 1503 debug-print-function ${FUNCNAME} $*
1596 1504
1597 1505
1598 local compiler="${GENTOO_COMPILER}" 1506 local compiler="${GENTOO_COMPILER}"
1628 fi 1536 fi
1629 fi 1537 fi
1630 echo ${compiler_executable} 1538 echo ${compiler_executable}
1631} 1539}
1632 1540
1633# ------------------------------------------------------------------------------ 1541# @FUNCTION: java-pkg_javac-args
1634# @ebuild-function java-pkg_javac-args 1542# @DESCRIPTION:
1635#
1636# If an ebuild uses javac directly, instead of using ejavac, it should call this 1543# If an ebuild uses javac directly, instead of using ejavac, it should call this
1637# to know what -source/-target to use. 1544# to know what -source/-target to use.
1638# 1545#
1639# @return string - arguments to pass to javac, complete with -target and -source 1546# @RETURN: string - arguments to pass to javac, complete with -target and -source
1640# ------------------------------------------------------------------------------
1641java-pkg_javac-args() { 1547java-pkg_javac-args() {
1642 debug-print-function ${FUNCNAME} $* 1548 debug-print-function ${FUNCNAME} $*
1643 1549
1644 local want_source="$(java-pkg_get-source)" 1550 local want_source="$(java-pkg_get-source)"
1645 local want_target="$(java-pkg_get-target)" 1551 local want_target="$(java-pkg_get-target)"
1661 echo "${target_str}" 1567 echo "${target_str}"
1662 fi 1568 fi
1663 fi 1569 fi
1664} 1570}
1665 1571
1666# TODO document 1572# @FUNCTION: java-pkg_get-jni-cflags
1573# @DESCRIPTION:
1574# Echos the CFLAGS for JNI compilations
1667java-pkg_get-jni-cflags() { 1575java-pkg_get-jni-cflags() {
1668 local flags="-I${JAVA_HOME}/include" 1576 local flags="-I${JAVA_HOME}/include"
1669 1577
1670 local platform="linux" 1578 local platform="linux"
1671 use elibc_FreeBSD && platform="freebsd" 1579 use elibc_FreeBSD && platform="freebsd"
1675 1583
1676 echo ${flags} 1584 echo ${flags}
1677} 1585}
1678 1586
1679java-pkg_ensure-gcj() { 1587java-pkg_ensure-gcj() {
1680 if ! built_with_use sys-devel/gcc gcj ; then 1588 # was enforcing sys-devel/gcc[gcj]
1681 ewarn 1589 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} 1590}
1688 1591
1689java-pkg_ensure-test() { 1592java-pkg_ensure-test() {
1690 if hasq test ${FEATURES} && ! hasq -test ${FEATURES} \ 1593 # was enforcing USE=test if FEATURES=test
1691 && hasq test ${IUSE} && ! use test; 1594 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} 1595}
1698 1596
1699# ------------------------------------------------------------------------------ 1597# @FUNCTION: java-pkg_register-ant-task
1700# @ebuild-function java-pkg_register-ant-task 1598# @USAGE: [--version x.y] [<name>]
1701# 1599# @DESCRIPTION:
1702# Register this package as ant task, so that ant will load it when no specific 1600# 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 1601# 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 1602# 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 1603# 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 1604# .jar into /usr/share/ant-core/lib to get autoloaded, for backwards
1707# compatibility. 1605# compatibility.
1708# 1606#
1607# @CODE
1608# Parameters
1709# @param --version x.y Register only for ant version x.y (otherwise for any ant 1609# --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 1610# 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, 1611# ant-core ant tasks after core was updated, before the tasks are updated,
1712# without a need for blockers. 1612# without a need for blockers.
1713# @param $1 Name to register as. Defaults to JAVA_PKG_NAME ($PN[-$SLOT]) 1613# $1 Name to register as. Defaults to JAVA_PKG_NAME ($PN[-$SLOT])
1714# ------------------------------------------------------------------------------ 1614# @CODE
1715java-pkg_register-ant-task() { 1615java-pkg_register-ant-task() {
1716 local TASKS_DIR="tasks" 1616 local TASKS_DIR="tasks"
1717 1617
1718 # check for --version x.y parameters 1618 # check for --version x.y parameters
1719 while [[ -n "${1}" && -n "${2}" ]]; do 1619 while [[ -n "${1}" && -n "${2}" ]]; do
1731 1631
1732 dodir /usr/share/ant/${TASKS_DIR} 1632 dodir /usr/share/ant/${TASKS_DIR}
1733 touch "${D}/usr/share/ant/${TASKS_DIR}/${TASK_NAME}" 1633 touch "${D}/usr/share/ant/${TASKS_DIR}/${TASK_NAME}"
1734} 1634}
1735 1635
1736# ------------------------------------------------------------------------------ 1636# @FUNCTION: java-pkg_ant-tasks-depend
1737# @internal-function java-pkg_ant-tasks-depend 1637# @INTERNAL
1738# 1638# @DESCRIPTION:
1739# Translates the WANT_ANT_TASKS variable into valid dependencies. 1639# Translates the WANT_ANT_TASKS variable into valid dependencies.
1740# ------------------------------------------------------------------------------
1741java-pkg_ant-tasks-depend() { 1640java-pkg_ant-tasks-depend() {
1742 debug-print-function ${FUNCNAME} ${WANT_ANT_TASKS} 1641 debug-print-function ${FUNCNAME} ${WANT_ANT_TASKS}
1743 1642
1744 if [[ -n "${WANT_ANT_TASKS}" ]]; then 1643 if [[ -n "${WANT_ANT_TASKS}" ]]; then
1745 local DEP="" 1644 local DEP=""
1759 else 1658 else
1760 return 0 1659 return 0
1761 fi 1660 fi
1762} 1661}
1763 1662
1764# ------------------------------------------------------------------------------ 1663
1765# @ebuild-function ejunit 1664# @FUNCTION: ejunit_
1766# 1665# @INTERNAL
1666# @DESCRIPTION:
1767# Junit wrapper function. Makes it easier to run the tests and checks for 1667# 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. 1668# dev-java/junit in DEPEND. Launches the tests using junit.textui.TestRunner.
1769# 1669# @CODE
1770# Examples: 1670# Parameters:
1771# ejunit -cp build/classes org.blinkenlights.jid3.test.AllTests 1671# $1 - junit package (junit or junit-4)
1772# ejunit org.blinkenlights.jid3.test.AllTests
1773#
1774# @param $1 - -cp or -classpath 1672# $2 - -cp or -classpath
1775# @param $2 - classpath; junit and recorded dependencies get appended 1673# $3 - classpath; junit and recorded dependencies get appended
1776# @param $@ - the rest of the parameters are passed to java 1674# $@ - the rest of the parameters are passed to java
1777# ------------------------------------------------------------------------------ 1675# @CODE
1778ejunit() { 1676ejunit_() {
1779 debug-print-function ${FUNCNAME} $* 1677 debug-print-function ${FUNCNAME} $*
1780 1678
1781 local pkgs 1679 local pkgs
1782 if [[ -f ${JAVA_PKG_DEPEND_FILE} ]]; then 1680 if [[ -f ${JAVA_PKG_DEPEND_FILE} ]]; then
1783 for atom in $(cat ${JAVA_PKG_DEPEND_FILE} | tr : ' '); do 1681 for atom in $(cat ${JAVA_PKG_DEPEND_FILE} | tr : ' '); do
1784 pkgs=${pkgs},$(echo ${atom} | sed -re "s/^.*@//") 1682 pkgs=${pkgs},$(echo ${atom} | sed -re "s/^.*@//")
1785 done 1683 done
1786 fi 1684 fi
1787 1685
1686 local junit=${1}
1687 shift 1
1688
1788 local cp=$(java-pkg_getjars --with-dependencies junit${pkgs}) 1689 local cp=$(java-pkg_getjars --with-dependencies ${junit}${pkgs})
1789 if [[ ${1} = -cp || ${1} = -classpath ]]; then 1690 if [[ ${1} = -cp || ${1} = -classpath ]]; then
1790 cp="${2}:${cp}" 1691 cp="${2}:${cp}"
1791 shift 2 1692 shift 2
1792 else 1693 else
1793 cp=".:${cp}" 1694 cp=".:${cp}"
1794 fi 1695 fi
1795 1696
1796 local runner=junit.textui.TestRunner 1697 local runner=junit.textui.TestRunner
1698 if [[ "${junit}" == "junit-4" ]] ; then
1699 runner=org.junit.runner.JUnitCore
1700 fi
1797 debug-print "Calling: java -cp \"${cp}\" -Djava.awt.headless=true ${runner} ${@}" 1701 debug-print "Calling: java -cp \"${cp}\" -Djava.awt.headless=true ${runner} ${@}"
1798 java -cp "${cp}" -Djava.awt.headless=true ${runner} "${@}" || die "Running junit failed" 1702 java -cp "${cp}" -Djava.awt.headless=true ${runner} "${@}" || die "Running junit failed"
1799} 1703}
1800 1704
1801# ------------------------------------------------------------------------------ 1705# @FUNCTION: ejunit
1802# @section-end helper 1706# @DESCRIPTION:
1803# ------------------------------------------------------------------------------ 1707# Junit wrapper function. Makes it easier to run the tests and checks for
1804 1708# dev-java/junit in DEPEND. Launches the tests using org.junit.runner.JUnitCore.
1805# ------------------------------------------------------------------------------
1806# @eclass-src_prepare
1807# 1709#
1710# @CODE
1711# Parameters:
1712# $1 - -cp or -classpath
1713# $2 - classpath; junit and recorded dependencies get appended
1714# $@ - the rest of the parameters are passed to java
1715#
1716# Examples:
1717# ejunit -cp build/classes org.blinkenlights.jid3.test.AllTests
1718# ejunit org.blinkenlights.jid3.test.AllTests
1719# ejunit org.blinkenlights.jid3.test.FirstTest org.blinkenlights.jid3.test.SecondTest
1720# @CODE
1721ejunit() {
1722 debug-print-function ${FUNCNAME} $*
1723
1724 ejunit_ "junit" "${@}"
1725}
1726
1727# @FUNCTION: ejunit4
1728# @DESCRIPTION:
1729# Junit4 wrapper function. Makes it easier to run the tests and checks for
1730# dev-java/junit:4 in DEPEND. Launches the tests using junit.textui.TestRunner.
1731#
1732# @CODE
1733# Parameters:
1734# $1 - -cp or -classpath
1735# $2 - classpath; junit and recorded dependencies get appended
1736# $@ - the rest of the parameters are passed to java
1737#
1738# Examples:
1739# ejunit4 -cp build/classes org.blinkenlights.jid3.test.AllTests
1740# ejunit4 org.blinkenlights.jid3.test.AllTests
1741# ejunit4 org.blinkenlights.jid3.test.FirstTest \
1742# org.blinkenlights.jid3.test.SecondTest
1743# @CODE
1744ejunit4() {
1745 debug-print-function ${FUNCNAME} $*
1746
1747 ejunit_ "junit-4" "${@}"
1748}
1749
1750# @FUNCTION: java-utils-2_src_prepare
1751# @DESCRIPTION:
1808# src_prepare Searches for bundled jars 1752# src_prepare Searches for bundled jars
1809# ------------------------------------------------------------------------------ 1753# Don't call directly, but via java-pkg-2_src_prepare!
1810
1811java-utils-2_src_prepare() { 1754java-utils-2_src_prepare() {
1755 [[ ${EBUILD_PHASE} == prepare ]] &&
1756 java-pkg_func-exists java_prepare && java_prepare
1757
1812 # Remember that eant will call this unless called via Portage 1758 # Remember that eant will call this unless called via Portage
1813 if [[ ! -e "${T}/java-utils-2_src_prepare-run" ]] && is-java-strict; then 1759 if [[ ! -e "${T}/java-utils-2_src_prepare-run" ]] && is-java-strict; then
1814 echo "Searching for bundled jars:" 1760 echo "Searching for bundled jars:"
1815 java-pkg_find-normal-jars || echo "None found." 1761 java-pkg_find-normal-jars || echo "None found."
1816 echo "Searching for bundled classes (no output if none found):" 1762 echo "Searching for bundled classes (no output if none found):"
1818 echo "Search done." 1764 echo "Search done."
1819 fi 1765 fi
1820 touch "${T}/java-utils-2_src_prepare-run" 1766 touch "${T}/java-utils-2_src_prepare-run"
1821} 1767}
1822 1768
1823# ------------------------------------------------------------------------------ 1769# @FUNCTION: java-utils-2_pkg_preinst
1824# @section-begin build 1770# @DESCRIPTION:
1825# @section-summary Build functions 1771# pkg_preinst Searches for missing and unneeded dependencies
1826# 1772# Don't call directly, but via java-pkg-2_pkg_preinst!
1827# These are some functions for building a package. In particular, it consists of 1773java-utils-2_pkg_preinst() {
1828# wrappers for javac and ant. 1774 if is-java-strict; then
1829# ------------------------------------------------------------------------------ 1775 if [[ ! -e "${JAVA_PKG_ENV}" ]] || has ant-tasks ${INHERITED}; then
1776 return
1777 fi
1830 1778
1831# ------------------------------------------------------------------------------ 1779 if has_version dev-java/java-dep-check; then
1832# @ebuild-function eant 1780 local output=$(GENTOO_VM= java-dep-check --image "${D}" "${JAVA_PKG_ENV}")
1833# 1781 [[ ${output} ]] && ewarn "${output}"
1782 else
1783 eerror "Install dev-java/java-dep-check for dependency checking"
1784 fi
1785 fi
1786}
1787
1788# @FUNCTION: eant
1789# @USAGE: <ant_build_target(s)>
1790# @DESCRIPTION:
1834# Ant wrapper function. Will use the appropriate compiler, based on user-defined 1791# Ant wrapper function. Will use the appropriate compiler, based on user-defined
1835# compiler. Will also set proper ANT_TASKS from the variable ANT_TASKS, 1792# compiler. Will also set proper ANT_TASKS from the variable ANT_TASKS,
1836# variables: 1793# variables:
1794#
1795# @CODE
1796# Variables:
1837# EANT_GENTOO_CLASSPATH - calls java-pkg_getjars for the value and adds to the 1797# EANT_GENTOO_CLASSPATH - calls java-pkg_getjars for the value and adds to the
1838# gentoo.classpath property. Be sure to call 1798# gentoo.classpath property. Be sure to call java-ant_rewrite-classpath in src_unpack.
1839# java-ant_rewrite-classpath in src_unpack. 1799# EANT_NEEDS_TOOLS - add tools.jar to the gentoo.classpath. Should only be used
1840# JAVA_PKG_NO_BUNDLED_SEARCH - Don't search for bundled jars or class files 1800# for build-time purposes, the dependency is not recorded to
1801# package.env!
1841# *ANT_TASKS - used to determine ANT_TASKS before calling Ant. 1802# ANT_TASKS - used to determine ANT_TASKS before calling Ant.
1842# ------------------------------------------------------------------------------ 1803# @CODE
1843eant() { 1804eant() {
1844 debug-print-function ${FUNCNAME} $* 1805 debug-print-function ${FUNCNAME} $*
1845 1806
1846 if [[ ${EBUILD_PHASE} = compile ]]; then 1807 if [[ ${EBUILD_PHASE} = compile ]]; then
1847 java-ant-2_src_configure 1808 java-ant-2_src_configure
1848 java-utils-2_src_prepare 1809 java-utils-2_src_prepare
1849 fi 1810 fi
1850 1811
1851 if ! hasq java-ant-2 ${INHERITED}; then 1812 if ! has java-ant-2 ${INHERITED}; then
1852 local msg="You should inherit java-ant-2 when using eant" 1813 local msg="You should inherit java-ant-2 when using eant"
1853 java-pkg_announce-qa-violation "${msg}" 1814 java-pkg_announce-qa-violation "${msg}"
1854 fi 1815 fi
1855 1816
1856 local antflags="-Dnoget=true -Dmaven.mode.offline=true -Dbuild.sysclasspath=ignore" 1817 local antflags="-Dnoget=true -Dmaven.mode.offline=true -Dbuild.sysclasspath=ignore"
1929 local gcp="${EANT_GENTOO_CLASSPATH}" 1890 local gcp="${EANT_GENTOO_CLASSPATH}"
1930 local getjarsarg="" 1891 local getjarsarg=""
1931 1892
1932 if [[ ${EBUILD_PHASE} = "test" ]]; then 1893 if [[ ${EBUILD_PHASE} = "test" ]]; then
1933 antflags="${antflags} -DJunit.present=true" 1894 antflags="${antflags} -DJunit.present=true"
1934 [[ ${ANT_TASKS} = *ant-junit* ]] && gcp="${gcp} junit"
1935 getjarsarg="--with-dependencies" 1895 getjarsarg="--with-dependencies"
1896
1897 local re="\bant-junit4?([-:]\S+)?\b"
1898 [[ ${ANT_TASKS} =~ ${re} ]] && gcp+=" ${BASH_REMATCH[0]}"
1899 else
1900 antflags="${antflags} -Dmaven.test.skip=true"
1936 fi 1901 fi
1937 1902
1938 local cp 1903 local cp
1939 1904
1940 for atom in ${gcp}; do 1905 for atom in ${gcp}; do
1941 cp="${cp}:$(java-pkg_getjars ${getjarsarg} ${atom})" 1906 cp="${cp}:$(java-pkg_getjars ${getjarsarg} ${atom})"
1942 done 1907 done
1908
1909 [[ -n "${EANT_NEEDS_TOOLS}" ]] && cp="${cp}:$(java-config --tools)"
1943 1910
1944 if [[ ${cp} ]]; then 1911 if [[ ${cp} ]]; then
1945 # It seems ant does not like single quotes around ${cp} 1912 # It seems ant does not like single quotes around ${cp}
1946 cp=${cp#:} 1913 cp=${cp#:}
1947 [[ ${EANT_GENTOO_CLASSPATH_EXTRA} ]] && \ 1914 [[ ${EANT_GENTOO_CLASSPATH_EXTRA} ]] && \
1952 [[ -n ${JAVA_PKG_DEBUG} ]] && echo ant ${antflags} "${@}" 1919 [[ -n ${JAVA_PKG_DEBUG} ]] && echo ant ${antflags} "${@}"
1953 debug-print "Calling ant (GENTOO_VM: ${GENTOO_VM}): ${antflags} ${@}" 1920 debug-print "Calling ant (GENTOO_VM: ${GENTOO_VM}): ${antflags} ${@}"
1954 ant ${antflags} "${@}" || die "eant failed" 1921 ant ${antflags} "${@}" || die "eant failed"
1955} 1922}
1956 1923
1957# ------------------------------------------------------------------------------ 1924# @FUNCTION: ejavac
1958# @ebuild-function ejavac 1925# @USAGE: <javac_arguments>
1959# 1926# @DESCRIPTION:
1960# Javac wrapper function. Will use the appropriate compiler, based on 1927# Javac wrapper function. Will use the appropriate compiler, based on
1961# /etc/java-config/compilers.conf 1928# /etc/java-config/compilers.conf
1962#
1963# @param $@ - Arguments to be passed to the compiler
1964# ------------------------------------------------------------------------------
1965ejavac() { 1929ejavac() {
1966 debug-print-function ${FUNCNAME} $* 1930 debug-print-function ${FUNCNAME} $*
1967 1931
1968 java-pkg_init-compiler_ 1932 java-pkg_init-compiler_
1969 1933
1983 1947
1984 [[ -n ${JAVA_PKG_DEBUG} ]] && echo ${compiler_executable} ${javac_args} "${@}" 1948 [[ -n ${JAVA_PKG_DEBUG} ]] && echo ${compiler_executable} ${javac_args} "${@}"
1985 ${compiler_executable} ${javac_args} "${@}" || die "ejavac failed" 1949 ${compiler_executable} ${javac_args} "${@}" || die "ejavac failed"
1986} 1950}
1987 1951
1988# ------------------------------------------------------------------------------ 1952# @FUNCTION: ejavadoc
1989# @ebuild-function java-pkg_filter-compiler 1953# @USAGE: <javadoc_arguments>
1990# 1954# @DESCRIPTION:
1955# javadoc wrapper function. Will set some flags based on the VM version
1956# due to strict javadoc rules in 1.8.
1957ejavadoc() {
1958 debug-print-function ${FUNCNAME} $*
1959
1960 local javadoc_args=""
1961
1962 if java-pkg_is-vm-version-ge "1.8" ; then
1963 javadoc_args="-Xdoclint:none"
1964 fi
1965
1966 javadoc ${javadoc_args} "${@}" || die "ejavadoc failed"
1967}
1968
1969# @FUNCTION: java-pkg_filter-compiler
1970# @USAGE: <compiler(s)_to_filter>
1971# @DESCRIPTION:
1991# Used to prevent the use of some compilers. Should be used in src_compile. 1972# Used to prevent the use of some compilers. Should be used in src_compile.
1992# Basically, it just appends onto JAVA_PKG_FILTER_COMPILER 1973# Basically, it just appends onto JAVA_PKG_FILTER_COMPILER
1993#
1994# @param $@ - compilers to filter
1995# ------------------------------------------------------------------------------
1996java-pkg_filter-compiler() { 1974java-pkg_filter-compiler() {
1997 JAVA_PKG_FILTER_COMPILER="${JAVA_PKG_FILTER_COMPILER} $@" 1975 JAVA_PKG_FILTER_COMPILER="${JAVA_PKG_FILTER_COMPILER} $@"
1998} 1976}
1999 1977
2000# ------------------------------------------------------------------------------ 1978# @FUNCTION: java-pkg_force-compiler
2001# @ebuild-function java-pkg_force-compiler 1979# @USAGE: <compiler(s)_to_force>
2002# 1980# @DESCRIPTION:
2003# Used to force the use of particular compilers. Should be used in src_compile. 1981# Used to force the use of particular compilers. Should be used in src_compile.
2004# A common use of this would be to force ecj-3.1 to be used on amd64, to avoid 1982# A common use of this would be to force ecj-3.1 to be used on amd64, to avoid
2005# OutOfMemoryErrors that may come up. 1983# OutOfMemoryErrors that may come up.
2006#
2007# @param $@ - compilers to force
2008# ------------------------------------------------------------------------------
2009java-pkg_force-compiler() { 1984java-pkg_force-compiler() {
2010 JAVA_PKG_FORCE_COMPILER="$@" 1985 JAVA_PKG_FORCE_COMPILER="$@"
2011} 1986}
2012 1987
2013# ------------------------------------------------------------------------------ 1988# @FUNCTION: use_doc
2014# @ebuild-function use_doc 1989# @DESCRIPTION:
2015# 1990#
2016# Helper function for getting ant to build javadocs. If the user has USE=doc, 1991# Helper function for getting ant to build javadocs. If the user has USE=doc,
2017# then 'javadoc' or the argument are returned. Otherwise, there is no return. 1992# then 'javadoc' or the argument are returned. Otherwise, there is no return.
2018# 1993#
2019# The output of this should be passed to ant. 1994# The output of this should be passed to ant.
1995# @CODE
1996# Parameters:
1997# $@ - Option value to return. Defaults to 'javadoc'
2020# 1998#
1999# Examples:
2021# Example: build javadocs by calling 'javadoc' target 2000# build javadocs by calling 'javadoc' target
2022# eant $(use_doc) 2001# eant $(use_doc)
2002#
2023# Example: build javadocs by calling 'apidoc' target 2003# build javadocs by calling 'apidoc' target
2024# eant $(use_doc apidoc) 2004# eant $(use_doc apidoc)
2025# 2005# @CODE
2026# @param $@ - Option value to return. Defaults to 'javadoc'
2027# @return string - Name of the target to create javadocs 2006# @RETURN string - Name of the target to create javadocs
2028# ------------------------------------------------------------------------------
2029use_doc() { 2007use_doc() {
2030 use doc && echo ${@:-javadoc} 2008 use doc && echo ${@:-javadoc}
2031} 2009}
2032 2010
2033 2011
2034# ------------------------------------------------------------------------------ 2012# @FUNCTION: java-pkg_init
2035# @section-end build 2013# @INTERNAL
2036# ------------------------------------------------------------------------------ 2014# @DESCRIPTION:
2037
2038# ------------------------------------------------------------------------------
2039# @section-begin internal
2040# @section-summary Internal functions
2041#
2042# Do __NOT__ use any of these from an ebuild! These are only to be used from
2043# within the java eclasses.
2044# ------------------------------------------------------------------------------
2045
2046# -----------------------------------------------------------------------------
2047# @function-internal java-pkg_init
2048#
2049# The purpose of this function, as the name might imply, is to initialize the 2015# The purpose of this function, as the name might imply, is to initialize the
2050# Java environment. It ensures that that there aren't any environment variables 2016# Java environment. It ensures that that there aren't any environment variables
2051# that'll muss things up. It initializes some variables, which are used 2017# that'll muss things up. It initializes some variables, which are used
2052# internally. And most importantly, it'll switch the VM if necessary. 2018# internally. And most importantly, it'll switch the VM if necessary.
2053# 2019#
2054# This shouldn't be used directly. Instead, java-pkg and java-pkg-opt will 2020# This shouldn't be used directly. Instead, java-pkg and java-pkg-opt will
2055# call it during each of the phases of the merge process. 2021# call it during each of the phases of the merge process.
2056#
2057# -----------------------------------------------------------------------------
2058java-pkg_init() { 2022java-pkg_init() {
2059 debug-print-function ${FUNCNAME} $* 2023 debug-print-function ${FUNCNAME} $*
2024
2025 # Don't set up build environment if installing from binary. #206024 #258423
2026 [[ "${MERGE_TYPE}" == "binary" ]] && return
2027 # Also try Portage's nonstandard EMERGE_FROM for old EAPIs, if it doesn't
2028 # work nothing is lost.
2029 has ${EAPI:-0} 0 1 2 3 && [[ "${EMERGE_FROM}" == "binary" ]] && return
2030
2060 unset JAVAC 2031 unset JAVAC
2061 unset JAVA_HOME 2032 unset JAVA_HOME
2033
2034 java-config --help >/dev/null || {
2035 eerror ""
2036 eerror "Can't run java-config --help"
2037 eerror "Have you upgraded python recently but haven't"
2038 eerror "run python-updater yet?"
2039 die "Can't run java-config --help"
2040 }
2062 2041
2063 # People do all kinds of weird things. 2042 # People do all kinds of weird things.
2064 # http://forums.gentoo.org/viewtopic-p-3943166.html 2043 # http://forums.gentoo.org/viewtopic-p-3943166.html
2065 local silence="${SILENCE_JAVA_OPTIONS_WARNING}" 2044 local silence="${SILENCE_JAVA_OPTIONS_WARNING}"
2066 local accept="${I_WANT_GLOBAL_JAVA_OPTIONS}" 2045 local accept="${I_WANT_GLOBAL_JAVA_OPTIONS}"
2083 2062
2084 if java-pkg_func-exists ant_src_unpack; then 2063 if java-pkg_func-exists ant_src_unpack; then
2085 java-pkg_announce-qa-violation "Using old ant_src_unpack. Should be src_unpack" 2064 java-pkg_announce-qa-violation "Using old ant_src_unpack. Should be src_unpack"
2086 fi 2065 fi
2087 2066
2088 java-pkg_init_paths_
2089 java-pkg_switch-vm 2067 java-pkg_switch-vm
2090 PATH=${JAVA_HOME}/bin:${PATH} 2068 PATH=${JAVA_HOME}/bin:${PATH}
2091 2069
2092 # TODO we will probably want to set JAVAC and JAVACFLAGS 2070 # TODO we will probably want to set JAVAC and JAVACFLAGS
2093 2071
2104 export CLASSPATH= 2082 export CLASSPATH=
2105 2083
2106 # Unset external ANT_ stuff 2084 # Unset external ANT_ stuff
2107 export ANT_TASKS= 2085 export ANT_TASKS=
2108 export ANT_OPTS= 2086 export ANT_OPTS=
2087 export ANT_RESPECT_JAVA_HOME=
2109} 2088}
2110 2089
2111# ------------------------------------------------------------------------------ 2090# @FUNCTION: java-pkg-init-compiler_
2112# @function-internal java-pkg-init-compiler_ 2091# @INTERNAL
2113# 2092# @DESCRIPTION:
2114# This function attempts to figure out what compiler should be used. It does 2093# This function attempts to figure out what compiler should be used. It does
2115# this by reading the file at JAVA_PKG_COMPILERS_CONF, and checking the 2094# this by reading the file at JAVA_PKG_COMPILERS_CONF, and checking the
2116# COMPILERS variable defined there. 2095# COMPILERS variable defined there.
2117# This can be overridden by a list in JAVA_PKG_FORCE_COMPILER 2096# This can be overridden by a list in JAVA_PKG_FORCE_COMPILER
2118# 2097#
2129# If the user doesn't defined anything in JAVA_PKG_COMPILERS_CONF, or no 2108# If the user doesn't defined anything in JAVA_PKG_COMPILERS_CONF, or no
2130# suitable compiler was found there, then the default is to use javac provided 2109# suitable compiler was found there, then the default is to use javac provided
2131# by the current VM. 2110# by the current VM.
2132# 2111#
2133# 2112#
2134# @return name of the compiler to use 2113# @RETURN name of the compiler to use
2135# ------------------------------------------------------------------------------
2136java-pkg_init-compiler_() { 2114java-pkg_init-compiler_() {
2137 debug-print-function ${FUNCNAME} $* 2115 debug-print-function ${FUNCNAME} $*
2138 2116
2139 if [[ -n ${GENTOO_COMPILER} ]]; then 2117 if [[ -n ${GENTOO_COMPILER} ]]; then
2140 debug-print "GENTOO_COMPILER already set" 2118 debug-print "GENTOO_COMPILER already set"
2220 einfo "Using ${GENTOO_COMPILER} for compilation" 2198 einfo "Using ${GENTOO_COMPILER} for compilation"
2221 fi 2199 fi
2222 2200
2223} 2201}
2224 2202
2225# ------------------------------------------------------------------------------ 2203# @FUNCTION: init_paths_
2226# @internal-function init_paths_ 2204# @INTERNAL
2227# 2205# @DESCRIPTION:
2228# Initializes some variables that will be used. These variables are mostly used 2206# Initializes some variables that will be used. These variables are mostly used
2229# to determine where things will eventually get installed. 2207# to determine where things will eventually get installed.
2230# ------------------------------------------------------------------------------
2231java-pkg_init_paths_() { 2208java-pkg_init_paths_() {
2232 debug-print-function ${FUNCNAME} $* 2209 debug-print-function ${FUNCNAME} $*
2233 2210
2234 local pkg_name 2211 local pkg_name
2235 if [[ "$SLOT" == "0" ]] ; then 2212 if [[ "${SLOT%/*}" == "0" ]] ; then
2236 JAVA_PKG_NAME="${PN}" 2213 JAVA_PKG_NAME="${PN}"
2237 else 2214 else
2238 JAVA_PKG_NAME="${PN}-${SLOT}" 2215 JAVA_PKG_NAME="${PN}-${SLOT%/*}"
2239 fi 2216 fi
2240 2217
2241 JAVA_PKG_SHAREPATH="${DESTTREE}/share/${JAVA_PKG_NAME}" 2218 JAVA_PKG_SHAREPATH="${DESTTREE}/share/${JAVA_PKG_NAME}"
2242 JAVA_PKG_SOURCESPATH="${JAVA_PKG_SHAREPATH}/sources/" 2219 JAVA_PKG_SOURCESPATH="${JAVA_PKG_SHAREPATH}/sources/"
2243 JAVA_PKG_ENV="${D}${JAVA_PKG_SHAREPATH}/package.env" 2220 JAVA_PKG_ENV="${D}${JAVA_PKG_SHAREPATH}/package.env"
2245 JAVA_PKG_VIRTUAL_PROVIDER="${D}/${JAVA_PKG_VIRTUALS_PATH}/${JAVA_PKG_NAME}" 2222 JAVA_PKG_VIRTUAL_PROVIDER="${D}/${JAVA_PKG_VIRTUALS_PATH}/${JAVA_PKG_NAME}"
2246 2223
2247 [[ -z "${JAVA_PKG_JARDEST}" ]] && JAVA_PKG_JARDEST="${JAVA_PKG_SHAREPATH}/lib" 2224 [[ -z "${JAVA_PKG_JARDEST}" ]] && JAVA_PKG_JARDEST="${JAVA_PKG_SHAREPATH}/lib"
2248 [[ -z "${JAVA_PKG_LIBDEST}" ]] && JAVA_PKG_LIBDEST="${DESTTREE}/$(get_libdir)/${JAVA_PKG_NAME}" 2225 [[ -z "${JAVA_PKG_LIBDEST}" ]] && JAVA_PKG_LIBDEST="${DESTTREE}/$(get_libdir)/${JAVA_PKG_NAME}"
2249 [[ -z "${JAVA_PKG_WARDEST}" ]] && JAVA_PKG_WARDEST="${JAVA_PKG_SHAREPATH}/webapps" 2226 [[ -z "${JAVA_PKG_WARDEST}" ]] && JAVA_PKG_WARDEST="${JAVA_PKG_SHAREPATH}/webapps"
2250
2251 2227
2252 # TODO maybe only print once? 2228 # TODO maybe only print once?
2253 debug-print "JAVA_PKG_SHAREPATH: ${JAVA_PKG_SHAREPATH}" 2229 debug-print "JAVA_PKG_SHAREPATH: ${JAVA_PKG_SHAREPATH}"
2254 debug-print "JAVA_PKG_ENV: ${JAVA_PKG_ENV}" 2230 debug-print "JAVA_PKG_ENV: ${JAVA_PKG_ENV}"
2255 debug-print "JAVA_PKG_JARDEST: ${JAVA_PKG_JARDEST}" 2231 debug-print "JAVA_PKG_JARDEST: ${JAVA_PKG_JARDEST}"
2256 debug-print "JAVA_PKG_LIBDEST: ${JAVA_PKG_LIBDEST}" 2232 debug-print "JAVA_PKG_LIBDEST: ${JAVA_PKG_LIBDEST}"
2257 debug-print "JAVA_PKG_WARDEST: ${JAVA_PKG_WARDEST}" 2233 debug-print "JAVA_PKG_WARDEST: ${JAVA_PKG_WARDEST}"
2258} 2234}
2259 2235
2260# ------------------------------------------------------------------------------ 2236# @FUNCTION: java-pkg_do_write_
2261# @internal-function java-pkg_do_write_ 2237# @INTERNAL
2262# 2238# @DESCRIPTION:
2263# Writes the package.env out to disk. 2239# Writes the package.env out to disk.
2264# 2240#
2265# ------------------------------------------------------------------------------
2266# TODO change to do-write, to match everything else 2241# TODO change to do-write, to match everything else
2267java-pkg_do_write_() { 2242java-pkg_do_write_() {
2268 debug-print-function ${FUNCNAME} $* 2243 debug-print-function ${FUNCNAME} $*
2269 java-pkg_init_paths_ 2244 java-pkg_init_paths_
2270 # Create directory for package.env 2245 # Create directory for package.env
2275 # Create package.env 2250 # Create package.env
2276 ( 2251 (
2277 echo "DESCRIPTION=\"${DESCRIPTION}\"" 2252 echo "DESCRIPTION=\"${DESCRIPTION}\""
2278 echo "GENERATION=\"2\"" 2253 echo "GENERATION=\"2\""
2279 echo "SLOT=\"${SLOT}\"" 2254 echo "SLOT=\"${SLOT}\""
2255 echo "CATEGORY=\"${CATEGORY}\""
2256 echo "PVR=\"${PVR}\""
2280 2257
2281 [[ -n "${JAVA_PKG_CLASSPATH}" ]] && echo "CLASSPATH=\"${JAVA_PKG_CLASSPATH}\"" 2258 [[ -n "${JAVA_PKG_CLASSPATH}" ]] && echo "CLASSPATH=\"${JAVA_PKG_CLASSPATH}\""
2282 [[ -n "${JAVA_PKG_LIBRARY}" ]] && echo "LIBRARY_PATH=\"${JAVA_PKG_LIBRARY}\"" 2259 [[ -n "${JAVA_PKG_LIBRARY}" ]] && echo "LIBRARY_PATH=\"${JAVA_PKG_LIBRARY}\""
2283 [[ -n "${JAVA_PROVIDE}" ]] && echo "PROVIDES=\"${JAVA_PROVIDE}\"" 2260 [[ -n "${JAVA_PROVIDE}" ]] && echo "PROVIDES=\"${JAVA_PROVIDE}\""
2284 [[ -f "${JAVA_PKG_DEPEND_FILE}" ]] \ 2261 [[ -f "${JAVA_PKG_DEPEND_FILE}" ]] \
2285 && echo "DEPEND=\"$(cat "${JAVA_PKG_DEPEND_FILE}" | uniq | tr '\n' ':')\"" 2262 && echo "DEPEND=\"$(sort -u "${JAVA_PKG_DEPEND_FILE}" | tr '\n' ':')\""
2286 [[ -f "${JAVA_PKG_OPTIONAL_DEPEND_FILE}" ]] \ 2263 [[ -f "${JAVA_PKG_OPTIONAL_DEPEND_FILE}" ]] \
2287 && echo "OPTIONAL_DEPEND=\"$(cat "${JAVA_PKG_OPTIONAL_DEPEND_FILE}" | uniq | tr '\n' ':')\"" 2264 && echo "OPTIONAL_DEPEND=\"$(sort -u "${JAVA_PKG_OPTIONAL_DEPEND_FILE}" | tr '\n' ':')\""
2288 echo "VM=\"$(echo ${RDEPEND} ${DEPEND} | sed -e 's/ /\n/g' | sed -n -e '/virtual\/\(jre\|jdk\)/ { p;q }')\"" # TODO cleanup ! 2265 echo "VM=\"$(echo ${RDEPEND} ${DEPEND} | sed -e 's/ /\n/g' | sed -n -e '/virtual\/\(jre\|jdk\)/ { p;q }')\"" # TODO cleanup !
2266 [[ -f "${JAVA_PKG_BUILD_DEPEND_FILE}" ]] \
2267 && echo "BUILD_DEPEND=\"$(sort -u "${JAVA_PKG_BUILD_DEPEND_FILE}" | tr '\n' ':')\""
2289 ) > "${JAVA_PKG_ENV}" 2268 ) > "${JAVA_PKG_ENV}"
2290 2269
2291 # register target/source 2270 # register target/source
2292 local target="$(java-pkg_get-target)" 2271 local target="$(java-pkg_get-target)"
2293 local source="$(java-pkg_get-source)" 2272 local source="$(java-pkg_get-source)"
2321 debug-print "or JAVA_PKG_OPTIONAL_DEPEND_FILE not defined so can't" 2300 debug-print "or JAVA_PKG_OPTIONAL_DEPEND_FILE not defined so can't"
2322 debug-print "write package.env." 2301 debug-print "write package.env."
2323 fi 2302 fi
2324} 2303}
2325 2304
2326# ------------------------------------------------------------------------------ 2305# @FUNCTION: java-pkg_record-jar_
2327# @internal-function java-pkg_record-jar_ 2306# @INTERNAL
2328# 2307# @DESCRIPTION:
2329# Record an (optional) dependency to the package.env 2308# Record an (optional) dependency to the package.env
2309# @CODE
2310# Parameters:
2330# @param --optional - record dependency as optional 2311# --optional - record dependency as optional
2312# --build - record dependency as build_only
2331# @param $1 - package to record 2313# $1 - package to record
2332# @param $2 - (optional) jar of package to record 2314# $2 - (optional) jar of package to record
2333# ------------------------------------------------------------------------------ 2315# @CODE
2334JAVA_PKG_DEPEND_FILE="${T}/java-pkg-depend" 2316JAVA_PKG_DEPEND_FILE="${T}/java-pkg-depend"
2335JAVA_PKG_OPTIONAL_DEPEND_FILE="${T}/java-pkg-optional-depend" 2317JAVA_PKG_OPTIONAL_DEPEND_FILE="${T}/java-pkg-optional-depend"
2318JAVA_PKG_BUILD_DEPEND_FILE="${T}/java-pkg-build-depend"
2336 2319
2337java-pkg_record-jar_() { 2320java-pkg_record-jar_() {
2338 debug-print-function ${FUNCNAME} $* 2321 debug-print-function ${FUNCNAME} $*
2339 2322
2340 local depend_file="${JAVA_PKG_DEPEND_FILE}" 2323 local depend_file="${JAVA_PKG_DEPEND_FILE}"
2341 if [[ "${1}" == "--optional" ]]; then 2324 case "${1}" in
2342 depend_file="${JAVA_PKG_OPTIONAL_DEPEND_FILE}" 2325 "--optional") depend_file="${JAVA_PKG_OPTIONAL_DEPEND_FILE}"; shift;;
2343 shift 2326 "--build-only") depend_file="${JAVA_PKG_BUILD_DEPEND_FILE}"; shift;;
2344 fi 2327 esac
2345 2328
2346 local pkg=${1} jar=${2} append 2329 local pkg=${1} jar=${2} append
2347 if [[ -z "${jar}" ]]; then 2330 if [[ -z "${jar}" ]]; then
2348 append="${pkg}" 2331 append="${pkg}"
2349 else 2332 else
2351 fi 2334 fi
2352 2335
2353 echo "${append}" >> "${depend_file}" 2336 echo "${append}" >> "${depend_file}"
2354} 2337}
2355 2338
2356# ------------------------------------------------------------------------------ 2339# @FUNCTION: java-pkg_append_
2357# @internal-function java-pkg_append_ 2340# @INTERNAL
2358# 2341# @DESCRIPTION:
2359# Appends a value to a variable 2342# Appends a value to a variable
2360# 2343#
2361# Example: java-pkg_append_ CLASSPATH foo.jar 2344# @CODE
2345# Parameters:
2362# @param $1 variable name to modify 2346# $1 variable name to modify
2363# @param $2 value to append 2347# $2 value to append
2364# ------------------------------------------------------------------------------ 2348#
2349# Examples:
2350# java-pkg_append_ CLASSPATH foo.jar
2351# @CODE
2365java-pkg_append_() { 2352java-pkg_append_() {
2366 debug-print-function ${FUNCNAME} $* 2353 debug-print-function ${FUNCNAME} $*
2367 2354
2368 local var="${1}" value="${2}" 2355 local var="${1}" value="${2}"
2369 if [[ -z "${!var}" ]] ; then 2356 if [[ -z "${!var}" ]] ; then
2380 [[ -z ${haveit} ]] && export ${var}="${!var}:${value}" 2367 [[ -z ${haveit} ]] && export ${var}="${!var}:${value}"
2381 IFS=${oldIFS} 2368 IFS=${oldIFS}
2382 fi 2369 fi
2383} 2370}
2384 2371
2385# ------------------------------------------------------------------------------ 2372# @FUNCTION: java-pkg_expand_dir_
2386# @internal-function java-pkg_expand_dir_ 2373# @INTERNAL
2387# 2374# @DESCRIPTION:
2388# Gets the full path of the file/directory's parent. 2375# Gets the full path of the file/directory's parent.
2376# @CODE
2377# Parameters:
2389# @param $1 - file/directory to find parent directory for 2378# $1 - file/directory to find parent directory for
2379# @CODE
2390# @return - path to $1's parent directory 2380# @RETURN: path to $1's parent directory
2391# ------------------------------------------------------------------------------
2392java-pkg_expand_dir_() { 2381java-pkg_expand_dir_() {
2393 pushd "$(dirname "${1}")" >/dev/null 2>&1 2382 pushd "$(dirname "${1}")" >/dev/null 2>&1
2394 pwd 2383 pwd
2395 popd >/dev/null 2>&1 2384 popd >/dev/null 2>&1
2396} 2385}
2397 2386
2398# ------------------------------------------------------------------------------ 2387# @FUNCTION: java-pkg_func-exists
2399# @internal-function java-pkg_func-exists 2388# @INTERNAL
2400# 2389# @DESCRIPTION:
2401# Does the indicated function exist? 2390# Does the indicated function exist?
2402# 2391# @RETURN: 0 - function is declared, 1 - function is undeclared
2403# @return 0 - function is declared
2404# @return 1 - function is undeclared
2405# ------------------------------------------------------------------------------
2406java-pkg_func-exists() { 2392java-pkg_func-exists() {
2407 if [[ -n "$(declare -f ${1})" ]]; then 2393 declare -F ${1} > /dev/null
2408 return 0
2409 else
2410 return 1
2411 fi
2412} 2394}
2413 2395
2414# ------------------------------------------------------------------------------ 2396# @FUNCTION: java-pkg_setup-vm
2415# @internal-function java-pkg_setup-vm 2397# @INTERNAL
2416# 2398# @DESCRIPTION:
2417# Sets up the environment for a specific VM 2399# Sets up the environment for a specific VM
2418#
2419# ------------------------------------------------------------------------------
2420java-pkg_setup-vm() { 2400java-pkg_setup-vm() {
2421 debug-print-function ${FUNCNAME} $* 2401 debug-print-function ${FUNCNAME} $*
2422
2423 export LANG="C" LC_ALL="C"
2424 2402
2425 local vendor="$(java-pkg_get-vm-vendor)" 2403 local vendor="$(java-pkg_get-vm-vendor)"
2426 if [[ "${vendor}" == "sun" ]] && java-pkg_is-vm-version-ge "1.5" ; then 2404 if [[ "${vendor}" == "sun" ]] && java-pkg_is-vm-version-ge "1.5" ; then
2427 addpredict "/dev/random" 2405 addpredict "/dev/random"
2428 elif [[ "${vendor}" == "ibm" ]]; then 2406 elif [[ "${vendor}" == "ibm" ]]; then
2429 addpredict "/proc/self/maps" 2407 addpredict "/proc/self/maps"
2430 addpredict "/proc/cpuinfo" 2408 addpredict "/proc/cpuinfo"
2409 addpredict "/proc/self/coredump_filter"
2410 elif [[ "${vendor}" == "oracle" ]]; then
2411 addpredict "/dev/random"
2412 addpredict "/proc/self/coredump_filter"
2413 elif [[ "${vendor}" == icedtea* ]] && java-pkg_is-vm-version-ge "1.7" ; then
2414 addpredict "/dev/random"
2415 addpredict "/proc/self/coredump_filter"
2431 elif [[ "${vendor}" == "jrockit" ]]; then 2416 elif [[ "${vendor}" == "jrockit" ]]; then
2432 addpredict "/proc/cpuinfo" 2417 addpredict "/proc/cpuinfo"
2433 fi 2418 fi
2434} 2419}
2435 2420
2436# ------------------------------------------------------------------------------ 2421# @FUNCTION: java-pkg_needs-vm
2437# @internal-function java-pkg_needs-vm 2422# @INTERNAL
2438# 2423# @DESCRIPTION:
2439# Does the current package depend on virtual/jdk? 2424# Does the current package depend on virtual/jdk or does it set
2425# JAVA_PKG_WANT_BUILD_VM?
2440# 2426#
2441# @return 0 - Package depends on virtual/jdk 2427# @RETURN: 0 - Package depends on virtual/jdk; 1 - Package does not depend on virtual/jdk
2442# @return 1 - Package does not depend on virtual/jdk
2443# ------------------------------------------------------------------------------
2444java-pkg_needs-vm() { 2428java-pkg_needs-vm() {
2445 debug-print-function ${FUNCNAME} $* 2429 debug-print-function ${FUNCNAME} $*
2446 2430
2447 if [[ -n "$(echo ${DEPEND} | sed -e '\:virtual/jdk:!d')" ]]; then 2431 if [[ -n "$(echo ${JAVA_PKG_NV_DEPEND:-${DEPEND}} | sed -e '\:virtual/jdk:!d')" ]]; then
2448 return 0 2432 return 0
2449 fi 2433 fi
2450 2434
2435 [[ -n "${JAVA_PKG_WANT_BUILD_VM}" ]] && return 0
2436
2451 return 1 2437 return 1
2452} 2438}
2453 2439
2454# ------------------------------------------------------------------------------ 2440# @FUNCTION: java-pkg_get-current-vm
2455# @internal-function java-pkg_get-current-vm 2441# @INTERNAL
2456#
2457# @return - The current VM being used 2442# @RETURN - The current VM being used
2458# ------------------------------------------------------------------------------
2459java-pkg_get-current-vm() { 2443java-pkg_get-current-vm() {
2460 java-config -f 2444 java-config -f
2461} 2445}
2462 2446
2463# ------------------------------------------------------------------------------ 2447# @FUNCTION: java-pkg_get-vm-vendor
2464# @internal-function java-pkg_get-vm-vendor 2448# @INTERNAL
2465#
2466# @return - The vendor of the current VM 2449# @RETURN - The vendor of the current VM
2467# ------------------------------------------------------------------------------
2468java-pkg_get-vm-vendor() { 2450java-pkg_get-vm-vendor() {
2469 debug-print-function ${FUNCNAME} $* 2451 debug-print-function ${FUNCNAME} $*
2470 2452
2471 local vm="$(java-pkg_get-current-vm)" 2453 local vm="$(java-pkg_get-current-vm)"
2472 vm="${vm/-*/}" 2454 vm="${vm/-*/}"
2473 echo "${vm}" 2455 echo "${vm}"
2474} 2456}
2475 2457
2476# ------------------------------------------------------------------------------ 2458# @FUNCTION: java-pkg_get-vm-version
2477# @internal-function java-pkg_get-vm-version 2459# @INTERNAL
2478#
2479# @return - The version of the current VM 2460# @RETURN - The version of the current VM
2480# ------------------------------------------------------------------------------
2481java-pkg_get-vm-version() { 2461java-pkg_get-vm-version() {
2482 debug-print-function ${FUNCNAME} $* 2462 debug-print-function ${FUNCNAME} $*
2483 2463
2484 java-config -g PROVIDES_VERSION 2464 java-config -g PROVIDES_VERSION
2485} 2465}
2486 2466
2487# ------------------------------------------------------------------------------ 2467# @FUNCTION: java-pkg_build-vm-from-handle
2488# @internal-function java-pkg_switch-vm 2468# @INTERNAL
2469# @DESCRIPTION:
2470# Selects a build vm from a list of vm handles. First checks for the system-vm
2471# beeing usable, then steps through the listed handles till a suitable vm is
2472# found.
2489# 2473#
2474# @RETURN - VM handle of an available JDK
2475java-pkg_build-vm-from-handle() {
2476 debug-print-function ${FUNCNAME} "$*"
2477
2478 local vm
2479 vm=$(java-pkg_get-current-vm 2>/dev/null)
2480 if [[ $? -eq 0 ]]; then
2481 if has ${vm} ${JAVA_PKG_WANT_BUILD_VM}; then
2482 echo ${vm}
2483 return 0
2484 fi
2485 fi
2486
2487 for vm in ${JAVA_PKG_WANT_BUILD_VM}; do
2488 if java-config-2 --select-vm=${vm} 2>/dev/null; then
2489 echo ${vm}
2490 return 0
2491 fi
2492 done
2493
2494 eerror "${FUNCNAME}: No vm found for handles: ${JAVA_PKG_WANT_BUILD_VM}"
2495 return 1
2496}
2497
2498# @FUNCTION: java-pkg_switch-vm
2499# @INTERNAL
2500# @DESCRIPTION:
2490# Switch VM if we're allowed to (controlled by JAVA_PKG_ALLOW_VM_CHANGE), and 2501# Switch VM if we're allowed to (controlled by JAVA_PKG_ALLOW_VM_CHANGE), and
2491# verify that the current VM is sufficient. 2502# verify that the current VM is sufficient.
2492# Setup the environment for the VM being used. 2503# Setup the environment for the VM being used.
2493# ------------------------------------------------------------------------------
2494java-pkg_switch-vm() { 2504java-pkg_switch-vm() {
2495 debug-print-function ${FUNCNAME} $* 2505 debug-print-function ${FUNCNAME} $*
2496 2506
2497 if java-pkg_needs-vm; then 2507 if java-pkg_needs-vm; then
2498 # Use the VM specified by JAVA_PKG_FORCE_VM 2508 # Use the VM specified by JAVA_PKG_FORCE_VM
2500 # If you're forcing the VM, I hope you know what your doing... 2510 # If you're forcing the VM, I hope you know what your doing...
2501 debug-print "JAVA_PKG_FORCE_VM used: ${JAVA_PKG_FORCE_VM}" 2511 debug-print "JAVA_PKG_FORCE_VM used: ${JAVA_PKG_FORCE_VM}"
2502 export GENTOO_VM="${JAVA_PKG_FORCE_VM}" 2512 export GENTOO_VM="${JAVA_PKG_FORCE_VM}"
2503 # if we're allowed to switch the vm... 2513 # if we're allowed to switch the vm...
2504 elif [[ "${JAVA_PKG_ALLOW_VM_CHANGE}" == "yes" ]]; then 2514 elif [[ "${JAVA_PKG_ALLOW_VM_CHANGE}" == "yes" ]]; then
2505 debug-print "depend-java-query: NV_DEPEND: ${JAVA_PKG_NV_DEPEND:-${DEPEND}} VNEED: ${JAVA_PKG_VNEED}" 2515 # if there is an explicit list of handles to choose from
2506 if [[ -n ${JAVA_PKG_VNEED} ]]; then 2516 if [[ -n "${JAVA_PKG_WANT_BUILD_VM}" ]]; then
2507 GENTOO_VM="$(depend-java-query --need-virtual "${JAVA_PKG_VNEED}" --get-vm "${JAVA_PKG_NV_DEPEND:-${DEPEND}}")" 2517 debug-print "JAVA_PKG_WANT_BUILD_VM used: ${JAVA_PKG_WANT_BUILD_VM}"
2518 GENTOO_VM=$(java-pkg_build-vm-from-handle)
2519 if [[ $? != 0 ]]; then
2520 eerror "${FUNCNAME}: No VM found for handles: ${JAVA_PKG_WANT_BUILD_VM}"
2521 die "${FUNCNAME}: Failed to determine VM for building"
2522 fi
2523 # JAVA_PKG_WANT_SOURCE and JAVA_PKG_WANT_TARGET are required as
2524 # they can't be deduced from handles.
2525 if [[ -z "${JAVA_PKG_WANT_SOURCE}" ]]; then
2526 eerror "JAVA_PKG_WANT_BUILD_VM specified but not JAVA_PKG_WANT_SOURCE"
2527 die "Specify JAVA_PKG_WANT_SOURCE"
2528 fi
2529 if [[ -z "${JAVA_PKG_WANT_TARGET}" ]]; then
2530 eerror "JAVA_PKG_WANT_BUILD_VM specified but not JAVA_PKG_WANT_TARGET"
2531 die "Specify JAVA_PKG_WANT_TARGET"
2532 fi
2533 # otherwise determine a vm from dep string
2508 else 2534 else
2535 debug-print "depend-java-query: NV_DEPEND: ${JAVA_PKG_NV_DEPEND:-${DEPEND}}"
2509 GENTOO_VM="$(depend-java-query --get-vm "${JAVA_PKG_NV_DEPEND:-${DEPEND}}")" 2536 GENTOO_VM="$(depend-java-query --get-vm "${JAVA_PKG_NV_DEPEND:-${DEPEND}}")"
2537 if [[ -z "${GENTOO_VM}" || "${GENTOO_VM}" == "None" ]]; then
2538 eerror "Unable to determine VM for building from dependencies:"
2539 echo "NV_DEPEND: ${JAVA_PKG_NV_DEPEND:-${DEPEND}}"
2540 die "Failed to determine VM for building."
2541 fi
2510 fi 2542 fi
2511 if [[ -z "${GENTOO_VM}" || "${GENTOO_VM}" == "None" ]]; then
2512 eerror "Unable to determine VM for building from dependencies:"
2513 echo "NV_DEPEND: ${JAVA_PKG_NV_DEPEND:-${DEPEND}}"
2514 echo "VNEED: ${JAVA_PKG_VNEED}"
2515 die "Failed to determine VM for building."
2516 else
2517 export GENTOO_VM 2543 export GENTOO_VM
2518 fi
2519 # otherwise just make sure the current VM is sufficient 2544 # otherwise just make sure the current VM is sufficient
2520 else 2545 else
2521 java-pkg_ensure-vm-version-sufficient 2546 java-pkg_ensure-vm-version-sufficient
2522 fi 2547 fi
2523 debug-print "Using: $(java-config -f)" 2548 debug-print "Using: $(java-config -f)"
2551 else 2576 else
2552 [[ -n "${JAVA_PKG_DEBUG}" ]] && ewarn "!!! This package inherits java-pkg but doesn't depend on a JDK. -bin or broken dependency!!!" 2577 [[ -n "${JAVA_PKG_DEBUG}" ]] && ewarn "!!! This package inherits java-pkg but doesn't depend on a JDK. -bin or broken dependency!!!"
2553 fi 2578 fi
2554} 2579}
2555 2580
2556# ------------------------------------------------------------------------------ 2581# @FUNCTION: java-pkg_die
2557# @internal-function java-pkg_die 2582# @INTERNAL
2558# 2583# @DESCRIPTION:
2559# Enhanced die for Java packages, which displays some information that may be 2584# Enhanced die for Java packages, which displays some information that may be
2560# useful for debugging bugs on bugzilla. 2585# useful for debugging bugs on bugzilla.
2561# ------------------------------------------------------------------------------
2562#register_die_hook java-pkg_die 2586#register_die_hook java-pkg_die
2563if ! hasq java-pkg_die ${EBUILD_DEATH_HOOKS}; then 2587if ! has java-pkg_die ${EBUILD_DEATH_HOOKS}; then
2564 EBUILD_DEATH_HOOKS="${EBUILD_DEATH_HOOKS} java-pkg_die" 2588 EBUILD_DEATH_HOOKS="${EBUILD_DEATH_HOOKS} java-pkg_die"
2565fi 2589fi
2566 2590
2567java-pkg_die() { 2591java-pkg_die() {
2568 echo "!!! When you file a bug report, please include the following information:" >&2 2592 echo "!!! When you file a bug report, please include the following information:" >&2
2569 echo "GENTOO_VM=${GENTOO_VM} CLASSPATH=\"${CLASSPATH}\" JAVA_HOME=\"${JAVA_HOME}\"" >&2 2593 echo "GENTOO_VM=${GENTOO_VM} CLASSPATH=\"${CLASSPATH}\" JAVA_HOME=\"${JAVA_HOME}\"" >&2
2570 echo "JAVACFLAGS=\"${JAVACFLAGS}\" COMPILER=\"${GENTOO_COMPILER}\"" >&2 2594 echo "JAVACFLAGS=\"${JAVACFLAGS}\" COMPILER=\"${GENTOO_COMPILER}\"" >&2
2571 echo "and of course, the output of emerge --info" >&2 2595 echo "and of course, the output of emerge --info =${P}" >&2
2572} 2596}
2573 2597
2574 2598
2575# TODO document 2599# TODO document
2576# List jars in the source directory, ${S} 2600# List jars in the source directory, ${S}
2583 einfo "Classes" 2607 einfo "Classes"
2584 find "${S}" -type f -name '*.class' -print0 | xargs -0 -r -n 500 ls -ald | sed -e "s,${WORKDIR},\${WORKDIR}," 2608 find "${S}" -type f -name '*.class' -print0 | xargs -0 -r -n 500 ls -ald | sed -e "s,${WORKDIR},\${WORKDIR},"
2585 fi 2609 fi
2586} 2610}
2587 2611
2588# ------------------------------------------------------------------------------ 2612# @FUNCTION: java-pkg_verify-classes
2589# @internal-function java-pkg_verify-classes 2613# @INTERNAL
2590# 2614# @DESCRIPTION:
2591# Verify that the classes were compiled for the right source / target. Dies if 2615# Verify that the classes were compiled for the right source / target. Dies if
2592# not. 2616# not.
2617# @CODE
2593# @param $1 (optional) - the file to check, otherwise checks whole ${D} 2618# $1 (optional) - the file to check, otherwise checks whole ${D}
2594# ------------------------------------------------------------------------------ 2619# @CODE
2595java-pkg_verify-classes() { 2620java-pkg_verify-classes() {
2596 #$(find ${D} -type f -name '*.jar' -o -name '*.class') 2621 #$(find ${D} -type f -name '*.jar' -o -name '*.class')
2597 2622
2598 local version_verify="/usr/bin/class-version-verify.py" 2623 local version_verify="/usr/bin/class-version-verify.py"
2599 2624
2627 eerror "See ${log} for more details." 2652 eerror "See ${log} for more details."
2628 die "Incorrect bytecode found" 2653 die "Incorrect bytecode found"
2629 fi 2654 fi
2630} 2655}
2631 2656
2632# ---------------------------------------------------------------------------- 2657# @FUNCTION: java-pkg_ensure-dep
2633# @internal-function java-pkg_ensure-dep 2658# @INTERNAL
2659# @DESCRIPTION:
2634# Check that a package being used in jarfrom, getjars and getjar is contained 2660# Check that a package being used in jarfrom, getjars and getjar is contained
2635# within DEPEND or RDEPEND. 2661# within DEPEND or RDEPEND with the correct SLOT. See this mail for details:
2662# https://archives.gentoo.org/gentoo-dev/message/dcb644f89520f4bbb61cc7bbe45fdf6e
2663# @CODE
2664# Parameters:
2636# @param $1 - empty - check both vars; "runtime" or "build" - check only 2665# $1 - empty - check both vars; "runtime" or "build" - check only
2637# RDEPEND, resp. DEPEND 2666# RDEPEND, resp. DEPEND
2638# @param $2 - Package name and slot. 2667# $2 - Package name and slot.
2639 2668# @CODE
2640java-pkg_ensure-dep() { 2669java-pkg_ensure-dep() {
2641 debug-print-function ${FUNCNAME} $* 2670 debug-print-function ${FUNCNAME} $*
2642 2671
2643 local limit_to="${1}" 2672 local limit_to="${1}"
2644 local target_pkg="${2}" 2673 local target_pkg="${2}"
2645 local dev_error="" 2674 local dev_error=""
2646 2675
2647 local stripped_pkg=$(echo "${target_pkg}" | sed \ 2676 # Transform into a regular expression to look for a matching package
2648 's/-[0-9]*\(\.[0-9]\)*$//') 2677 # and SLOT. SLOTs don't have to be numeric so foo-bar could either
2678 # mean foo-bar:0 or foo:bar. So you want to get your head around the
2679 # line below?
2680 #
2681 # * The target package first has any dots escaped, e.g. foo-1.2
2682 # becomes foo-1\.2.
2683 #
2684 # * sed then looks at the component following the last - or :
2685 # character, or the whole string if there is no - or :
2686 # character. It uses this to build a new regexp with two
2687 # significant branches.
2688 #
2689 # * The first checks for the whole target package string, optionally
2690 # followed by a version number, and then :0.
2691 #
2692 # * The second checks for the first part of the target package
2693 # string, optionally followed by a version number, followed by the
2694 # aforementioned component, treating that as a SLOT.
2695 #
2696 local stripped_pkg=/$(sed -r 's/[-:]?([^-:]+)$/(\0(-[^:]+)?:0|(-[^:]+)?:\1)/' <<< "${target_pkg//./\\.}")\\b
2649 2697
2650 debug-print "Matching against: ${stripped_pkg}" 2698 debug-print "Matching against: ${stripped_pkg}"
2651 2699
2700 # Uncomment the lines below once we've dealt with more of these
2701 # otherwise we'll be tempted to turn JAVA_PKG_STRICT off while
2702 # getting hit with a wave of bug reports. :(
2703
2652 if [[ ${limit_to} != runtime && ! ( "${DEPEND}" =~ "$stripped_pkg" ) ]]; then 2704 if [[ ${limit_to} != runtime && ! ( "${DEPEND}" =~ $stripped_pkg ) ]]; then
2653 dev_error="The ebuild is attempting to use ${target_pkg} that is not" 2705 dev_error="The ebuild is attempting to use ${target_pkg}, which is not "
2654 dev_error="${dev_error} declared in DEPEND." 2706 dev_error+="declared with a SLOT in DEPEND."
2655 if is-java-strict; then 2707# if is-java-strict; then
2656 eerror "${dev_error}"
2657 die "${dev_error}" 2708# die "${dev_error}"
2658 elif [[ ${BASH_SUBSHELL} = 0 ]]; then 2709# else
2659 eerror "${dev_error}" 2710 eqawarn "java-pkg_ensure-dep: ${dev_error}"
2660 elog "Because you have this package installed the package will" 2711# eerror "Because you have ${target_pkg} installed,"
2661 elog "build without problems, but please report this to" 2712# eerror "the package will build without problems, but please"
2662 elog "http://bugs.gentoo.org" 2713# eerror "report this to http://bugs.gentoo.org."
2663 fi 2714# fi
2664 fi 2715 elif [[ ${limit_to} != build && ! ( "${RDEPEND}${PDEPEND}" =~ ${stripped_pkg} ) ]]; then
2665
2666 if [[ ${limit_to} != build ]]; then
2667 if [[ ! ( ${RDEPEND} =~ "${stripped_pkg}" ) ]]; then
2668 if [[ ! ( ${PDEPEND} =~ "${stripped_pkg}" ) ]]; then
2669 dev_error="The ebuild is attempting to use ${target_pkg}," 2716 dev_error="The ebuild is attempting to use ${target_pkg}, which is not "
2670 dev_error="${dev_error} without specifying --build-only, that is not declared in RDEPEND" 2717 dev_error+="declared with a SLOT in [RP]DEPEND and --build-only wasn't given."
2671 dev_error="${dev_error} or PDEPEND."
2672 if is-java-strict; then 2718# if is-java-strict; then
2673 eerror "${dev_error}"
2674 die "${dev_error}" 2719# die "${dev_error}"
2675 elif [[ ${BASH_SUBSHELL} = 0 ]]; then 2720# else
2676 eerror "${dev_error}" 2721 eqawarn "java-pkg_ensure-dep: ${dev_error}"
2677 elog "The package will build without problems, but may fail to run" 2722# eerror "The package will build without problems, but may fail to run"
2678 elog "if you don't have ${target_pkg} installed, so please report" 2723# eerror "if you don't have ${target_pkg} installed,"
2679 elog "this to http://bugs.gentoo.org" 2724# eerror "so please report this to http://bugs.gentoo.org."
2680 fi
2681 fi
2682 fi 2725# fi
2683 fi 2726 fi
2684} 2727}
2685
2686# ------------------------------------------------------------------------------
2687# @section-end internal
2688# ------------------------------------------------------------------------------
2689 2728
2690java-pkg_check-phase() { 2729java-pkg_check-phase() {
2691 local phase=${1} 2730 local phase=${1}
2692 local funcname=${FUNCNAME[1]} 2731 local funcname=${FUNCNAME[1]}
2693 if [[ ${EBUILD_PHASE} != ${phase} ]]; then 2732 if [[ ${EBUILD_PHASE} != ${phase} ]]; then
2703 java-pkg_announce-qa-violation "installing versioned jar '${jar}'" 2742 java-pkg_announce-qa-violation "installing versioned jar '${jar}'"
2704 fi 2743 fi
2705} 2744}
2706 2745
2707java-pkg_check-jikes() { 2746java-pkg_check-jikes() {
2708 if hasq jikes ${IUSE}; then 2747 if has jikes ${IUSE}; then
2709 java-pkg_announce-qa-violation "deprecated USE flag 'jikes' in IUSE" 2748 java-pkg_announce-qa-violation "deprecated USE flag 'jikes' in IUSE"
2710 fi 2749 fi
2711} 2750}
2712 2751
2713java-pkg_announce-qa-violation() { 2752java-pkg_announce-qa-violation() {
2728 2767
2729is-java-strict() { 2768is-java-strict() {
2730 [[ -n ${JAVA_PKG_STRICT} ]] 2769 [[ -n ${JAVA_PKG_STRICT} ]]
2731 return $? 2770 return $?
2732} 2771}
2733
2734[[ "${EAPI}" = "2" ]] && EXPORT_FUNCTIONS src_prepare
2735
2736# ------------------------------------------------------------------------------
2737# @eclass-end
2738# ------------------------------------------------------------------------------

Legend:
Removed from v.1.113  
changed lines
  Added in v.1.162

  ViewVC Help
Powered by ViewVC 1.1.20