Changeset: f0e55d026b91 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f0e55d026b91
Added Files:
tools/embedded/java-package/Makefile.ag
Modified Files:
tools/embedded/Makefile.ag
tools/embedded/java-package/org_monetdb_embedded_MonetDBEmbedded.c
tools/embedded/java-package/org_monetdb_embedded_result_EmbeddedQueryResult.c
Branch: embedded-java
Log Message:
Adda Makefile.ag
Fixing a few issues
diffs (93 lines):
diff --git a/tools/embedded/Makefile.ag b/tools/embedded/Makefile.ag
--- a/tools/embedded/Makefile.ag
+++ b/tools/embedded/Makefile.ag
@@ -17,6 +17,8 @@
MTSAFE
+SUBDIRS = HAVE_JAVA?java-package
+
INCLUDES = ../../monetdb5/mal \
../../monetdb5/modules/atoms \
../../monetdb5/modules/mal \
diff --git a/tools/embedded/java-package/Makefile.ag
b/tools/embedded/java-package/Makefile.ag
new file mode 100644
--- /dev/null
+++ b/tools/embedded/java-package/Makefile.ag
@@ -0,0 +1,45 @@
+# The contents of this file are subject to the MonetDB Public License
+# Version 1.1 (the "License"); you may not use this file except in
+# compliance with the License. You may obtain a copy of the License at
+# http://www.monetdb.org/Legal/MonetDBLicense
+#
+# Software distributed under the License is distributed on an "AS IS"
+# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+# License for the specific language governing rights and limitations
+# under the License.
+#
+# The Original Code is the MonetDB Database System.
+#
+# The Initial Developer of the Original Code is CWI.
+# Portions created by CWI are Copyright (C) 1997-July 2008 CWI.
+# Copyright August 2008-2015 MonetDB B.V.
+# All Rights Reserved.
+
+MTSAFE
+
+INCLUDES = ../ \
+ ../../../monetdb5/mal \
+ ../../../monetdb5/modules/atoms \
+ ../../../monetdb5/modules/mal \
+ ../../../monetdb5/extras/rapi \
+ ../../../gdk \
+ ../../../common/stream \
+ ../../../common/utils \
+ ../../../common/options \
+ ../../../clients/mapilib \
+ ../../../sql/include \
+ ../../../sql/server \
+ ../../../sql/common \
+ ../../../sql/storage \
+ ../../../sql/backends/monet5 \
+ $(pcre_CFLAGS)
+
+lib_embedded = {
+ SOURCES = org_monetdb_embedded_MonetDBEmbedded.c
org_monetdb_embedded_MonetDBEmbedded.h \
+ org_monetdb_embedded_result_EmbeddedQueryResult.c
org_monetdb_embedded_result_EmbeddedQueryResult.h
+ VERSION = 0.1
+ LIBS = ../../monetdb5/tools/libmonetdb5 \
+ ../../gdk/libbat \
+ $(pcre_LIBS) $(PSAPILIB) \
+ $(SOCKET_LIBS) $(MALLOC_LIBS) $(DL_LIBS) $(PTHREAD_LIBS)
+}
diff --git a/tools/embedded/java-package/org_monetdb_embedded_MonetDBEmbedded.c
b/tools/embedded/java-package/org_monetdb_embedded_MonetDBEmbedded.c
--- a/tools/embedded/java-package/org_monetdb_embedded_MonetDBEmbedded.c
+++ b/tools/embedded/java-package/org_monetdb_embedded_MonetDBEmbedded.c
@@ -8,7 +8,15 @@
#include "org_monetdb_embedded_MonetDBEmbedded.h"
#include "embedded.h"
+
#include "gdk.h"
+#include "monetdb_config.h"
+#include "monet_options.h"
+#include "mal.h"
+#include "mal_client.h"
+#include "mal_linker.h"
+#include "msabaoth.h"
+#include "sql_scenario.h"
JNIEXPORT jint JNICALL Java_org_monetdb_embedded_MonetDBLite_startupWrapper
(JNIEnv *env, jobject object, jstring directory, jboolean silent) {
diff --git
a/tools/embedded/java-package/org_monetdb_embedded_result_EmbeddedQueryResult.c
b/tools/embedded/java-package/org_monetdb_embedded_result_EmbeddedQueryResult.c
---
a/tools/embedded/java-package/org_monetdb_embedded_result_EmbeddedQueryResult.c
+++
b/tools/embedded/java-package/org_monetdb_embedded_result_EmbeddedQueryResult.c
@@ -21,7 +21,7 @@ JNIEXPORT jobject JNICALL Java_org_monet
jintArray values = (*env)->NewIntArray(env, size);
jbooleanArray nulls = (*env)->NewBooleanArray(env, size);
- jobect *column;
+ jobject *column;
jclass columnClass = (*env)->FindClass(env,
"org/monetdb/embedded/result/column/IntegerColumn");
// from Java IntegerColumn(int[] values, int columnSize, boolean[]
nullIndex)
jmethodID columnConstructor = (*env)->GetMethodID(env, columnClass,
"<init>", "([II[Z)V");
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
