/[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.51 Revision 1.52
… …
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.51 2007/01/28 20:04:59 betelgeuse Exp $ 9# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.52 2007/01/28 20:58:29 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
… …
1540# java-pkg_announce-qa-violation \ 1540# java-pkg_announce-qa-violation \
1541# "Using eant, but not depending on dev-java/ant or dev-java/ant-core" 1541# "Using eant, but not depending on dev-java/ant or dev-java/ant-core"
1542# fi 1542# fi
1543 1543
1544 if ! hasq java-ant-2 ${INHERITED} && is-java-strict; then 1544 if ! hasq java-ant-2 ${INHERITED} && is-java-strict; then
1545 msg="You should inherit java-ant-2 when using eant" 1545 local msg="You should inherit java-ant-2 when using eant"
1546 java-pkg_announce-qa-violation ${msg} 1546 java-pkg_announce-qa-violation ${msg}
1547 die ${msg} 1547 die ${msg}
1548 fi 1548 fi
1549 1549
1550 local antflags="-Dnoget=true -Dmaven.mode.offline=true" 1550 local antflags="-Dnoget=true -Dmaven.mode.offline=true"
… …
1573 if is-java-strict; then 1573 if is-java-strict; then
1574 einfo "Disabling system classpath for ant" 1574 einfo "Disabling system classpath for ant"
1575 antflags="${antflags} -Dbuild.sysclasspath=ignore" 1575 antflags="${antflags} -Dbuild.sysclasspath=ignore"
1576 fi 1576 fi
1577 1577
1578 for arg in "${@}"; do
1579 if [[ ${arg} = -lib ]]; then
1580 if is-java-strict; then
1581 eerror "You should not use the -lib argument to eant because it will fail"
1582 eerror "with JAVA_PKG_STRICT. Please use for example java-pkg_jar-from or"
1583 eerror "or ant properties to make dependencies available."
1584 eerror "For ant tasks use WANT_ANT_TASKS or ANT_TASKS from."
1585 eerror "split ant (>=dev-java/ant-core-1.7)."
1586 die "eant -lib is deprecated/forbidden"
1587 else
1588 echo "eant -lib is deprecated. Turn JAVA_PKG_STRICT on for"
1589 echo "more info."
1590 fi
1591 fi
1592 done
1593
1578 if has_version ">=dev-java/ant-core-1.7.0"; then 1594 if has_version ">=dev-java/ant-core-1.7.0"; then
1579 # default ANT_TASKS to WANT_ANT_TASKS, if ANT_TASKS is not set explicitly 1595 # default ANT_TASKS to WANT_ANT_TASKS, if ANT_TASKS is not set explicitly
1580 ANT_TASKS="${ANT_TASKS:-${WANT_ANT_TASKS}}" 1596 ANT_TASKS="${ANT_TASKS:-${WANT_ANT_TASKS}}"
1581 1597
1582 # override ANT_TASKS with JAVA_PKG_FORCE_ANT_TASKS if it's set 1598 # override ANT_TASKS with JAVA_PKG_FORCE_ANT_TASKS if it's set
… …
1598 elif [[ "${ANT_TASKS}" == "none" ]]; then 1614 elif [[ "${ANT_TASKS}" == "none" ]]; then
1599 einfo "Disabling all optional ANT_TASKS" 1615 einfo "Disabling all optional ANT_TASKS"
1600 else 1616 else
1601 einfo "Using following ANT_TASKS: ${ANT_TASKS}" 1617 einfo "Using following ANT_TASKS: ${ANT_TASKS}"
1602 fi 1618 fi
1603 1619
1604 export ANT_TASKS 1620 export ANT_TASKS
1605 fi 1621 fi
1606 1622
1607 [[ -n ${JAVA_PKG_DEBUG} ]] && antflags="${antflags} --execdebug -debug" 1623 [[ -n ${JAVA_PKG_DEBUG} ]] && antflags="${antflags} --execdebug -debug"
1608 [[ -n ${PORTAGE_QUIET} ]] && antflags="${antflags} -q" 1624 [[ -n ${PORTAGE_QUIET} ]] && antflags="${antflags} -q"
Legend:
Removed from v.1.51  
changed lines
  Added in v.1.52
  ViewVC Help
Powered by ViewVC 1.1.20