Gentoo Archives: gentoo-commits

From: "Vlastimil Babka (caster)" <caster@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in eclass: java-utils-2.eclass
Date: Mon, 29 Dec 2008 00:16:42
Message-Id: E1LH5oG-0005Dw-Du@stork.gentoo.org
1 caster 08/12/29 00:16:40
2
3 Modified: java-utils-2.eclass
4 Log:
5 Add EANT_NEEDS_TOOLS variable for adding tools.jar to gentoo.classpath, bug #231673 by James Le Cuirot <chewi@××××××××××××××.uk>.
6
7 Revision Changes Path
8 1.120 eclass/java-utils-2.eclass
9
10 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/java-utils-2.eclass?rev=1.120&view=markup
11 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/java-utils-2.eclass?rev=1.120&content-type=text/plain
12 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/java-utils-2.eclass?r1=1.119&r2=1.120
13
14 Index: java-utils-2.eclass
15 ===================================================================
16 RCS file: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v
17 retrieving revision 1.119
18 retrieving revision 1.120
19 diff -u -r1.119 -r1.120
20 --- java-utils-2.eclass 20 Dec 2008 19:25:29 -0000 1.119
21 +++ java-utils-2.eclass 29 Dec 2008 00:16:40 -0000 1.120
22 @@ -6,7 +6,7 @@
23 #
24 # Licensed under the GNU General Public License, v2
25 #
26 -# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.119 2008/12/20 19:25:29 betelgeuse Exp $
27 +# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.120 2008/12/29 00:16:40 caster Exp $
28
29 # -----------------------------------------------------------------------------
30 # @eclass-begin
31 @@ -1838,6 +1838,9 @@
32 # EANT_GENTOO_CLASSPATH - calls java-pkg_getjars for the value and adds to the
33 # gentoo.classpath property. Be sure to call
34 # java-ant_rewrite-classpath in src_unpack.
35 +# EANT_NEEDS_TOOLS - add tools.jar to the gentoo.classpath. Should only be used
36 +# for build-time purposes, the dependency is not recorded to
37 +# package.env!
38 # JAVA_PKG_NO_BUNDLED_SEARCH - Don't search for bundled jars or class files
39 # *ANT_TASKS - used to determine ANT_TASKS before calling Ant.
40 # ------------------------------------------------------------------------------
41 @@ -1942,6 +1945,8 @@
42 cp="${cp}:$(java-pkg_getjars ${getjarsarg} ${atom})"
43 done
44
45 + [[ -n "${EANT_NEEDS_TOOLS}" ]] && cp="${cp}:$(java-config --tools)"
46 +
47 if [[ ${cp} ]]; then
48 # It seems ant does not like single quotes around ${cp}
49 cp=${cp#:}