| 1 |
betelgeuse 09/09/02 21:41:30 |
| 2 |
|
| 3 |
Modified: java-pkg-2.eclass |
| 4 |
Log: |
| 5 |
add java-pkg-2_src_test but don't export it so it can be used but doesn't break things that haven't been made to work with it |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.34 eclass/java-pkg-2.eclass |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/java-pkg-2.eclass?rev=1.34&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/java-pkg-2.eclass?rev=1.34&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/java-pkg-2.eclass?r1=1.33&r2=1.34 |
| 13 |
|
| 14 |
Index: java-pkg-2.eclass |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/java-pkg-2.eclass,v |
| 17 |
retrieving revision 1.33 |
| 18 |
retrieving revision 1.34 |
| 19 |
diff -u -r1.33 -r1.34 |
| 20 |
--- java-pkg-2.eclass 19 Feb 2009 05:10:37 -0000 1.33 |
| 21 |
+++ java-pkg-2.eclass 2 Sep 2009 21:41:29 -0000 1.34 |
| 22 |
@@ -5,7 +5,7 @@ |
| 23 |
# |
| 24 |
# Licensed under the GNU General Public License, v2 |
| 25 |
# |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/java-pkg-2.eclass,v 1.33 2009/02/19 05:10:37 serkan Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/java-pkg-2.eclass,v 1.34 2009/09/02 21:41:29 betelgeuse Exp $ |
| 28 |
|
| 29 |
inherit java-utils-2 |
| 30 |
|
| 31 |
@@ -103,6 +103,61 @@ |
| 32 |
fi |
| 33 |
} |
| 34 |
|
| 35 |
+java-pkg-2_supports-test() { |
| 36 |
+ python << EOF |
| 37 |
+from xml.dom.minidom import parse |
| 38 |
+import sys |
| 39 |
+dom = parse("${1}") |
| 40 |
+for elem in dom.getElementsByTagName('target'): |
| 41 |
+ if elem.getAttribute('name') == 'test': |
| 42 |
+ sys.exit(0) |
| 43 |
+sys.exit(1) |
| 44 |
+EOF |
| 45 |
+ return $? |
| 46 |
+} |
| 47 |
+ |
| 48 |
+java-pkg-2_src_test() { |
| 49 |
+ [[ -e "${EANT_BUILD_XML:=build.xml}" ]] || return |
| 50 |
+ |
| 51 |
+ if [[ ${EANT_TEST_TARGET} ]] || java-pkg-2_supports-test ${EANT_BUILD_XML}; then |
| 52 |
+ local opts task |
| 53 |
+ |
| 54 |
+ if [[ ${EANT_TEST_JUNIT_INTO} ]]; then |
| 55 |
+ java-pkg_jar-from --into "${EANT_TEST_JUNIT_INTO}" junit |
| 56 |
+ fi |
| 57 |
+ |
| 58 |
+ ANT_TASKS=${EANT_TEST_ANT_TASKS:-${ANT_TASKS:-${EANT_ANT_TASKS}}} |
| 59 |
+ |
| 60 |
+ if [[ ${DEPEND} = *dev-java/ant-junit* ]]; then |
| 61 |
+ |
| 62 |
+ if [[ ${ANT_TASKS} && "${ANT_TASKS}" != none ]]; then |
| 63 |
+ ANT_TASKS="${ANT_TASKS} ant-junit" |
| 64 |
+ else |
| 65 |
+ ANT_TASKS="ant-junit" |
| 66 |
+ fi |
| 67 |
+ |
| 68 |
+ task=true |
| 69 |
+ fi |
| 70 |
+ |
| 71 |
+ if [[ ${task} ]] || [[ ${DEPEND} = *dev-java/junit* ]]; then |
| 72 |
+ opts="-Djunit.jar=\"$(java-pkg_getjar junit junit.jar)\"" |
| 73 |
+ if [[ ${EANT_TEST_GENTOO_CLASSPATH} ]]; then |
| 74 |
+ EANT_GENTOO_CLASSPATH="${EANT_TEST_GENTOO_CLASSPATH},junit" |
| 75 |
+ elif [[ ${EANT_GENTOO_CLASSPATH} ]]; then |
| 76 |
+ EANT_GENTOO_CLASSPATH+=',junit' |
| 77 |
+ else |
| 78 |
+ EANT_GENTOO_CLASSPATH=junit |
| 79 |
+ fi |
| 80 |
+ fi |
| 81 |
+ |
| 82 |
+ eant ${opts} -f "${EANT_BUILD_XML}" \ |
| 83 |
+ ${EANT_EXTRA_ARGS} ${EANT_TEST_EXTRA_ARGS} ${EANT_TEST_TARGET:-test} |
| 84 |
+ |
| 85 |
+ else |
| 86 |
+ echo "${FUNCNAME}: No test target in ${EANT_BUILD_XML}" |
| 87 |
+ fi |
| 88 |
+} |
| 89 |
+ |
| 90 |
# ------------------------------------------------------------------------------ |
| 91 |
# @eclass-pkg_preinst |
| 92 |
# |
Archives