| 1 |
betelgeuse 08/05/03 21:28:07 |
| 2 |
|
| 3 |
Modified: java-utils-2.eclass |
| 4 |
Log: |
| 5 |
Fix ejunit to work when the package has no dependencies and getjars to work with VM provided virtuals. |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.106 eclass/java-utils-2.eclass |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/java-utils-2.eclass?rev=1.106&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/java-utils-2.eclass?rev=1.106&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/java-utils-2.eclass?r1=1.105&r2=1.106 |
| 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.105 |
| 18 |
retrieving revision 1.106 |
| 19 |
diff -u -r1.105 -r1.106 |
| 20 |
--- java-utils-2.eclass 26 Mar 2008 23:00:23 -0000 1.105 |
| 21 |
+++ java-utils-2.eclass 3 May 2008 21:28:07 -0000 1.106 |
| 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.105 2008/03/26 23:00:23 ali_bush Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.106 2008/05/03 21:28:07 betelgeuse Exp $ |
| 28 |
|
| 29 |
# ----------------------------------------------------------------------------- |
| 30 |
# @eclass-begin |
| 31 |
@@ -614,6 +614,7 @@ |
| 32 |
dosym ${dest}/api "${JAVA_PKG_SHAREPATH}/api" || die |
| 33 |
|
| 34 |
if [[ ${symlink} ]]; then |
| 35 |
+ debug-print "symlinking ${dest}/{api,${symlink}}" |
| 36 |
dosym ${dest}/{api,${symlink}} || die |
| 37 |
fi |
| 38 |
} |
| 39 |
@@ -1022,26 +1023,20 @@ |
| 40 |
[[ ${#} -ne 1 ]] && die "${FUNCNAME} takes only one argument besides --*" |
| 41 |
|
| 42 |
|
| 43 |
- local classpath pkgs="${1}" |
| 44 |
+ local pkgs="${1}" |
| 45 |
|
| 46 |
if [[ "${EAPI}" == "1" ]]; then |
| 47 |
pkgs="${pkgs//:/-}" |
| 48 |
fi |
| 49 |
|
| 50 |
jars="$(java-config ${deep} --classpath=${pkgs})" |
| 51 |
- [[ $? != 0 || -z "${jars}" ]] && die "java-config --classpath=${pkgs} failed" |
| 52 |
+ [[ $? != 0 ]] && die "java-config --classpath=${pkgs} failed" |
| 53 |
debug-print "${pkgs}:${jars}" |
| 54 |
|
| 55 |
for pkg in ${pkgs//,/ }; do |
| 56 |
java-pkg_ensure-dep "${build_only}" "${pkg}" |
| 57 |
done |
| 58 |
|
| 59 |
- if [[ -z "${classpath}" ]]; then |
| 60 |
- classpath="${jars}" |
| 61 |
- else |
| 62 |
- classpath="${classpath}:${jars}" |
| 63 |
- fi |
| 64 |
- |
| 65 |
# Only record jars that aren't build-only |
| 66 |
if [[ -z "${build_only}" ]]; then |
| 67 |
for pkg in ${pkgs//,/ }; do |
| 68 |
@@ -1049,7 +1044,7 @@ |
| 69 |
done |
| 70 |
fi |
| 71 |
|
| 72 |
- echo "${classpath}" |
| 73 |
+ echo "${jars}" |
| 74 |
} |
| 75 |
|
| 76 |
# ------------------------------------------------------------------------------ |
| 77 |
@@ -1777,13 +1772,15 @@ |
| 78 |
# @param $2 - classpath; junit and recorded dependencies get appended |
| 79 |
# @param $@ - the rest of the parameters are passed to java |
| 80 |
# ------------------------------------------------------------------------------ |
| 81 |
-ejunit() { |
| 82 |
+ejunit{ |
| 83 |
debug-print-function ${FUNCNAME} $* |
| 84 |
|
| 85 |
local pkgs |
| 86 |
- for atom in $(cat ${JAVA_PKG_DEPEND_FILE} | tr : ' '); do |
| 87 |
- pkgs=${pkgs},$(echo ${atom} | sed -re "s/^.*@//") |
| 88 |
- done |
| 89 |
+ if [[ -f ${JAVA_PKG_DEPEND_FILE} ]]; then |
| 90 |
+ for atom in $(cat ${JAVA_PKG_DEPEND_FILE} | tr : ' '); do |
| 91 |
+ pkgs=${pkgs},$(echo ${atom} | sed -re "s/^.*@//") |
| 92 |
+ done |
| 93 |
+ fi |
| 94 |
|
| 95 |
local cp=$(java-pkg_getjars --with-dependencies junit${pkgs}) |
| 96 |
if [[ ${1} = -cp || ${1} = -classpath ]]; then |
| 97 |
|
| 98 |
|
| 99 |
|
| 100 |
-- |
| 101 |
gentoo-commits@l.g.o mailing list |
Archives