/[gentoo-x86]/eclass/java-utils-2.eclass
Gentoo

Diff of /eclass/java-utils-2.eclass

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 1.163 Revision 1.164
4# Copyright (c) 2004, Karl Trygve Kalleberg <karltk@gentoo.org> 4# Copyright (c) 2004, Karl Trygve Kalleberg <karltk@gentoo.org>
5# Copyright (c) 2004-2015, Gentoo Foundation 5# Copyright (c) 2004-2015, Gentoo Foundation
6# 6#
7# Licensed under the GNU General Public License, v2 7# Licensed under the GNU General Public License, v2
8# 8#
9# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.163 2015/06/15 21:09:06 chewi Exp $ 9# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.164 2015/06/19 14:11:24 chewi Exp $
10 10
11# @ECLASS: java-utils-2.eclass 11# @ECLASS: java-utils-2.eclass
12# @MAINTAINER: 12# @MAINTAINER:
13# java@gentoo.org 13# java@gentoo.org
14# @AUTHOR: 14# @AUTHOR:
1932 fi 1932 fi
1933 1933
1934 local cp 1934 local cp
1935 1935
1936 for atom in ${gcp}; do 1936 for atom in ${gcp}; do
1937 cp="${cp}:$(java-pkg_getjars ${getjarsarg} ${atom})" 1937 cp+=":$(java-pkg_getjars ${getjarsarg} ${atom})"
1938 done 1938 done
1939 1939
1940 [[ -n "${EANT_NEEDS_TOOLS}" ]] && cp="${cp}:$(java-config --tools)" 1940 [[ ${EANT_NEEDS_TOOLS} ]] && cp+=":$(java-config --tools)"
1941 [[ ${EANT_GENTOO_CLASSPATH_EXTRA} ]] && cp+=":${EANT_GENTOO_CLASSPATH_EXTRA}"
1941 1942
1942 if [[ ${cp} ]]; then 1943 if [[ ${cp#:} ]]; then
1943 # It seems ant does not like single quotes around ${cp} 1944 # It seems ant does not like single quotes around ${cp}
1944 cp=${cp#:}
1945 [[ ${EANT_GENTOO_CLASSPATH_EXTRA} ]] && \
1946 cp="${cp}:${EANT_GENTOO_CLASSPATH_EXTRA}"
1947 antflags="${antflags} -Dgentoo.classpath=\"${cp}\"" 1945 antflags="${antflags} -Dgentoo.classpath=\"${cp#:}\""
1948 fi 1946 fi
1949 1947
1950 [[ -n ${JAVA_PKG_DEBUG} ]] && echo ant ${antflags} "${@}" 1948 [[ -n ${JAVA_PKG_DEBUG} ]] && echo ant ${antflags} "${@}"
1951 debug-print "Calling ant (GENTOO_VM: ${GENTOO_VM}): ${antflags} ${@}" 1949 debug-print "Calling ant (GENTOO_VM: ${GENTOO_VM}): ${antflags} ${@}"
1952 ant ${antflags} "${@}" || die "eant failed" 1950 ant ${antflags} "${@}" || die "eant failed"

Legend:
Removed from v.1.163  
changed lines
  Added in v.1.164

  ViewVC Help
Powered by ViewVC 1.1.20