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

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

  ViewVC Help
Powered by ViewVC 1.1.20