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

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

  ViewVC Help
Powered by ViewVC 1.1.20