/[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.38 Revision 1.46
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.38 2006/12/31 19:30:54 betelgeuse Exp $ 9# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.46 2007/01/21 01:20:21 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
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#
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
188 INSDESTTREE="${JAVA_PKG_JARDEST}" \ 232 INSDESTTREE="${JAVA_PKG_JARDEST}" \
189 doins "${jar}" || die "failed to install ${jar}" 233 doins "${jar}" || die "failed to install ${jar}"
190 java-pkg_append_ JAVA_PKG_CLASSPATH "${JAVA_PKG_JARDEST}/${jar_basename}" 234 java-pkg_append_ JAVA_PKG_CLASSPATH "${JAVA_PKG_JARDEST}/${jar_basename}"
254 [[ ${#} -lt 1 ]] && die "at least one argument needed" 298 [[ ${#} -lt 1 ]] && die "at least one argument needed"
255 299
256 java-pkg_init_paths_ 300 java-pkg_init_paths_
257 301
258 local jar jar_dir jar_file 302 local jar jar_dir jar_file
259 for jar in "$@"; do 303 for jar in ${@}; do
260 # TODO use java-pkg_check-versioned-jar 304 # TODO use java-pkg_check-versioned-jar
261 if [[ -e "${jar}" || -e "${D}${jar}" ]]; then 305 if [[ -e "${jar}" || -e "${D}${jar}" ]]; then
262 [[ -d "${jar}" || -d "${D}${jar}" ]] \ 306 [[ -d "${jar}" || -d "${D}${jar}" ]] \
263 && die "Called ${FUNCNAME} on a directory $*" 307 && die "Called ${FUNCNAME} on a directory $*"
264 # nelchael: we should strip ${D} in this case too, here's why: 308 # nelchael: we should strip ${D} in this case too, here's why:
292 local original_jar="${1}" 336 local original_jar="${1}"
293 local new_jar="${2:-${PN}.jar}" 337 local new_jar="${2:-${PN}.jar}"
294 local new_jar_dest="${T}/${new_jar}" 338 local new_jar_dest="${T}/${new_jar}"
295 339
296 [[ -z ${original_jar} ]] && die "Must specify a jar to install" 340 [[ -z ${original_jar} ]] && die "Must specify a jar to install"
297 [[ ! -f ${original_jar} ]] && die "${original_jar} does not exist!" 341 [[ ! -f ${original_jar} ]] \
342 && die "${original_jar} does not exist or is not a file!"
298 343
299 rm -f "${new_jar_dest}" || die "Failed to remove ${new_jar_dest}" 344 rm -f "${new_jar_dest}" || die "Failed to remove ${new_jar_dest}"
300 cp "${original_jar}" "${new_jar_dest}" \ 345 cp "${original_jar}" "${new_jar_dest}" \
301 || die "Failed to copy ${original_jar} to ${new_jar_dest}" 346 || die "Failed to copy ${original_jar} to ${new_jar_dest}"
302 java-pkg_dojar "${new_jar_dest}" 347 java-pkg_dojar "${new_jar_dest}"
550# @param $1 - filename of launcher to create 595# @param $1 - filename of launcher to create
551# @param $2 - options, as follows: 596# @param $2 - options, as follows:
552# --main the.main.class.too.start 597# --main the.main.class.too.start
553# --jar /the/jar/too/launch.jar or just <name>.jar 598# --jar /the/jar/too/launch.jar or just <name>.jar
554# --java_args 'Extra arguments to pass to java' 599# --java_args 'Extra arguments to pass to java'
555# --pkg_args 'Extra arguments too pass to the package' 600# --pkg_args 'Extra arguments to pass to the package'
556# --pwd 601# --pwd Directory the launcher changes to before executing java
557# -into 602# -into Directory to install the launcher to, instead of /usr/bin
558# -pre 603# -pre Prepend contents of this file to the launcher
559# ------------------------------------------------------------------------------ 604# ------------------------------------------------------------------------------
560java-pkg_dolauncher() { 605java-pkg_dolauncher() {
561 debug-print-function ${FUNCNAME} $* 606 debug-print-function ${FUNCNAME} $*
562 607
563 java-pkg_check-phase install 608 java-pkg_check-phase install
604 fi 649 fi
605 fi 650 fi
606 651
607 # Write the actual script 652 # Write the actual script
608 echo "#!/bin/bash" > "${target}" 653 echo "#!/bin/bash" > "${target}"
609 [[ -n "${pre}" ]] && [[ -f "${pre}" ]] && cat "${pre}" >> "${target}" 654 if [[ -n "${pre}" ]]; then
655 if [[ -f "${pre}" ]]; then
656 cat "${pre}" >> "${target}"
657 else
658 die "-pre specified file '${pre}' does not exist"
659 fi
660 fi
610 echo "gjl_package=${JAVA_PKG_NAME}" >> "${target}" 661 echo "gjl_package=${JAVA_PKG_NAME}" >> "${target}"
611 cat "${var_tmp}" >> "${target}" 662 cat "${var_tmp}" >> "${target}"
612 rm -f "${var_tmp}" 663 rm -f "${var_tmp}"
613 echo "source /usr/share/java-config-2/launcher/launcher.bash" >> "${target}" 664 echo "source /usr/share/java-config-2/launcher/launcher.bash" >> "${target}"
614 665
724 if [[ "${1}" = "--build-only" ]]; then 775 if [[ "${1}" = "--build-only" ]]; then
725 build_only="true" 776 build_only="true"
726 shift 777 shift
727 fi 778 fi
728 779
780 if [[ "${1}" = "--with-dependencies" ]]; then
781 local deep="--with-dependencies"
782 shift
783 fi
784
729 local target_pkg="${1}" target_jar="${2}" destjar="${3}" 785 local target_pkg="${1}" target_jar="${2}" destjar="${3}"
730 786
731 [[ -z ${target_pkg} ]] && die "Must specify a package" 787 [[ -z ${target_pkg} ]] && die "Must specify a package"
732 788
733 # default destjar to the target jar 789 # default destjar to the target jar
734 [[ -z "${destjar}" ]] && destjar="${target_jar}" 790 [[ -z "${destjar}" ]] && destjar="${target_jar}"
735 791
736 local error_msg="There was a problem getting the classpath for ${target_pkg}." 792 local error_msg="There was a problem getting the classpath for ${target_pkg}."
737 local classpath 793 local classpath
738 classpath="$(java-config --classpath=${target_pkg})" 794 classpath="$(java-config ${deep} --classpath=${target_pkg})"
739 [[ $? != 0 ]] && die ${error_msg} 795 [[ $? != 0 ]] && die ${error_msg}
740 796
741 local jar 797 local jar
742 for jar in ${classpath//:/ }; do 798 for jar in ${classpath//:/ }; do
743 local jar_name=$(basename "${jar}") 799 local jar_name=$(basename "${jar}")
804 if [[ "${1}" = "--build-only" ]]; then 860 if [[ "${1}" = "--build-only" ]]; then
805 local build_only="true" 861 local build_only="true"
806 shift 862 shift
807 fi 863 fi
808 864
865 if [[ "${1}" = "--with-dependencies" ]]; then
866 local deep="--with-dependencies"
867 shift
868 fi
869
809 [[ ${#} -ne 1 ]] && die "${FUNCNAME} takes only one argument besides --build-only" 870 [[ ${#} -ne 1 ]] && die "${FUNCNAME} takes only one argument besides --build-only"
810 871
811 local classpath pkgs="${1}" 872 local classpath pkgs="${1}"
812 jars="$(java-config --classpath=${pkgs})" 873 jars="$(java-config ${deep} --classpath=${pkgs})"
813 [[ -z "${jars}" ]] && die "java-config --classpath=${pkgs} failed" 874 [[ -z "${jars}" ]] && die "java-config --classpath=${pkgs} failed"
814 debug-print "${pkgs}:${jars}" 875 debug-print "${pkgs}:${jars}"
815 876
816 if [[ -z "${classpath}" ]]; then 877 if [[ -z "${classpath}" ]]; then
817 classpath="${jars}" 878 classpath="${jars}"
1009# 1070#
1010# export DEPEND="${DEPEND} ${depstr}" 1071# export DEPEND="${DEPEND} ${depstr}"
1011# export RDEPEND="${RDEPEND} ${depstr}" 1072# export RDEPEND="${RDEPEND} ${depstr}"
1012#} 1073#}
1013 1074
1075# ------------------------------------------------------------------------------
1076# @ebuild-function java-pkg_find-normal-jars
1077#
1078# Find the files with suffix .jar file in the given directory or $WORKDIR
1079#
1080# @param $1 - The directory to search for jar files (default: ${WORKDIR})
1081# ------------------------------------------------------------------------------
1082java-pkg_find-normal-jars() {
1083 local dir=$1
1084 [[ "${dir}" ]] || dir="${WORKDIR}"
1085 local found
1086 for jar in $(find "${dir}" -name "*.jar" -type f); do
1087 echo "${jar}"
1088 found="true"
1089 done
1090 [[ "${found}" ]]
1091 return $?
1092}
1093
1094# ------------------------------------------------------------------------------
1095# @ebuild-function java-pkg_ensure-no-bundled-jars
1096#
1097# Try to locate bundled jar files in ${WORKDIR} and die if found.
1014# This should be used after S has been populated with symlinks to jars 1098# This function should be called after WORKDIR has been populated with symlink
1015# TODO document 1099# to system jar files or bundled jars removed.
1100# ------------------------------------------------------------------------------
1016java-pkg_ensure-no-bundled-jars() { 1101java-pkg_ensure-no-bundled-jars() {
1017 debug-print-function ${FUNCNAME} $* 1102 debug-print-function ${FUNCNAME} $*
1018 pushd ${WORKDIR} >/dev/null 2>/dev/null
1019 1103
1020 local bundled_jars=$(find . -name "*.jar" -type f) 1104 local bundled_jars=$(java-pkg_find-normal-jars)
1021 if [[ -n ${bundled_jars} ]]; then 1105 if [[ -n ${bundled_jars} ]]; then
1022 echo "Bundled jars found:" 1106 echo "Bundled jars found:"
1023 local jar 1107 local jar
1024 for jar in ${bundled_jars}; do 1108 for jar in ${bundled_jars}; do
1025 echo $(pwd)${jar/./} 1109 echo $(pwd)${jar/./}
1026 done 1110 done
1027 die "Bundled jars found!" 1111 die "Bundled jars found!"
1028
1029 fi 1112 fi
1030 popd >/dev/null 2>/dev/null
1031} 1113}
1032 1114
1033# ------------------------------------------------------------------------------ 1115# ------------------------------------------------------------------------------
1034# @internal-function java-pkg_ensure-vm-version-sufficient 1116# @internal-function java-pkg_ensure-vm-version-sufficient
1035# 1117#
1297 die "Need USE=test enabled" 1379 die "Need USE=test enabled"
1298 fi 1380 fi
1299} 1381}
1300 1382
1301# ------------------------------------------------------------------------------ 1383# ------------------------------------------------------------------------------
1384# @ebuild-function java-pkg_register-ant-task
1385#
1386# Register this package as ant task, so that ant will load it when no specific
1387# ANT_TASKS are specified. Note that even without this registering, all packages
1388# specified in ANT_TASKS will be loaded. Mostly used by the actual ant tasks
1389# packages, but can be also used by other ebuilds that used to symlink their
1390# .jar into /usr/share/ant-core/lib to get autoloaded, for backwards
1391# compatibility.
1392#
1393# @param --version x.y Register only for ant version x.y (otherwise for any ant
1394# version). Used by the ant-* packages to prevent loading of mismatched
1395# ant-core ant tasks after core was updated, before the tasks are updated,
1396# without a need for blockers.
1397# @param $1 Name to register as. Defaults to JAVA_PKG_NAME ($PN[-$SLOT])
1398# ------------------------------------------------------------------------------
1399java-pkg_register-ant-task() {
1400 local TASKS_DIR="tasks"
1401
1402 # check for --version x.y parameters
1403 while [[ -n "${1}" && -n "${2}" ]]; do
1404 local var="${1#--}"
1405 local val="${2}"
1406 if [[ "${var}" == "version" ]]; then
1407 TASKS_DIR="tasks-${val}"
1408 else
1409 die "Unknown parameter passed to java-pkg_register-ant-tasks: ${1} ${2}"
1410 fi
1411 shift 2
1412 done
1413
1414 local TASK_NAME="${1:-${JAVA_PKG_NAME}}"
1415
1416 dodir /usr/share/ant/${TASKS_DIR}
1417 touch "${D}/usr/share/ant/${TASKS_DIR}/${TASK_NAME}"
1418}
1419
1420# ------------------------------------------------------------------------------
1421# @internal-function java-pkg_ant-tasks-from-deps
1422#
1423# Function to determine ANT_TASKS from DEPEND variable for backwards
1424# compatibility with ebuilds that don't set ANT_TASKS before calling eant() or
1425# WANT_ANT_TASKS before inheriting java-pkg-2. If the DEPEND string contains
1426# "dev-java/ant" or "dev-java/ant-tasks", then it returns "all", otherwise
1427# "none". It's not smart enough to cope with USE flag depends but that shouldn't
1428# be a problem, the worst it can do is activace all tasks when not needed.
1429# Note that this is called only with JAVA_PKG_STRICT=1, to find ebuilds with
1430# insufficient dependencies, otherwise all available tasks are used for
1431# backwards compatilbility.
1432#
1433# @return "all" or "none"
1434# ------------------------------------------------------------------------------
1435java-pkg_ant-tasks-from-deps() {
1436 local found_ant found_ant_tasks
1437
1438 for dep in ${DEPEND}
1439 do
1440 local ant="$(awk '/(dev-java\/ant)/ { if (match($1, "(dev-java/ant)((-[0-9])+|$)", m)) print m[1] }' <<< ${dep})"
1441 [[ "${ant}" == "dev-java/ant" ]] && found_ant=true
1442 [[ "${dep}" == *"ant-tasks"* ]] && found_ant_tasks=true
1443 done
1444
1445 if [[ -n "${found_ant}" || -n "${found_ant_tasks}" ]]; then
1446 java-pkg_announce-qa-violation "The ebuild DEPENDS on deprecated ant or ant-tasks"
1447 echo "all"
1448 else
1449 # ebuild doesn't set ANT_TASKS and doesn't depend on ant-tasks or ant
1450 # so we deactivate all tasks that may be installed
1451 echo "none"
1452 fi
1453}
1454
1455# ------------------------------------------------------------------------------
1456# @internal-function java-pkg_ant-tasks-depend
1457#
1458# Translates the WANT_ANT_TASKS variable into valid dependencies.
1459# ------------------------------------------------------------------------------
1460java-pkg_ant-tasks-depend() {
1461 debug-print-function ${FUNCNAME} ${WANT_ANT_TASKS}
1462
1463 if [[ -n "${WANT_ANT_TASKS}" ]]; then
1464 local DEP=""
1465 for i in ${WANT_ANT_TASKS}
1466 do
1467 if [[ ${i} != ant-* ]]; then
1468 echo "Invalid atom in WANT_ANT_TASKS: ${i}"
1469 return 1
1470 fi
1471 DEP="${DEP}dev-java/${i} "
1472 done
1473 echo ${DEP}
1474 return 0
1475 else
1476 return 0
1477 fi
1478}
1479
1480# ------------------------------------------------------------------------------
1302# @section-end helper 1481# @section-end helper
1303# ------------------------------------------------------------------------------ 1482# ------------------------------------------------------------------------------
1304 1483
1305# ------------------------------------------------------------------------------ 1484# ------------------------------------------------------------------------------
1306# @section-begin build 1485# @section-begin build
1312 1491
1313# ------------------------------------------------------------------------------ 1492# ------------------------------------------------------------------------------
1314# @ebuild-function eant 1493# @ebuild-function eant
1315# 1494#
1316# Ant wrapper function. Will use the appropriate compiler, based on user-defined 1495# Ant wrapper function. Will use the appropriate compiler, based on user-defined
1317# compiler. 1496# compiler. Will also set proper ANT_TASKS from the variable ANT_TASKS,
1318# 1497# variables:
1498# EANT_GENTOO_CLASSPATH - calls java-pkg_getjars for the value and adds to the
1499# gentoo.classpath property. Be sure to call
1500# java-ant_rewrite-classpath in src_unpack.
1501# *ANT_TASKS - used to determine ANT_TASKS before calling Ant.
1319# ------------------------------------------------------------------------------ 1502# ------------------------------------------------------------------------------
1320eant() { 1503eant() {
1321 debug-print-function ${FUNCNAME} $* 1504 debug-print-function ${FUNCNAME} $*
1322 1505
1323 # FIXME get this working 1506 # FIXME get this working
1352 if is-java-strict; then 1535 if is-java-strict; then
1353 einfo "Disabling system classpath for ant" 1536 einfo "Disabling system classpath for ant"
1354 antflags="${antflags} -Dbuild.sysclasspath=ignore" 1537 antflags="${antflags} -Dbuild.sysclasspath=ignore"
1355 fi 1538 fi
1356 1539
1357 if [[ -n ${JAVA_PKG_DEBUG} ]]; then 1540 if has_version ">=dev-java/ant-core-1.7.0"; then
1358 antflags="${antflags} -debug" 1541 # default ANT_TASKS to WANT_ANT_TASKS, if ANT_TASKS is not set explicitly
1542 ANT_TASKS="${ANT_TASKS:-${WANT_ANT_TASKS}}"
1543
1544 # override ANT_TASKS with JAVA_PKG_FORCE_ANT_TASKS if it's set
1545 ANT_TASKS="${JAVA_PKG_FORCE_ANT_TASKS:-${ANT_TASKS}}"
1546
1547 if is-java-strict; then
1548 # if ant-tasks were not set by ebuild or forced, try to determine them from depends
1549 if [[ -z "${ANT_TASKS}" ]]; then
1550 ANT_TASKS="$(java-pkg_ant-tasks-from-deps)"
1551 fi
1552 else
1553 # if ant-tasks is not set by ebuild or forced, activate all of them
1554 ANT_TASKS="${ANT_TASKS:-all}"
1555 fi
1556
1557 # at this point, ANT_TASKS should be "all", "none" or explicit list
1558 if [[ "${ANT_TASKS}" == "all" ]]; then
1559 einfo "Using all available ANT_TASKS"
1560 elif [[ "${ANT_TASKS}" == "none" ]]; then
1561 einfo "Disabling all optional ANT_TASKS"
1562 else
1563 einfo "Using following ANT_TASKS: ${ANT_TASKS}"
1564 fi
1565
1566 export ANT_TASKS
1567 fi
1568
1569 [[ -n ${JAVA_PKG_DEBUG} ]] && antflags="${antflags} --execdebug -debug"
1570 [[ -n ${PORTAGE_QUIET} ]] && antflags="${antflags} -q"
1571
1572 local gcp="${EANT_GENTOO_CLASSPATH}"
1573
1574 if [[ "${gcp}" ]]; then
1575 local cp="$(java-pkg_getjars ${gcp})"
1576 # It seems ant does not like single quotes around ${cp}
1577 antflags="${antflags} -Dgentoo.classpath=\"${cp}\""
1359 fi 1578 fi
1360 1579
1361 [[ -n ${JAVA_PKG_DEBUG} ]] && echo ant ${antflags} "${@}" 1580 [[ -n ${JAVA_PKG_DEBUG} ]] && echo ant ${antflags} "${@}"
1581 debug-print "Calling ant: ${antflags} ${@}"
1362 ant ${antflags} "${@}" || die "eant failed" 1582 ant ${antflags} "${@}" || die "eant failed"
1363 1583
1364} 1584}
1365 1585
1366# ------------------------------------------------------------------------------ 1586# ------------------------------------------------------------------------------
1479 # When users have crazy classpaths some packages can fail to compile. 1699 # When users have crazy classpaths some packages can fail to compile.
1480 # and everything should work with empty CLASSPATH. 1700 # and everything should work with empty CLASSPATH.
1481 # This also helps prevent unexpected dependencies on random things 1701 # This also helps prevent unexpected dependencies on random things
1482 # from the CLASSPATH. 1702 # from the CLASSPATH.
1483 unset CLASSPATH 1703 unset CLASSPATH
1704
1705 # Unset external ANT_ stuff
1706 unset ANT_TASKS
1707 unset ANT_OPTS
1484} 1708}
1485 1709
1486# ------------------------------------------------------------------------------ 1710# ------------------------------------------------------------------------------
1487# @function-internal java-pkg-init-compiler_ 1711# @function-internal java-pkg-init-compiler_
1488# 1712#

Legend:
Removed from v.1.38  
changed lines
  Added in v.1.46

  ViewVC Help
Powered by ViewVC 1.1.20