/[gentoo-x86]/eclass/java-utils-2.eclass
Gentoo

Diff of /eclass/java-utils-2.eclass

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 1.33 Revision 1.61
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.33 2006/12/07 02:27:22 flameeyes Exp $ 9# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.61 2007/03/03 16:27:31 betelgeuse Exp $
10 10
11 11
12# ----------------------------------------------------------------------------- 12# -----------------------------------------------------------------------------
13# @eclass-begin 13# @eclass-begin
14# @eclass-shortdesc Java Utility eclass 14# @eclass-shortdesc Java Utility eclass
36# ----------------------------------------------------------------------------- 36# -----------------------------------------------------------------------------
37 37
38# Make sure we use java-config-2 38# Make sure we use java-config-2
39export WANT_JAVA_CONFIG="2" 39export WANT_JAVA_CONFIG="2"
40 40
41# TODO document 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# @variable-internal JAVA_PKG_PORTAGE_DEP
61#
62# The version of portage we need to function properly. At this moment it's
63# portage with phase hooks support.
64# -----------------------------------------------------------------------------
42JAVA_PKG_PORTAGE_DEP=">=sys-apps/portage-2.1_pre1" 65JAVA_PKG_PORTAGE_DEP=">=sys-apps/portage-2.1_pre1"
43 66
44# ----------------------------------------------------------------------------- 67# -----------------------------------------------------------------------------
45# @variable-internal JAVA_PKG_E_DEPEND 68# @variable-internal JAVA_PKG_E_DEPEND
46# 69#
47# This is a convience variable to be used from the other java eclasses. This is 70# 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 71# the version of java-config we want to use. We also need a recent version
49# portage, that includes phase hooks. 72# portage, that includes phase hooks.
50# ----------------------------------------------------------------------------- 73# -----------------------------------------------------------------------------
51JAVA_PKG_E_DEPEND=">=dev-java/java-config-2.0.19-r1 ${JAVA_PKG_PORTAGE_DEP}" 74JAVA_PKG_E_DEPEND=">=dev-java/java-config-2.0.31 ${JAVA_PKG_PORTAGE_DEP}"
52 75
53# ----------------------------------------------------------------------------- 76# -----------------------------------------------------------------------------
54# @variable-external JAVA_PKG_ALLOW_VM_CHANGE 77# @variable-external JAVA_PKG_ALLOW_VM_CHANGE
55# @variable-default yes 78# @variable-default yes
56# 79#
128# JAVA_PKG_COMPILERS_CONF. 151# JAVA_PKG_COMPILERS_CONF.
129# 152#
130# @note This should only be used internally or for testing. 153# @note This should only be used internally or for testing.
131# @example Use jikes and javac, in that order 154# @example Use jikes and javac, in that order
132# JAVA_PKG_FORCE_COMPILER="jikes javac" 155# JAVA_PKG_FORCE_COMPILER="jikes javac"
156# -----------------------------------------------------------------------------
157
158# -----------------------------------------------------------------------------
159# @variable-external JAVA_PKG_FORCE_ANT_TASKS
160#
161# An $IFS separated list of ant tasks. Can be set in environment before calling
162# emerge/ebuild to override variables set in ebuild, mainly for testing before
163# putting the resulting (WANT_)ANT_TASKS into ebuild. Affects only ANT_TASKS in
164# eant() call, not the dependencies specified in WANT_ANT_TASKS.
165#
166# @example JAVA_PKG_FORCE_ANT_TASKS="ant-junit ant-trax" \
167# ebuild foo.ebuild compile
168#
169# @seealso WANT_ANT_TASKS
133# ----------------------------------------------------------------------------- 170# -----------------------------------------------------------------------------
134 171
135# TODO document me 172# TODO document me
136JAVA_PKG_QA_VIOLATIONS=0 173JAVA_PKG_QA_VIOLATIONS=0
137 174
174 # Create JARDEST if it doesn't exist 211 # Create JARDEST if it doesn't exist
175 dodir ${JAVA_PKG_JARDEST} 212 dodir ${JAVA_PKG_JARDEST}
176 213
177 local jar 214 local jar
178 # for each jar 215 # for each jar
179 for jar in "$@"; do 216 for jar in "${@}"; do
180 local jar_basename=$(basename "${jar}") 217 local jar_basename=$(basename "${jar}")
181 218
182 java-pkg_check-versioned-jar ${jar_basename} 219 java-pkg_check-versioned-jar ${jar_basename}
183 220
184 # check if it exists 221 # check if it exists
185 if [[ -e "${jar}" ]] ; then 222 if [[ -e "${jar}" ]] ; then
223 # Don't overwrite if jar has already been installed with the same
224 # name
225 local dest="${D}${JAVA_PKG_JARDEST}/${jar_basename}"
226 if [[ -e "${dest}" ]]; then
227 ewarn "Overwriting ${dest}"
228 fi
229
186 # install it into JARDEST if it's a non-symlink 230 # install it into JARDEST if it's a non-symlink
187 if [[ ! -L "${jar}" ]] ; then 231 if [[ ! -L "${jar}" ]] ; then
232 #but first check class version when in strict mode.
233 is-java-strict && java-pkg_verify-classes "${jar}"
234
188 INSDESTTREE="${JAVA_PKG_JARDEST}" \ 235 INSDESTTREE="${JAVA_PKG_JARDEST}" \
189 doins "${jar}" || die "failed to install ${jar}" 236 doins "${jar}" || die "failed to install ${jar}"
190 java-pkg_append_ JAVA_PKG_CLASSPATH "${JAVA_PKG_JARDEST}/${jar_basename}" 237 java-pkg_append_ JAVA_PKG_CLASSPATH "${JAVA_PKG_JARDEST}/${jar_basename}"
191 debug-print "installed ${jar} to ${D}${JAVA_PKG_JARDEST}" 238 debug-print "installed ${jar} to ${D}${JAVA_PKG_JARDEST}"
192 # make a symlink to the original jar if it's symlink 239 # make a symlink to the original jar if it's symlink
203 250
204 java-pkg_do_write_ 251 java-pkg_do_write_
205} 252}
206 253
207 254
255# ------------------------------------------------------------------------------
256# @internal-function depend-java-query
257#
258# Wrapper for the depend-java-query binary to enable passing USE in env.
259# Using env variables keeps this eclass working with java-config versions that
260# do not handle use flags.
261# ------------------------------------------------------------------------------
262
263depend-java-query() {
264 # Used to have a which call here but it caused endless loops for some people
265 # please tell us why if you you have any idea. Maybe bash 3.1?
266 USE="${USE}" /usr/bin/depend-java-query "${@}"
267}
208 268
209# ------------------------------------------------------------------------------ 269# ------------------------------------------------------------------------------
210# @ebuild-function java-pkg_regjar 270# @ebuild-function java-pkg_regjar
211# 271#
212# Records an already installed jar in the package.env 272# Records an already installed jar in the package.env
243 [[ ${#} -lt 1 ]] && die "at least one argument needed" 303 [[ ${#} -lt 1 ]] && die "at least one argument needed"
244 304
245 java-pkg_init_paths_ 305 java-pkg_init_paths_
246 306
247 local jar jar_dir jar_file 307 local jar jar_dir jar_file
248 for jar in "$@"; do 308 for jar in "${@}"; do
249 # TODO use java-pkg_check-versioned-jar 309 # TODO use java-pkg_check-versioned-jar
250 if [[ -e "${jar}" ]]; then 310 if [[ -e "${jar}" || -e "${D}${jar}" ]]; then
311 [[ -d "${jar}" || -d "${D}${jar}" ]] \
312 && die "Called ${FUNCNAME} on a directory $*"
313
314 #check that class version correct when in strict mode
315 is-java-strict && java-pkg_verify-classes "${jar}"
316
251 # nelchael: we should strip ${D} in this case too, here's why: 317 # nelchael: we should strip ${D} in this case too, here's why:
252 # imagine such call: 318 # imagine such call:
253 # java-pkg_regjar ${D}/opt/java/*.jar 319 # java-pkg_regjar ${D}/opt/java/*.jar
254 # such call will fall into this case (-e ${jar}) and will 320 # such call will fall into this case (-e ${jar}) and will
255 # record paths with ${D} in package.env 321 # record paths with ${D} in package.env
256 java-pkg_append_ JAVA_PKG_CLASSPATH "${jar#${D}}" 322 java-pkg_append_ JAVA_PKG_CLASSPATH "${jar#${D}}"
257 elif [[ -e "${D}${jar}" ]]; then
258 java-pkg_append_ JAVA_PKG_CLASSPATH "${jar#${D}}"
259 else 323 else
260 die "${jar} does not exist" 324 die "${jar} does not exist"
261 fi 325 fi
262 done 326 done
263 327
264 java-pkg_do_write_ 328 java-pkg_do_write_
265} 329}
266
267 330
268# ------------------------------------------------------------------------------ 331# ------------------------------------------------------------------------------
269# @ebuild-function java-pkg_newjar 332# @ebuild-function java-pkg_newjar
270# 333#
271# Installs a jar with a new name 334# Installs a jar with a new name
282 local original_jar="${1}" 345 local original_jar="${1}"
283 local new_jar="${2:-${PN}.jar}" 346 local new_jar="${2:-${PN}.jar}"
284 local new_jar_dest="${T}/${new_jar}" 347 local new_jar_dest="${T}/${new_jar}"
285 348
286 [[ -z ${original_jar} ]] && die "Must specify a jar to install" 349 [[ -z ${original_jar} ]] && die "Must specify a jar to install"
287 [[ ! -f ${original_jar} ]] && die "${original_jar} does not exist!" 350 [[ ! -f ${original_jar} ]] \
351 && die "${original_jar} does not exist or is not a file!"
288 352
289 rm -f "${new_jar_dest}" || die "Failed to remove ${new_jar_dest}" 353 rm -f "${new_jar_dest}" || die "Failed to remove ${new_jar_dest}"
290 cp "${original_jar}" "${new_jar_dest}" \ 354 cp "${original_jar}" "${new_jar_dest}" \
291 || die "Failed to copy ${original_jar} to ${new_jar_dest}" 355 || die "Failed to copy ${original_jar} to ${new_jar_dest}"
292 java-pkg_dojar "${new_jar_dest}" 356 java-pkg_dojar "${new_jar_dest}"
341 java-pkg_append_ JAVA_PKG_LIBRARY "${JAVA_PKG_LIBDEST}" 405 java-pkg_append_ JAVA_PKG_LIBRARY "${JAVA_PKG_LIBDEST}"
342 debug-print "Installing ${lib} to ${JAVA_PKG_LIBDEST}" 406 debug-print "Installing ${lib} to ${JAVA_PKG_LIBDEST}"
343 # otherwise make a symlink to the symlink's origin 407 # otherwise make a symlink to the symlink's origin
344 else 408 else
345 # TODO use dosym 409 # TODO use dosym
410 ln -s "$(readlink "${lib}")" \
346 ln -s "$(readlink "${lib}")" "${D}${JAVA_PKG_LIBDEST}/$(basename "${lib}")" 411 "${D}${JAVA_PKG_LIBDEST}/$(basename "${lib}")"
347 debug-print "${lib} is a symlink, linking accordanly" 412 debug-print "${lib} is a symlink, linking accordanly"
348 fi 413 fi
349 # otherwise die 414 # otherwise die
350 else 415 else
351 die "${lib} does not exist" 416 die "${lib} does not exist"
505 java-pkg_init_paths_ 570 java-pkg_init_paths_
506 571
507 local zip_name="${PN}-src.zip" 572 local zip_name="${PN}-src.zip"
508 local zip_path="${T}/${zip_name}" 573 local zip_path="${T}/${zip_name}"
509 local dir 574 local dir
510 for dir in ${@}; do 575 for dir in "${@}"; do
511 local dir_parent=$(dirname "${dir}") 576 local dir_parent=$(dirname "${dir}")
512 local dir_name=$(basename "${dir}") 577 local dir_name=$(basename "${dir}")
513 pushd ${dir_parent} > /dev/null || die "problem entering ${dir_parent}" 578 pushd ${dir_parent} > /dev/null || die "problem entering ${dir_parent}"
514 zip -q -r ${zip_path} ${dir_name} -i '*.java' 579 zip -q -r ${zip_path} ${dir_name} -i '*.java'
515 local result=$? 580 local result=$?
540# @param $1 - filename of launcher to create 605# @param $1 - filename of launcher to create
541# @param $2 - options, as follows: 606# @param $2 - options, as follows:
542# --main the.main.class.too.start 607# --main the.main.class.too.start
543# --jar /the/jar/too/launch.jar or just <name>.jar 608# --jar /the/jar/too/launch.jar or just <name>.jar
544# --java_args 'Extra arguments to pass to java' 609# --java_args 'Extra arguments to pass to java'
545# --pkg_args 'Extra arguments too pass to the package' 610# --pkg_args 'Extra arguments to pass to the package'
546# --pwd 611# --pwd Directory the launcher changes to before executing java
547# -into 612# -into Directory to install the launcher to, instead of /usr/bin
548# -pre 613# -pre Prepend contents of this file to the launcher
549# ------------------------------------------------------------------------------ 614# ------------------------------------------------------------------------------
550java-pkg_dolauncher() { 615java-pkg_dolauncher() {
551 debug-print-function ${FUNCNAME} $* 616 debug-print-function ${FUNCNAME} $*
552 617
553 java-pkg_check-phase install 618 java-pkg_check-phase install
565 local var_tmp="${T}/launcher_variables_tmp" 630 local var_tmp="${T}/launcher_variables_tmp"
566 local target_dir pre 631 local target_dir pre
567 632
568 # Process the other the rest of the arguments 633 # Process the other the rest of the arguments
569 while [[ -n "${1}" && -n "${2}" ]]; do 634 while [[ -n "${1}" && -n "${2}" ]]; do
570 local var=${1} value=${2} 635 local var="${1}" value="${2}"
571 if [[ "${var:0:2}" == "--" ]]; then 636 if [[ "${var:0:2}" == "--" ]]; then
572 local var=${var:2} 637 local var=${var:2}
573 echo "gjl_${var}=\"${value}\"" >> "${var_tmp}" 638 echo "gjl_${var}=\"${value}\"" >> "${var_tmp}"
574 local gjl_${var}="${value}" 639 local gjl_${var}="${value}"
575 elif [[ "${var}" == "-into" ]]; then 640 elif [[ "${var}" == "-into" ]]; then
594 fi 659 fi
595 fi 660 fi
596 661
597 # Write the actual script 662 # Write the actual script
598 echo "#!/bin/bash" > "${target}" 663 echo "#!/bin/bash" > "${target}"
599 [[ -n "${pre}" ]] && [[ -f "${pre}" ]] && cat "${pre}" >> "${target}" 664 if [[ -n "${pre}" ]]; then
665 if [[ -f "${pre}" ]]; then
666 cat "${pre}" >> "${target}"
667 else
668 die "-pre specified file '${pre}' does not exist"
669 fi
670 fi
600 echo "gjl_package=${JAVA_PKG_NAME}" >> "${target}" 671 echo "gjl_package=${JAVA_PKG_NAME}" >> "${target}"
601 cat "${var_tmp}" >> "${target}" 672 cat "${var_tmp}" >> "${target}"
602 rm -f "${var_tmp}" 673 rm -f "${var_tmp}"
603 echo "source /usr/share/java-config-2/launcher/launcher.bash" >> "${target}" 674 echo "source /usr/share/java-config-2/launcher/launcher.bash" >> "${target}"
604 675
696# Example: get a specific jar from xerces slot 2, and name it diffrently 767# Example: get a specific jar from xerces slot 2, and name it diffrently
697# java-pkg_jar-from xerces-2 xml-apis.jar xml.jar 768# java-pkg_jar-from xerces-2 xml-apis.jar xml.jar
698# Example: get junit.jar which is needed only for building 769# Example: get junit.jar which is needed only for building
699# java-pkg_jar-from --build-only junit junit.jar 770# java-pkg_jar-from --build-only junit junit.jar
700# 771#
701# @param $1 - (optional) "--build-only" makes the jar(s) not added into 772# @param $opt
702# package.env DEPEND line. 773# --build-only - makes the jar(s) not added into package.env DEPEND line.
774# (assumed automatically when called inside src_test)
775# --with-dependencies - get jars also from requested package's dependencies
776# transitively.
777# --into $dir - symlink jar(s) into $dir (must exist) instead of .
703# @param $1 - Package to get jars from. 778# @param $1 - Package to get jars from.
704# @param $2 - jar from package. If not specified, all jars will be used. 779# @param $2 - jar from package. If not specified, all jars will be used.
705# @param $3 - When a single jar is specified, destination filename of the 780# @param $3 - When a single jar is specified, destination filename of the
706# symlink. Defaults to the name of the jar. 781# symlink. Defaults to the name of the jar.
707# ------------------------------------------------------------------------------ 782# ------------------------------------------------------------------------------
708# TODO could probably be cleaned up a little 783# TODO could probably be cleaned up a little
709java-pkg_jar-from() { 784java-pkg_jar-from() {
710 debug-print-function ${FUNCNAME} $* 785 debug-print-function ${FUNCNAME} $*
711 786
712 local build_only="" 787 local build_only=""
788 local destdir="."
789 local deep=""
713 790
791 [[ "${EBUILD_PHASE}" == "test" ]] && build_only="true"
792
793 while [[ "${1}" == --* ]]; do
714 if [[ "${1}" = "--build-only" ]]; then 794 if [[ "${1}" = "--build-only" ]]; then
715 build_only="true" 795 build_only="true"
796 elif [[ "${1}" = "--with-dependencies" ]]; then
797 deep="--with-dependencies"
798 elif [[ "${1}" = "--into" ]]; then
799 destdir="${2}"
800 shift
801 else
802 die "java-pkg_jar-from called with unknown parameter: ${1}"
803 fi
716 shift 804 shift
717 fi 805 done
718 806
719 local target_pkg="${1}" target_jar="${2}" destjar="${3}" 807 local target_pkg="${1}" target_jar="${2}" destjar="${3}"
720 808
721 [[ -z ${target_pkg} ]] && die "Must specify a package" 809 [[ -z ${target_pkg} ]] && die "Must specify a package"
722 810
723 # default destjar to the target jar 811 # default destjar to the target jar
724 [[ -z "${destjar}" ]] && destjar="${target_jar}" 812 [[ -z "${destjar}" ]] && destjar="${target_jar}"
725 813
726 local error_msg="There was a problem getting the classpath for ${target_pkg}." 814 local error_msg="There was a problem getting the classpath for ${target_pkg}."
727 local classpath 815 local classpath
728 classpath="$(java-config --classpath=${target_pkg})" 816 classpath="$(java-config ${deep} --classpath=${target_pkg})"
729 [[ $? != 0 ]] && die ${error_msg} 817 [[ $? != 0 ]] && die ${error_msg}
818
819 pushd ${destdir} > /dev/null \
820 || die "failed to change directory to ${destdir}"
821
822 # When we have commas this functions is called to bring jars from multiple
823 # packages. This affects recording of dependencencies because that syntax uses :
824 # if we don't change them to : gjl and java-config -d -p break
825 if [[ ${target_pkg} = *,* ]]; then
826 build_only="true"
827 java-pkg_record-jar_ ${target_pkg//,/:}
828 fi
730 829
731 local jar 830 local jar
732 for jar in ${classpath//:/ }; do 831 for jar in ${classpath//:/ }; do
733 local jar_name=$(basename "${jar}") 832 local jar_name=$(basename "${jar}")
734 if [[ ! -f "${jar}" ]] ; then 833 if [[ ! -f "${jar}" ]] ; then
745 elif [[ "${jar_name}" == "${target_jar}" ]] ; then 844 elif [[ "${jar_name}" == "${target_jar}" ]] ; then
746 [[ -f "${destjar}" ]] && rm "${destjar}" 845 [[ -f "${destjar}" ]] && rm "${destjar}"
747 ln -snf "${jar}" "${destjar}" \ 846 ln -snf "${jar}" "${destjar}" \
748 || die "Failed to make symlink from ${jar} to ${destjar}" 847 || die "Failed to make symlink from ${jar} to ${destjar}"
749 [[ -z "${build_only}" ]] && java-pkg_record-jar_ "${target_pkg}" "${jar}" 848 [[ -z "${build_only}" ]] && java-pkg_record-jar_ "${target_pkg}" "${jar}"
849 popd > /dev/null
750 return 0 850 return 0
751 fi 851 fi
752 done 852 done
853 popd > /dev/null
753 # if no target was specified, we're ok 854 # if no target was specified, we're ok
754 if [[ -z "${target_jar}" ]] ; then 855 if [[ -z "${target_jar}" ]] ; then
755 return 0 856 return 0
756 # otherwise, die bitterly 857 # otherwise, die bitterly
757 else 858 else
781# Example: Get the classpath for xerces-2 and xalan, 882# Example: Get the classpath for xerces-2 and xalan,
782# java-pkg_getjars xerces-2,xalan 883# java-pkg_getjars xerces-2,xalan
783# Example Return: 884# Example Return:
784# /usr/share/xerces-2/lib/xml-apis.jar:/usr/share/xerces-2/lib/xmlParserAPIs.jar:/usr/share/xalan/lib/xalan.jar 885# /usr/share/xerces-2/lib/xml-apis.jar:/usr/share/xerces-2/lib/xmlParserAPIs.jar:/usr/share/xalan/lib/xalan.jar
785# 886#
786# @param $1 - (optional) "--build-only" makes the jar(s) not added into 887# @param $opt
787# package.env DEPEND line. 888# --build-only - makes the jar(s) not added into package.env DEPEND line.
889# (assumed automatically when called inside src_test)
890# --with-dependencies - get jars also from requested package's dependencies
891# transitively.
788# @param $2 - list of packages to get jars from 892# @param $1 - list of packages to get jars from
789# (passed to java-config --classpath) 893# (passed to java-config --classpath)
790# ------------------------------------------------------------------------------ 894# ------------------------------------------------------------------------------
791java-pkg_getjars() { 895java-pkg_getjars() {
792 debug-print-function ${FUNCNAME} $* 896 debug-print-function ${FUNCNAME} $*
793 897
794 [[ ${#} -lt 1 || ${#} -gt 2 ]] && die "${FUNCNAME} takes only one or two arguments" 898 local build_only=""
899 local deep=""
795 900
901 [[ "${EBUILD_PHASE}" == "test" ]] && build_only="true"
902
903 while [[ "${1}" == --* ]]; do
796 if [[ "${1}" = "--build-only" ]]; then 904 if [[ "${1}" = "--build-only" ]]; then
797 local build_only="true" 905 build_only="true"
906 elif [[ "${1}" = "--with-dependencies" ]]; then
907 deep="--with-dependencies"
908 else
909 die "java-pkg_jar-from called with unknown parameter: ${1}"
910 fi
798 shift 911 shift
799 fi 912 done
913
914 [[ ${#} -ne 1 ]] && die "${FUNCNAME} takes only one argument besides --*"
800 915
801 local classpath pkgs="${1}" 916 local classpath pkgs="${1}"
802 jars="$(java-config --classpath=${pkgs})" 917 jars="$(java-config ${deep} --classpath=${pkgs})"
803 [[ -z "${jars}" ]] && die "java-config --classpath=${pkgs} failed" 918 [[ -z "${jars}" ]] && die "java-config --classpath=${pkgs} failed"
804 debug-print "${pkgs}:${jars}" 919 debug-print "${pkgs}:${jars}"
805 920
806 if [[ -z "${classpath}" ]]; then 921 if [[ -z "${classpath}" ]]; then
807 classpath="${jars}" 922 classpath="${jars}"
834# @example 949# @example
835# java-pkg_getjar xerces-2 xml-apis.jar 950# java-pkg_getjar xerces-2 xml-apis.jar
836# @example-return 951# @example-return
837# /usr/share/xerces-2/lib/xml-apis.jar 952# /usr/share/xerces-2/lib/xml-apis.jar
838# 953#
839# @param $1 - (optional) "--build-only" makes the jar not added into 954# @param $opt
840# package.env DEPEND line. 955# --build-only - makes the jar not added into package.env DEPEND line.
841# @param $1 - package to use 956# @param $1 - package to use
842# @param $2 - jar to get 957# @param $2 - jar to get
843# ------------------------------------------------------------------------------ 958# ------------------------------------------------------------------------------
844java-pkg_getjar() { 959java-pkg_getjar() {
845 debug-print-function ${FUNCNAME} $* 960 debug-print-function ${FUNCNAME} $*
846 961
847 local build_only="" 962 local build_only=""
848 963
964 [[ "${EBUILD_PHASE}" == "test" ]] && build_only="true"
965
966 while [[ "${1}" == --* ]]; do
849 if [[ "${1}" = "--build-only" ]]; then 967 if [[ "${1}" = "--build-only" ]]; then
850 build_only="true" 968 build_only="true"
969 else
970 die "java-pkg_jar-from called with unknown parameter: ${1}"
971 fi
851 shift 972 shift
852 fi 973 done
974
975 [[ ${#} -ne 2 ]] && die "${FUNCNAME} takes only two arguments besides --*"
853 976
854 local pkg="${1}" target_jar="${2}" jar 977 local pkg="${1}" target_jar="${2}" jar
855 [[ -z ${pkg} ]] && die "Must specify package to get a jar from" 978 [[ -z ${pkg} ]] && die "Must specify package to get a jar from"
856 [[ -z ${target_jar} ]] && die "Must specify jar to get" 979 [[ -z ${target_jar} ]] && die "Must specify jar to get"
857 980
999# 1122#
1000# export DEPEND="${DEPEND} ${depstr}" 1123# export DEPEND="${DEPEND} ${depstr}"
1001# export RDEPEND="${RDEPEND} ${depstr}" 1124# export RDEPEND="${RDEPEND} ${depstr}"
1002#} 1125#}
1003 1126
1127# ------------------------------------------------------------------------------
1128# @ebuild-function java-pkg_find-normal-jars
1129#
1130# Find the files with suffix .jar file in the given directory or $WORKDIR
1131#
1132# @param $1 - The directory to search for jar files (default: ${WORKDIR})
1133# ------------------------------------------------------------------------------
1134java-pkg_find-normal-jars() {
1135 local dir=$1
1136 [[ "${dir}" ]] || dir="${WORKDIR}"
1137 local found
1138 for jar in $(find "${dir}" -name "*.jar" -type f); do
1139 echo "${jar}"
1140 found="true"
1141 done
1142 [[ "${found}" ]]
1143 return $?
1144}
1145
1146# ------------------------------------------------------------------------------
1147# @ebuild-function java-pkg_ensure-no-bundled-jars
1148#
1149# Try to locate bundled jar files in ${WORKDIR} and die if found.
1004# This should be used after S has been populated with symlinks to jars 1150# This function should be called after WORKDIR has been populated with symlink
1005# TODO document 1151# to system jar files or bundled jars removed.
1152# ------------------------------------------------------------------------------
1006java-pkg_ensure-no-bundled-jars() { 1153java-pkg_ensure-no-bundled-jars() {
1007 debug-print-function ${FUNCNAME} $* 1154 debug-print-function ${FUNCNAME} $*
1008 pushd ${WORKDIR} >/dev/null 2>/dev/null
1009 1155
1010 local bundled_jars=$(find . -name "*.jar" -type f) 1156 local bundled_jars=$(java-pkg_find-normal-jars)
1011 if [[ -n ${bundled_jars} ]]; then 1157 if [[ -n ${bundled_jars} ]]; then
1012 echo "Bundled jars found:" 1158 echo "Bundled jars found:"
1013 local jar 1159 local jar
1014 for jar in ${bundled_jars}; do 1160 for jar in ${bundled_jars}; do
1015 echo $(pwd)${jar/./} 1161 echo $(pwd)${jar/./}
1016 done 1162 done
1017 die "Bundled jars found!" 1163 die "Bundled jars found!"
1018
1019 fi 1164 fi
1020 popd >/dev/null 2>/dev/null
1021} 1165}
1022 1166
1023# ------------------------------------------------------------------------------ 1167# ------------------------------------------------------------------------------
1024# @internal-function java-pkg_ensure-vm-version-sufficient 1168# @internal-function java-pkg_ensure-vm-version-sufficient
1025# 1169#
1174# @ebuild-function java-pkg_get-target 1318# @ebuild-function java-pkg_get-target
1175# 1319#
1176# Determines what target version should be used, for passing to -target. 1320# Determines what target version should be used, for passing to -target.
1177# If you don't care about lower versions, you can set _WANT_TARGET to the 1321# If you don't care about lower versions, you can set _WANT_TARGET to the
1178# version of your JDK. 1322# version of your JDK.
1179# Remember doing this will mostly like cause things to break.
1180# Doesn't allow it to be lower then the one in depend.
1181# Doesn't allow it to be higher then the active vm.
1182# 1323#
1183# @return string - Either the lowest possible target, or JAVA_PKG_WANT_TARGET 1324# @return string - Either the lowest possible target, or JAVA_PKG_WANT_TARGET
1184# ------------------------------------------------------------------------------ 1325# ------------------------------------------------------------------------------
1185java-pkg_get-target() { 1326java-pkg_get-target() {
1186 local min=$(depend-java-query --get-lowest "${DEPEND} ${RDEPEND}")
1187 if [[ -n "${JAVA_PKG_WANT_TARGET}" ]]; then
1188 local max="$(java-config --select-vm "${GENTOO_VM}" -g PROVIDES_VERSION)"
1189 if version_is_at_least "${min}" "${JAVA_PKG_WANT_TARGET}" && version_is_at_least "${JAVA_PKG_WANT_TARGET}" "${max}"; then
1190 echo ${JAVA_PKG_WANT_TARGET}
1191 else
1192 echo ${min}
1193 fi
1194 else
1195 echo ${min}
1196 fi
1197
1198 #echo ${JAVA_PKG_WANT_TARGET:-$(depend-java-query --get-lowest "${DEPEND}")} 1327 echo ${JAVA_PKG_WANT_TARGET:-$(depend-java-query --get-lowest "${DEPEND} ${RDEPEND}")}
1199} 1328}
1200 1329
1201java-pkg_get-javac() { 1330java-pkg_get-javac() {
1202 debug-print-function ${FUNCNAME} $* 1331 debug-print-function ${FUNCNAME} $*
1203 1332
1292 die "No GCJ support found!" 1421 die "No GCJ support found!"
1293 fi 1422 fi
1294} 1423}
1295 1424
1296java-pkg_ensure-test() { 1425java-pkg_ensure-test() {
1297 if hasq test ${FEATURES} && ! hasq -test ${FEATURES} && ! use test; then 1426 if hasq test ${FEATURES} && ! hasq -test ${FEATURES} \
1427 && hasq test ${IUSE} && ! use test;
1428 then
1298 eerror "You specified FEATURES=test, but USE=test is needed" 1429 eerror "You specified FEATURES=test, but USE=test is needed"
1299 eerror "to pull in the additional dependencies for testing" 1430 eerror "to pull in the additional dependencies for testing"
1300 die "Need USE=test enabled" 1431 die "Need USE=test enabled"
1301 fi 1432 fi
1302} 1433}
1303 1434
1304# ------------------------------------------------------------------------------ 1435# ------------------------------------------------------------------------------
1436# @ebuild-function java-pkg_register-ant-task
1437#
1438# Register this package as ant task, so that ant will load it when no specific
1439# ANT_TASKS are specified. Note that even without this registering, all packages
1440# specified in ANT_TASKS will be loaded. Mostly used by the actual ant tasks
1441# packages, but can be also used by other ebuilds that used to symlink their
1442# .jar into /usr/share/ant-core/lib to get autoloaded, for backwards
1443# compatibility.
1444#
1445# @param --version x.y Register only for ant version x.y (otherwise for any ant
1446# version). Used by the ant-* packages to prevent loading of mismatched
1447# ant-core ant tasks after core was updated, before the tasks are updated,
1448# without a need for blockers.
1449# @param $1 Name to register as. Defaults to JAVA_PKG_NAME ($PN[-$SLOT])
1450# ------------------------------------------------------------------------------
1451java-pkg_register-ant-task() {
1452 local TASKS_DIR="tasks"
1453
1454 # check for --version x.y parameters
1455 while [[ -n "${1}" && -n "${2}" ]]; do
1456 local var="${1#--}"
1457 local val="${2}"
1458 if [[ "${var}" == "version" ]]; then
1459 TASKS_DIR="tasks-${val}"
1460 else
1461 die "Unknown parameter passed to java-pkg_register-ant-tasks: ${1} ${2}"
1462 fi
1463 shift 2
1464 done
1465
1466 local TASK_NAME="${1:-${JAVA_PKG_NAME}}"
1467
1468 dodir /usr/share/ant/${TASKS_DIR}
1469 touch "${D}/usr/share/ant/${TASKS_DIR}/${TASK_NAME}"
1470}
1471
1472# ------------------------------------------------------------------------------
1473# @internal-function java-pkg_ant-tasks-from-deps
1474#
1475# Function to determine ANT_TASKS from DEPEND variable for backwards
1476# compatibility with ebuilds that don't set ANT_TASKS before calling eant() or
1477# WANT_ANT_TASKS before inheriting java-pkg-2. If the DEPEND string contains
1478# "dev-java/ant" or "dev-java/ant-tasks", then it returns "all", otherwise
1479# "none". It's not smart enough to cope with USE flag depends but that shouldn't
1480# be a problem, the worst it can do is activace all tasks when not needed.
1481# Note that this is called only with JAVA_PKG_STRICT=1, to find ebuilds with
1482# insufficient dependencies, otherwise all available tasks are used for
1483# backwards compatilbility.
1484#
1485# @return "all" or "none"
1486# ------------------------------------------------------------------------------
1487java-pkg_ant-tasks-from-deps() {
1488 local found_ant found_ant_tasks
1489
1490 for dep in ${DEPEND}
1491 do
1492 local ant="$(awk '/(dev-java\/ant)/ { if (match($1, "(dev-java/ant)((-[0-9])+|$)", m)) print m[1] }' <<< ${dep})"
1493 [[ "${ant}" == "dev-java/ant" ]] && found_ant=true
1494 [[ "${dep}" == *"ant-tasks"* ]] && found_ant_tasks=true
1495 done
1496
1497 if [[ -n "${found_ant}" || -n "${found_ant_tasks}" ]]; then
1498 java-pkg_announce-qa-violation "The ebuild DEPENDS on deprecated ant or ant-tasks"
1499 echo "all"
1500 else
1501 # ebuild doesn't set ANT_TASKS and doesn't depend on ant-tasks or ant
1502 # so we deactivate all tasks that may be installed
1503 echo "none"
1504 fi
1505}
1506
1507# ------------------------------------------------------------------------------
1508# @internal-function java-pkg_ant-tasks-depend
1509#
1510# Translates the WANT_ANT_TASKS variable into valid dependencies.
1511# ------------------------------------------------------------------------------
1512java-pkg_ant-tasks-depend() {
1513 debug-print-function ${FUNCNAME} ${WANT_ANT_TASKS}
1514
1515 if [[ -n "${WANT_ANT_TASKS}" ]]; then
1516 local DEP=""
1517 for i in ${WANT_ANT_TASKS}
1518 do
1519 if [[ ${i} != ant-* ]]; then
1520 echo "Invalid atom in WANT_ANT_TASKS: ${i}"
1521 return 1
1522 fi
1523 DEP="${DEP}dev-java/${i} "
1524 done
1525 echo ${DEP}
1526 return 0
1527 else
1528 return 0
1529 fi
1530}
1531
1532# ------------------------------------------------------------------------------
1305# @section-end helper 1533# @section-end helper
1306# ------------------------------------------------------------------------------ 1534# ------------------------------------------------------------------------------
1307 1535
1308# ------------------------------------------------------------------------------ 1536# ------------------------------------------------------------------------------
1309# @section-begin build 1537# @section-begin build
1315 1543
1316# ------------------------------------------------------------------------------ 1544# ------------------------------------------------------------------------------
1317# @ebuild-function eant 1545# @ebuild-function eant
1318# 1546#
1319# Ant wrapper function. Will use the appropriate compiler, based on user-defined 1547# Ant wrapper function. Will use the appropriate compiler, based on user-defined
1320# compiler. 1548# compiler. Will also set proper ANT_TASKS from the variable ANT_TASKS,
1321# 1549# variables:
1550# EANT_GENTOO_CLASSPATH - calls java-pkg_getjars for the value and adds to the
1551# gentoo.classpath property. Be sure to call
1552# java-ant_rewrite-classpath in src_unpack.
1553# *ANT_TASKS - used to determine ANT_TASKS before calling Ant.
1322# ------------------------------------------------------------------------------ 1554# ------------------------------------------------------------------------------
1323eant() { 1555eant() {
1324 debug-print-function ${FUNCNAME} $* 1556 debug-print-function ${FUNCNAME} $*
1325 1557
1326 # FIXME get this working 1558 # FIXME get this working
1327# if is-java-strict && [[ ! ${DEPEND} =~ "dev-java/ant" ]]; then 1559# if is-java-strict && [[ ! ${DEPEND} =~ "dev-java/ant" ]]; then
1328# java-pkg_announce-qa-violation \ 1560# java-pkg_announce-qa-violation \
1329# "Using eant, but not depending on dev-java/ant or dev-java/ant-core" 1561# "Using eant, but not depending on dev-java/ant or dev-java/ant-core"
1330# fi 1562# fi
1331 1563
1332 local antflags 1564 if ! hasq java-ant-2 ${INHERITED} && is-java-strict; then
1565 local msg="You should inherit java-ant-2 when using eant"
1566 java-pkg_announce-qa-violation ${msg}
1567 die ${msg}
1568 fi
1569
1570 local antflags="-Dnoget=true -Dmaven.mode.offline=true"
1571
1333 java-pkg_init-compiler_ 1572 java-pkg_init-compiler_
1334 local compiler="${GENTOO_COMPILER}" 1573 local compiler="${GENTOO_COMPILER}"
1335 1574
1336 local compiler_env="${JAVA_PKG_COMPILER_DIR}/${compiler}" 1575 local compiler_env="${JAVA_PKG_COMPILER_DIR}/${compiler}"
1337 1576
1339 if [[ "${compiler}" != "javac" && -z "${build_compiler}" ]]; then 1578 if [[ "${compiler}" != "javac" && -z "${build_compiler}" ]]; then
1340 die "ANT_BUILD_COMPILER undefined in ${compiler_env}" 1579 die "ANT_BUILD_COMPILER undefined in ${compiler_env}"
1341 fi 1580 fi
1342 1581
1343 if [[ ${compiler} != "javac" ]]; then 1582 if [[ ${compiler} != "javac" ]]; then
1344 antflags="-Dbuild.compiler=${build_compiler}" 1583 antflags="${antflags} -Dbuild.compiler=${build_compiler}"
1345 # Figure out any extra stuff to put on the classpath for compilers aside 1584 # Figure out any extra stuff to put on the classpath for compilers aside
1346 # from javac 1585 # from javac
1347 # ANT_BUILD_COMPILER_DEPS should be something that could be passed to 1586 # ANT_BUILD_COMPILER_DEPS should be something that could be passed to
1348 # java-config -p 1587 # java-config -p
1349 local build_compiler_deps="$(source ${JAVA_PKG_COMPILER_DIR}/${compiler} 1>/dev/null 2>&1; echo ${ANT_BUILD_COMPILER_DEPS})" 1588 local build_compiler_deps="$(source ${JAVA_PKG_COMPILER_DIR}/${compiler} 1>/dev/null 2>&1; echo ${ANT_BUILD_COMPILER_DEPS})"
1355 if is-java-strict; then 1594 if is-java-strict; then
1356 einfo "Disabling system classpath for ant" 1595 einfo "Disabling system classpath for ant"
1357 antflags="${antflags} -Dbuild.sysclasspath=ignore" 1596 antflags="${antflags} -Dbuild.sysclasspath=ignore"
1358 fi 1597 fi
1359 1598
1360 if [[ -n ${JAVA_PKG_DEBUG} ]]; then 1599 for arg in "${@}"; do
1361 antflags="${antflags} -debug" 1600 if [[ ${arg} = -lib ]]; then
1601 if is-java-strict; then
1602 eerror "You should not use the -lib argument to eant because it will fail"
1603 eerror "with JAVA_PKG_STRICT. Please use for example java-pkg_jar-from"
1604 eerror "or ant properties to make dependencies available."
1605 eerror "For ant tasks use WANT_ANT_TASKS or ANT_TASKS from."
1606 eerror "split ant (>=dev-java/ant-core-1.7)."
1607 die "eant -lib is deprecated/forbidden"
1608 else
1609 echo "eant -lib is deprecated. Turn JAVA_PKG_STRICT on for"
1610 echo "more info."
1611 fi
1612 fi
1613 done
1614
1615 if has_version ">=dev-java/ant-core-1.7.0"; then
1616 # default ANT_TASKS to WANT_ANT_TASKS, if ANT_TASKS is not set explicitly
1617 ANT_TASKS="${ANT_TASKS:-${WANT_ANT_TASKS}}"
1618
1619 # override ANT_TASKS with JAVA_PKG_FORCE_ANT_TASKS if it's set
1620 ANT_TASKS="${JAVA_PKG_FORCE_ANT_TASKS:-${ANT_TASKS}}"
1621
1622 if is-java-strict; then
1623 # if ant-tasks were not set by ebuild or forced, try to determine them from depends
1624 if [[ -z "${ANT_TASKS}" ]]; then
1625 ANT_TASKS="$(java-pkg_ant-tasks-from-deps)"
1626 fi
1627 else
1628 # if ant-tasks is not set by ebuild or forced, activate all of them
1629 ANT_TASKS="${ANT_TASKS:-all}"
1630 fi
1631
1632 # at this point, ANT_TASKS should be "all", "none" or explicit list
1633 if [[ "${ANT_TASKS}" == "all" ]]; then
1634 einfo "Using all available ANT_TASKS"
1635 elif [[ "${ANT_TASKS}" == "none" ]]; then
1636 einfo "Disabling all optional ANT_TASKS"
1637 else
1638 einfo "Using following ANT_TASKS: ${ANT_TASKS}"
1639 fi
1640
1641 export ANT_TASKS
1642 fi
1643
1644 [[ -n ${JAVA_PKG_DEBUG} ]] && antflags="${antflags} --execdebug -debug"
1645 [[ -n ${PORTAGE_QUIET} ]] && antflags="${antflags} -q"
1646
1647 local gcp="${EANT_GENTOO_CLASSPATH}"
1648
1649 if [[ ${EBUILD_PHASE} = "test" ]]; then
1650 antflags="${antflags} -DJunit.present=true"
1651 [[ ${gcp} && ${ANT_TASKS} = *ant-junit* ]] && gcp="${gcp} junit"
1652 fi
1653
1654 local cp
1655
1656 for atom in ${gcp}; do
1657 cp="${cp}:$(java-pkg_getjars ${atom})"
1658 done
1659
1660 if [[ ${cp} ]]; then
1661 # It seems ant does not like single quotes around ${cp}
1662 antflags="${antflags} -Dgentoo.classpath=\"${cp#:}\""
1362 fi 1663 fi
1363 1664
1364 [[ -n ${JAVA_PKG_DEBUG} ]] && echo ant ${antflags} "${@}" 1665 [[ -n ${JAVA_PKG_DEBUG} ]] && echo ant ${antflags} "${@}"
1666 debug-print "Calling ant: ${antflags} ${@}"
1365 ant ${antflags} "${@}" || die "eant failed" 1667 ant ${antflags} "${@}" || die "eant failed"
1366 1668
1367} 1669}
1368 1670
1369# ------------------------------------------------------------------------------ 1671# ------------------------------------------------------------------------------
1439# @return string - Name of the target to create javadocs 1741# @return string - Name of the target to create javadocs
1440# ------------------------------------------------------------------------------ 1742# ------------------------------------------------------------------------------
1441use_doc() { 1743use_doc() {
1442 use doc && echo ${@:-javadoc} 1744 use doc && echo ${@:-javadoc}
1443} 1745}
1746
1444 1747
1445# ------------------------------------------------------------------------------ 1748# ------------------------------------------------------------------------------
1446# @section-end build 1749# @section-end build
1447# ------------------------------------------------------------------------------ 1750# ------------------------------------------------------------------------------
1448 1751
1481 # When users have crazy classpaths some packages can fail to compile. 1784 # When users have crazy classpaths some packages can fail to compile.
1482 # and everything should work with empty CLASSPATH. 1785 # and everything should work with empty CLASSPATH.
1483 # This also helps prevent unexpected dependencies on random things 1786 # This also helps prevent unexpected dependencies on random things
1484 # from the CLASSPATH. 1787 # from the CLASSPATH.
1485 unset CLASSPATH 1788 unset CLASSPATH
1789
1790 # Unset external ANT_ stuff
1791 unset ANT_TASKS
1792 unset ANT_OPTS
1486} 1793}
1487 1794
1488# ------------------------------------------------------------------------------ 1795# ------------------------------------------------------------------------------
1489# @function-internal java-pkg-init-compiler_ 1796# @function-internal java-pkg-init-compiler_
1490# 1797#
1832# Switch VM if we're allowed to (controlled by JAVA_PKG_ALLOW_VM_CHANGE), and 2139# Switch VM if we're allowed to (controlled by JAVA_PKG_ALLOW_VM_CHANGE), and
1833# verify that the current VM is sufficient. 2140# verify that the current VM is sufficient.
1834# Setup the environment for the VM being used. 2141# Setup the environment for the VM being used.
1835# ------------------------------------------------------------------------------ 2142# ------------------------------------------------------------------------------
1836java-pkg_switch-vm() { 2143java-pkg_switch-vm() {
2144 debug-print-function ${FUNCNAME} $*
2145
1837 if java-pkg_needs-vm; then 2146 if java-pkg_needs-vm; then
1838 # Use the VM specified by JAVA_PKG_FORCE_VM 2147 # Use the VM specified by JAVA_PKG_FORCE_VM
1839 if [[ -n ${JAVA_PKG_FORCE_VM} ]]; then 2148 if [[ -n "${JAVA_PKG_FORCE_VM}" ]]; then
1840 # If you're forcing the VM, I hope you know what your doing... 2149 # If you're forcing the VM, I hope you know what your doing...
2150 debug-print "JAVA_PKG_FORCE_VM used: ${JAVA_PKG_FORCE_VM}"
1841 export GENTOO_VM="${JAVA_PKG_FORCE_VM}" 2151 export GENTOO_VM="${JAVA_PKG_FORCE_VM}"
1842 # if we're allowed to switch the vm... 2152 # if we're allowed to switch the vm...
1843 elif [[ "${JAVA_PKG_ALLOW_VM_CHANGE}" == "yes" ]]; then 2153 elif [[ "${JAVA_PKG_ALLOW_VM_CHANGE}" == "yes" ]]; then
1844 debug-print "depend-java-query: NV_DEPEND: ${JAVA_PKG_NV_DEPEND:-${DEPEND}} VNEED: ${JAVA_PKG_VNEED}" 2154 debug-print "depend-java-query: NV_DEPEND: ${JAVA_PKG_NV_DEPEND:-${DEPEND}} VNEED: ${JAVA_PKG_VNEED}"
1845 if [[ -n ${JAVA_PKG_VNEED} ]]; then 2155 if [[ -n ${JAVA_PKG_VNEED} ]]; then
1925 einfo "Classes" 2235 einfo "Classes"
1926 find "${S}" -type f -name '*.class' -print0 | xargs -0 -r -n 500 ls -ald | sed -e "s,${WORKDIR},\${WORKDIR}," 2236 find "${S}" -type f -name '*.class' -print0 | xargs -0 -r -n 500 ls -ald | sed -e "s,${WORKDIR},\${WORKDIR},"
1927 fi 2237 fi
1928} 2238}
1929 2239
1930# TODO document 2240# ------------------------------------------------------------------------------
2241# @internal-function java-pkg_verify-classes
2242#
1931# Verify that the classes were compiled for the right source / target 2243# Verify that the classes were compiled for the right source / target. Dies if
2244# not.
2245# @param $1 (optional) - the file to check, otherwise checks whole ${D}
2246# ------------------------------------------------------------------------------
1932java-pkg_verify-classes() { 2247java-pkg_verify-classes() {
1933 ebegin "Verifying java class versions"
1934 #$(find ${D} -type f -name '*.jar' -o -name '*.class') 2248 #$(find ${D} -type f -name '*.jar' -o -name '*.class')
1935 class-version-verify.py -t $(java-pkg_get-target) -r ${D} 2249 local target=$(java-pkg_get-target)
2250 local result
2251 local log="${T}/class-version-verify.log"
2252 if [[ -n "${1}" ]]; then
2253 class-version-verify.py -v -t ${target} "${1}" > "${log}"
1936 result=$? 2254 result=$?
1937 eend ${result}
1938 if [[ ${result} == 0 ]]; then
1939 einfo "All good"
1940 else 2255 else
1941 ewarn "Possible problem" 2256 ebegin "Verifying java class versions (target: ${target})"
1942 die "Bad class files found" 2257 class-version-verify.py -v -t ${target} -r "${D}" > "${log}"
2258 result=$?
2259 eend ${result}
2260 fi
2261 [[ -n ${JAVA_PKG_DEBUG} ]] && cat "${log}"
2262 if [[ ${result} != 0 ]]; then
2263 eerror "Incorrect bytecode version found"
2264 [[ -n "${1}" ]] && eerror "in file: ${1}"
2265 eerror "See ${log} for more details."
2266 die "Incorrect bytecode found"
1943 fi 2267 fi
1944} 2268}
1945 2269
1946# ------------------------------------------------------------------------------ 2270# ------------------------------------------------------------------------------
1947# @section-end internal 2271# @section-end internal

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

  ViewVC Help
Powered by ViewVC 1.1.20