Raspberries/mraa
Private
Public Access
2
0
Fork 0
Code Activity

java: Migrate IsrCallbacks to Java's Runnable class

Browse Source 
Signed-off-by: Petre Eftime <petre.p.eftime@intel.com>
Signed-off-by: Brendan Le Foll <brendan.le.foll@intel.com>
This commit is contained in:
Petre Eftime
2015-12-16 16:56:38 +02:00
committed by Brendan Le Foll
parent 78a4d12a37
commit c63e38a57e
9 changed files with 104 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/java/CMakeLists.txt
View File

@@ -10,7 +10,8 @@ include_directories (
set_source_files_properties (mraajava.i PROPERTIES SWIG_FLAGS ";-package;mraa;-I${CMAKE_BINARY_DIR}/src")
set_source_files_properties (mraajava.i PROPERTIES CPLUSPLUS ON)
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive")
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive -DJAVACALLBACK")
set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DJAVACALLBACK")
if (NOT DEFINED $ENV{JAVA_HOME_NATIVE})
set (JAVA_HOME_NATIVE $ENV{JAVA_HOME})
@@ -29,6 +30,7 @@ add_custom_command (TARGET mraajava
COMMAND cmake -E echo "Compiling java.."
COMMAND cmake -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/mraa
COMMAND ${JAVAC} *.java -d ${CMAKE_CURRENT_BINARY_DIR}
COMMAND cmake -E create_symlink java/libmraajava.so ${CMAKE_CURRENT_BINARY_DIR}/../libmraajava.so
COMMAND cmake -E echo "Creating jar"
COMMAND ${JAR} cvf mraa.jar mraa
)
@@ -42,6 +44,9 @@ endif ()
install (FILES ${CMAKE_CURRENT_BINARY_DIR}/libmraajava.so
DESTINATION lib/java
)
install (FILES ${CMAKE_CURRENT_BINARY_DIR}/../libmraajava.so
DESTINATION lib/
)
install (FILES ${CMAKE_CURRENT_BINARY_DIR}/mraa.jar
DESTINATION lib/java
)

11
src/java/mraajava.i
View File

@@ -42,6 +42,9 @@
return $jnicall;
}
%typemap(jtype) jobject runnable "java.lang.Runnable"
%typemap(jstype) jobject runnable "java.lang.Runnable"
namespace mraa {
class Spi;
%typemap(out) uint8_t*
@@ -55,14 +58,18 @@ class Spi;
%ignore write(const char* data, int length);
%ignore read(char* data, int length);
%ignore globVM;
%ignore env_key;
%ignore mraa_java_isr_callback;
%feature("director") IsrCallback;
SWIG_DIRECTOR_OWNED(IsrCallback)
%include ../mraa.i
%wrapper %{
JavaVM *globVM;
jint JNI_OnLoad(JavaVM *vm, void *reserved) {
/* initialize mraa */
globVM = vm;
mraa_init();
return JNI_VERSION_1_8;
}