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

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

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

Revision 1.42 Revision 1.43
12# and xml-rewrite.py because they were so slow 12# and xml-rewrite.py because they were so slow
13# Petteri Räty (betelgeuse@gentoo.org) 13# Petteri Räty (betelgeuse@gentoo.org)
14# 14#
15# Licensed under the GNU General Public License, v2 15# Licensed under the GNU General Public License, v2
16# 16#
17# $Header: /var/cvsroot/gentoo-x86/eclass/java-ant-2.eclass,v 1.42 2008/10/05 16:53:38 betelgeuse Exp $ 17# $Header: /var/cvsroot/gentoo-x86/eclass/java-ant-2.eclass,v 1.43 2008/10/07 14:41:13 betelgeuse Exp $
18 18
19inherit java-utils-2 19inherit java-utils-2
20 20
21# This eclass provides functionality for Java packages which use 21# This eclass provides functionality for Java packages which use
22# ant to build. In particular, it will attempt to fix build.xml files, so that 22# ant to build. In particular, it will attempt to fix build.xml files, so that
49# check that java-pkg_ant-tasks-depend didn't fail 49# check that java-pkg_ant-tasks-depend didn't fail
50if [[ $? != 0 ]]; then 50if [[ $? != 0 ]]; then
51 eerror "${ANT_TASKS_DEPEND}" 51 eerror "${ANT_TASKS_DEPEND}"
52 die "java-pkg_ant-tasks-depend() failed" 52 die "java-pkg_ant-tasks-depend() failed"
53fi 53fi
54
55# We need some tools from javatoolkit. We also need portage 2.1 for phase hooks
56# and ant dependencies constructed above.
54JAVA_ANT_E_DEPEND="${JAVA_ANT_E_DEPEND} ${ANT_TASKS_DEPEND}" 57JAVA_ANT_E_DEPEND="${JAVA_ANT_E_DEPEND}
58 ${ANT_TASKS_DEPEND}
59 ${JAVA_PKG_PORTAGE_DEP}
60 >=dev-java/javatoolkit-0.3.0-r2"
55 61
56# this eclass must be inherited after java-pkg-2 or java-pkg-opt-2 62# this eclass must be inherited after java-pkg-2 or java-pkg-opt-2
57# if it's java-pkg-opt-2, ant dependencies are pulled based on USE flag 63# if it's java-pkg-opt-2, ant dependencies are pulled based on USE flag
58if hasq java-pkg-opt-2 ${INHERITED}; then 64if hasq java-pkg-opt-2 ${INHERITED}; then
59 JAVA_ANT_E_DEPEND="${JAVA_PKG_OPT_USE}? ( ${JAVA_ANT_E_DEPEND} )" 65 JAVA_ANT_E_DEPEND="${JAVA_PKG_OPT_USE}? ( ${JAVA_ANT_E_DEPEND} )"
60elif ! hasq java-pkg-2 ${INHERITED}; then 66elif ! hasq java-pkg-2 ${INHERITED}; then
61 eerror "java-ant-2 eclass can only be inherited AFTER java-pkg-2 or java-pkg-opt-2" 67 eerror "java-ant-2 eclass can only be inherited AFTER java-pkg-2 or java-pkg-opt-2"
62fi 68fi
63 69
64# We need some tools from javatoolkit. We also need portage 2.1 for phase hooks 70DEPEND="${JAVA_ANT_E_DEPEND}"
65# and ant dependencies constructed above
66DEPEND=">=dev-java/javatoolkit-0.3.0-r2 ${JAVA_PKG_PORTAGE_DEP} ${JAVA_ANT_E_DEPEND}"
67 71
68# ------------------------------------------------------------------------------ 72# ------------------------------------------------------------------------------
69# @global JAVA_PKG_BSFIX 73# @global JAVA_PKG_BSFIX
70# 74#
71# Should we attempt to 'fix' ant build files to include the source/target 75# Should we attempt to 'fix' ant build files to include the source/target

Legend:
Removed from v.1.42  
changed lines
  Added in v.1.43

  ViewVC Help
Powered by ViewVC 1.1.20