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

Legend:
Removed from v.1.90  
changed lines
  Added in v.1.164

  ViewVC Help
Powered by ViewVC 1.1.20