Merge branch 'master' of https://github.com/Tightdb/tightdb_java2

realm · Sep 7, 2012 · 762a522 · 762a522
2 parents f186144 + 76d7afb
commit 762a522
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 16 deletions.
diff --git a/build.sh b/build.sh
@@ -10,6 +10,7 @@ MAKE="make -j8"
 JAVA_INC="include"
 JAVA_BIN="bin"
 JNI_LIB_SUFFIX=""
+JNI_LIB_INST_DIR="lib/jni" # Absolute or relative to installation prefix
 
 
 # Setup OS specific stuff
@@ -19,6 +20,7 @@ if [ "$OS" = "Darwin" ]; then
     JAVA_INC="Headers"
     JAVA_BIN="Commands"
     JNI_LIB_SUFFIX=".jnilib"
+    JNI_LIB_INST_DIR="/System/Library/Java/Extensions"
 fi
 
 
@@ -141,12 +143,28 @@ case "$MODE" in
 
     "install")
         PREFIX="$1"
+        PREFIX_WAS_SPECIFIED="$PREFIX"
         if [ -z "$PREFIX" ]; then
             PREFIX="/usr/local"
         fi
         (cd "$TIGHTDB_JAVA_HOME/tightdb_jni/src" && $MAKE prefix="$PREFIX" install) || exit 1
-        if [ "$JNI_LIB_SUFFIX" ]; then
-            (cd "$PREFIX/lib/jni" && ln -s "libtightdb-jni.so" "libtightdb-jni$JNI_LIB_SUFFIX") || exit 1
+        if [ "$JNI_LIB_SUFFIX" -a "$JNI_LIB_SUFFIX" != ".so" -o "$JNI_LIB_INST_DIR" -a "$JNI_LIB_INST_DIR" != "lib" ]; then
+            SUFFIX="${JNI_LIB_SUFFIX:-.so}"
+            INST_DIR="${JNI_LIB_INST_DIR:-lib}"
+            if [ "$PREFIX_WAS_SPECIFIED" ]; then
+                if printf "%s\n" "$INST_DIR" |grep '^/' >/dev/null; then
+                    INST_DIR="lib"
+                fi
+            fi
+            if ! printf "%s\n" "$INST_DIR" |grep '^/' >/dev/null; then
+                INST_DIR="$PREFIX/$INST_DIR"
+            fi
+            if [ "$INST_DIR" = "$PREFIX/lib" ]; then
+                (cd "$INST_DIR" && ln -f -s "libtightdb-jni.so" "libtightdb-jni$SUFFIX") || exit 1
+            else
+                install -d "$INST_DIR" || exit 1
+                (cd "$INST_DIR" && ln -f -s "$PREFIX/lib/libtightdb-jni.so" "libtightdb-jni$SUFFIX") || exit 1
+            fi
         fi
         install -d "$PREFIX/share/java" || exit 1
         install -m 644 "src/main/tightdb.jar" "$PREFIX/share/java" || exit 1
@@ -157,13 +175,11 @@ case "$MODE" in
     "test-installed")
         PREFIX="$1"
         find_java || exit 1
-        if [ -z "$PREFIX" ]; then
+        if [ "$PREFIX" ]; then
+            JAVA="$JAVA -Djava.library.path=$PREFIX/lib"
+        else
             PREFIX="/usr/local"
         fi
-        # FIXME: For which PREFIX, if any, is $PREFIX/lib/jni automatically in java.library.path? (Ubuntu, other Linuxes, Darwin, ...)
-        if [ "$PREFIX" != "/usr/local" ]; then
-            JAVA="$JAVA -Djava.library.path=$PREFIX/lib/jni"
-        fi
         cd "$TIGHTDB_JAVA_HOME/test-installed" || exit 1
         TEMP_DIR="$(mktemp -d /tmp/tightdb.java.test-installed.XXXX)" || exit 1
         export CLASSPATH="$PREFIX/share/java/tightdb.jar:."

diff --git a/src/main/java/com/tightdb/ColumnType.java b/src/main/java/com/tightdb/ColumnType.java
@@ -1,10 +1,13 @@
 package com.tightdb;
 
+// Make sure numbers match with <tightdb/column_type.hpp>
+
 public enum ColumnType {
 	ColumnTypeInt(0),
 	ColumnTypeBool(1),
 	ColumnTypeString(2),
-	ColumnTypeStringEnum(3),	// This is NOT a user selectable datatype - You can not create a table containing this type
+        // FIXME: Try to get rid of this one!
+        ColumnTypeStringEnum(3),        // This is NOT a user selectable datatype - You can not create a table containing this type
 	ColumnTypeBinary(4),
 	ColumnTypeTable(5),
 	ColumnTypeMixed(6),

diff --git a/src/test/java/com/tightdb/lib/TableColumnsTest.java b/src/test/java/com/tightdb/lib/TableColumnsTest.java
@@ -87,7 +87,7 @@ public void shouldFindAllRecordsByColumnValue()
 		assertEquals(0, view.size());
 	}
 
-	@Test(enabled = false)
+	@Test(enabled=false)
 	public void shouldAggregateColumnValue() {
 		assertEquals(EmployeesFixture.EMPLOYEES[0].salary,
 				employees.salary.minimum());

diff --git a/src/test/java/com/tightdb/lib/TableQueryTest.java b/src/test/java/com/tightdb/lib/TableQueryTest.java
@@ -61,7 +61,7 @@ public void shouldCalculateStatistics() {
 		assertEquals(40000, results.salary.sum(0, 2, 100)); // both
 	}
 
-	@Test
+	@Test(enabled=false)
 	public void shouldMatchOnSimpleStringCriteria() {
 		assertEquals(1, employees.firstName.eq("John").findAll().size());
 		assertEquals(1, employees.firstName.equal("John").findAll().size());
@@ -182,4 +182,4 @@ public void shouldntRemoveNonMatchingRows() {
 		assertEquals(3, employees.size());
 	}
 
-}
+}
diff --git a/src/test/java/com/tightdb/lib/ViewColumnsTest.java b/src/test/java/com/tightdb/lib/ViewColumnsTest.java
@@ -83,7 +83,7 @@ public void shouldFindAllRecordsByColumnValue()
 		assertEquals(0, view.size());
 	}
 
-	@Test(enabled = false)
+	@Test(enabled=false)
 	public void shouldAggregateColumnValue() {
 		assertEquals(EmployeesFixture.EMPLOYEES[0].salary,
 				employeesView.salary.minimum());

diff --git a/tightdb_jni/src/Makefile b/tightdb_jni/src/Makefile
@@ -1,7 +1,4 @@
-EXTRA_INSTALL_PREFIXES = jni
-
-jni_LIBRARIES = libtightdb-jni.a
-jni_DIR       = $(jnidir)
+lib_LIBRARIES = libtightdb-jni.a
 
 libtightdb_jni_a_SOURCES       = $(wildcard *.cpp)
 libtightdb_jni_a_LDFLAGS       = -ltightdb -lproc