avetana_cvs: some cosmetic changes and working patch

   * better descriptions, use staging-only commands, remove cd handling
   * now working patch (replaces avetanalocaldevice.patch)

2 files changed, 26 insertions, 17 deletions

diff --git a/packages/avetanabt/avetanabt_cvs.bb b/packages/avetanabt/avetanabt_cvs.bb
index fa91771848..2d9c0040ed 100644
--- a/packages/avetanabt/avetanabt_cvs.bb
+++ b/packages/avetanabt/avetanabt_cvs.bb
@@ -1,17 +1,16 @@
 DESCRIPTION = "avetanaBT: Bluetooth API implementation for Java (JSR-82)"
 SECTION = "devel"
 DEPENDS = "findutils-native jikes-native kaffeh-native fastjar-native bluez-libs classpath"
-#RDEPENDS = "bluez-utils"
 # Matthias Ringwald <mringwal@inf.ethz.ch> was helping me in the first phase. Thanks.
 MAINTAINER = "Mustafa Yuecel <yuecelm@ee.ethz.ch>"
 LICENSE = "GPL"
 HOMEPAGE = "http://sourceforge.net/projects/avetanabt/"
 
 PV = "0.0cvs${CVSDATE}"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/avetanabt;module=avetanabt \
-	   file://avetanalocaldevice.patch;patch=1"
+	   file://maxConnectedDevices.patch;patch=1"
 
 S = "${WORKDIR}/avetanabt"
 
@@ -22,31 +21,30 @@ do_compile() {
 
   # doing nearly the same as in Makefile written...
 
-  mkdir -p build
-  rm -fr build/*
+  # clean build directory
+  ${STAGING_BINDIR}/mkdir -p build
+  ${STAGING_BINDIR}/rm -fr build/*
 
+  # generate classes
   # javac -> jikes
   ${STAGING_BINDIR}/find {de,javax,com} -iname *.java > file.list
   ${STAGING_BINDIR}/jikes -verbose --bootclasspath ${STAGING_DIR}/${BUILD_SYS}/share/kaffeh/rt.jar -d build @file.list
 
-  # create own version.xml (add version information at runtime)
-  head -n 4 version.xml >> build/version.xml
-  echo "    <build value=\"${PV}-${PR}\" date=\"${CVSDATE}\" time=\"${@time.strftime('%H:%M',time.gmtime())}\"/>" >> build/version.xml
-  tail -n 3 version.xml >> build/version.xml
+  # create own version.xml (add version information available at runtime)
+  ${STAGING_BINDIR}/head -n 4 version.xml >> build/version.xml
+  ${STAGING_BINDIR}/echo "    <build value=\"cvs${CVSDATE}\" date=\"${CVSDATE}\" time=\"${@time.strftime('%H:%M',time.gmtime())}\"/>" >> build/version.xml
+  ${STAGING_BINDIR}/tail -n 3 version.xml >> build/version.xml
 
+  # move classes into jar archive
   # jar -> fastjar
-  cd build
-  ${STAGING_BINDIR}/fastjar -cf ../avetanaBT.jar de javax com version.xml
-  cd ..
-
+  ${STAGING_BINDIR}/fastjar -v -cf avetanaBT.jar -C build de -C build javax -C build com -C build version.xml
+  
   # JNI generated header file - de_avetana_bluetooth_stack_BlueZ.h
   # javah -> kaffeh
-  cd c
-  ${STAGING_BINDIR}/kaffeh -jni -classpath ../avetanaBT.jar:${STAGING_DIR}/${BUILD_SYS}/share/kaffeh/rt.jar de.avetana.bluetooth.stack.BlueZ
+  ${STAGING_BINDIR}/kaffeh -jni -classpath avetanaBT.jar:${STAGING_DIR}/${BUILD_SYS}/share/kaffeh/rt.jar -d c de.avetana.bluetooth.stack.BlueZ
 
   # Native language (C) library - libavetanaBT.so
-  ${CXX} ${CXXFLAGS} -shared -lbluetooth -I${STAGING_INCDIR}/classpath BlueZ.cpp -o ../libavetanaBT.so ${LDFLAGS}
-  cd ..
+  ${CXX} ${CXXFLAGS}  -shared -lbluetooth -I${STAGING_INCDIR}/classpath c/BlueZ.cpp -o libavetanaBT.so ${LDFLAGS}
 
 }
 
diff --git a/packages/avetanabt/files/maxConnectedDevices.patch b/packages/avetanabt/files/maxConnectedDevices.patch
new file mode 100644
index 0000000000..fd553818da
--- /dev/null
+++ b/packages/avetanabt/files/maxConnectedDevices.patch
@@ -0,0 +1,11 @@
+--- avetanabt/c/BlueZ.cpp.old	2005-09-11 16:47:49.150357416 +0200
++++ avetanabt/c/BlueZ.cpp	2005-09-11 16:57:47.024466736 +0200
+@@ -664,7 +664,7 @@
+  */

+ JNIEXPORT jint JNICALL Java_de_avetana_bluetooth_stack_BlueZ_getMaxConnectedDevices

+ (JNIEnv *env, jclass obj) {

+-  return 1;

++  return 7;

+ }

+ 

+ /**