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

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

  ViewVC Help
Powered by ViewVC 1.1.20