/[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.35 Revision 1.36
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.35 2006/12/17 14:48:33 betelgeuse Exp $ 9# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.36 2006/12/20 22:45:18 caster 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
1339# if is-java-strict && [[ ! ${DEPEND} =~ "dev-java/ant" ]]; then 1339# if is-java-strict && [[ ! ${DEPEND} =~ "dev-java/ant" ]]; then
1340# java-pkg_announce-qa-violation \ 1340# java-pkg_announce-qa-violation \
1341# "Using eant, but not depending on dev-java/ant or dev-java/ant-core" 1341# "Using eant, but not depending on dev-java/ant or dev-java/ant-core"
1342# fi 1342# fi
1343 1343
1344 local antflags 1344 local antflags="-Dnoget=true"
1345 java-pkg_init-compiler_ 1345 java-pkg_init-compiler_
1346 local compiler="${GENTOO_COMPILER}" 1346 local compiler="${GENTOO_COMPILER}"
1347 1347
1348 local compiler_env="${JAVA_PKG_COMPILER_DIR}/${compiler}" 1348 local compiler_env="${JAVA_PKG_COMPILER_DIR}/${compiler}"
1349 1349
1351 if [[ "${compiler}" != "javac" && -z "${build_compiler}" ]]; then 1351 if [[ "${compiler}" != "javac" && -z "${build_compiler}" ]]; then
1352 die "ANT_BUILD_COMPILER undefined in ${compiler_env}" 1352 die "ANT_BUILD_COMPILER undefined in ${compiler_env}"
1353 fi 1353 fi
1354 1354
1355 if [[ ${compiler} != "javac" ]]; then 1355 if [[ ${compiler} != "javac" ]]; then
1356 antflags="-Dbuild.compiler=${build_compiler}" 1356 antflags="${antflags} -Dbuild.compiler=${build_compiler}"
1357 # Figure out any extra stuff to put on the classpath for compilers aside 1357 # Figure out any extra stuff to put on the classpath for compilers aside
1358 # from javac 1358 # from javac
1359 # ANT_BUILD_COMPILER_DEPS should be something that could be passed to 1359 # ANT_BUILD_COMPILER_DEPS should be something that could be passed to
1360 # java-config -p 1360 # java-config -p
1361 local build_compiler_deps="$(source ${JAVA_PKG_COMPILER_DIR}/${compiler} 1>/dev/null 2>&1; echo ${ANT_BUILD_COMPILER_DEPS})" 1361 local build_compiler_deps="$(source ${JAVA_PKG_COMPILER_DIR}/${compiler} 1>/dev/null 2>&1; echo ${ANT_BUILD_COMPILER_DEPS})"

Legend:
Removed from v.1.35  
changed lines
  Added in v.1.36

  ViewVC Help
Powered by ViewVC 1.1.20