summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPetteri Räty <betelgeuse@gentoo.org>2008-10-01 15:23:17 +0000
committerPetteri Räty <betelgeuse@gentoo.org>2008-10-01 15:23:17 +0000
commit2d4b8724a18bb08c530fa10b84ba869749ef67f8 (patch)
treee1fa25cc96948d0d0523303b622595fee6229a82 /eclass/java-ant-2.eclass
parentAdd ~sparc keyword for testing. (diff)
downloadgentoo-2-2d4b8724a18bb08c530fa10b84ba869749ef67f8.tar.gz
gentoo-2-2d4b8724a18bb08c530fa10b84ba869749ef67f8.tar.bz2
gentoo-2-2d4b8724a18bb08c530fa10b84ba869749ef67f8.zip
Move build.xml rewriting from eant to java-ant-2_src_configure and bundled jar checking to java-utils-2_src_prepare.
Diffstat (limited to 'eclass/java-ant-2.eclass')
-rw-r--r--eclass/java-ant-2.eclass20
1 files changed, 19 insertions, 1 deletions
diff --git a/eclass/java-ant-2.eclass b/eclass/java-ant-2.eclass
index a04e2a9db410..28272c3f07ca 100644
--- a/eclass/java-ant-2.eclass
+++ b/eclass/java-ant-2.eclass
@@ -14,7 +14,7 @@
#
# Licensed under the GNU General Public License, v2
#
-# $Header: /var/cvsroot/gentoo-x86/eclass/java-ant-2.eclass,v 1.39 2008/09/28 15:47:48 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/java-ant-2.eclass,v 1.40 2008/10/01 15:23:17 betelgeuse Exp $
inherit java-utils-2
@@ -128,6 +128,24 @@ JAVA_ANT_CLASSPATH_TAGS="javac xjavac"
# default: off
# ------------------------------------------------------------------------------
+[[ "${EAPI}" == "2" ]] && EXPORT_FUNCTIONS src_configure
+
+# ------------------------------------------------------------------------------
+# @eclass-src_configure
+#
+# src_configure rewrites the build.xml files
+# ------------------------------------------------------------------------------
+java-ant-2_src_configure() {
+ # eant will call us unless called by Portage
+ [[ -e "${T}/java-ant-2_src_configure-run" ]] && return
+
+ [[ "${JAVA_ANT_IGNORE_SYSTEM_CLASSES}" ]] \
+ && java-ant_ignore-system-classes "${S}/build.xml"
+
+ java-ant_bsfix
+ touch "${T}/java-ant-2_src_configure-run"
+}
+
# ------------------------------------------------------------------------------
# @private java-ant_bsfix
#