chewi 15/06/17 09:48:12 Modified: ChangeLog java-pkg-2.eclass Log: Remove eclass dependency on python[xml] and replace with some ugly grep that should suffice. Closes #552332.
Revision Changes Path 1.1670 eclass/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1670&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1670&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1669&r2=1.1670 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v retrieving revision 1.1669 retrieving revision 1.1670 diff -u -r1.1669 -r1.1670 --- ChangeLog 16 Jun 2015 21:40:51 -0000 1.1669 +++ ChangeLog 17 Jun 2015 09:48:12 -0000 1.1670 @@ -1,6 +1,10 @@ # ChangeLog for eclass directory # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1669 2015/06/16 21:40:51 williamh Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1670 2015/06/17 09:48:12 chewi Exp $ + + 17 Jun 2015; James Le Cuirot <[email protected]> java-pkg-2.eclass: + Remove eclass dependency on python[xml] and replace with some ugly grep that + should suffice. Closes #552332. 16 Jun 2015; William Hubbs <[email protected]> +golang-vcs.eclass: Add golang-vcs.eclass to retrieve go packages from vcs repositories 1.41 eclass/java-pkg-2.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-pkg-2.eclass?rev=1.41&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-pkg-2.eclass?rev=1.41&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-pkg-2.eclass?r1=1.40&r2=1.41 Index: java-pkg-2.eclass =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/java-pkg-2.eclass,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- java-pkg-2.eclass 28 Apr 2015 20:35:40 -0000 1.40 +++ java-pkg-2.eclass 17 Jun 2015 09:48:12 -0000 1.41 @@ -5,7 +5,7 @@ # # Licensed under the GNU General Public License, v2 # -# $Header: /var/cvsroot/gentoo-x86/eclass/java-pkg-2.eclass,v 1.40 2015/04/28 20:35:40 chewi Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/java-pkg-2.eclass,v 1.41 2015/06/17 09:48:12 chewi Exp $ # @ECLASS: java-pkg-2.eclass # @MAINTAINER: @@ -96,25 +96,6 @@ fi } - -# @FUNCTION: java-pkg-2_supports-test -# @INTERNAL -# @DESCRIPTION: -# test whether a build.xml has a test target. - -java-pkg-2_supports-test() { - python << EOF -from xml.dom.minidom import parse -import sys -dom = parse("${1}") -for elem in dom.getElementsByTagName('target'): - if elem.getAttribute('name') == 'test': - sys.exit(0) -sys.exit(1) -EOF - return $? -} - # @FUNCTION: java-pkg-2_src_test # @DESCRIPTION: # src_test, not exported. @@ -122,7 +103,7 @@ java-pkg-2_src_test() { [[ -e "${EANT_BUILD_XML:=build.xml}" ]] || return - if [[ ${EANT_TEST_TARGET} ]] || java-pkg-2_supports-test ${EANT_BUILD_XML}; then + if [[ ${EANT_TEST_TARGET} ]] || < "${EANT_BUILD_XML}" tr -d "\n" | grep -Eq "<target\b[^>]*\bname=[\"']test[\"']"; then local opts task_re junit_re pkg if [[ ${EANT_TEST_JUNIT_INTO} ]]; then
