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

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

  ViewVC Help
Powered by ViewVC 1.1.20