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

Legend:
Removed from v.1.65  
changed lines
  Added in v.1.168

  ViewVC Help
Powered by ViewVC 1.1.20