[oe-commits] org.oe.dev java-library.bbclass: Default implementation for do_install/do_stage.

[thebohemian commit]

java-library.bbclass: Default implementation for do_install/do_stage.
java.bbclass: Added oe_makeclasspath function.

Author: thebohemian at openembedded.org
Branch: org.openembedded.dev
Revision: c827a7afadeb81d1fe48c8ea8c9a4b0deb619d3d
ViewMTN: http://monotone.openembedded.org/revision/info/c827a7afadeb81d1fe48c8ea8c9a4b0deb619d3d
Files:
1
classes/java-library.bbclass
classes/java.bbclass
Diffs:

#
# mt diff -r6bd3614ad9e0794f14e84f374a4136b4a27af01e -rc827a7afadeb81d1fe48c8ea8c9a4b0deb619d3d
#
#
#
# patch "classes/java-library.bbclass"
#  from [ba884554b916e0ee77988f7e42644eb50f0bcf92]
#    to [8663571955e5e7b94d365cb357c051df42196900]
# 
# patch "classes/java.bbclass"
#  from [4a470d4978ae2ef918625aa0f94f81ced60914df]
#    to [1cbaed96d4ed2a16236caaec74121c841339d213]
#
============================================================
--- classes/java-library.bbclass	ba884554b916e0ee77988f7e42644eb50f0bcf92
+++ classes/java-library.bbclass	8663571955e5e7b94d365cb357c051df42196900
@@ -35,3 +35,24 @@ FILES_${JPN} = "${datadir_java}"
 
 FILES_${JPN} = "${datadir_java}"
 
+# File name of the libraries' main Jar file
+JARFILENAME = "${P}.jar"
+
+# Space-separated list of alternative file names.
+ALTJARFILENAMES = "${PN}.jar"
+
+java_install() {
+  oe_jarinstall ${JARFILENAME} ${ALTJARFILENAMES}
+}
+
+do_install() {
+  java_install
+}
+
+java_stage() {
+  oe_jarinstall -s ${JARFILENAME} ${ALTJARFILENAMES}
+}
+
+do_stage() {
+  java_stage
+}
============================================================
--- classes/java.bbclass	4a470d4978ae2ef918625aa0f94f81ced60914df
+++ classes/java.bbclass	1cbaed96d4ed2a16236caaec74121c841339d213
@@ -61,6 +61,41 @@ oe_jarinstall() {
   done
 }
 
+oe_makeclasspath() {
+  # Purpose: Generate a classpath variable from the given Jar file names
+  # where the ".jar" has been omitted.
+  #
+  # 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
+  #
+  # Provide the -s at the beginning otherwise strange things happen.
+  #
+  dir=${datadir_java}
+	classpath=
+	delimiter=
+
+  while [ "$#" -gt 0 ]; do
+    case "$1" in
+    -s)
+      dir=${STAGING_DATADIR_JAVA}
+      ;;
+    -*)
+      oefatal "oe_makeclasspath: unknown option: $1"
+      ;;
+    *)
+      classpath=$classpath$delimiter$dir/$1.jar
+      delimiter=":"
+      ;;
+    esac
+    shift
+  done
+
+	echo $classpath
+}
+
 # Creates a simple wrapper script for your Java program.
 # The script is written to ${PN} by default. 
 #