/[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.114 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.114 2008/10/01 15:43:55 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# ----------------------------------------------------------------------------- 32# @VARIABLE: JAVA_PKG_PORTAGE_DEP
41# @variable-external WANT_ANT_TASKS 33# @INTERNAL
42# @variable-default "" 34# @DESCRIPTION:
43#
44# An $IFS separated list of ant tasks.
45# Ebuild can specify this variable before inheriting java-ant-2 eclass to
46# determine ANT_TASKS it needs. They will be automatically translated to
47# DEPEND variable and ANT_TASKS variable. JAVA_PKG_FORCE_ANT_TASKS can override
48# ANT_TASKS set by WANT_ANT_TASKS, but not the DEPEND due to caching.
49# Ebuilds that need to depend conditionally on certain tasks and specify them
50# differently for different eant calls can't use this simplified approach.
51# You also cannot specify version or anything else than ant-*.
52#
53# @example WANT_ANT_TASKS="ant-junit ant-trax"
54#
55# @seealso JAVA_PKG_FORCE_ANT_TASKS
56# -----------------------------------------------------------------------------
57#WANT_ANT_TASKS
58
59# -----------------------------------------------------------------------------
60# @variable-internal JAVA_PKG_PORTAGE_DEP
61#
62# The version of portage we need to function properly. Previously it was 35# The version of portage we need to function properly. Previously it was
63# portage with phase hooks support but now we use a version with proper env 36# portage with phase hooks support but now we use a version with proper env
64# saving. 37# saving. For EAPI 2 we have new enough stuff so let's have cleaner deps.
65# -----------------------------------------------------------------------------
66JAVA_PKG_PORTAGE_DEP=">=sys-apps/portage-2.1.2.7" 38has "${EAPI}" 0 1 && JAVA_PKG_PORTAGE_DEP=">=sys-apps/portage-2.1.2.7"
67 39
68# ----------------------------------------------------------------------------- 40# @VARIABLE: JAVA_PKG_E_DEPEND
69# @variable-internal JAVA_PKG_E_DEPEND 41# @INTERNAL
70# 42# @DESCRIPTION:
71# This is a convience variable to be used from the other java eclasses. This is 43# This is a convience variable to be used from the other java eclasses. This is
72# the version of java-config we want to use. Usually the latest stable version 44# the version of java-config we want to use. Usually the latest stable version
73# so that ebuilds can use new features without depending on specific versions. 45# so that ebuilds can use new features without depending on specific versions.
74# -----------------------------------------------------------------------------
75JAVA_PKG_E_DEPEND=">=dev-java/java-config-2.0.33-r1 ${JAVA_PKG_PORTAGE_DEP}" 46JAVA_PKG_E_DEPEND=">=dev-java/java-config-2.2.0 ${JAVA_PKG_PORTAGE_DEP}"
76hasq source ${JAVA_PKG_IUSE} && JAVA_PKG_E_DEPEND="${JAVA_PKG_E_DEPEND} source? ( app-arch/zip )" 47has source ${JAVA_PKG_IUSE} && JAVA_PKG_E_DEPEND="${JAVA_PKG_E_DEPEND} source? ( app-arch/zip )"
77 48
78# ----------------------------------------------------------------------------- 49# @ECLASS-VARIABLE: JAVA_PKG_WANT_BOOTCLASSPATH
79# @variable-external JAVA_PKG_ALLOW_VM_CHANGE 50# @DEFAULT_UNSET
80# @variable-default yes 51# @DESCRIPTION:
81# 52# The version of bootclasspath the package needs to work. Translates to a proper
53# dependency. The bootclasspath can then be obtained by java-ant_rewrite-bootclasspath
54if [[ -n "${JAVA_PKG_WANT_BOOTCLASSPATH}" ]]; then
55 if [[ "${JAVA_PKG_WANT_BOOTCLASSPATH}" == "1.5" ]]; then
56 JAVA_PKG_E_DEPEND="${JAVA_PKG_E_DEPEND} >=dev-java/gnu-classpath-0.98-r1:0.98"
57 else
58 eerror "Unknown value of JAVA_PKG_WANT_BOOTCLASSPATH"
59 # since die in global scope doesn't work, this will make repoman fail
60 JAVA_PKG_E_DEPEND="${JAVA_PKG_E_DEPEND} BAD_JAVA_PKG_WANT_BOOTCLASSPATH"
61 fi
62fi
63
64# @ECLASS-VARIABLE: JAVA_PKG_ALLOW_VM_CHANGE
65# @DESCRIPTION:
82# Allow this eclass to change the active VM? 66# Allow this eclass to change the active VM?
83# If your system VM isn't sufficient for the package, the build will fail. 67# If your system VM isn't sufficient for the package, the build will fail
84# @note This is useful for testing specific VMs. 68# instead of trying to switch to another VM.
85# ----------------------------------------------------------------------------- 69#
70# Overriding the default can be useful for testing specific VMs locally, but
71# should not be used in the final ebuild.
86JAVA_PKG_ALLOW_VM_CHANGE=${JAVA_PKG_ALLOW_VM_CHANGE:="yes"} 72JAVA_PKG_ALLOW_VM_CHANGE=${JAVA_PKG_ALLOW_VM_CHANGE:="yes"}
87 73
88# ----------------------------------------------------------------------------- 74# @ECLASS-VARIABLE: JAVA_PKG_FORCE_VM
89# @variable-external JAVA_PKG_FORCE_VM 75# @DEFAULT_UNSET
90# 76# @DESCRIPTION:
91# Explicitly set a particular VM to use. If its not valid, it'll fall back to 77# Explicitly set a particular VM to use. If its not valid, it'll fall back to
92# whatever /etc/java-config-2/build/jdk.conf would elect to use. 78# whatever /etc/java-config-2/build/jdk.conf would elect to use.
93# 79#
94# Should only be used for testing and debugging. 80# Should only be used for testing and debugging.
95# 81#
96# @example Use sun-jdk-1.5 to emerge foo 82# Example: use sun-jdk-1.5 to emerge foo:
83# @CODE
97# JAVA_PKG_FORCE_VM=sun-jdk-1.5 emerge foo 84# JAVA_PKG_FORCE_VM=sun-jdk-1.5 emerge foo
98# 85# @CODE
99# -----------------------------------------------------------------------------
100 86
101# ----------------------------------------------------------------------------- 87# @ECLASS-VARIABLE: JAVA_PKG_WANT_BUILD_VM
102# @variable-external JAVA_PKG_WANT_SOURCE 88# @DEFAULT_UNSET
89# @DESCRIPTION:
90# A list of VM handles to choose a build VM from. If the list contains the
91# currently active VM use that one, otherwise step through the list till a
92# usable/installed VM is found.
103# 93#
104# Specify a specific VM version to compile for to use for -source. 94# This allows to use an explicit list of JDKs in DEPEND instead of a virtual.
105# Normally this is determined from DEPEND. 95# Users of this variable must make sure at least one of the listed handles is
96# covered by DEPEND.
97# Requires JAVA_PKG_WANT_SOURCE and JAVA_PKG_WANT_TARGET to be set as well.
98
99# @ECLASS-VARIABLE: JAVA_PKG_WANT_SOURCE
100# @DEFAULT_UNSET
101# @DESCRIPTION:
102# Specify a non-standard Java source version for compilation (via javac -source
103# parameter or Ant equivalent via build.xml rewriting done by java-ant-2 eclass).
104# Normally this is determined from the jdk version specified in DEPEND.
106# See java-pkg_get-source function below. 105# See java-pkg_get-source function below.
107# 106#
108# Should only be used for testing and debugging. 107# Should generally only be used for testing and debugging.
109# 108#
110# @seealso java-pkg_get-source
111#
112# @example Use 1.4 source to emerge baz 109# Use 1.4 source to emerge baz
110# @CODE
113# JAVA_PKG_WANT_SOURCE=1.4 emerge baz 111# JAVA_PKG_WANT_SOURCE=1.4 emerge baz
114# ----------------------------------------------------------------------------- 112# @CODE
115 113
116# ----------------------------------------------------------------------------- 114# @ECLASS-VARIABLE: JAVA_PKG_WANT_TARGET
117# @variable-external JAVA_PKG_WANT_TARGET 115# @DEFAULT_UNSET
118# 116# @DESCRIPTION:
119# Same as JAVA_PKG_WANT_SOURCE above but for -target. 117# Same as JAVA_PKG_WANT_SOURCE (see above) but for javac -target parameter,
118# which affects the version of generated bytecode.
119# Normally this is determined from the jre/jdk version specified in RDEPEND.
120# See java-pkg_get-target function below. 120# See java-pkg_get-target function below.
121# 121#
122# Should only be used for testing and debugging. 122# Should generallyonly be used for testing and debugging.
123# 123#
124# @seealso java-pkg_get-target
125#
126# @example emerge bar to be compatible with 1.3 124# emerge bar to be compatible with 1.3
125# @CODE
127# JAVA_PKG_WANT_TARGET=1.3 emerge bar 126# JAVA_PKG_WANT_TARGET=1.3 emerge bar
128# ----------------------------------------------------------------------------- 127# @CODE
129 128
130# ----------------------------------------------------------------------------- 129# @ECLASS-VARIABLE: JAVA_RM_FILES
131# @variable-internal JAVA_PKG_COMPILER_DIR 130# @DEFAULT_UNSET
132# @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.
133# 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:
134# Directory where compiler settings are saved, without trailing slash. 146# Directory where compiler settings are saved, without trailing slash.
135# Probably shouldn't touch this variable. 147# You probably shouldn't touch this variable except local testing.
136# -----------------------------------------------------------------------------
137JAVA_PKG_COMPILER_DIR=${JAVA_PKG_COMPILER_DIR:="/usr/share/java-config-2/compiler"} 148JAVA_PKG_COMPILER_DIR=${JAVA_PKG_COMPILER_DIR:="/usr/share/java-config-2/compiler"}
138 149
139 150# @VARIABLE: JAVA_PKG_COMPILERS_CONF
140# ----------------------------------------------------------------------------- 151# @INTERNAL
141# @variable-internal JAVA_PKG_COMPILERS_CONF 152# @DESCRIPTION:
142# @variable-default /etc/java-config-2/build/compilers.conf
143#
144# Path to file containing information about which compiler to use. 153# Path to file containing information about which compiler to use.
145# Can be overloaded, but it should be overloaded for testing. 154# Can be overloaded, but it should be overloaded only for local testing.
146# -----------------------------------------------------------------------------
147JAVA_PKG_COMPILERS_CONF=${JAVA_PKG_COMPILERS_CONF:="/etc/java-config-2/build/compilers.conf"} 155JAVA_PKG_COMPILERS_CONF=${JAVA_PKG_COMPILERS_CONF:="/etc/java-config-2/build/compilers.conf"}
148 156
149# ----------------------------------------------------------------------------- 157# @ECLASS-VARIABLE: JAVA_PKG_FORCE_COMPILER
150# @variable-external JAVA_PKG_FORCE_COMPILER 158# @INTERNAL
151# 159# @DEFAULT_UNSET
160# @DESCRIPTION:
152# 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
153# JAVA_PKG_COMPILERS_CONF. 162# JAVA_PKG_COMPILERS_CONF.
154# 163#
155# @note This should only be used internally or for testing. 164# Useful for local testing.
165#
156# @example Use jikes and javac, in that order 166# Use jikes and javac, in that order
167# @CODE
157# JAVA_PKG_FORCE_COMPILER="jikes javac" 168# JAVA_PKG_FORCE_COMPILER="jikes javac"
158# ----------------------------------------------------------------------------- 169# @CODE
159 170
160# ----------------------------------------------------------------------------- 171# @ECLASS-VARIABLE: JAVA_PKG_FORCE_ANT_TASKS
161# @variable-external JAVA_PKG_FORCE_ANT_TASKS 172# @DEFAULT_UNSET
162# 173# @DESCRIPTION:
163# 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
164# 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
165# 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
166# eant() call, not the dependencies specified in WANT_ANT_TASKS. 177# eant() call, not the dependencies specified in WANT_ANT_TASKS.
167# 178#
179# @CODE
168# @example JAVA_PKG_FORCE_ANT_TASKS="ant-junit ant-trax" \ 180# JAVA_PKG_FORCE_ANT_TASKS="ant-junit ant-trax" \
169# ebuild foo.ebuild compile 181# ebuild foo.ebuild compile
170# 182# @CODE
171# @seealso WANT_ANT_TASKS
172# -----------------------------------------------------------------------------
173 183
174# TODO document me 184# TODO document me
175JAVA_PKG_QA_VIOLATIONS=0 185JAVA_PKG_QA_VIOLATIONS=0
176 186
177# ----------------------------------------------------------------------------- 187# @FUNCTION: java-pkg_doexamples
178# @section-end variables 188# @USAGE: [--subdir <subdir>] <file1/dir1> [<file2> ...]
179# ----------------------------------------------------------------------------- 189# @DESCRIPTION:
180
181
182# -----------------------------------------------------------------------------
183# @section-begin install
184# @section-summary Install functions
185#
186# These are used to install Java-related things, such as jars, Javadocs, JNI
187# libraries, etc.
188# -----------------------------------------------------------------------------
189
190# -----------------------------------------------------------------------------
191# @ebuild-function java-pkg_doexamples
192#
193# Installs given arguments to /usr/share/doc/${PF}/examples 190# Installs given arguments to /usr/share/doc/${PF}/examples
194# If you give it only one parameter and it is a directory it will install 191# If you give it only one parameter and it is a directory it will install
195# everything in that directory to the examples directory. 192# everything in that directory to the examples directory.
196# 193#
194# @CODE
195# Parameters:
196# --subdir - If the examples need a certain directory structure
197# $* - list of files to install
198#
197# @example 199# Examples:
198# java-pkg_doexamples demo 200# java-pkg_doexamples demo
199# java-pkg_doexamples demo/* examples/* 201# java-pkg_doexamples demo/* examples/*
200# 202# @CODE
201# @param --subdir - If the examples need a certain directory structure
202# @param $* - list of files to install
203# ------------------------------------------------------------------------------
204java-pkg_doexamples() { 203java-pkg_doexamples() {
205 debug-print-function ${FUNCNAME} $* 204 debug-print-function ${FUNCNAME} $*
206 205
207 [[ ${#} -lt 1 ]] && die "At least one argument needed" 206 [[ ${#} -lt 1 ]] && die "At least one argument needed"
208 207
209 java-pkg_check-phase install 208 java-pkg_check-phase install
209 java-pkg_init_paths_
210 210
211 local dest=/usr/share/doc/${PF}/examples 211 local dest=/usr/share/doc/${PF}/examples
212 if [[ ${1} == --subdir ]]; then 212 if [[ ${1} == --subdir ]]; then
213 local dest=${dest}/${2} 213 local dest=${dest}/${2}
214 dodir ${dest} 214 dodir ${dest}
224 ( # dont want to pollute calling env 224 ( # dont want to pollute calling env
225 insinto "${dest}" 225 insinto "${dest}"
226 doins -r "$@" 226 doins -r "$@"
227 ) || die "Installing examples failed" 227 ) || die "Installing examples failed"
228 fi 228 fi
229}
230 229
231# ----------------------------------------------------------------------------- 230 # Let's make a symlink to the directory we have everything else under
232# @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.
233# 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:
234# Installs any number of jars. 304# Installs any number of jars.
235# 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.
236# You can use java-pkg_jarinto to change this path. 306# You can use java-pkg_jarinto to change this path.
237# 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.
238# Instead, use java-pkg_newjar defined below. 308# Instead, use java-pkg_newjar defined below.
239# 309#
240# @example 310# @CODE
241# java-pkg_dojar dist/${PN}.jar dist/${PN}-core.jar 311# java-pkg_dojar dist/${PN}.jar dist/${PN}-core.jar
312# @CODE
242# 313#
243# @param $* - list of jars to install 314# @param $* - list of jars to install
244# ------------------------------------------------------------------------------
245java-pkg_dojar() { 315java-pkg_dojar() {
246 debug-print-function ${FUNCNAME} $* 316 debug-print-function ${FUNCNAME} $*
247 317
248 [[ ${#} -lt 1 ]] && die "At least one argument needed" 318 [[ ${#} -lt 1 ]] && die "At least one argument needed"
249 319
291 done 361 done
292 362
293 java-pkg_do_write_ 363 java-pkg_do_write_
294} 364}
295 365
296# ------------------------------------------------------------------------------ 366# @FUNCTION: java-pkg_regjar
297# @internal-function depend-java-query 367# @USAGE: </path/to/installed/jar>
298# 368# @DESCRIPTION:
299# Wrapper for the depend-java-query binary to enable passing USE in env.
300# Using env variables keeps this eclass working with java-config versions that
301# do not handle use flags.
302# ------------------------------------------------------------------------------
303
304depend-java-query() {
305 # Used to have a which call here but it caused endless loops for some people
306 # that had some weird bashrc voodoo for which.
307 USE="${USE}" /usr/bin/depend-java-query "${@}"
308}
309
310# ------------------------------------------------------------------------------
311# @ebuild-function java-pkg_regjar
312#
313# Records an already installed jar in the package.env 369# Records an already installed (in ${D}) jar in the package.env
314# This would mostly be used if the package has make or a custom script to 370# This would mostly be used if the package has make or a custom script to
315# install things. 371# install things.
316# 372#
317# Example:
318# java-pkg_regjar ${D}/opt/foo/lib/foo.jar
319#
320# WARNING: 373# WARNING:
321# 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
322# 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:
323# 376#
324# java-pkg_regjar /opt/my-java/lib/*.jar 377# @CODE
325#
326# will not work, because:
327# * the `for jar in "$@"` can't expand the path to jar file names, as they
328# don't exist yet
329# * all `if ...` inside for will fail - the file '/opt/my-java/lib/*.jar'
330# doesn't exist
331#
332# you have to use it as:
333#
334# java-pkg_regjar ${D}/opt/my-java/lib/*.jar 378# java-pkg_regjar ${D}/opt/my-java/lib/*.jar
379# @CODE
335# 380#
336# @param $@ - jars to record 381
337# ------------------------------------------------------------------------------
338# 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?
339java-pkg_regjar() { 383java-pkg_regjar() {
340 debug-print-function ${FUNCNAME} $* 384 debug-print-function ${FUNCNAME} $*
341 385
342 java-pkg_check-phase install 386 java-pkg_check-phase install
365 if [[ ${jar} = *\** ]]; then 409 if [[ ${jar} = *\** ]]; then
366 eerror "The argument ${jar} to ${FUNCNAME}" 410 eerror "The argument ${jar} to ${FUNCNAME}"
367 eerror "has * in it. If you want it to glob in" 411 eerror "has * in it. If you want it to glob in"
368 eerror '${D} add ${D} to the argument.' 412 eerror '${D} add ${D} to the argument.'
369 fi 413 fi
414 debug-print "${jar} or ${D}${jar} not found"
370 die "${jar} does not exist" 415 die "${jar} does not exist"
371 fi 416 fi
372 done 417 done
373 418
374 java-pkg_do_write_ 419 java-pkg_do_write_
375} 420}
376 421
377# ------------------------------------------------------------------------------ 422# @FUNCTION: java-pkg_newjar
378# @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)
379# 426#
380# Installs a jar with a new name
381#
382# @example: install a versioned jar without the version 427# For example, installs a versioned jar without the version
383# java-pkg_newjar dist/${P}.jar ${PN}.jar
384#
385# @param $1 - jar to install
386# @param $2 - new name for jar - defaults to ${PN}.jar if not specified
387# ------------------------------------------------------------------------------
388java-pkg_newjar() { 428java-pkg_newjar() {
389 debug-print-function ${FUNCNAME} $* 429 debug-print-function ${FUNCNAME} $*
390 430
391 local original_jar="${1}" 431 local original_jar="${1}"
392 local new_jar="${2:-${PN}.jar}" 432 local new_jar="${2:-${PN}.jar}"
400 cp "${original_jar}" "${new_jar_dest}" \ 440 cp "${original_jar}" "${new_jar_dest}" \
401 || die "Failed to copy ${original_jar} to ${new_jar_dest}" 441 || die "Failed to copy ${original_jar} to ${new_jar_dest}"
402 java-pkg_dojar "${new_jar_dest}" 442 java-pkg_dojar "${new_jar_dest}"
403} 443}
404 444
405# ------------------------------------------------------------------------------ 445# @FUNCTION: java-pkg_addcp
406# @ebuild-function java-pkg_addcp 446# @USAGE: <classpath>
407# 447# @DESCRIPTION:
408# 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,
409# 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.
410# 450# The parameters of this function are appended to JAVA_PKG_CLASSPATH
411# TODO add example
412# @param $@ - value to append to JAVA_PKG_CLASSPATH
413# ------------------------------------------------------------------------------
414java-pkg_addcp() { 451java-pkg_addcp() {
415 java-pkg_append_ JAVA_PKG_CLASSPATH "${@}" 452 java-pkg_append_ JAVA_PKG_CLASSPATH "${@}"
416 java-pkg_do_write_ 453 java-pkg_do_write_
417} 454}
418 455
419# ------------------------------------------------------------------------------ 456# @FUNCTION: java-pkg_doso
420# @ebuild-function java-pkg_doso 457# @USAGE: <path/to/file1.so> [...]
421# 458# @DESCRIPTION:
422# Installs any number of JNI libraries 459# Installs any number of JNI libraries
423# 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
424# can be used change this path 461# can be used change this path
425# 462#
463# @CODE
426# Example: 464# Example:
427# java-pkg_doso *.so 465# java-pkg_doso *.so
428# 466# @CODE
429# @param $@ - JNI libraries to install
430# ------------------------------------------------------------------------------
431java-pkg_doso() { 467java-pkg_doso() {
432 debug-print-function ${FUNCNAME} $* 468 debug-print-function ${FUNCNAME} $*
433 469
434 [[ ${#} -lt 1 ]] && "At least one argument required for ${FUNCNAME}"
435 java-pkg_check-phase install 470 java-pkg_check-phase install
436 471
437 [[ ${#} -lt 1 ]] && die "At least one argument required for ${FUNCNAME}" 472 [[ ${#} -lt 1 ]] && die "${FUNCNAME} requires at least one argument"
438 473
439 java-pkg_init_paths_ 474 java-pkg_init_paths_
440 475
441 local lib 476 local lib
442 # for each lib 477 # for each lib
444 # if the lib exists... 479 # if the lib exists...
445 if [[ -e "${lib}" ]] ; then 480 if [[ -e "${lib}" ]] ; then
446 # install if it isn't a symlink 481 # install if it isn't a symlink
447 if [[ ! -L "${lib}" ]] ; then 482 if [[ ! -L "${lib}" ]] ; then
448 INSDESTTREE="${JAVA_PKG_LIBDEST}" \ 483 INSDESTTREE="${JAVA_PKG_LIBDEST}" \
449 INSOPTIONS="${LIBOPTIONS}" \ 484 INSOPTIONS="-m0755" \
450 doins "${lib}" || die "failed to install ${lib}" 485 doins "${lib}" || die "failed to install ${lib}"
451 java-pkg_append_ JAVA_PKG_LIBRARY "${JAVA_PKG_LIBDEST}" 486 java-pkg_append_ JAVA_PKG_LIBRARY "${JAVA_PKG_LIBDEST}"
452 debug-print "Installing ${lib} to ${JAVA_PKG_LIBDEST}" 487 debug-print "Installing ${lib} to ${JAVA_PKG_LIBDEST}"
453 # otherwise make a symlink to the symlink's origin 488 # otherwise make a symlink to the symlink's origin
454 else 489 else
455 # TODO use dosym 490 dosym "$(readlink "${lib}")" "${JAVA_PKG_LIBDEST}/${lib##*/}"
456 ln -s "$(readlink "${lib}")" \
457 "${D}${JAVA_PKG_LIBDEST}/$(basename "${lib}")"
458 debug-print "${lib} is a symlink, linking accordanly" 491 debug-print "${lib} is a symlink, linking accordantly"
459 fi 492 fi
460 # otherwise die 493 # otherwise die
461 else 494 else
462 die "${lib} does not exist" 495 die "${lib} does not exist"
463 fi 496 fi
464 done 497 done
465 498
466 java-pkg_do_write_ 499 java-pkg_do_write_
467} 500}
468 501
469# ------------------------------------------------------------------------------ 502# @FUNCTION: java-pkg_regso
470# @ebuild-function java-pkg_regso 503# @USAGE: <file1.so> [...]
471# 504# @DESCRIPTION:
472# 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
473# 510#
474# Example: 511# Example:
475# java-pkg_regso *.so /path/*.so 512# java-pkg_regso *.so /path/*.so
476# 513# @CODE
477# @param $@ - JNI libraries to register
478# ------------------------------------------------------------------------------
479java-pkg_regso() { 514java-pkg_regso() {
480 debug-print-function ${FUNCNAME} $* 515 debug-print-function ${FUNCNAME} $*
481 516
482 java-pkg_check-phase install 517 java-pkg_check-phase install
483 518
484 [[ ${#} -lt 1 ]] && "at least one argument needed" 519 [[ ${#} -lt 1 ]] && die "${FUNCNAME} requires at least one argument"
485 520
486 java-pkg_init_paths_ 521 java-pkg_init_paths_
487 522
488 local lib target_dir 523 local lib target_dir
489 for lib in "$@" ; do 524 for lib in "$@" ; do
501 done 536 done
502 537
503 java-pkg_do_write_ 538 java-pkg_do_write_
504} 539}
505 540
506# ------------------------------------------------------------------------------ 541# @FUNCTION: java-pkg_jarinto
507# @ebuild-function java-pkg_jarinto 542# @USAGE: </path/to/install/jars/into>
508# 543# @DESCRIPTION:
509# Changes the path jars are installed into 544# Changes the path jars are installed into via subsequent java-pkg_dojar calls.
510#
511# @param $1 - new location to install jars into.
512# -----------------------------------------------------------------------------
513java-pkg_jarinto() { 545java-pkg_jarinto() {
514 debug-print-function ${FUNCNAME} $* 546 debug-print-function ${FUNCNAME} $*
515 547
516 JAVA_PKG_JARDEST="${1}" 548 JAVA_PKG_JARDEST="${1}"
517} 549}
518 550
519# ------------------------------------------------------------------------------ 551# @FUNCTION: java-pkg_sointo
520# @ebuild-function java-pkg_sointo 552# @USAGE: </path/to/install/sofiles/into>
521# 553# @DESCRIPTION:
522# Changes the path that JNI libraries are installed into. 554# Changes the path that JNI libraries are installed into via subsequent
523# 555# java-pkg_doso calls.
524# @param $1 - new location to install JNI libraries into.
525# ------------------------------------------------------------------------------
526java-pkg_sointo() { 556java-pkg_sointo() {
527 debug-print-function ${FUNCNAME} $* 557 debug-print-function ${FUNCNAME} $*
528 558
529 JAVA_PKG_LIBDEST="${1}" 559 JAVA_PKG_LIBDEST="${1}"
530} 560}
531 561
532# ------------------------------------------------------------------------------ 562# @FUNCTION: java-pkg_dohtml
533# @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.
534# 566#
535# Install Javadoc HTML documentation 567# @CODE
536#
537# @example
538# java-pkg_dohtml dist/docs/ 568# java-pkg_dohtml dist/docs/
539# 569# @CODE
540# ------------------------------------------------------------------------------
541java-pkg_dohtml() { 570java-pkg_dohtml() {
542 debug-print-function ${FUNCNAME} $* 571 debug-print-function ${FUNCNAME} $*
543 572
544 [[ ${#} -lt 1 ]] && die "At least one argument required for ${FUNCNAME}" 573 [[ ${#} -lt 1 ]] && die "At least one argument required for ${FUNCNAME}"
545 574
551 # a reasonable way to catch # docs for all of the 580 # a reasonable way to catch # docs for all of the
552 # old ebuilds. 581 # old ebuilds.
553 java-pkg_recordjavadoc 582 java-pkg_recordjavadoc
554} 583}
555 584
556# ------------------------------------------------------------------------------ 585# @FUNCTION: java-pkg_dojavadoc
557# @ebuild-function java-pkg_dojavadoc 586# @USAGE: [--symlink destination] <path/to/javadocs/root>
558# 587# @DESCRIPTION:
559# 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.
560# 589#
590# @CODE
591# Parameters:
561# @param $1: optional --symlink creates to symlink like this for html 592# $1: optional --symlink creates to symlink like this for html
562# documentation bundles. 593# documentation bundles.
563# @param $2: - The javadoc root directory. 594# $2: - The javadoc root directory.
564# 595#
565# @example: 596# Examples:
566# java-pkg_dojavadoc docs/api 597# java-pkg_dojavadoc docs/api
567# java-pkg_dojavadoc --symlink apidocs docs/api 598# java-pkg_dojavadoc --symlink apidocs docs/api
568# 599# @CODE
569# ------------------------------------------------------------------------------
570java-pkg_dojavadoc() { 600java-pkg_dojavadoc() {
571 debug-print-function ${FUNCNAME} $* 601 debug-print-function ${FUNCNAME} $*
572 602
573 # For html documentation bundles that link to Javadoc 603 # For html documentation bundles that link to Javadoc
574 local symlink 604 local symlink
581 local dest=/usr/share/doc/${PF}/html 611 local dest=/usr/share/doc/${PF}/html
582 612
583 # QA checks 613 # QA checks
584 614
585 java-pkg_check-phase install 615 java-pkg_check-phase install
616 java-pkg_init_paths_
586 617
587 [[ -z "${dir}" ]] && die "Must specify a directory!" 618 [[ -z "${dir}" ]] && die "Must specify a directory!"
588 [[ ! -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!"
589 if [[ ! -e "${dir}/index.html" ]]; then 620 if [[ ! -e "${dir}/index.html" ]]; then
590 local msg="No index.html in javadoc directory" 621 local msg="No index.html in javadoc directory"
617 debug-print "symlinking ${dest}/{api,${symlink}}" 648 debug-print "symlinking ${dest}/{api,${symlink}}"
618 dosym ${dest}/{api,${symlink}} || die 649 dosym ${dest}/{api,${symlink}} || die
619 fi 650 fi
620} 651}
621 652
622# ------------------------------------------------------------------------------ 653# @FUNCTION: java-pkg_dosrc
623# @ebuild-function java-pkg_dosrc 654# @USAGE: <path/to/sources> [...]
624# 655# @DESCRIPTION:
625# 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
626# 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.
627# 659#
628# Ebuild needs to DEPEND on app-arch/zip to use this. 660# @CODE
629#
630# It also should be controlled by USE=source.
631#
632# @example: 661# Example:
633# java-pkg_dosrc src/* 662# java-pkg_dosrc src/*
634# 663# @CODE
635# ------------------------------------------------------------------------------ 664
636# 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
637# source -nichoj 666# source -nichoj
667#
638# 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#
639# TODO maybe we can take an existing zip/jar? -nichoj 670# TODO maybe we can take an existing zip/jar? -nichoj
671#
640# FIXME apparently this fails if you give it an empty directories 672# FIXME apparently this fails if you give it an empty directories
641java-pkg_dosrc() { 673java-pkg_dosrc() {
642 debug-print-function ${FUNCNAME} $* 674 debug-print-function ${FUNCNAME} $*
643 675
644 [ ${#} -lt 1 ] && die "At least one argument needed" 676 [ ${#} -lt 1 ] && die "At least one argument needed"
676 708
677 JAVA_SOURCES="${JAVA_PKG_SOURCESPATH}/${zip_name}" 709 JAVA_SOURCES="${JAVA_PKG_SOURCESPATH}/${zip_name}"
678 java-pkg_do_write_ 710 java-pkg_do_write_
679} 711}
680 712
681# ------------------------------------------------------------------------------ 713# @FUNCTION: java-pkg_dolauncher
682# @ebuild-function java-pkg_dolauncher 714# @USAGE: <filename> [options]
683# 715# @DESCRIPTION:
684# Make a wrapper script to lauch/start this package 716# Make a wrapper script to lauch/start this package
685# If necessary, the wrapper will switch to the appropriate VM. 717# If necessary, the wrapper will switch to the appropriate VM.
686# 718#
687# 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
688# 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}.
689# 721#
722# @CODE
723# Parameters:
690# @param $1 - filename of launcher to create 724# $1 - filename of launcher to create
691# @param $2 - options, as follows: 725# $2 - options, as follows:
692# --main the.main.class.too.start 726# --main the.main.class.to.start
693# --jar /the/jar/too/launch.jar or just <name>.jar 727# --jar /the/jar/too/launch.jar or just <name>.jar
694# --java_args 'Extra arguments to pass to java' 728# --java_args 'Extra arguments to pass to java'
695# --pkg_args 'Extra arguments to pass to the package' 729# --pkg_args 'Extra arguments to pass to the package'
696# --pwd Directory the launcher changes to before executing java 730# --pwd Directory the launcher changes to before executing java
697# -into Directory to install the launcher to, instead of /usr/bin 731# -into Directory to install the launcher to, instead of /usr/bin
698# -pre Prepend contents of this file to the launcher 732# -pre Prepend contents of this file to the launcher
699# ------------------------------------------------------------------------------ 733# @CODE
700java-pkg_dolauncher() { 734java-pkg_dolauncher() {
701 debug-print-function ${FUNCNAME} $* 735 debug-print-function ${FUNCNAME} $*
702 736
703 java-pkg_check-phase install 737 java-pkg_check-phase install
704 java-pkg_init_paths_ 738 java-pkg_init_paths_
765 else 799 else
766 dobin "${target}" 800 dobin "${target}"
767 fi 801 fi
768} 802}
769 803
770# ------------------------------------------------------------------------------ 804# @FUNCTION: java-pkg_dowar
805# @DESCRIPTION:
771# Install war files. 806# Install war files.
772# TODO document 807# TODO document
773# ------------------------------------------------------------------------------
774java-pkg_dowar() { 808java-pkg_dowar() {
775 debug-print-function ${FUNCNAME} $* 809 debug-print-function ${FUNCNAME} $*
776 810
777 # Check for arguments 811 # Check for arguments
778 [[ ${#} -lt 1 ]] && die "At least one argument needed" 812 [[ ${#} -lt 1 ]] && die "At least one argument needed"
802 INSDESTTREE=${JAVA_PKG_WARDEST} \ 836 INSDESTTREE=${JAVA_PKG_WARDEST} \
803 doins ${warpath} 837 doins ${warpath}
804 done 838 done
805} 839}
806 840
807# ------------------------------------------------------------------------------ 841# @FUNCTION: java-pkg_recordjavadoc
808# @internal-function java-pkg_recordjavadoc 842# @INTERNAL
843# @DESCRIPTION:
809# 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
810# 845
811# TODO make sure this in the proper section 846# TODO make sure this in the proper section
812# ------------------------------------------------------------------------------
813java-pkg_recordjavadoc() 847java-pkg_recordjavadoc()
814{ 848{
815 debug-print-function ${FUNCNAME} $* 849 debug-print-function ${FUNCNAME} $*
816 # the find statement is important 850 # the find statement is important
817 # as some packages include multiple trees of javadoc 851 # as some packages include multiple trees of javadoc
824 else 858 else
825 debug-print "No javadocs found" 859 debug-print "No javadocs found"
826 fi 860 fi
827} 861}
828 862
829# ------------------------------------------------------------------------------
830# @section-end install
831# ------------------------------------------------------------------------------
832 863
833# ------------------------------------------------------------------------------ 864# @FUNCTION: java-pkg_jar-from
834# @begin-section query 865# @USAGE: [--build-only] [--with-dependencies] [--virtual] [--into dir] <package> [<package.jar>] [<destination.jar>]
835# Use these to build the classpath for building a package. 866# @DESCRIPTION:
836# ------------------------------------------------------------------------------
837
838# ------------------------------------------------------------------------------
839# @ebuild-function java-pkg_jar-from
840#
841# Makes a symlink to a jar from a certain package 867# Makes a symlink to a jar from a certain package
842# A lot of java packages include dependencies in a lib/ directory 868# A lot of java packages include dependencies in a lib/ directory
843# You can use this function to replace these bundled dependencies. 869# You can use this function to replace these bundled dependencies.
844# 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"
845# 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
846# 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).
847# 873#
874# @CODE
848# Example: get all jars from xerces slot 2 875# Example: get all jars from xerces slot 2
849# java-pkg_jar-from xerces-2 876# java-pkg_jar-from xerces-2
877#
850# Example: get a specific jar from xerces slot 2 878# Example: get a specific jar from xerces slot 2
851# java-pkg_jar-from xerces-2 xml-apis.jar 879# java-pkg_jar-from xerces-2 xml-apis.jar
880#
852# 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
853# java-pkg_jar-from xerces-2 xml-apis.jar xml.jar 882# java-pkg_jar-from xerces-2 xml-apis.jar xml.jar
883#
854# Example: get junit.jar which is needed only for building 884# Example: get junit.jar which is needed only for building
855# java-pkg_jar-from --build-only junit junit.jar 885# java-pkg_jar-from --build-only junit junit.jar
886# @CODE
856# 887#
857# @param $opt 888# @CODE
889# Parameters
858# --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.
859# (assumed automatically when called inside src_test) 891# (assumed automatically when called inside src_test)
860# --with-dependencies - get jars also from requested package's dependencies 892# --with-dependencies - get jars also from requested package's dependencies
861# transitively. 893# transitively.
862# --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
863# and will not have individual jar dependencies recorded. 895# and will not have individual jar dependencies recorded.
864# --into $dir - symlink jar(s) into $dir (must exist) instead of . 896# --into $dir - symlink jar(s) into $dir (must exist) instead of .
865# @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
866# case other parameters are not used. 898# case other parameters are not used.
867# @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.
868# @param $3 - When a single jar is specified, destination filename of the 900# $3 - When a single jar is specified, destination filename of the
869# symlink. Defaults to the name of the jar. 901# symlink. Defaults to the name of the jar.
870# ------------------------------------------------------------------------------ 902# @CODE
903
871# TODO could probably be cleaned up a little 904# TODO could probably be cleaned up a little
872java-pkg_jar-from() { 905java-pkg_jar-from() {
873 debug-print-function ${FUNCNAME} $* 906 debug-print-function ${FUNCNAME} $*
874 907
875 local build_only="" 908 local build_only=""
876 local destdir="." 909 local destdir="."
877 local deep="" 910 local deep=""
878 local virtual="" 911 local virtual=""
912 local record_jar=""
879 913
880 [[ "${EBUILD_PHASE}" == "test" ]] && build_only="build" 914 [[ "${EBUILD_PHASE}" == "test" ]] && build_only="build"
881 915
882 while [[ "${1}" == --* ]]; do 916 while [[ "${1}" == --* ]]; do
883 if [[ "${1}" = "--build-only" ]]; then 917 if [[ "${1}" = "--build-only" ]]; then
918 for pkg in ${target_pkg//,/ }; do 952 for pkg in ${target_pkg//,/ }; do
919 java-pkg_ensure-dep "${build_only}" "${pkg}" 953 java-pkg_ensure-dep "${build_only}" "${pkg}"
920 [[ -z "${build_only}" ]] && java-pkg_record-jar_ "${pkg}" 954 [[ -z "${build_only}" ]] && java-pkg_record-jar_ "${pkg}"
921 done 955 done
922 # setting this disables further record-jar_ calls later 956 # setting this disables further record-jar_ calls later
923 build_only="build" 957 record_jar="true"
924 else 958 else
925 java-pkg_ensure-dep "${build_only}" "${target_pkg}" 959 java-pkg_ensure-dep "${build_only}" "${target_pkg}"
926 fi 960 fi
927 961
928 # Record the entire virtual as a dependency so that 962 # Record the entire virtual as a dependency so that
929 # no jars are missed. 963 # no jars are missed.
930 if [[ -z "${build_only}" && -n "${virtual}" ]]; then 964 if [[ -z "${build_only}" && -n "${virtual}" ]]; then
931 java-pkg_record-jar_ "${target_pkg}" 965 java-pkg_record-jar_ "${target_pkg}"
932 # setting this disables further record-jars_ calls later 966 # setting this disables further record-jars_ calls later
933 build_only="build" 967 record_jar="true"
934 fi 968 fi
935 969
936 pushd ${destdir} > /dev/null \ 970 pushd ${destdir} > /dev/null \
937 || die "failed to change directory to ${destdir}" 971 || die "failed to change directory to ${destdir}"
938 972
946 # If no specific target jar was indicated, link it 980 # If no specific target jar was indicated, link it
947 if [[ -z "${target_jar}" ]] ; then 981 if [[ -z "${target_jar}" ]] ; then
948 [[ -f "${target_jar}" ]] && rm "${target_jar}" 982 [[ -f "${target_jar}" ]] && rm "${target_jar}"
949 ln -snf "${jar}" \ 983 ln -snf "${jar}" \
950 || 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
951 [[ -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
952 # otherwise, if the current jar is the target jar, link it 992 # otherwise, if the current jar is the target jar, link it
953 elif [[ "${jar_name}" == "${target_jar}" ]] ; then 993 elif [[ "${jar_name}" == "${target_jar}" ]] ; then
954 [[ -f "${destjar}" ]] && rm "${destjar}" 994 [[ -f "${destjar}" ]] && rm "${destjar}"
955 ln -snf "${jar}" "${destjar}" \ 995 ln -snf "${jar}" "${destjar}" \
956 || 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
957 [[ -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
958 popd > /dev/null 1004 popd > /dev/null
959 return 0 1005 return 0
960 fi 1006 fi
961 done 1007 done
962 popd > /dev/null 1008 popd > /dev/null
967 else 1013 else
968 die "Failed to find ${target_jar:-jar} in ${target_pkg}" 1014 die "Failed to find ${target_jar:-jar} in ${target_pkg}"
969 fi 1015 fi
970} 1016}
971 1017
972# ------------------------------------------------------------------------------ 1018# @FUNCTION: java-pkg_jarfrom
973# @ebuild-function java-pkg_jarfrom 1019# @DESCRIPTION:
974#
975# See java-pkg_jar-from 1020# See java-pkg_jar-from
976# ------------------------------------------------------------------------------
977java-pkg_jarfrom() { 1021java-pkg_jarfrom() {
978 java-pkg_jar-from "$@" 1022 java-pkg_jar-from "$@"
979} 1023}
980 1024
981# ------------------------------------------------------------------------------ 1025# @FUNCTION: java-pkg_getjars
982# @ebuild-function java-pkg_getjars 1026# @USAGE: [--build-only] [--with-dependencies] <package1>[,<package2>...]
983# 1027# @DESCRIPTION:
984# Get the classpath provided by any number of packages 1028# Get the classpath provided by any number of packages
985# 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'.
986# The providing packages are recorded as dependencies into package.env DEPEND 1030# The providing packages are recorded as dependencies into package.env DEPEND
987# 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
988# 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
989# (junit testing etc). 1033# (junit testing etc).
990# 1034#
1035# @CODE
991# Example: Get the classpath for xerces-2 and xalan, 1036# Example: Get the classpath for xerces-2 and xalan,
992# java-pkg_getjars xerces-2,xalan 1037# java-pkg_getjars xerces-2,xalan
1038#
993# Example Return: 1039# Example Return:
994# /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
995# 1041#
996# @param $opt 1042#
1043# Parameters:
997# --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.
998# (assumed automatically when called inside src_test) 1045# (assumed automatically when called inside src_test)
999# --with-dependencies - get jars also from requested package's dependencies 1046# --with-dependencies - get jars also from requested package's dependencies
1000# transitively. 1047# transitively.
1001# @param $1 - list of packages to get jars from 1048# $1 - list of packages to get jars from
1002# (passed to java-config --classpath) 1049# (passed to java-config --classpath)
1003# ------------------------------------------------------------------------------ 1050# @CODE
1004java-pkg_getjars() { 1051java-pkg_getjars() {
1005 debug-print-function ${FUNCNAME} $* 1052 debug-print-function ${FUNCNAME} $*
1006 1053
1007 local build_only="" 1054 local build_only=""
1008 local deep="" 1055 local deep=""
1035 1082
1036 for pkg in ${pkgs//,/ }; do 1083 for pkg in ${pkgs//,/ }; do
1037 java-pkg_ensure-dep "${build_only}" "${pkg}" 1084 java-pkg_ensure-dep "${build_only}" "${pkg}"
1038 done 1085 done
1039 1086
1040 # Only record jars that aren't build-only 1087 for pkg in ${pkgs//,/ }; do
1041 if [[ -z "${build_only}" ]]; then 1088 if [[ -z "${build_only}" ]]; then
1042 for pkg in ${pkgs//,/ }; do
1043 java-pkg_record-jar_ "${pkg}" 1089 java-pkg_record-jar_ "${pkg}"
1090 else
1091 java-pkg_record-jar_ --build-only "${pkg}"
1092 fi
1044 done 1093 done
1045 fi
1046 1094
1047 echo "${jars}" 1095 echo "${jars}"
1048} 1096}
1049 1097
1050# ------------------------------------------------------------------------------ 1098# @FUNCTION: java-pkg_getjar
1051# @ebuild-function java-pkg_getjar 1099# @USAGE: [--build-only] [--virtual] <package> <jarfile>
1052# 1100# @DESCRIPTION:
1053# Get the filename of a single jar from a package 1101# Get the complete path of a single jar from a package
1054# The providing package is recorded as runtime dependency into package.env 1102# The providing package is recorded as runtime dependency into package.env
1055# 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
1056# 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
1057# (junit testing etc). 1105# (junit testing etc).
1058# 1106#
1107# @CODE
1059# @example 1108# Example:
1060# java-pkg_getjar xerces-2 xml-apis.jar 1109# java-pkg_getjar xerces-2 xml-apis.jar
1061# @example-return 1110# returns
1062# /usr/share/xerces-2/lib/xml-apis.jar 1111# /usr/share/xerces-2/lib/xml-apis.jar
1063# 1112#
1064# @param $opt 1113# Parameters:
1065# --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.
1066# --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
1067# and will not have individual jar dependencies recorded. 1116# and will not have individual jar dependencies recorded.
1068# @param $1 - package to use 1117# $1 - package to use
1069# @param $2 - jar to get 1118# $2 - jar to get
1070# ------------------------------------------------------------------------------ 1119# @CODE
1071java-pkg_getjar() { 1120java-pkg_getjar() {
1072 debug-print-function ${FUNCNAME} $* 1121 debug-print-function ${FUNCNAME} $*
1073 1122
1074 local build_only="" 1123 local build_only=""
1075 local virtual="" 1124 local virtual=""
1125 local record_jar=""
1076 1126
1077 [[ "${EBUILD_PHASE}" == "test" ]] && build_only="build" 1127 [[ "${EBUILD_PHASE}" == "test" ]] && build_only="build"
1078 1128
1079 while [[ "${1}" == --* ]]; do 1129 while [[ "${1}" == --* ]]; do
1080 if [[ "${1}" = "--build-only" ]]; then 1130 if [[ "${1}" = "--build-only" ]]; then
1106 java-pkg_ensure-dep "${build_only}" "${pkg}" 1156 java-pkg_ensure-dep "${build_only}" "${pkg}"
1107 1157
1108 # 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
1109 # So that individual jars are not recorded. 1159 # So that individual jars are not recorded.
1110 if [[ -n "${virtual}" ]]; then 1160 if [[ -n "${virtual}" ]]; then
1161 if [[ -z "${build_only}" ]]; then
1111 java-pkg_record-jar_ "${pkg}" 1162 java-pkg_record-jar_ "${pkg}"
1112 build_only="true" 1163 else
1164 java-pkg_record-jar_ --build-only "${pkg}"
1165 fi
1166 record_jar="true"
1113 fi 1167 fi
1114 1168
1115 for jar in ${classpath//:/ }; do 1169 for jar in ${classpath//:/ }; do
1116 if [[ ! -f "${jar}" ]] ; then 1170 if [[ ! -f "${jar}" ]] ; then
1117 die "Installation problem with jar ${jar} in ${pkg} - is it installed?" 1171 die "Installation problem with jar ${jar} in ${pkg} - is it installed?"
1118 fi 1172 fi
1119 1173
1120 if [[ "$(basename ${jar})" == "${target_jar}" ]] ; then 1174 if [[ "$(basename ${jar})" == "${target_jar}" ]] ; then
1121 # Only record jars that aren't build-only 1175 # Only record jars that aren't build-only
1122 [[ -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
1123 echo "${jar}" 1183 echo "${jar}"
1124 return 0 1184 return 0
1125 fi 1185 fi
1126 done 1186 done
1127 1187
1128 die "Could not find ${target_jar} in ${pkg}" 1188 die "Could not find ${target_jar} in ${pkg}"
1129 return 1 1189 return 1
1130} 1190}
1131 1191
1132# ------------------------------------------------------------------------------ 1192# @FUNCTION: java-pkg_register-dependency
1133# @ebuild-function java-pkg_register-dependency 1193# @USAGE: <package>[,<package2>...] [<jarfile>]
1134# 1194# @DESCRIPTION:
1135# 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
1136# 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
1137# src_install phase. 1197# src_install phase.
1138# 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
1139# 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
1140# specified in ebuild's RDEPEND, and should be omitted in DEPEND. 1200# specified in ebuild's RDEPEND, and should be omitted in DEPEND.
1141# 1201#
1202# @CODE
1203# Parameters:
1142# @param $1 - comma-separated list of packages, or a single package 1204# $1 - comma-separated list of packages, or a single package
1143# @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
1144# to depend on 1206# to depend on
1145# 1207#
1208# Examples:
1146# Example: Record the dependency on whole xerces-2 and xalan, 1209# Record the dependency on whole xerces-2 and xalan,
1147# java-pkg_register-dependency xerces-2,xalan 1210# java-pkg_register-dependency xerces-2,xalan
1211#
1148# Example: Record the dependency on ant.jar from ant-core 1212# Record the dependency on ant.jar from ant-core
1149# java-pkg_register-dependency ant-core ant.jar 1213# java-pkg_register-dependency ant-core ant.jar
1214# @CODE
1150# 1215#
1151# 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
1152# 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
1153# 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
1154# there are more packages providing identically named jar without class 1219# there are more packages providing identically named jar without class
1155# collisions. 1220# collisions.
1156# ------------------------------------------------------------------------------
1157java-pkg_register-dependency() { 1221java-pkg_register-dependency() {
1158 debug-print-function ${FUNCNAME} $* 1222 debug-print-function ${FUNCNAME} $*
1159 1223
1160 java-pkg_check-phase install 1224 java-pkg_check-phase install
1161 1225
1183 fi 1247 fi
1184 1248
1185 java-pkg_do_write_ 1249 java-pkg_do_write_
1186} 1250}
1187 1251
1188# ------------------------------------------------------------------------------
1189# @ebuild-function java-pkg_register-optional-dependency 1252# @FUNCTION: java-pkg_register-optional-dependency
1190# 1253# @USAGE: <package>[,<package2>...] [<jarfile>]
1254# @DESCRIPTION:
1191# 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
1192# 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
1193# called in src_install phase. 1257# called in src_install phase.
1194# 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.
1195# 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
1196# 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
1197# for each implementation triggering hard dependency. 1261# for each implementation triggering hard dependency.
1198# 1262#
1263# @CODE
1264# Parameters:
1199# @param $1 - comma-separated list of packages, or a single package 1265# $1 - comma-separated list of packages, or a single package
1200# @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
1201# to depend on
1202# 1267#
1268# Example:
1203# Example: Record the optional dependency on some jdbc providers 1269# Record the optional dependency on some jdbc providers
1204# 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
1205# 1272#
1206# 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
1207# 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
1208# 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
1209# there are more packages providing identically named jar without class 1276# there are more packages providing identically named jar without class
1210# collisions. 1277# collisions.
1211# ------------------------------------------------------------------------------
1212java-pkg_register-optional-dependency() { 1278java-pkg_register-optional-dependency() {
1213 debug-print-function ${FUNCNAME} $* 1279 debug-print-function ${FUNCNAME} $*
1214 1280
1215 java-pkg_check-phase install 1281 java-pkg_check-phase install
1216 1282
1236 fi 1302 fi
1237 1303
1238 java-pkg_do_write_ 1304 java-pkg_do_write_
1239} 1305}
1240 1306
1241# ------------------------------------------------------------------------------
1242# @ebuild-function java-pkg_register-environment-variable 1307# @FUNCTION: java-pkg_register-environment-variable
1243# 1308# @USAGE: <name> <value>
1309# @DESCRIPTION:
1244# Register an arbitrary environment variable into package.env. The gjl launcher 1310# Register an arbitrary environment variable into package.env. The gjl launcher
1245# 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
1246# environement before executing java command. 1312# environement before executing java command.
1247# Must only be called in src_install phase. 1313# Must only be called in src_install phase.
1248#
1249# @param $1 - variable name
1250# @param $2 - variable value
1251# ------------------------------------------------------------------------------
1252JAVA_PKG_EXTRA_ENV="${T}/java-pkg-extra-env" 1314JAVA_PKG_EXTRA_ENV="${T}/java-pkg-extra-env"
1253JAVA_PKG_EXTRA_ENV_VARS="" 1315JAVA_PKG_EXTRA_ENV_VARS=""
1254java-pkg_register-environment-variable() { 1316java-pkg_register-environment-variable() {
1255 debug-print-function ${FUNCNAME} $* 1317 debug-print-function ${FUNCNAME} $*
1256 1318
1261 echo "${1}=\"${2}\"" >> ${JAVA_PKG_EXTRA_ENV} 1323 echo "${1}=\"${2}\"" >> ${JAVA_PKG_EXTRA_ENV}
1262 JAVA_PKG_EXTRA_ENV_VARS="${JAVA_PKG_EXTRA_ENV_VARS} ${1}" 1324 JAVA_PKG_EXTRA_ENV_VARS="${JAVA_PKG_EXTRA_ENV_VARS} ${1}"
1263 1325
1264 java-pkg_do_write_ 1326 java-pkg_do_write_
1265} 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
1266 1356
1267# 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
1268# populate jars from the filesystem. 1358# populate jars from the filesystem.
1269# 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
1270# string that was built instead of stdin 1360# string that was built instead of stdin
1298# 1388#
1299# read line 1389# read line
1300# done 1390# done
1301#} 1391#}
1302 1392
1303# ------------------------------------------------------------------------------ 1393# @FUNCTION: java-pkg_find-normal-jars
1304# @section-end query 1394# @USAGE: [<path/to/directory>]
1305# ------------------------------------------------------------------------------ 1395# @DESCRIPTION:
1306
1307# ------------------------------------------------------------------------------
1308# @section-begin helper
1309# @section-summary Helper functions
1310#
1311# Various other functions to use from an ebuild
1312# ------------------------------------------------------------------------------
1313
1314# ------------------------------------------------------------------------------
1315# @ebuild-function java-pkg_need
1316#
1317# Adds virtual dependencies, which can optionally be controlled by a USE flag.
1318# Currently supported virtuals are:
1319# javamail
1320# jdbc-stdext
1321# jaf
1322# jdbc-rowset
1323# jms
1324#
1325# @param $1 - Optionally indicate that the dependencies are controlled by
1326# a use flag by specifying '--use' Requires $2.
1327# @param $2 - USE flag which will enable the dependencies.
1328# @param $@ - virtual packages to add depenedencies for
1329# ------------------------------------------------------------------------------
1330# TODO rewrite to parse a line based declaration file instead -- karltk
1331#java-pkg_need() {
1332# debug-print-function ${FUNCNAME} $*
1333# local useflag
1334# if [[ ${1} == "--use" ]]; then
1335# useflag="${2}"
1336# shift 2
1337# fi
1338#
1339# if [[ -z ${1} ]]; then
1340# die "Must specify at least one virtual package."
1341# fi
1342#
1343# local depstr newdepstr
1344#
1345# for virtual in ${@}; do
1346# if has ${virtual} ${JAVA_PKG_VNEED}; then
1347# debug-print "Already registered virtual ${virtual}"
1348# continue
1349# fi
1350# case ${virtual} in
1351# javamail)
1352# debug-print "java-pkg_need: adding javamail dependencies"
1353# newdepstr="|| ( dev-java/gnu-javamail dev-java/sun-javamail-bin )"
1354# ;;
1355# jdbc-stdext)
1356# debug-print "java-pkg_need: adding jdbc-stdext dependencies"
1357# newdepstr="|| ( >=virtual/jdk-1.4 dev-java/jdbc2-stdext )"
1358# ;;
1359# jaf)
1360# debug-print "java-pkg_need: adding jaf dependencies"
1361# newdepstr="|| ( dev-java/gnu-jaf dev-java/sun-jaf-bin )"
1362# ;;
1363# jdbc-rowset)
1364# debug-print "java-pkg_need: adding jdbc-rowset dependencies"
1365# newdepstr="|| ( >=virtual/jdk-1.5 dev-java/sun-jdbc-rowset )"
1366# ;;
1367# jms)
1368# debug-print "java-pkg_need: adding jms dependencies"
1369# newdepstr="|| ( dev-java/sun-jms dev-java/openjms )"
1370# ;;
1371# *)
1372# die "Invalid virtual: ${virtual}"
1373# esac
1374#
1375# export JAVA_PKG_VNEED="${JAVA_PKG_VNEED} ${virtual}"
1376#
1377# if [[ -n ${useflag} ]]; then
1378# depstr="${depstr} ${useflag}? ( ${newdepstr} )"
1379# else
1380# depstr="${depstr} ${newdepstr}"
1381# fi
1382# done
1383#
1384# [[ -z ${JAVA_PKG_NV_DEPEND} ]] && export JAVA_PKG_NV_DEPEND="${DEPEND}"
1385# [[ -z ${JAVA_PKG_NV_RDEPEND} ]] && export JAVA_PKG_NV_RDEPEND="${RDEPEND}"
1386#
1387# export DEPEND="${DEPEND} ${depstr}"
1388# export RDEPEND="${RDEPEND} ${depstr}"
1389#}
1390
1391# ------------------------------------------------------------------------------
1392# @ebuild-function java-pkg_find-normal-jars
1393#
1394# 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)
1395#
1396# @param $1 - The directory to search for jar files (default: ${WORKDIR})
1397# ------------------------------------------------------------------------------
1398java-pkg_find-normal-jars() { 1397java-pkg_find-normal-jars() {
1399 local dir=$1 1398 local dir=$1
1400 [[ "${dir}" ]] || dir="${WORKDIR}" 1399 [[ "${dir}" ]] || dir="${WORKDIR}"
1401 local found 1400 local found
1402 for jar in $(find "${dir}" -name "*.jar" -type f); do 1401 for jar in $(find "${dir}" -name "*.jar" -type f); do
1405 done 1404 done
1406 [[ "${found}" ]] 1405 [[ "${found}" ]]
1407 return $? 1406 return $?
1408} 1407}
1409 1408
1410# ------------------------------------------------------------------------------ 1409# @FUNCTION: java-pkg_ensure-no-bundled-jars
1411# @ebuild-function java-pkg_ensure-no-bundled-jars 1410# @DESCRIPTION:
1412#
1413# 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.
1414# 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
1415# to system jar files or bundled jars removed. 1413# to system jar files or bundled jars removed.
1416# ------------------------------------------------------------------------------
1417java-pkg_ensure-no-bundled-jars() { 1414java-pkg_ensure-no-bundled-jars() {
1418 debug-print-function ${FUNCNAME} $* 1415 debug-print-function ${FUNCNAME} $*
1419 1416
1420 local bundled_jars=$(java-pkg_find-normal-jars) 1417 local bundled_jars=$(java-pkg_find-normal-jars)
1421 if [[ -n ${bundled_jars} ]]; then 1418 if [[ -n ${bundled_jars} ]]; then
1426 done 1423 done
1427 die "Bundled jars found!" 1424 die "Bundled jars found!"
1428 fi 1425 fi
1429} 1426}
1430 1427
1431# ------------------------------------------------------------------------------
1432# @internal-function java-pkg_ensure-vm-version-sufficient 1428# @FUNCTION: java-pkg_ensure-vm-version-sufficient
1433# 1429# @INTERNAL
1430# @DESCRIPTION:
1434# 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.
1435#
1436# ------------------------------------------------------------------------------
1437java-pkg_ensure-vm-version-sufficient() { 1432java-pkg_ensure-vm-version-sufficient() {
1438 debug-print-function ${FUNCNAME} $* 1433 debug-print-function ${FUNCNAME} $*
1439 1434
1440 if ! java-pkg_is-vm-version-sufficient; then 1435 if ! java-pkg_is-vm-version-sufficient; then
1441 debug-print "VM is not suffient" 1436 debug-print "VM is not suffient"
1443 einfo "Please use java-config -S to set the correct one" 1438 einfo "Please use java-config -S to set the correct one"
1444 die "Active Java VM cannot build this package" 1439 die "Active Java VM cannot build this package"
1445 fi 1440 fi
1446} 1441}
1447 1442
1448# ------------------------------------------------------------------------------ 1443# @FUNCTION: java-pkg_is-vm-version-sufficient
1449# @internal-function java-pkg_is-vm-version-sufficient 1444# @INTERNAL
1450# 1445# @DESCRIPTION:
1451# @return zero - VM is sufficient 1446# @RETURN: zero - VM is sufficient; non-zero - VM is not sufficient
1452# @return non-zero - VM is not sufficient
1453# ------------------------------------------------------------------------------
1454java-pkg_is-vm-version-sufficient() { 1447java-pkg_is-vm-version-sufficient() {
1455 debug-print-function ${FUNCNAME} $* 1448 debug-print-function ${FUNCNAME} $*
1456 1449
1457 depend-java-query --is-sufficient "${DEPEND}" > /dev/null 1450 depend-java-query --is-sufficient "${DEPEND}" > /dev/null
1458 return $? 1451 return $?
1459} 1452}
1460 1453
1461# ------------------------------------------------------------------------------ 1454# @FUNCTION: java-pkg_ensure-vm-version-eq
1462# @internal-function java-pkg_ensure-vm-version-eq 1455# @INTERNAL
1463# 1456# @DESCRIPTION:
1464# 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.
1465# 1458#
1466# @param $@ - Desired VM version to ensure 1459# @param $@ - Desired VM version to ensure
1467# ------------------------------------------------------------------------------
1468java-pkg_ensure-vm-version-eq() { 1460java-pkg_ensure-vm-version-eq() {
1469 debug-print-function ${FUNCNAME} $* 1461 debug-print-function ${FUNCNAME} $*
1470 1462
1471 if ! java-pkg_is-vm-version-eq $@ ; then 1463 if ! java-pkg_is-vm-version-eq $@ ; then
1472 debug-print "VM is not suffient" 1464 debug-print "VM is not suffient"
1474 einfo "Please use java-config -S to set the correct one" 1466 einfo "Please use java-config -S to set the correct one"
1475 die "Active Java VM too old" 1467 die "Active Java VM too old"
1476 fi 1468 fi
1477} 1469}
1478 1470
1479# ------------------------------------------------------------------------------ 1471# @FUNCTION: java-pkg_is-vm-version-eq
1480# @internal-function java-pkg_is-vm-version-eq 1472# @USAGE: <version>
1481# 1473# @INTERNAL
1482# @param $@ - VM version to compare current VM to 1474# @RETURN: zero - VM versions are equal; non-zero - VM version are not equal
1483# @return zero - VM versions are equal
1484# @return non-zero - VM version are not equal
1485# ------------------------------------------------------------------------------
1486java-pkg_is-vm-version-eq() { 1475java-pkg_is-vm-version-eq() {
1487 debug-print-function ${FUNCNAME} $* 1476 debug-print-function ${FUNCNAME} $*
1488 1477
1489 local needed_version="$@" 1478 local needed_version="$@"
1490 1479
1507 return 1 1496 return 1
1508 fi 1497 fi
1509 fi 1498 fi
1510} 1499}
1511 1500
1512# ------------------------------------------------------------------------------ 1501# @FUNCTION: java-pkg_ensure-vm-version-ge
1513# @internal-function java-pkg_ensure-vm-version-ge 1502# @INTERNAL
1514# 1503# @DESCRIPTION:
1515# 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
1516# 1505#
1517# @param $@ - VM version to compare current to 1506# @param $@ - VM version to compare current to
1518# ------------------------------------------------------------------------------
1519java-pkg_ensure-vm-version-ge() { 1507java-pkg_ensure-vm-version-ge() {
1520 debug-print-function ${FUNCNAME} $* 1508 debug-print-function ${FUNCNAME} $*
1521 1509
1522 if ! java-pkg_is-vm-version-ge "$@" ; then 1510 if ! java-pkg_is-vm-version-ge "$@" ; then
1523 debug-print "vm is not suffient" 1511 debug-print "vm is not suffient"
1525 einfo "Please use java-config -S to set the correct one" 1513 einfo "Please use java-config -S to set the correct one"
1526 die "Active Java VM too old" 1514 die "Active Java VM too old"
1527 fi 1515 fi
1528} 1516}
1529 1517
1530# ------------------------------------------------------------------------------ 1518# @FUNCTION: java-pkg_is-vm-version-ge
1531# @internal-function java-pkg_is-vm-version-ge 1519# @INTERNAL
1532# 1520# @DESCRIPTION:
1521# @CODE
1522# Parameters:
1533# @param $@ - VM version to compare current VM to 1523# $@ - VM version to compare current VM to
1524# @CODE
1534# @return zero - current VM version is greater than checked version 1525# @RETURN: zero - current VM version is greater than checked version;
1535# @return non-zero - current VM version is not greater than checked version 1526# non-zero - current VM version is not greater than checked version
1536# ------------------------------------------------------------------------------
1537java-pkg_is-vm-version-ge() { 1527java-pkg_is-vm-version-ge() {
1538 debug-print-function ${FUNCNAME} $* 1528 debug-print-function ${FUNCNAME} $*
1539 1529
1540 local needed_version=$@ 1530 local needed_version=$@
1541 local vm_version=$(java-pkg_get-vm-version) 1531 local vm_version=$(java-pkg_get-vm-version)
1560java-pkg_get-current-vm() { 1550java-pkg_get-current-vm() {
1561 echo ${GENTOO_VM} 1551 echo ${GENTOO_VM}
1562} 1552}
1563 1553
1564java-pkg_current-vm-matches() { 1554java-pkg_current-vm-matches() {
1565 hasq $(java-pkg_get-current-vm) ${@} 1555 has $(java-pkg_get-current-vm) ${@}
1566 return $? 1556 return $?
1567} 1557}
1568 1558
1569# ------------------------------------------------------------------------------ 1559# @FUNCTION: java-pkg_get-source
1570# @ebuild-function java-pkg_get-source 1560# @DESCRIPTION:
1571#
1572# Determines what source version should be used, for passing to -source. 1561# Determines what source version should be used, for passing to -source.
1573# 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
1574# 1563#
1575# @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
1576# ------------------------------------------------------------------------------
1577java-pkg_get-source() { 1565java-pkg_get-source() {
1578 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}")}
1579} 1567}
1580 1568
1581# ------------------------------------------------------------------------------ 1569# @FUNCTION: java-pkg_get-target
1582# @ebuild-function java-pkg_get-target 1570# @DESCRIPTION:
1583#
1584# Determines what target version should be used, for passing to -target. 1571# Determines what target version should be used, for passing to -target.
1585# 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
1586# version of your JDK. 1573# version of your JDK.
1587# 1574#
1588# @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
1589# ------------------------------------------------------------------------------
1590java-pkg_get-target() { 1576java-pkg_get-target() {
1591 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}")}
1592} 1578}
1593 1579
1580# @FUNCTION: java-pkg_get-javac
1581# @DESCRIPTION:
1582# Returns the compiler executable
1594java-pkg_get-javac() { 1583java-pkg_get-javac() {
1595 debug-print-function ${FUNCNAME} $* 1584 debug-print-function ${FUNCNAME} $*
1596 1585
1597 1586
1598 local compiler="${GENTOO_COMPILER}" 1587 local compiler="${GENTOO_COMPILER}"
1628 fi 1617 fi
1629 fi 1618 fi
1630 echo ${compiler_executable} 1619 echo ${compiler_executable}
1631} 1620}
1632 1621
1633# ------------------------------------------------------------------------------ 1622# @FUNCTION: java-pkg_javac-args
1634# @ebuild-function java-pkg_javac-args 1623# @DESCRIPTION:
1635#
1636# 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
1637# to know what -source/-target to use. 1625# to know what -source/-target to use.
1638# 1626#
1639# @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
1640# ------------------------------------------------------------------------------
1641java-pkg_javac-args() { 1628java-pkg_javac-args() {
1642 debug-print-function ${FUNCNAME} $* 1629 debug-print-function ${FUNCNAME} $*
1643 1630
1644 local want_source="$(java-pkg_get-source)" 1631 local want_source="$(java-pkg_get-source)"
1645 local want_target="$(java-pkg_get-target)" 1632 local want_target="$(java-pkg_get-target)"
1653 if [[ -z "${want_source}" || -z "${want_target}" ]]; then 1640 if [[ -z "${want_source}" || -z "${want_target}" ]]; then
1654 debug-print "could not find valid -source/-target values for javac" 1641 debug-print "could not find valid -source/-target values for javac"
1655 echo "Could not find valid -source/-target values for javac" 1642 echo "Could not find valid -source/-target values for javac"
1656 return 1 1643 return 1
1657 else 1644 else
1658 if java-pkg_is-vm-version-ge "1.4"; then
1659 echo "${source_str} ${target_str}" 1645 echo "${source_str} ${target_str}"
1660 else
1661 echo "${target_str}"
1662 fi 1646 fi
1663 fi
1664} 1647}
1665 1648
1666# TODO document 1649# @FUNCTION: java-pkg_get-jni-cflags
1650# @DESCRIPTION:
1651# Echos the CFLAGS for JNI compilations
1667java-pkg_get-jni-cflags() { 1652java-pkg_get-jni-cflags() {
1668 local flags="-I${JAVA_HOME}/include" 1653 local flags="-I${JAVA_HOME}/include"
1669 1654
1670 local platform="linux" 1655 local platform="linux"
1671 use elibc_FreeBSD && platform="freebsd" 1656 use elibc_FreeBSD && platform="freebsd"
1675 1660
1676 echo ${flags} 1661 echo ${flags}
1677} 1662}
1678 1663
1679java-pkg_ensure-gcj() { 1664java-pkg_ensure-gcj() {
1680 if ! built_with_use sys-devel/gcc gcj ; then 1665 # was enforcing sys-devel/gcc[gcj]
1681 ewarn 1666 die "${FUNCNAME} was removed. Use use-deps available as of EAPI 2 instead. #261562"
1682 ewarn "You must build gcc with the gcj support to build with gcj"
1683 ewarn
1684 ebeep 5
1685 die "No GCJ support found!"
1686 fi
1687} 1667}
1688 1668
1689java-pkg_ensure-test() { 1669java-pkg_ensure-test() {
1690 if hasq test ${FEATURES} && ! hasq -test ${FEATURES} \ 1670 # was enforcing USE=test if FEATURES=test
1691 && hasq test ${IUSE} && ! use test; 1671 die "${FUNCNAME} was removed. Package mangers handle this already. #278965"
1692 then
1693 eerror "You specified FEATURES=test, but USE=test is needed"
1694 eerror "to pull in the additional dependencies for testing"
1695 die "Need USE=test enabled"
1696 fi
1697} 1672}
1698 1673
1699# ------------------------------------------------------------------------------ 1674# @FUNCTION: java-pkg_register-ant-task
1700# @ebuild-function java-pkg_register-ant-task 1675# @USAGE: [--version x.y] [<name>]
1701# 1676# @DESCRIPTION:
1702# 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
1703# 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
1704# 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
1705# 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
1706# .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
1707# compatibility. 1682# compatibility.
1708# 1683#
1684# @CODE
1685# Parameters
1709# @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
1710# version). Used by the ant-* packages to prevent loading of mismatched 1687# version). Used by the ant-* packages to prevent loading of mismatched
1711# 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,
1712# without a need for blockers. 1689# without a need for blockers.
1713# @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])
1714# ------------------------------------------------------------------------------ 1691# @CODE
1715java-pkg_register-ant-task() { 1692java-pkg_register-ant-task() {
1716 local TASKS_DIR="tasks" 1693 local TASKS_DIR="tasks"
1717 1694
1718 # check for --version x.y parameters 1695 # check for --version x.y parameters
1719 while [[ -n "${1}" && -n "${2}" ]]; do 1696 while [[ -n "${1}" && -n "${2}" ]]; do
1731 1708
1732 dodir /usr/share/ant/${TASKS_DIR} 1709 dodir /usr/share/ant/${TASKS_DIR}
1733 touch "${D}/usr/share/ant/${TASKS_DIR}/${TASK_NAME}" 1710 touch "${D}/usr/share/ant/${TASKS_DIR}/${TASK_NAME}"
1734} 1711}
1735 1712
1736# ------------------------------------------------------------------------------ 1713# @FUNCTION: java-pkg_ant-tasks-depend
1737# @internal-function java-pkg_ant-tasks-depend 1714# @INTERNAL
1738# 1715# @DESCRIPTION:
1739# Translates the WANT_ANT_TASKS variable into valid dependencies. 1716# Translates the WANT_ANT_TASKS variable into valid dependencies.
1740# ------------------------------------------------------------------------------
1741java-pkg_ant-tasks-depend() { 1717java-pkg_ant-tasks-depend() {
1742 debug-print-function ${FUNCNAME} ${WANT_ANT_TASKS} 1718 debug-print-function ${FUNCNAME} ${WANT_ANT_TASKS}
1743 1719
1744 if [[ -n "${WANT_ANT_TASKS}" ]]; then 1720 if [[ -n "${WANT_ANT_TASKS}" ]]; then
1745 local DEP="" 1721 local DEP=""
1759 else 1735 else
1760 return 0 1736 return 0
1761 fi 1737 fi
1762} 1738}
1763 1739
1764# ------------------------------------------------------------------------------ 1740
1765# @ebuild-function ejunit 1741# @FUNCTION: ejunit_
1766# 1742# @INTERNAL
1743# @DESCRIPTION:
1767# 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
1768# 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.
1769# 1746# @CODE
1770# Examples: 1747# Parameters:
1771# ejunit -cp build/classes org.blinkenlights.jid3.test.AllTests 1748# $1 - junit package (junit or junit-4)
1772# ejunit org.blinkenlights.jid3.test.AllTests
1773#
1774# @param $1 - -cp or -classpath 1749# $2 - -cp or -classpath
1775# @param $2 - classpath; junit and recorded dependencies get appended 1750# $3 - classpath; junit and recorded dependencies get appended
1776# @param $@ - the rest of the parameters are passed to java 1751# $@ - the rest of the parameters are passed to java
1777# ------------------------------------------------------------------------------ 1752# @CODE
1778ejunit() { 1753ejunit_() {
1779 debug-print-function ${FUNCNAME} $* 1754 debug-print-function ${FUNCNAME} $*
1780 1755
1781 local pkgs 1756 local pkgs
1782 if [[ -f ${JAVA_PKG_DEPEND_FILE} ]]; then 1757 if [[ -f ${JAVA_PKG_DEPEND_FILE} ]]; then
1783 for atom in $(cat ${JAVA_PKG_DEPEND_FILE} | tr : ' '); do 1758 for atom in $(cat ${JAVA_PKG_DEPEND_FILE} | tr : ' '); do
1784 pkgs=${pkgs},$(echo ${atom} | sed -re "s/^.*@//") 1759 pkgs=${pkgs},$(echo ${atom} | sed -re "s/^.*@//")
1785 done 1760 done
1786 fi 1761 fi
1787 1762
1763 local junit=${1}
1764 shift 1
1765
1788 local cp=$(java-pkg_getjars --with-dependencies junit${pkgs}) 1766 local cp=$(java-pkg_getjars --with-dependencies ${junit}${pkgs})
1789 if [[ ${1} = -cp || ${1} = -classpath ]]; then 1767 if [[ ${1} = -cp || ${1} = -classpath ]]; then
1790 cp="${2}:${cp}" 1768 cp="${2}:${cp}"
1791 shift 2 1769 shift 2
1792 else 1770 else
1793 cp=".:${cp}" 1771 cp=".:${cp}"
1794 fi 1772 fi
1795 1773
1796 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
1797 debug-print "Calling: java -cp \"${cp}\" -Djava.awt.headless=true ${runner} ${@}" 1778 debug-print "Calling: java -cp \"${cp}\" -Djava.awt.headless=true ${runner} ${@}"
1798 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"
1799} 1780}
1800 1781
1801# ------------------------------------------------------------------------------ 1782# @FUNCTION: ejunit
1802# @section-end helper 1783# @DESCRIPTION:
1803# ------------------------------------------------------------------------------ 1784# Junit wrapper function. Makes it easier to run the tests and checks for
1804 1785# dev-java/junit in DEPEND. Launches the tests using org.junit.runner.JUnitCore.
1805# ------------------------------------------------------------------------------
1806# @eclass-src_prepare
1807# 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:
1808# src_prepare Searches for bundled jars 1829# src_prepare Searches for bundled jars
1809# ------------------------------------------------------------------------------ 1830# Don't call directly, but via java-pkg-2_src_prepare!
1810
1811java-utils-2_src_prepare() { 1831java-utils-2_src_prepare() {
1812 # Remember that eant will call this unless called via Portage 1832 java-pkg_func-exists java_prepare && java_prepare
1813 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
1814 echo "Searching for bundled jars:" 1841 echo "Searching for bundled jars:"
1815 java-pkg_find-normal-jars || echo "None found." 1842 java-pkg_find-normal-jars || echo "None found."
1816 echo "Searching for bundled classes (no output if none found):" 1843 echo "Searching for bundled classes (no output if none found):"
1817 find "${WORKDIR}" -name "*.class" 1844 find "${WORKDIR}" -name "*.class"
1818 echo "Search done." 1845 echo "Search done."
1819 fi 1846 fi
1820 touch "${T}/java-utils-2_src_prepare-run"
1821} 1847}
1822 1848
1823# ------------------------------------------------------------------------------ 1849# @FUNCTION: java-utils-2_pkg_preinst
1824# @section-begin build 1850# @DESCRIPTION:
1825# @section-summary Build functions 1851# pkg_preinst Searches for missing and unneeded dependencies
1826# 1852# Don't call directly, but via java-pkg-2_pkg_preinst!
1827# These are some functions for building a package. In particular, it consists of 1853java-utils-2_pkg_preinst() {
1828# wrappers for javac and ant. 1854 if is-java-strict; then
1829# ------------------------------------------------------------------------------ 1855 if [[ ! -e "${JAVA_PKG_ENV}" ]] || has ant-tasks ${INHERITED}; then
1856 return
1857 fi
1830 1858
1831# ------------------------------------------------------------------------------ 1859 if has_version dev-java/java-dep-check; then
1832# @ebuild-function eant 1860 local output=$(GENTOO_VM= java-dep-check --image "${D}" "${JAVA_PKG_ENV}")
1833# 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:
1834# 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
1835# 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,
1836# variables: 1873# variables:
1874#
1875# @CODE
1876# Variables:
1837# 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
1838# gentoo.classpath property. Be sure to call 1878# gentoo.classpath property. Be sure to call java-ant_rewrite-classpath in src_unpack.
1839# java-ant_rewrite-classpath in src_unpack. 1879# EANT_NEEDS_TOOLS - add tools.jar to the gentoo.classpath. Should only be used
1840# 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!
1841# *ANT_TASKS - used to determine ANT_TASKS before calling Ant. 1882# ANT_TASKS - used to determine ANT_TASKS before calling Ant.
1842# ------------------------------------------------------------------------------ 1883# @CODE
1843eant() { 1884eant() {
1844 debug-print-function ${FUNCNAME} $* 1885 debug-print-function ${FUNCNAME} $*
1845 1886
1846 if [[ ${EBUILD_PHASE} = compile ]]; then 1887 if [[ ${EBUILD_PHASE} = compile ]]; then
1847 java-ant-2_src_configure 1888 java-ant-2_src_configure
1848 java-utils-2_src_prepare
1849 fi 1889 fi
1850 1890
1851 if ! hasq java-ant-2 ${INHERITED}; then 1891 if ! has java-ant-2 ${INHERITED}; then
1852 local msg="You should inherit java-ant-2 when using eant" 1892 local msg="You should inherit java-ant-2 when using eant"
1853 java-pkg_announce-qa-violation "${msg}" 1893 java-pkg_announce-qa-violation "${msg}"
1854 fi 1894 fi
1855 1895
1856 local antflags="-Dnoget=true -Dmaven.mode.offline=true -Dbuild.sysclasspath=ignore" 1896 local antflags="-Dnoget=true -Dmaven.mode.offline=true -Dbuild.sysclasspath=ignore"
1929 local gcp="${EANT_GENTOO_CLASSPATH}" 1969 local gcp="${EANT_GENTOO_CLASSPATH}"
1930 local getjarsarg="" 1970 local getjarsarg=""
1931 1971
1932 if [[ ${EBUILD_PHASE} = "test" ]]; then 1972 if [[ ${EBUILD_PHASE} = "test" ]]; then
1933 antflags="${antflags} -DJunit.present=true" 1973 antflags="${antflags} -DJunit.present=true"
1934 [[ ${ANT_TASKS} = *ant-junit* ]] && gcp="${gcp} junit"
1935 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"
1936 fi 1980 fi
1937 1981
1938 local cp 1982 local cp
1939 1983
1940 for atom in ${gcp}; do 1984 for atom in ${gcp}; do
1941 cp="${cp}:$(java-pkg_getjars ${getjarsarg} ${atom})" 1985 cp+=":$(java-pkg_getjars ${getjarsarg} ${atom})"
1942 done 1986 done
1943 1987
1988 [[ ${EANT_NEEDS_TOOLS} ]] && cp+=":$(java-config --tools)"
1989 [[ ${EANT_GENTOO_CLASSPATH_EXTRA} ]] && cp+=":${EANT_GENTOO_CLASSPATH_EXTRA}"
1990
1944 if [[ ${cp} ]]; then 1991 if [[ ${cp#:} ]]; then
1945 # It seems ant does not like single quotes around ${cp} 1992 # It seems ant does not like single quotes around ${cp}
1946 cp=${cp#:}
1947 [[ ${EANT_GENTOO_CLASSPATH_EXTRA} ]] && \
1948 cp="${cp}:${EANT_GENTOO_CLASSPATH_EXTRA}"
1949 antflags="${antflags} -Dgentoo.classpath=\"${cp}\"" 1993 antflags="${antflags} -Dgentoo.classpath=\"${cp#:}\""
1950 fi 1994 fi
1951 1995
1952 [[ -n ${JAVA_PKG_DEBUG} ]] && echo ant ${antflags} "${@}" 1996 [[ -n ${JAVA_PKG_DEBUG} ]] && echo ant ${antflags} "${@}"
1953 debug-print "Calling ant (GENTOO_VM: ${GENTOO_VM}): ${antflags} ${@}" 1997 debug-print "Calling ant (GENTOO_VM: ${GENTOO_VM}): ${antflags} ${@}"
1954 ant ${antflags} "${@}" || die "eant failed" 1998 ant ${antflags} "${@}" || die "eant failed"
1955} 1999}
1956 2000
1957# ------------------------------------------------------------------------------ 2001# @FUNCTION: ejavac
1958# @ebuild-function ejavac 2002# @USAGE: <javac_arguments>
1959# 2003# @DESCRIPTION:
1960# Javac wrapper function. Will use the appropriate compiler, based on 2004# Javac wrapper function. Will use the appropriate compiler, based on
1961# /etc/java-config/compilers.conf 2005# /etc/java-config/compilers.conf
1962#
1963# @param $@ - Arguments to be passed to the compiler
1964# ------------------------------------------------------------------------------
1965ejavac() { 2006ejavac() {
1966 debug-print-function ${FUNCNAME} $* 2007 debug-print-function ${FUNCNAME} $*
1967 2008
1968 java-pkg_init-compiler_ 2009 java-pkg_init-compiler_
1969 2010
1983 2024
1984 [[ -n ${JAVA_PKG_DEBUG} ]] && echo ${compiler_executable} ${javac_args} "${@}" 2025 [[ -n ${JAVA_PKG_DEBUG} ]] && echo ${compiler_executable} ${javac_args} "${@}"
1985 ${compiler_executable} ${javac_args} "${@}" || die "ejavac failed" 2026 ${compiler_executable} ${javac_args} "${@}" || die "ejavac failed"
1986} 2027}
1987 2028
1988# ------------------------------------------------------------------------------ 2029# @FUNCTION: ejavadoc
1989# @ebuild-function java-pkg_filter-compiler 2030# @USAGE: <javadoc_arguments>
1990# 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:
1991# 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.
1992# Basically, it just appends onto JAVA_PKG_FILTER_COMPILER 2050# Basically, it just appends onto JAVA_PKG_FILTER_COMPILER
1993#
1994# @param $@ - compilers to filter
1995# ------------------------------------------------------------------------------
1996java-pkg_filter-compiler() { 2051java-pkg_filter-compiler() {
1997 JAVA_PKG_FILTER_COMPILER="${JAVA_PKG_FILTER_COMPILER} $@" 2052 JAVA_PKG_FILTER_COMPILER="${JAVA_PKG_FILTER_COMPILER} $@"
1998} 2053}
1999 2054
2000# ------------------------------------------------------------------------------ 2055# @FUNCTION: java-pkg_force-compiler
2001# @ebuild-function java-pkg_force-compiler 2056# @USAGE: <compiler(s)_to_force>
2002# 2057# @DESCRIPTION:
2003# 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.
2004# 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
2005# OutOfMemoryErrors that may come up. 2060# OutOfMemoryErrors that may come up.
2006#
2007# @param $@ - compilers to force
2008# ------------------------------------------------------------------------------
2009java-pkg_force-compiler() { 2061java-pkg_force-compiler() {
2010 JAVA_PKG_FORCE_COMPILER="$@" 2062 JAVA_PKG_FORCE_COMPILER="$@"
2011} 2063}
2012 2064
2013# ------------------------------------------------------------------------------ 2065# @FUNCTION: use_doc
2014# @ebuild-function use_doc 2066# @DESCRIPTION:
2015# 2067#
2016# 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,
2017# 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.
2018# 2070#
2019# 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'
2020# 2075#
2076# Examples:
2021# Example: build javadocs by calling 'javadoc' target 2077# build javadocs by calling 'javadoc' target
2022# eant $(use_doc) 2078# eant $(use_doc)
2079#
2023# Example: build javadocs by calling 'apidoc' target 2080# build javadocs by calling 'apidoc' target
2024# eant $(use_doc apidoc) 2081# eant $(use_doc apidoc)
2025# 2082# @CODE
2026# @param $@ - Option value to return. Defaults to 'javadoc'
2027# @return string - Name of the target to create javadocs 2083# @RETURN string - Name of the target to create javadocs
2028# ------------------------------------------------------------------------------
2029use_doc() { 2084use_doc() {
2030 use doc && echo ${@:-javadoc} 2085 use doc && echo ${@:-javadoc}
2031} 2086}
2032 2087
2033 2088
2034# ------------------------------------------------------------------------------ 2089# @FUNCTION: java-pkg_init
2035# @section-end build 2090# @INTERNAL
2036# ------------------------------------------------------------------------------ 2091# @DESCRIPTION:
2037
2038# ------------------------------------------------------------------------------
2039# @section-begin internal
2040# @section-summary Internal functions
2041#
2042# Do __NOT__ use any of these from an ebuild! These are only to be used from
2043# within the java eclasses.
2044# ------------------------------------------------------------------------------
2045
2046# -----------------------------------------------------------------------------
2047# @function-internal java-pkg_init
2048#
2049# 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
2050# 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
2051# 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
2052# internally. And most importantly, it'll switch the VM if necessary. 2095# internally. And most importantly, it'll switch the VM if necessary.
2053# 2096#
2054# 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
2055# call it during each of the phases of the merge process. 2098# call it during each of the phases of the merge process.
2056#
2057# -----------------------------------------------------------------------------
2058java-pkg_init() { 2099java-pkg_init() {
2059 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
2060 unset JAVAC 2108 unset JAVAC
2061 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 }
2062 2118
2063 # People do all kinds of weird things. 2119 # People do all kinds of weird things.
2064 # http://forums.gentoo.org/viewtopic-p-3943166.html 2120 # http://forums.gentoo.org/viewtopic-p-3943166.html
2065 local silence="${SILENCE_JAVA_OPTIONS_WARNING}" 2121 local silence="${SILENCE_JAVA_OPTIONS_WARNING}"
2066 local accept="${I_WANT_GLOBAL_JAVA_OPTIONS}" 2122 local accept="${I_WANT_GLOBAL_JAVA_OPTIONS}"
2083 2139
2084 if java-pkg_func-exists ant_src_unpack; then 2140 if java-pkg_func-exists ant_src_unpack; then
2085 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"
2086 fi 2142 fi
2087 2143
2088 java-pkg_init_paths_
2089 java-pkg_switch-vm 2144 java-pkg_switch-vm
2090 PATH=${JAVA_HOME}/bin:${PATH} 2145 PATH=${JAVA_HOME}/bin:${PATH}
2091 2146
2092 # TODO we will probably want to set JAVAC and JAVACFLAGS 2147 # TODO we will probably want to set JAVAC and JAVACFLAGS
2093 2148
2104 export CLASSPATH= 2159 export CLASSPATH=
2105 2160
2106 # Unset external ANT_ stuff 2161 # Unset external ANT_ stuff
2107 export ANT_TASKS= 2162 export ANT_TASKS=
2108 export ANT_OPTS= 2163 export ANT_OPTS=
2164 export ANT_RESPECT_JAVA_HOME=
2109} 2165}
2110 2166
2111# ------------------------------------------------------------------------------ 2167# @FUNCTION: java-pkg-init-compiler_
2112# @function-internal java-pkg-init-compiler_ 2168# @INTERNAL
2113# 2169# @DESCRIPTION:
2114# 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
2115# 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
2116# COMPILERS variable defined there. 2172# COMPILERS variable defined there.
2117# 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
2118# 2174#
2129# 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
2130# 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
2131# by the current VM. 2187# by the current VM.
2132# 2188#
2133# 2189#
2134# @return name of the compiler to use 2190# @RETURN name of the compiler to use
2135# ------------------------------------------------------------------------------
2136java-pkg_init-compiler_() { 2191java-pkg_init-compiler_() {
2137 debug-print-function ${FUNCNAME} $* 2192 debug-print-function ${FUNCNAME} $*
2138 2193
2139 if [[ -n ${GENTOO_COMPILER} ]]; then 2194 if [[ -n ${GENTOO_COMPILER} ]]; then
2140 debug-print "GENTOO_COMPILER already set" 2195 debug-print "GENTOO_COMPILER already set"
2181 if ! has ${desired_target} ${supported_target}; then 2236 if ! has ${desired_target} ${supported_target}; then
2182 ewarn "${compiler} does not support -target ${desired_target}, skipping" 2237 ewarn "${compiler} does not support -target ${desired_target}, skipping"
2183 continue 2238 continue
2184 fi 2239 fi
2185 2240
2186 # -source was introduced in 1.3, so only check 1.3 and on
2187 if version_is_at_least "${desired_soure}" "1.3"; then
2188 # Verify that the compiler supports source 2241 # Verify that the compiler supports source
2189 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})
2190 if ! has ${desired_source} ${supported_source}; then 2243 if ! has ${desired_source} ${supported_source}; then
2191 ewarn "${compiler} does not support -source ${desired_source}, skipping" 2244 ewarn "${compiler} does not support -source ${desired_source}, skipping"
2192 continue 2245 continue
2193 fi
2194 fi 2246 fi
2195 2247
2196 # 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
2197 export GENTOO_COMPILER="${compiler}" 2249 export GENTOO_COMPILER="${compiler}"
2198 break 2250 break
2220 einfo "Using ${GENTOO_COMPILER} for compilation" 2272 einfo "Using ${GENTOO_COMPILER} for compilation"
2221 fi 2273 fi
2222 2274
2223} 2275}
2224 2276
2225# ------------------------------------------------------------------------------ 2277# @FUNCTION: init_paths_
2226# @internal-function init_paths_ 2278# @INTERNAL
2227# 2279# @DESCRIPTION:
2228# 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
2229# to determine where things will eventually get installed. 2281# to determine where things will eventually get installed.
2230# ------------------------------------------------------------------------------
2231java-pkg_init_paths_() { 2282java-pkg_init_paths_() {
2232 debug-print-function ${FUNCNAME} $* 2283 debug-print-function ${FUNCNAME} $*
2233 2284
2234 local pkg_name 2285 local pkg_name
2235 if [[ "$SLOT" == "0" ]] ; then 2286 if [[ "${SLOT%/*}" == "0" ]] ; then
2236 JAVA_PKG_NAME="${PN}" 2287 JAVA_PKG_NAME="${PN}"
2237 else 2288 else
2238 JAVA_PKG_NAME="${PN}-${SLOT}" 2289 JAVA_PKG_NAME="${PN}-${SLOT%/*}"
2239 fi 2290 fi
2240 2291
2241 JAVA_PKG_SHAREPATH="${DESTTREE}/share/${JAVA_PKG_NAME}" 2292 JAVA_PKG_SHAREPATH="${DESTTREE}/share/${JAVA_PKG_NAME}"
2242 JAVA_PKG_SOURCESPATH="${JAVA_PKG_SHAREPATH}/sources/" 2293 JAVA_PKG_SOURCESPATH="${JAVA_PKG_SHAREPATH}/sources/"
2243 JAVA_PKG_ENV="${D}${JAVA_PKG_SHAREPATH}/package.env" 2294 JAVA_PKG_ENV="${D}${JAVA_PKG_SHAREPATH}/package.env"
2245 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}"
2246 2297
2247 [[ -z "${JAVA_PKG_JARDEST}" ]] && JAVA_PKG_JARDEST="${JAVA_PKG_SHAREPATH}/lib" 2298 [[ -z "${JAVA_PKG_JARDEST}" ]] && JAVA_PKG_JARDEST="${JAVA_PKG_SHAREPATH}/lib"
2248 [[ -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}"
2249 [[ -z "${JAVA_PKG_WARDEST}" ]] && JAVA_PKG_WARDEST="${JAVA_PKG_SHAREPATH}/webapps" 2300 [[ -z "${JAVA_PKG_WARDEST}" ]] && JAVA_PKG_WARDEST="${JAVA_PKG_SHAREPATH}/webapps"
2250
2251 2301
2252 # TODO maybe only print once? 2302 # TODO maybe only print once?
2253 debug-print "JAVA_PKG_SHAREPATH: ${JAVA_PKG_SHAREPATH}" 2303 debug-print "JAVA_PKG_SHAREPATH: ${JAVA_PKG_SHAREPATH}"
2254 debug-print "JAVA_PKG_ENV: ${JAVA_PKG_ENV}" 2304 debug-print "JAVA_PKG_ENV: ${JAVA_PKG_ENV}"
2255 debug-print "JAVA_PKG_JARDEST: ${JAVA_PKG_JARDEST}" 2305 debug-print "JAVA_PKG_JARDEST: ${JAVA_PKG_JARDEST}"
2256 debug-print "JAVA_PKG_LIBDEST: ${JAVA_PKG_LIBDEST}" 2306 debug-print "JAVA_PKG_LIBDEST: ${JAVA_PKG_LIBDEST}"
2257 debug-print "JAVA_PKG_WARDEST: ${JAVA_PKG_WARDEST}" 2307 debug-print "JAVA_PKG_WARDEST: ${JAVA_PKG_WARDEST}"
2258} 2308}
2259 2309
2260# ------------------------------------------------------------------------------ 2310# @FUNCTION: java-pkg_do_write_
2261# @internal-function java-pkg_do_write_ 2311# @INTERNAL
2262# 2312# @DESCRIPTION:
2263# Writes the package.env out to disk. 2313# Writes the package.env out to disk.
2264# 2314#
2265# ------------------------------------------------------------------------------
2266# TODO change to do-write, to match everything else 2315# TODO change to do-write, to match everything else
2267java-pkg_do_write_() { 2316java-pkg_do_write_() {
2268 debug-print-function ${FUNCNAME} $* 2317 debug-print-function ${FUNCNAME} $*
2269 java-pkg_init_paths_ 2318 java-pkg_init_paths_
2270 # Create directory for package.env 2319 # Create directory for package.env
2275 # Create package.env 2324 # Create package.env
2276 ( 2325 (
2277 echo "DESCRIPTION=\"${DESCRIPTION}\"" 2326 echo "DESCRIPTION=\"${DESCRIPTION}\""
2278 echo "GENERATION=\"2\"" 2327 echo "GENERATION=\"2\""
2279 echo "SLOT=\"${SLOT}\"" 2328 echo "SLOT=\"${SLOT}\""
2329 echo "CATEGORY=\"${CATEGORY}\""
2330 echo "PVR=\"${PVR}\""
2280 2331
2281 [[ -n "${JAVA_PKG_CLASSPATH}" ]] && echo "CLASSPATH=\"${JAVA_PKG_CLASSPATH}\"" 2332 [[ -n "${JAVA_PKG_CLASSPATH}" ]] && echo "CLASSPATH=\"${JAVA_PKG_CLASSPATH}\""
2282 [[ -n "${JAVA_PKG_LIBRARY}" ]] && echo "LIBRARY_PATH=\"${JAVA_PKG_LIBRARY}\"" 2333 [[ -n "${JAVA_PKG_LIBRARY}" ]] && echo "LIBRARY_PATH=\"${JAVA_PKG_LIBRARY}\""
2283 [[ -n "${JAVA_PROVIDE}" ]] && echo "PROVIDES=\"${JAVA_PROVIDE}\"" 2334 [[ -n "${JAVA_PROVIDE}" ]] && echo "PROVIDES=\"${JAVA_PROVIDE}\""
2284 [[ -f "${JAVA_PKG_DEPEND_FILE}" ]] \ 2335 [[ -f "${JAVA_PKG_DEPEND_FILE}" ]] \
2285 && echo "DEPEND=\"$(cat "${JAVA_PKG_DEPEND_FILE}" | uniq | tr '\n' ':')\"" 2336 && echo "DEPEND=\"$(sort -u "${JAVA_PKG_DEPEND_FILE}" | tr '\n' ':')\""
2286 [[ -f "${JAVA_PKG_OPTIONAL_DEPEND_FILE}" ]] \ 2337 [[ -f "${JAVA_PKG_OPTIONAL_DEPEND_FILE}" ]] \
2287 && 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' ':')\""
2288 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' ':')\""
2289 ) > "${JAVA_PKG_ENV}" 2342 ) > "${JAVA_PKG_ENV}"
2290 2343
2291 # register target/source 2344 # register target/source
2292 local target="$(java-pkg_get-target)" 2345 local target="$(java-pkg_get-target)"
2293 local source="$(java-pkg_get-source)" 2346 local source="$(java-pkg_get-source)"
2321 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"
2322 debug-print "write package.env." 2375 debug-print "write package.env."
2323 fi 2376 fi
2324} 2377}
2325 2378
2326# ------------------------------------------------------------------------------ 2379# @FUNCTION: java-pkg_record-jar_
2327# @internal-function java-pkg_record-jar_ 2380# @INTERNAL
2328# 2381# @DESCRIPTION:
2329# Record an (optional) dependency to the package.env 2382# Record an (optional) dependency to the package.env
2383# @CODE
2384# Parameters:
2330# @param --optional - record dependency as optional 2385# --optional - record dependency as optional
2386# --build - record dependency as build_only
2331# @param $1 - package to record 2387# $1 - package to record
2332# @param $2 - (optional) jar of package to record 2388# $2 - (optional) jar of package to record
2333# ------------------------------------------------------------------------------ 2389# @CODE
2334JAVA_PKG_DEPEND_FILE="${T}/java-pkg-depend" 2390JAVA_PKG_DEPEND_FILE="${T}/java-pkg-depend"
2335JAVA_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"
2336 2393
2337java-pkg_record-jar_() { 2394java-pkg_record-jar_() {
2338 debug-print-function ${FUNCNAME} $* 2395 debug-print-function ${FUNCNAME} $*
2339 2396
2340 local depend_file="${JAVA_PKG_DEPEND_FILE}" 2397 local depend_file="${JAVA_PKG_DEPEND_FILE}"
2341 if [[ "${1}" == "--optional" ]]; then 2398 case "${1}" in
2342 depend_file="${JAVA_PKG_OPTIONAL_DEPEND_FILE}" 2399 "--optional") depend_file="${JAVA_PKG_OPTIONAL_DEPEND_FILE}"; shift;;
2343 shift 2400 "--build-only") depend_file="${JAVA_PKG_BUILD_DEPEND_FILE}"; shift;;
2344 fi 2401 esac
2345 2402
2346 local pkg=${1} jar=${2} append 2403 local pkg=${1} jar=${2} append
2347 if [[ -z "${jar}" ]]; then 2404 if [[ -z "${jar}" ]]; then
2348 append="${pkg}" 2405 append="${pkg}"
2349 else 2406 else
2351 fi 2408 fi
2352 2409
2353 echo "${append}" >> "${depend_file}" 2410 echo "${append}" >> "${depend_file}"
2354} 2411}
2355 2412
2356# ------------------------------------------------------------------------------ 2413# @FUNCTION: java-pkg_append_
2357# @internal-function java-pkg_append_ 2414# @INTERNAL
2358# 2415# @DESCRIPTION:
2359# Appends a value to a variable 2416# Appends a value to a variable
2360# 2417#
2361# Example: java-pkg_append_ CLASSPATH foo.jar 2418# @CODE
2419# Parameters:
2362# @param $1 variable name to modify 2420# $1 variable name to modify
2363# @param $2 value to append 2421# $2 value to append
2364# ------------------------------------------------------------------------------ 2422#
2423# Examples:
2424# java-pkg_append_ CLASSPATH foo.jar
2425# @CODE
2365java-pkg_append_() { 2426java-pkg_append_() {
2366 debug-print-function ${FUNCNAME} $* 2427 debug-print-function ${FUNCNAME} $*
2367 2428
2368 local var="${1}" value="${2}" 2429 local var="${1}" value="${2}"
2369 if [[ -z "${!var}" ]] ; then 2430 if [[ -z "${!var}" ]] ; then
2380 [[ -z ${haveit} ]] && export ${var}="${!var}:${value}" 2441 [[ -z ${haveit} ]] && export ${var}="${!var}:${value}"
2381 IFS=${oldIFS} 2442 IFS=${oldIFS}
2382 fi 2443 fi
2383} 2444}
2384 2445
2385# ------------------------------------------------------------------------------ 2446# @FUNCTION: java-pkg_expand_dir_
2386# @internal-function java-pkg_expand_dir_ 2447# @INTERNAL
2387# 2448# @DESCRIPTION:
2388# 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:
2389# @param $1 - file/directory to find parent directory for 2452# $1 - file/directory to find parent directory for
2453# @CODE
2390# @return - path to $1's parent directory 2454# @RETURN: path to $1's parent directory
2391# ------------------------------------------------------------------------------
2392java-pkg_expand_dir_() { 2455java-pkg_expand_dir_() {
2393 pushd "$(dirname "${1}")" >/dev/null 2>&1 2456 pushd "$(dirname "${1}")" >/dev/null 2>&1
2394 pwd 2457 pwd
2395 popd >/dev/null 2>&1 2458 popd >/dev/null 2>&1
2396} 2459}
2397 2460
2398# ------------------------------------------------------------------------------ 2461# @FUNCTION: java-pkg_func-exists
2399# @internal-function java-pkg_func-exists 2462# @INTERNAL
2400# 2463# @DESCRIPTION:
2401# Does the indicated function exist? 2464# Does the indicated function exist?
2402# 2465# @RETURN: 0 - function is declared, 1 - function is undeclared
2403# @return 0 - function is declared
2404# @return 1 - function is undeclared
2405# ------------------------------------------------------------------------------
2406java-pkg_func-exists() { 2466java-pkg_func-exists() {
2407 if [[ -n "$(declare -f ${1})" ]]; then 2467 declare -F ${1} > /dev/null
2408 return 0
2409 else
2410 return 1
2411 fi
2412} 2468}
2413 2469
2414# ------------------------------------------------------------------------------ 2470# @FUNCTION: java-pkg_setup-vm
2415# @internal-function java-pkg_setup-vm 2471# @INTERNAL
2416# 2472# @DESCRIPTION:
2417# Sets up the environment for a specific VM 2473# Sets up the environment for a specific VM
2418#
2419# ------------------------------------------------------------------------------
2420java-pkg_setup-vm() { 2474java-pkg_setup-vm() {
2421 debug-print-function ${FUNCNAME} $* 2475 debug-print-function ${FUNCNAME} $*
2422
2423 export LANG="C" LC_ALL="C"
2424 2476
2425 local vendor="$(java-pkg_get-vm-vendor)" 2477 local vendor="$(java-pkg_get-vm-vendor)"
2426 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
2427 addpredict "/dev/random" 2479 addpredict "/dev/random"
2428 elif [[ "${vendor}" == "ibm" ]]; then 2480 elif [[ "${vendor}" == "ibm" ]]; then
2429 addpredict "/proc/self/maps" 2481 addpredict "/proc/self/maps"
2430 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"
2431 elif [[ "${vendor}" == "jrockit" ]]; then 2490 elif [[ "${vendor}" == "jrockit" ]]; then
2432 addpredict "/proc/cpuinfo" 2491 addpredict "/proc/cpuinfo"
2433 fi 2492 fi
2434} 2493}
2435 2494
2436# ------------------------------------------------------------------------------ 2495# @FUNCTION: java-pkg_needs-vm
2437# @internal-function java-pkg_needs-vm 2496# @INTERNAL
2438# 2497# @DESCRIPTION:
2439# 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?
2440# 2500#
2441# @return 0 - Package depends on virtual/jdk 2501# @RETURN: 0 - Package depends on virtual/jdk; 1 - Package does not depend on virtual/jdk
2442# @return 1 - Package does not depend on virtual/jdk
2443# ------------------------------------------------------------------------------
2444java-pkg_needs-vm() { 2502java-pkg_needs-vm() {
2445 debug-print-function ${FUNCNAME} $* 2503 debug-print-function ${FUNCNAME} $*
2446 2504
2447 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
2448 return 0 2506 return 0
2449 fi 2507 fi
2450 2508
2509 [[ -n "${JAVA_PKG_WANT_BUILD_VM}" ]] && return 0
2510
2451 return 1 2511 return 1
2452} 2512}
2453 2513
2454# ------------------------------------------------------------------------------ 2514# @FUNCTION: java-pkg_get-current-vm
2455# @internal-function java-pkg_get-current-vm 2515# @INTERNAL
2456#
2457# @return - The current VM being used 2516# @RETURN - The current VM being used
2458# ------------------------------------------------------------------------------
2459java-pkg_get-current-vm() { 2517java-pkg_get-current-vm() {
2460 java-config -f 2518 java-config -f
2461} 2519}
2462 2520
2463# ------------------------------------------------------------------------------ 2521# @FUNCTION: java-pkg_get-vm-vendor
2464# @internal-function java-pkg_get-vm-vendor 2522# @INTERNAL
2465#
2466# @return - The vendor of the current VM 2523# @RETURN - The vendor of the current VM
2467# ------------------------------------------------------------------------------
2468java-pkg_get-vm-vendor() { 2524java-pkg_get-vm-vendor() {
2469 debug-print-function ${FUNCNAME} $* 2525 debug-print-function ${FUNCNAME} $*
2470 2526
2471 local vm="$(java-pkg_get-current-vm)" 2527 local vm="$(java-pkg_get-current-vm)"
2472 vm="${vm/-*/}" 2528 vm="${vm/-*/}"
2473 echo "${vm}" 2529 echo "${vm}"
2474} 2530}
2475 2531
2476# ------------------------------------------------------------------------------ 2532# @FUNCTION: java-pkg_get-vm-version
2477# @internal-function java-pkg_get-vm-version 2533# @INTERNAL
2478#
2479# @return - The version of the current VM 2534# @RETURN - The version of the current VM
2480# ------------------------------------------------------------------------------
2481java-pkg_get-vm-version() { 2535java-pkg_get-vm-version() {
2482 debug-print-function ${FUNCNAME} $* 2536 debug-print-function ${FUNCNAME} $*
2483 2537
2484 java-config -g PROVIDES_VERSION 2538 java-config -g PROVIDES_VERSION
2485} 2539}
2486 2540
2487# ------------------------------------------------------------------------------ 2541# @FUNCTION: java-pkg_build-vm-from-handle
2488# @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.
2489# 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:
2490# 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
2491# verify that the current VM is sufficient. 2576# verify that the current VM is sufficient.
2492# Setup the environment for the VM being used. 2577# Setup the environment for the VM being used.
2493# ------------------------------------------------------------------------------
2494java-pkg_switch-vm() { 2578java-pkg_switch-vm() {
2495 debug-print-function ${FUNCNAME} $* 2579 debug-print-function ${FUNCNAME} $*
2496 2580
2497 if java-pkg_needs-vm; then 2581 if java-pkg_needs-vm; then
2498 # Use the VM specified by JAVA_PKG_FORCE_VM 2582 # Use the VM specified by JAVA_PKG_FORCE_VM
2500 # 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...
2501 debug-print "JAVA_PKG_FORCE_VM used: ${JAVA_PKG_FORCE_VM}" 2585 debug-print "JAVA_PKG_FORCE_VM used: ${JAVA_PKG_FORCE_VM}"
2502 export GENTOO_VM="${JAVA_PKG_FORCE_VM}" 2586 export GENTOO_VM="${JAVA_PKG_FORCE_VM}"
2503 # if we're allowed to switch the vm... 2587 # if we're allowed to switch the vm...
2504 elif [[ "${JAVA_PKG_ALLOW_VM_CHANGE}" == "yes" ]]; then 2588 elif [[ "${JAVA_PKG_ALLOW_VM_CHANGE}" == "yes" ]]; then
2505 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
2506 if [[ -n ${JAVA_PKG_VNEED} ]]; then 2590 if [[ -n "${JAVA_PKG_WANT_BUILD_VM}" ]]; then
2507 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
2508 else 2608 else
2609 debug-print "depend-java-query: NV_DEPEND: ${JAVA_PKG_NV_DEPEND:-${DEPEND}}"
2509 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
2510 fi 2616 fi
2511 if [[ -z "${GENTOO_VM}" || "${GENTOO_VM}" == "None" ]]; then
2512 eerror "Unable to determine VM for building from dependencies:"
2513 echo "NV_DEPEND: ${JAVA_PKG_NV_DEPEND:-${DEPEND}}"
2514 echo "VNEED: ${JAVA_PKG_VNEED}"
2515 die "Failed to determine VM for building."
2516 else
2517 export GENTOO_VM 2617 export GENTOO_VM
2518 fi
2519 # otherwise just make sure the current VM is sufficient 2618 # otherwise just make sure the current VM is sufficient
2520 else 2619 else
2521 java-pkg_ensure-vm-version-sufficient 2620 java-pkg_ensure-vm-version-sufficient
2522 fi 2621 fi
2523 debug-print "Using: $(java-config -f)" 2622 debug-print "Using: $(java-config -f)"
2551 else 2650 else
2552 [[ -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!!!"
2553 fi 2652 fi
2554} 2653}
2555 2654
2556# ------------------------------------------------------------------------------ 2655# @FUNCTION: java-pkg_die
2557# @internal-function java-pkg_die 2656# @INTERNAL
2558# 2657# @DESCRIPTION:
2559# 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
2560# useful for debugging bugs on bugzilla. 2659# useful for debugging bugs on bugzilla.
2561# ------------------------------------------------------------------------------
2562#register_die_hook java-pkg_die 2660#register_die_hook java-pkg_die
2563if ! hasq java-pkg_die ${EBUILD_DEATH_HOOKS}; then 2661if ! has java-pkg_die ${EBUILD_DEATH_HOOKS}; then
2564 EBUILD_DEATH_HOOKS="${EBUILD_DEATH_HOOKS} java-pkg_die" 2662 EBUILD_DEATH_HOOKS="${EBUILD_DEATH_HOOKS} java-pkg_die"
2565fi 2663fi
2566 2664
2567java-pkg_die() { 2665java-pkg_die() {
2568 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
2569 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
2570 echo "JAVACFLAGS=\"${JAVACFLAGS}\" COMPILER=\"${GENTOO_COMPILER}\"" >&2 2668 echo "JAVACFLAGS=\"${JAVACFLAGS}\" COMPILER=\"${GENTOO_COMPILER}\"" >&2
2571 echo "and of course, the output of emerge --info" >&2 2669 echo "and of course, the output of emerge --info =${P}" >&2
2572} 2670}
2573 2671
2574 2672
2575# TODO document 2673# TODO document
2576# List jars in the source directory, ${S} 2674# List jars in the source directory, ${S}
2583 einfo "Classes" 2681 einfo "Classes"
2584 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},"
2585 fi 2683 fi
2586} 2684}
2587 2685
2588# ------------------------------------------------------------------------------ 2686# @FUNCTION: java-pkg_verify-classes
2589# @internal-function java-pkg_verify-classes 2687# @INTERNAL
2590# 2688# @DESCRIPTION:
2591# 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
2592# not. 2690# not.
2691# @CODE
2593# @param $1 (optional) - the file to check, otherwise checks whole ${D} 2692# $1 (optional) - the file to check, otherwise checks whole ${D}
2594# ------------------------------------------------------------------------------ 2693# @CODE
2595java-pkg_verify-classes() { 2694java-pkg_verify-classes() {
2596 #$(find ${D} -type f -name '*.jar' -o -name '*.class') 2695 #$(find ${D} -type f -name '*.jar' -o -name '*.class')
2597 2696
2598 local version_verify="/usr/bin/class-version-verify.py" 2697 local version_verify="/usr/bin/class-version-verify.py"
2599 2698
2627 eerror "See ${log} for more details." 2726 eerror "See ${log} for more details."
2628 die "Incorrect bytecode found" 2727 die "Incorrect bytecode found"
2629 fi 2728 fi
2630} 2729}
2631 2730
2632# ---------------------------------------------------------------------------- 2731# @FUNCTION: java-pkg_ensure-dep
2633# @internal-function java-pkg_ensure-dep 2732# @INTERNAL
2733# @DESCRIPTION:
2634# 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
2635# 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:
2636# @param $1 - empty - check both vars; "runtime" or "build" - check only 2739# $1 - empty - check both vars; "runtime" or "build" - check only
2637# RDEPEND, resp. DEPEND 2740# RDEPEND, resp. DEPEND
2638# @param $2 - Package name and slot. 2741# $2 - Package name and slot.
2639 2742# @CODE
2640java-pkg_ensure-dep() { 2743java-pkg_ensure-dep() {
2641 debug-print-function ${FUNCNAME} $* 2744 debug-print-function ${FUNCNAME} $*
2642 2745
2643 local limit_to="${1}" 2746 local limit_to="${1}"
2644 local target_pkg="${2}" 2747 local target_pkg="${2}"
2645 local dev_error="" 2748 local dev_error=""
2646 2749
2647 local stripped_pkg=$(echo "${target_pkg}" | sed \ 2750 # Transform into a regular expression to look for a matching package
2648 '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
2649 2771
2650 debug-print "Matching against: ${stripped_pkg}" 2772 debug-print "Matching against: ${stripped_pkg}"
2651 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
2652 if [[ ${limit_to} != runtime && ! ( "${DEPEND}" =~ "$stripped_pkg" ) ]]; then 2778 if [[ ${limit_to} != runtime && ! ( "${DEPEND}" =~ $stripped_pkg ) ]]; then
2653 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 "
2654 dev_error="${dev_error} declared in DEPEND." 2780 dev_error+="declared with a SLOT in DEPEND."
2655 if is-java-strict; then 2781# if is-java-strict; then
2656 eerror "${dev_error}"
2657 die "${dev_error}" 2782# die "${dev_error}"
2658 elif [[ ${BASH_SUBSHELL} = 0 ]]; then 2783# else
2659 eerror "${dev_error}" 2784 eqawarn "java-pkg_ensure-dep: ${dev_error}"
2660 elog "Because you have this package installed the package will" 2785# eerror "Because you have ${target_pkg} installed,"
2661 elog "build without problems, but please report this to" 2786# eerror "the package will build without problems, but please"
2662 elog "http://bugs.gentoo.org" 2787# eerror "report this to http://bugs.gentoo.org."
2663 fi 2788# fi
2664 fi 2789 elif [[ ${limit_to} != build && ! ( "${RDEPEND}${PDEPEND}" =~ ${stripped_pkg} ) ]]; then
2665
2666 if [[ ${limit_to} != build ]]; then
2667 if [[ ! ( ${RDEPEND} =~ "${stripped_pkg}" ) ]]; then
2668 if [[ ! ( ${PDEPEND} =~ "${stripped_pkg}" ) ]]; then
2669 dev_error="The ebuild is attempting to use ${target_pkg}," 2790 dev_error="The ebuild is attempting to use ${target_pkg}, which is not "
2670 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."
2671 dev_error="${dev_error} or PDEPEND."
2672 if is-java-strict; then 2792# if is-java-strict; then
2673 eerror "${dev_error}"
2674 die "${dev_error}" 2793# die "${dev_error}"
2675 elif [[ ${BASH_SUBSHELL} = 0 ]]; then 2794# else
2676 eerror "${dev_error}" 2795 eqawarn "java-pkg_ensure-dep: ${dev_error}"
2677 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"
2678 elog "if you don't have ${target_pkg} installed, so please report" 2797# eerror "if you don't have ${target_pkg} installed,"
2679 elog "this to http://bugs.gentoo.org" 2798# eerror "so please report this to http://bugs.gentoo.org."
2680 fi
2681 fi
2682 fi 2799# fi
2683 fi 2800 fi
2684} 2801}
2685
2686# ------------------------------------------------------------------------------
2687# @section-end internal
2688# ------------------------------------------------------------------------------
2689 2802
2690java-pkg_check-phase() { 2803java-pkg_check-phase() {
2691 local phase=${1} 2804 local phase=${1}
2692 local funcname=${FUNCNAME[1]} 2805 local funcname=${FUNCNAME[1]}
2693 if [[ ${EBUILD_PHASE} != ${phase} ]]; then 2806 if [[ ${EBUILD_PHASE} != ${phase} ]]; then
2703 java-pkg_announce-qa-violation "installing versioned jar '${jar}'" 2816 java-pkg_announce-qa-violation "installing versioned jar '${jar}'"
2704 fi 2817 fi
2705} 2818}
2706 2819
2707java-pkg_check-jikes() { 2820java-pkg_check-jikes() {
2708 if hasq jikes ${IUSE}; then 2821 if has jikes ${IUSE}; then
2709 java-pkg_announce-qa-violation "deprecated USE flag 'jikes' in IUSE" 2822 java-pkg_announce-qa-violation "deprecated USE flag 'jikes' in IUSE"
2710 fi 2823 fi
2711} 2824}
2712 2825
2713java-pkg_announce-qa-violation() { 2826java-pkg_announce-qa-violation() {
2728 2841
2729is-java-strict() { 2842is-java-strict() {
2730 [[ -n ${JAVA_PKG_STRICT} ]] 2843 [[ -n ${JAVA_PKG_STRICT} ]]
2731 return $? 2844 return $?
2732} 2845}
2733
2734EXPORT_FUNCTIONS src_prepare
2735
2736# ------------------------------------------------------------------------------
2737# @eclass-end
2738# ------------------------------------------------------------------------------

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

  ViewVC Help
Powered by ViewVC 1.1.20