2jciebu01: fix base class and build dependencies

Signed-off-by: Mihai Tudor Panu <mihai.tudor.panu@intel.com>

src/2jciebu01-ble/CMakeLists.txt

@@ -1,10 +0,0 @@
-if (TINYB_FOUND)
-  set (libname "2jciebu01-ble")
-  set (libdescription "Omron BLE Environment Sensor")
-  set (module_src "2jciebu01_ble.cxx")
-  set (module_hpp "2jciebu01_ble.hpp")
-
-  set (reqlibname "libtinyb")
-  upm_module_init(2jciebu01-usb ${TINYB_LIBRARIES})
-  target_include_directories(${libname} PUBLIC ${TINYB_INCLUDE_DIRS})
-endif()

src/2jciebu01-usb/CMakeLists.txt

@@ -1,5 +0,0 @@
-set (libname "2jciebu01-usb")
-set (libdescription "Omron USB Environment Sensor")
-set (module_src "2jciebu01_usb.cxx" "2jciebu01.cxx")
-set (module_hpp "2jciebu01_usb.hpp" "2jciebu01.hpp")
-upm_module_init(mraa)

src/2jciebu01_ble/2jciebu01_ble.i

@@ -1,5 +1,5 @@
 #ifdef SWIGPYTHON
-%module (package="upm") 2jciebu01_ble
+%module (package="upm") om2jciebu01_ble
 #endif
 
 %include "../common_top.i"
@@ -10,13 +10,12 @@ JAVA_JNI_LOADLIBRARY(javaupm_2jciebu01_ble)
 #endif
 /* END Java syntax */
 
+%import "2jciebu01.hpp"
+
 /* BEGIN Common SWIG syntax ------------------------------------------------- */
 %{
 #include "2jciebu01_ble.hpp"
-#include "2jciebu01.hpp"
 %}
 
 %include "2jciebu01_ble.hpp"
-%include "2jciebu01.hpp"
-
 /* END Common SWIG syntax */

src/2jciebu01_ble/CMakeLists.txt

@@ -0,0 +1,8 @@
+if (TINYB_FOUND)
+  set (libname "2jciebu01_ble")
+  set (libdescription "Omron BLE Environment Sensor")
+  set (module_src "${libname}.cxx")
+  set (module_hpp "${libname}.hpp")
+
+  upm_module_init(tinyb 2jciebu01_usb)
+endif()

src/2jciebu01_usb/2jciebu01_usb.i

@@ -1,5 +1,5 @@
 #ifdef SWIGPYTHON
-%module (package="upm") 2jciebu01_usb
+%module (package="upm") om2jciebu01_usb
 #endif
 
 %include "../common_top.i"
@@ -12,11 +12,10 @@ JAVA_JNI_LOADLIBRARY(javaupm_2jciebu01_usb)
 
 /* BEGIN Common SWIG syntax ------------------------------------------------- */
 %{
-#include "2jciebu01_usb.hpp"
 #include "2jciebu01.hpp"
+#include "2jciebu01_usb.hpp"
 %}
 
-%include "2jciebu01_usb.hpp"
 %include "2jciebu01.hpp"
-
+%include "2jciebu01_usb.hpp"
 /* END Common SWIG syntax */

src/2jciebu01_usb/CMakeLists.txt

@@ -0,0 +1,5 @@
+set (libname "2jciebu01_usb")
+set (libdescription "Omron USB Environment Sensor")
+set (module_src "${libname}.cxx" "2jciebu01.cxx")
+set (module_hpp "${libname}.hpp" "2jciebu01.hpp")
+upm_module_init(mraa)

src/javaswig_blacklist

@@ -0,0 +1 @@
+2jciebu01_ble