* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog java-pkg-2.eclass
@ 2012-06-04 8:27 Ralph Sennhauser (sera)
0 siblings, 0 replies; 3+ messages in thread
From: Ralph Sennhauser (sera) @ 2012-06-04 8:27 UTC (permalink / raw
To: gentoo-commits
sera 12/06/04 08:27:42
Modified: ChangeLog java-pkg-2.eclass
Log:
No longer call java-pkg_ensure-test in java-pkg-2_pkg_setup as this is handled by all package managers. #278965
Revision Changes Path
1.285 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.285&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.285&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.284&r2=1.285
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.284
retrieving revision 1.285
diff -u -r1.284 -r1.285
--- ChangeLog 2 Jun 2012 19:16:31 -0000 1.284
+++ ChangeLog 4 Jun 2012 08:27:42 -0000 1.285
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.284 2012/06/02 19:16:31 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.285 2012/06/04 08:27:42 sera Exp $
+
+ 04 Jun 2012; Ralph Sennhauser <sera@gentoo.org> java-pkg-2.eclass:
+ No longer call java-pkg_ensure-test in java-pkg-2_pkg_setup as this is
+ handled by all package managers. #278965
02 Jun 2012; Zac Medico <zmedico@gentoo.org> common-lisp-common-2.eclass,
java-ant-2.eclass, common-lisp-common-3.eclass, common-lisp-common.eclass,
1.38 eclass/java-pkg-2.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-pkg-2.eclass?rev=1.38&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-pkg-2.eclass?rev=1.38&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-pkg-2.eclass?r1=1.37&r2=1.38
Index: java-pkg-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/java-pkg-2.eclass,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- java-pkg-2.eclass 27 Dec 2011 17:55:12 -0000 1.37
+++ java-pkg-2.eclass 4 Jun 2012 08:27:42 -0000 1.38
@@ -5,7 +5,7 @@
#
# Licensed under the GNU General Public License, v2
#
-# $Header: /var/cvsroot/gentoo-x86/eclass/java-pkg-2.eclass,v 1.37 2011/12/27 17:55:12 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/java-pkg-2.eclass,v 1.38 2012/06/04 08:27:42 sera Exp $
inherit java-utils-2
@@ -61,7 +61,6 @@
# ------------------------------------------------------------------------------
java-pkg-2_pkg_setup() {
java-pkg_init
- java-pkg_ensure-test
}
# ------------------------------------------------------------------------------
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog java-pkg-2.eclass
@ 2012-07-21 11:57 Ralph Sennhauser (sera)
0 siblings, 0 replies; 3+ messages in thread
From: Ralph Sennhauser (sera) @ 2012-07-21 11:57 UTC (permalink / raw
To: gentoo-commits
sera 12/07/21 11:57:30
Modified: ChangeLog java-pkg-2.eclass
Log:
Convert documentation to eclass-manpages.
Revision Changes Path
1.347 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.347&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.347&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.346&r2=1.347
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.346
retrieving revision 1.347
diff -u -r1.346 -r1.347
--- ChangeLog 19 Jul 2012 12:09:05 -0000 1.346
+++ ChangeLog 21 Jul 2012 11:57:30 -0000 1.347
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.346 2012/07/19 12:09:05 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.347 2012/07/21 11:57:30 sera Exp $
+
+ 21 Jul 2012; Ralph Sennhauser <sera@gentoo.org> java-pkg-2.eclass:
+ Convert documentation to eclass-manpages.
19 Jul 2012; Tomáš Chvátal <scarabeus@gentoo.org> mozlinguas.eclass:
Fix eclassdoc.
1.39 eclass/java-pkg-2.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-pkg-2.eclass?rev=1.39&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-pkg-2.eclass?rev=1.39&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-pkg-2.eclass?r1=1.38&r2=1.39
Index: java-pkg-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/java-pkg-2.eclass,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- java-pkg-2.eclass 4 Jun 2012 08:27:42 -0000 1.38
+++ java-pkg-2.eclass 21 Jul 2012 11:57:30 -0000 1.39
@@ -5,42 +5,33 @@
#
# Licensed under the GNU General Public License, v2
#
-# $Header: /var/cvsroot/gentoo-x86/eclass/java-pkg-2.eclass,v 1.38 2012/06/04 08:27:42 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/java-pkg-2.eclass,v 1.39 2012/07/21 11:57:30 sera Exp $
-inherit java-utils-2
-
-# -----------------------------------------------------------------------------
-# @eclass-begin
-# @eclass-summary Eclass for Java Packages
-#
+# @ECLASS: java-pkg-2.eclass
+# @MAINTAINER:
+# java@gentoo.org
+# @AUTHOR:
+# Thomas Matthijs <axxo@gentoo.org>
+# @BLURB: Eclass for Java Packages
+# @DESCRIPTION:
# This eclass should be inherited for pure Java packages, or by packages which
# need to use Java.
-# -----------------------------------------------------------------------------
-# ------------------------------------------------------------------------------
-# @IUSE
-#
+inherit java-utils-2
+
+# @ECLASS-VARIABLE: JAVA_PKG_IUSE
+# @DEFAULT_UNSET
+# @DESCRIPTION:
# Use JAVA_PKG_IUSE instead of IUSE for doc, source and examples so that
# the eclass can automatically add the needed dependencies for the java-pkg_do*
# functions.
-#
-# ------------------------------------------------------------------------------
IUSE="${JAVA_PKG_IUSE}"
-# ------------------------------------------------------------------------------
-# @depend
-#
# Java packages need java-config, and a fairly new release of Portage.
-#
# JAVA_PKG_E_DEPEND is defined in java-utils.eclass.
-# ------------------------------------------------------------------------------
DEPEND="${JAVA_PKG_E_DEPEND}"
-# ------------------------------------------------------------------------------
-# @rdepend
-#
# Nothing special for RDEPEND... just the same as DEPEND.
-# ------------------------------------------------------------------------------
RDEPEND="${DEPEND}"
# Commons packages follow the same rules so do it here
@@ -54,39 +45,40 @@
*) EXPORT_FUNCTIONS pkg_setup src_prepare src_compile pkg_preinst ;;
esac
-# ------------------------------------------------------------------------------
-# @eclass-pkg_setup
-#
+# @FUNCTION: java-pkg-2_pkg_setup
+# @DESCRIPTION:
# pkg_setup initializes the Java environment
-# ------------------------------------------------------------------------------
+
java-pkg-2_pkg_setup() {
java-pkg_init
}
-# ------------------------------------------------------------------------------
-# @eclass-src_prepare
-#
+
+# @FUNCTION: java-pkg-2_src_prepare
+# @DESCRIPTION:
# wrapper for java-utils-2_src_prepare
-# ------------------------------------------------------------------------------
+
java-pkg-2_src_prepare() {
java-utils-2_src_prepare
}
-# ------------------------------------------------------------------------------
-# @eclass-src_compile
-#
+
+# @FUNCTION: java-pkg-2_src_compile
+# @DESCRIPTION:
# Default src_compile for java packages
-# variables:
-# EANT_BUILD_XML - controls the location of the build.xml (default: ./build.xml)
-# EANT_FILTER_COMPILER - Calls java-pkg_filter-compiler with the value
-# EANT_BUILD_TARGET - the ant target/targets to execute (default: jar)
-# EANT_DOC_TARGET - the target to build extra docs under the doc use flag
-# (default: javadoc; declare empty to disable completely)
-# EANT_GENTOO_CLASSPATH - @see eant documention in java-utils-2.eclass
-# EANT_EXTRA_ARGS - extra arguments to pass to eant
-# EANT_ANT_TASKS - modifies the ANT_TASKS variable in the eant environment
-# param: Parameters are passed to ant verbatim
-# ------------------------------------------------------------------------------
+#
+# @CODE
+# Variables:
+# EANT_BUILD_XML - controls the location of the build.xml (default: ./build.xml)
+# EANT_FILTER_COMPILER - Calls java-pkg_filter-compiler with the value
+# EANT_BUILD_TARGET - the ant target/targets to execute (default: jar)
+# EANT_DOC_TARGET - the target to build extra docs under the doc use flag
+# (default: javadoc; declare empty to disable completely)
+# EANT_GENTOO_CLASSPATH - @see eant documention in java-utils-2.eclass
+# EANT_EXTRA_ARGS - extra arguments to pass to eant
+# EANT_ANT_TASKS - modifies the ANT_TASKS variable in the eant environment
+# @CODE
+
java-pkg-2_src_compile() {
if [[ -e "${EANT_BUILD_XML:=build.xml}" ]]; then
[[ "${EANT_FILTER_COMPILER}" ]] && \
@@ -104,6 +96,12 @@
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
@@ -117,6 +115,10 @@
return $?
}
+# @FUNCTION: java-pkg-2_src_test
+# @DESCRIPTION:
+# src_test, not exported.
+
java-pkg-2_src_test() {
[[ -e "${EANT_BUILD_XML:=build.xml}" ]] || return
@@ -159,15 +161,10 @@
fi
}
-# ------------------------------------------------------------------------------
-# @eclass-pkg_preinst
-#
+# @FUNCTION: java-pkg-2_pkg_preinst
+# @DESCRIPTION:
# wrapper for java-utils-2_pkg_preinst
-# ------------------------------------------------------------------------------
+
java-pkg-2_pkg_preinst() {
java-utils-2_pkg_preinst
}
-
-# ------------------------------------------------------------------------------
-# @eclass-end
-# ------------------------------------------------------------------------------
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog java-pkg-2.eclass
@ 2015-06-17 9:48 James Le Cuirot (chewi)
0 siblings, 0 replies; 3+ messages in thread
From: James Le Cuirot (chewi) @ 2015-06-17 9:48 UTC (permalink / raw
To: gentoo-commits
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 <chewi@gentoo.org> 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 <williamh@gentoo.org> +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
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-06-17 9:48 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-07-21 11:57 [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog java-pkg-2.eclass Ralph Sennhauser (sera)
-- strict thread matches above, loose matches on Subject: below --
2015-06-17 9:48 James Le Cuirot (chewi)
2012-06-04 8:27 Ralph Sennhauser (sera)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox