summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPetteri Räty <betelgeuse@gentoo.org>2008-03-05 19:30:29 +0000
committerPetteri Räty <betelgeuse@gentoo.org>2008-03-05 19:30:29 +0000
commit6b3fbf4e603bfdc2b1ca5c13f72d23c24979de49 (patch)
treec7dfa9836bef5f45b999056e4401a721574e972b /eclass/java-ant-2.eclass
parentalpha/ia64/sparc stable wrt #209677 (diff)
downloadhistorical-6b3fbf4e603bfdc2b1ca5c13f72d23c24979de49.tar.gz
historical-6b3fbf4e603bfdc2b1ca5c13f72d23c24979de49.tar.bz2
historical-6b3fbf4e603bfdc2b1ca5c13f72d23c24979de49.zip
Add support for JAVA_ANT_CLASSPATH_TAGS.
Diffstat (limited to 'eclass/java-ant-2.eclass')
-rw-r--r--eclass/java-ant-2.eclass16
1 files changed, 14 insertions, 2 deletions
diff --git a/eclass/java-ant-2.eclass b/eclass/java-ant-2.eclass
index e12b4fd34e80..079f9e972180 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.29 2008/02/13 19:44:15 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/java-ant-2.eclass,v 1.30 2008/03/05 19:30:29 betelgeuse Exp $
inherit java-utils-2
@@ -112,6 +112,15 @@ JAVA_PKG_BSFIX_TARGET_TAGS=${JAVA_PKG_BSFIX_TARGET_TAGS:-"javac xjavac javac.pre
JAVA_PKG_BSFIX_SOURCE_TAGS=${JAVA_PKG_BSFIX_SOURCE_TAGS:-"javadoc javac xjavac javac.preset"}
# ------------------------------------------------------------------------------
+# @global JAVA_ANT_CLASSPATH_TAGS
+#
+# Targets to add the classpath attribute to
+#
+# default: javac xjavac
+# ------------------------------------------------------------------------------
+JAVA_ANT_CLASSPATH_TAGS="javac xjavac"
+
+# ------------------------------------------------------------------------------
# @global JAVA_ANT_IGNORE_SYSTEM_CLASSES
#
# Rewrites available tasks to ignore ant classpath.
@@ -344,6 +353,8 @@ java-ant_bsfix_one() {
# @public java-ant_rewrite-classpath
#
# Adds 'classpath="${gentoo.classpath}"' to specified build file.
+# Affected by:
+# JAVA_ANT_CLASSPATH_TAGS
# @param $1 - the file to rewrite (defaults to build.xml)
# ------------------------------------------------------------------------------
java-ant_rewrite-classpath() {
@@ -360,7 +371,8 @@ java-ant_rewrite-classpath() {
chmod u+w "${file}"
- java-ant_xml-rewrite -f "${file}" --change -e javac -e xjavac -a classpath -v '${gentoo.classpath}'
+ java-ant_xml-rewrite -f "${file}" --change \
+ -e ${JAVA_ANT_CLASSPATH_TAGS// / -e } -a classpath -v '${gentoo.classpath}'
if [[ -n "${JAVA_PKG_DEBUG}" ]]; then
diff -NurbB "${file}.orig" "${file}"