/[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.3 Revision 1.67
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# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.67 2007/03/22 03:11:19 nichoj Exp $
9 10
10 11
11# ----------------------------------------------------------------------------- 12# -----------------------------------------------------------------------------
12# @eclass-begin 13# @eclass-begin
13# @eclass-shortdesc Java Utility eclass 14# @eclass-shortdesc Java Utility eclass
14# @eclass-maintainer java@gentoo.org 15# @eclass-maintainer java@gentoo.org
15# 16#
16# This eclass provides functionality which is used by 17# This eclass provides functionality which is used by
17# java-pkg.eclass and java-pkg-opt.eclass as well as from ebuilds. 18# java-pkg.eclass and java-pkg-opt.eclass as well as from ebuilds.
18# 19#
19# @warning 20# @warning
20# You probably don't want to inherit this directly from an ebuild. Instead, 21# 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 22# 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. 23# Java packages, or java-pkg-opt for packages that have optional Java support.
23# 24#
24# ----------------------------------------------------------------------------- 25# -----------------------------------------------------------------------------
25 26
26inherit eutils versionator multilib 27inherit eutils versionator multilib
28
29IUSE="elibc_FreeBSD"
27 30
28# ----------------------------------------------------------------------------- 31# -----------------------------------------------------------------------------
29# @section-begin variables 32# @section-begin variables
30# @section-title Variables 33# @section-title Variables
31# 34#
34 37
35# Make sure we use java-config-2 38# Make sure we use java-config-2
36export WANT_JAVA_CONFIG="2" 39export WANT_JAVA_CONFIG="2"
37 40
38# ----------------------------------------------------------------------------- 41# -----------------------------------------------------------------------------
42# @variable-external WANT_ANT_TASKS
43# @variable-default ""
44#
45# An $IFS separated list of ant tasks.
46# Ebuild can specify this variable before inheriting java-ant-2 eclass to
47# determine ANT_TASKS it needs. They will be automatically translated to
48# DEPEND variable and ANT_TASKS variable. JAVA_PKG_FORCE_ANT_TASKS can override
49# ANT_TASKS set by WANT_ANT_TASKS, but not the DEPEND due to caching.
50# Ebuilds that need to depend conditionally on certain tasks and specify them
51# differently for different eant calls can't use this simplified approach.
52# You also cannot specify version or anything else than ant-*.
53#
54# @example WANT_ANT_TASKS="ant-junit ant-trax"
55#
56# @seealso JAVA_PKG_FORCE_ANT_TASKS
57# -----------------------------------------------------------------------------
58#WANT_ANT_TASKS
59
60# -----------------------------------------------------------------------------
61# @variable-internal JAVA_PKG_PORTAGE_DEP
62#
63# The version of portage we need to function properly. At this moment it's
64# portage with phase hooks support.
65# -----------------------------------------------------------------------------
66JAVA_PKG_PORTAGE_DEP=">=sys-apps/portage-2.1_pre1"
67
68# -----------------------------------------------------------------------------
39# @variable-internal JAVA_PKG_E_DEPEND 69# @variable-internal JAVA_PKG_E_DEPEND
40# 70#
41# 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
42# 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. We also need a recent version
43# portage, that includes phase hooks. 73# portage, that includes phase hooks.
44# ----------------------------------------------------------------------------- 74# -----------------------------------------------------------------------------
45JAVA_PKG_E_DEPEND=">=dev-java/java-config-2.0.19-r1 >=sys-apps/portage-2.1_pre1" 75JAVA_PKG_E_DEPEND=">=dev-java/java-config-2.0.31 ${JAVA_PKG_PORTAGE_DEP}"
46 76
47# ----------------------------------------------------------------------------- 77# -----------------------------------------------------------------------------
48# @variable-external JAVA_PKG_ALLOW_VM_CHANGE 78# @variable-external JAVA_PKG_ALLOW_VM_CHANGE
49# @variable-default yes 79# @variable-default yes
50# 80#
97# ----------------------------------------------------------------------------- 127# -----------------------------------------------------------------------------
98 128
99# ----------------------------------------------------------------------------- 129# -----------------------------------------------------------------------------
100# @variable-internal JAVA_PKG_COMPILER_DIR 130# @variable-internal JAVA_PKG_COMPILER_DIR
101# @default /usr/share/java-config-2/compiler 131# @default /usr/share/java-config-2/compiler
102# 132#
103# Directory where compiler settings are saved, without trailing slash. 133# Directory where compiler settings are saved, without trailing slash.
104# Probably shouldn't touch this variable. 134# Probably shouldn't touch this variable.
105# ----------------------------------------------------------------------------- 135# -----------------------------------------------------------------------------
106JAVA_PKG_COMPILER_DIR=${JAVA_PKG_COMPILER_DIR:="/usr/share/java-config-2/compiler"} 136JAVA_PKG_COMPILER_DIR=${JAVA_PKG_COMPILER_DIR:="/usr/share/java-config-2/compiler"}
107 137
117 147
118# ----------------------------------------------------------------------------- 148# -----------------------------------------------------------------------------
119# @variable-external JAVA_PKG_FORCE_COMPILER 149# @variable-external JAVA_PKG_FORCE_COMPILER
120# 150#
121# Explicitly set a list of compilers to use. This is normally read from 151# Explicitly set a list of compilers to use. This is normally read from
122# JAVA_PKG_COMPILERS_CONF. 152# JAVA_PKG_COMPILERS_CONF.
123# 153#
124# @note This should only be used internally or for testing. 154# @note This should only be used internally or for testing.
125# @example Use jikes and javac, in that order 155# @example Use jikes and javac, in that order
126# JAVA_PKG_FORCE_COMPILER="jikes javac" 156# JAVA_PKG_FORCE_COMPILER="jikes javac"
127# ----------------------------------------------------------------------------- 157# -----------------------------------------------------------------------------
128 158
159# -----------------------------------------------------------------------------
160# @variable-external JAVA_PKG_FORCE_ANT_TASKS
161#
162# An $IFS separated list of ant tasks. Can be set in environment before calling
163# emerge/ebuild to override variables set in ebuild, mainly for testing before
164# putting the resulting (WANT_)ANT_TASKS into ebuild. Affects only ANT_TASKS in
165# eant() call, not the dependencies specified in WANT_ANT_TASKS.
166#
167# @example JAVA_PKG_FORCE_ANT_TASKS="ant-junit ant-trax" \
168# ebuild foo.ebuild compile
169#
170# @seealso WANT_ANT_TASKS
171# -----------------------------------------------------------------------------
172
129# TODO document me 173# TODO document me
130JAVA_PKG_QA_VIOLATIONS=0 174JAVA_PKG_QA_VIOLATIONS=0
131 175
132# ----------------------------------------------------------------------------- 176# -----------------------------------------------------------------------------
133# @section-end variables 177# @section-end variables
140# 184#
141# These are used to install Java-related things, such as jars, Javadocs, JNI 185# These are used to install Java-related things, such as jars, Javadocs, JNI
142# libraries, etc. 186# libraries, etc.
143# ----------------------------------------------------------------------------- 187# -----------------------------------------------------------------------------
144 188
189# -----------------------------------------------------------------------------
190# @ebuild-function java-pkg_doexamples
191#
192# Installs given arguments to /usr/share/doc/${PF}/examples
193# If you give it only one parameter and it is a directory it will install
194# everything in that directory to the examples directory.
195#
196# @example
197# java-pkg_doexamples demo
198# java-pkg_doexamples demo/* examples/*
199#
200# @param $* - list of files to install
201# ------------------------------------------------------------------------------
202java-pkg_doexamples() {
203 debug-print-function ${FUNCNAME} $*
204
205 [[ ${#} -lt 1 ]] && die "At least one argument needed"
206
207 java-pkg_check-phase install
208
209 local dest=/usr/share/doc/${PF}/examples
210 if [[ ${#} = 1 && -d ${1} ]]; then
211 INSDESTTREE="${dest}" doins -r ${1}/* || die "Installing examples failed"
212 else
213 INSDESTTREE="${dest}" doins -r "${@}" || die "Installing examples failed"
214 fi
215}
145 216
146# ----------------------------------------------------------------------------- 217# -----------------------------------------------------------------------------
147# @ebuild-function java-pkg_dojar 218# @ebuild-function java-pkg_dojar
148# 219#
149# Installs any number of jars. 220# Installs any number of jars.
150# Jar's will be installed into /usr/share/${PN}(-${SLOT})/lib/ by default. 221# Jar's will be installed into /usr/share/${PN}(-${SLOT})/lib/ by default.
151# You can use java-pkg_jarinto to change this path. 222# You can use java-pkg_jarinto to change this path.
152# You should never install a jar with a package version in the filename. 223# You should never install a jar with a package version in the filename.
153# Instead, use java-pkg_newjar defined below. 224# Instead, use java-pkg_newjar defined below.
154# 225#
155# @example 226# @example
156# java-pkg_dojar dist/${PN}.jar dist/${PN}-core.jar 227# java-pkg_dojar dist/${PN}.jar dist/${PN}-core.jar
157# 228#
168 # Create JARDEST if it doesn't exist 239 # Create JARDEST if it doesn't exist
169 dodir ${JAVA_PKG_JARDEST} 240 dodir ${JAVA_PKG_JARDEST}
170 241
171 local jar 242 local jar
172 # for each jar 243 # for each jar
173 for jar in "$@"; do 244 for jar in "${@}"; do
174 local jar_basename=$(basename "${jar}") 245 local jar_basename=$(basename "${jar}")
175 246
176 java-pkg_check-versioned-jar ${jar_basename} 247 java-pkg_check-versioned-jar ${jar_basename}
177 248
178 # check if it exists 249 # check if it exists
179 if [[ -e "${jar}" ]] ; then 250 if [[ -e "${jar}" ]] ; then
251 # Don't overwrite if jar has already been installed with the same
252 # name
253 local dest="${D}${JAVA_PKG_JARDEST}/${jar_basename}"
254 if [[ -e "${dest}" ]]; then
255 ewarn "Overwriting ${dest}"
256 fi
257
180 # install it into JARDEST if it's a non-symlink 258 # install it into JARDEST if it's a non-symlink
181 if [[ ! -L "${jar}" ]] ; then 259 if [[ ! -L "${jar}" ]] ; then
260 #but first check class version when in strict mode.
261 is-java-strict && java-pkg_verify-classes "${jar}"
262
182 INSDESTTREE="${JAVA_PKG_JARDEST}" \ 263 INSDESTTREE="${JAVA_PKG_JARDEST}" \
183 doins "${jar}" || die "failed to install ${jar}" 264 doins "${jar}" || die "failed to install ${jar}"
184 java-pkg_append_ JAVA_PKG_CLASSPATH "${JAVA_PKG_JARDEST}/${jar_basename}" 265 java-pkg_append_ JAVA_PKG_CLASSPATH "${JAVA_PKG_JARDEST}/${jar_basename}"
185 debug-print "installed ${jar} to ${D}${JAVA_PKG_JARDEST}" 266 debug-print "installed ${jar} to ${D}${JAVA_PKG_JARDEST}"
186 # make a symlink to the original jar if it's symlink 267 # make a symlink to the original jar if it's symlink
197 278
198 java-pkg_do_write_ 279 java-pkg_do_write_
199} 280}
200 281
201 282
283# ------------------------------------------------------------------------------
284# @internal-function depend-java-query
285#
286# Wrapper for the depend-java-query binary to enable passing USE in env.
287# Using env variables keeps this eclass working with java-config versions that
288# do not handle use flags.
289# ------------------------------------------------------------------------------
290
291depend-java-query() {
292 # Used to have a which call here but it caused endless loops for some people
293 # that had some weird bashrc voodoo for which.
294 USE="${USE}" /usr/bin/depend-java-query "${@}"
295}
202 296
203# ------------------------------------------------------------------------------ 297# ------------------------------------------------------------------------------
204# @ebuild-function java-pkg_regjar 298# @ebuild-function java-pkg_regjar
205# 299#
206# Records an already installed jar in the package.env 300# Records an already installed jar in the package.env
207# This would mostly be used if the package has make or a custom script to 301# This would mostly be used if the package has make or a custom script to
208# install things. 302# install things.
209# 303#
210# Example: 304# Example:
211# java-pkg-regjar ${D}/opt/foo/lib/foo.jar 305# java-pkg_regjar ${D}/opt/foo/lib/foo.jar
306#
307# WARNING:
308# if you want to use shell expansion, you have to use ${D}/... as the for in
309# this function will not be able to expand the path, here's an example:
310#
311# java-pkg_regjar /opt/my-java/lib/*.jar
312#
313# will not work, because:
314# * the `for jar in "$@"` can't expand the path to jar file names, as they
315# don't exist yet
316# * all `if ...` inside for will fail - the file '/opt/my-java/lib/*.jar'
317# doesn't exist
318#
319# you have to use it as:
320#
321# java-pkg_regjar ${D}/opt/my-java/lib/*.jar
212# 322#
213# @param $@ - jars to record 323# @param $@ - jars to record
214# ------------------------------------------------------------------------------ 324# ------------------------------------------------------------------------------
215# TODO fix me! 325# TODO should we be making sure the jar is present on ${D} or wherever?
216java-pkg_regjar() { 326java-pkg_regjar() {
217 debug-print-function ${FUNCNAME} $* 327 debug-print-function ${FUNCNAME} $*
218 328
219 java-pkg_check-phase install 329 java-pkg_check-phase install
220 330
221 [[ ${#} -lt 1 ]] && die "at least one argument needed" 331 [[ ${#} -lt 1 ]] && die "at least one argument needed"
222 332
223 java-pkg_init_paths_ 333 java-pkg_init_paths_
224 334
225 local jar jar_dir jar_file 335 local jar jar_dir jar_file
226 for jar in "$@"; do 336 for jar in "${@}"; do
227 # TODO use java-pkg_check-versioned-jar 337 # TODO use java-pkg_check-versioned-jar
228 if [[ -e "${jar}" ]]; then
229 java-pkg_append_ JAVA_PKG_CLASSPATH "${jar}"
230 elif [[ -e "${D}${jar}" ]]; then 338 if [[ -e "${jar}" || -e "${D}${jar}" ]]; then
339 [[ -d "${jar}" || -d "${D}${jar}" ]] \
340 && die "Called ${FUNCNAME} on a directory $*"
341
342 #check that class version correct when in strict mode
343 is-java-strict && java-pkg_verify-classes "${jar}"
344
345 # nelchael: we should strip ${D} in this case too, here's why:
346 # imagine such call:
347 # java-pkg_regjar ${D}/opt/java/*.jar
348 # such call will fall into this case (-e ${jar}) and will
349 # record paths with ${D} in package.env
231 java-pkg_append_ JAVA_PKG_CLASSPATH "${jar#${D}}" 350 java-pkg_append_ JAVA_PKG_CLASSPATH "${jar#${D}}"
232 else 351 else
233 die "${jar} does not exist" 352 die "${jar} does not exist"
234 fi 353 fi
235 done 354 done
236 355
237 java-pkg_do_write_ 356 java-pkg_do_write_
238} 357}
239 358
240
241# ------------------------------------------------------------------------------ 359# ------------------------------------------------------------------------------
242# @ebuild-function java-pkg_newjar 360# @ebuild-function java-pkg_newjar
243# 361#
244# Installs a jar with a new name 362# Installs a jar with a new name
245# 363#
255 local original_jar="${1}" 373 local original_jar="${1}"
256 local new_jar="${2:-${PN}.jar}" 374 local new_jar="${2:-${PN}.jar}"
257 local new_jar_dest="${T}/${new_jar}" 375 local new_jar_dest="${T}/${new_jar}"
258 376
259 [[ -z ${original_jar} ]] && die "Must specify a jar to install" 377 [[ -z ${original_jar} ]] && die "Must specify a jar to install"
260 [[ ! -f ${original_jar} ]] && die "${new_jar} does not exist!" 378 [[ ! -f ${original_jar} ]] \
379 && die "${original_jar} does not exist or is not a file!"
261 380
262 rm -f "${new_jar_dest}" || die "Failed to remove ${new_jar_dest}" 381 rm -f "${new_jar_dest}" || die "Failed to remove ${new_jar_dest}"
263 cp "${original_jar}" "${new_jar_dest}" \ 382 cp "${original_jar}" "${new_jar_dest}" \
264 || die "Failed to copy ${original_jar} to ${new_jar_dest}" 383 || die "Failed to copy ${original_jar} to ${new_jar_dest}"
265 java-pkg_dojar "${new_jar_dest}" 384 java-pkg_dojar "${new_jar_dest}"
266} 385}
267 386
268
269# ------------------------------------------------------------------------------ 387# ------------------------------------------------------------------------------
270# @ebuild-function java-pkg_addcp 388# @ebuild-function java-pkg_addcp
271# 389#
272# Add something to the package's classpath. For jars, you should use dojar, 390# Add something to the package's classpath. For jars, you should use dojar,
273# newjar, or regjar. This is typically used to add directories to the classpath. 391# newjar, or regjar. This is typically used to add directories to the classpath.
278java-pkg_addcp() { 396java-pkg_addcp() {
279 java-pkg_append_ JAVA_PKG_CLASSPATH "${@}" 397 java-pkg_append_ JAVA_PKG_CLASSPATH "${@}"
280 java-pkg_do_write_ 398 java-pkg_do_write_
281} 399}
282 400
283
284# ------------------------------------------------------------------------------ 401# ------------------------------------------------------------------------------
285# @ebuild-function java-pkg_doso 402# @ebuild-function java-pkg_doso
286# 403#
287# Installs any number of JNI libraries 404# Installs any number of JNI libraries
288# They will be installed into /usr/lib by default, but java-pkg_sointo 405# They will be installed into /usr/lib by default, but java-pkg_sointo
289# can be used change this path 406# can be used change this path
290# 407#
291# Example: 408# Example:
316 java-pkg_append_ JAVA_PKG_LIBRARY "${JAVA_PKG_LIBDEST}" 433 java-pkg_append_ JAVA_PKG_LIBRARY "${JAVA_PKG_LIBDEST}"
317 debug-print "Installing ${lib} to ${JAVA_PKG_LIBDEST}" 434 debug-print "Installing ${lib} to ${JAVA_PKG_LIBDEST}"
318 # otherwise make a symlink to the symlink's origin 435 # otherwise make a symlink to the symlink's origin
319 else 436 else
320 # TODO use dosym 437 # TODO use dosym
438 ln -s "$(readlink "${lib}")" \
321 ln -s "$(readlink "${lib}")" "${D}${JAVA_PKG_LIBDEST}/$(basename "${lib}")" 439 "${D}${JAVA_PKG_LIBDEST}/$(basename "${lib}")"
322 debug-print "${lib} is a symlink, linking accordanly" 440 debug-print "${lib} is a symlink, linking accordanly"
323 fi 441 fi
324 # otherwise die 442 # otherwise die
325 else 443 else
326 die "${lib} does not exist" 444 die "${lib} does not exist"
346 java-pkg_check-phase install 464 java-pkg_check-phase install
347 465
348 [[ ${#} -lt 1 ]] && "at least one argument needed" 466 [[ ${#} -lt 1 ]] && "at least one argument needed"
349 467
350 java-pkg_init_paths_ 468 java-pkg_init_paths_
351 469
352 local lib target_dir 470 local lib target_dir
353 for lib in "$@" ; do 471 for lib in "$@" ; do
354 # Check the absolute path of the lib 472 # Check the absolute path of the lib
355 if [[ -e "${lib}" ]] ; then 473 if [[ -e "${lib}" ]] ; then
356 target_dir="$(java-pkg_expand_dir_ ${lib})" 474 target_dir="$(java-pkg_expand_dir_ ${lib})"
404# ------------------------------------------------------------------------------ 522# ------------------------------------------------------------------------------
405java-pkg_dohtml() { 523java-pkg_dohtml() {
406 debug-print-function ${FUNCNAME} $* 524 debug-print-function ${FUNCNAME} $*
407 525
408 [[ ${#} -lt 1 ]] && die "At least one argument required for ${FUNCNAME}" 526 [[ ${#} -lt 1 ]] && die "At least one argument required for ${FUNCNAME}"
409 # TODO-nichoj find out what exactly -f package-list does 527
528 # from /usr/lib/portage/bin/dohtml -h
529 # -f Set list of allowed extensionless file names.
410 dohtml -f package-list "$@" 530 dohtml -f package-list "$@"
531
411 # this probably shouldn't be here but it provides 532 # this probably shouldn't be here but it provides
412 # a reasonable way to catch # docs for all of the 533 # a reasonable way to catch # docs for all of the
413 # old ebuilds. 534 # old ebuilds.
414 java-pkg_recordjavadoc 535 java-pkg_recordjavadoc
415} 536}
416 537
417# TODO document 538# ------------------------------------------------------------------------------
539# @ebuild-function java-pkg_dojavadoc
540#
541# Installs javadoc documentation. This should be controlled by the doc use flag.
542#
543# @param $1: - The javadoc root directory.
544#
545# @example:
546# java-pkg_dojavadoc docs/api
547#
548# ------------------------------------------------------------------------------
418java-pkg_dojavadoc() { 549java-pkg_dojavadoc() {
419 local dir="$1" 550 local dir="$1"
420 551
421 java-pkg_check-phase install 552 java-pkg_check-phase install
422 553
434} 565}
435 566
436# ------------------------------------------------------------------------------ 567# ------------------------------------------------------------------------------
437# @ebuild-function java-pkg_dosrc 568# @ebuild-function java-pkg_dosrc
438# 569#
439# Installs a zip containing the source for a package, so it can used in 570# Installs a zip containing the source for a package, so it can used in
440# from IDEs like eclipse and netbeans. 571# from IDEs like eclipse and netbeans.
441# 572#
442# Ebuild needs to DEPEND on app-arch/zip to use this. 573# Ebuild needs to DEPEND on app-arch/zip to use this.
443# 574#
444# It also should be controlled by USE=source. 575# It also should be controlled by USE=source.
445# 576#
446# @example: 577# @example:
447# java-pkg_dosrc src/* 578# java-pkg_dosrc src/*
448# 579#
449# ------------------------------------------------------------------------------ 580# ------------------------------------------------------------------------------
450# TODO change so it the arguments it takes are the base directories containing 581# TODO change so it the arguments it takes are the base directories containing
451# source -nichoj 582# source -nichoj
452# TODO should we be able to handle multiple calls to dosrc? -nichoj 583# TODO should we be able to handle multiple calls to dosrc? -nichoj
453# TODO maybe we can take an existing zip/jar? -nichoj 584# TODO maybe we can take an existing zip/jar? -nichoj
454# FIXME apparently this fails if you give it an empty directories 585# FIXME apparently this fails if you give it an empty directories
455java-pkg_dosrc() { 586java-pkg_dosrc() {
456 debug-print-function ${FUNCNAME} $* 587 debug-print-function ${FUNCNAME} $*
457 588
458 [ ${#} -lt 1 ] && die "At least one argument needed" 589 [ ${#} -lt 1 ] && die "At least one argument needed"
459 if ! hasq source ${IUSE}; then
460 echo "Java QA Notice: ${FUNCNAME} called without source in IUSE"
461 fi
462 590
463 java-pkg_check-phase install 591 java-pkg_check-phase install
464 592
465 [[ ${#} -lt 1 ]] && die "At least one argument needed" 593 [[ ${#} -lt 1 ]] && die "At least one argument needed"
594
595 if ! [[ ${DEPEND} = *app-arch/zip* ]]; then
596 local msg="${FUNCNAME} called without app-arch/zip in DEPEND"
597 if is-java-strict; then
598 eerror "${msg}"
599 die "${msg}"
600 else
601 echo "${msg}"
602 echo "Please report this to http://bugs.gentoo.org."
603 fi
604 fi
466 605
467 java-pkg_init_paths_ 606 java-pkg_init_paths_
468 607
469 local zip_name="${PN}-src.zip" 608 local zip_name="${PN}-src.zip"
470 local zip_path="${T}/${zip_name}" 609 local zip_path="${T}/${zip_name}"
471 local dir 610 local dir
472 for dir in ${@}; do 611 for dir in "${@}"; do
473 local dir_parent=$(dirname "${dir}") 612 local dir_parent=$(dirname "${dir}")
474 local dir_name=$(basename "${dir}") 613 local dir_name=$(basename "${dir}")
475 pushd ${dir_parent} > /dev/null || die "problem entering ${dir_parent}" 614 pushd ${dir_parent} > /dev/null || die "problem entering ${dir_parent}"
476 zip -q -r ${zip_path} ${dir_name} -i '*.java' 615 zip -q -r ${zip_path} ${dir_name} -i '*.java'
477 local result=$? 616 local result=$?
494# @ebuild-function java-pkg_dolauncher 633# @ebuild-function java-pkg_dolauncher
495# 634#
496# Make a wrapper script to lauch/start this package 635# Make a wrapper script to lauch/start this package
497# If necessary, the wrapper will switch to the appropriate VM. 636# If necessary, the wrapper will switch to the appropriate VM.
498# 637#
638# Can be called without parameters if the package installs only one jar
639# that has the Main-class attribute set. The wrapper will be named ${PN}.
640#
499# @param $1 - filename of launcher to create 641# @param $1 - filename of launcher to create
500# @param $2 - options, as follows: 642# @param $2 - options, as follows:
501# --main the.main.class.too.start 643# --main the.main.class.too.start
502# --jar /the/jar/too/launch.jar 644# --jar /the/jar/too/launch.jar or just <name>.jar
503# --java_args 'Extra arguments to pass too jave' 645# --java_args 'Extra arguments to pass to java'
504# --pkg_args 'extra arguments too pass too the package' 646# --pkg_args 'Extra arguments to pass to the package'
505# --pwd 647# --pwd Directory the launcher changes to before executing java
506# -into 648# -into Directory to install the launcher to, instead of /usr/bin
507# -pre 649# -pre Prepend contents of this file to the launcher
508# ------------------------------------------------------------------------------ 650# ------------------------------------------------------------------------------
509java-pkg_dolauncher() { 651java-pkg_dolauncher() {
510 debug-print-function ${FUNCNAME} $* 652 debug-print-function ${FUNCNAME} $*
511 653
512 java-pkg_check-phase install 654 java-pkg_check-phase install
513
514 [[ ${#} -lt 1 ]] && die "Need at least one argument"
515
516 java-pkg_init_paths_ 655 java-pkg_init_paths_
517 656
657 if [[ ${#} = 0 ]]; then
658 local name="${PN}"
659 else
518 local name="${1}" 660 local name="${1}"
661 shift
662 fi
663
519 # TODO rename to launcher 664 # TODO rename to launcher
520 local target="${T}/${name}" 665 local target="${T}/${name}"
666 local var_tmp="${T}/launcher_variables_tmp"
521 local target_dir pre 667 local target_dir pre
522 shift
523 668
524 echo "#!/bin/bash" > "${target}" 669 # Process the other the rest of the arguments
525 while [[ -n "${1}" && -n "${2}" ]]; do 670 while [[ -n "${1}" && -n "${2}" ]]; do
526 local var=${1} value=${2} 671 local var="${1}" value="${2}"
527 if [[ "${var:0:2}" == "--" ]]; then 672 if [[ "${var:0:2}" == "--" ]]; then
673 local var=${var:2}
528 echo "gjl_${var:2}=\"${value}\"" >> "${target}" 674 echo "gjl_${var}=\"${value}\"" >> "${var_tmp}"
675 local gjl_${var}="${value}"
529 elif [[ "${var}" == "-into" ]]; then 676 elif [[ "${var}" == "-into" ]]; then
530 target_dir="${value}" 677 target_dir="${value}"
531 elif [[ "${var}" == "-pre" ]]; then 678 elif [[ "${var}" == "-pre" ]]; then
532 pre="${value}" 679 pre="${value}"
533 fi 680 fi
534 shift 2 681 shift 2
535 done 682 done
683
684 # Test if no --jar and --main arguments were given and
685 # in that case check if the package only installs one jar
686 # and use that jar.
687 if [[ -z "${gjl_jar}" && -z "${gjl_main}" ]]; then
688 local cp="${JAVA_PKG_CLASSPATH}"
689 if [[ "${cp/:}" = "${cp}" && "${cp%.jar}" != "${cp}" ]]; then
690 echo "gjl_jar=\"${JAVA_PKG_CLASSPATH}\"" >> "${var_tmp}"
691 else
692 local msg="Not enough information to create a launcher given."
693 msg="${msg} Please give --jar or --main argument to ${FUNCNAME}."
694 die "${msg}"
695 fi
696 fi
697
698 # Write the actual script
699 echo "#!/bin/bash" > "${target}"
700 if [[ -n "${pre}" ]]; then
701 if [[ -f "${pre}" ]]; then
702 cat "${pre}" >> "${target}"
703 else
704 die "-pre specified file '${pre}' does not exist"
705 fi
706 fi
536 echo "gjl_package=${JAVA_PKG_NAME}" >> "${target}" 707 echo "gjl_package=${JAVA_PKG_NAME}" >> "${target}"
537 [[ -n "${pre}" ]] && [[ -f "${pre}" ]] && cat "${pre}" >> "${target}" 708 cat "${var_tmp}" >> "${target}"
709 rm -f "${var_tmp}"
538 echo "source /usr/share/java-config-2/launcher/launcher.bash" >> "${target}" 710 echo "source /usr/share/java-config-2/launcher/launcher.bash" >> "${target}"
539 711
540 if [[ -n "${into}" ]]; then 712 if [[ -n "${target_dir}" ]]; then
541 DESTTREE="${target_dir}" dobin "${target}" 713 DESTTREE="${target_dir}" dobin "${target}"
542 local ret=$? 714 local ret=$?
543 return ${ret} 715 return ${ret}
544 else 716 else
545 dobin "${target}" 717 dobin "${target}"
573 echo "dowar: warning, skipping directory ${war}" 745 echo "dowar: warning, skipping directory ${war}"
574 continue 746 continue
575 else 747 else
576 warpath="${war}" 748 warpath="${war}"
577 fi 749 fi
578 750
579 # Install those files like you mean it 751 # Install those files like you mean it
580 INSOPTIONS="-m 0644" \ 752 INSOPTIONS="-m 0644" \
581 INSDESTTREE=${JAVA_PKG_WARDEST} \ 753 INSDESTTREE=${JAVA_PKG_WARDEST} \
582 doins ${warpath} 754 doins ${warpath}
583 done 755 done
618# @ebuild-function java-pkg_jar-from 790# @ebuild-function java-pkg_jar-from
619# 791#
620# Makes a symlink to a jar from a certain package 792# Makes a symlink to a jar from a certain package
621# A lot of java packages include dependencies in a lib/ directory 793# A lot of java packages include dependencies in a lib/ directory
622# You can use this function to replace these bundled dependencies. 794# You can use this function to replace these bundled dependencies.
795# The dependency is recorded into package.env DEPEND line, unless "--build-only"
796# is passed as the very first argument, for jars that have to be present only
797# at build time and are not needed on runtime (junit testing etc).
623# 798#
624# Example: get all jars from xerces slot 2 799# Example: get all jars from xerces slot 2
625# java-pkg_jar-from xerces-2 800# java-pkg_jar-from xerces-2
626# Example: get a specific jar from xerces slot 2 801# Example: get a specific jar from xerces slot 2
627# java-pkg_jar-from xerces-2 xml-apis.jar 802# java-pkg_jar-from xerces-2 xml-apis.jar
628# Example get a specific jar from xerces slot 2, and name it diffrently 803# Example: get a specific jar from xerces slot 2, and name it diffrently
629# java-pkg_jar-from xerces-2 xml-apis.jar xml.jar 804# java-pkg_jar-from xerces-2 xml-apis.jar xml.jar
805# Example: get junit.jar which is needed only for building
806# java-pkg_jar-from --build-only junit junit.jar
630# 807#
808# @param $opt
809# --build-only - makes the jar(s) not added into package.env DEPEND line.
810# (assumed automatically when called inside src_test)
811# --with-dependencies - get jars also from requested package's dependencies
812# transitively.
813# --into $dir - symlink jar(s) into $dir (must exist) instead of .
631# @param $1 - Package to get jars from. 814# @param $1 - Package to get jars from.
632# @param $2 - jar from package. If not specified, all jars will be used. 815# @param $2 - jar from package. If not specified, all jars will be used.
633# @param $3 - When a single jar is specified, destination filename of the 816# @param $3 - When a single jar is specified, destination filename of the
634# symlink. Defaults to the name of the jar. 817# symlink. Defaults to the name of the jar.
635# ------------------------------------------------------------------------------ 818# ------------------------------------------------------------------------------
636# TODO could probably be cleaned up a little 819# TODO could probably be cleaned up a little
637java-pkg_jar-from() { 820java-pkg_jar-from() {
638 debug-print-function ${FUNCNAME} $* 821 debug-print-function ${FUNCNAME} $*
639 822
823 local build_only=""
824 local destdir="."
825 local deep=""
826
827 [[ "${EBUILD_PHASE}" == "test" ]] && build_only="true"
828
829 while [[ "${1}" == --* ]]; do
830 if [[ "${1}" = "--build-only" ]]; then
831 build_only="true"
832 elif [[ "${1}" = "--with-dependencies" ]]; then
833 deep="--with-dependencies"
834 elif [[ "${1}" = "--into" ]]; then
835 destdir="${2}"
836 shift
837 else
838 die "java-pkg_jar-from called with unknown parameter: ${1}"
839 fi
840 shift
841 done
842
640 local target_pkg="${1}" target_jar="${2}" destjar="${3}" 843 local target_pkg="${1}" target_jar="${2}" destjar="${3}"
641 844
642 [[ -z ${target_pkg} ]] && die "Must specify a package" 845 [[ -z ${target_pkg} ]] && die "Must specify a package"
643 846
644 # default destjar to the target jar 847 # default destjar to the target jar
645 [[ -z "${destjar}" ]] && destjar="${target_jar}" 848 [[ -z "${destjar}" ]] && destjar="${target_jar}"
646 849
850 local error_msg="There was a problem getting the classpath for ${target_pkg}."
851 local classpath
647 local classpath="$(java-config --classpath=${target_pkg})" 852 classpath="$(java-config ${deep} --classpath=${target_pkg})"
648 [[ $? != 0 ]] && die "There was a problem getting the classpath for ${target_pkg}" 853 [[ $? != 0 ]] && die ${error_msg}
854
855 pushd ${destdir} > /dev/null \
856 || die "failed to change directory to ${destdir}"
857
858 # When we have commas this functions is called to bring jars from multiple
859 # packages. This affects recording of dependencencies because that syntax uses :
860 # if we don't change them to : gjl and java-config -d -p break
861 if [[ ${target_pkg} = *,* ]]; then
862 build_only="true"
863 java-pkg_record-jar_ ${target_pkg//,/:}
864 fi
649 865
650 local jar 866 local jar
651 for jar in ${classpath//:/ }; do 867 for jar in ${classpath//:/ }; do
652 local jar_name=$(basename "${jar}") 868 local jar_name=$(basename "${jar}")
653 if [[ ! -f "${jar}" ]] ; then 869 if [[ ! -f "${jar}" ]] ; then
657 # If no specific target jar was indicated, link it 873 # If no specific target jar was indicated, link it
658 if [[ -z "${target_jar}" ]] ; then 874 if [[ -z "${target_jar}" ]] ; then
659 [[ -f "${target_jar}" ]] && rm "${target_jar}" 875 [[ -f "${target_jar}" ]] && rm "${target_jar}"
660 ln -snf "${jar}" \ 876 ln -snf "${jar}" \
661 || die "Failed to make symlink from ${jar} to ${jar_name}" 877 || die "Failed to make symlink from ${jar} to ${jar_name}"
662 java-pkg_record-jar_ "${target_pkg}" "${jar}" 878 [[ -z "${build_only}" ]] && java-pkg_record-jar_ "${target_pkg}" "${jar}"
663 # otherwise, if the current jar is the target jar, link it 879 # otherwise, if the current jar is the target jar, link it
664 elif [[ "${jar_name}" == "${target_jar}" ]] ; then 880 elif [[ "${jar_name}" == "${target_jar}" ]] ; then
665 [[ -f "${destjar}" ]] && rm "${destjar}" 881 [[ -f "${destjar}" ]] && rm "${destjar}"
666 ln -snf "${jar}" "${destjar}" \ 882 ln -snf "${jar}" "${destjar}" \
667 || die "Failed to make symlink from ${jar} to ${destjar}" 883 || die "Failed to make symlink from ${jar} to ${destjar}"
668 java-pkg_record-jar_ "${target_pkg}" "${jar}" 884 [[ -z "${build_only}" ]] && java-pkg_record-jar_ "${target_pkg}" "${jar}"
885 popd > /dev/null
669 return 0 886 return 0
670 fi 887 fi
671 done 888 done
889 popd > /dev/null
672 # if no target was specified, we're ok 890 # if no target was specified, we're ok
673 if [[ -z "${target_jar}" ]] ; then 891 if [[ -z "${target_jar}" ]] ; then
674 return 0 892 return 0
675 # otherwise, die bitterly 893 # otherwise, die bitterly
676 else 894 else
690# ------------------------------------------------------------------------------ 908# ------------------------------------------------------------------------------
691# @ebuild-function java-pkg_getjars 909# @ebuild-function java-pkg_getjars
692# 910#
693# Get the classpath provided by any number of packages 911# Get the classpath provided by any number of packages
694# Among other things, this can be passed to 'javac -classpath' or 'ant -lib'. 912# Among other things, this can be passed to 'javac -classpath' or 'ant -lib'.
913# The providing packages are recorded as dependencies into package.env DEPEND
914# line, unless "--build-only" is passed as the very first argument, for jars
915# that have to be present only at build time and are not needed on runtime
916# (junit testing etc).
695# 917#
696# Example: Get the classpath for xerces-2, 918# Example: Get the classpath for xerces-2 and xalan,
697# java-pkg_getjars xerces-2 xalan 919# java-pkg_getjars xerces-2,xalan
698# Example Return: 920# Example Return:
699# /usr/share/xerces-2/lib/xml-apis.jar:/usr/share/xerces-2/lib/xmlParserAPIs.jar:/usr/share/xalan/lib/xalan.jar 921# /usr/share/xerces-2/lib/xml-apis.jar:/usr/share/xerces-2/lib/xmlParserAPIs.jar:/usr/share/xalan/lib/xalan.jar
700# 922#
923# @param $opt
924# --build-only - makes the jar(s) not added into package.env DEPEND line.
925# (assumed automatically when called inside src_test)
926# --with-dependencies - get jars also from requested package's dependencies
927# transitively.
701# @param $@ - list of packages to get jars from 928# @param $1 - list of packages to get jars from
929# (passed to java-config --classpath)
702# ------------------------------------------------------------------------------ 930# ------------------------------------------------------------------------------
703java-pkg_getjars() { 931java-pkg_getjars() {
704 debug-print-function ${FUNCNAME} $* 932 debug-print-function ${FUNCNAME} $*
705 933
706 [[ ${#} -lt 1 ]] && die "At least one argument needed" 934 local build_only=""
935 local deep=""
707 936
708 # NOTE could probably just pass $@ to java-config --classpath. and return it 937 [[ "${EBUILD_PHASE}" == "test" ]] && build_only="true"
709 local classpath pkg 938
710 for pkg in ${@//,/ }; do 939 while [[ "${1}" == --* ]]; do
711 #for pkg in $(echo "$@" | tr ',' ' '); do 940 if [[ "${1}" = "--build-only" ]]; then
712 jars="$(java-config --classpath=${pkg})" 941 build_only="true"
713 debug-print "${pkg}:${jars}" 942 elif [[ "${1}" = "--with-dependencies" ]]; then
714 # TODO should we ensure jars exist? 943 deep="--with-dependencies"
715 if [[ -z "${classpath}" ]]; then
716 classpath="${jars}"
717 else 944 else
718 classpath="${classpath}:${jars}" 945 die "java-pkg_jar-from called with unknown parameter: ${1}"
719 fi 946 fi
720 java-pkg_record-jar_ "${pkg}" 947 shift
721 done 948 done
949
950 [[ ${#} -ne 1 ]] && die "${FUNCNAME} takes only one argument besides --*"
951
952 local classpath pkgs="${1}"
953 jars="$(java-config ${deep} --classpath=${pkgs})"
954 [[ -z "${jars}" ]] && die "java-config --classpath=${pkgs} failed"
955 debug-print "${pkgs}:${jars}"
956
957 if [[ -z "${classpath}" ]]; then
958 classpath="${jars}"
959 else
960 classpath="${classpath}:${jars}"
961 fi
962
963 # Only record jars that aren't build-only
964 if [[ -z "${build_only}" ]]; then
965 oldifs="${IFS}"
966 IFS=","
967 for pkg in ${pkgs}; do
968 java-pkg_record-jar_ "${pkg}"
969 done
970 IFS="${oldifs}"
971 fi
972
722 echo "${classpath}" 973 echo "${classpath}"
723} 974}
724 975
725# ------------------------------------------------------------------------------ 976# ------------------------------------------------------------------------------
726# @ebuild-function java-pkg_getjar 977# @ebuild-function java-pkg_getjar
727# 978#
728# Get the filename of a single jar from a package 979# Get the filename of a single jar from a package
980# The providing package is recorded as runtime dependency into package.env
981# DEPEND line, unless "--build-only" is passed as the very first argument, for
982# jars that have to be present only at build time and are not needed on runtime
983# (junit testing etc).
729# 984#
730# @example 985# @example
731# java-pkg_getjar xerces-2 xml-apis.jar 986# java-pkg_getjar xerces-2 xml-apis.jar
732# @example-return 987# @example-return
733# /usr/share/xerces-2/lib/xml-apis.jar 988# /usr/share/xerces-2/lib/xml-apis.jar
734# 989#
990# @param $opt
991# --build-only - makes the jar not added into package.env DEPEND line.
735# @param $1 - package to use 992# @param $1 - package to use
736# @param $2 - jar to get 993# @param $2 - jar to get
737# ------------------------------------------------------------------------------ 994# ------------------------------------------------------------------------------
738java-pkg_getjar() { 995java-pkg_getjar() {
739 debug-print-function ${FUNCNAME} $* 996 debug-print-function ${FUNCNAME} $*
997
998 local build_only=""
999
1000 [[ "${EBUILD_PHASE}" == "test" ]] && build_only="true"
1001
1002 while [[ "${1}" == --* ]]; do
1003 if [[ "${1}" = "--build-only" ]]; then
1004 build_only="true"
1005 else
1006 die "java-pkg_jar-from called with unknown parameter: ${1}"
1007 fi
1008 shift
1009 done
1010
1011 [[ ${#} -ne 2 ]] && die "${FUNCNAME} takes only two arguments besides --*"
740 1012
741 local pkg="${1}" target_jar="${2}" jar 1013 local pkg="${1}" target_jar="${2}" jar
742 [[ -z ${pkg} ]] && die "Must specify package to get a jar from" 1014 [[ -z ${pkg} ]] && die "Must specify package to get a jar from"
743 [[ -z ${target_jar} ]] && die "Must specify jar to get" 1015 [[ -z ${target_jar} ]] && die "Must specify jar to get"
744 1016
745 # TODO check that package is actually installed 1017 local error_msg="Could not find classpath for ${pkg}. Are you sure its installed?"
1018 local classpath
746 local classpath=$(java-config --classpath=${pkg}) 1019 classpath=$(java-config --classpath=${pkg})
747 [[ $? != 0 ]] && die "There could not find classpath for ${pkg}. Are you sure its installed?" 1020 [[ $? != 0 ]] && die ${error_msg}
1021
748 for jar in ${classpath//:/ }; do 1022 for jar in ${classpath//:/ }; do
749 if [[ ! -f "${jar}" ]] ; then 1023 if [[ ! -f "${jar}" ]] ; then
750 die "Installation problems with jars in ${pkg} - is it installed?" 1024 die "Installation problem with jar ${jar} in ${pkg} - is it installed?"
751 fi 1025 fi
752 1026
753 if [[ "$(basename ${jar})" == "${target_jar}" ]] ; then 1027 if [[ "$(basename ${jar})" == "${target_jar}" ]] ; then
754 java-pkg_record-jar_ "${pkg}" "${jar}" 1028 # Only record jars that aren't build-only
1029 [[ -z "${build_only}" ]] && java-pkg_record-jar_ "${pkg}" "${jar}"
755 echo "${jar}" 1030 echo "${jar}"
756 return 0 1031 return 0
757 fi 1032 fi
758 done 1033 done
759 1034
760 die "Could not find ${target_jar} in ${pkg}" 1035 die "Could not find ${target_jar} in ${pkg}"
761 return 1 1036 return 1
762} 1037}
763 1038
764# This function reads stdin, and based on that input, figures out how to 1039# This function reads stdin, and based on that input, figures out how to
778# line="${line// /}" 1053# line="${line// /}"
779# 1054#
780# # format: path=jarinfo 1055# # format: path=jarinfo
781# local path=${line%%=*} 1056# local path=${line%%=*}
782# local jarinfo=${line##*=} 1057# local jarinfo=${line##*=}
783# 1058#
784# # format: jar@package 1059# # format: jar@package
785# local jar=${jarinfo%%@*}.jar 1060# local jar=${jarinfo%%@*}.jar
786# local package=${jarinfo##*@} 1061# local package=${jarinfo##*@}
787# if [[ -n ${replace_only} ]]; then 1062# if [[ -n ${replace_only} ]]; then
788# [[ ! -f $path ]] && die "No jar exists at ${path}" 1063# [[ ! -f $path ]] && die "No jar exists at ${path}"
801# @section-end query 1076# @section-end query
802# ------------------------------------------------------------------------------ 1077# ------------------------------------------------------------------------------
803 1078
804# ------------------------------------------------------------------------------ 1079# ------------------------------------------------------------------------------
805# @section-begin helper 1080# @section-begin helper
806# @section-summary Helper functions 1081# @section-summary Helper functions
807# 1082#
808# Various other functions to use from an ebuild 1083# Various other functions to use from an ebuild
809# ------------------------------------------------------------------------------ 1084# ------------------------------------------------------------------------------
810 1085
811# ------------------------------------------------------------------------------ 1086# ------------------------------------------------------------------------------
817# jdbc-stdext 1092# jdbc-stdext
818# jaf 1093# jaf
819# jdbc-rowset 1094# jdbc-rowset
820# jms 1095# jms
821# 1096#
822# @param $1 - Optionally indicate that the dependencies are controlled by 1097# @param $1 - Optionally indicate that the dependencies are controlled by
823# a use flag by specifying '--use' Requires $2. 1098# a use flag by specifying '--use' Requires $2.
824# @param $2 - USE flag which will enable the dependencies. 1099# @param $2 - USE flag which will enable the dependencies.
825# @param $@ - virtual packages to add depenedencies for 1100# @param $@ - virtual packages to add depenedencies for
826# ------------------------------------------------------------------------------ 1101# ------------------------------------------------------------------------------
827# TODO rewrite to parse a line based declaration file instead -- karltk 1102# TODO rewrite to parse a line based declaration file instead -- karltk
883# 1158#
884# export DEPEND="${DEPEND} ${depstr}" 1159# export DEPEND="${DEPEND} ${depstr}"
885# export RDEPEND="${RDEPEND} ${depstr}" 1160# export RDEPEND="${RDEPEND} ${depstr}"
886#} 1161#}
887 1162
1163# ------------------------------------------------------------------------------
1164# @ebuild-function java-pkg_find-normal-jars
1165#
1166# Find the files with suffix .jar file in the given directory or $WORKDIR
1167#
1168# @param $1 - The directory to search for jar files (default: ${WORKDIR})
1169# ------------------------------------------------------------------------------
1170java-pkg_find-normal-jars() {
1171 local dir=$1
1172 [[ "${dir}" ]] || dir="${WORKDIR}"
1173 local found
1174 for jar in $(find "${dir}" -name "*.jar" -type f); do
1175 echo "${jar}"
1176 found="true"
1177 done
1178 [[ "${found}" ]]
1179 return $?
1180}
1181
1182# ------------------------------------------------------------------------------
1183# @ebuild-function java-pkg_ensure-no-bundled-jars
1184#
1185# Try to locate bundled jar files in ${WORKDIR} and die if found.
888# This should be used after S has been populated with symlinks to jars 1186# This function should be called after WORKDIR has been populated with symlink
889# TODO document 1187# to system jar files or bundled jars removed.
1188# ------------------------------------------------------------------------------
890java-pkg_ensure-no-bundled-jars() { 1189java-pkg_ensure-no-bundled-jars() {
891 debug-print-function ${FUNCNAME} $* 1190 debug-print-function ${FUNCNAME} $*
892 pushd ${WORKDIR} >/dev/null 2>/dev/null
893 1191
894 local bundled_jars=$(find . -name "*.jar" -type f) 1192 local bundled_jars=$(java-pkg_find-normal-jars)
895 if [[ -n ${bundled_jars} ]]; then 1193 if [[ -n ${bundled_jars} ]]; then
896 echo "Bundled jars found:" 1194 echo "Bundled jars found:"
897 local jar 1195 local jar
898 for jar in ${bundled_jars}; do 1196 for jar in ${bundled_jars}; do
899 echo $(pwd)${jar/./} 1197 echo $(pwd)${jar/./}
900 done 1198 done
901 die "Bundled jars found!" 1199 die "Bundled jars found!"
902
903 fi 1200 fi
904 popd >/dev/null 2>/dev/null
905} 1201}
906 1202
907# ------------------------------------------------------------------------------ 1203# ------------------------------------------------------------------------------
908# @internal-function java-pkg_ensure-vm-version-sufficient 1204# @internal-function java-pkg_ensure-vm-version-sufficient
909# 1205#
921 fi 1217 fi
922} 1218}
923 1219
924# ------------------------------------------------------------------------------ 1220# ------------------------------------------------------------------------------
925# @internal-function java-pkg_is-vm-version-sufficient 1221# @internal-function java-pkg_is-vm-version-sufficient
926# 1222#
927# @return zero - VM is sufficient 1223# @return zero - VM is sufficient
928# @return non-zero - VM is not sufficient 1224# @return non-zero - VM is not sufficient
929# ------------------------------------------------------------------------------ 1225# ------------------------------------------------------------------------------
930java-pkg_is-vm-version-sufficient() { 1226java-pkg_is-vm-version-sufficient() {
931 debug-print-function ${FUNCNAME} $* 1227 debug-print-function ${FUNCNAME} $*
951 die "Active Java VM too old" 1247 die "Active Java VM too old"
952 fi 1248 fi
953} 1249}
954 1250
955# ------------------------------------------------------------------------------ 1251# ------------------------------------------------------------------------------
956# @internal-function java-pkg_is-vm-version-eq 1252# @internal-function java-pkg_is-vm-version-eq
957# 1253#
958# @param $@ - VM version to compare current VM to 1254# @param $@ - VM version to compare current VM to
959# @return zero - VM versions are equal 1255# @return zero - VM versions are equal
960# @return non-zero - VM version are not equal 1256# @return non-zero - VM version are not equal
961# ------------------------------------------------------------------------------ 1257# ------------------------------------------------------------------------------
962java-pkg_is-vm-version-eq() { 1258java-pkg_is-vm-version-eq() {
992# 1288#
993# @param $@ - VM version to compare current to 1289# @param $@ - VM version to compare current to
994# ------------------------------------------------------------------------------ 1290# ------------------------------------------------------------------------------
995java-pkg_ensure-vm-version-ge() { 1291java-pkg_ensure-vm-version-ge() {
996 debug-print-function ${FUNCNAME} $* 1292 debug-print-function ${FUNCNAME} $*
997 1293
998 if ! java-pkg_is-vm-version-ge "$@" ; then 1294 if ! java-pkg_is-vm-version-ge "$@" ; then
999 debug-print "vm is not suffient" 1295 debug-print "vm is not suffient"
1000 eerror "This package requires a Java VM version >= $@" 1296 eerror "This package requires a Java VM version >= $@"
1001 einfo "Please use java-config -S to set the correct one" 1297 einfo "Please use java-config -S to set the correct one"
1002 die "Active Java VM too old" 1298 die "Active Java VM too old"
1003 fi 1299 fi
1004} 1300}
1005 1301
1006# ------------------------------------------------------------------------------ 1302# ------------------------------------------------------------------------------
1007# @internal-function java-pkg_is-vm-version-ge 1303# @internal-function java-pkg_is-vm-version-ge
1008# 1304#
1009# @param $@ - VM version to compare current VM to 1305# @param $@ - VM version to compare current VM to
1010# @return zero - current VM version is greater than checked version 1306# @return zero - current VM version is greater than checked version
1011# @return non-zero - current VM version is not greater than checked version 1307# @return non-zero - current VM version is not greater than checked version
1012# ------------------------------------------------------------------------------ 1308# ------------------------------------------------------------------------------
1013java-pkg_is-vm-version-ge() { 1309java-pkg_is-vm-version-ge() {
1027 return 1 1323 return 1
1028 fi 1324 fi
1029 fi 1325 fi
1030} 1326}
1031 1327
1328java-pkg_set-current-vm() {
1329 export GENTOO_VM=${1}
1330}
1331
1332java-pkg_get-current-vm() {
1333 echo ${GENTOO_VM}
1334}
1335
1336java-pkg_current-vm-matches() {
1337 hasq $(java-pkg_get-current-vm) ${@}
1338 return $?
1339}
1340
1032# ------------------------------------------------------------------------------ 1341# ------------------------------------------------------------------------------
1033# @ebuild-function java-pkg_get-source 1342# @ebuild-function java-pkg_get-source
1034# 1343#
1035# Determines what source version should be used, for passing to -source. 1344# Determines what source version should be used, for passing to -source.
1036# Unless you want to break things you probably shouldn't set _WANT_SOURCE 1345# Unless you want to break things you probably shouldn't set _WANT_SOURCE
1037# 1346#
1038# @return string - Either the lowest possible source, or JAVA_PKG_WANT_SOURCE 1347# @return string - Either the lowest possible source, or JAVA_PKG_WANT_SOURCE
1039# ------------------------------------------------------------------------------ 1348# ------------------------------------------------------------------------------
1044# ------------------------------------------------------------------------------ 1353# ------------------------------------------------------------------------------
1045# @ebuild-function java-pkg_get-target 1354# @ebuild-function java-pkg_get-target
1046# 1355#
1047# Determines what target version should be used, for passing to -target. 1356# Determines what target version should be used, for passing to -target.
1048# If you don't care about lower versions, you can set _WANT_TARGET to the 1357# If you don't care about lower versions, you can set _WANT_TARGET to the
1049# version of your JDK. 1358# version of your JDK.
1050# Remember doing this will mostly like cause things to break.
1051# Doesn't allow it to be lower then the one in depend.
1052# Doesn't allow it to be higher then the active vm.
1053# 1359#
1054# @return string - Either the lowest possible target, or JAVA_PKG_WANT_TARGET 1360# @return string - Either the lowest possible target, or JAVA_PKG_WANT_TARGET
1055# ------------------------------------------------------------------------------ 1361# ------------------------------------------------------------------------------
1056java-pkg_get-target() { 1362java-pkg_get-target() {
1057 local min=$(depend-java-query --get-lowest "${DEPEND} ${RDEPEND}")
1058 if [[ -n "${JAVA_PKG_WANT_TARGET}" ]]; then
1059 local max="$(java-config --select-vm "${GENTOO_VM}" -g PROVIDES_VERSION)"
1060 if version_is_at_least "${min}" "${JAVA_PKG_WANT_TARGET}" && version_is_at_least "${JAVA_PKG_WANT_TARGET}" "${max}"; then
1061 echo ${JAVA_PKG_WANT_TARGET}
1062 else
1063 echo ${min}
1064 fi
1065 else
1066 echo ${min}
1067 fi
1068
1069 #echo ${JAVA_PKG_WANT_TARGET:-$(depend-java-query --get-lowest "${DEPEND}")} 1363 echo ${JAVA_PKG_WANT_TARGET:-$(depend-java-query --get-lowest "${DEPEND} ${RDEPEND}")}
1070} 1364}
1071 1365
1072java-pkg_get-javac() { 1366java-pkg_get-javac() {
1073 debug-print-function ${FUNCNAME} $* 1367 debug-print-function ${FUNCNAME} $*
1074 1368
1075 java-pkg_init-compiler_ 1369
1076 local compiler="${GENTOO_COMPILER}" 1370 local compiler="${GENTOO_COMPILER}"
1077 1371
1078 local compiler_executable 1372 local compiler_executable
1079 if [[ "${compiler}" = "javac" ]]; then 1373 if [[ "${compiler}" = "javac" ]]; then
1080 # nothing fancy needs to be done for javac 1374 # nothing fancy needs to be done for javac
1088 unset JAVAC 1382 unset JAVAC
1089 # try to get value of JAVAC 1383 # try to get value of JAVAC
1090 compiler_executable="$(source ${compiler_env} 1>/dev/null 2>&1; echo ${JAVAC})" 1384 compiler_executable="$(source ${compiler_env} 1>/dev/null 2>&1; echo ${JAVAC})"
1091 export JAVAC=${old_javac} 1385 export JAVAC=${old_javac}
1092 1386
1093 [[ -z ${compiler_executable} ]] && die "JAVAC is empty or undefined in ${compiler_env}" 1387 if [[ -z ${compiler_executable} ]]; then
1094 1388 echo "JAVAC is empty or undefined in ${compiler_env}"
1389 return 1
1390 fi
1391
1095 # check that it's executable 1392 # check that it's executable
1096 if [[ ! -x ${compiler_executable} ]]; then 1393 if [[ ! -x ${compiler_executable} ]]; then
1097 eerror "Could not find ${compiler_executable}!"
1098 die "${compiler_executable} doesn't exist, or isn't executable" 1394 echo "${compiler_executable} doesn't exist, or isn't executable"
1395 return 1
1099 fi 1396 fi
1100 else 1397 else
1101 eerror "Could not find environment file for ${compiler}" 1398 echo "Could not find environment file for ${compiler}"
1102 die "Could not find ${compiler_env}" 1399 return 1
1103 fi 1400 fi
1104 fi 1401 fi
1105 echo ${compiler_executable} 1402 echo ${compiler_executable}
1106} 1403}
1107 1404
1108# ------------------------------------------------------------------------------ 1405# ------------------------------------------------------------------------------
1109# @ebuild-function java-pkg_javac-args 1406# @ebuild-function java-pkg_javac-args
1110# 1407#
1111# If an ebuild uses javac directly, instead of using ejavac, it should call this 1408# If an ebuild uses javac directly, instead of using ejavac, it should call this
1112# to know what -source/-target to use. 1409# to know what -source/-target to use.
1113# 1410#
1114# @return string - arguments to pass to javac, complete with -target and -source 1411# @return string - arguments to pass to javac, complete with -target and -source
1117 debug-print-function ${FUNCNAME} $* 1414 debug-print-function ${FUNCNAME} $*
1118 1415
1119 local want_source="$(java-pkg_get-source)" 1416 local want_source="$(java-pkg_get-source)"
1120 local want_target="$(java-pkg_get-target)" 1417 local want_target="$(java-pkg_get-target)"
1121 1418
1122 local source_str="-source ${want_source}" 1419 local source_str="-source ${want_source}"
1123 local target_str="-target ${want_target}" 1420 local target_str="-target ${want_target}"
1124 1421
1125 debug-print "want source: ${want_source}" 1422 debug-print "want source: ${want_source}"
1126 debug-print "want target: ${want_target}" 1423 debug-print "want target: ${want_target}"
1127 1424
1128 if [[ -z "${want_source}" || -z "${want_target}" ]]; then 1425 if [[ -z "${want_source}" || -z "${want_target}" ]]; then
1129 debug-print "could not find valid -source/-target values" 1426 debug-print "could not find valid -source/-target values for javac"
1130 die "Could not find valid -source/-target values" 1427 echo "Could not find valid -source/-target values for javac"
1428 return 1
1131 else 1429 else
1132 if java-pkg_is-vm-version-ge "1.4"; then 1430 if java-pkg_is-vm-version-ge "1.4"; then
1133 echo "${source_str} ${target_str}" 1431 echo "${source_str} ${target_str}"
1134 else 1432 else
1135 echo "${target_str}" 1433 echo "${target_str}"
1139 1437
1140# TODO document 1438# TODO document
1141java-pkg_get-jni-cflags() { 1439java-pkg_get-jni-cflags() {
1142 local flags="-I${JAVA_HOME}/include" 1440 local flags="-I${JAVA_HOME}/include"
1143 1441
1144 # TODO figure out how to cope with other things than linux... 1442 local platform="linux"
1443 use elibc_FreeBSD && platform="freebsd"
1444
1445 # TODO do a check that the directories are valid
1145 flags="${flags} -I${JAVA_HOME}/include/linux" 1446 flags="${flags} -I${JAVA_HOME}/include/${platform}"
1146 1447
1147 echo ${flags} 1448 echo ${flags}
1449}
1450
1451java-pkg_ensure-gcj() {
1452 if ! built_with_use sys-devel/gcc gcj ; then
1453 ewarn
1454 ewarn "You must build gcc with the gcj support to build with gcj"
1455 ewarn
1456 ebeep 5
1457 die "No GCJ support found!"
1458 fi
1459}
1460
1461java-pkg_ensure-test() {
1462 if hasq test ${FEATURES} && ! hasq -test ${FEATURES} \
1463 && hasq test ${IUSE} && ! use test;
1464 then
1465 eerror "You specified FEATURES=test, but USE=test is needed"
1466 eerror "to pull in the additional dependencies for testing"
1467 die "Need USE=test enabled"
1468 fi
1469}
1470
1471# ------------------------------------------------------------------------------
1472# @ebuild-function java-pkg_register-ant-task
1473#
1474# Register this package as ant task, so that ant will load it when no specific
1475# ANT_TASKS are specified. Note that even without this registering, all packages
1476# specified in ANT_TASKS will be loaded. Mostly used by the actual ant tasks
1477# packages, but can be also used by other ebuilds that used to symlink their
1478# .jar into /usr/share/ant-core/lib to get autoloaded, for backwards
1479# compatibility.
1480#
1481# @param --version x.y Register only for ant version x.y (otherwise for any ant
1482# version). Used by the ant-* packages to prevent loading of mismatched
1483# ant-core ant tasks after core was updated, before the tasks are updated,
1484# without a need for blockers.
1485# @param $1 Name to register as. Defaults to JAVA_PKG_NAME ($PN[-$SLOT])
1486# ------------------------------------------------------------------------------
1487java-pkg_register-ant-task() {
1488 local TASKS_DIR="tasks"
1489
1490 # check for --version x.y parameters
1491 while [[ -n "${1}" && -n "${2}" ]]; do
1492 local var="${1#--}"
1493 local val="${2}"
1494 if [[ "${var}" == "version" ]]; then
1495 TASKS_DIR="tasks-${val}"
1496 else
1497 die "Unknown parameter passed to java-pkg_register-ant-tasks: ${1} ${2}"
1498 fi
1499 shift 2
1500 done
1501
1502 local TASK_NAME="${1:-${JAVA_PKG_NAME}}"
1503
1504 dodir /usr/share/ant/${TASKS_DIR}
1505 touch "${D}/usr/share/ant/${TASKS_DIR}/${TASK_NAME}"
1506}
1507
1508# ------------------------------------------------------------------------------
1509# @internal-function java-pkg_ant-tasks-from-deps
1510#
1511# Function to determine ANT_TASKS from DEPEND variable for backwards
1512# compatibility with ebuilds that don't set ANT_TASKS before calling eant() or
1513# WANT_ANT_TASKS before inheriting java-pkg-2. If the DEPEND string contains
1514# "dev-java/ant" or "dev-java/ant-tasks", then it returns "all", otherwise
1515# "none". It's not smart enough to cope with USE flag depends but that shouldn't
1516# be a problem, the worst it can do is activace all tasks when not needed.
1517# Note that this is called only with JAVA_PKG_STRICT=1, to find ebuilds with
1518# insufficient dependencies, otherwise all available tasks are used for
1519# backwards compatilbility.
1520#
1521# @return "all" or "none"
1522# ------------------------------------------------------------------------------
1523java-pkg_ant-tasks-from-deps() {
1524 local found_ant found_ant_tasks
1525
1526 for dep in ${DEPEND}
1527 do
1528 local ant="$(awk '/(dev-java\/ant)/ { if (match($1, "(dev-java/ant)((-[0-9])+|$)", m)) print m[1] }' <<< ${dep})"
1529 [[ "${ant}" == "dev-java/ant" ]] && found_ant=true
1530 [[ "${dep}" == *"ant-tasks"* ]] && found_ant_tasks=true
1531 done
1532
1533 if [[ -n "${found_ant}" || -n "${found_ant_tasks}" ]]; then
1534 java-pkg_announce-qa-violation "The ebuild DEPENDS on deprecated ant or ant-tasks"
1535 echo "all"
1536 else
1537 # ebuild doesn't set ANT_TASKS and doesn't depend on ant-tasks or ant
1538 # so we deactivate all tasks that may be installed
1539 echo "none"
1540 fi
1541}
1542
1543# ------------------------------------------------------------------------------
1544# @internal-function java-pkg_ant-tasks-depend
1545#
1546# Translates the WANT_ANT_TASKS variable into valid dependencies.
1547# ------------------------------------------------------------------------------
1548java-pkg_ant-tasks-depend() {
1549 debug-print-function ${FUNCNAME} ${WANT_ANT_TASKS}
1550
1551 if [[ -n "${WANT_ANT_TASKS}" ]]; then
1552 local DEP=""
1553 for i in ${WANT_ANT_TASKS}
1554 do
1555 if [[ ${i} != ant-* ]]; then
1556 echo "Invalid atom in WANT_ANT_TASKS: ${i}"
1557 return 1
1558 fi
1559 DEP="${DEP}dev-java/${i} "
1560 done
1561 echo ${DEP}
1562 return 0
1563 else
1564 return 0
1565 fi
1148} 1566}
1149 1567
1150# ------------------------------------------------------------------------------ 1568# ------------------------------------------------------------------------------
1151# @section-end helper 1569# @section-end helper
1152# ------------------------------------------------------------------------------ 1570# ------------------------------------------------------------------------------
1161 1579
1162# ------------------------------------------------------------------------------ 1580# ------------------------------------------------------------------------------
1163# @ebuild-function eant 1581# @ebuild-function eant
1164# 1582#
1165# Ant wrapper function. Will use the appropriate compiler, based on user-defined 1583# Ant wrapper function. Will use the appropriate compiler, based on user-defined
1166# compiler. 1584# compiler. Will also set proper ANT_TASKS from the variable ANT_TASKS,
1167# 1585# variables:
1586# EANT_GENTOO_CLASSPATH - calls java-pkg_getjars for the value and adds to the
1587# gentoo.classpath property. Be sure to call
1588# java-ant_rewrite-classpath in src_unpack.
1589# *ANT_TASKS - used to determine ANT_TASKS before calling Ant.
1168# ------------------------------------------------------------------------------ 1590# ------------------------------------------------------------------------------
1169eant() { 1591eant() {
1170 debug-print-function ${FUNCNAME} $* 1592 debug-print-function ${FUNCNAME} $*
1171 1593
1172 local antflags 1594 # FIXME get this working
1595# if is-java-strict && [[ ! ${DEPEND} =~ "dev-java/ant" ]]; then
1596# java-pkg_announce-qa-violation \
1597# "Using eant, but not depending on dev-java/ant or dev-java/ant-core"
1598# fi
1599
1600 if ! hasq java-ant-2 ${INHERITED} && is-java-strict; then
1601 local msg="You should inherit java-ant-2 when using eant"
1602 java-pkg_announce-qa-violation ${msg}
1603 die ${msg}
1604 fi
1605
1606 local antflags="-Dnoget=true -Dmaven.mode.offline=true"
1607
1173 java-pkg_init-compiler_ 1608 java-pkg_init-compiler_
1174 local compiler="${GENTOO_COMPILER}" 1609 local compiler="${GENTOO_COMPILER}"
1175 1610
1176 local compiler_env="${JAVA_PKG_COMPILER_DIR}/${compiler}" 1611 local compiler_env="${JAVA_PKG_COMPILER_DIR}/${compiler}"
1177 1612
1179 if [[ "${compiler}" != "javac" && -z "${build_compiler}" ]]; then 1614 if [[ "${compiler}" != "javac" && -z "${build_compiler}" ]]; then
1180 die "ANT_BUILD_COMPILER undefined in ${compiler_env}" 1615 die "ANT_BUILD_COMPILER undefined in ${compiler_env}"
1181 fi 1616 fi
1182 1617
1183 if [[ ${compiler} != "javac" ]]; then 1618 if [[ ${compiler} != "javac" ]]; then
1184 antflags="-Dbuild.compiler=${build_compiler}" 1619 antflags="${antflags} -Dbuild.compiler=${build_compiler}"
1185 # Figure out any extra stuff to put on the classpath for compilers aside 1620 # Figure out any extra stuff to put on the classpath for compilers aside
1186 # from javac 1621 # from javac
1187 # ANT_BUILD_COMPILER_DEPS should be something that could be passed to 1622 # ANT_BUILD_COMPILER_DEPS should be something that could be passed to
1188 # java-config -p 1623 # java-config -p
1189 local build_compiler_deps="$(source ${JAVA_PKG_COMPILER_DIR}/${compiler} 1>/dev/null 2>&1; echo ${ANT_BUILD_COMPILER_DEPS})" 1624 local build_compiler_deps="$(source ${JAVA_PKG_COMPILER_DIR}/${compiler} 1>/dev/null 2>&1; echo ${ANT_BUILD_COMPILER_DEPS})"
1190 if [[ -n ${build_compiler_deps} ]]; then 1625 if [[ -n ${build_compiler_deps} ]]; then
1191 antflags="${antflags} -lib $(java-config -p ${build_compiler_deps})" 1626 antflags="${antflags} -lib $(java-config -p ${build_compiler_deps})"
1192 fi 1627 fi
1193 fi 1628 fi
1194 1629
1195 if [[ -n ${JAVA_PKG_DEBUG} ]]; then 1630 if is-java-strict; then
1196 antflags="${antflags} -debug" 1631 einfo "Disabling system classpath for ant"
1632 antflags="${antflags} -Dbuild.sysclasspath=ignore"
1633 fi
1634
1635 for arg in "${@}"; do
1636 if [[ ${arg} = -lib ]]; then
1637 if is-java-strict; then
1638 eerror "You should not use the -lib argument to eant because it will fail"
1639 eerror "with JAVA_PKG_STRICT. Please use for example java-pkg_jar-from"
1640 eerror "or ant properties to make dependencies available."
1641 eerror "For ant tasks use WANT_ANT_TASKS or ANT_TASKS from."
1642 eerror "split ant (>=dev-java/ant-core-1.7)."
1643 die "eant -lib is deprecated/forbidden"
1644 else
1645 echo "eant -lib is deprecated. Turn JAVA_PKG_STRICT on for"
1646 echo "more info."
1647 fi
1197 fi 1648 fi
1198 1649 done
1650
1651 if has_version ">=dev-java/ant-core-1.7.0"; then
1652 # default ANT_TASKS to WANT_ANT_TASKS, if ANT_TASKS is not set explicitly
1653 ANT_TASKS="${ANT_TASKS:-${WANT_ANT_TASKS}}"
1654
1655 # override ANT_TASKS with JAVA_PKG_FORCE_ANT_TASKS if it's set
1656 ANT_TASKS="${JAVA_PKG_FORCE_ANT_TASKS:-${ANT_TASKS}}"
1657
1658 if is-java-strict; then
1659 # if ant-tasks were not set by ebuild or forced, try to determine them from depends
1660 if [[ -z "${ANT_TASKS}" ]]; then
1661 ANT_TASKS="$(java-pkg_ant-tasks-from-deps)"
1662 fi
1663 else
1664 # if ant-tasks is not set by ebuild or forced, activate all of them
1665 ANT_TASKS="${ANT_TASKS:-all}"
1666 fi
1667
1668 # at this point, ANT_TASKS should be "all", "none" or explicit list
1669 if [[ "${ANT_TASKS}" == "all" ]]; then
1670 einfo "Using all available ANT_TASKS"
1671 elif [[ "${ANT_TASKS}" == "none" ]]; then
1672 einfo "Disabling all optional ANT_TASKS"
1673 else
1674 einfo "Using following ANT_TASKS: ${ANT_TASKS}"
1675 fi
1676
1677 export ANT_TASKS
1678 fi
1679
1680 [[ -n ${JAVA_PKG_DEBUG} ]] && antflags="${antflags} --execdebug -debug"
1681 [[ -n ${PORTAGE_QUIET} ]] && antflags="${antflags} -q"
1682
1683 local gcp="${EANT_GENTOO_CLASSPATH}"
1684
1685 if [[ ${EBUILD_PHASE} = "test" ]]; then
1686 antflags="${antflags} -DJunit.present=true"
1687 [[ ${gcp} && ${ANT_TASKS} = *ant-junit* ]] && gcp="${gcp} junit"
1688 fi
1689
1690 local cp
1691
1692 for atom in ${gcp}; do
1693 cp="${cp}:$(java-pkg_getjars ${atom})"
1694 done
1695
1696 if [[ ${cp} ]]; then
1697 # It seems ant does not like single quotes around ${cp}
1698 antflags="${antflags} -Dgentoo.classpath=\"${cp#:}\""
1699 fi
1700
1199 [[ -n ${JAVA_PKG_DEBUG} ]] && echo ant ${antflags} "${@}" 1701 [[ -n ${JAVA_PKG_DEBUG} ]] && echo ant ${antflags} "${@}"
1702 debug-print "Calling ant: ${antflags} ${@}"
1200 ant ${antflags} "${@}" || die "eant failed" 1703 ant ${antflags} "${@}" || die "eant failed"
1201 1704
1202} 1705}
1203 1706
1204# ------------------------------------------------------------------------------ 1707# ------------------------------------------------------------------------------
1205# @ebuild-function ejavac 1708# @ebuild-function ejavac
1206# 1709#
1207# Javac wrapper function. Will use the appropriate compiler, based on 1710# Javac wrapper function. Will use the appropriate compiler, based on
1208# /etc/java-config/compilers.conf 1711# /etc/java-config/compilers.conf
1209# 1712#
1210# @param $@ - Arguments to be passed to the compiler 1713# @param $@ - Arguments to be passed to the compiler
1211# ------------------------------------------------------------------------------ 1714# ------------------------------------------------------------------------------
1212ejavac() { 1715ejavac() {
1213 debug-print-function ${FUNCNAME} $* 1716 debug-print-function ${FUNCNAME} $*
1214 1717
1718 java-pkg_init-compiler_
1719
1720 local compiler_executable
1215 local compiler_executable=$(java-pkg_get-javac) 1721 compiler_executable=$(java-pkg_get-javac)
1722 if [[ ${?} != 0 ]]; then
1723 eerror "There was a problem determining compiler: ${compiler_executable}"
1724 die "get-javac failed"
1725 fi
1216 1726
1727 local javac_args
1728 javac_args="$(java-pkg_javac-args)"
1729 if [[ ${?} != 0 ]]; then
1730 eerror "There was a problem determining JAVACFLAGS: ${javac_args}"
1731 die "java-pkg_javac-args failed"
1732 fi
1733
1217 [[ -n ${JAVA_PKG_DEBUG} ]] && echo ${compiler_executable} $(java-pkg_javac-args) "${@}" 1734 [[ -n ${JAVA_PKG_DEBUG} ]] && echo ${compiler_executable} ${javac_args} "${@}"
1218 ${compiler_executable} $(java-pkg_javac-args) "${@}" || die "ejavac failed" 1735 ${compiler_executable} ${javac_args} "${@}" || die "ejavac failed"
1219} 1736}
1220 1737
1221# ------------------------------------------------------------------------------ 1738# ------------------------------------------------------------------------------
1222# @ebuild-function java-pkg_filter-compiler 1739# @ebuild-function java-pkg_filter-compiler
1223# 1740#
1224# Used to prevent the use of some compilers. Should be used in src_compile. 1741# Used to prevent the use of some compilers. Should be used in src_compile.
1225# Basically, it just appends onto JAVA_PKG_FILTER_COMPILER 1742# Basically, it just appends onto JAVA_PKG_FILTER_COMPILER
1226# 1743#
1227# @param $@ - compilers to filter 1744# @param $@ - compilers to filter
1228# ------------------------------------------------------------------------------ 1745# ------------------------------------------------------------------------------
1229java-pkg_filter-compiler() { 1746java-pkg_filter-compiler() {
1230 JAVA_PKG_FILTER_COMPILER="${JAVA_PKG_FILTER_COMPILER} $@" 1747 JAVA_PKG_FILTER_COMPILER="${JAVA_PKG_FILTER_COMPILER} $@"
1231} 1748}
1232 1749
1233# ------------------------------------------------------------------------------ 1750# ------------------------------------------------------------------------------
1751# @ebuild-function java-pkg_force-compiler
1752#
1753# Used to force the use of particular compilers. Should be used in src_compile.
1754# A common use of this would be to force ecj-3.1 to be used on amd64, to avoid
1755# OutOfMemoryErrors that may come up.
1756#
1757# @param $@ - compilers to force
1758# ------------------------------------------------------------------------------
1759java-pkg_force-compiler() {
1760 JAVA_PKG_FORCE_COMPILER="$@"
1761}
1762
1763# ------------------------------------------------------------------------------
1234# @ebuild-function use_doc 1764# @ebuild-function use_doc
1235# 1765#
1236# Helper function for getting ant to build javadocs. If the user has USE=doc, 1766# Helper function for getting ant to build javadocs. If the user has USE=doc,
1237# then 'javadoc' or the argument are returned. Otherwise, there is no return. 1767# then 'javadoc' or the argument are returned. Otherwise, there is no return.
1238# 1768#
1239# The output of this should be passed to ant. 1769# The output of this should be passed to ant.
1240# 1770#
1241# Example: build javadocs by calling 'javadoc' target 1771# Example: build javadocs by calling 'javadoc' target
1242# eant $(use_doc) 1772# eant $(use_doc)
1243# Example: build javadocs by calling 'apidoc' target 1773# Example: build javadocs by calling 'apidoc' target
1248# ------------------------------------------------------------------------------ 1778# ------------------------------------------------------------------------------
1249use_doc() { 1779use_doc() {
1250 use doc && echo ${@:-javadoc} 1780 use doc && echo ${@:-javadoc}
1251} 1781}
1252 1782
1783
1253# ------------------------------------------------------------------------------ 1784# ------------------------------------------------------------------------------
1254# @section-end build 1785# @section-end build
1255# ------------------------------------------------------------------------------ 1786# ------------------------------------------------------------------------------
1256 1787
1257# ------------------------------------------------------------------------------ 1788# ------------------------------------------------------------------------------
1258# @section-begin internal 1789# @section-begin internal
1259# @section-summary Internal functions 1790# @section-summary Internal functions
1260# 1791#
1261# Do __NOT__ use any of these from an ebuild! These are only to be used from 1792# Do __NOT__ use any of these from an ebuild! These are only to be used from
1262# within the java eclasses. 1793# within the java eclasses.
1263# ------------------------------------------------------------------------------ 1794# ------------------------------------------------------------------------------
1264 1795
1265# ----------------------------------------------------------------------------- 1796# -----------------------------------------------------------------------------
1266# @function-internal java-pkg_init 1797# @function-internal java-pkg_init
1267# 1798#
1268# The purpose of this function, as the name might imply, is to initialize the 1799# The purpose of this function, as the name might imply, is to initialize the
1269# Java environment. It ensures that that there aren't any environment variables 1800# Java environment. It ensures that that there aren't any environment variables
1270# that'll muss things up. It initializes some variables, which are used 1801# that'll muss things up. It initializes some variables, which are used
1271# internally. And most importantly, it'll switch the VM if necessary. 1802# internally. And most importantly, it'll switch the VM if necessary.
1272# 1803#
1275# 1806#
1276# ----------------------------------------------------------------------------- 1807# -----------------------------------------------------------------------------
1277java-pkg_init() { 1808java-pkg_init() {
1278 unset JAVAC 1809 unset JAVAC
1279 unset JAVA_HOME 1810 unset JAVA_HOME
1811
1812 # People do all kinds of weird things.
1813 # http://forums.gentoo.org/viewtopic-p-3943166.html
1814 local silence="${SILENCE_JAVA_OPTIONS_WARNING}"
1815 local accept="${I_WANT_GLOBAL_JAVA_OPTIONS}"
1816 if [[ -n ${_JAVA_OPTIONS} && -z ${accept} && -z ${silence} ]]; then
1817 ewarn "_JAVA_OPTIONS changes what java -version outputs at least for"
1818 ewarn "sun-jdk vms and and as such break configure scripts that"
1819 ewarn "use it (for example app-office/openoffice) so we filter it out."
1820 ewarn "Use SILENCE_JAVA_OPTIONS_WARNING=true in the environment (use"
1821 ewarn "make.conf for example) to silence this warning or"
1822 ewarn "I_WANT_GLOBAL_JAVA_OPTIONS to not filter it."
1823 fi
1824
1825 if [[ -z ${accept} ]]; then
1826 unset _JAVA_OPTIONS
1827 # phase hooks make this run many times without this
1828 I_WANT_GLOBAL_JAVA_OPTIONS="true"
1829 fi
1830
1280 java-pkg_init_paths_ 1831 java-pkg_init_paths_
1281 java-pkg_switch-vm 1832 java-pkg_switch-vm
1282 PATH=${JAVA_HOME}/bin:${PATH} 1833 PATH=${JAVA_HOME}/bin:${PATH}
1283 1834
1284 # TODO we will probably want to set JAVAC and JAVACFLAGS 1835 # TODO we will probably want to set JAVAC and JAVACFLAGS
1285 1836
1286 # Do some QA checks 1837 # Do some QA checks
1287 java-pkg_check-jikes 1838 java-pkg_check-jikes
1288 1839
1289 # When users have crazy classpaths some packages can fail to compile. 1840 # When users have crazy classpaths some packages can fail to compile.
1290 # and everything should work with empty CLASSPATH. 1841 # and everything should work with empty CLASSPATH.
1291 # This also helps prevent unexpected dependencies on random things 1842 # This also helps prevent unexpected dependencies on random things
1292 # from the CLASSPATH. 1843 # from the CLASSPATH.
1293 unset CLASSPATH 1844 unset CLASSPATH
1845
1846 # Unset external ANT_ stuff
1847 unset ANT_TASKS
1848 unset ANT_OPTS
1294} 1849}
1295 1850
1296# ------------------------------------------------------------------------------ 1851# ------------------------------------------------------------------------------
1297# @function-internal java-pkg-init-compiler_ 1852# @function-internal java-pkg-init-compiler_
1298# 1853#
1299# This function attempts to figure out what compiler should be used. It does 1854# This function attempts to figure out what compiler should be used. It does
1300# this by reading the file at JAVA_PKG_COMPILERS_CONF, and checking the 1855# this by reading the file at JAVA_PKG_COMPILERS_CONF, and checking the
1301# COMPILERS variable defined there. 1856# COMPILERS variable defined there.
1302# This can be overridden by a list in JAVA_PKG_FORCE_COMPILER 1857# This can be overridden by a list in JAVA_PKG_FORCE_COMPILER
1303# 1858#
1304# It will go through the list of compilers, and verify that it supports the 1859# It will go through the list of compilers, and verify that it supports the
1305# target and source that are needed. If it is not suitable, then the next 1860# target and source that are needed. If it is not suitable, then the next
1306# compiler is checked. When JAVA_PKG_FORCE_COMPILER is defined, this checking 1861# compiler is checked. When JAVA_PKG_FORCE_COMPILER is defined, this checking
1307# isn't done. 1862# isn't done.
1308# 1863#
1330 if [[ -z ${JAVA_PKG_FORCE_COMPILER} ]]; then 1885 if [[ -z ${JAVA_PKG_FORCE_COMPILER} ]]; then
1331 compilers="$(source ${JAVA_PKG_COMPILERS_CONF} 1>/dev/null 2>&1; echo ${COMPILERS})" 1886 compilers="$(source ${JAVA_PKG_COMPILERS_CONF} 1>/dev/null 2>&1; echo ${COMPILERS})"
1332 else 1887 else
1333 compilers=${JAVA_PKG_FORCE_COMPILER} 1888 compilers=${JAVA_PKG_FORCE_COMPILER}
1334 fi 1889 fi
1335 1890
1336 debug-print "Read \"${compilers}\" from ${JAVA_PKG_COMPILERS_CONF}" 1891 debug-print "Read \"${compilers}\" from ${JAVA_PKG_COMPILERS_CONF}"
1337 1892
1338 # Figure out if we should announce what compiler we're using 1893 # Figure out if we should announce what compiler we're using
1339 local compiler 1894 local compiler
1340 for compiler in ${compilers}; do 1895 for compiler in ${compilers}; do
1343 if [[ ${compiler} = "javac" ]]; then 1898 if [[ ${compiler} = "javac" ]]; then
1344 debug-print "Found javac... breaking" 1899 debug-print "Found javac... breaking"
1345 export GENTOO_COMPILER="javac" 1900 export GENTOO_COMPILER="javac"
1346 break 1901 break
1347 fi 1902 fi
1348 1903
1349 if has ${compiler} ${JAVA_PKG_FILTER_COMPILER}; then 1904 if has ${compiler} ${JAVA_PKG_FILTER_COMPILER}; then
1350 if [[ -z ${JAVA_PKG_FORCE_COMPILER} ]]; then 1905 if [[ -z ${JAVA_PKG_FORCE_COMPILER} ]]; then
1351 einfo "Filtering ${compiler}" 1906 einfo "Filtering ${compiler}"
1352 continue 1907 continue
1353 fi 1908 fi
1354 fi 1909 fi
1355 1910
1356 # for non-javac, we need to make sure it supports the right target and 1911 # for non-javac, we need to make sure it supports the right target and
1357 # source 1912 # source
1358 local compiler_env="${JAVA_PKG_COMPILER_DIR}/${compiler}" 1913 local compiler_env="${JAVA_PKG_COMPILER_DIR}/${compiler}"
1359 if [[ -f ${compiler_env} ]]; then 1914 if [[ -f ${compiler_env} ]]; then
1360 local desired_target="$(java-pkg_get-target)" 1915 local desired_target="$(java-pkg_get-target)"
1442# Writes the package.env out to disk. 1997# Writes the package.env out to disk.
1443# 1998#
1444# ------------------------------------------------------------------------------ 1999# ------------------------------------------------------------------------------
1445# TODO change to do-write, to match everything else 2000# TODO change to do-write, to match everything else
1446java-pkg_do_write_() { 2001java-pkg_do_write_() {
2002 java-pkg_init_paths_
1447 # Create directory for package.env 2003 # Create directory for package.env
1448 dodir "${JAVA_PKG_SHAREPATH}" 2004 dodir "${JAVA_PKG_SHAREPATH}"
1449 if [[ -n "${JAVA_PKG_CLASSPATH}" || -n "${JAVA_PKG_LIBRARY}" || -f "${JAVA_PKG_DEPEND}" ]]; then 2005 if [[ -n "${JAVA_PKG_CLASSPATH}" || -n "${JAVA_PKG_LIBRARY}" || -f "${JAVA_PKG_DEPEND}" ]]; then
1450 # Create package.env 2006 # Create package.env
1451 ( 2007 (
1456 [[ -n "${JAVA_PKG_LIBRARY}" ]] && echo "LIBRARY_PATH=\"${JAVA_PKG_LIBRARY}\"" 2012 [[ -n "${JAVA_PKG_LIBRARY}" ]] && echo "LIBRARY_PATH=\"${JAVA_PKG_LIBRARY}\""
1457 [[ -n "${JAVA_PROVIDE}" ]] && echo "PROVIDES=\"${JAVA_PROVIDE}\"" 2013 [[ -n "${JAVA_PROVIDE}" ]] && echo "PROVIDES=\"${JAVA_PROVIDE}\""
1458 [[ -f "${JAVA_PKG_DEPEND}" ]] && echo "DEPEND=\"$(cat ${JAVA_PKG_DEPEND} | uniq | tr '\n' ':')\"" 2014 [[ -f "${JAVA_PKG_DEPEND}" ]] && echo "DEPEND=\"$(cat ${JAVA_PKG_DEPEND} | uniq | tr '\n' ':')\""
1459 echo "VM=\"$(echo ${RDEPEND} ${DEPEND} | sed -e 's/ /\n/g' | sed -n -e '/virtual\/\(jre\|jdk\)/ { p;q }')\"" # TODO cleanup ! 2015 echo "VM=\"$(echo ${RDEPEND} ${DEPEND} | sed -e 's/ /\n/g' | sed -n -e '/virtual\/\(jre\|jdk\)/ { p;q }')\"" # TODO cleanup !
1460 ) > "${JAVA_PKG_ENV}" 2016 ) > "${JAVA_PKG_ENV}"
1461 2017
1462 # register target/source 2018 # register target/source
1463 local target="$(java-pkg_get-target)" 2019 local target="$(java-pkg_get-target)"
1464 local source="$(java-pkg_get-source)" 2020 local source="$(java-pkg_get-source)"
1465 [[ -n ${target} ]] && echo "TARGET=\"${target}\"" >> "${JAVA_PKG_ENV}" 2021 [[ -n ${target} ]] && echo "TARGET=\"${target}\"" >> "${JAVA_PKG_ENV}"
1466 [[ -n ${source} ]] && echo "SOURCE=\"${source}\"" >> "${JAVA_PKG_ENV}" 2022 [[ -n ${source} ]] && echo "SOURCE=\"${source}\"" >> "${JAVA_PKG_ENV}"
1479 # Strip unnecessary leading and trailing colons 2035 # Strip unnecessary leading and trailing colons
1480 # TODO try to cleanup if possible 2036 # TODO try to cleanup if possible
1481 sed -e "s/=\":/=\"/" -e "s/:\"$/\"/" -i "${JAVA_PKG_ENV}" || die "Did you forget to call java_init ?" 2037 sed -e "s/=\":/=\"/" -e "s/:\"$/\"/" -i "${JAVA_PKG_ENV}" || die "Did you forget to call java_init ?"
1482 fi 2038 fi
1483} 2039}
1484
1485 2040
1486# ------------------------------------------------------------------------------ 2041# ------------------------------------------------------------------------------
1487# @internal-function java-pkg_record-jar_ 2042# @internal-function java-pkg_record-jar_
1488# 2043#
1489# Record a dependency to the package.env 2044# Record a dependency to the package.env
1533 fi 2088 fi
1534} 2089}
1535 2090
1536# ------------------------------------------------------------------------------ 2091# ------------------------------------------------------------------------------
1537# @internal-function java-pkg_expand_dir_ 2092# @internal-function java-pkg_expand_dir_
1538# 2093#
1539# Gets the full path of the file/directory's parent. 2094# Gets the full path of the file/directory's parent.
1540# @param $1 - file/directory to find parent directory for 2095# @param $1 - file/directory to find parent directory for
1541# @return - path to $1's parent directory 2096# @return - path to $1's parent directory
1542# ------------------------------------------------------------------------------ 2097# ------------------------------------------------------------------------------
1543java-pkg_expand_dir_() { 2098java-pkg_expand_dir_() {
1570# ------------------------------------------------------------------------------ 2125# ------------------------------------------------------------------------------
1571java-pkg_setup-vm() { 2126java-pkg_setup-vm() {
1572 debug-print-function ${FUNCNAME} $* 2127 debug-print-function ${FUNCNAME} $*
1573 2128
1574 local vendor="$(java-pkg_get-vm-vendor)" 2129 local vendor="$(java-pkg_get-vm-vendor)"
1575 if [[ "${vendor}" == "sun" ]] && java-pkg_is-vm-version-ge 1 5; then 2130 if [[ "${vendor}" == "sun" ]] && java-pkg_is-vm-version-ge "1.5" ; then
1576 addpredict "/dev/random" 2131 addpredict "/dev/random"
1577 elif [[ "${vendor}" == "ibm" ]]; then 2132 elif [[ "${vendor}" == "ibm" ]]; then
1578 addpredict "/proc/self/maps" 2133 addpredict "/proc/self/maps"
1579 addpredict "/proc/cpuinfo" 2134 addpredict "/proc/cpuinfo"
1580 export LANG="C" LC_ALL="C" 2135 export LANG="C" LC_ALL="C"
1629# @return - The version of the current VM 2184# @return - The version of the current VM
1630# ------------------------------------------------------------------------------ 2185# ------------------------------------------------------------------------------
1631java-pkg_get-vm-version() { 2186java-pkg_get-vm-version() {
1632 debug-print-function ${FUNCNAME} $* 2187 debug-print-function ${FUNCNAME} $*
1633 2188
1634 java-pkg_get-current-vm | sed -e "s/.*-\([0-9.]\+\).*/\1/" 2189 java-config -g PROVIDES_VERSION
1635} 2190}
1636 2191
1637# ------------------------------------------------------------------------------ 2192# ------------------------------------------------------------------------------
1638# @internal-function java-pkg_switch-vm 2193# @internal-function java-pkg_switch-vm
1639# 2194#
1640# Switch VM if we're allowed to (controlled by JAVA_PKG_ALLOW_VM_CHANGE), and 2195# Switch VM if we're allowed to (controlled by JAVA_PKG_ALLOW_VM_CHANGE), and
1641# verify that the current VM is sufficient. 2196# verify that the current VM is sufficient.
1642# Setup the environment for the VM being used. 2197# Setup the environment for the VM being used.
1643# ------------------------------------------------------------------------------ 2198# ------------------------------------------------------------------------------
1644java-pkg_switch-vm() { 2199java-pkg_switch-vm() {
2200 debug-print-function ${FUNCNAME} $*
2201
1645 if java-pkg_needs-vm; then 2202 if java-pkg_needs-vm; then
1646 # Use the VM specified by JAVA_PKG_FORCE_VM 2203 # Use the VM specified by JAVA_PKG_FORCE_VM
1647 if [[ -n ${JAVA_PKG_FORCE_VM} ]]; then 2204 if [[ -n "${JAVA_PKG_FORCE_VM}" ]]; then
1648 # If you're forcing the VM, I hope you know what your doing... 2205 # If you're forcing the VM, I hope you know what your doing...
2206 debug-print "JAVA_PKG_FORCE_VM used: ${JAVA_PKG_FORCE_VM}"
1649 export GENTOO_VM="${JAVA_PKG_FORCE_VM}" 2207 export GENTOO_VM="${JAVA_PKG_FORCE_VM}"
1650 # if we're allowed to switch the vm... 2208 # if we're allowed to switch the vm...
1651 elif [[ "${JAVA_PKG_ALLOW_VM_CHANGE}" == "yes" ]]; then 2209 elif [[ "${JAVA_PKG_ALLOW_VM_CHANGE}" == "yes" ]]; then
1652 debug-print "depend-java-query: NV_DEPEND: ${JAVA_PKG_NV_DEPEND:-${DEPEND}} VNEED: ${JAVA_PKG_VNEED}" 2210 debug-print "depend-java-query: NV_DEPEND: ${JAVA_PKG_NV_DEPEND:-${DEPEND}} VNEED: ${JAVA_PKG_VNEED}"
1653 if [[ -n ${JAVA_PKG_VNEED} ]]; then 2211 if [[ -n ${JAVA_PKG_VNEED} ]]; then
1654 export GENTOO_VM="$(depend-java-query --need-virtual "${JAVA_PKG_VNEED}" --get-vm "${JAVA_PKG_NV_DEPEND:-${DEPEND}}")" 2212 GENTOO_VM="$(depend-java-query --need-virtual "${JAVA_PKG_VNEED}" --get-vm "${JAVA_PKG_NV_DEPEND:-${DEPEND}}")"
1655 else 2213 else
1656 export GENTOO_VM="$(depend-java-query --get-vm "${JAVA_PKG_NV_DEPEND:-${DEPEND}}")" 2214 GENTOO_VM="$(depend-java-query --get-vm "${JAVA_PKG_NV_DEPEND:-${DEPEND}}")"
2215 fi
2216 if [[ -z "${GENTOO_VM}" || "${GENTOO_VM}" == "None" ]]; then
2217 eerror "Unable to determine VM for building from dependencies:"
2218 echo "NV_DEPEND: ${JAVA_PKG_NV_DEPEND:-${DEPEND}}"
2219 echo "VNEED: ${JAVA_PKG_VNEED}"
2220 die "Failed to determine VM for building."
2221 else
2222 export GENTOO_VM
1657 fi 2223 fi
1658 # otherwise just make sure the current VM is sufficient 2224 # otherwise just make sure the current VM is sufficient
1659 else 2225 else
1660 java-pkg_ensure-vm-version-sufficient 2226 java-pkg_ensure-vm-version-sufficient
1661 fi 2227 fi
1662 debug-print "Using: $(java-config -f)" 2228 debug-print "Using: $(java-config -f)"
1663 2229
1664 java-pkg_setup-vm 2230 java-pkg_setup-vm
1665 2231
1666 export JAVA=$(java-config -java) 2232 export JAVA=$(java-config --java)
1667 export JAVAC=$(java-config -javac) 2233 export JAVAC=$(java-config --javac)
1668 export JAVACFLAGS="$(java-pkg_javac-args)" 2234 JAVACFLAGS="$(java-pkg_javac-args)"
2235 if [[ ${?} != 0 ]]; then
2236 eerror "There was a problem determining JAVACFLAGS: ${JAVACFLAGS}"
2237 die "java-pkg_javac-args failed"
2238 fi
1669 [[ -n ${JAVACFLAGS_EXTRA} ]] && export JAVACFLAGS="${JAVACFLAGS_EXTRA} ${JAVACFLAGS}" 2239 [[ -n ${JAVACFLAGS_EXTRA} ]] && JAVACFLAGS="${JAVACFLAGS_EXTRA} ${JAVACFLAGS}"
2240 export JAVACFLAGS
1670 2241
1671 export JAVA_HOME="$(java-config -g JAVA_HOME)" 2242 export JAVA_HOME="$(java-config -g JAVA_HOME)"
1672 export JDK_HOME=${JAVA_HOME} 2243 export JDK_HOME=${JAVA_HOME}
1673 2244
1674 #TODO If you know a better solution let us know. 2245 #TODO If you know a better solution let us know.
1675 java-pkg_append_ LD_LIBRARY_PATH "$(java-config -g LDPATH)" 2246 java-pkg_append_ LD_LIBRARY_PATH "$(java-config -g LDPATH)"
1676 2247
1677 local tann="${T}/announced-vm" 2248 local tann="${T}/announced-vm"
1678 if [[ -n "${JAVA_PKG_DEBUG}" ]] || [[ ! -f "${tann}" ]] ; then 2249 if [[ -n "${JAVA_PKG_DEBUG}" ]] || [[ ! -f "${tann}" ]] ; then
1679 # Add a check for setup/preinst phase... to avoid duplicate outputs 2250 # Add a check for setup/preinst phase... to avoid duplicate outputs
1680 # for when FEATURES=buildpkg 2251 # for when FEATURES=buildpkg
1681 if [[ ${EBUILD_PHASE} != "setup" && ${EBUILD_PHASE} != "preinst" && ${EBUILD_PHASE} != "postinst" ]]; 2252 if [[ ${EBUILD_PHASE} != "setup" && ${EBUILD_PHASE} != "preinst" && ${EBUILD_PHASE} != "postinst" ]];
1706 echo "GENTOO_VM=${GENTOO_VM} CLASSPATH=\"${CLASSPATH}\" JAVA_HOME=\"${JAVA_HOME}\"" >&2 2277 echo "GENTOO_VM=${GENTOO_VM} CLASSPATH=\"${CLASSPATH}\" JAVA_HOME=\"${JAVA_HOME}\"" >&2
1707 echo "JAVACFLAGS=\"${JAVACFLAGS}\" COMPILER=\"${GENTOO_COMPILER}\"" >&2 2278 echo "JAVACFLAGS=\"${JAVACFLAGS}\" COMPILER=\"${GENTOO_COMPILER}\"" >&2
1708 echo "and of course, the output of emerge --info" >&2 2279 echo "and of course, the output of emerge --info" >&2
1709} 2280}
1710 2281
2282
2283# TODO document
2284# List jars in the source directory, ${S}
2285java-pkg_jar-list() {
2286 if [[ -n "${JAVA_PKG_DEBUG}" ]]; then
2287 einfo "Linked Jars"
2288 find "${S}" -type l -name '*.jar' -print0 | xargs -0 -r -n 500 ls -ald | sed -e "s,${WORKDIR},\${WORKDIR},"
2289 einfo "Jars"
2290 find "${S}" -type f -name '*.jar' -print0 | xargs -0 -r -n 500 ls -ald | sed -e "s,${WORKDIR},\${WORKDIR},"
2291 einfo "Classes"
2292 find "${S}" -type f -name '*.class' -print0 | xargs -0 -r -n 500 ls -ald | sed -e "s,${WORKDIR},\${WORKDIR},"
2293 fi
2294}
2295
2296# ------------------------------------------------------------------------------
2297# @internal-function java-pkg_verify-classes
2298#
2299# Verify that the classes were compiled for the right source / target. Dies if
2300# not.
2301# @param $1 (optional) - the file to check, otherwise checks whole ${D}
2302# ------------------------------------------------------------------------------
2303java-pkg_verify-classes() {
2304 #$(find ${D} -type f -name '*.jar' -o -name '*.class')
2305 local target=$(java-pkg_get-target)
2306 local result
2307 local log="${T}/class-version-verify.log"
2308 if [[ -n "${1}" ]]; then
2309 class-version-verify.py -v -t ${target} "${1}" > "${log}"
2310 result=$?
2311 else
2312 ebegin "Verifying java class versions (target: ${target})"
2313 class-version-verify.py -v -t ${target} -r "${D}" > "${log}"
2314 result=$?
2315 eend ${result}
2316 fi
2317 [[ -n ${JAVA_PKG_DEBUG} ]] && cat "${log}"
2318 if [[ ${result} != 0 ]]; then
2319 eerror "Incorrect bytecode version found"
2320 [[ -n "${1}" ]] && eerror "in file: ${1}"
2321 eerror "See ${log} for more details."
2322 die "Incorrect bytecode found"
2323 fi
2324}
2325
1711# ------------------------------------------------------------------------------ 2326# ------------------------------------------------------------------------------
1712# @section-end internal 2327# @section-end internal
1713# ------------------------------------------------------------------------------ 2328# ------------------------------------------------------------------------------
1714 2329
1715java-pkg_check-phase() { 2330java-pkg_check-phase() {
1716 local phase=${1} 2331 local phase=${1}
1717 local funcname=${2} 2332 local funcname=${2}
1718 # TODO add check for java-stricter
1719 if [[ ${EBUILD_PHASE} != ${phase} ]]; then 2333 if is-java-strict && [[ ${EBUILD_PHASE} != ${phase} ]]; then
1720 java-pkg_announce-qa-violation \ 2334 java-pkg_announce-qa-violation \
1721 "${funcname} used outside of src_${phase}" 2335 "${funcname} used outside of src_${phase}"
1722 fi 2336 fi
1723} 2337}
1724 2338
1735 java-pkg_announce-qa-violation "deprecated USE flag 'jikes' in IUSE" 2349 java-pkg_announce-qa-violation "deprecated USE flag 'jikes' in IUSE"
1736 fi 2350 fi
1737} 2351}
1738 2352
1739java-pkg_announce-qa-violation() { 2353java-pkg_announce-qa-violation() {
1740 if hasq java-strict ${FEATURES}; then 2354 if is-java-strict; then
1741 echo "Java QA Notice: $@" >&2 2355 echo "Java QA Notice: $@" >&2
1742 increment-qa-violations 2356 increment-qa-violations
1743 fi 2357 fi
1744} 2358}
1745 2359
1746increment-qa-violations() { 2360increment-qa-violations() {
1747 let "JAVA_PKG_QA_VIOLATIONS+=1" 2361 let "JAVA_PKG_QA_VIOLATIONS+=1"
1748 export JAVA_PKG_QA_VIOLATIONS 2362 export JAVA_PKG_QA_VIOLATIONS
1749} 2363}
1750 2364
2365is-java-strict() {
2366 [[ -n ${JAVA_PKG_STRICT} ]]
2367 return $?
2368}
2369
1751# ------------------------------------------------------------------------------ 2370# ------------------------------------------------------------------------------
1752# @eclass-end 2371# @eclass-end
1753# ------------------------------------------------------------------------------ 2372# ------------------------------------------------------------------------------

Legend:
Removed from v.1.3  
changed lines
  Added in v.1.67

  ViewVC Help
Powered by ViewVC 1.1.20