Gentoo Archives: gentoo-commits

From: "Petteri Raty (betelgeuse)" <betelgeuse@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in eclass: java-utils-2.eclass
Date: Tue, 22 Jul 2008 21:27:26
Message-Id: E1KLPOF-0007BI-Us@stork.gentoo.org
1 betelgeuse 08/07/22 21:27:23
2
3 Modified: java-utils-2.eclass
4 Log:
5 Add support for EANT_GENTOO_CLASSPATH_EXTRA.
6
7 Revision Changes Path
8 1.112 eclass/java-utils-2.eclass
9
10 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/java-utils-2.eclass?rev=1.112&view=markup
11 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/java-utils-2.eclass?rev=1.112&content-type=text/plain
12 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/java-utils-2.eclass?r1=1.111&r2=1.112
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.111
18 retrieving revision 1.112
19 diff -u -r1.111 -r1.112
20 --- java-utils-2.eclass 19 Jul 2008 09:24:47 -0000 1.111
21 +++ java-utils-2.eclass 22 Jul 2008 21:27:23 -0000 1.112
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.111 2008/07/19 09:24:47 tove Exp $
27 +# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.112 2008/07/22 21:27:23 betelgeuse Exp $
28
29 # -----------------------------------------------------------------------------
30 # @eclass-begin
31 @@ -1944,7 +1944,10 @@
32
33 if [[ ${cp} ]]; then
34 # It seems ant does not like single quotes around ${cp}
35 - antflags="${antflags} -Dgentoo.classpath=\"${cp#:}\""
36 + cp=${cp#:}
37 + [[ ${EANT_GENTOO_CLASSPATH_EXTRA} ]] && \
38 + cp="${cp}:${EANT_GENTOO_CLASSPATH_EXTRA}"
39 + antflags="${antflags} -Dgentoo.classpath=\"${cp}\""
40 fi
41
42 [[ -n ${JAVA_PKG_DEBUG} ]] && echo ant ${antflags} "${@}"