summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Schuster <thebohemian@gmx.net>2008-10-07 21:08:36 +0000
committerRobert Schuster <thebohemian@gmx.net>2008-10-07 21:08:36 +0000
commit6f2f6d9acfc6c53adbc97893505a4fbb142d6f45 (patch)
treea9cbd9b06406e15ae02f9260e1e2b47ee9549037
parent941a5095125fbbef4914c59328d154dfbfa0e1e9 (diff)
parent3edc90bafa0912873ae40910f7481aec4737dfd8 (diff)
merge of 'd3c8a06d1d4f7abaf8f97964d82c9c0811415c68'
and 'e4568544a8390f2371814f5e9359920853e5b0b1'
-rw-r--r--classes/java.bbclass26
1 files changed, 17 insertions, 9 deletions
diff --git a/classes/java.bbclass b/classes/java.bbclass
index 11a2bf5c0c..620dae79fb 100644
--- a/classes/java.bbclass
+++ b/classes/java.bbclass
@@ -70,19 +70,27 @@ oe_jarinstall() {
oe_makeclasspath() {
# Purpose: Generate a classpath variable from the given Jar file names
- # where the ".jar" has been omitted.
+ # where the ".jar" has been omitted. The string is stored in the script
+ # variable whose name is given in the first argument to this function.
#
- # oe_makeclasspath foo baz bar
- # Prints ${datadir_java}/foo.jar:${datadir_java}/baz.jar:${datadir_java}/bar.jar
- #
- # oe_makeclasspath -s foo baz bar
- # Prints ${STAGING_DATADIR_JAVA}/foo.jar:${STAGING_DATADIR_JAVA}/baz.jar:${STAGING_DATADIR_JAVA}/bar.jar
+ # oe_makeclasspath cp foo baz bar
+ # Stores ${datadir_java}/foo.jar:${datadir_java}/baz.jar:${datadir_java}/bar.jar
+ # in variable "cp".
#
+ # oe_makeclasspath bootcp -s foo baz bar
+ # Stores ${STAGING_DATADIR_JAVA}/foo.jar:${STAGING_DATADIR_JAVA}/baz.jar:${STAGING_DATADIR_JAVA}/bar.jar
+ # in variable "bootcp".
+ #
# Provide the -s at the beginning otherwise strange things happen.
- #
+ # If -s is given the function checks whether the requested jar file exists
+ # and exits with an error message if it cannot be found.
+ #
dir=${datadir_java}
classpath=
delimiter=
+ retval=$1
+
+ shift
while [ "$#" -gt 0 ]; do
case "$1" in
@@ -95,7 +103,7 @@ oe_makeclasspath() {
*)
file=$dir/$1.jar
- if [ ! -f $file ]; then
+ if [ -z "$dir" -a ! -f $file ]; then
oefatal "oe_makeclasspath: Jar file for '$1' not found at $file"
fi
@@ -106,7 +114,7 @@ oe_makeclasspath() {
shift
done
- echo $classpath
+ eval $retval="$classpath"
}
# Creates a simple wrapper script for your Java program.