/[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.40 Revision 1.93
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.40 2007/01/10 09:52:51 betelgeuse Exp $ 9# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.93 2007/09/27 19:47:08 betelgeuse Exp $
10
11 10
12# ----------------------------------------------------------------------------- 11# -----------------------------------------------------------------------------
13# @eclass-begin 12# @eclass-begin
14# @eclass-shortdesc Java Utility eclass 13# @eclass-shortdesc Java Utility eclass
15# @eclass-maintainer java@gentoo.org 14# @eclass-maintainer java@gentoo.org
36# ----------------------------------------------------------------------------- 35# -----------------------------------------------------------------------------
37 36
38# Make sure we use java-config-2 37# Make sure we use java-config-2
39export WANT_JAVA_CONFIG="2" 38export WANT_JAVA_CONFIG="2"
40 39
41# TODO document 40# -----------------------------------------------------------------------------
41# @variable-external WANT_ANT_TASKS
42# @variable-default ""
43#
44# An $IFS separated list of ant tasks.
45# Ebuild can specify this variable before inheriting java-ant-2 eclass to
46# determine ANT_TASKS it needs. They will be automatically translated to
47# DEPEND variable and ANT_TASKS variable. JAVA_PKG_FORCE_ANT_TASKS can override
48# ANT_TASKS set by WANT_ANT_TASKS, but not the DEPEND due to caching.
49# Ebuilds that need to depend conditionally on certain tasks and specify them
50# differently for different eant calls can't use this simplified approach.
51# You also cannot specify version or anything else than ant-*.
52#
53# @example WANT_ANT_TASKS="ant-junit ant-trax"
54#
55# @seealso JAVA_PKG_FORCE_ANT_TASKS
56# -----------------------------------------------------------------------------
57#WANT_ANT_TASKS
58
59# -----------------------------------------------------------------------------
60# @variable-internal JAVA_PKG_PORTAGE_DEP
61#
62# The version of portage we need to function properly. Previously it was
63# portage with phase hooks support but now we use a version with proper env
64# saving.
65# -----------------------------------------------------------------------------
42JAVA_PKG_PORTAGE_DEP=">=sys-apps/portage-2.1_pre1" 66JAVA_PKG_PORTAGE_DEP=">=sys-apps/portage-2.1.2.7"
43 67
44# ----------------------------------------------------------------------------- 68# -----------------------------------------------------------------------------
45# @variable-internal JAVA_PKG_E_DEPEND 69# @variable-internal JAVA_PKG_E_DEPEND
46# 70#
47# 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
48# the version of java-config we want to use. We also need a recent version 72# the version of java-config we want to use. Usually the latest stable version
49# portage, that includes phase hooks. 73# so that ebuilds can use new features without depending on specific versions.
50# ----------------------------------------------------------------------------- 74# -----------------------------------------------------------------------------
51JAVA_PKG_E_DEPEND=">=dev-java/java-config-2.0.19-r1 ${JAVA_PKG_PORTAGE_DEP}" 75JAVA_PKG_E_DEPEND=">=dev-java/java-config-2.0.33-r1 ${JAVA_PKG_PORTAGE_DEP}"
52 76
53# ----------------------------------------------------------------------------- 77# -----------------------------------------------------------------------------
54# @variable-external JAVA_PKG_ALLOW_VM_CHANGE 78# @variable-external JAVA_PKG_ALLOW_VM_CHANGE
55# @variable-default yes 79# @variable-default yes
56# 80#
130# @note This should only be used internally or for testing. 154# @note This should only be used internally or for testing.
131# @example Use jikes and javac, in that order 155# @example Use jikes and javac, in that order
132# JAVA_PKG_FORCE_COMPILER="jikes javac" 156# JAVA_PKG_FORCE_COMPILER="jikes javac"
133# ----------------------------------------------------------------------------- 157# -----------------------------------------------------------------------------
134 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
135# TODO document me 173# TODO document me
136JAVA_PKG_QA_VIOLATIONS=0 174JAVA_PKG_QA_VIOLATIONS=0
137 175
138# ----------------------------------------------------------------------------- 176# -----------------------------------------------------------------------------
139# @section-end variables 177# @section-end variables
146# 184#
147# 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
148# libraries, etc. 186# libraries, etc.
149# ----------------------------------------------------------------------------- 187# -----------------------------------------------------------------------------
150 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 --subdir - If the examples need a certain directory structure
201# @param $* - list of files to install
202# ------------------------------------------------------------------------------
203java-pkg_doexamples() {
204 debug-print-function ${FUNCNAME} $*
205
206 [[ ${#} -lt 1 ]] && die "At least one argument needed"
207
208 java-pkg_check-phase install
209
210 local dest=/usr/share/doc/${PF}/examples
211 if [[ ${1} == --subdir ]]; then
212 local dest=${dest}/${2}
213 dodir ${dest}
214 shift 2
215 fi
216
217 if [[ ${#} = 1 && -d ${1} ]]; then
218 ( # dont want to pollute calling env
219 insinto "${dest}"
220 doins -r ${1}/*
221 ) || die "Installing examples failed"
222 else
223 ( # dont want to pollute calling env
224 insinto "${dest}"
225 doins -r "$@"
226 ) || die "Installing examples failed"
227 fi
228}
151 229
152# ----------------------------------------------------------------------------- 230# -----------------------------------------------------------------------------
153# @ebuild-function java-pkg_dojar 231# @ebuild-function java-pkg_dojar
154# 232#
155# Installs any number of jars. 233# Installs any number of jars.
174 # Create JARDEST if it doesn't exist 252 # Create JARDEST if it doesn't exist
175 dodir ${JAVA_PKG_JARDEST} 253 dodir ${JAVA_PKG_JARDEST}
176 254
177 local jar 255 local jar
178 # for each jar 256 # for each jar
179 for jar in ${@}; do 257 for jar in "${@}"; do
180 local jar_basename=$(basename "${jar}") 258 local jar_basename=$(basename "${jar}")
181 259
182 java-pkg_check-versioned-jar ${jar_basename} 260 java-pkg_check-versioned-jar ${jar_basename}
183 261
184 # check if it exists 262 # check if it exists
185 if [[ -e "${jar}" ]] ; then 263 if [[ -e "${jar}" ]] ; then
264 # Don't overwrite if jar has already been installed with the same
265 # name
266 local dest="${D}${JAVA_PKG_JARDEST}/${jar_basename}"
267 if [[ -e "${dest}" ]]; then
268 ewarn "Overwriting ${dest}"
269 fi
270
186 # install it into JARDEST if it's a non-symlink 271 # install it into JARDEST if it's a non-symlink
187 if [[ ! -L "${jar}" ]] ; then 272 if [[ ! -L "${jar}" ]] ; then
273 #but first check class version when in strict mode.
274 is-java-strict && java-pkg_verify-classes "${jar}"
275
188 INSDESTTREE="${JAVA_PKG_JARDEST}" \ 276 INSDESTTREE="${JAVA_PKG_JARDEST}" \
189 doins "${jar}" || die "failed to install ${jar}" 277 doins "${jar}" || die "failed to install ${jar}"
190 java-pkg_append_ JAVA_PKG_CLASSPATH "${JAVA_PKG_JARDEST}/${jar_basename}" 278 java-pkg_append_ JAVA_PKG_CLASSPATH "${JAVA_PKG_JARDEST}/${jar_basename}"
191 debug-print "installed ${jar} to ${D}${JAVA_PKG_JARDEST}" 279 debug-print "installed ${jar} to ${D}${JAVA_PKG_JARDEST}"
192 # make a symlink to the original jar if it's symlink 280 # make a symlink to the original jar if it's symlink
212# Using env variables keeps this eclass working with java-config versions that 300# Using env variables keeps this eclass working with java-config versions that
213# do not handle use flags. 301# do not handle use flags.
214# ------------------------------------------------------------------------------ 302# ------------------------------------------------------------------------------
215 303
216depend-java-query() { 304depend-java-query() {
305 # Used to have a which call here but it caused endless loops for some people
306 # that had some weird bashrc voodoo for which.
217 USE="${USE}" $(which depend-java-query) "${@}" 307 USE="${USE}" /usr/bin/depend-java-query "${@}"
218} 308}
219 309
220# ------------------------------------------------------------------------------ 310# ------------------------------------------------------------------------------
221# @ebuild-function java-pkg_regjar 311# @ebuild-function java-pkg_regjar
222# 312#
254 [[ ${#} -lt 1 ]] && die "at least one argument needed" 344 [[ ${#} -lt 1 ]] && die "at least one argument needed"
255 345
256 java-pkg_init_paths_ 346 java-pkg_init_paths_
257 347
258 local jar jar_dir jar_file 348 local jar jar_dir jar_file
259 for jar in ${@}; do 349 for jar in "${@}"; do
260 # TODO use java-pkg_check-versioned-jar 350 # TODO use java-pkg_check-versioned-jar
261 if [[ -e "${jar}" || -e "${D}${jar}" ]]; then 351 if [[ -e "${jar}" || -e "${D}${jar}" ]]; then
262 [[ -d "${jar}" || -d "${D}${jar}" ]] \ 352 [[ -d "${jar}" || -d "${D}${jar}" ]] \
263 && die "Called ${FUNCNAME} on a directory $*" 353 && die "Called ${FUNCNAME} on a directory $*"
354
355 #check that class version correct when in strict mode
356 is-java-strict && java-pkg_verify-classes "${jar}"
357
264 # nelchael: we should strip ${D} in this case too, here's why: 358 # nelchael: we should strip ${D} in this case too, here's why:
265 # imagine such call: 359 # imagine such call:
266 # java-pkg_regjar ${D}/opt/java/*.jar 360 # java-pkg_regjar ${D}/opt/java/*.jar
267 # such call will fall into this case (-e ${jar}) and will 361 # such call will fall into this case (-e ${jar}) and will
268 # record paths with ${D} in package.env 362 # record paths with ${D} in package.env
269 java-pkg_append_ JAVA_PKG_CLASSPATH "${jar#${D}}" 363 java-pkg_append_ JAVA_PKG_CLASSPATH "${jar#${D}}"
270 else 364 else
365 if [[ ${jar} = *\** ]]; then
366 eerror "The argument ${jar} to ${FUNCNAME}"
367 eerror "has * in it. If you want it to glob in"
368 eerror '${D} add ${D} to the argument.'
369 fi
271 die "${jar} does not exist" 370 die "${jar} does not exist"
272 fi 371 fi
273 done 372 done
274 373
275 java-pkg_do_write_ 374 java-pkg_do_write_
292 local original_jar="${1}" 391 local original_jar="${1}"
293 local new_jar="${2:-${PN}.jar}" 392 local new_jar="${2:-${PN}.jar}"
294 local new_jar_dest="${T}/${new_jar}" 393 local new_jar_dest="${T}/${new_jar}"
295 394
296 [[ -z ${original_jar} ]] && die "Must specify a jar to install" 395 [[ -z ${original_jar} ]] && die "Must specify a jar to install"
297 [[ ! -f ${original_jar} ]] && die "${original_jar} does not exist!" 396 [[ ! -f ${original_jar} ]] \
397 && die "${original_jar} does not exist or is not a file!"
298 398
299 rm -f "${new_jar_dest}" || die "Failed to remove ${new_jar_dest}" 399 rm -f "${new_jar_dest}" || die "Failed to remove ${new_jar_dest}"
300 cp "${original_jar}" "${new_jar_dest}" \ 400 cp "${original_jar}" "${new_jar_dest}" \
301 || die "Failed to copy ${original_jar} to ${new_jar_dest}" 401 || die "Failed to copy ${original_jar} to ${new_jar_dest}"
302 java-pkg_dojar "${new_jar_dest}" 402 java-pkg_dojar "${new_jar_dest}"
351 java-pkg_append_ JAVA_PKG_LIBRARY "${JAVA_PKG_LIBDEST}" 451 java-pkg_append_ JAVA_PKG_LIBRARY "${JAVA_PKG_LIBDEST}"
352 debug-print "Installing ${lib} to ${JAVA_PKG_LIBDEST}" 452 debug-print "Installing ${lib} to ${JAVA_PKG_LIBDEST}"
353 # otherwise make a symlink to the symlink's origin 453 # otherwise make a symlink to the symlink's origin
354 else 454 else
355 # TODO use dosym 455 # TODO use dosym
456 ln -s "$(readlink "${lib}")" \
356 ln -s "$(readlink "${lib}")" "${D}${JAVA_PKG_LIBDEST}/$(basename "${lib}")" 457 "${D}${JAVA_PKG_LIBDEST}/$(basename "${lib}")"
357 debug-print "${lib} is a symlink, linking accordanly" 458 debug-print "${lib} is a symlink, linking accordanly"
358 fi 459 fi
359 # otherwise die 460 # otherwise die
360 else 461 else
361 die "${lib} does not exist" 462 die "${lib} does not exist"
462# @example: 563# @example:
463# java-pkg_dojavadoc docs/api 564# java-pkg_dojavadoc docs/api
464# 565#
465# ------------------------------------------------------------------------------ 566# ------------------------------------------------------------------------------
466java-pkg_dojavadoc() { 567java-pkg_dojavadoc() {
568 debug-print-function ${FUNCNAME} $*
467 local dir="$1" 569 local dir="$1"
570
571 # QA checks
468 572
469 java-pkg_check-phase install 573 java-pkg_check-phase install
470 574
471 [[ -z "${dir}" ]] && die "Must specify a directory!" 575 [[ -z "${dir}" ]] && die "Must specify a directory!"
472 [[ ! -d "${dir}" ]] && die "${dir} does not exist, or isn't a directory!" 576 [[ ! -d "${dir}" ]] && die "${dir} does not exist, or isn't a directory!"
577 if [[ ! -e "${dir}/index.html" ]]; then
578 local msg="No index.html in javadoc directory"
579 ewarn "${msg}"
580 is-java-strict && die "${msg}"
581 fi
582
583 # Renaming to match our directory layout
473 584
474 local dir_to_install="${dir}" 585 local dir_to_install="${dir}"
475 if [[ "$(basename "${dir}")" != "api" ]]; then 586 if [[ "$(basename "${dir}")" != "api" ]]; then
476 dir_to_install="${T}/api" 587 dir_to_install="${T}/api"
477 # TODO use doins 588 # TODO use doins
478 cp -r "${dir}" "${dir_to_install}" || die "cp failed" 589 cp -r "${dir}" "${dir_to_install}" || die "cp failed"
479 fi 590 fi
591
592 # Actual installation
480 593
481 java-pkg_dohtml -r ${dir_to_install} 594 java-pkg_dohtml -r ${dir_to_install}
482} 595}
483 596
484# ------------------------------------------------------------------------------ 597# ------------------------------------------------------------------------------
502# FIXME apparently this fails if you give it an empty directories 615# FIXME apparently this fails if you give it an empty directories
503java-pkg_dosrc() { 616java-pkg_dosrc() {
504 debug-print-function ${FUNCNAME} $* 617 debug-print-function ${FUNCNAME} $*
505 618
506 [ ${#} -lt 1 ] && die "At least one argument needed" 619 [ ${#} -lt 1 ] && die "At least one argument needed"
507 if ! hasq source ${IUSE}; then
508 echo "Java QA Notice: ${FUNCNAME} called without source in IUSE"
509 fi
510 620
511 java-pkg_check-phase install 621 java-pkg_check-phase install
512 622
513 [[ ${#} -lt 1 ]] && die "At least one argument needed" 623 [[ ${#} -lt 1 ]] && die "At least one argument needed"
624
625 if ! [[ ${DEPEND} = *app-arch/zip* ]]; then
626 local msg="${FUNCNAME} called without app-arch/zip in DEPEND"
627 if is-java-strict; then
628 eerror "${msg}"
629 die "${msg}"
630 else
631 echo "${msg}"
632 echo "Please report this to http://bugs.gentoo.org."
633 fi
634 fi
514 635
515 java-pkg_init_paths_ 636 java-pkg_init_paths_
516 637
517 local zip_name="${PN}-src.zip" 638 local zip_name="${PN}-src.zip"
518 local zip_path="${T}/${zip_name}" 639 local zip_path="${T}/${zip_name}"
519 local dir 640 local dir
520 for dir in ${@}; do 641 for dir in "${@}"; do
521 local dir_parent=$(dirname "${dir}") 642 local dir_parent=$(dirname "${dir}")
522 local dir_name=$(basename "${dir}") 643 local dir_name=$(basename "${dir}")
523 pushd ${dir_parent} > /dev/null || die "problem entering ${dir_parent}" 644 pushd ${dir_parent} > /dev/null || die "problem entering ${dir_parent}"
524 zip -q -r ${zip_path} ${dir_name} -i '*.java' 645 zip -q -r ${zip_path} ${dir_name} -i '*.java'
525 local result=$? 646 local result=$?
550# @param $1 - filename of launcher to create 671# @param $1 - filename of launcher to create
551# @param $2 - options, as follows: 672# @param $2 - options, as follows:
552# --main the.main.class.too.start 673# --main the.main.class.too.start
553# --jar /the/jar/too/launch.jar or just <name>.jar 674# --jar /the/jar/too/launch.jar or just <name>.jar
554# --java_args 'Extra arguments to pass to java' 675# --java_args 'Extra arguments to pass to java'
555# --pkg_args 'Extra arguments too pass to the package' 676# --pkg_args 'Extra arguments to pass to the package'
556# --pwd 677# --pwd Directory the launcher changes to before executing java
557# -into 678# -into Directory to install the launcher to, instead of /usr/bin
558# -pre 679# -pre Prepend contents of this file to the launcher
559# ------------------------------------------------------------------------------ 680# ------------------------------------------------------------------------------
560java-pkg_dolauncher() { 681java-pkg_dolauncher() {
561 debug-print-function ${FUNCNAME} $* 682 debug-print-function ${FUNCNAME} $*
562 683
563 java-pkg_check-phase install 684 java-pkg_check-phase install
604 fi 725 fi
605 fi 726 fi
606 727
607 # Write the actual script 728 # Write the actual script
608 echo "#!/bin/bash" > "${target}" 729 echo "#!/bin/bash" > "${target}"
609 [[ -n "${pre}" ]] && [[ -f "${pre}" ]] && cat "${pre}" >> "${target}" 730 if [[ -n "${pre}" ]]; then
731 if [[ -f "${pre}" ]]; then
732 cat "${pre}" >> "${target}"
733 else
734 die "-pre specified file '${pre}' does not exist"
735 fi
736 fi
610 echo "gjl_package=${JAVA_PKG_NAME}" >> "${target}" 737 echo "gjl_package=${JAVA_PKG_NAME}" >> "${target}"
611 cat "${var_tmp}" >> "${target}" 738 cat "${var_tmp}" >> "${target}"
612 rm -f "${var_tmp}" 739 rm -f "${var_tmp}"
613 echo "source /usr/share/java-config-2/launcher/launcher.bash" >> "${target}" 740 echo "source /usr/share/java-config-2/launcher/launcher.bash" >> "${target}"
614 741
706# Example: get a specific jar from xerces slot 2, and name it diffrently 833# Example: get a specific jar from xerces slot 2, and name it diffrently
707# java-pkg_jar-from xerces-2 xml-apis.jar xml.jar 834# java-pkg_jar-from xerces-2 xml-apis.jar xml.jar
708# Example: get junit.jar which is needed only for building 835# Example: get junit.jar which is needed only for building
709# java-pkg_jar-from --build-only junit junit.jar 836# java-pkg_jar-from --build-only junit junit.jar
710# 837#
711# @param $1 - (optional) "--build-only" makes the jar(s) not added into 838# @param $opt
712# package.env DEPEND line. 839# --build-only - makes the jar(s) not added into package.env DEPEND line.
713# @param $1 - Package to get jars from. 840# (assumed automatically when called inside src_test)
841# --with-dependencies - get jars also from requested package's dependencies
842# transitively.
843# --into $dir - symlink jar(s) into $dir (must exist) instead of .
844# @param $1 - Package to get jars from, or comma-separated list of packages in
845# case other parameters are not used.
714# @param $2 - jar from package. If not specified, all jars will be used. 846# @param $2 - jar from package. If not specified, all jars will be used.
715# @param $3 - When a single jar is specified, destination filename of the 847# @param $3 - When a single jar is specified, destination filename of the
716# symlink. Defaults to the name of the jar. 848# symlink. Defaults to the name of the jar.
717# ------------------------------------------------------------------------------ 849# ------------------------------------------------------------------------------
718# TODO could probably be cleaned up a little 850# TODO could probably be cleaned up a little
719java-pkg_jar-from() { 851java-pkg_jar-from() {
720 debug-print-function ${FUNCNAME} $* 852 debug-print-function ${FUNCNAME} $*
721 853
722 local build_only="" 854 local build_only=""
855 local destdir="."
856 local deep=""
723 857
858 [[ "${EBUILD_PHASE}" == "test" ]] && build_only="build"
859
860 while [[ "${1}" == --* ]]; do
724 if [[ "${1}" = "--build-only" ]]; then 861 if [[ "${1}" = "--build-only" ]]; then
725 build_only="true" 862 build_only="build"
863 elif [[ "${1}" = "--with-dependencies" ]]; then
864 deep="--with-dependencies"
865 elif [[ "${1}" = "--into" ]]; then
866 destdir="${2}"
867 shift
868 else
869 die "java-pkg_jar-from called with unknown parameter: ${1}"
870 fi
726 shift 871 shift
727 fi 872 done
728 873
729 local target_pkg="${1}" target_jar="${2}" destjar="${3}" 874 local target_pkg="${1}" target_jar="${2}" destjar="${3}"
730 875
731 [[ -z ${target_pkg} ]] && die "Must specify a package" 876 [[ -z ${target_pkg} ]] && die "Must specify a package"
732 877
733 # default destjar to the target jar 878 # default destjar to the target jar
734 [[ -z "${destjar}" ]] && destjar="${target_jar}" 879 [[ -z "${destjar}" ]] && destjar="${target_jar}"
735 880
736 local error_msg="There was a problem getting the classpath for ${target_pkg}." 881 local error_msg="There was a problem getting the classpath for ${target_pkg}."
737 local classpath 882 local classpath
738 classpath="$(java-config --classpath=${target_pkg})" 883 classpath="$(java-config ${deep} --classpath=${target_pkg})"
739 [[ $? != 0 ]] && die ${error_msg} 884 [[ $? != 0 ]] && die ${error_msg}
885
886 # When we have commas this functions is called to bring jars from multiple
887 # packages. This affects recording of dependencencies performed later
888 # which expects one package only, so we do it here.
889 if [[ ${target_pkg} = *,* ]]; then
890 for pkg in ${target_pkg//,/ }; do
891 java-pkg_ensure-dep "${build_only}" "${pkg}"
892 [[ -z "${build_only}" ]] && java-pkg_record-jar_ "${pkg}"
893 done
894 # setting this disables further record-jar_ calls later
895 build_only="build"
896 else
897 java-pkg_ensure-dep "${build_only}" "${target_pkg}"
898 fi
899
900 pushd ${destdir} > /dev/null \
901 || die "failed to change directory to ${destdir}"
740 902
741 local jar 903 local jar
742 for jar in ${classpath//:/ }; do 904 for jar in ${classpath//:/ }; do
743 local jar_name=$(basename "${jar}") 905 local jar_name=$(basename "${jar}")
744 if [[ ! -f "${jar}" ]] ; then 906 if [[ ! -f "${jar}" ]] ; then
755 elif [[ "${jar_name}" == "${target_jar}" ]] ; then 917 elif [[ "${jar_name}" == "${target_jar}" ]] ; then
756 [[ -f "${destjar}" ]] && rm "${destjar}" 918 [[ -f "${destjar}" ]] && rm "${destjar}"
757 ln -snf "${jar}" "${destjar}" \ 919 ln -snf "${jar}" "${destjar}" \
758 || die "Failed to make symlink from ${jar} to ${destjar}" 920 || die "Failed to make symlink from ${jar} to ${destjar}"
759 [[ -z "${build_only}" ]] && java-pkg_record-jar_ "${target_pkg}" "${jar}" 921 [[ -z "${build_only}" ]] && java-pkg_record-jar_ "${target_pkg}" "${jar}"
922 popd > /dev/null
760 return 0 923 return 0
761 fi 924 fi
762 done 925 done
926 popd > /dev/null
763 # if no target was specified, we're ok 927 # if no target was specified, we're ok
764 if [[ -z "${target_jar}" ]] ; then 928 if [[ -z "${target_jar}" ]] ; then
765 return 0 929 return 0
766 # otherwise, die bitterly 930 # otherwise, die bitterly
767 else 931 else
791# Example: Get the classpath for xerces-2 and xalan, 955# Example: Get the classpath for xerces-2 and xalan,
792# java-pkg_getjars xerces-2,xalan 956# java-pkg_getjars xerces-2,xalan
793# Example Return: 957# Example Return:
794# /usr/share/xerces-2/lib/xml-apis.jar:/usr/share/xerces-2/lib/xmlParserAPIs.jar:/usr/share/xalan/lib/xalan.jar 958# /usr/share/xerces-2/lib/xml-apis.jar:/usr/share/xerces-2/lib/xmlParserAPIs.jar:/usr/share/xalan/lib/xalan.jar
795# 959#
796# @param $1 - (optional) "--build-only" makes the jar(s) not added into 960# @param $opt
797# package.env DEPEND line. 961# --build-only - makes the jar(s) not added into package.env DEPEND line.
962# (assumed automatically when called inside src_test)
963# --with-dependencies - get jars also from requested package's dependencies
964# transitively.
798# @param $2 - list of packages to get jars from 965# @param $1 - list of packages to get jars from
799# (passed to java-config --classpath) 966# (passed to java-config --classpath)
800# ------------------------------------------------------------------------------ 967# ------------------------------------------------------------------------------
801java-pkg_getjars() { 968java-pkg_getjars() {
802 debug-print-function ${FUNCNAME} $* 969 debug-print-function ${FUNCNAME} $*
803 970
971 local build_only=""
972 local deep=""
973
974 [[ "${EBUILD_PHASE}" == "test" ]] && build_only="build"
975
976 while [[ "${1}" == --* ]]; do
804 if [[ "${1}" = "--build-only" ]]; then 977 if [[ "${1}" = "--build-only" ]]; then
805 local build_only="true" 978 build_only="build"
979 elif [[ "${1}" = "--with-dependencies" ]]; then
980 deep="--with-dependencies"
981 else
982 die "java-pkg_jar-from called with unknown parameter: ${1}"
983 fi
806 shift 984 shift
807 fi 985 done
808 986
809 [[ ${#} -ne 1 ]] && die "${FUNCNAME} takes only one argument besides --build-only" 987 [[ ${#} -ne 1 ]] && die "${FUNCNAME} takes only one argument besides --*"
988
810 989
811 local classpath pkgs="${1}" 990 local classpath pkgs="${1}"
812 jars="$(java-config --classpath=${pkgs})" 991 jars="$(java-config ${deep} --classpath=${pkgs})"
813 [[ -z "${jars}" ]] && die "java-config --classpath=${pkgs} failed" 992 [[ $? != 0 || -z "${jars}" ]] && die "java-config --classpath=${pkgs} failed"
814 debug-print "${pkgs}:${jars}" 993 debug-print "${pkgs}:${jars}"
994
995 for pkg in ${pkgs//,/ }; do
996 java-pkg_ensure-dep "${build_only}" "${pkg}"
997 done
815 998
816 if [[ -z "${classpath}" ]]; then 999 if [[ -z "${classpath}" ]]; then
817 classpath="${jars}" 1000 classpath="${jars}"
818 else 1001 else
819 classpath="${classpath}:${jars}" 1002 classpath="${classpath}:${jars}"
820 fi 1003 fi
821 1004
822 # Only record jars that aren't build-only 1005 # Only record jars that aren't build-only
823 if [[ -z "${build_only}" ]]; then 1006 if [[ -z "${build_only}" ]]; then
824 oldifs="${IFS}"
825 IFS=","
826 for pkg in ${pkgs}; do 1007 for pkg in ${pkgs//,/ }; do
827 java-pkg_record-jar_ "${pkg}" 1008 java-pkg_record-jar_ "${pkg}"
828 done 1009 done
829 IFS="${oldifs}"
830 fi 1010 fi
831 1011
832 echo "${classpath}" 1012 echo "${classpath}"
833} 1013}
834 1014
844# @example 1024# @example
845# java-pkg_getjar xerces-2 xml-apis.jar 1025# java-pkg_getjar xerces-2 xml-apis.jar
846# @example-return 1026# @example-return
847# /usr/share/xerces-2/lib/xml-apis.jar 1027# /usr/share/xerces-2/lib/xml-apis.jar
848# 1028#
849# @param $1 - (optional) "--build-only" makes the jar not added into 1029# @param $opt
850# package.env DEPEND line. 1030# --build-only - makes the jar not added into package.env DEPEND line.
851# @param $1 - package to use 1031# @param $1 - package to use
852# @param $2 - jar to get 1032# @param $2 - jar to get
853# ------------------------------------------------------------------------------ 1033# ------------------------------------------------------------------------------
854java-pkg_getjar() { 1034java-pkg_getjar() {
855 debug-print-function ${FUNCNAME} $* 1035 debug-print-function ${FUNCNAME} $*
856 1036
857 local build_only="" 1037 local build_only=""
858 1038
1039 [[ "${EBUILD_PHASE}" == "test" ]] && build_only="build"
1040
1041 while [[ "${1}" == --* ]]; do
859 if [[ "${1}" = "--build-only" ]]; then 1042 if [[ "${1}" = "--build-only" ]]; then
860 build_only="true" 1043 build_only="build"
1044 else
1045 die "java-pkg_jar-from called with unknown parameter: ${1}"
1046 fi
861 shift 1047 shift
862 fi 1048 done
1049
1050 [[ ${#} -ne 2 ]] && die "${FUNCNAME} takes only two arguments besides --*"
863 1051
864 local pkg="${1}" target_jar="${2}" jar 1052 local pkg="${1}" target_jar="${2}" jar
865 [[ -z ${pkg} ]] && die "Must specify package to get a jar from" 1053 [[ -z ${pkg} ]] && die "Must specify package to get a jar from"
866 [[ -z ${target_jar} ]] && die "Must specify jar to get" 1054 [[ -z ${target_jar} ]] && die "Must specify jar to get"
867 1055
868 local error_msg="Could not find classpath for ${pkg}. Are you sure its installed?" 1056 local error_msg="Could not find classpath for ${pkg}. Are you sure its installed?"
869 local classpath 1057 local classpath
870 classpath=$(java-config --classpath=${pkg}) 1058 classpath=$(java-config --classpath=${pkg})
871 [[ $? != 0 ]] && die ${error_msg} 1059 [[ $? != 0 ]] && die ${error_msg}
1060
1061 java-pkg_ensure-dep "${build_only}" "${pkg}"
872 1062
873 for jar in ${classpath//:/ }; do 1063 for jar in ${classpath//:/ }; do
874 if [[ ! -f "${jar}" ]] ; then 1064 if [[ ! -f "${jar}" ]] ; then
875 die "Installation problem with jar ${jar} in ${pkg} - is it installed?" 1065 die "Installation problem with jar ${jar} in ${pkg} - is it installed?"
876 fi 1066 fi
883 fi 1073 fi
884 done 1074 done
885 1075
886 die "Could not find ${target_jar} in ${pkg}" 1076 die "Could not find ${target_jar} in ${pkg}"
887 return 1 1077 return 1
1078}
1079
1080# ------------------------------------------------------------------------------
1081# @ebuild-function java-pkg_register-dependency
1082#
1083# Registers runtime dependency on a package, list of packages, or a single jar
1084# from a package, into package.env DEPEND line. Can only be called in
1085# src_install phase.
1086# Intended for binary packages where you don't need to symlink the jars or get
1087# their classpath during build. As such, the dependencies only need to be
1088# specified in ebuild's RDEPEND, and should be omitted in DEPEND.
1089#
1090# @param $1 - comma-separated list of packages, or a single package
1091# @param $2 - if param $1 is a single package, optionally specify the jar
1092# to depend on
1093#
1094# Example: Record the dependency on whole xerces-2 and xalan,
1095# java-pkg_register-dependency xerces-2,xalan
1096# Example: Record the dependency on ant.jar from ant-core
1097# java-pkg_register-dependency ant-core ant.jar
1098#
1099# Note: Passing both list of packages as the first parameter AND specifying the
1100# jar as the second is not allowed and will cause the function to die. We assume
1101# that there's more chance one passes such combination as a mistake, than that
1102# there are more packages providing identically named jar without class
1103# collisions.
1104# ------------------------------------------------------------------------------
1105java-pkg_register-dependency() {
1106 debug-print-function ${FUNCNAME} $*
1107
1108 java-pkg_check-phase install
1109
1110 [[ ${#} -gt 2 ]] && die "${FUNCNAME} takes at most two arguments"
1111
1112 local pkgs="${1}"
1113 local jar="${2}"
1114
1115 [[ -z "${pkgs}" ]] && die "${FUNCNAME} called with no package(s) specified"
1116
1117 if [[ -z "${jar}" ]]; then
1118 for pkg in ${pkgs//,/ }; do
1119 java-pkg_ensure-dep runtime "${pkg}"
1120 java-pkg_record-jar_ "${pkg}"
1121 done
1122 else
1123 [[ ${pkgs} == *,* ]] && \
1124 die "${FUNCNAME} called with both package list and jar name"
1125 java-pkg_ensure-dep runtime "${pkgs}"
1126 java-pkg_record-jar_ "${pkgs}" "${jar}"
1127 fi
1128
1129 java-pkg_do_write_
1130}
1131
1132# ------------------------------------------------------------------------------
1133# @ebuild-function java-pkg_register-optional-dependency
1134#
1135# Registers optional runtime dependency on a package, list of packages, or a
1136# single jar from a package, into package.env OPTIONAL_DEPEND line. Can only be
1137# called in src_install phase.
1138# Intended for packages that can use other packages when those are in classpath.
1139# Will be put on classpath by launcher if they are installed. Typical case is
1140# JDBC implementations for various databases. It's better than having USE flag
1141# for each implementation triggering hard dependency.
1142#
1143# @param $1 - comma-separated list of packages, or a single package
1144# @param $2 - if param $1 is a single package, optionally specify the jar
1145# to depend on
1146#
1147# Example: Record the optional dependency on some jdbc providers
1148# java-pkg_register-optional-dependency jdbc-jaybird,jtds-1.2,jdbc-mysql
1149#
1150# Note: Passing both list of packages as the first parameter AND specifying the
1151# jar as the second is not allowed and will cause the function to die. We assume
1152# that there's more chance one passes such combination as a mistake, than that
1153# there are more packages providing identically named jar without class
1154# collisions.
1155# ------------------------------------------------------------------------------
1156java-pkg_register-optional-dependency() {
1157 debug-print-function ${FUNCNAME} $*
1158
1159 java-pkg_check-phase install
1160
1161 [[ ${#} -gt 2 ]] && die "${FUNCNAME} takes at most two arguments"
1162
1163 local pkgs="${1}"
1164 local jar="${2}"
1165
1166 [[ -z "${pkgs}" ]] && die "${FUNCNAME} called with no package(s) specified"
1167
1168 if [[ -z "${jar}" ]]; then
1169 for pkg in ${pkgs//,/ }; do
1170 java-pkg_record-jar_ --optional "${pkg}"
1171 done
1172 else
1173 [[ ${pkgs} == *,* ]] && \
1174 die "${FUNCNAME} called with both package list and jar name"
1175 java-pkg_record-jar_ --optional "${pkgs}" "${jar}"
1176 fi
1177
1178 java-pkg_do_write_
1179}
1180
1181# ------------------------------------------------------------------------------
1182# @ebuild-function java-pkg_register-environment-variable
1183#
1184# Register an arbitrary environment variable into package.env. The gjl launcher
1185# for this package or any package depending on this will export it into
1186# environement before executing java command.
1187# Must only be called in src_install phase.
1188#
1189# @param $1 - variable name
1190# @param $2 - variable value
1191# ------------------------------------------------------------------------------
1192JAVA_PKG_EXTRA_ENV="${T}/java-pkg-extra-env"
1193JAVA_PKG_EXTRA_ENV_VARS=""
1194java-pkg_register-environment-variable() {
1195 debug-print-function ${FUNCNAME} $*
1196
1197 java-pkg_check-phase install
1198
1199 [[ ${#} != 2 ]] && die "${FUNCNAME} takes two arguments"
1200
1201 echo "${1}=\"${2}\"" >> ${JAVA_PKG_EXTRA_ENV}
1202 JAVA_PKG_EXTRA_ENV_VARS="${JAVA_PKG_EXTRA_ENV_VARS} ${1}"
1203
1204 java-pkg_do_write_
888} 1205}
889 1206
890# This function reads stdin, and based on that input, figures out how to 1207# This function reads stdin, and based on that input, figures out how to
891# populate jars from the filesystem. 1208# populate jars from the filesystem.
892# Need to figure out a good way of making use of this, ie be able to use a 1209# Need to figure out a good way of making use of this, ie be able to use a
1318 die "Need USE=test enabled" 1635 die "Need USE=test enabled"
1319 fi 1636 fi
1320} 1637}
1321 1638
1322# ------------------------------------------------------------------------------ 1639# ------------------------------------------------------------------------------
1640# @ebuild-function java-pkg_register-ant-task
1641#
1642# Register this package as ant task, so that ant will load it when no specific
1643# ANT_TASKS are specified. Note that even without this registering, all packages
1644# specified in ANT_TASKS will be loaded. Mostly used by the actual ant tasks
1645# packages, but can be also used by other ebuilds that used to symlink their
1646# .jar into /usr/share/ant-core/lib to get autoloaded, for backwards
1647# compatibility.
1648#
1649# @param --version x.y Register only for ant version x.y (otherwise for any ant
1650# version). Used by the ant-* packages to prevent loading of mismatched
1651# ant-core ant tasks after core was updated, before the tasks are updated,
1652# without a need for blockers.
1653# @param $1 Name to register as. Defaults to JAVA_PKG_NAME ($PN[-$SLOT])
1654# ------------------------------------------------------------------------------
1655java-pkg_register-ant-task() {
1656 local TASKS_DIR="tasks"
1657
1658 # check for --version x.y parameters
1659 while [[ -n "${1}" && -n "${2}" ]]; do
1660 local var="${1#--}"
1661 local val="${2}"
1662 if [[ "${var}" == "version" ]]; then
1663 TASKS_DIR="tasks-${val}"
1664 else
1665 die "Unknown parameter passed to java-pkg_register-ant-tasks: ${1} ${2}"
1666 fi
1667 shift 2
1668 done
1669
1670 local TASK_NAME="${1:-${JAVA_PKG_NAME}}"
1671
1672 dodir /usr/share/ant/${TASKS_DIR}
1673 touch "${D}/usr/share/ant/${TASKS_DIR}/${TASK_NAME}"
1674}
1675
1676# ------------------------------------------------------------------------------
1677# @internal-function java-pkg_ant-tasks-from-deps
1678#
1679# Function to determine ANT_TASKS from DEPEND variable for backwards
1680# compatibility with ebuilds that don't set ANT_TASKS before calling eant() or
1681# WANT_ANT_TASKS before inheriting java-pkg-2. If the DEPEND string contains
1682# "dev-java/ant" or "dev-java/ant-tasks", then it returns "all", otherwise
1683# "none". It's not smart enough to cope with USE flag depends but that shouldn't
1684# be a problem, the worst it can do is activace all tasks when not needed.
1685# Note that this is called only with JAVA_PKG_STRICT=1, to find ebuilds with
1686# insufficient dependencies, otherwise all available tasks are used for
1687# backwards compatilbility.
1688#
1689# @return "all" or "none"
1690# ------------------------------------------------------------------------------
1691java-pkg_ant-tasks-from-deps() {
1692 local found_ant found_ant_tasks
1693
1694 for dep in ${DEPEND}
1695 do
1696 local ant="$(awk '/(dev-java\/ant)/ { if (match($1, "(dev-java/ant)((-[0-9])+|$)", m)) print m[1] }' <<< ${dep})"
1697 [[ "${ant}" == "dev-java/ant" ]] && found_ant=true
1698 [[ "${dep}" == *"ant-tasks"* ]] && found_ant_tasks=true
1699 done
1700
1701 if [[ -n "${found_ant}" || -n "${found_ant_tasks}" ]]; then
1702 java-pkg_announce-qa-violation --nodie "The ebuild DEPENDS on deprecated ant or ant-tasks"
1703 echo "all"
1704 else
1705 # ebuild doesn't set ANT_TASKS and doesn't depend on ant-tasks or ant
1706 # so we deactivate all tasks that may be installed
1707 echo "none"
1708 fi
1709}
1710
1711# ------------------------------------------------------------------------------
1712# @internal-function java-pkg_ant-tasks-depend
1713#
1714# Translates the WANT_ANT_TASKS variable into valid dependencies.
1715# ------------------------------------------------------------------------------
1716java-pkg_ant-tasks-depend() {
1717 debug-print-function ${FUNCNAME} ${WANT_ANT_TASKS}
1718
1719 if [[ -n "${WANT_ANT_TASKS}" ]]; then
1720 local DEP=""
1721 for i in ${WANT_ANT_TASKS}
1722 do
1723 if [[ ${i} != ant-* ]]; then
1724 echo "Invalid atom in WANT_ANT_TASKS: ${i}"
1725 return 1
1726 fi
1727 DEP="${DEP}dev-java/${i} "
1728 done
1729 echo ${DEP}
1730 return 0
1731 else
1732 return 0
1733 fi
1734}
1735
1736# ------------------------------------------------------------------------------
1737# @ebuild-function ejunit
1738#
1739# Junit wrapper function. Makes it easier to run the tests and checks for
1740# dev-java/junit in DEPEND. Launches the tests using junit.textui.TestRunner.
1741#
1742# Examples:
1743# ejunit -cp build/classes org.blinkenlights.jid3.test.AllTests
1744# ejunit org.blinkenlights.jid3.test.AllTests
1745#
1746# @param $1 - -cp or -classpath
1747# @param $2 - classpath; junit and recorded dependencies get appended
1748# @param $@ - the rest of the parameters are passed to java
1749# ------------------------------------------------------------------------------
1750ejunit() {
1751 debug-print-function ${FUNCNAME} $*
1752
1753 local pkgs
1754 for atom in $(cat ${JAVA_PKG_DEPEND_FILE} | tr : ' '); do
1755 pkgs=${pkgs},$(echo ${atom} | sed -re "s/^.*@//")
1756 done
1757
1758 local cp=$(java-pkg_getjars --with-dependencies junit${pkgs})
1759 if [[ ${1} = -cp || ${1} = -classpath ]]; then
1760 cp="${2}:${cp}"
1761 shift 2
1762 else
1763 cp=".:${cp}"
1764 fi
1765
1766 local runner=junit.textui.TestRunner
1767 debug-print "Calling: java -cp \"${cp}\" -Djava.awt.headless=true ${runner} ${@}"
1768 java -cp "${cp}" -Djava.awt.headless=true ${runner} "${@}" || die "Running junit failed"
1769}
1770
1771# ------------------------------------------------------------------------------
1323# @section-end helper 1772# @section-end helper
1324# ------------------------------------------------------------------------------ 1773# ------------------------------------------------------------------------------
1325 1774
1326# ------------------------------------------------------------------------------ 1775# ------------------------------------------------------------------------------
1327# @section-begin build 1776# @section-begin build
1333 1782
1334# ------------------------------------------------------------------------------ 1783# ------------------------------------------------------------------------------
1335# @ebuild-function eant 1784# @ebuild-function eant
1336# 1785#
1337# Ant wrapper function. Will use the appropriate compiler, based on user-defined 1786# Ant wrapper function. Will use the appropriate compiler, based on user-defined
1338# compiler. 1787# compiler. Will also set proper ANT_TASKS from the variable ANT_TASKS,
1339# 1788# variables:
1789# EANT_GENTOO_CLASSPATH - calls java-pkg_getjars for the value and adds to the
1790# gentoo.classpath property. Be sure to call
1791# java-ant_rewrite-classpath in src_unpack.
1792# JAVA_PKG_NO_BUNDLED_SEARCH - Don't search for bundled jars or class files
1793# *ANT_TASKS - used to determine ANT_TASKS before calling Ant.
1340# ------------------------------------------------------------------------------ 1794# ------------------------------------------------------------------------------
1341eant() { 1795eant() {
1342 debug-print-function ${FUNCNAME} $* 1796 debug-print-function ${FUNCNAME} $*
1343 1797
1344 # FIXME get this working 1798 if [[ ${EBUILD_PHASE} = compile ]]; then
1345# if is-java-strict && [[ ! ${DEPEND} =~ "dev-java/ant" ]]; then 1799 # Used to be done in hooks in java-ant-2.eclass but moved here so that we can
1800 # finally get rid of the hooks without breaking stuff
1801
1802 [[ "${JAVA_ANT_IGNORE_SYSTEM_CLASSES}" && "${JAVA_PKG_BSFIX}" ]] \
1803 && java-ant_ignore-system-classes "${S}/build.xml"
1804
1805 if hasq java-ant-2 ${INHERITED}; then
1806 java-ant_bsfix
1807 fi
1808
1809 # eant can be called multiple times
1810 JAVA_PKG_BSFIX="off"
1811
1812 if [[ -z ${JAVA_PKG_NO_BUNDLED_SEARCH} ]] && is-java-strict; then
1813 echo "Searching for bundled jars:"
1814 java-pkg_find-normal-jars || echo "None found."
1815 echo "Searching for bundled classes (no output if none found):"
1816 find "${WORKDIR}" -name "*.class"
1817 echo "Search done."
1818 JAVA_PKG_NO_BUNDLED_SEARCH=true # eant can be called many times
1819 fi
1820 fi
1821
1822 if ! hasq java-ant-2 ${INHERITED}; then
1823 local msg="You should inherit java-ant-2 when using eant"
1346# java-pkg_announce-qa-violation \ 1824 java-pkg_announce-qa-violation "${msg}"
1347# "Using eant, but not depending on dev-java/ant or dev-java/ant-core"
1348# fi 1825 fi
1349 1826
1350 local antflags="-Dnoget=true" 1827 local antflags="-Dnoget=true -Dmaven.mode.offline=true"
1828
1351 java-pkg_init-compiler_ 1829 java-pkg_init-compiler_
1352 local compiler="${GENTOO_COMPILER}" 1830 local compiler="${GENTOO_COMPILER}"
1353 1831
1354 local compiler_env="${JAVA_PKG_COMPILER_DIR}/${compiler}" 1832 local compiler_env="${JAVA_PKG_COMPILER_DIR}/${compiler}"
1355
1356 local build_compiler="$(source ${compiler_env} 1>/dev/null 2>&1; echo ${ANT_BUILD_COMPILER})" 1833 local build_compiler="$(source ${compiler_env} 1>/dev/null 2>&1; echo ${ANT_BUILD_COMPILER})"
1357 if [[ "${compiler}" != "javac" && -z "${build_compiler}" ]]; then 1834 if [[ "${compiler}" != "javac" && -z "${build_compiler}" ]]; then
1358 die "ANT_BUILD_COMPILER undefined in ${compiler_env}" 1835 die "ANT_BUILD_COMPILER undefined in ${compiler_env}"
1359 fi 1836 fi
1360 1837
1373 if is-java-strict; then 1850 if is-java-strict; then
1374 einfo "Disabling system classpath for ant" 1851 einfo "Disabling system classpath for ant"
1375 antflags="${antflags} -Dbuild.sysclasspath=ignore" 1852 antflags="${antflags} -Dbuild.sysclasspath=ignore"
1376 fi 1853 fi
1377 1854
1378 if [[ -n ${JAVA_PKG_DEBUG} ]]; then 1855 for arg in "${@}"; do
1379 antflags="${antflags} -debug" 1856 if [[ ${arg} = -lib ]]; then
1857 if is-java-strict; then
1858 eerror "You should not use the -lib argument to eant because it will fail"
1859 eerror "with JAVA_PKG_STRICT. Please use for example java-pkg_jar-from"
1860 eerror "or ant properties to make dependencies available."
1861 eerror "For ant tasks use WANT_ANT_TASKS or ANT_TASKS from."
1862 eerror "split ant (>=dev-java/ant-core-1.7)."
1863 die "eant -lib is deprecated/forbidden"
1864 else
1865 echo "eant -lib is deprecated. Turn JAVA_PKG_STRICT on for"
1866 echo "more info."
1867 fi
1868 fi
1869 done
1870
1871 # we use this in src_* so we run ant from /
1872 if ROOT=/ has_version ">=dev-java/ant-core-1.7.0"; then
1873 # default ANT_TASKS to WANT_ANT_TASKS, if ANT_TASKS is not set explicitly
1874 ANT_TASKS="${ANT_TASKS:-${WANT_ANT_TASKS}}"
1875
1876 # override ANT_TASKS with JAVA_PKG_FORCE_ANT_TASKS if it's set
1877 ANT_TASKS="${JAVA_PKG_FORCE_ANT_TASKS:-${ANT_TASKS}}"
1878
1879 if is-java-strict; then
1880 # if ant-tasks were not set by ebuild or forced, try to determine them from depends
1881 if [[ -z "${ANT_TASKS}" ]]; then
1882 ANT_TASKS="$(java-pkg_ant-tasks-from-deps)"
1883 fi
1884 else
1885 # if ant-tasks is not set by ebuild or forced, activate all of them
1886 ANT_TASKS="${ANT_TASKS:-all}"
1887 fi
1888
1889 # at this point, ANT_TASKS should be "all", "none" or explicit list
1890 if [[ "${ANT_TASKS}" == "all" ]]; then
1891 einfo "Using all available ANT_TASKS"
1892 elif [[ "${ANT_TASKS}" == "none" ]]; then
1893 einfo "Disabling all optional ANT_TASKS"
1894 else
1895 einfo "Using following ANT_TASKS: ${ANT_TASKS}"
1896 fi
1897
1898 export ANT_TASKS
1899 fi
1900
1901 [[ -n ${JAVA_PKG_DEBUG} ]] && antflags="${antflags} --execdebug -debug"
1902 [[ -n ${PORTAGE_QUIET} ]] && antflags="${antflags} -q"
1903
1904 local gcp="${EANT_GENTOO_CLASSPATH}"
1905 local getjarsarg=""
1906
1907 if [[ ${EBUILD_PHASE} = "test" ]]; then
1908 antflags="${antflags} -DJunit.present=true"
1909 [[ ${gcp} && ${ANT_TASKS} = *ant-junit* ]] && gcp="${gcp} junit"
1910 getjarsarg="--with-dependencies"
1911 fi
1912
1913 local cp
1914
1915 for atom in ${gcp}; do
1916 cp="${cp}:$(java-pkg_getjars ${getjarsarg} ${atom})"
1917 done
1918
1919 if [[ ${cp} ]]; then
1920 # It seems ant does not like single quotes around ${cp}
1921 antflags="${antflags} -Dgentoo.classpath=\"${cp#:}\""
1380 fi 1922 fi
1381 1923
1382 [[ -n ${JAVA_PKG_DEBUG} ]] && echo ant ${antflags} "${@}" 1924 [[ -n ${JAVA_PKG_DEBUG} ]] && echo ant ${antflags} "${@}"
1925 debug-print "Calling ant (GENTOO_VM: ${GENTOO_VM}): ${antflags} ${@}"
1383 ant ${antflags} "${@}" || die "eant failed" 1926 ant ${antflags} "${@}" || die "eant failed"
1384
1385} 1927}
1386 1928
1387# ------------------------------------------------------------------------------ 1929# ------------------------------------------------------------------------------
1388# @ebuild-function ejavac 1930# @ebuild-function ejavac
1389# 1931#
1486# 2028#
1487# ----------------------------------------------------------------------------- 2029# -----------------------------------------------------------------------------
1488java-pkg_init() { 2030java-pkg_init() {
1489 unset JAVAC 2031 unset JAVAC
1490 unset JAVA_HOME 2032 unset JAVA_HOME
2033
2034 # People do all kinds of weird things.
2035 # http://forums.gentoo.org/viewtopic-p-3943166.html
2036 local silence="${SILENCE_JAVA_OPTIONS_WARNING}"
2037 local accept="${I_WANT_GLOBAL_JAVA_OPTIONS}"
2038 if [[ -n ${_JAVA_OPTIONS} && -z ${accept} && -z ${silence} ]]; then
2039 ewarn "_JAVA_OPTIONS changes what java -version outputs at least for"
2040 ewarn "sun-jdk vms and and as such break configure scripts that"
2041 ewarn "use it (for example app-office/openoffice) so we filter it out."
2042 ewarn "Use SILENCE_JAVA_OPTIONS_WARNING=true in the environment (use"
2043 ewarn "make.conf for example) to silence this warning or"
2044 ewarn "I_WANT_GLOBAL_JAVA_OPTIONS to not filter it."
2045 fi
2046
2047 if [[ -z ${accept} ]]; then
2048 unset _JAVA_OPTIONS
2049 # phase hooks make this run many times without this
2050 I_WANT_GLOBAL_JAVA_OPTIONS="true"
2051 fi
2052
2053 if java-pkg_func-exists ant_src_unpack; then
2054 java-pkg_announce-qa-violation "Using old ant_src_unpack. Should be src_unpack"
2055 fi
2056
1491 java-pkg_init_paths_ 2057 java-pkg_init_paths_
1492 java-pkg_switch-vm 2058 java-pkg_switch-vm
1493 PATH=${JAVA_HOME}/bin:${PATH} 2059 PATH=${JAVA_HOME}/bin:${PATH}
1494 2060
1495 # TODO we will probably want to set JAVAC and JAVACFLAGS 2061 # TODO we will probably want to set JAVAC and JAVACFLAGS
1500 # When users have crazy classpaths some packages can fail to compile. 2066 # When users have crazy classpaths some packages can fail to compile.
1501 # and everything should work with empty CLASSPATH. 2067 # and everything should work with empty CLASSPATH.
1502 # This also helps prevent unexpected dependencies on random things 2068 # This also helps prevent unexpected dependencies on random things
1503 # from the CLASSPATH. 2069 # from the CLASSPATH.
1504 unset CLASSPATH 2070 unset CLASSPATH
2071
2072 # Unset external ANT_ stuff
2073 unset ANT_TASKS
2074 unset ANT_OPTS
1505} 2075}
1506 2076
1507# ------------------------------------------------------------------------------ 2077# ------------------------------------------------------------------------------
1508# @function-internal java-pkg-init-compiler_ 2078# @function-internal java-pkg-init-compiler_
1509# 2079#
1653# Writes the package.env out to disk. 2223# Writes the package.env out to disk.
1654# 2224#
1655# ------------------------------------------------------------------------------ 2225# ------------------------------------------------------------------------------
1656# TODO change to do-write, to match everything else 2226# TODO change to do-write, to match everything else
1657java-pkg_do_write_() { 2227java-pkg_do_write_() {
2228 debug-print-function ${FUNCNAME} $*
1658 java-pkg_init_paths_ 2229 java-pkg_init_paths_
1659 # Create directory for package.env 2230 # Create directory for package.env
1660 dodir "${JAVA_PKG_SHAREPATH}" 2231 dodir "${JAVA_PKG_SHAREPATH}"
1661 if [[ -n "${JAVA_PKG_CLASSPATH}" || -n "${JAVA_PKG_LIBRARY}" || -f "${JAVA_PKG_DEPEND}" ]]; then 2232 if [[ -n "${JAVA_PKG_CLASSPATH}" || -n "${JAVA_PKG_LIBRARY}" || -f \
2233 "${JAVA_PKG_DEPEND_FILE}" || -f \
2234 "${JAVA_PKG_OPTIONAL_DEPEND_FILE}" ]]; then
1662 # Create package.env 2235 # Create package.env
1663 ( 2236 (
1664 echo "DESCRIPTION=\"${DESCRIPTION}\"" 2237 echo "DESCRIPTION=\"${DESCRIPTION}\""
1665 echo "GENERATION=\"2\"" 2238 echo "GENERATION=\"2\""
1666 2239
1667 [[ -n "${JAVA_PKG_CLASSPATH}" ]] && echo "CLASSPATH=\"${JAVA_PKG_CLASSPATH}\"" 2240 [[ -n "${JAVA_PKG_CLASSPATH}" ]] && echo "CLASSPATH=\"${JAVA_PKG_CLASSPATH}\""
1668 [[ -n "${JAVA_PKG_LIBRARY}" ]] && echo "LIBRARY_PATH=\"${JAVA_PKG_LIBRARY}\"" 2241 [[ -n "${JAVA_PKG_LIBRARY}" ]] && echo "LIBRARY_PATH=\"${JAVA_PKG_LIBRARY}\""
1669 [[ -n "${JAVA_PROVIDE}" ]] && echo "PROVIDES=\"${JAVA_PROVIDE}\"" 2242 [[ -n "${JAVA_PROVIDE}" ]] && echo "PROVIDES=\"${JAVA_PROVIDE}\""
1670 [[ -f "${JAVA_PKG_DEPEND}" ]] && echo "DEPEND=\"$(cat ${JAVA_PKG_DEPEND} | uniq | tr '\n' ':')\"" 2243 [[ -f "${JAVA_PKG_DEPEND_FILE}" ]] \
2244 && echo "DEPEND=\"$(cat "${JAVA_PKG_DEPEND_FILE}" | uniq | tr '\n' ':')\""
2245 [[ -f "${JAVA_PKG_OPTIONAL_DEPEND_FILE}" ]] \
2246 && echo "OPTIONAL_DEPEND=\"$(cat "${JAVA_PKG_OPTIONAL_DEPEND_FILE}" | uniq | tr '\n' ':')\""
1671 echo "VM=\"$(echo ${RDEPEND} ${DEPEND} | sed -e 's/ /\n/g' | sed -n -e '/virtual\/\(jre\|jdk\)/ { p;q }')\"" # TODO cleanup ! 2247 echo "VM=\"$(echo ${RDEPEND} ${DEPEND} | sed -e 's/ /\n/g' | sed -n -e '/virtual\/\(jre\|jdk\)/ { p;q }')\"" # TODO cleanup !
1672 ) > "${JAVA_PKG_ENV}" 2248 ) > "${JAVA_PKG_ENV}"
1673 2249
1674 # register target/source 2250 # register target/source
1675 local target="$(java-pkg_get-target)" 2251 local target="$(java-pkg_get-target)"
1686 2262
1687 2263
1688 echo "MERGE_VM=\"${GENTOO_VM}\"" >> "${JAVA_PKG_ENV}" 2264 echo "MERGE_VM=\"${GENTOO_VM}\"" >> "${JAVA_PKG_ENV}"
1689 [[ -n ${GENTOO_COMPILER} ]] && echo "MERGE_COMPILER=\"${GENTOO_COMPILER}\"" >> "${JAVA_PKG_ENV}" 2265 [[ -n ${GENTOO_COMPILER} ]] && echo "MERGE_COMPILER=\"${GENTOO_COMPILER}\"" >> "${JAVA_PKG_ENV}"
1690 2266
2267 # extra env variables
2268 if [[ -n "${JAVA_PKG_EXTRA_ENV_VARS}" ]]; then
2269 cat "${JAVA_PKG_EXTRA_ENV}" >> "${JAVA_PKG_ENV}" || die
2270 # nested echo to remove leading/trailing spaces
2271 echo "ENV_VARS=\"$(echo ${JAVA_PKG_EXTRA_ENV_VARS})\"" \
2272 >> "${JAVA_PKG_ENV}" || die
2273 fi
2274
1691 # Strip unnecessary leading and trailing colons 2275 # Strip unnecessary leading and trailing colons
1692 # TODO try to cleanup if possible 2276 # TODO try to cleanup if possible
1693 sed -e "s/=\":/=\"/" -e "s/:\"$/\"/" -i "${JAVA_PKG_ENV}" || die "Did you forget to call java_init ?" 2277 sed -e "s/=\":/=\"/" -e "s/:\"$/\"/" -i "${JAVA_PKG_ENV}" || die "Did you forget to call java_init ?"
2278 else
2279 debug-print "JAVA_PKG_CLASSPATH, JAVA_PKG_LIBRARY, JAVA_PKG_DEPEND_FILE"
2280 debug-print "or JAVA_PKG_OPTIONAL_DEPEND_FILE not defined so can't"
2281 debug-print "write package.env."
1694 fi 2282 fi
1695} 2283}
1696 2284
1697# ------------------------------------------------------------------------------ 2285# ------------------------------------------------------------------------------
1698# @internal-function java-pkg_record-jar_ 2286# @internal-function java-pkg_record-jar_
1699# 2287#
1700# Record a dependency to the package.env 2288# Record an (optional) dependency to the package.env
1701# 2289# @param --optional - record dependency as optional
2290# @param $1 - package to record
2291# @param $2 - (optional) jar of package to record
1702# ------------------------------------------------------------------------------ 2292# ------------------------------------------------------------------------------
1703JAVA_PKG_DEPEND="${T}/java-pkg-depend" 2293JAVA_PKG_DEPEND_FILE="${T}/java-pkg-depend"
2294JAVA_PKG_OPTIONAL_DEPEND_FILE="${T}/java-pkg-optional-depend"
1704 2295
1705java-pkg_record-jar_() { 2296java-pkg_record-jar_() {
1706 debug-print-function ${FUNCNAME} $* 2297 debug-print-function ${FUNCNAME} $*
2298
2299 local depend_file="${JAVA_PKG_DEPEND_FILE}"
2300 if [[ "${1}" == "--optional" ]]; then
2301 depend_file="${JAVA_PKG_OPTIONAL_DEPEND_FILE}"
2302 shift
2303 fi
1707 2304
1708 local pkg=${1} jar=${2} append 2305 local pkg=${1} jar=${2} append
1709 if [[ -z "${jar}" ]]; then 2306 if [[ -z "${jar}" ]]; then
1710 append="${pkg}" 2307 append="${pkg}"
1711 else 2308 else
1712 append="$(basename ${jar})@${pkg}" 2309 append="$(basename ${jar})@${pkg}"
1713 fi 2310 fi
1714 2311
1715 echo ${append} >> ${JAVA_PKG_DEPEND} 2312 echo "${append}" >> "${depend_file}"
1716} 2313}
1717 2314
1718# ------------------------------------------------------------------------------ 2315# ------------------------------------------------------------------------------
1719# @internal-function java-pkg_append_ 2316# @internal-function java-pkg_append_
1720# 2317#
1780# 2377#
1781# ------------------------------------------------------------------------------ 2378# ------------------------------------------------------------------------------
1782java-pkg_setup-vm() { 2379java-pkg_setup-vm() {
1783 debug-print-function ${FUNCNAME} $* 2380 debug-print-function ${FUNCNAME} $*
1784 2381
2382 export LANG="C" LC_ALL="C"
2383
1785 local vendor="$(java-pkg_get-vm-vendor)" 2384 local vendor="$(java-pkg_get-vm-vendor)"
1786 if [[ "${vendor}" == "sun" ]] && java-pkg_is-vm-version-ge "1.5" ; then 2385 if [[ "${vendor}" == "sun" ]] && java-pkg_is-vm-version-ge "1.5" ; then
1787 addpredict "/dev/random" 2386 addpredict "/dev/random"
1788 elif [[ "${vendor}" == "ibm" ]]; then 2387 elif [[ "${vendor}" == "ibm" ]]; then
1789 addpredict "/proc/self/maps" 2388 addpredict "/proc/self/maps"
1790 addpredict "/proc/cpuinfo" 2389 addpredict "/proc/cpuinfo"
1791 export LANG="C" LC_ALL="C"
1792 elif [[ "${vendor}" == "jrockit" ]]; then 2390 elif [[ "${vendor}" == "jrockit" ]]; then
1793 addpredict "/proc/cpuinfo" 2391 addpredict "/proc/cpuinfo"
1794 fi 2392 fi
1795} 2393}
1796 2394
1900 2498
1901 #TODO If you know a better solution let us know. 2499 #TODO If you know a better solution let us know.
1902 java-pkg_append_ LD_LIBRARY_PATH "$(java-config -g LDPATH)" 2500 java-pkg_append_ LD_LIBRARY_PATH "$(java-config -g LDPATH)"
1903 2501
1904 local tann="${T}/announced-vm" 2502 local tann="${T}/announced-vm"
2503 # With the hooks we should only get here once from pkg_setup but better safe than sorry
2504 # if people have for example modified eclasses some where
1905 if [[ -n "${JAVA_PKG_DEBUG}" ]] || [[ ! -f "${tann}" ]] ; then 2505 if [[ -n "${JAVA_PKG_DEBUG}" ]] || [[ ! -f "${tann}" ]] ; then
1906 # Add a check for setup/preinst phase... to avoid duplicate outputs
1907 # for when FEATURES=buildpkg
1908 if [[ ${EBUILD_PHASE} != "setup" && ${EBUILD_PHASE} != "preinst" && ${EBUILD_PHASE} != "postinst" ]];
1909 then
1910 einfo "Using: $(java-config -f)" 2506 einfo "Using: $(java-config -f)"
1911 [[ ! -f "${tann}" ]] && touch "${tann}" 2507 [[ ! -f "${tann}" ]] && touch "${tann}"
1912 fi
1913 fi 2508 fi
1914 2509
1915 else 2510 else
1916 [[ -n "${JAVA_PKG_DEBUG}" ]] && ewarn "!!! This package inherits java-pkg but doesn't depend on a JDK. -bin or broken dependency!!!" 2511 [[ -n "${JAVA_PKG_DEBUG}" ]] && ewarn "!!! This package inherits java-pkg but doesn't depend on a JDK. -bin or broken dependency!!!"
1917 fi 2512 fi
1947 einfo "Classes" 2542 einfo "Classes"
1948 find "${S}" -type f -name '*.class' -print0 | xargs -0 -r -n 500 ls -ald | sed -e "s,${WORKDIR},\${WORKDIR}," 2543 find "${S}" -type f -name '*.class' -print0 | xargs -0 -r -n 500 ls -ald | sed -e "s,${WORKDIR},\${WORKDIR},"
1949 fi 2544 fi
1950} 2545}
1951 2546
1952# TODO document 2547# ------------------------------------------------------------------------------
2548# @internal-function java-pkg_verify-classes
2549#
1953# Verify that the classes were compiled for the right source / target 2550# Verify that the classes were compiled for the right source / target. Dies if
2551# not.
2552# @param $1 (optional) - the file to check, otherwise checks whole ${D}
2553# ------------------------------------------------------------------------------
1954java-pkg_verify-classes() { 2554java-pkg_verify-classes() {
1955 ebegin "Verifying java class versions"
1956 #$(find ${D} -type f -name '*.jar' -o -name '*.class') 2555 #$(find ${D} -type f -name '*.jar' -o -name '*.class')
1957 class-version-verify.py -t $(java-pkg_get-target) -r ${D} 2556 local target=$(java-pkg_get-target)
2557 local result
2558 local log="${T}/class-version-verify.log"
2559 if [[ -n "${1}" ]]; then
2560 class-version-verify.py -v -t ${target} "${1}" > "${log}"
1958 result=$? 2561 result=$?
1959 eend ${result}
1960 if [[ ${result} == 0 ]]; then
1961 einfo "All good"
1962 else 2562 else
1963 ewarn "Possible problem" 2563 ebegin "Verifying java class versions (target: ${target})"
1964 die "Bad class files found" 2564 class-version-verify.py -v -t ${target} -r "${D}" > "${log}"
2565 result=$?
2566 eend ${result}
2567 fi
2568 [[ -n ${JAVA_PKG_DEBUG} ]] && cat "${log}"
2569 if [[ ${result} != 0 ]]; then
2570 eerror "Incorrect bytecode version found"
2571 [[ -n "${1}" ]] && eerror "in file: ${1}"
2572 eerror "See ${log} for more details."
2573 die "Incorrect bytecode found"
2574 fi
2575}
2576
2577# ----------------------------------------------------------------------------
2578# @internal-function java-pkg_ensure-dep
2579# Check that a package being used in jarfrom, getjars and getjar is contained
2580# within DEPEND or RDEPEND.
2581# @param $1 - empty - check both vars; "runtime" or "build" - check only
2582# RDEPEND, resp. DEPEND
2583# @param $2 - Package name and slot.
2584
2585java-pkg_ensure-dep() {
2586 debug-print-function ${FUNCNAME} $*
2587
2588 local limit_to="${1}"
2589 local target_pkg="${2}"
2590 local dev_error=""
2591
2592 local stripped_pkg=$(echo "${target_pkg}" | sed \
2593 's/-[0-9]*\(\.[0-9]\)*$//')
2594
2595 debug-print "Matching against: ${stripped_pkg}"
2596
2597 if [[ ${limit_to} != runtime && ! ( "${DEPEND}" =~ "$stripped_pkg" ) ]]; then
2598 dev_error="The ebuild is attempting to use ${target_pkg} that is not"
2599 dev_error="${dev_error} declared in DEPEND."
2600 if is-java-strict; then
2601 eerror "${dev_error}"
2602 die "${dev_error}"
2603 elif [[ ${BASH_SUBSHELL} = 0 ]]; then
2604 eerror "${dev_error}"
2605 elog "Because you have this package installed the package will"
2606 elog "build without problems, but please report this to"
2607 elog "http://bugs.gentoo.org"
2608 fi
2609 fi
2610
2611 if [[ ${limit_to} != build ]]; then
2612 if [[ ! ( ${RDEPEND} =~ "${stripped_pkg}" ) ]]; then
2613 if [[ ! ( ${PDEPEND} =~ "${stripped_pkg}" ) ]]; then
2614 dev_error="The ebuild is attempting to use ${target_pkg},"
2615 dev_error="${dev_error} without specifying --build-only, that is not declared in RDEPEND"
2616 dev_error="${dev_error} or PDEPEND."
2617 if is-java-strict; then
2618 eerror "${dev_error}"
2619 die "${dev_error}"
2620 elif [[ ${BASH_SUBSHELL} = 0 ]]; then
2621 eerror "${dev_error}"
2622 elog "The package will build without problems, but may fail to run"
2623 elog "if you don't have ${target_pkg} installed, so please report"
2624 elog "this to http://bugs.gentoo.org"
2625 fi
2626 fi
2627 fi
1965 fi 2628 fi
1966} 2629}
1967 2630
1968# ------------------------------------------------------------------------------ 2631# ------------------------------------------------------------------------------
1969# @section-end internal 2632# @section-end internal
1970# ------------------------------------------------------------------------------ 2633# ------------------------------------------------------------------------------
1971 2634
1972java-pkg_check-phase() { 2635java-pkg_check-phase() {
1973 local phase=${1} 2636 local phase=${1}
1974 local funcname=${2} 2637 local funcname=${FUNCNAME[1]}
1975 if is-java-strict && [[ ${EBUILD_PHASE} != ${phase} ]]; then 2638 if [[ ${EBUILD_PHASE} != ${phase} ]]; then
1976 java-pkg_announce-qa-violation \
1977 "${funcname} used outside of src_${phase}" 2639 local msg="${funcname} used outside of src_${phase}"
2640 java-pkg_announce-qa-violation "${msg}"
1978 fi 2641 fi
1979} 2642}
1980 2643
1981java-pkg_check-versioned-jar() { 2644java-pkg_check-versioned-jar() {
1982 local jar=${1} 2645 local jar=${1}
1991 java-pkg_announce-qa-violation "deprecated USE flag 'jikes' in IUSE" 2654 java-pkg_announce-qa-violation "deprecated USE flag 'jikes' in IUSE"
1992 fi 2655 fi
1993} 2656}
1994 2657
1995java-pkg_announce-qa-violation() { 2658java-pkg_announce-qa-violation() {
1996 if is-java-strict; then 2659 local nodie
2660 if [[ ${1} == "--nodie" ]]; then
2661 nodie="true"
2662 shift
2663 fi
1997 echo "Java QA Notice: $@" >&2 2664 echo "Java QA Notice: $@" >&2
1998 increment-qa-violations 2665 increment-qa-violations
1999 fi 2666 [[ -z "${nodie}" ]] && is-java-strict && die "${@}"
2000} 2667}
2001 2668
2002increment-qa-violations() { 2669increment-qa-violations() {
2003 let "JAVA_PKG_QA_VIOLATIONS+=1" 2670 let "JAVA_PKG_QA_VIOLATIONS+=1"
2004 export JAVA_PKG_QA_VIOLATIONS 2671 export JAVA_PKG_QA_VIOLATIONS

Legend:
Removed from v.1.40  
changed lines
  Added in v.1.93

  ViewVC Help
Powered by ViewVC 1.1.20