Use sbt-jni plugin

21 files changed, 15 insertions, 136 deletions

diff --git a/flow-native/Makefile.am b/flow-native/Makefile.am
deleted file mode 100644
index e06bd75..0000000
--- a/flow-native/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-AUTOMAKE_OPTIONS = foreign
-ACLOCAL_AMFLAGS = -I m4
-
-SUBDIRS = src
\ No newline at end of file
diff --git a/flow-native/build.sbt b/flow-native/build.sbt
new file mode 100644
index 0000000..b175e05
--- /dev/null
+++ b/flow-native/build.sbt
@@ -0,0 +1,3 @@
+enablePlugins(JniNative)
+
+jniLibraryPath in (Compile, jni) := "com/github/jodersky/flow"
diff --git a/flow-native/m4/ax_jni_include_dir.m4 b/flow-native/m4/ax_jni_include_dir.m4
deleted file mode 100644
index 20fa380..0000000
--- a/flow-native/m4/ax_jni_include_dir.m4
+++ /dev/null
@@ -1,124 +0,0 @@
-# ===========================================================================
-#    http://www.gnu.org/software/autoconf-archive/ax_jni_include_dir.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_JNI_INCLUDE_DIR
-#
-# DESCRIPTION
-#
-#   AX_JNI_INCLUDE_DIR finds include directories needed for compiling
-#   programs using the JNI interface.
-#
-#   JNI include directories are usually in the Java distribution. This is
-#   deduced from the value of $JAVA_HOME, $JAVAC, or the path to "javac", in
-#   that order. When this macro completes, a list of directories is left in
-#   the variable JNI_INCLUDE_DIRS.
-#
-#   Example usage follows:
-#
-#     AX_JNI_INCLUDE_DIR
-#
-#     for JNI_INCLUDE_DIR in $JNI_INCLUDE_DIRS
-#     do
-#             CPPFLAGS="$CPPFLAGS -I$JNI_INCLUDE_DIR"
-#     done
-#
-#   If you want to force a specific compiler:
-#
-#   - at the configure.in level, set JAVAC=yourcompiler before calling
-#   AX_JNI_INCLUDE_DIR
-#
-#   - at the configure level, setenv JAVAC
-#
-#   Note: This macro can work with the autoconf M4 macros for Java programs.
-#   This particular macro is not part of the original set of macros.
-#
-# LICENSE
-#
-#   Copyright (c) 2008 Don Anderson <dda@sleepycat.com>
-#
-#   Copying and distribution of this file, with or without modification, are
-#   permitted in any medium without royalty provided the copyright notice
-#   and this notice are preserved. This file is offered as-is, without any
-#   warranty.
-
-#serial 10
-
-AU_ALIAS([AC_JNI_INCLUDE_DIR], [AX_JNI_INCLUDE_DIR])
-AC_DEFUN([AX_JNI_INCLUDE_DIR],[
-
-JNI_INCLUDE_DIRS=""
-
-if test "x$JAVA_HOME" != x; then
-    _JTOPDIR="$JAVA_HOME"
-else
-    if test "x$JAVAC" = x; then
-        JAVAC=javac
-    fi
-    AC_PATH_PROG([_ACJNI_JAVAC], [$JAVAC], [no])
-    if test "x$_ACJNI_JAVAC" = xno; then
-        AC_MSG_ERROR([cannot find JDK; try setting \$JAVAC or \$JAVA_HOME])
-    fi
-    _ACJNI_FOLLOW_SYMLINKS("$_ACJNI_JAVAC")
-    _JTOPDIR=`echo "$_ACJNI_FOLLOWED" | sed -e 's://*:/:g' -e 's:/[[^/]]*$::'`
-fi
-
-_JINC="$_JTOPDIR/include"
-
-_AS_ECHO_LOG([_JTOPDIR=$_JTOPDIR])
-_AS_ECHO_LOG([_JINC=$_JINC])
-
-# On Mac OS X 10.6.4, jni.h is a symlink:
-# /System/Library/Frameworks/JavaVM.framework/Versions/Current/Headers/jni.h
-# -> ../../CurrentJDK/Headers/jni.h.
-AC_CHECK_FILE([$_JINC/jni.h],
-    [JNI_INCLUDE_DIRS="$JNI_INCLUDE_DIRS $_JINC"],
-    [_JTOPDIR=`echo "$_JTOPDIR" | sed -e 's:/[[^/]]*$::'`
-     AC_CHECK_FILE([$_JTOPDIR/include/jni.h],
-        [JNI_INCLUDE_DIRS="$JNI_INCLUDE_DIRS $_JTOPDIR/include"],
-                AC_MSG_ERROR([cannot find JDK header files]))
-    ])
-
-# get the likely subdirectories for system specific java includes
-case "$host_os" in
-bsdi*)          _JNI_INC_SUBDIRS="bsdos";;
-freebsd*)       _JNI_INC_SUBDIRS="freebsd";;
-linux*)         _JNI_INC_SUBDIRS="linux genunix";;
-osf*)           _JNI_INC_SUBDIRS="alpha";;
-solaris*)       _JNI_INC_SUBDIRS="solaris";;
-mingw*)     _JNI_INC_SUBDIRS="win32";;
-cygwin*)    _JNI_INC_SUBDIRS="win32";;
-darwin*)    _JNI_INC_SUBDIRS="darwin";;
-*)              _JNI_INC_SUBDIRS="genunix";;
-esac
-
-# add any subdirectories that are present
-for JINCSUBDIR in $_JNI_INC_SUBDIRS
-do
-    if test -d "$_JTOPDIR/include/$JINCSUBDIR"; then
-         JNI_INCLUDE_DIRS="$JNI_INCLUDE_DIRS $_JTOPDIR/include/$JINCSUBDIR"
-    fi
-done
-])
-
-# _ACJNI_FOLLOW_SYMLINKS <path>
-# Follows symbolic links on <path>,
-# finally setting variable _ACJNI_FOLLOWED
-# ----------------------------------------
-AC_DEFUN([_ACJNI_FOLLOW_SYMLINKS],[
-# find the include directory relative to the javac executable
-_cur="$1"
-while ls -ld "$_cur" 2>/dev/null | grep " -> " >/dev/null; do
-        AC_MSG_CHECKING([symlink for $_cur])
-        _slink=`ls -ld "$_cur" | sed 's/.* -> //'`
-        case "$_slink" in
-        /*) _cur="$_slink";;
-        # 'X' avoids triggering unwanted echo options.
-        *) _cur=`echo "X$_cur" | sed -e 's/^X//' -e 's:[[^/]]*$::'`"$_slink";;
-        esac
-        AC_MSG_RESULT([$_cur])
-done
-_ACJNI_FOLLOWED="$_cur"
-])# _ACJNI
diff --git a/flow-native/.gitignore b/flow-native/src/.gitignore
index b8d894c..b8d894c 100644
--- a/flow-native/.gitignore
+++ b/flow-native/src/.gitignore
diff --git a/flow-native/src/Makefile.am b/flow-native/src/Makefile.am
index 9fefbd1..e06bd75 100644
--- a/flow-native/src/Makefile.am
+++ b/flow-native/src/Makefile.am
@@ -1,9 +1,4 @@
-lib_LTLIBRARIES = libflow3.la
+AUTOMAKE_OPTIONS = foreign
+ACLOCAL_AMFLAGS = -I m4
 
-libflow3_la_SOURCES = flow_jni.c platform/posix/flow.c flow.h com_github_jodersky_flow_internal_NativeSerial.h
-
-if ENABLE_VERSIONED_LIB
-libflow3_la_LDFLAGS = -version-info 0:1:0
-else 
-libflow3_la_LDFLAGS = -avoid-version
-endif
\ No newline at end of file
+SUBDIRS = src
\ No newline at end of file
diff --git a/flow-native/bootstrap b/flow-native/src/bootstrap
index d4d064f..d4d064f 100755
--- a/flow-native/bootstrap
+++ b/flow-native/src/bootstrap
diff --git a/flow-native/configure.ac b/flow-native/src/configure.ac
index 1b622c4..1b622c4 100644
--- a/flow-native/configure.ac
+++ b/flow-native/src/configure.ac
diff --git a/flow-native/debian/changelog b/flow-native/src/debian/changelog
index 00bb566..00bb566 100644
--- a/flow-native/debian/changelog
+++ b/flow-native/src/debian/changelog
diff --git a/flow-native/debian/compat b/flow-native/src/debian/compat
index ec63514..ec63514 100644
--- a/flow-native/debian/compat
+++ b/flow-native/src/debian/compat
diff --git a/flow-native/debian/control b/flow-native/src/debian/control
index f335e0e..f335e0e 100644
--- a/flow-native/debian/control
+++ b/flow-native/src/debian/control
diff --git a/flow-native/debian/copyright b/flow-native/src/debian/copyright
index d26a00a..d26a00a 100644
--- a/flow-native/debian/copyright
+++ b/flow-native/src/debian/copyright
diff --git a/flow-native/debian/rules b/flow-native/src/debian/rules
index c062736..c062736 100755
--- a/flow-native/debian/rules
+++ b/flow-native/src/debian/rules
diff --git a/flow-native/pkg/mkpkg b/flow-native/src/pkg/mkpkg
index c82d9cb..c82d9cb 100755
--- a/flow-native/pkg/mkpkg
+++ b/flow-native/src/pkg/mkpkg
diff --git a/flow-native/readme.md b/flow-native/src/readme.md
index 4bee987..4bee987 100644
--- a/flow-native/readme.md
+++ b/flow-native/src/readme.md
diff --git a/flow-native/src/src/Makefile.am b/flow-native/src/src/Makefile.am
new file mode 100644
index 0000000..9fefbd1
--- /dev/null
+++ b/flow-native/src/src/Makefile.am
@@ -0,0 +1,9 @@
+lib_LTLIBRARIES = libflow3.la
+
+libflow3_la_SOURCES = flow_jni.c platform/posix/flow.c flow.h com_github_jodersky_flow_internal_NativeSerial.h
+
+if ENABLE_VERSIONED_LIB
+libflow3_la_LDFLAGS = -version-info 0:1:0
+else 
+libflow3_la_LDFLAGS = -avoid-version
+endif
\ No newline at end of file
diff --git a/flow-native/src/com_github_jodersky_flow_internal_NativeSerial.h b/flow-native/src/src/com_github_jodersky_flow_internal_NativeSerial.h
index 04364fb..04364fb 100644
--- a/flow-native/src/com_github_jodersky_flow_internal_NativeSerial.h
+++ b/flow-native/src/src/com_github_jodersky_flow_internal_NativeSerial.h
diff --git a/flow-native/src/flow.h b/flow-native/src/src/flow.h
index 44e2a47..44e2a47 100644
--- a/flow-native/src/flow.h
+++ b/flow-native/src/src/flow.h
diff --git a/flow-native/src/flow_jni.c b/flow-native/src/src/flow_jni.c
index 8ec2aed..8ec2aed 100644
--- a/flow-native/src/flow_jni.c
+++ b/flow-native/src/src/flow_jni.c
diff --git a/flow-native/src/platform/posix/flow.c b/flow-native/src/src/platform/posix/flow.c
index a2a239c..a2a239c 100644
--- a/flow-native/src/platform/posix/flow.c
+++ b/flow-native/src/src/platform/posix/flow.c
diff --git a/flow-native/src/platform/windows/README b/flow-native/src/src/platform/windows/README
index 3d24410..3d24410 100644
--- a/flow-native/src/platform/windows/README
+++ b/flow-native/src/src/platform/windows/README
diff --git a/flow-native/src/platform/windows/flow.c.disabled b/flow-native/src/src/platform/windows/flow.c.disabled
index 86a267c..86a267c 100644
--- a/flow-native/src/platform/windows/flow.c.disabled
+++ b/flow-native/src/src/platform/windows/flow.c.disabled