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

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

  ViewVC Help
Powered by ViewVC 1.1.20