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

Legend:
Removed from v.1.104  
changed lines
  Added in v.1.166

  ViewVC Help
Powered by ViewVC 1.1.20