/[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.103 Revision 1.104
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.103 2008/01/12 15:08:47 caster Exp $ 9# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.104 2008/03/03 17:55:21 betelgeuse Exp $
10 10
11# ----------------------------------------------------------------------------- 11# -----------------------------------------------------------------------------
12# @eclass-begin 12# @eclass-begin
13# @eclass-shortdesc Java Utility eclass 13# @eclass-shortdesc Java Utility eclass
14# @eclass-maintainer java@gentoo.org 14# @eclass-maintainer java@gentoo.org
290 fi 290 fi
291 done 291 done
292 292
293 java-pkg_do_write_ 293 java-pkg_do_write_
294} 294}
295
296 295
297# ------------------------------------------------------------------------------ 296# ------------------------------------------------------------------------------
298# @internal-function depend-java-query 297# @internal-function depend-java-query
299# 298#
300# Wrapper for the depend-java-query binary to enable passing USE in env. 299# Wrapper for the depend-java-query binary to enable passing USE in env.
647 646
648 [[ ${#} -lt 1 ]] && die "At least one argument needed" 647 [[ ${#} -lt 1 ]] && die "At least one argument needed"
649 648
650 if ! [[ ${DEPEND} = *app-arch/zip* ]]; then 649 if ! [[ ${DEPEND} = *app-arch/zip* ]]; then
651 local msg="${FUNCNAME} called without app-arch/zip in DEPEND" 650 local msg="${FUNCNAME} called without app-arch/zip in DEPEND"
652 if is-java-strict; then 651 java-pkg_announce-qa-violation ${msg}
653 eerror "${msg}"
654 die "${msg}"
655 else
656 echo "${msg}"
657 echo "Please report this to http://bugs.gentoo.org."
658 fi
659 fi 652 fi
660 653
661 java-pkg_init_paths_ 654 java-pkg_init_paths_
662 655
663 local zip_name="${PN}-src.zip" 656 local zip_name="${PN}-src.zip"
2176 done 2169 done
2177 2170
2178 # If it hasn't been defined already, default to javac 2171 # If it hasn't been defined already, default to javac
2179 if [[ -z ${GENTOO_COMPILER} ]]; then 2172 if [[ -z ${GENTOO_COMPILER} ]]; then
2180 if [[ -n ${compilers} ]]; then 2173 if [[ -n ${compilers} ]]; then
2181 einfo "No suitable compiler found: defaulting javac for compilation" 2174 einfo "No suitable compiler found: defaulting to JDK default for compilation"
2182 else 2175 else
2183 # probably don't need to notify users about the default. 2176 # probably don't need to notify users about the default.
2184 :;#einfo "Defaulting to javac for compilation" 2177 :;#einfo "Defaulting to javac for compilation"
2185 fi 2178 fi
2179 if java-config -g GENTOO_COMPILER 2> /dev/null; then
2180 export GENTOO_COMPILER=$(java-config -g GENTOO_COMPILER)
2181 else
2186 export GENTOO_COMPILER=javac 2182 export GENTOO_COMPILER=javac
2183 fi
2187 else 2184 else
2188 einfo "Using ${GENTOO_COMPILER} for compilation" 2185 einfo "Using ${GENTOO_COMPILER} for compilation"
2189 fi 2186 fi
2190 2187
2191} 2188}
2242 "${JAVA_PKG_OPTIONAL_DEPEND_FILE}" ]]; then 2239 "${JAVA_PKG_OPTIONAL_DEPEND_FILE}" ]]; then
2243 # Create package.env 2240 # Create package.env
2244 ( 2241 (
2245 echo "DESCRIPTION=\"${DESCRIPTION}\"" 2242 echo "DESCRIPTION=\"${DESCRIPTION}\""
2246 echo "GENERATION=\"2\"" 2243 echo "GENERATION=\"2\""
2244 echo "SLOT=\"${SLOT}\""
2247 2245
2248 [[ -n "${JAVA_PKG_CLASSPATH}" ]] && echo "CLASSPATH=\"${JAVA_PKG_CLASSPATH}\"" 2246 [[ -n "${JAVA_PKG_CLASSPATH}" ]] && echo "CLASSPATH=\"${JAVA_PKG_CLASSPATH}\""
2249 [[ -n "${JAVA_PKG_LIBRARY}" ]] && echo "LIBRARY_PATH=\"${JAVA_PKG_LIBRARY}\"" 2247 [[ -n "${JAVA_PKG_LIBRARY}" ]] && echo "LIBRARY_PATH=\"${JAVA_PKG_LIBRARY}\""
2250 [[ -n "${JAVA_PROVIDE}" ]] && echo "PROVIDES=\"${JAVA_PROVIDE}\"" 2248 [[ -n "${JAVA_PROVIDE}" ]] && echo "PROVIDES=\"${JAVA_PROVIDE}\""
2251 [[ -f "${JAVA_PKG_DEPEND_FILE}" ]] \ 2249 [[ -f "${JAVA_PKG_DEPEND_FILE}" ]] \

Legend:
Removed from v.1.103  
changed lines
  Added in v.1.104

  ViewVC Help
Powered by ViewVC 1.1.20