/[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.15 Revision 1.113
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-2005, 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 9# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.113 2008/10/01 15:23:17 betelgeuse Exp $
10 10
11# ----------------------------------------------------------------------------- 11# -----------------------------------------------------------------------------
12# @eclass-begin 12# @eclass-begin
13# @eclass-shortdesc Java Utility eclass 13# @eclass-shortdesc Java Utility eclass
14# @eclass-maintainer java@gentoo.org 14# @eclass-maintainer java@gentoo.org
15# 15#
16# This eclass provides functionality which is used by 16# This eclass provides functionality which is used by
17# java-pkg.eclass and java-pkg-opt.eclass as well as from ebuilds. 17# java-pkg.eclass and java-pkg-opt.eclass as well as from ebuilds.
18# 18#
19# @warning 19# @warning
20# You probably don't want to inherit this directly from an ebuild. Instead, 20# You probably don't want to inherit this directly from an ebuild. Instead,
21# you should inherit java-ant for Ant-based Java packages, java-pkg for other 21# you should inherit java-ant for Ant-based Java packages, java-pkg for other
22# Java packages, or java-pkg-opt for packages that have optional Java support. 22# Java packages, or java-pkg-opt for packages that have optional Java support.
23# 23#
24# ----------------------------------------------------------------------------- 24# -----------------------------------------------------------------------------
25 25
26inherit eutils versionator multilib 26inherit eutils versionator multilib
27
28IUSE="elibc_FreeBSD"
27 29
28# ----------------------------------------------------------------------------- 30# -----------------------------------------------------------------------------
29# @section-begin variables 31# @section-begin variables
30# @section-title Variables 32# @section-title Variables
31# 33#
33# ----------------------------------------------------------------------------- 35# -----------------------------------------------------------------------------
34 36
35# Make sure we use java-config-2 37# Make sure we use java-config-2
36export WANT_JAVA_CONFIG="2" 38export WANT_JAVA_CONFIG="2"
37 39
38# TODO document 40# -----------------------------------------------------------------------------
41# @variable-external WANT_ANT_TASKS
42# @variable-default ""
43#
44# An $IFS separated list of ant tasks.
45# Ebuild can specify this variable before inheriting java-ant-2 eclass to
46# determine ANT_TASKS it needs. They will be automatically translated to
47# DEPEND variable and ANT_TASKS variable. JAVA_PKG_FORCE_ANT_TASKS can override
48# ANT_TASKS set by WANT_ANT_TASKS, but not the DEPEND due to caching.
49# Ebuilds that need to depend conditionally on certain tasks and specify them
50# differently for different eant calls can't use this simplified approach.
51# You also cannot specify version or anything else than ant-*.
52#
53# @example WANT_ANT_TASKS="ant-junit ant-trax"
54#
55# @seealso JAVA_PKG_FORCE_ANT_TASKS
56# -----------------------------------------------------------------------------
57#WANT_ANT_TASKS
58
59# -----------------------------------------------------------------------------
60# @variable-internal JAVA_PKG_PORTAGE_DEP
61#
62# The version of portage we need to function properly. Previously it was
63# portage with phase hooks support but now we use a version with proper env
64# saving.
65# -----------------------------------------------------------------------------
39JAVA_PKG_PORTAGE_DEP=">=sys-apps/portage-2.1_pre1" 66JAVA_PKG_PORTAGE_DEP=">=sys-apps/portage-2.1.2.7"
40 67
41# ----------------------------------------------------------------------------- 68# -----------------------------------------------------------------------------
42# @variable-internal JAVA_PKG_E_DEPEND 69# @variable-internal JAVA_PKG_E_DEPEND
43# 70#
44# This is a convience variable to be used from the other java eclasses. This is 71# This is a convience variable to be used from the other java eclasses. This is
45# the version of java-config we want to use. We also need a recent version 72# the version of java-config we want to use. Usually the latest stable version
46# portage, that includes phase hooks. 73# so that ebuilds can use new features without depending on specific versions.
47# ----------------------------------------------------------------------------- 74# -----------------------------------------------------------------------------
48JAVA_PKG_E_DEPEND=">=dev-java/java-config-2.0.19-r1 ${JAVA_PKG_PORTAGE_DEP}" 75JAVA_PKG_E_DEPEND=">=dev-java/java-config-2.0.33-r1 ${JAVA_PKG_PORTAGE_DEP}"
76hasq source ${JAVA_PKG_IUSE} && JAVA_PKG_E_DEPEND="${JAVA_PKG_E_DEPEND} source? ( app-arch/zip )"
49 77
50# ----------------------------------------------------------------------------- 78# -----------------------------------------------------------------------------
51# @variable-external JAVA_PKG_ALLOW_VM_CHANGE 79# @variable-external JAVA_PKG_ALLOW_VM_CHANGE
52# @variable-default yes 80# @variable-default yes
53# 81#
100# ----------------------------------------------------------------------------- 128# -----------------------------------------------------------------------------
101 129
102# ----------------------------------------------------------------------------- 130# -----------------------------------------------------------------------------
103# @variable-internal JAVA_PKG_COMPILER_DIR 131# @variable-internal JAVA_PKG_COMPILER_DIR
104# @default /usr/share/java-config-2/compiler 132# @default /usr/share/java-config-2/compiler
105# 133#
106# Directory where compiler settings are saved, without trailing slash. 134# Directory where compiler settings are saved, without trailing slash.
107# Probably shouldn't touch this variable. 135# Probably shouldn't touch this variable.
108# ----------------------------------------------------------------------------- 136# -----------------------------------------------------------------------------
109JAVA_PKG_COMPILER_DIR=${JAVA_PKG_COMPILER_DIR:="/usr/share/java-config-2/compiler"} 137JAVA_PKG_COMPILER_DIR=${JAVA_PKG_COMPILER_DIR:="/usr/share/java-config-2/compiler"}
110 138
120 148
121# ----------------------------------------------------------------------------- 149# -----------------------------------------------------------------------------
122# @variable-external JAVA_PKG_FORCE_COMPILER 150# @variable-external JAVA_PKG_FORCE_COMPILER
123# 151#
124# Explicitly set a list of compilers to use. This is normally read from 152# Explicitly set a list of compilers to use. This is normally read from
125# JAVA_PKG_COMPILERS_CONF. 153# JAVA_PKG_COMPILERS_CONF.
126# 154#
127# @note This should only be used internally or for testing. 155# @note This should only be used internally or for testing.
128# @example Use jikes and javac, in that order 156# @example Use jikes and javac, in that order
129# JAVA_PKG_FORCE_COMPILER="jikes javac" 157# JAVA_PKG_FORCE_COMPILER="jikes javac"
130# ----------------------------------------------------------------------------- 158# -----------------------------------------------------------------------------
131 159
160# -----------------------------------------------------------------------------
161# @variable-external JAVA_PKG_FORCE_ANT_TASKS
162#
163# An $IFS separated list of ant tasks. Can be set in environment before calling
164# emerge/ebuild to override variables set in ebuild, mainly for testing before
165# putting the resulting (WANT_)ANT_TASKS into ebuild. Affects only ANT_TASKS in
166# eant() call, not the dependencies specified in WANT_ANT_TASKS.
167#
168# @example JAVA_PKG_FORCE_ANT_TASKS="ant-junit ant-trax" \
169# ebuild foo.ebuild compile
170#
171# @seealso WANT_ANT_TASKS
172# -----------------------------------------------------------------------------
173
132# TODO document me 174# TODO document me
133JAVA_PKG_QA_VIOLATIONS=0 175JAVA_PKG_QA_VIOLATIONS=0
134 176
135# ----------------------------------------------------------------------------- 177# -----------------------------------------------------------------------------
136# @section-end variables 178# @section-end variables
143# 185#
144# These are used to install Java-related things, such as jars, Javadocs, JNI 186# These are used to install Java-related things, such as jars, Javadocs, JNI
145# libraries, etc. 187# libraries, etc.
146# ----------------------------------------------------------------------------- 188# -----------------------------------------------------------------------------
147 189
190# -----------------------------------------------------------------------------
191# @ebuild-function java-pkg_doexamples
192#
193# Installs given arguments to /usr/share/doc/${PF}/examples
194# If you give it only one parameter and it is a directory it will install
195# everything in that directory to the examples directory.
196#
197# @example
198# java-pkg_doexamples demo
199# java-pkg_doexamples demo/* examples/*
200#
201# @param --subdir - If the examples need a certain directory structure
202# @param $* - list of files to install
203# ------------------------------------------------------------------------------
204java-pkg_doexamples() {
205 debug-print-function ${FUNCNAME} $*
206
207 [[ ${#} -lt 1 ]] && die "At least one argument needed"
208
209 java-pkg_check-phase install
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}
148 230
149# ----------------------------------------------------------------------------- 231# -----------------------------------------------------------------------------
150# @ebuild-function java-pkg_dojar 232# @ebuild-function java-pkg_dojar
151# 233#
152# Installs any number of jars. 234# Installs any number of jars.
153# Jar's will be installed into /usr/share/${PN}(-${SLOT})/lib/ by default. 235# Jar's will be installed into /usr/share/${PN}(-${SLOT})/lib/ by default.
154# You can use java-pkg_jarinto to change this path. 236# You can use java-pkg_jarinto to change this path.
155# You should never install a jar with a package version in the filename. 237# You should never install a jar with a package version in the filename.
156# Instead, use java-pkg_newjar defined below. 238# Instead, use java-pkg_newjar defined below.
157# 239#
158# @example 240# @example
159# java-pkg_dojar dist/${PN}.jar dist/${PN}-core.jar 241# java-pkg_dojar dist/${PN}.jar dist/${PN}-core.jar
160# 242#
171 # Create JARDEST if it doesn't exist 253 # Create JARDEST if it doesn't exist
172 dodir ${JAVA_PKG_JARDEST} 254 dodir ${JAVA_PKG_JARDEST}
173 255
174 local jar 256 local jar
175 # for each jar 257 # for each jar
176 for jar in "$@"; do 258 for jar in "${@}"; do
177 local jar_basename=$(basename "${jar}") 259 local jar_basename=$(basename "${jar}")
178 260
179 java-pkg_check-versioned-jar ${jar_basename} 261 java-pkg_check-versioned-jar ${jar_basename}
180 262
181 # check if it exists 263 # check if it exists
182 if [[ -e "${jar}" ]] ; then 264 if [[ -e "${jar}" ]] ; then
265 # Don't overwrite if jar has already been installed with the same
266 # name
267 local dest="${D}${JAVA_PKG_JARDEST}/${jar_basename}"
268 if [[ -e "${dest}" ]]; then
269 ewarn "Overwriting ${dest}"
270 fi
271
183 # install it into JARDEST if it's a non-symlink 272 # install it into JARDEST if it's a non-symlink
184 if [[ ! -L "${jar}" ]] ; then 273 if [[ ! -L "${jar}" ]] ; then
274 #but first check class version when in strict mode.
275 is-java-strict && java-pkg_verify-classes "${jar}"
276
185 INSDESTTREE="${JAVA_PKG_JARDEST}" \ 277 INSDESTTREE="${JAVA_PKG_JARDEST}" \
186 doins "${jar}" || die "failed to install ${jar}" 278 doins "${jar}" || die "failed to install ${jar}"
187 java-pkg_append_ JAVA_PKG_CLASSPATH "${JAVA_PKG_JARDEST}/${jar_basename}" 279 java-pkg_append_ JAVA_PKG_CLASSPATH "${JAVA_PKG_JARDEST}/${jar_basename}"
188 debug-print "installed ${jar} to ${D}${JAVA_PKG_JARDEST}" 280 debug-print "installed ${jar} to ${D}${JAVA_PKG_JARDEST}"
189 # make a symlink to the original jar if it's symlink 281 # make a symlink to the original jar if it's symlink
199 done 291 done
200 292
201 java-pkg_do_write_ 293 java-pkg_do_write_
202} 294}
203 295
296# ------------------------------------------------------------------------------
297# @internal-function depend-java-query
298#
299# Wrapper for the depend-java-query binary to enable passing USE in env.
300# Using env variables keeps this eclass working with java-config versions that
301# do not handle use flags.
302# ------------------------------------------------------------------------------
204 303
304depend-java-query() {
305 # Used to have a which call here but it caused endless loops for some people
306 # that had some weird bashrc voodoo for which.
307 USE="${USE}" /usr/bin/depend-java-query "${@}"
308}
205 309
206# ------------------------------------------------------------------------------ 310# ------------------------------------------------------------------------------
207# @ebuild-function java-pkg_regjar 311# @ebuild-function java-pkg_regjar
208# 312#
209# Records an already installed jar in the package.env 313# Records an already installed jar in the package.env
222# will not work, because: 326# will not work, because:
223# * the `for jar in "$@"` can't expand the path to jar file names, as they 327# * the `for jar in "$@"` can't expand the path to jar file names, as they
224# don't exist yet 328# don't exist yet
225# * all `if ...` inside for will fail - the file '/opt/my-java/lib/*.jar' 329# * all `if ...` inside for will fail - the file '/opt/my-java/lib/*.jar'
226# doesn't exist 330# doesn't exist
227# 331#
228# you have to use it as: 332# you have to use it as:
229# 333#
230# java-pkg_regjar ${D}/opt/my-java/lib/*.jar 334# java-pkg_regjar ${D}/opt/my-java/lib/*.jar
231# 335#
232# @param $@ - jars to record 336# @param $@ - jars to record
240 [[ ${#} -lt 1 ]] && die "at least one argument needed" 344 [[ ${#} -lt 1 ]] && die "at least one argument needed"
241 345
242 java-pkg_init_paths_ 346 java-pkg_init_paths_
243 347
244 local jar jar_dir jar_file 348 local jar jar_dir jar_file
245 for jar in "$@"; do 349 for jar in "${@}"; do
246 # TODO use java-pkg_check-versioned-jar 350 # TODO use java-pkg_check-versioned-jar
247 if [[ -e "${jar}" ]]; then 351 if [[ -e "${jar}" || -e "${D}${jar}" ]]; then
352 [[ -d "${jar}" || -d "${D}${jar}" ]] \
353 && die "Called ${FUNCNAME} on a directory $*"
354
355 #check that class version correct when in strict mode
356 is-java-strict && java-pkg_verify-classes "${jar}"
357
248 # nelchael: we should strip ${D} in this case too, here's why: 358 # nelchael: we should strip ${D} in this case too, here's why:
249 # imagine such call: 359 # imagine such call:
250 # java-pkg_regjar ${D}/opt/java/*.jar 360 # java-pkg_regjar ${D}/opt/java/*.jar
251 # such call will fall into this case (-e ${jar}) and will 361 # such call will fall into this case (-e ${jar}) and will
252 # record paths with ${D} in package.env 362 # record paths with ${D} in package.env
253 java-pkg_append_ JAVA_PKG_CLASSPATH "${jar#${D}}" 363 java-pkg_append_ JAVA_PKG_CLASSPATH "${jar#${D}}"
254 elif [[ -e "${D}${jar}" ]]; then
255 java-pkg_append_ JAVA_PKG_CLASSPATH "${jar#${D}}"
256 else 364 else
365 if [[ ${jar} = *\** ]]; then
366 eerror "The argument ${jar} to ${FUNCNAME}"
367 eerror "has * in it. If you want it to glob in"
368 eerror '${D} add ${D} to the argument.'
369 fi
257 die "${jar} does not exist" 370 die "${jar} does not exist"
258 fi 371 fi
259 done 372 done
260 373
261 java-pkg_do_write_ 374 java-pkg_do_write_
262} 375}
263
264 376
265# ------------------------------------------------------------------------------ 377# ------------------------------------------------------------------------------
266# @ebuild-function java-pkg_newjar 378# @ebuild-function java-pkg_newjar
267# 379#
268# Installs a jar with a new name 380# Installs a jar with a new name
279 local original_jar="${1}" 391 local original_jar="${1}"
280 local new_jar="${2:-${PN}.jar}" 392 local new_jar="${2:-${PN}.jar}"
281 local new_jar_dest="${T}/${new_jar}" 393 local new_jar_dest="${T}/${new_jar}"
282 394
283 [[ -z ${original_jar} ]] && die "Must specify a jar to install" 395 [[ -z ${original_jar} ]] && die "Must specify a jar to install"
284 [[ ! -f ${original_jar} ]] && die "${original_jar} does not exist!" 396 [[ ! -f ${original_jar} ]] \
397 && die "${original_jar} does not exist or is not a file!"
285 398
286 rm -f "${new_jar_dest}" || die "Failed to remove ${new_jar_dest}" 399 rm -f "${new_jar_dest}" || die "Failed to remove ${new_jar_dest}"
287 cp "${original_jar}" "${new_jar_dest}" \ 400 cp "${original_jar}" "${new_jar_dest}" \
288 || die "Failed to copy ${original_jar} to ${new_jar_dest}" 401 || die "Failed to copy ${original_jar} to ${new_jar_dest}"
289 java-pkg_dojar "${new_jar_dest}" 402 java-pkg_dojar "${new_jar_dest}"
290} 403}
291 404
292
293# ------------------------------------------------------------------------------ 405# ------------------------------------------------------------------------------
294# @ebuild-function java-pkg_addcp 406# @ebuild-function java-pkg_addcp
295# 407#
296# Add something to the package's classpath. For jars, you should use dojar, 408# Add something to the package's classpath. For jars, you should use dojar,
297# newjar, or regjar. This is typically used to add directories to the classpath. 409# newjar, or regjar. This is typically used to add directories to the classpath.
302java-pkg_addcp() { 414java-pkg_addcp() {
303 java-pkg_append_ JAVA_PKG_CLASSPATH "${@}" 415 java-pkg_append_ JAVA_PKG_CLASSPATH "${@}"
304 java-pkg_do_write_ 416 java-pkg_do_write_
305} 417}
306 418
307
308# ------------------------------------------------------------------------------ 419# ------------------------------------------------------------------------------
309# @ebuild-function java-pkg_doso 420# @ebuild-function java-pkg_doso
310# 421#
311# Installs any number of JNI libraries 422# Installs any number of JNI libraries
312# They will be installed into /usr/lib by default, but java-pkg_sointo 423# They will be installed into /usr/lib by default, but java-pkg_sointo
313# can be used change this path 424# can be used change this path
314# 425#
315# Example: 426# Example:
334 if [[ -e "${lib}" ]] ; then 445 if [[ -e "${lib}" ]] ; then
335 # install if it isn't a symlink 446 # install if it isn't a symlink
336 if [[ ! -L "${lib}" ]] ; then 447 if [[ ! -L "${lib}" ]] ; then
337 INSDESTTREE="${JAVA_PKG_LIBDEST}" \ 448 INSDESTTREE="${JAVA_PKG_LIBDEST}" \
338 INSOPTIONS="${LIBOPTIONS}" \ 449 INSOPTIONS="${LIBOPTIONS}" \
339 doins "${lib}" || "failed to install ${lib}" 450 doins "${lib}" || die "failed to install ${lib}"
340 java-pkg_append_ JAVA_PKG_LIBRARY "${JAVA_PKG_LIBDEST}" 451 java-pkg_append_ JAVA_PKG_LIBRARY "${JAVA_PKG_LIBDEST}"
341 debug-print "Installing ${lib} to ${JAVA_PKG_LIBDEST}" 452 debug-print "Installing ${lib} to ${JAVA_PKG_LIBDEST}"
342 # otherwise make a symlink to the symlink's origin 453 # otherwise make a symlink to the symlink's origin
343 else 454 else
344 # TODO use dosym 455 # TODO use dosym
456 ln -s "$(readlink "${lib}")" \
345 ln -s "$(readlink "${lib}")" "${D}${JAVA_PKG_LIBDEST}/$(basename "${lib}")" 457 "${D}${JAVA_PKG_LIBDEST}/$(basename "${lib}")"
346 debug-print "${lib} is a symlink, linking accordanly" 458 debug-print "${lib} is a symlink, linking accordanly"
347 fi 459 fi
348 # otherwise die 460 # otherwise die
349 else 461 else
350 die "${lib} does not exist" 462 die "${lib} does not exist"
370 java-pkg_check-phase install 482 java-pkg_check-phase install
371 483
372 [[ ${#} -lt 1 ]] && "at least one argument needed" 484 [[ ${#} -lt 1 ]] && "at least one argument needed"
373 485
374 java-pkg_init_paths_ 486 java-pkg_init_paths_
375 487
376 local lib target_dir 488 local lib target_dir
377 for lib in "$@" ; do 489 for lib in "$@" ; do
378 # Check the absolute path of the lib 490 # Check the absolute path of the lib
379 if [[ -e "${lib}" ]] ; then 491 if [[ -e "${lib}" ]] ; then
380 target_dir="$(java-pkg_expand_dir_ ${lib})" 492 target_dir="$(java-pkg_expand_dir_ ${lib})"
428# ------------------------------------------------------------------------------ 540# ------------------------------------------------------------------------------
429java-pkg_dohtml() { 541java-pkg_dohtml() {
430 debug-print-function ${FUNCNAME} $* 542 debug-print-function ${FUNCNAME} $*
431 543
432 [[ ${#} -lt 1 ]] && die "At least one argument required for ${FUNCNAME}" 544 [[ ${#} -lt 1 ]] && die "At least one argument required for ${FUNCNAME}"
433 # TODO-nichoj find out what exactly -f package-list does 545
546 # from /usr/lib/portage/bin/dohtml -h
547 # -f Set list of allowed extensionless file names.
434 dohtml -f package-list "$@" 548 dohtml -f package-list "$@"
549
435 # this probably shouldn't be here but it provides 550 # this probably shouldn't be here but it provides
436 # a reasonable way to catch # docs for all of the 551 # a reasonable way to catch # docs for all of the
437 # old ebuilds. 552 # old ebuilds.
438 java-pkg_recordjavadoc 553 java-pkg_recordjavadoc
439} 554}
440 555
441# TODO document 556# ------------------------------------------------------------------------------
557# @ebuild-function java-pkg_dojavadoc
558#
559# Installs javadoc documentation. This should be controlled by the doc use flag.
560#
561# @param $1: optional --symlink creates to symlink like this for html
562# documentation bundles.
563# @param $2: - The javadoc root directory.
564#
565# @example:
566# java-pkg_dojavadoc docs/api
567# java-pkg_dojavadoc --symlink apidocs docs/api
568#
569# ------------------------------------------------------------------------------
442java-pkg_dojavadoc() { 570java-pkg_dojavadoc() {
571 debug-print-function ${FUNCNAME} $*
572
573 # For html documentation bundles that link to Javadoc
574 local symlink
575 if [[ ${1} = --symlink ]]; then
576 symlink=${2}
577 shift 2
578 fi
579
443 local dir="$1" 580 local dir="$1"
581 local dest=/usr/share/doc/${PF}/html
582
583 # QA checks
444 584
445 java-pkg_check-phase install 585 java-pkg_check-phase install
446 586
447 [[ -z "${dir}" ]] && die "Must specify a directory!" 587 [[ -z "${dir}" ]] && die "Must specify a directory!"
448 [[ ! -d "${dir}" ]] && die "${dir} does not exist, or isn't a directory!" 588 [[ ! -d "${dir}" ]] && die "${dir} does not exist, or isn't a directory!"
589 if [[ ! -e "${dir}/index.html" ]]; then
590 local msg="No index.html in javadoc directory"
591 ewarn "${msg}"
592 is-java-strict && die "${msg}"
593 fi
594
595 if [[ -e ${D}/${dest}/api ]]; then
596 eerror "${dest} already exists. Will not overwrite."
597 die "${dest}"
598 fi
599
600 # Renaming to match our directory layout
449 601
450 local dir_to_install="${dir}" 602 local dir_to_install="${dir}"
451 if [[ "$(basename "${dir}")" != "api" ]]; then 603 if [[ "$(basename "${dir}")" != "api" ]]; then
452 dir_to_install="${T}/api" 604 dir_to_install="${T}/api"
453 # TODO use doins 605 # TODO use doins
454 cp -r "${dir}" "${dir_to_install}" || die "cp failed" 606 cp -r "${dir}" "${dir_to_install}" || die "cp failed"
455 fi 607 fi
456 608
609 # Actual installation
610
457 java-pkg_dohtml -r ${dir_to_install} 611 java-pkg_dohtml -r "${dir_to_install}"
612
613 # Let's make a symlink to the directory we have everything else under
614 dosym ${dest}/api "${JAVA_PKG_SHAREPATH}/api" || die
615
616 if [[ ${symlink} ]]; then
617 debug-print "symlinking ${dest}/{api,${symlink}}"
618 dosym ${dest}/{api,${symlink}} || die
619 fi
458} 620}
459 621
460# ------------------------------------------------------------------------------ 622# ------------------------------------------------------------------------------
461# @ebuild-function java-pkg_dosrc 623# @ebuild-function java-pkg_dosrc
462# 624#
463# Installs a zip containing the source for a package, so it can used in 625# Installs a zip containing the source for a package, so it can used in
464# from IDEs like eclipse and netbeans. 626# from IDEs like eclipse and netbeans.
465# 627#
466# Ebuild needs to DEPEND on app-arch/zip to use this. 628# Ebuild needs to DEPEND on app-arch/zip to use this.
467# 629#
468# It also should be controlled by USE=source. 630# It also should be controlled by USE=source.
469# 631#
470# @example: 632# @example:
471# java-pkg_dosrc src/* 633# java-pkg_dosrc src/*
472# 634#
473# ------------------------------------------------------------------------------ 635# ------------------------------------------------------------------------------
474# TODO change so it the arguments it takes are the base directories containing 636# TODO change so it the arguments it takes are the base directories containing
475# source -nichoj 637# source -nichoj
476# TODO should we be able to handle multiple calls to dosrc? -nichoj 638# TODO should we be able to handle multiple calls to dosrc? -nichoj
477# TODO maybe we can take an existing zip/jar? -nichoj 639# TODO maybe we can take an existing zip/jar? -nichoj
478# FIXME apparently this fails if you give it an empty directories 640# FIXME apparently this fails if you give it an empty directories
479java-pkg_dosrc() { 641java-pkg_dosrc() {
480 debug-print-function ${FUNCNAME} $* 642 debug-print-function ${FUNCNAME} $*
481 643
482 [ ${#} -lt 1 ] && die "At least one argument needed" 644 [ ${#} -lt 1 ] && die "At least one argument needed"
483 if ! hasq source ${IUSE}; then
484 echo "Java QA Notice: ${FUNCNAME} called without source in IUSE"
485 fi
486 645
487 java-pkg_check-phase install 646 java-pkg_check-phase install
488 647
489 [[ ${#} -lt 1 ]] && die "At least one argument needed" 648 [[ ${#} -lt 1 ]] && die "At least one argument needed"
649
650 if ! [[ ${DEPEND} = *app-arch/zip* ]]; then
651 local msg="${FUNCNAME} called without app-arch/zip in DEPEND"
652 java-pkg_announce-qa-violation ${msg}
653 fi
490 654
491 java-pkg_init_paths_ 655 java-pkg_init_paths_
492 656
493 local zip_name="${PN}-src.zip" 657 local zip_name="${PN}-src.zip"
494 local zip_path="${T}/${zip_name}" 658 local zip_path="${T}/${zip_name}"
495 local dir 659 local dir
496 for dir in ${@}; do 660 for dir in "${@}"; do
497 local dir_parent=$(dirname "${dir}") 661 local dir_parent=$(dirname "${dir}")
498 local dir_name=$(basename "${dir}") 662 local dir_name=$(basename "${dir}")
499 pushd ${dir_parent} > /dev/null || die "problem entering ${dir_parent}" 663 pushd ${dir_parent} > /dev/null || die "problem entering ${dir_parent}"
500 zip -q -r ${zip_path} ${dir_name} -i '*.java' 664 zip -q -r ${zip_path} ${dir_name} -i '*.java'
501 local result=$? 665 local result=$?
518# @ebuild-function java-pkg_dolauncher 682# @ebuild-function java-pkg_dolauncher
519# 683#
520# Make a wrapper script to lauch/start this package 684# Make a wrapper script to lauch/start this package
521# If necessary, the wrapper will switch to the appropriate VM. 685# If necessary, the wrapper will switch to the appropriate VM.
522# 686#
687# Can be called without parameters if the package installs only one jar
688# that has the Main-class attribute set. The wrapper will be named ${PN}.
689#
523# @param $1 - filename of launcher to create 690# @param $1 - filename of launcher to create
524# @param $2 - options, as follows: 691# @param $2 - options, as follows:
525# --main the.main.class.too.start 692# --main the.main.class.too.start
526# --jar /the/jar/too/launch.jar 693# --jar /the/jar/too/launch.jar or just <name>.jar
527# --java_args 'Extra arguments to pass too jave' 694# --java_args 'Extra arguments to pass to java'
528# --pkg_args 'extra arguments too pass too the package' 695# --pkg_args 'Extra arguments to pass to the package'
529# --pwd 696# --pwd Directory the launcher changes to before executing java
530# -into 697# -into Directory to install the launcher to, instead of /usr/bin
531# -pre 698# -pre Prepend contents of this file to the launcher
532# ------------------------------------------------------------------------------ 699# ------------------------------------------------------------------------------
533java-pkg_dolauncher() { 700java-pkg_dolauncher() {
534 debug-print-function ${FUNCNAME} $* 701 debug-print-function ${FUNCNAME} $*
535 702
536 java-pkg_check-phase install 703 java-pkg_check-phase install
537
538 [[ ${#} -lt 1 ]] && die "Need at least one argument"
539
540 java-pkg_init_paths_ 704 java-pkg_init_paths_
541 705
706 if [[ ${#} = 0 ]]; then
707 local name="${PN}"
708 else
542 local name="${1}" 709 local name="${1}"
710 shift
711 fi
712
543 # TODO rename to launcher 713 # TODO rename to launcher
544 local target="${T}/${name}" 714 local target="${T}/${name}"
715 local var_tmp="${T}/launcher_variables_tmp"
545 local target_dir pre 716 local target_dir pre
546 shift
547 717
548 echo "#!/bin/bash" > "${target}" 718 # Process the other the rest of the arguments
549 while [[ -n "${1}" && -n "${2}" ]]; do 719 while [[ -n "${1}" && -n "${2}" ]]; do
550 local var=${1} value=${2} 720 local var="${1}" value="${2}"
551 if [[ "${var:0:2}" == "--" ]]; then 721 if [[ "${var:0:2}" == "--" ]]; then
722 local var=${var:2}
552 echo "gjl_${var:2}=\"${value}\"" >> "${target}" 723 echo "gjl_${var}=\"${value}\"" >> "${var_tmp}"
724 local gjl_${var}="${value}"
553 elif [[ "${var}" == "-into" ]]; then 725 elif [[ "${var}" == "-into" ]]; then
554 target_dir="${value}" 726 target_dir="${value}"
555 elif [[ "${var}" == "-pre" ]]; then 727 elif [[ "${var}" == "-pre" ]]; then
556 pre="${value}" 728 pre="${value}"
557 fi 729 fi
558 shift 2 730 shift 2
559 done 731 done
732
733 # Test if no --jar and --main arguments were given and
734 # in that case check if the package only installs one jar
735 # and use that jar.
736 if [[ -z "${gjl_jar}" && -z "${gjl_main}" ]]; then
737 local cp="${JAVA_PKG_CLASSPATH}"
738 if [[ "${cp/:}" = "${cp}" && "${cp%.jar}" != "${cp}" ]]; then
739 echo "gjl_jar=\"${JAVA_PKG_CLASSPATH}\"" >> "${var_tmp}"
740 else
741 local msg="Not enough information to create a launcher given."
742 msg="${msg} Please give --jar or --main argument to ${FUNCNAME}."
743 die "${msg}"
744 fi
745 fi
746
747 # Write the actual script
748 echo "#!/bin/bash" > "${target}"
749 if [[ -n "${pre}" ]]; then
750 if [[ -f "${pre}" ]]; then
751 cat "${pre}" >> "${target}"
752 else
753 die "-pre specified file '${pre}' does not exist"
754 fi
755 fi
560 echo "gjl_package=${JAVA_PKG_NAME}" >> "${target}" 756 echo "gjl_package=${JAVA_PKG_NAME}" >> "${target}"
561 [[ -n "${pre}" ]] && [[ -f "${pre}" ]] && cat "${pre}" >> "${target}" 757 cat "${var_tmp}" >> "${target}"
758 rm -f "${var_tmp}"
562 echo "source /usr/share/java-config-2/launcher/launcher.bash" >> "${target}" 759 echo "source /usr/share/java-config-2/launcher/launcher.bash" >> "${target}"
563 760
564 if [[ -n "${into}" ]]; then 761 if [[ -n "${target_dir}" ]]; then
565 DESTTREE="${target_dir}" dobin "${target}" 762 DESTTREE="${target_dir}" dobin "${target}"
566 local ret=$? 763 local ret=$?
567 return ${ret} 764 return ${ret}
568 else 765 else
569 dobin "${target}" 766 dobin "${target}"
597 echo "dowar: warning, skipping directory ${war}" 794 echo "dowar: warning, skipping directory ${war}"
598 continue 795 continue
599 else 796 else
600 warpath="${war}" 797 warpath="${war}"
601 fi 798 fi
602 799
603 # Install those files like you mean it 800 # Install those files like you mean it
604 INSOPTIONS="-m 0644" \ 801 INSOPTIONS="-m 0644" \
605 INSDESTTREE=${JAVA_PKG_WARDEST} \ 802 INSDESTTREE=${JAVA_PKG_WARDEST} \
606 doins ${warpath} 803 doins ${warpath}
607 done 804 done
642# @ebuild-function java-pkg_jar-from 839# @ebuild-function java-pkg_jar-from
643# 840#
644# Makes a symlink to a jar from a certain package 841# Makes a symlink to a jar from a certain package
645# A lot of java packages include dependencies in a lib/ directory 842# A lot of java packages include dependencies in a lib/ directory
646# You can use this function to replace these bundled dependencies. 843# You can use this function to replace these bundled dependencies.
844# The dependency is recorded into package.env DEPEND line, unless "--build-only"
845# is passed as the very first argument, for jars that have to be present only
846# at build time and are not needed on runtime (junit testing etc).
647# 847#
648# Example: get all jars from xerces slot 2 848# Example: get all jars from xerces slot 2
649# java-pkg_jar-from xerces-2 849# java-pkg_jar-from xerces-2
650# Example: get a specific jar from xerces slot 2 850# Example: get a specific jar from xerces slot 2
651# java-pkg_jar-from xerces-2 xml-apis.jar 851# java-pkg_jar-from xerces-2 xml-apis.jar
652# Example get a specific jar from xerces slot 2, and name it diffrently 852# Example: get a specific jar from xerces slot 2, and name it diffrently
653# java-pkg_jar-from xerces-2 xml-apis.jar xml.jar 853# java-pkg_jar-from xerces-2 xml-apis.jar xml.jar
854# Example: get junit.jar which is needed only for building
855# java-pkg_jar-from --build-only junit junit.jar
654# 856#
655# @param $1 - Package to get jars from. 857# @param $opt
858# --build-only - makes the jar(s) not added into package.env DEPEND line.
859# (assumed automatically when called inside src_test)
860# --with-dependencies - get jars also from requested package's dependencies
861# transitively.
862# --virtual - Packages passed to this function are to be handled as virtuals
863# and will not have individual jar dependencies recorded.
864# --into $dir - symlink jar(s) into $dir (must exist) instead of .
865# @param $1 - Package to get jars from, or comma-separated list of packages in
866# case other parameters are not used.
656# @param $2 - jar from package. If not specified, all jars will be used. 867# @param $2 - jar from package. If not specified, all jars will be used.
657# @param $3 - When a single jar is specified, destination filename of the 868# @param $3 - When a single jar is specified, destination filename of the
658# symlink. Defaults to the name of the jar. 869# symlink. Defaults to the name of the jar.
659# ------------------------------------------------------------------------------ 870# ------------------------------------------------------------------------------
660# TODO could probably be cleaned up a little 871# TODO could probably be cleaned up a little
661java-pkg_jar-from() { 872java-pkg_jar-from() {
662 debug-print-function ${FUNCNAME} $* 873 debug-print-function ${FUNCNAME} $*
663 874
875 local build_only=""
876 local destdir="."
877 local deep=""
878 local virtual=""
879
880 [[ "${EBUILD_PHASE}" == "test" ]] && build_only="build"
881
882 while [[ "${1}" == --* ]]; do
883 if [[ "${1}" = "--build-only" ]]; then
884 build_only="build"
885 elif [[ "${1}" = "--with-dependencies" ]]; then
886 deep="--with-dependencies"
887 elif [[ "${1}" = "--virtual" ]]; then
888 virtual="true"
889 elif [[ "${1}" = "--into" ]]; then
890 destdir="${2}"
891 shift
892 else
893 die "java-pkg_jar-from called with unknown parameter: ${1}"
894 fi
895 shift
896 done
897
664 local target_pkg="${1}" target_jar="${2}" destjar="${3}" 898 local target_pkg="${1}" target_jar="${2}" destjar="${3}"
665 899
666 [[ -z ${target_pkg} ]] && die "Must specify a package" 900 [[ -z ${target_pkg} ]] && die "Must specify a package"
901
902 if [[ "${EAPI}" == "1" ]]; then
903 target_pkg="${target_pkg//:/-}"
904 fi
667 905
668 # default destjar to the target jar 906 # default destjar to the target jar
669 [[ -z "${destjar}" ]] && destjar="${target_jar}" 907 [[ -z "${destjar}" ]] && destjar="${target_jar}"
670 908
909 local error_msg="There was a problem getting the classpath for ${target_pkg}."
910 local classpath
671 local classpath="$(java-config --classpath=${target_pkg})" 911 classpath="$(java-config ${deep} --classpath=${target_pkg})"
672 [[ $? != 0 ]] && die "There was a problem getting the classpath for ${target_pkg}" 912 [[ $? != 0 ]] && die ${error_msg}
913
914 # When we have commas this functions is called to bring jars from multiple
915 # packages. This affects recording of dependencencies performed later
916 # which expects one package only, so we do it here.
917 if [[ ${target_pkg} = *,* ]]; then
918 for pkg in ${target_pkg//,/ }; do
919 java-pkg_ensure-dep "${build_only}" "${pkg}"
920 [[ -z "${build_only}" ]] && java-pkg_record-jar_ "${pkg}"
921 done
922 # setting this disables further record-jar_ calls later
923 build_only="build"
924 else
925 java-pkg_ensure-dep "${build_only}" "${target_pkg}"
926 fi
927
928 # Record the entire virtual as a dependency so that
929 # no jars are missed.
930 if [[ -z "${build_only}" && -n "${virtual}" ]]; then
931 java-pkg_record-jar_ "${target_pkg}"
932 # setting this disables further record-jars_ calls later
933 build_only="build"
934 fi
935
936 pushd ${destdir} > /dev/null \
937 || die "failed to change directory to ${destdir}"
673 938
674 local jar 939 local jar
675 for jar in ${classpath//:/ }; do 940 for jar in ${classpath//:/ }; do
676 local jar_name=$(basename "${jar}") 941 local jar_name=$(basename "${jar}")
677 if [[ ! -f "${jar}" ]] ; then 942 if [[ ! -f "${jar}" ]] ; then
681 # If no specific target jar was indicated, link it 946 # If no specific target jar was indicated, link it
682 if [[ -z "${target_jar}" ]] ; then 947 if [[ -z "${target_jar}" ]] ; then
683 [[ -f "${target_jar}" ]] && rm "${target_jar}" 948 [[ -f "${target_jar}" ]] && rm "${target_jar}"
684 ln -snf "${jar}" \ 949 ln -snf "${jar}" \
685 || die "Failed to make symlink from ${jar} to ${jar_name}" 950 || die "Failed to make symlink from ${jar} to ${jar_name}"
686 java-pkg_record-jar_ "${target_pkg}" "${jar}" 951 [[ -z "${build_only}" ]] && java-pkg_record-jar_ "${target_pkg}" "${jar}"
687 # otherwise, if the current jar is the target jar, link it 952 # otherwise, if the current jar is the target jar, link it
688 elif [[ "${jar_name}" == "${target_jar}" ]] ; then 953 elif [[ "${jar_name}" == "${target_jar}" ]] ; then
689 [[ -f "${destjar}" ]] && rm "${destjar}" 954 [[ -f "${destjar}" ]] && rm "${destjar}"
690 ln -snf "${jar}" "${destjar}" \ 955 ln -snf "${jar}" "${destjar}" \
691 || die "Failed to make symlink from ${jar} to ${destjar}" 956 || die "Failed to make symlink from ${jar} to ${destjar}"
692 java-pkg_record-jar_ "${target_pkg}" "${jar}" 957 [[ -z "${build_only}" ]] && java-pkg_record-jar_ "${target_pkg}" "${jar}"
958 popd > /dev/null
693 return 0 959 return 0
694 fi 960 fi
695 done 961 done
962 popd > /dev/null
696 # if no target was specified, we're ok 963 # if no target was specified, we're ok
697 if [[ -z "${target_jar}" ]] ; then 964 if [[ -z "${target_jar}" ]] ; then
698 return 0 965 return 0
699 # otherwise, die bitterly 966 # otherwise, die bitterly
700 else 967 else
714# ------------------------------------------------------------------------------ 981# ------------------------------------------------------------------------------
715# @ebuild-function java-pkg_getjars 982# @ebuild-function java-pkg_getjars
716# 983#
717# Get the classpath provided by any number of packages 984# Get the classpath provided by any number of packages
718# Among other things, this can be passed to 'javac -classpath' or 'ant -lib'. 985# Among other things, this can be passed to 'javac -classpath' or 'ant -lib'.
986# The providing packages are recorded as dependencies into package.env DEPEND
987# line, unless "--build-only" is passed as the very first argument, for jars
988# that have to be present only at build time and are not needed on runtime
989# (junit testing etc).
719# 990#
720# Example: Get the classpath for xerces-2, 991# Example: Get the classpath for xerces-2 and xalan,
721# java-pkg_getjars xerces-2 xalan 992# java-pkg_getjars xerces-2,xalan
722# Example Return: 993# Example Return:
723# /usr/share/xerces-2/lib/xml-apis.jar:/usr/share/xerces-2/lib/xmlParserAPIs.jar:/usr/share/xalan/lib/xalan.jar 994# /usr/share/xerces-2/lib/xml-apis.jar:/usr/share/xerces-2/lib/xmlParserAPIs.jar:/usr/share/xalan/lib/xalan.jar
724# 995#
996# @param $opt
997# --build-only - makes the jar(s) not added into package.env DEPEND line.
998# (assumed automatically when called inside src_test)
999# --with-dependencies - get jars also from requested package's dependencies
1000# transitively.
725# @param $@ - list of packages to get jars from 1001# @param $1 - list of packages to get jars from
1002# (passed to java-config --classpath)
726# ------------------------------------------------------------------------------ 1003# ------------------------------------------------------------------------------
727java-pkg_getjars() { 1004java-pkg_getjars() {
728 debug-print-function ${FUNCNAME} $* 1005 debug-print-function ${FUNCNAME} $*
729 1006
730 [[ ${#} -lt 1 ]] && die "At least one argument needed" 1007 local build_only=""
1008 local deep=""
731 1009
732 # NOTE could probably just pass $@ to java-config --classpath. and return it 1010 [[ "${EBUILD_PHASE}" == "test" ]] && build_only="build"
733 local classpath pkg 1011
734 for pkg in ${@//,/ }; do 1012 while [[ "${1}" == --* ]]; do
735 #for pkg in $(echo "$@" | tr ',' ' '); do 1013 if [[ "${1}" = "--build-only" ]]; then
736 jars="$(java-config --classpath=${pkg})" 1014 build_only="build"
737 debug-print "${pkg}:${jars}" 1015 elif [[ "${1}" = "--with-dependencies" ]]; then
738 # TODO should we ensure jars exist? 1016 deep="--with-dependencies"
739 if [[ -z "${classpath}" ]]; then
740 classpath="${jars}"
741 else 1017 else
742 classpath="${classpath}:${jars}" 1018 die "java-pkg_jar-from called with unknown parameter: ${1}"
743 fi 1019 fi
744 java-pkg_record-jar_ "${pkg}" 1020 shift
745 done 1021 done
746 echo "${classpath}" 1022
1023 [[ ${#} -ne 1 ]] && die "${FUNCNAME} takes only one argument besides --*"
1024
1025
1026 local pkgs="${1}"
1027
1028 if [[ "${EAPI}" == "1" ]]; then
1029 pkgs="${pkgs//:/-}"
1030 fi
1031
1032 jars="$(java-config ${deep} --classpath=${pkgs})"
1033 [[ $? != 0 ]] && die "java-config --classpath=${pkgs} failed"
1034 debug-print "${pkgs}:${jars}"
1035
1036 for pkg in ${pkgs//,/ }; do
1037 java-pkg_ensure-dep "${build_only}" "${pkg}"
1038 done
1039
1040 # Only record jars that aren't build-only
1041 if [[ -z "${build_only}" ]]; then
1042 for pkg in ${pkgs//,/ }; do
1043 java-pkg_record-jar_ "${pkg}"
1044 done
1045 fi
1046
1047 echo "${jars}"
747} 1048}
748 1049
749# ------------------------------------------------------------------------------ 1050# ------------------------------------------------------------------------------
750# @ebuild-function java-pkg_getjar 1051# @ebuild-function java-pkg_getjar
751# 1052#
752# Get the filename of a single jar from a package 1053# Get the filename of a single jar from a package
1054# The providing package is recorded as runtime dependency into package.env
1055# DEPEND line, unless "--build-only" is passed as the very first argument, for
1056# jars that have to be present only at build time and are not needed on runtime
1057# (junit testing etc).
753# 1058#
754# @example 1059# @example
755# java-pkg_getjar xerces-2 xml-apis.jar 1060# java-pkg_getjar xerces-2 xml-apis.jar
756# @example-return 1061# @example-return
757# /usr/share/xerces-2/lib/xml-apis.jar 1062# /usr/share/xerces-2/lib/xml-apis.jar
758# 1063#
1064# @param $opt
1065# --build-only - makes the jar not added into package.env DEPEND line.
1066# --virtual - Packages passed to this function are to be handled as virtuals
1067# and will not have individual jar dependencies recorded.
759# @param $1 - package to use 1068# @param $1 - package to use
760# @param $2 - jar to get 1069# @param $2 - jar to get
761# ------------------------------------------------------------------------------ 1070# ------------------------------------------------------------------------------
762java-pkg_getjar() { 1071java-pkg_getjar() {
763 debug-print-function ${FUNCNAME} $* 1072 debug-print-function ${FUNCNAME} $*
764 1073
1074 local build_only=""
1075 local virtual=""
1076
1077 [[ "${EBUILD_PHASE}" == "test" ]] && build_only="build"
1078
1079 while [[ "${1}" == --* ]]; do
1080 if [[ "${1}" = "--build-only" ]]; then
1081 build_only="build"
1082 elif [[ "${1}" == "--virtual" ]]; then
1083 virtual="true"
1084 else
1085 die "java-pkg_getjar called with unknown parameter: ${1}"
1086 fi
1087 shift
1088 done
1089
1090 [[ ${#} -ne 2 ]] && die "${FUNCNAME} takes only two arguments besides --*"
1091
765 local pkg="${1}" target_jar="${2}" jar 1092 local pkg="${1}" target_jar="${2}" jar
1093
1094 if [[ "${EAPI}" == "1" ]]; then
1095 pkg="${pkg//:/-}"
1096 fi
1097
766 [[ -z ${pkg} ]] && die "Must specify package to get a jar from" 1098 [[ -z ${pkg} ]] && die "Must specify package to get a jar from"
767 [[ -z ${target_jar} ]] && die "Must specify jar to get" 1099 [[ -z ${target_jar} ]] && die "Must specify jar to get"
768 1100
769 # TODO check that package is actually installed 1101 local error_msg="Could not find classpath for ${pkg}. Are you sure its installed?"
1102 local classpath
770 local classpath=$(java-config --classpath=${pkg}) 1103 classpath=$(java-config --classpath=${pkg})
771 [[ $? != 0 ]] && die "There could not find classpath for ${pkg}. Are you sure its installed?" 1104 [[ $? != 0 ]] && die ${error_msg}
1105
1106 java-pkg_ensure-dep "${build_only}" "${pkg}"
1107
1108 # Record the package(Virtual) as a dependency and then set build_only
1109 # So that individual jars are not recorded.
1110 if [[ -n "${virtual}" ]]; then
1111 java-pkg_record-jar_ "${pkg}"
1112 build_only="true"
1113 fi
1114
772 for jar in ${classpath//:/ }; do 1115 for jar in ${classpath//:/ }; do
773 if [[ ! -f "${jar}" ]] ; then 1116 if [[ ! -f "${jar}" ]] ; then
774 die "Installation problems with jars in ${pkg} - is it installed?" 1117 die "Installation problem with jar ${jar} in ${pkg} - is it installed?"
775 fi 1118 fi
776 1119
777 if [[ "$(basename ${jar})" == "${target_jar}" ]] ; then 1120 if [[ "$(basename ${jar})" == "${target_jar}" ]] ; then
778 java-pkg_record-jar_ "${pkg}" "${jar}" 1121 # Only record jars that aren't build-only
1122 [[ -z "${build_only}" ]] && java-pkg_record-jar_ "${pkg}" "${jar}"
779 echo "${jar}" 1123 echo "${jar}"
780 return 0 1124 return 0
781 fi 1125 fi
782 done 1126 done
783 1127
784 die "Could not find ${target_jar} in ${pkg}" 1128 die "Could not find ${target_jar} in ${pkg}"
785 return 1 1129 return 1
1130}
1131
1132# ------------------------------------------------------------------------------
1133# @ebuild-function java-pkg_register-dependency
1134#
1135# Registers runtime dependency on a package, list of packages, or a single jar
1136# from a package, into package.env DEPEND line. Can only be called in
1137# src_install phase.
1138# Intended for binary packages where you don't need to symlink the jars or get
1139# their classpath during build. As such, the dependencies only need to be
1140# specified in ebuild's RDEPEND, and should be omitted in DEPEND.
1141#
1142# @param $1 - comma-separated list of packages, or a single package
1143# @param $2 - if param $1 is a single package, optionally specify the jar
1144# to depend on
1145#
1146# Example: Record the dependency on whole xerces-2 and xalan,
1147# java-pkg_register-dependency xerces-2,xalan
1148# Example: Record the dependency on ant.jar from ant-core
1149# java-pkg_register-dependency ant-core ant.jar
1150#
1151# Note: Passing both list of packages as the first parameter AND specifying the
1152# jar as the second is not allowed and will cause the function to die. We assume
1153# that there's more chance one passes such combination as a mistake, than that
1154# there are more packages providing identically named jar without class
1155# collisions.
1156# ------------------------------------------------------------------------------
1157java-pkg_register-dependency() {
1158 debug-print-function ${FUNCNAME} $*
1159
1160 java-pkg_check-phase install
1161
1162 [[ ${#} -gt 2 ]] && die "${FUNCNAME} takes at most two arguments"
1163
1164 local pkgs="${1}"
1165 local jar="${2}"
1166
1167 [[ -z "${pkgs}" ]] && die "${FUNCNAME} called with no package(s) specified"
1168
1169 if [[ "${EAPI}" == "1" ]]; then
1170 pkgs="${pkgs//:/-}"
1171 fi
1172
1173 if [[ -z "${jar}" ]]; then
1174 for pkg in ${pkgs//,/ }; do
1175 java-pkg_ensure-dep runtime "${pkg}"
1176 java-pkg_record-jar_ "${pkg}"
1177 done
1178 else
1179 [[ ${pkgs} == *,* ]] && \
1180 die "${FUNCNAME} called with both package list and jar name"
1181 java-pkg_ensure-dep runtime "${pkgs}"
1182 java-pkg_record-jar_ "${pkgs}" "${jar}"
1183 fi
1184
1185 java-pkg_do_write_
1186}
1187
1188# ------------------------------------------------------------------------------
1189# @ebuild-function java-pkg_register-optional-dependency
1190#
1191# Registers optional runtime dependency on a package, list of packages, or a
1192# single jar from a package, into package.env OPTIONAL_DEPEND line. Can only be
1193# called in src_install phase.
1194# Intended for packages that can use other packages when those are in classpath.
1195# Will be put on classpath by launcher if they are installed. Typical case is
1196# JDBC implementations for various databases. It's better than having USE flag
1197# for each implementation triggering hard dependency.
1198#
1199# @param $1 - comma-separated list of packages, or a single package
1200# @param $2 - if param $1 is a single package, optionally specify the jar
1201# to depend on
1202#
1203# Example: Record the optional dependency on some jdbc providers
1204# java-pkg_register-optional-dependency jdbc-jaybird,jtds-1.2,jdbc-mysql
1205#
1206# Note: Passing both list of packages as the first parameter AND specifying the
1207# jar as the second is not allowed and will cause the function to die. We assume
1208# that there's more chance one passes such combination as a mistake, than that
1209# there are more packages providing identically named jar without class
1210# collisions.
1211# ------------------------------------------------------------------------------
1212java-pkg_register-optional-dependency() {
1213 debug-print-function ${FUNCNAME} $*
1214
1215 java-pkg_check-phase install
1216
1217 [[ ${#} -gt 2 ]] && die "${FUNCNAME} takes at most two arguments"
1218
1219 local pkgs="${1}"
1220 local jar="${2}"
1221
1222 [[ -z "${pkgs}" ]] && die "${FUNCNAME} called with no package(s) specified"
1223
1224 if [[ "${EAPI}" == "1" ]]; then
1225 pkgs="${pkgs//:/-}"
1226 fi
1227
1228 if [[ -z "${jar}" ]]; then
1229 for pkg in ${pkgs//,/ }; do
1230 java-pkg_record-jar_ --optional "${pkg}"
1231 done
1232 else
1233 [[ ${pkgs} == *,* ]] && \
1234 die "${FUNCNAME} called with both package list and jar name"
1235 java-pkg_record-jar_ --optional "${pkgs}" "${jar}"
1236 fi
1237
1238 java-pkg_do_write_
1239}
1240
1241# ------------------------------------------------------------------------------
1242# @ebuild-function java-pkg_register-environment-variable
1243#
1244# Register an arbitrary environment variable into package.env. The gjl launcher
1245# for this package or any package depending on this will export it into
1246# environement before executing java command.
1247# Must only be called in src_install phase.
1248#
1249# @param $1 - variable name
1250# @param $2 - variable value
1251# ------------------------------------------------------------------------------
1252JAVA_PKG_EXTRA_ENV="${T}/java-pkg-extra-env"
1253JAVA_PKG_EXTRA_ENV_VARS=""
1254java-pkg_register-environment-variable() {
1255 debug-print-function ${FUNCNAME} $*
1256
1257 java-pkg_check-phase install
1258
1259 [[ ${#} != 2 ]] && die "${FUNCNAME} takes two arguments"
1260
1261 echo "${1}=\"${2}\"" >> ${JAVA_PKG_EXTRA_ENV}
1262 JAVA_PKG_EXTRA_ENV_VARS="${JAVA_PKG_EXTRA_ENV_VARS} ${1}"
1263
1264 java-pkg_do_write_
786} 1265}
787 1266
788# This function reads stdin, and based on that input, figures out how to 1267# This function reads stdin, and based on that input, figures out how to
789# populate jars from the filesystem. 1268# populate jars from the filesystem.
790# Need to figure out a good way of making use of this, ie be able to use a 1269# Need to figure out a good way of making use of this, ie be able to use a
802# line="${line// /}" 1281# line="${line// /}"
803# 1282#
804# # format: path=jarinfo 1283# # format: path=jarinfo
805# local path=${line%%=*} 1284# local path=${line%%=*}
806# local jarinfo=${line##*=} 1285# local jarinfo=${line##*=}
807# 1286#
808# # format: jar@package 1287# # format: jar@package
809# local jar=${jarinfo%%@*}.jar 1288# local jar=${jarinfo%%@*}.jar
810# local package=${jarinfo##*@} 1289# local package=${jarinfo##*@}
811# if [[ -n ${replace_only} ]]; then 1290# if [[ -n ${replace_only} ]]; then
812# [[ ! -f $path ]] && die "No jar exists at ${path}" 1291# [[ ! -f $path ]] && die "No jar exists at ${path}"
825# @section-end query 1304# @section-end query
826# ------------------------------------------------------------------------------ 1305# ------------------------------------------------------------------------------
827 1306
828# ------------------------------------------------------------------------------ 1307# ------------------------------------------------------------------------------
829# @section-begin helper 1308# @section-begin helper
830# @section-summary Helper functions 1309# @section-summary Helper functions
831# 1310#
832# Various other functions to use from an ebuild 1311# Various other functions to use from an ebuild
833# ------------------------------------------------------------------------------ 1312# ------------------------------------------------------------------------------
834 1313
835# ------------------------------------------------------------------------------ 1314# ------------------------------------------------------------------------------
841# jdbc-stdext 1320# jdbc-stdext
842# jaf 1321# jaf
843# jdbc-rowset 1322# jdbc-rowset
844# jms 1323# jms
845# 1324#
846# @param $1 - Optionally indicate that the dependencies are controlled by 1325# @param $1 - Optionally indicate that the dependencies are controlled by
847# a use flag by specifying '--use' Requires $2. 1326# a use flag by specifying '--use' Requires $2.
848# @param $2 - USE flag which will enable the dependencies. 1327# @param $2 - USE flag which will enable the dependencies.
849# @param $@ - virtual packages to add depenedencies for 1328# @param $@ - virtual packages to add depenedencies for
850# ------------------------------------------------------------------------------ 1329# ------------------------------------------------------------------------------
851# TODO rewrite to parse a line based declaration file instead -- karltk 1330# TODO rewrite to parse a line based declaration file instead -- karltk
907# 1386#
908# export DEPEND="${DEPEND} ${depstr}" 1387# export DEPEND="${DEPEND} ${depstr}"
909# export RDEPEND="${RDEPEND} ${depstr}" 1388# export RDEPEND="${RDEPEND} ${depstr}"
910#} 1389#}
911 1390
1391# ------------------------------------------------------------------------------
1392# @ebuild-function java-pkg_find-normal-jars
1393#
1394# Find the files with suffix .jar file in the given directory or $WORKDIR
1395#
1396# @param $1 - The directory to search for jar files (default: ${WORKDIR})
1397# ------------------------------------------------------------------------------
1398java-pkg_find-normal-jars() {
1399 local dir=$1
1400 [[ "${dir}" ]] || dir="${WORKDIR}"
1401 local found
1402 for jar in $(find "${dir}" -name "*.jar" -type f); do
1403 echo "${jar}"
1404 found="true"
1405 done
1406 [[ "${found}" ]]
1407 return $?
1408}
1409
1410# ------------------------------------------------------------------------------
1411# @ebuild-function java-pkg_ensure-no-bundled-jars
1412#
1413# Try to locate bundled jar files in ${WORKDIR} and die if found.
912# This should be used after S has been populated with symlinks to jars 1414# This function should be called after WORKDIR has been populated with symlink
913# TODO document 1415# to system jar files or bundled jars removed.
1416# ------------------------------------------------------------------------------
914java-pkg_ensure-no-bundled-jars() { 1417java-pkg_ensure-no-bundled-jars() {
915 debug-print-function ${FUNCNAME} $* 1418 debug-print-function ${FUNCNAME} $*
916 pushd ${WORKDIR} >/dev/null 2>/dev/null
917 1419
918 local bundled_jars=$(find . -name "*.jar" -type f) 1420 local bundled_jars=$(java-pkg_find-normal-jars)
919 if [[ -n ${bundled_jars} ]]; then 1421 if [[ -n ${bundled_jars} ]]; then
920 echo "Bundled jars found:" 1422 echo "Bundled jars found:"
921 local jar 1423 local jar
922 for jar in ${bundled_jars}; do 1424 for jar in ${bundled_jars}; do
923 echo $(pwd)${jar/./} 1425 echo $(pwd)${jar/./}
924 done 1426 done
925 die "Bundled jars found!" 1427 die "Bundled jars found!"
926
927 fi 1428 fi
928 popd >/dev/null 2>/dev/null
929} 1429}
930 1430
931# ------------------------------------------------------------------------------ 1431# ------------------------------------------------------------------------------
932# @internal-function java-pkg_ensure-vm-version-sufficient 1432# @internal-function java-pkg_ensure-vm-version-sufficient
933# 1433#
945 fi 1445 fi
946} 1446}
947 1447
948# ------------------------------------------------------------------------------ 1448# ------------------------------------------------------------------------------
949# @internal-function java-pkg_is-vm-version-sufficient 1449# @internal-function java-pkg_is-vm-version-sufficient
950# 1450#
951# @return zero - VM is sufficient 1451# @return zero - VM is sufficient
952# @return non-zero - VM is not sufficient 1452# @return non-zero - VM is not sufficient
953# ------------------------------------------------------------------------------ 1453# ------------------------------------------------------------------------------
954java-pkg_is-vm-version-sufficient() { 1454java-pkg_is-vm-version-sufficient() {
955 debug-print-function ${FUNCNAME} $* 1455 debug-print-function ${FUNCNAME} $*
975 die "Active Java VM too old" 1475 die "Active Java VM too old"
976 fi 1476 fi
977} 1477}
978 1478
979# ------------------------------------------------------------------------------ 1479# ------------------------------------------------------------------------------
980# @internal-function java-pkg_is-vm-version-eq 1480# @internal-function java-pkg_is-vm-version-eq
981# 1481#
982# @param $@ - VM version to compare current VM to 1482# @param $@ - VM version to compare current VM to
983# @return zero - VM versions are equal 1483# @return zero - VM versions are equal
984# @return non-zero - VM version are not equal 1484# @return non-zero - VM version are not equal
985# ------------------------------------------------------------------------------ 1485# ------------------------------------------------------------------------------
986java-pkg_is-vm-version-eq() { 1486java-pkg_is-vm-version-eq() {
1016# 1516#
1017# @param $@ - VM version to compare current to 1517# @param $@ - VM version to compare current to
1018# ------------------------------------------------------------------------------ 1518# ------------------------------------------------------------------------------
1019java-pkg_ensure-vm-version-ge() { 1519java-pkg_ensure-vm-version-ge() {
1020 debug-print-function ${FUNCNAME} $* 1520 debug-print-function ${FUNCNAME} $*
1021 1521
1022 if ! java-pkg_is-vm-version-ge "$@" ; then 1522 if ! java-pkg_is-vm-version-ge "$@" ; then
1023 debug-print "vm is not suffient" 1523 debug-print "vm is not suffient"
1024 eerror "This package requires a Java VM version >= $@" 1524 eerror "This package requires a Java VM version >= $@"
1025 einfo "Please use java-config -S to set the correct one" 1525 einfo "Please use java-config -S to set the correct one"
1026 die "Active Java VM too old" 1526 die "Active Java VM too old"
1027 fi 1527 fi
1028} 1528}
1029 1529
1030# ------------------------------------------------------------------------------ 1530# ------------------------------------------------------------------------------
1031# @internal-function java-pkg_is-vm-version-ge 1531# @internal-function java-pkg_is-vm-version-ge
1032# 1532#
1033# @param $@ - VM version to compare current VM to 1533# @param $@ - VM version to compare current VM to
1034# @return zero - current VM version is greater than checked version 1534# @return zero - current VM version is greater than checked version
1035# @return non-zero - current VM version is not greater than checked version 1535# @return non-zero - current VM version is not greater than checked version
1036# ------------------------------------------------------------------------------ 1536# ------------------------------------------------------------------------------
1037java-pkg_is-vm-version-ge() { 1537java-pkg_is-vm-version-ge() {
1066 return $? 1566 return $?
1067} 1567}
1068 1568
1069# ------------------------------------------------------------------------------ 1569# ------------------------------------------------------------------------------
1070# @ebuild-function java-pkg_get-source 1570# @ebuild-function java-pkg_get-source
1071# 1571#
1072# Determines what source version should be used, for passing to -source. 1572# Determines what source version should be used, for passing to -source.
1073# Unless you want to break things you probably shouldn't set _WANT_SOURCE 1573# Unless you want to break things you probably shouldn't set _WANT_SOURCE
1074# 1574#
1075# @return string - Either the lowest possible source, or JAVA_PKG_WANT_SOURCE 1575# @return string - Either the lowest possible source, or JAVA_PKG_WANT_SOURCE
1076# ------------------------------------------------------------------------------ 1576# ------------------------------------------------------------------------------
1081# ------------------------------------------------------------------------------ 1581# ------------------------------------------------------------------------------
1082# @ebuild-function java-pkg_get-target 1582# @ebuild-function java-pkg_get-target
1083# 1583#
1084# Determines what target version should be used, for passing to -target. 1584# Determines what target version should be used, for passing to -target.
1085# If you don't care about lower versions, you can set _WANT_TARGET to the 1585# If you don't care about lower versions, you can set _WANT_TARGET to the
1086# version of your JDK. 1586# version of your JDK.
1087# Remember doing this will mostly like cause things to break.
1088# Doesn't allow it to be lower then the one in depend.
1089# Doesn't allow it to be higher then the active vm.
1090# 1587#
1091# @return string - Either the lowest possible target, or JAVA_PKG_WANT_TARGET 1588# @return string - Either the lowest possible target, or JAVA_PKG_WANT_TARGET
1092# ------------------------------------------------------------------------------ 1589# ------------------------------------------------------------------------------
1093java-pkg_get-target() { 1590java-pkg_get-target() {
1094 local min=$(depend-java-query --get-lowest "${DEPEND} ${RDEPEND}")
1095 if [[ -n "${JAVA_PKG_WANT_TARGET}" ]]; then
1096 local max="$(java-config --select-vm "${GENTOO_VM}" -g PROVIDES_VERSION)"
1097 if version_is_at_least "${min}" "${JAVA_PKG_WANT_TARGET}" && version_is_at_least "${JAVA_PKG_WANT_TARGET}" "${max}"; then
1098 echo ${JAVA_PKG_WANT_TARGET}
1099 else
1100 echo ${min}
1101 fi
1102 else
1103 echo ${min}
1104 fi
1105
1106 #echo ${JAVA_PKG_WANT_TARGET:-$(depend-java-query --get-lowest "${DEPEND}")} 1591 echo ${JAVA_PKG_WANT_TARGET:-$(depend-java-query --get-lowest "${DEPEND} ${RDEPEND}")}
1107} 1592}
1108 1593
1109java-pkg_get-javac() { 1594java-pkg_get-javac() {
1110 debug-print-function ${FUNCNAME} $* 1595 debug-print-function ${FUNCNAME} $*
1111 1596
1112 java-pkg_init-compiler_ 1597
1113 local compiler="${GENTOO_COMPILER}" 1598 local compiler="${GENTOO_COMPILER}"
1114 1599
1115 local compiler_executable 1600 local compiler_executable
1116 if [[ "${compiler}" = "javac" ]]; then 1601 if [[ "${compiler}" = "javac" ]]; then
1117 # nothing fancy needs to be done for javac 1602 # nothing fancy needs to be done for javac
1125 unset JAVAC 1610 unset JAVAC
1126 # try to get value of JAVAC 1611 # try to get value of JAVAC
1127 compiler_executable="$(source ${compiler_env} 1>/dev/null 2>&1; echo ${JAVAC})" 1612 compiler_executable="$(source ${compiler_env} 1>/dev/null 2>&1; echo ${JAVAC})"
1128 export JAVAC=${old_javac} 1613 export JAVAC=${old_javac}
1129 1614
1130 [[ -z ${compiler_executable} ]] && die "JAVAC is empty or undefined in ${compiler_env}" 1615 if [[ -z ${compiler_executable} ]]; then
1131 1616 echo "JAVAC is empty or undefined in ${compiler_env}"
1617 return 1
1618 fi
1619
1132 # check that it's executable 1620 # check that it's executable
1133 if [[ ! -x ${compiler_executable} ]]; then 1621 if [[ ! -x ${compiler_executable} ]]; then
1134 eerror "Could not find ${compiler_executable}!"
1135 die "${compiler_executable} doesn't exist, or isn't executable" 1622 echo "${compiler_executable} doesn't exist, or isn't executable"
1623 return 1
1136 fi 1624 fi
1137 else 1625 else
1138 eerror "Could not find environment file for ${compiler}" 1626 echo "Could not find environment file for ${compiler}"
1139 die "Could not find ${compiler_env}" 1627 return 1
1140 fi 1628 fi
1141 fi 1629 fi
1142 echo ${compiler_executable} 1630 echo ${compiler_executable}
1143} 1631}
1144 1632
1145# ------------------------------------------------------------------------------ 1633# ------------------------------------------------------------------------------
1146# @ebuild-function java-pkg_javac-args 1634# @ebuild-function java-pkg_javac-args
1147# 1635#
1148# If an ebuild uses javac directly, instead of using ejavac, it should call this 1636# If an ebuild uses javac directly, instead of using ejavac, it should call this
1149# to know what -source/-target to use. 1637# to know what -source/-target to use.
1150# 1638#
1151# @return string - arguments to pass to javac, complete with -target and -source 1639# @return string - arguments to pass to javac, complete with -target and -source
1154 debug-print-function ${FUNCNAME} $* 1642 debug-print-function ${FUNCNAME} $*
1155 1643
1156 local want_source="$(java-pkg_get-source)" 1644 local want_source="$(java-pkg_get-source)"
1157 local want_target="$(java-pkg_get-target)" 1645 local want_target="$(java-pkg_get-target)"
1158 1646
1159 local source_str="-source ${want_source}" 1647 local source_str="-source ${want_source}"
1160 local target_str="-target ${want_target}" 1648 local target_str="-target ${want_target}"
1161 1649
1162 debug-print "want source: ${want_source}" 1650 debug-print "want source: ${want_source}"
1163 debug-print "want target: ${want_target}" 1651 debug-print "want target: ${want_target}"
1164 1652
1165 if [[ -z "${want_source}" || -z "${want_target}" ]]; then 1653 if [[ -z "${want_source}" || -z "${want_target}" ]]; then
1166 debug-print "could not find valid -source/-target values" 1654 debug-print "could not find valid -source/-target values for javac"
1167 die "Could not find valid -source/-target values" 1655 echo "Could not find valid -source/-target values for javac"
1656 return 1
1168 else 1657 else
1169 if java-pkg_is-vm-version-ge "1.4"; then 1658 if java-pkg_is-vm-version-ge "1.4"; then
1170 echo "${source_str} ${target_str}" 1659 echo "${source_str} ${target_str}"
1171 else 1660 else
1172 echo "${target_str}" 1661 echo "${target_str}"
1176 1665
1177# TODO document 1666# TODO document
1178java-pkg_get-jni-cflags() { 1667java-pkg_get-jni-cflags() {
1179 local flags="-I${JAVA_HOME}/include" 1668 local flags="-I${JAVA_HOME}/include"
1180 1669
1670 local platform="linux"
1671 use elibc_FreeBSD && platform="freebsd"
1672
1181 # TODO do a check that the directories are valid 1673 # TODO do a check that the directories are valid
1182 # TODO figure out how to cope with other things than linux...
1183 flags="${flags} -I${JAVA_HOME}/include/linux" 1674 flags="${flags} -I${JAVA_HOME}/include/${platform}"
1184 1675
1185 echo ${flags} 1676 echo ${flags}
1186} 1677}
1187 1678
1188java-pkg_ensure-gcj() { 1679java-pkg_ensure-gcj() {
1194 die "No GCJ support found!" 1685 die "No GCJ support found!"
1195 fi 1686 fi
1196} 1687}
1197 1688
1198java-pkg_ensure-test() { 1689java-pkg_ensure-test() {
1199 if hasq test ${FEATURES} && ! hasq -test ${FEATURES} && ! use test; then 1690 if hasq test ${FEATURES} && ! hasq -test ${FEATURES} \
1691 && hasq test ${IUSE} && ! use test;
1692 then
1200 eerror "You specified FEATURES=test, but USE=test is needed" 1693 eerror "You specified FEATURES=test, but USE=test is needed"
1201 eerror "to pull in the additional dependencies for testing" 1694 eerror "to pull in the additional dependencies for testing"
1202 die "Need USE=test enabled" 1695 die "Need USE=test enabled"
1203 fi 1696 fi
1204} 1697}
1205 1698
1206# ------------------------------------------------------------------------------ 1699# ------------------------------------------------------------------------------
1700# @ebuild-function java-pkg_register-ant-task
1701#
1702# Register this package as ant task, so that ant will load it when no specific
1703# ANT_TASKS are specified. Note that even without this registering, all packages
1704# specified in ANT_TASKS will be loaded. Mostly used by the actual ant tasks
1705# packages, but can be also used by other ebuilds that used to symlink their
1706# .jar into /usr/share/ant-core/lib to get autoloaded, for backwards
1707# compatibility.
1708#
1709# @param --version x.y Register only for ant version x.y (otherwise for any ant
1710# version). Used by the ant-* packages to prevent loading of mismatched
1711# ant-core ant tasks after core was updated, before the tasks are updated,
1712# without a need for blockers.
1713# @param $1 Name to register as. Defaults to JAVA_PKG_NAME ($PN[-$SLOT])
1714# ------------------------------------------------------------------------------
1715java-pkg_register-ant-task() {
1716 local TASKS_DIR="tasks"
1717
1718 # check for --version x.y parameters
1719 while [[ -n "${1}" && -n "${2}" ]]; do
1720 local var="${1#--}"
1721 local val="${2}"
1722 if [[ "${var}" == "version" ]]; then
1723 TASKS_DIR="tasks-${val}"
1724 else
1725 die "Unknown parameter passed to java-pkg_register-ant-tasks: ${1} ${2}"
1726 fi
1727 shift 2
1728 done
1729
1730 local TASK_NAME="${1:-${JAVA_PKG_NAME}}"
1731
1732 dodir /usr/share/ant/${TASKS_DIR}
1733 touch "${D}/usr/share/ant/${TASKS_DIR}/${TASK_NAME}"
1734}
1735
1736# ------------------------------------------------------------------------------
1737# @internal-function java-pkg_ant-tasks-depend
1738#
1739# Translates the WANT_ANT_TASKS variable into valid dependencies.
1740# ------------------------------------------------------------------------------
1741java-pkg_ant-tasks-depend() {
1742 debug-print-function ${FUNCNAME} ${WANT_ANT_TASKS}
1743
1744 if [[ -n "${WANT_ANT_TASKS}" ]]; then
1745 local DEP=""
1746 for i in ${WANT_ANT_TASKS}
1747 do
1748 if [[ ${i} = ant-* ]]; then
1749 DEP="${DEP}dev-java/${i} "
1750 elif [[ ${i} = */*:* ]]; then
1751 DEP="${DEP}${i} "
1752 else
1753 echo "Invalid atom in WANT_ANT_TASKS: ${i}"
1754 return 1
1755 fi
1756 done
1757 echo ${DEP}
1758 return 0
1759 else
1760 return 0
1761 fi
1762}
1763
1764# ------------------------------------------------------------------------------
1765# @ebuild-function ejunit
1766#
1767# Junit wrapper function. Makes it easier to run the tests and checks for
1768# dev-java/junit in DEPEND. Launches the tests using junit.textui.TestRunner.
1769#
1770# Examples:
1771# ejunit -cp build/classes org.blinkenlights.jid3.test.AllTests
1772# ejunit org.blinkenlights.jid3.test.AllTests
1773#
1774# @param $1 - -cp or -classpath
1775# @param $2 - classpath; junit and recorded dependencies get appended
1776# @param $@ - the rest of the parameters are passed to java
1777# ------------------------------------------------------------------------------
1778ejunit() {
1779 debug-print-function ${FUNCNAME} $*
1780
1781 local pkgs
1782 if [[ -f ${JAVA_PKG_DEPEND_FILE} ]]; then
1783 for atom in $(cat ${JAVA_PKG_DEPEND_FILE} | tr : ' '); do
1784 pkgs=${pkgs},$(echo ${atom} | sed -re "s/^.*@//")
1785 done
1786 fi
1787
1788 local cp=$(java-pkg_getjars --with-dependencies junit${pkgs})
1789 if [[ ${1} = -cp || ${1} = -classpath ]]; then
1790 cp="${2}:${cp}"
1791 shift 2
1792 else
1793 cp=".:${cp}"
1794 fi
1795
1796 local runner=junit.textui.TestRunner
1797 debug-print "Calling: java -cp \"${cp}\" -Djava.awt.headless=true ${runner} ${@}"
1798 java -cp "${cp}" -Djava.awt.headless=true ${runner} "${@}" || die "Running junit failed"
1799}
1800
1801# ------------------------------------------------------------------------------
1207# @section-end helper 1802# @section-end helper
1208# ------------------------------------------------------------------------------ 1803# ------------------------------------------------------------------------------
1804
1805# ------------------------------------------------------------------------------
1806# @eclass-src_prepare
1807#
1808# src_prepare Searches for bundled jars
1809# ------------------------------------------------------------------------------
1810
1811java-utils-2_src_prepare() {
1812 # Remember that eant will call this unless called via Portage
1813 if [[ ! -e "${T}/java-utils-2_src_prepare-run" ]] && is-java-strict; then
1814 echo "Searching for bundled jars:"
1815 java-pkg_find-normal-jars || echo "None found."
1816 echo "Searching for bundled classes (no output if none found):"
1817 find "${WORKDIR}" -name "*.class"
1818 echo "Search done."
1819 fi
1820 touch "${T}/java-utils-2_src_prepare-run"
1821}
1209 1822
1210# ------------------------------------------------------------------------------ 1823# ------------------------------------------------------------------------------
1211# @section-begin build 1824# @section-begin build
1212# @section-summary Build functions 1825# @section-summary Build functions
1213# 1826#
1217 1830
1218# ------------------------------------------------------------------------------ 1831# ------------------------------------------------------------------------------
1219# @ebuild-function eant 1832# @ebuild-function eant
1220# 1833#
1221# Ant wrapper function. Will use the appropriate compiler, based on user-defined 1834# Ant wrapper function. Will use the appropriate compiler, based on user-defined
1222# compiler. 1835# compiler. Will also set proper ANT_TASKS from the variable ANT_TASKS,
1223# 1836# variables:
1837# EANT_GENTOO_CLASSPATH - calls java-pkg_getjars for the value and adds to the
1838# gentoo.classpath property. Be sure to call
1839# java-ant_rewrite-classpath in src_unpack.
1840# JAVA_PKG_NO_BUNDLED_SEARCH - Don't search for bundled jars or class files
1841# *ANT_TASKS - used to determine ANT_TASKS before calling Ant.
1224# ------------------------------------------------------------------------------ 1842# ------------------------------------------------------------------------------
1225eant() { 1843eant() {
1226 debug-print-function ${FUNCNAME} $* 1844 debug-print-function ${FUNCNAME} $*
1227 1845
1228 # FIXME get this working 1846 if [[ ${EBUILD_PHASE} = compile ]]; then
1229# if is-java-strict && [[ ! ${DEPEND} =~ "dev-java/ant" ]]; then 1847 java-ant-2_src_configure
1848 java-utils-2_src_prepare
1849 fi
1850
1851 if ! hasq java-ant-2 ${INHERITED}; then
1852 local msg="You should inherit java-ant-2 when using eant"
1230# java-pkg_announce-qa-violation \ 1853 java-pkg_announce-qa-violation "${msg}"
1231# "Using eant, but not depending on dev-java/ant or dev-java/ant-core"
1232# fi 1854 fi
1233 1855
1234 local antflags 1856 local antflags="-Dnoget=true -Dmaven.mode.offline=true -Dbuild.sysclasspath=ignore"
1857
1235 java-pkg_init-compiler_ 1858 java-pkg_init-compiler_
1236 local compiler="${GENTOO_COMPILER}" 1859 local compiler="${GENTOO_COMPILER}"
1237 1860
1238 local compiler_env="${JAVA_PKG_COMPILER_DIR}/${compiler}" 1861 local compiler_env="${JAVA_PKG_COMPILER_DIR}/${compiler}"
1239
1240 local build_compiler="$(source ${compiler_env} 1>/dev/null 2>&1; echo ${ANT_BUILD_COMPILER})" 1862 local build_compiler="$(source ${compiler_env} 1>/dev/null 2>&1; echo ${ANT_BUILD_COMPILER})"
1241 if [[ "${compiler}" != "javac" && -z "${build_compiler}" ]]; then 1863 if [[ "${compiler}" != "javac" && -z "${build_compiler}" ]]; then
1242 die "ANT_BUILD_COMPILER undefined in ${compiler_env}" 1864 die "ANT_BUILD_COMPILER undefined in ${compiler_env}"
1243 fi 1865 fi
1244 1866
1245 if [[ ${compiler} != "javac" ]]; then 1867 if [[ ${compiler} != "javac" ]]; then
1246 antflags="-Dbuild.compiler=${build_compiler}" 1868 antflags="${antflags} -Dbuild.compiler=${build_compiler}"
1247 # Figure out any extra stuff to put on the classpath for compilers aside 1869 # Figure out any extra stuff to put on the classpath for compilers aside
1248 # from javac 1870 # from javac
1249 # ANT_BUILD_COMPILER_DEPS should be something that could be passed to 1871 # ANT_BUILD_COMPILER_DEPS should be something that could be passed to
1250 # java-config -p 1872 # java-config -p
1251 local build_compiler_deps="$(source ${JAVA_PKG_COMPILER_DIR}/${compiler} 1>/dev/null 2>&1; echo ${ANT_BUILD_COMPILER_DEPS})" 1873 local build_compiler_deps="$(source ${JAVA_PKG_COMPILER_DIR}/${compiler} 1>/dev/null 2>&1; echo ${ANT_BUILD_COMPILER_DEPS})"
1252 if [[ -n ${build_compiler_deps} ]]; then 1874 if [[ -n ${build_compiler_deps} ]]; then
1253 antflags="${antflags} -lib $(java-config -p ${build_compiler_deps})" 1875 antflags="${antflags} -lib $(java-config -p ${build_compiler_deps})"
1254 fi 1876 fi
1255 fi 1877 fi
1256 1878
1879 for arg in "${@}"; do
1880 if [[ ${arg} = -lib ]]; then
1257 if is-java-strict; then 1881 if is-java-strict; then
1258 einfo "Disabling system classpath for ant" 1882 eerror "You should not use the -lib argument to eant because it will fail"
1259 antflags="${antflags} -Dbuild.sysclasspath=ignore" 1883 eerror "with JAVA_PKG_STRICT. Please use for example java-pkg_jar-from"
1884 eerror "or ant properties to make dependencies available."
1885 eerror "For ant tasks use WANT_ANT_TASKS or ANT_TASKS from."
1886 eerror "split ant (>=dev-java/ant-core-1.7)."
1887 die "eant -lib is deprecated/forbidden"
1888 else
1889 echo "eant -lib is deprecated. Turn JAVA_PKG_STRICT on for"
1890 echo "more info."
1891 fi
1260 fi 1892 fi
1261 1893 done
1262 if [[ -n ${JAVA_PKG_DEBUG} ]]; then 1894
1263 antflags="${antflags} -debug" 1895 # parse WANT_ANT_TASKS for atoms
1896 local want_ant_tasks
1897 for i in ${WANT_ANT_TASKS}; do
1898 if [[ ${i} = */*:* ]]; then
1899 i=${i#*/}
1900 i=${i%:0}
1901 want_ant_tasks+="${i/:/-} "
1902 else
1903 want_ant_tasks+="${i} "
1264 fi 1904 fi
1265 1905 done
1906 # default ANT_TASKS to WANT_ANT_TASKS, if ANT_TASKS is not set explicitly
1907 ANT_TASKS="${ANT_TASKS:-${want_ant_tasks% }}"
1908
1909 # override ANT_TASKS with JAVA_PKG_FORCE_ANT_TASKS if it's set
1910 ANT_TASKS="${JAVA_PKG_FORCE_ANT_TASKS:-${ANT_TASKS}}"
1911
1912 # if ant-tasks is not set by ebuild or forced, use none
1913 ANT_TASKS="${ANT_TASKS:-none}"
1914
1915 # at this point, ANT_TASKS should be "all", "none" or explicit list
1916 if [[ "${ANT_TASKS}" == "all" ]]; then
1917 einfo "Using all available ANT_TASKS"
1918 elif [[ "${ANT_TASKS}" == "none" ]]; then
1919 einfo "Disabling all optional ANT_TASKS"
1920 else
1921 einfo "Using following ANT_TASKS: ${ANT_TASKS}"
1922 fi
1923
1924 export ANT_TASKS
1925
1926 [[ -n ${JAVA_PKG_DEBUG} ]] && antflags="${antflags} --execdebug -debug"
1927 [[ -n ${PORTAGE_QUIET} ]] && antflags="${antflags} -q"
1928
1929 local gcp="${EANT_GENTOO_CLASSPATH}"
1930 local getjarsarg=""
1931
1932 if [[ ${EBUILD_PHASE} = "test" ]]; then
1933 antflags="${antflags} -DJunit.present=true"
1934 [[ ${ANT_TASKS} = *ant-junit* ]] && gcp="${gcp} junit"
1935 getjarsarg="--with-dependencies"
1936 fi
1937
1938 local cp
1939
1940 for atom in ${gcp}; do
1941 cp="${cp}:$(java-pkg_getjars ${getjarsarg} ${atom})"
1942 done
1943
1944 if [[ ${cp} ]]; then
1945 # It seems ant does not like single quotes around ${cp}
1946 cp=${cp#:}
1947 [[ ${EANT_GENTOO_CLASSPATH_EXTRA} ]] && \
1948 cp="${cp}:${EANT_GENTOO_CLASSPATH_EXTRA}"
1949 antflags="${antflags} -Dgentoo.classpath=\"${cp}\""
1950 fi
1951
1266 [[ -n ${JAVA_PKG_DEBUG} ]] && echo ant ${antflags} "${@}" 1952 [[ -n ${JAVA_PKG_DEBUG} ]] && echo ant ${antflags} "${@}"
1953 debug-print "Calling ant (GENTOO_VM: ${GENTOO_VM}): ${antflags} ${@}"
1267 ant ${antflags} "${@}" || die "eant failed" 1954 ant ${antflags} "${@}" || die "eant failed"
1268
1269} 1955}
1270 1956
1271# ------------------------------------------------------------------------------ 1957# ------------------------------------------------------------------------------
1272# @ebuild-function ejavac 1958# @ebuild-function ejavac
1273# 1959#
1274# Javac wrapper function. Will use the appropriate compiler, based on 1960# Javac wrapper function. Will use the appropriate compiler, based on
1275# /etc/java-config/compilers.conf 1961# /etc/java-config/compilers.conf
1276# 1962#
1277# @param $@ - Arguments to be passed to the compiler 1963# @param $@ - Arguments to be passed to the compiler
1278# ------------------------------------------------------------------------------ 1964# ------------------------------------------------------------------------------
1279ejavac() { 1965ejavac() {
1280 debug-print-function ${FUNCNAME} $* 1966 debug-print-function ${FUNCNAME} $*
1281 1967
1282 # FIXME using get-javac ends up printing stuff with einfo 1968 java-pkg_init-compiler_
1969
1970 local compiler_executable
1283# local compiler_executable=$(java-pkg_get-javac) 1971 compiler_executable=$(java-pkg_get-javac)
1284 local compiler_executable="javac" 1972 if [[ ${?} != 0 ]]; then
1973 eerror "There was a problem determining compiler: ${compiler_executable}"
1974 die "get-javac failed"
1975 fi
1285 1976
1977 local javac_args
1978 javac_args="$(java-pkg_javac-args)"
1979 if [[ ${?} != 0 ]]; then
1980 eerror "There was a problem determining JAVACFLAGS: ${javac_args}"
1981 die "java-pkg_javac-args failed"
1982 fi
1983
1286 [[ -n ${JAVA_PKG_DEBUG} ]] && echo ${compiler_executable} $(java-pkg_javac-args) "${@}" 1984 [[ -n ${JAVA_PKG_DEBUG} ]] && echo ${compiler_executable} ${javac_args} "${@}"
1287 ${compiler_executable} $(java-pkg_javac-args) "${@}" || die "ejavac failed" 1985 ${compiler_executable} ${javac_args} "${@}" || die "ejavac failed"
1288} 1986}
1289 1987
1290# ------------------------------------------------------------------------------ 1988# ------------------------------------------------------------------------------
1291# @ebuild-function java-pkg_filter-compiler 1989# @ebuild-function java-pkg_filter-compiler
1292# 1990#
1293# Used to prevent the use of some compilers. Should be used in src_compile. 1991# Used to prevent the use of some compilers. Should be used in src_compile.
1294# Basically, it just appends onto JAVA_PKG_FILTER_COMPILER 1992# Basically, it just appends onto JAVA_PKG_FILTER_COMPILER
1295# 1993#
1296# @param $@ - compilers to filter 1994# @param $@ - compilers to filter
1297# ------------------------------------------------------------------------------ 1995# ------------------------------------------------------------------------------
1315# ------------------------------------------------------------------------------ 2013# ------------------------------------------------------------------------------
1316# @ebuild-function use_doc 2014# @ebuild-function use_doc
1317# 2015#
1318# Helper function for getting ant to build javadocs. If the user has USE=doc, 2016# Helper function for getting ant to build javadocs. If the user has USE=doc,
1319# then 'javadoc' or the argument are returned. Otherwise, there is no return. 2017# then 'javadoc' or the argument are returned. Otherwise, there is no return.
1320# 2018#
1321# The output of this should be passed to ant. 2019# The output of this should be passed to ant.
1322# 2020#
1323# Example: build javadocs by calling 'javadoc' target 2021# Example: build javadocs by calling 'javadoc' target
1324# eant $(use_doc) 2022# eant $(use_doc)
1325# Example: build javadocs by calling 'apidoc' target 2023# Example: build javadocs by calling 'apidoc' target
1330# ------------------------------------------------------------------------------ 2028# ------------------------------------------------------------------------------
1331use_doc() { 2029use_doc() {
1332 use doc && echo ${@:-javadoc} 2030 use doc && echo ${@:-javadoc}
1333} 2031}
1334 2032
2033
1335# ------------------------------------------------------------------------------ 2034# ------------------------------------------------------------------------------
1336# @section-end build 2035# @section-end build
1337# ------------------------------------------------------------------------------ 2036# ------------------------------------------------------------------------------
1338 2037
1339# ------------------------------------------------------------------------------ 2038# ------------------------------------------------------------------------------
1340# @section-begin internal 2039# @section-begin internal
1341# @section-summary Internal functions 2040# @section-summary Internal functions
1342# 2041#
1343# Do __NOT__ use any of these from an ebuild! These are only to be used from 2042# Do __NOT__ use any of these from an ebuild! These are only to be used from
1344# within the java eclasses. 2043# within the java eclasses.
1345# ------------------------------------------------------------------------------ 2044# ------------------------------------------------------------------------------
1346 2045
1347# ----------------------------------------------------------------------------- 2046# -----------------------------------------------------------------------------
1348# @function-internal java-pkg_init 2047# @function-internal java-pkg_init
1349# 2048#
1350# The purpose of this function, as the name might imply, is to initialize the 2049# The purpose of this function, as the name might imply, is to initialize the
1351# Java environment. It ensures that that there aren't any environment variables 2050# Java environment. It ensures that that there aren't any environment variables
1352# that'll muss things up. It initializes some variables, which are used 2051# that'll muss things up. It initializes some variables, which are used
1353# internally. And most importantly, it'll switch the VM if necessary. 2052# internally. And most importantly, it'll switch the VM if necessary.
1354# 2053#
1355# This shouldn't be used directly. Instead, java-pkg and java-pkg-opt will 2054# This shouldn't be used directly. Instead, java-pkg and java-pkg-opt will
1356# call it during each of the phases of the merge process. 2055# call it during each of the phases of the merge process.
1357# 2056#
1358# ----------------------------------------------------------------------------- 2057# -----------------------------------------------------------------------------
1359java-pkg_init() { 2058java-pkg_init() {
2059 debug-print-function ${FUNCNAME} $*
1360 unset JAVAC 2060 unset JAVAC
1361 unset JAVA_HOME 2061 unset JAVA_HOME
2062
2063 # People do all kinds of weird things.
2064 # http://forums.gentoo.org/viewtopic-p-3943166.html
2065 local silence="${SILENCE_JAVA_OPTIONS_WARNING}"
2066 local accept="${I_WANT_GLOBAL_JAVA_OPTIONS}"
2067 if [[ -n ${_JAVA_OPTIONS} && -z ${accept} && -z ${silence} ]]; then
2068 ewarn "_JAVA_OPTIONS changes what java -version outputs at least for"
2069 ewarn "sun-jdk vms and and as such break configure scripts that"
2070 ewarn "use it (for example app-office/openoffice) so we filter it out."
2071 ewarn "Use SILENCE_JAVA_OPTIONS_WARNING=true in the environment (use"
2072 ewarn "make.conf for example) to silence this warning or"
2073 ewarn "I_WANT_GLOBAL_JAVA_OPTIONS to not filter it."
2074 fi
2075
2076 if [[ -z ${accept} ]]; then
2077 # export _JAVA_OPTIONS= doesn't work because it will show up in java
2078 # -version output
2079 unset _JAVA_OPTIONS
2080 # phase hooks make this run many times without this
2081 I_WANT_GLOBAL_JAVA_OPTIONS="true"
2082 fi
2083
2084 if java-pkg_func-exists ant_src_unpack; then
2085 java-pkg_announce-qa-violation "Using old ant_src_unpack. Should be src_unpack"
2086 fi
2087
1362 java-pkg_init_paths_ 2088 java-pkg_init_paths_
1363 java-pkg_switch-vm 2089 java-pkg_switch-vm
1364 PATH=${JAVA_HOME}/bin:${PATH} 2090 PATH=${JAVA_HOME}/bin:${PATH}
1365 2091
1366 # TODO we will probably want to set JAVAC and JAVACFLAGS 2092 # TODO we will probably want to set JAVAC and JAVACFLAGS
1367 2093
1368 # Do some QA checks 2094 # Do some QA checks
1369 java-pkg_check-jikes 2095 java-pkg_check-jikes
1370 2096
2097 # Can't use unset here because Portage does not save the unset
2098 # see https://bugs.gentoo.org/show_bug.cgi?id=189417#c11
2099
1371 # When users have crazy classpaths some packages can fail to compile. 2100 # When users have crazy classpaths some packages can fail to compile.
1372 # and everything should work with empty CLASSPATH. 2101 # and everything should work with empty CLASSPATH.
1373 # This also helps prevent unexpected dependencies on random things 2102 # This also helps prevent unexpected dependencies on random things
1374 # from the CLASSPATH. 2103 # from the CLASSPATH.
1375 unset CLASSPATH 2104 export CLASSPATH=
2105
2106 # Unset external ANT_ stuff
2107 export ANT_TASKS=
2108 export ANT_OPTS=
1376} 2109}
1377 2110
1378# ------------------------------------------------------------------------------ 2111# ------------------------------------------------------------------------------
1379# @function-internal java-pkg-init-compiler_ 2112# @function-internal java-pkg-init-compiler_
1380# 2113#
1381# This function attempts to figure out what compiler should be used. It does 2114# This function attempts to figure out what compiler should be used. It does
1382# this by reading the file at JAVA_PKG_COMPILERS_CONF, and checking the 2115# this by reading the file at JAVA_PKG_COMPILERS_CONF, and checking the
1383# COMPILERS variable defined there. 2116# COMPILERS variable defined there.
1384# This can be overridden by a list in JAVA_PKG_FORCE_COMPILER 2117# This can be overridden by a list in JAVA_PKG_FORCE_COMPILER
1385# 2118#
1386# It will go through the list of compilers, and verify that it supports the 2119# It will go through the list of compilers, and verify that it supports the
1387# target and source that are needed. If it is not suitable, then the next 2120# target and source that are needed. If it is not suitable, then the next
1388# compiler is checked. When JAVA_PKG_FORCE_COMPILER is defined, this checking 2121# compiler is checked. When JAVA_PKG_FORCE_COMPILER is defined, this checking
1389# isn't done. 2122# isn't done.
1390# 2123#
1412 if [[ -z ${JAVA_PKG_FORCE_COMPILER} ]]; then 2145 if [[ -z ${JAVA_PKG_FORCE_COMPILER} ]]; then
1413 compilers="$(source ${JAVA_PKG_COMPILERS_CONF} 1>/dev/null 2>&1; echo ${COMPILERS})" 2146 compilers="$(source ${JAVA_PKG_COMPILERS_CONF} 1>/dev/null 2>&1; echo ${COMPILERS})"
1414 else 2147 else
1415 compilers=${JAVA_PKG_FORCE_COMPILER} 2148 compilers=${JAVA_PKG_FORCE_COMPILER}
1416 fi 2149 fi
1417 2150
1418 debug-print "Read \"${compilers}\" from ${JAVA_PKG_COMPILERS_CONF}" 2151 debug-print "Read \"${compilers}\" from ${JAVA_PKG_COMPILERS_CONF}"
1419 2152
1420 # Figure out if we should announce what compiler we're using 2153 # Figure out if we should announce what compiler we're using
1421 local compiler 2154 local compiler
1422 for compiler in ${compilers}; do 2155 for compiler in ${compilers}; do
1425 if [[ ${compiler} = "javac" ]]; then 2158 if [[ ${compiler} = "javac" ]]; then
1426 debug-print "Found javac... breaking" 2159 debug-print "Found javac... breaking"
1427 export GENTOO_COMPILER="javac" 2160 export GENTOO_COMPILER="javac"
1428 break 2161 break
1429 fi 2162 fi
1430 2163
1431 if has ${compiler} ${JAVA_PKG_FILTER_COMPILER}; then 2164 if has ${compiler} ${JAVA_PKG_FILTER_COMPILER}; then
1432 if [[ -z ${JAVA_PKG_FORCE_COMPILER} ]]; then 2165 if [[ -z ${JAVA_PKG_FORCE_COMPILER} ]]; then
1433 einfo "Filtering ${compiler}" 2166 einfo "Filtering ${compiler}"
1434 continue 2167 continue
1435 fi 2168 fi
1436 fi 2169 fi
1437 2170
1438 # for non-javac, we need to make sure it supports the right target and 2171 # for non-javac, we need to make sure it supports the right target and
1439 # source 2172 # source
1440 local compiler_env="${JAVA_PKG_COMPILER_DIR}/${compiler}" 2173 local compiler_env="${JAVA_PKG_COMPILER_DIR}/${compiler}"
1441 if [[ -f ${compiler_env} ]]; then 2174 if [[ -f ${compiler_env} ]]; then
1442 local desired_target="$(java-pkg_get-target)" 2175 local desired_target="$(java-pkg_get-target)"
1471 done 2204 done
1472 2205
1473 # If it hasn't been defined already, default to javac 2206 # If it hasn't been defined already, default to javac
1474 if [[ -z ${GENTOO_COMPILER} ]]; then 2207 if [[ -z ${GENTOO_COMPILER} ]]; then
1475 if [[ -n ${compilers} ]]; then 2208 if [[ -n ${compilers} ]]; then
1476 einfo "No suitable compiler found: defaulting javac for compilation" 2209 einfo "No suitable compiler found: defaulting to JDK default for compilation"
1477 else 2210 else
1478 # probably don't need to notify users about the default. 2211 # probably don't need to notify users about the default.
1479 :;#einfo "Defaulting to javac for compilation" 2212 :;#einfo "Defaulting to javac for compilation"
1480 fi 2213 fi
2214 if java-config -g GENTOO_COMPILER 2> /dev/null; then
2215 export GENTOO_COMPILER=$(java-config -g GENTOO_COMPILER)
2216 else
1481 export GENTOO_COMPILER=javac 2217 export GENTOO_COMPILER=javac
2218 fi
1482 else 2219 else
1483 einfo "Using ${GENTOO_COMPILER} for compilation" 2220 einfo "Using ${GENTOO_COMPILER} for compilation"
1484 fi 2221 fi
1485 2222
1486} 2223}
1502 fi 2239 fi
1503 2240
1504 JAVA_PKG_SHAREPATH="${DESTTREE}/share/${JAVA_PKG_NAME}" 2241 JAVA_PKG_SHAREPATH="${DESTTREE}/share/${JAVA_PKG_NAME}"
1505 JAVA_PKG_SOURCESPATH="${JAVA_PKG_SHAREPATH}/sources/" 2242 JAVA_PKG_SOURCESPATH="${JAVA_PKG_SHAREPATH}/sources/"
1506 JAVA_PKG_ENV="${D}${JAVA_PKG_SHAREPATH}/package.env" 2243 JAVA_PKG_ENV="${D}${JAVA_PKG_SHAREPATH}/package.env"
2244 JAVA_PKG_VIRTUALS_PATH="${DESTTREE}/share/java-config-2/virtuals"
2245 JAVA_PKG_VIRTUAL_PROVIDER="${D}/${JAVA_PKG_VIRTUALS_PATH}/${JAVA_PKG_NAME}"
1507 2246
1508 [[ -z "${JAVA_PKG_JARDEST}" ]] && JAVA_PKG_JARDEST="${JAVA_PKG_SHAREPATH}/lib" 2247 [[ -z "${JAVA_PKG_JARDEST}" ]] && JAVA_PKG_JARDEST="${JAVA_PKG_SHAREPATH}/lib"
1509 [[ -z "${JAVA_PKG_LIBDEST}" ]] && JAVA_PKG_LIBDEST="${DESTTREE}/$(get_libdir)/${JAVA_PKG_NAME}" 2248 [[ -z "${JAVA_PKG_LIBDEST}" ]] && JAVA_PKG_LIBDEST="${DESTTREE}/$(get_libdir)/${JAVA_PKG_NAME}"
1510 [[ -z "${JAVA_PKG_WARDEST}" ]] && JAVA_PKG_WARDEST="${JAVA_PKG_SHAREPATH}/webapps" 2249 [[ -z "${JAVA_PKG_WARDEST}" ]] && JAVA_PKG_WARDEST="${JAVA_PKG_SHAREPATH}/webapps"
1511 2250
1524# Writes the package.env out to disk. 2263# Writes the package.env out to disk.
1525# 2264#
1526# ------------------------------------------------------------------------------ 2265# ------------------------------------------------------------------------------
1527# TODO change to do-write, to match everything else 2266# TODO change to do-write, to match everything else
1528java-pkg_do_write_() { 2267java-pkg_do_write_() {
2268 debug-print-function ${FUNCNAME} $*
2269 java-pkg_init_paths_
1529 # Create directory for package.env 2270 # Create directory for package.env
1530 dodir "${JAVA_PKG_SHAREPATH}" 2271 dodir "${JAVA_PKG_SHAREPATH}"
1531 if [[ -n "${JAVA_PKG_CLASSPATH}" || -n "${JAVA_PKG_LIBRARY}" || -f "${JAVA_PKG_DEPEND}" ]]; then 2272 if [[ -n "${JAVA_PKG_CLASSPATH}" || -n "${JAVA_PKG_LIBRARY}" || -f \
2273 "${JAVA_PKG_DEPEND_FILE}" || -f \
2274 "${JAVA_PKG_OPTIONAL_DEPEND_FILE}" ]]; then
1532 # Create package.env 2275 # Create package.env
1533 ( 2276 (
1534 echo "DESCRIPTION=\"${DESCRIPTION}\"" 2277 echo "DESCRIPTION=\"${DESCRIPTION}\""
1535 echo "GENERATION=\"2\"" 2278 echo "GENERATION=\"2\""
2279 echo "SLOT=\"${SLOT}\""
1536 2280
1537 [[ -n "${JAVA_PKG_CLASSPATH}" ]] && echo "CLASSPATH=\"${JAVA_PKG_CLASSPATH}\"" 2281 [[ -n "${JAVA_PKG_CLASSPATH}" ]] && echo "CLASSPATH=\"${JAVA_PKG_CLASSPATH}\""
1538 [[ -n "${JAVA_PKG_LIBRARY}" ]] && echo "LIBRARY_PATH=\"${JAVA_PKG_LIBRARY}\"" 2282 [[ -n "${JAVA_PKG_LIBRARY}" ]] && echo "LIBRARY_PATH=\"${JAVA_PKG_LIBRARY}\""
1539 [[ -n "${JAVA_PROVIDE}" ]] && echo "PROVIDES=\"${JAVA_PROVIDE}\"" 2283 [[ -n "${JAVA_PROVIDE}" ]] && echo "PROVIDES=\"${JAVA_PROVIDE}\""
1540 [[ -f "${JAVA_PKG_DEPEND}" ]] && echo "DEPEND=\"$(cat ${JAVA_PKG_DEPEND} | uniq | tr '\n' ':')\"" 2284 [[ -f "${JAVA_PKG_DEPEND_FILE}" ]] \
2285 && echo "DEPEND=\"$(cat "${JAVA_PKG_DEPEND_FILE}" | uniq | tr '\n' ':')\""
2286 [[ -f "${JAVA_PKG_OPTIONAL_DEPEND_FILE}" ]] \
2287 && echo "OPTIONAL_DEPEND=\"$(cat "${JAVA_PKG_OPTIONAL_DEPEND_FILE}" | uniq | tr '\n' ':')\""
1541 echo "VM=\"$(echo ${RDEPEND} ${DEPEND} | sed -e 's/ /\n/g' | sed -n -e '/virtual\/\(jre\|jdk\)/ { p;q }')\"" # TODO cleanup ! 2288 echo "VM=\"$(echo ${RDEPEND} ${DEPEND} | sed -e 's/ /\n/g' | sed -n -e '/virtual\/\(jre\|jdk\)/ { p;q }')\"" # TODO cleanup !
1542 ) > "${JAVA_PKG_ENV}" 2289 ) > "${JAVA_PKG_ENV}"
1543 2290
1544 # register target/source 2291 # register target/source
1545 local target="$(java-pkg_get-target)" 2292 local target="$(java-pkg_get-target)"
1546 local source="$(java-pkg_get-source)" 2293 local source="$(java-pkg_get-source)"
1547 [[ -n ${target} ]] && echo "TARGET=\"${target}\"" >> "${JAVA_PKG_ENV}" 2294 [[ -n ${target} ]] && echo "TARGET=\"${target}\"" >> "${JAVA_PKG_ENV}"
1548 [[ -n ${source} ]] && echo "SOURCE=\"${source}\"" >> "${JAVA_PKG_ENV}" 2295 [[ -n ${source} ]] && echo "SOURCE=\"${source}\"" >> "${JAVA_PKG_ENV}"
1556 2303
1557 2304
1558 echo "MERGE_VM=\"${GENTOO_VM}\"" >> "${JAVA_PKG_ENV}" 2305 echo "MERGE_VM=\"${GENTOO_VM}\"" >> "${JAVA_PKG_ENV}"
1559 [[ -n ${GENTOO_COMPILER} ]] && echo "MERGE_COMPILER=\"${GENTOO_COMPILER}\"" >> "${JAVA_PKG_ENV}" 2306 [[ -n ${GENTOO_COMPILER} ]] && echo "MERGE_COMPILER=\"${GENTOO_COMPILER}\"" >> "${JAVA_PKG_ENV}"
1560 2307
2308 # extra env variables
2309 if [[ -n "${JAVA_PKG_EXTRA_ENV_VARS}" ]]; then
2310 cat "${JAVA_PKG_EXTRA_ENV}" >> "${JAVA_PKG_ENV}" || die
2311 # nested echo to remove leading/trailing spaces
2312 echo "ENV_VARS=\"$(echo ${JAVA_PKG_EXTRA_ENV_VARS})\"" \
2313 >> "${JAVA_PKG_ENV}" || die
2314 fi
2315
1561 # Strip unnecessary leading and trailing colons 2316 # Strip unnecessary leading and trailing colons
1562 # TODO try to cleanup if possible 2317 # TODO try to cleanup if possible
1563 sed -e "s/=\":/=\"/" -e "s/:\"$/\"/" -i "${JAVA_PKG_ENV}" || die "Did you forget to call java_init ?" 2318 sed -e "s/=\":/=\"/" -e "s/:\"$/\"/" -i "${JAVA_PKG_ENV}" || die "Did you forget to call java_init ?"
2319 else
2320 debug-print "JAVA_PKG_CLASSPATH, JAVA_PKG_LIBRARY, JAVA_PKG_DEPEND_FILE"
2321 debug-print "or JAVA_PKG_OPTIONAL_DEPEND_FILE not defined so can't"
2322 debug-print "write package.env."
1564 fi 2323 fi
1565} 2324}
1566
1567 2325
1568# ------------------------------------------------------------------------------ 2326# ------------------------------------------------------------------------------
1569# @internal-function java-pkg_record-jar_ 2327# @internal-function java-pkg_record-jar_
1570# 2328#
1571# Record a dependency to the package.env 2329# Record an (optional) dependency to the package.env
1572# 2330# @param --optional - record dependency as optional
2331# @param $1 - package to record
2332# @param $2 - (optional) jar of package to record
1573# ------------------------------------------------------------------------------ 2333# ------------------------------------------------------------------------------
1574JAVA_PKG_DEPEND="${T}/java-pkg-depend" 2334JAVA_PKG_DEPEND_FILE="${T}/java-pkg-depend"
2335JAVA_PKG_OPTIONAL_DEPEND_FILE="${T}/java-pkg-optional-depend"
1575 2336
1576java-pkg_record-jar_() { 2337java-pkg_record-jar_() {
1577 debug-print-function ${FUNCNAME} $* 2338 debug-print-function ${FUNCNAME} $*
2339
2340 local depend_file="${JAVA_PKG_DEPEND_FILE}"
2341 if [[ "${1}" == "--optional" ]]; then
2342 depend_file="${JAVA_PKG_OPTIONAL_DEPEND_FILE}"
2343 shift
2344 fi
1578 2345
1579 local pkg=${1} jar=${2} append 2346 local pkg=${1} jar=${2} append
1580 if [[ -z "${jar}" ]]; then 2347 if [[ -z "${jar}" ]]; then
1581 append="${pkg}" 2348 append="${pkg}"
1582 else 2349 else
1583 append="$(basename ${jar})@${pkg}" 2350 append="$(basename ${jar})@${pkg}"
1584 fi 2351 fi
1585 2352
1586 echo ${append} >> ${JAVA_PKG_DEPEND} 2353 echo "${append}" >> "${depend_file}"
1587} 2354}
1588 2355
1589# ------------------------------------------------------------------------------ 2356# ------------------------------------------------------------------------------
1590# @internal-function java-pkg_append_ 2357# @internal-function java-pkg_append_
1591# 2358#
1615 fi 2382 fi
1616} 2383}
1617 2384
1618# ------------------------------------------------------------------------------ 2385# ------------------------------------------------------------------------------
1619# @internal-function java-pkg_expand_dir_ 2386# @internal-function java-pkg_expand_dir_
1620# 2387#
1621# Gets the full path of the file/directory's parent. 2388# Gets the full path of the file/directory's parent.
1622# @param $1 - file/directory to find parent directory for 2389# @param $1 - file/directory to find parent directory for
1623# @return - path to $1's parent directory 2390# @return - path to $1's parent directory
1624# ------------------------------------------------------------------------------ 2391# ------------------------------------------------------------------------------
1625java-pkg_expand_dir_() { 2392java-pkg_expand_dir_() {
1651# 2418#
1652# ------------------------------------------------------------------------------ 2419# ------------------------------------------------------------------------------
1653java-pkg_setup-vm() { 2420java-pkg_setup-vm() {
1654 debug-print-function ${FUNCNAME} $* 2421 debug-print-function ${FUNCNAME} $*
1655 2422
2423 export LANG="C" LC_ALL="C"
2424
1656 local vendor="$(java-pkg_get-vm-vendor)" 2425 local vendor="$(java-pkg_get-vm-vendor)"
1657 if [[ "${vendor}" == "sun" ]] && java-pkg_is-vm-version-ge 1 5; then 2426 if [[ "${vendor}" == "sun" ]] && java-pkg_is-vm-version-ge "1.5" ; then
1658 addpredict "/dev/random" 2427 addpredict "/dev/random"
1659 elif [[ "${vendor}" == "ibm" ]]; then 2428 elif [[ "${vendor}" == "ibm" ]]; then
1660 addpredict "/proc/self/maps" 2429 addpredict "/proc/self/maps"
1661 addpredict "/proc/cpuinfo" 2430 addpredict "/proc/cpuinfo"
1662 export LANG="C" LC_ALL="C"
1663 elif [[ "${vendor}" == "jrockit" ]]; then 2431 elif [[ "${vendor}" == "jrockit" ]]; then
1664 addpredict "/proc/cpuinfo" 2432 addpredict "/proc/cpuinfo"
1665 fi 2433 fi
1666} 2434}
1667 2435
1711# @return - The version of the current VM 2479# @return - The version of the current VM
1712# ------------------------------------------------------------------------------ 2480# ------------------------------------------------------------------------------
1713java-pkg_get-vm-version() { 2481java-pkg_get-vm-version() {
1714 debug-print-function ${FUNCNAME} $* 2482 debug-print-function ${FUNCNAME} $*
1715 2483
1716 java-pkg_get-current-vm | sed -e "s/.*-\([0-9.]\+\).*/\1/" 2484 java-config -g PROVIDES_VERSION
1717} 2485}
1718 2486
1719# ------------------------------------------------------------------------------ 2487# ------------------------------------------------------------------------------
1720# @internal-function java-pkg_switch-vm 2488# @internal-function java-pkg_switch-vm
1721# 2489#
1722# Switch VM if we're allowed to (controlled by JAVA_PKG_ALLOW_VM_CHANGE), and 2490# Switch VM if we're allowed to (controlled by JAVA_PKG_ALLOW_VM_CHANGE), and
1723# verify that the current VM is sufficient. 2491# verify that the current VM is sufficient.
1724# Setup the environment for the VM being used. 2492# Setup the environment for the VM being used.
1725# ------------------------------------------------------------------------------ 2493# ------------------------------------------------------------------------------
1726java-pkg_switch-vm() { 2494java-pkg_switch-vm() {
2495 debug-print-function ${FUNCNAME} $*
2496
1727 if java-pkg_needs-vm; then 2497 if java-pkg_needs-vm; then
1728 # Use the VM specified by JAVA_PKG_FORCE_VM 2498 # Use the VM specified by JAVA_PKG_FORCE_VM
1729 if [[ -n ${JAVA_PKG_FORCE_VM} ]]; then 2499 if [[ -n "${JAVA_PKG_FORCE_VM}" ]]; then
1730 # If you're forcing the VM, I hope you know what your doing... 2500 # If you're forcing the VM, I hope you know what your doing...
2501 debug-print "JAVA_PKG_FORCE_VM used: ${JAVA_PKG_FORCE_VM}"
1731 export GENTOO_VM="${JAVA_PKG_FORCE_VM}" 2502 export GENTOO_VM="${JAVA_PKG_FORCE_VM}"
1732 # if we're allowed to switch the vm... 2503 # if we're allowed to switch the vm...
1733 elif [[ "${JAVA_PKG_ALLOW_VM_CHANGE}" == "yes" ]]; then 2504 elif [[ "${JAVA_PKG_ALLOW_VM_CHANGE}" == "yes" ]]; then
1734 debug-print "depend-java-query: NV_DEPEND: ${JAVA_PKG_NV_DEPEND:-${DEPEND}} VNEED: ${JAVA_PKG_VNEED}" 2505 debug-print "depend-java-query: NV_DEPEND: ${JAVA_PKG_NV_DEPEND:-${DEPEND}} VNEED: ${JAVA_PKG_VNEED}"
1735 if [[ -n ${JAVA_PKG_VNEED} ]]; then 2506 if [[ -n ${JAVA_PKG_VNEED} ]]; then
1736 export GENTOO_VM="$(depend-java-query --need-virtual "${JAVA_PKG_VNEED}" --get-vm "${JAVA_PKG_NV_DEPEND:-${DEPEND}}")" 2507 GENTOO_VM="$(depend-java-query --need-virtual "${JAVA_PKG_VNEED}" --get-vm "${JAVA_PKG_NV_DEPEND:-${DEPEND}}")"
1737 else 2508 else
1738 export GENTOO_VM="$(depend-java-query --get-vm "${JAVA_PKG_NV_DEPEND:-${DEPEND}}")" 2509 GENTOO_VM="$(depend-java-query --get-vm "${JAVA_PKG_NV_DEPEND:-${DEPEND}}")"
2510 fi
2511 if [[ -z "${GENTOO_VM}" || "${GENTOO_VM}" == "None" ]]; then
2512 eerror "Unable to determine VM for building from dependencies:"
2513 echo "NV_DEPEND: ${JAVA_PKG_NV_DEPEND:-${DEPEND}}"
2514 echo "VNEED: ${JAVA_PKG_VNEED}"
2515 die "Failed to determine VM for building."
2516 else
2517 export GENTOO_VM
1739 fi 2518 fi
1740 # otherwise just make sure the current VM is sufficient 2519 # otherwise just make sure the current VM is sufficient
1741 else 2520 else
1742 java-pkg_ensure-vm-version-sufficient 2521 java-pkg_ensure-vm-version-sufficient
1743 fi 2522 fi
1744 debug-print "Using: $(java-config -f)" 2523 debug-print "Using: $(java-config -f)"
1745 2524
1746 java-pkg_setup-vm 2525 java-pkg_setup-vm
1747 2526
1748 export JAVA=$(java-config --java) 2527 export JAVA=$(java-config --java)
1749 export JAVAC=$(java-config --javac) 2528 export JAVAC=$(java-config --javac)
1750 export JAVACFLAGS="$(java-pkg_javac-args)" 2529 JAVACFLAGS="$(java-pkg_javac-args)"
2530 if [[ ${?} != 0 ]]; then
2531 eerror "There was a problem determining JAVACFLAGS: ${JAVACFLAGS}"
2532 die "java-pkg_javac-args failed"
2533 fi
1751 [[ -n ${JAVACFLAGS_EXTRA} ]] && export JAVACFLAGS="${JAVACFLAGS_EXTRA} ${JAVACFLAGS}" 2534 [[ -n ${JAVACFLAGS_EXTRA} ]] && JAVACFLAGS="${JAVACFLAGS_EXTRA} ${JAVACFLAGS}"
2535 export JAVACFLAGS
1752 2536
1753 export JAVA_HOME="$(java-config -g JAVA_HOME)" 2537 export JAVA_HOME="$(java-config -g JAVA_HOME)"
1754 export JDK_HOME=${JAVA_HOME} 2538 export JDK_HOME=${JAVA_HOME}
1755 2539
1756 #TODO If you know a better solution let us know. 2540 #TODO If you know a better solution let us know.
1757 java-pkg_append_ LD_LIBRARY_PATH "$(java-config -g LDPATH)" 2541 java-pkg_append_ LD_LIBRARY_PATH "$(java-config -g LDPATH)"
1758 2542
1759 local tann="${T}/announced-vm" 2543 local tann="${T}/announced-vm"
2544 # With the hooks we should only get here once from pkg_setup but better safe than sorry
2545 # if people have for example modified eclasses some where
1760 if [[ -n "${JAVA_PKG_DEBUG}" ]] || [[ ! -f "${tann}" ]] ; then 2546 if [[ -n "${JAVA_PKG_DEBUG}" ]] || [[ ! -f "${tann}" ]] ; then
1761 # Add a check for setup/preinst phase... to avoid duplicate outputs
1762 # for when FEATURES=buildpkg
1763 if [[ ${EBUILD_PHASE} != "setup" && ${EBUILD_PHASE} != "preinst" && ${EBUILD_PHASE} != "postinst" ]];
1764 then
1765 einfo "Using: $(java-config -f)" 2547 einfo "Using: $(java-config -f)"
1766 [[ ! -f "${tann}" ]] && touch "${tann}" 2548 [[ ! -f "${tann}" ]] && touch "${tann}"
1767 fi
1768 fi 2549 fi
1769 2550
1770 else 2551 else
1771 [[ -n "${JAVA_PKG_DEBUG}" ]] && ewarn "!!! This package inherits java-pkg but doesn't depend on a JDK. -bin or broken dependency!!!" 2552 [[ -n "${JAVA_PKG_DEBUG}" ]] && ewarn "!!! This package inherits java-pkg but doesn't depend on a JDK. -bin or broken dependency!!!"
1772 fi 2553 fi
1802 einfo "Classes" 2583 einfo "Classes"
1803 find "${S}" -type f -name '*.class' -print0 | xargs -0 -r -n 500 ls -ald | sed -e "s,${WORKDIR},\${WORKDIR}," 2584 find "${S}" -type f -name '*.class' -print0 | xargs -0 -r -n 500 ls -ald | sed -e "s,${WORKDIR},\${WORKDIR},"
1804 fi 2585 fi
1805} 2586}
1806 2587
1807# TODO document 2588# ------------------------------------------------------------------------------
2589# @internal-function java-pkg_verify-classes
2590#
1808# Verify that the classes were compiled for the right source / target 2591# Verify that the classes were compiled for the right source / target. Dies if
2592# not.
2593# @param $1 (optional) - the file to check, otherwise checks whole ${D}
2594# ------------------------------------------------------------------------------
1809java-pkg_verify-classes() { 2595java-pkg_verify-classes() {
1810 ebegin "Verifying java class versions"
1811 #$(find ${D} -type f -name '*.jar' -o -name '*.class') 2596 #$(find ${D} -type f -name '*.jar' -o -name '*.class')
1812 class-version-verify.py -t $(java-pkg_get-target) -r ${D} 2597
2598 local version_verify="/usr/bin/class-version-verify.py"
2599
2600 if [[ ! -x "${version_verify}" ]]; then
2601 version_verify="/usr/$(get_libdir)/javatoolkit/bin/class-version-verify.py"
2602 fi
2603
2604 if [[ ! -x "${version_verify}" ]]; then
2605 ewarn "Unable to perform class version checks as"
2606 ewarn "class-version-verify.py is unavailable"
2607 ewarn "Please install dev-java/javatoolkit."
2608 return
2609 fi
2610
2611 local target=$(java-pkg_get-target)
2612 local result
2613 local log="${T}/class-version-verify.log"
2614 if [[ -n "${1}" ]]; then
2615 ${version_verify} -v -t ${target} "${1}" > "${log}"
1813 result=$? 2616 result=$?
1814 eend ${result}
1815 if [[ ${result} == 0 ]]; then
1816 einfo "All good"
1817 else 2617 else
1818 ewarn "Possible problem" 2618 ebegin "Verifying java class versions (target: ${target})"
1819 die "Bad class files found" 2619 ${version_verify} -v -t ${target} -r "${D}" > "${log}"
2620 result=$?
2621 eend ${result}
2622 fi
2623 [[ -n ${JAVA_PKG_DEBUG} ]] && cat "${log}"
2624 if [[ ${result} != 0 ]]; then
2625 eerror "Incorrect bytecode version found"
2626 [[ -n "${1}" ]] && eerror "in file: ${1}"
2627 eerror "See ${log} for more details."
2628 die "Incorrect bytecode found"
2629 fi
2630}
2631
2632# ----------------------------------------------------------------------------
2633# @internal-function java-pkg_ensure-dep
2634# Check that a package being used in jarfrom, getjars and getjar is contained
2635# within DEPEND or RDEPEND.
2636# @param $1 - empty - check both vars; "runtime" or "build" - check only
2637# RDEPEND, resp. DEPEND
2638# @param $2 - Package name and slot.
2639
2640java-pkg_ensure-dep() {
2641 debug-print-function ${FUNCNAME} $*
2642
2643 local limit_to="${1}"
2644 local target_pkg="${2}"
2645 local dev_error=""
2646
2647 local stripped_pkg=$(echo "${target_pkg}" | sed \
2648 's/-[0-9]*\(\.[0-9]\)*$//')
2649
2650 debug-print "Matching against: ${stripped_pkg}"
2651
2652 if [[ ${limit_to} != runtime && ! ( "${DEPEND}" =~ "$stripped_pkg" ) ]]; then
2653 dev_error="The ebuild is attempting to use ${target_pkg} that is not"
2654 dev_error="${dev_error} declared in DEPEND."
2655 if is-java-strict; then
2656 eerror "${dev_error}"
2657 die "${dev_error}"
2658 elif [[ ${BASH_SUBSHELL} = 0 ]]; then
2659 eerror "${dev_error}"
2660 elog "Because you have this package installed the package will"
2661 elog "build without problems, but please report this to"
2662 elog "http://bugs.gentoo.org"
1820 fi 2663 fi
1821} 2664 fi
1822 2665
2666 if [[ ${limit_to} != build ]]; then
2667 if [[ ! ( ${RDEPEND} =~ "${stripped_pkg}" ) ]]; then
2668 if [[ ! ( ${PDEPEND} =~ "${stripped_pkg}" ) ]]; then
2669 dev_error="The ebuild is attempting to use ${target_pkg},"
2670 dev_error="${dev_error} without specifying --build-only, that is not declared in RDEPEND"
2671 dev_error="${dev_error} or PDEPEND."
2672 if is-java-strict; then
2673 eerror "${dev_error}"
2674 die "${dev_error}"
2675 elif [[ ${BASH_SUBSHELL} = 0 ]]; then
2676 eerror "${dev_error}"
2677 elog "The package will build without problems, but may fail to run"
2678 elog "if you don't have ${target_pkg} installed, so please report"
2679 elog "this to http://bugs.gentoo.org"
2680 fi
2681 fi
2682 fi
2683 fi
2684}
1823 2685
1824# ------------------------------------------------------------------------------ 2686# ------------------------------------------------------------------------------
1825# @section-end internal 2687# @section-end internal
1826# ------------------------------------------------------------------------------ 2688# ------------------------------------------------------------------------------
1827 2689
1828java-pkg_check-phase() { 2690java-pkg_check-phase() {
1829 local phase=${1} 2691 local phase=${1}
1830 local funcname=${2} 2692 local funcname=${FUNCNAME[1]}
1831 if is-java-strict && [[ ${EBUILD_PHASE} != ${phase} ]]; then 2693 if [[ ${EBUILD_PHASE} != ${phase} ]]; then
1832 java-pkg_announce-qa-violation \
1833 "${funcname} used outside of src_${phase}" 2694 local msg="${funcname} used outside of src_${phase}"
2695 java-pkg_announce-qa-violation "${msg}"
1834 fi 2696 fi
1835} 2697}
1836 2698
1837java-pkg_check-versioned-jar() { 2699java-pkg_check-versioned-jar() {
1838 local jar=${1} 2700 local jar=${1}
1847 java-pkg_announce-qa-violation "deprecated USE flag 'jikes' in IUSE" 2709 java-pkg_announce-qa-violation "deprecated USE flag 'jikes' in IUSE"
1848 fi 2710 fi
1849} 2711}
1850 2712
1851java-pkg_announce-qa-violation() { 2713java-pkg_announce-qa-violation() {
1852 if is-java-strict; then 2714 local nodie
2715 if [[ ${1} == "--nodie" ]]; then
2716 nodie="true"
2717 shift
2718 fi
1853 echo "Java QA Notice: $@" >&2 2719 echo "Java QA Notice: $@" >&2
1854 increment-qa-violations 2720 increment-qa-violations
1855 fi 2721 [[ -z "${nodie}" ]] && is-java-strict && die "${@}"
1856} 2722}
1857 2723
1858increment-qa-violations() { 2724increment-qa-violations() {
1859 let "JAVA_PKG_QA_VIOLATIONS+=1" 2725 let "JAVA_PKG_QA_VIOLATIONS+=1"
1860 export JAVA_PKG_QA_VIOLATIONS 2726 export JAVA_PKG_QA_VIOLATIONS
1863is-java-strict() { 2729is-java-strict() {
1864 [[ -n ${JAVA_PKG_STRICT} ]] 2730 [[ -n ${JAVA_PKG_STRICT} ]]
1865 return $? 2731 return $?
1866} 2732}
1867 2733
2734[[ "${EAPI}" = "2" ]] && EXPORT_FUNCTIONS src_prepare
2735
1868# ------------------------------------------------------------------------------ 2736# ------------------------------------------------------------------------------
1869# @eclass-end 2737# @eclass-end
1870# ------------------------------------------------------------------------------ 2738# ------------------------------------------------------------------------------

Legend:
Removed from v.1.15  
changed lines
  Added in v.1.113

  ViewVC Help
Powered by ViewVC 1.1.20