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

Legend:
Removed from v.1.33  
changed lines
  Added in v.1.155

  ViewVC Help
Powered by ViewVC 1.1.20