Merge remote-tracking branch 'Tightdb/master' into bm-develop

Brian Munkholm · Brian Munkholm · commit b103de6e400a · 2013-09-24T10:59:52.000+02:00
Conflicts:
	.gitignore
diff --git a/.gitignore b/.gitignore
@@ -70,13 +70,18 @@ _ReSharper*/
 
 # sh build.sh test
 /test_output
-
-.DS_Store
-.idea
-*.iml
-
-*.lock
-
-tightdb-java-test/testng.xml
-
-doc/ref/examples/fromServlet
+
+.DS_Store
+.idea
+*.iml
+
+*.lock
+
+tightdb-java-test/testng.xml
+
+doc/ref/examples/fromServlet
+
+# debian packaging
+/debian/tightdb-java
+/debian/tightdb-java-dev
+/debian/.mh
diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,9 @@
+tightdb-java (0.0.1-2) UNRELEASED; urgency=low
+
+  * Support for Maven.
+
+ -- Kenneth Geisshirt <kg@tightdb.com>  Fri, 31 May 2013 09:44:32 +0200
+
 tightdb-java (0.0.1-1) UNRELEASED; urgency=low
 
   * Initial release. (Closes: #00001)
diff --git a/debian/control b/debian/control
@@ -15,6 +15,6 @@ Description: Fast, embedded database
 
 Package: tightdb-java-dev
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libtightdb
+Depends: ${shlibs:Depends}, ${misc:Depends}, tightdb-java
 Description: Fast, embedded database [development]
  TightDB is a fast, embedded database. This is the Java interface.
diff --git a/debian/rules b/debian/rules
@@ -1,8 +1,7 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+VERSION              := $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ')
 
 override_dh_usrlocal:
 
@@ -22,7 +21,7 @@ tightdb-java: build
 	dh_testroot -a
 	dh_installdocs -a
 	dh_installchangelogs -p$@ -a
-	dh_strip -p$@ .a
+	dh_strip -p$@ -a
 	dh_compress -p$@ -s
 	dh_fixperms -p$@ -a
 	dh_installdeb -p$@ -a
@@ -31,14 +30,20 @@ tightdb-java: build
 	dh_md5sums -p$@ -a
 	dh_builddeb -p$@ -a
 	dh_installdirs
+	mh_installpoms -p$@
+	mh_installjar -p$@ -l pom.xml lib/tightdb.jar
 
 tightdb-java-dev: build
 	DESTDIR=$$(pwd)/debian/tightdb-java-dev sh build.sh install
 	dh_testdir -a
 	dh_testroot -a
 	dh_installdocs -a
 	dh_installchangelogs -p$@ -a
-	dh_strip -p$@ .a
+	dh_strip -p$@ -a
+	dh_installexamples -p$@ $$(pwd)/examples/ant-setup
+	dh_installexamples -p$@ $$(pwd)/examples/intro-example
+	dh_installexamples -p$@ $$(pwd)/examples/lib-sqlite
+	dh_installexamples -p$@ $$(pwd)/examples/maven-setup
 	dh_compress -p$@ -s
 	dh_fixperms -p$@ -a
 	dh_installdeb -p$@ -a
diff --git a/pom.xml b/pom.xml
@@ -4,8 +4,8 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<groupId>com.tightdb</groupId>
-	<artifactId>tightdb-parent</artifactId>
-	<version>1.1.0</version>
+	<artifactId>tightdb</artifactId>
+	<version>0.0.1</version>
 	<packaging>pom</packaging>
 
 	<properties>
@@ -34,12 +34,4 @@
 			</plugin>
 		</plugins>
 	</build>
-
-	<modules>
-		<module>tightdb-java-core</module>
-		<module>tightdb-java-generator</module>
-		<module>tightdb-java-example</module>
-		<module>tightdb-java-doc</module>
-		<module>tightdb-java-test</module>
-	</modules>
-</project>
+</project>
diff --git a/tightdb-java-core/src/main/java/com/tightdb/internal/Util.java b/tightdb-java-core/src/main/java/com/tightdb/internal/Util.java
diff --git a/tightdb_jni/src/com_tightdb_internal_Util.cpp b/tightdb_jni/src/com_tightdb_internal_Util.cpp
diff --git a/tightdb_jni/src/com_tightdb_internal_Util.h b/tightdb_jni/src/com_tightdb_internal_Util.h
diff --git a/tightdb_jni/src/util.cpp b/tightdb_jni/src/util.cpp
@@ -7,7 +7,7 @@
 #include <tightdb/utf8.hpp>
 
 #include "util.hpp"
-#include "com_tightdb_internal_util.h"
+#include "com_tightdb_internal_Util.h"
 
 
 using namespace std;
diff --git a/tightdb_jni/src/util.hpp b/tightdb_jni/src/util.hpp
@@ -12,7 +12,7 @@
 #include <tightdb/safe_int_ops.hpp>
 #include <tightdb/lang_bind_helper.hpp>
 
-#include "com_tightdb_internal_util.h"
+#include "com_tightdb_internal_Util.h"
 
 
 #define TRACE               1       // disable for performance
