Fixed bug not allowing libgetenv and libtoscomm to be generated for darwin

diff --git a/tools/configure.ac b/tools/configure.ac
index 8b90e8872e8febaf84ba1e52a131a7d24d57ee8c..37c55d3091234f3d50b8be9f27b0631a816f4321 100644 (file)
--- a/tools/configure.ac
+++ b/tools/configure.ac
@@ -80,6 +80,7 @@ case $host in
   *-apple-darwin*)
     JNIPREFIX=lib
     JNISUFFIX=jnilib
+    JNIVERSIONS=.
     INSTALLJNI="install"
     AC_MSG_RESULT(no)
     DARWIN=yes

diff --git a/tools/tinyos/java/env/Makefile.am b/tools/tinyos/java/env/Makefile.am
index 32383bee779e70a9e3621c0e7f20a13883365389..2d03f2d513ffd9d3c489f5065af4829cdfd25440 100644 (file)
--- a/tools/tinyos/java/env/Makefile.am
+++ b/tools/tinyos/java/env/Makefile.am
@@ -6,7 +6,7 @@ tinyoslibdir=$(libdir)/tinyos
 
 tinyoslib_PROGRAMS = @GETENVLIB@
 
-EXTRA_PROGRAMS = libgetenv-32.so libgetenv-64.so getenv.dll
+EXTRA_PROGRAMS = libgetenv-32.so libgetenv-64.so getenv.dll libgetenv.jnilib
 
 SOFLAGS = "-I$(JDK)/include/linux" "-I$(JDK)/include" -shared -fpic
 
@@ -23,3 +23,7 @@ libgetenv-64.so : net_tinyos_util_Env.h net_tinyos_util_Env.c
 
 getenv.dll: net_tinyos_util_Env.h net_tinyos_util_Env.c
        gcc -shared -o$@ -mno-cygwin "-I$(JDK)/include" "-I$(JDK)/include/win32" -D_JNI_IMPLEMENTATION -Wl,--kill-at net_tinyos_util_Env.c
+
+libgetenv.jnilib : net_tinyos_util_Env.h net_tinyos_util_Env.c
+       gcc "-I$(JDK)/Headers" -bundle -fPIC net_tinyos_util_Env.c -o $@
+

diff --git a/tools/tinyos/java/serial/Makefile.am b/tools/tinyos/java/serial/Makefile.am
index 315d1f345768917c70053bcef91072eb577cd28d..88e2ed5cec4df3ed22d83acab8233365c890ef7f 100644 (file)
--- a/tools/tinyos/java/serial/Makefile.am
+++ b/tools/tinyos/java/serial/Makefile.am
@@ -6,7 +6,7 @@ tinyoslibdir=$(libdir)/tinyos
 
 tinyoslib_PROGRAMS = @TOSCOMMLIB@
 
-EXTRA_PROGRAMS = libtoscomm-32.so libtoscomm-64.so toscomm.dll
+EXTRA_PROGRAMS = libtoscomm-32.so libtoscomm-64.so toscomm.dll libtoscomm.jnilib
 
 # Compiling libtoscomm.so with -O2 generates bad code with gcc 4.1.x on x86_64
 # (the -O1 code is slightly weird, but works at least ;-))
@@ -24,6 +24,15 @@ toscomm_dll_SOURCES = \
   NativeSerial_win32.cpp \
   TOSComm_wrap.cxx
 
+libtoscomm_jnilib_SOURCES = \
+  NativeSerialEnums.h \
+  NativeSerial_darwin.cpp \
+  TOSComm_wrap.cxx
+
+libtoscomm.jnilib:  $(libtoscomm_jnilib_SOURCES)
+       $(CXX) -O2 -bundle "-I$(JDK)/Headers" \
+        -o $@ NativeSerial_darwin.cpp
+
 libtoscomm-32.so: $(libtoscomm_so_SOURCES)
        $(CXX) -m32 $(SOFLAGS) -o $@ NativeSerial_linux.cpp