diogo/yap-6.3
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

compile myddas interface to sqlite

Browse Source
This commit is contained in:
Vítor Santos Costa
2015-03-23 07:27:10 +00:00
parent c9aa53350a
commit 4eeacd8b7b
11 changed files with 233 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/swig/Android.mk.in
View File

@@ -23,10 +23,10 @@ include $(CLEAR_VARS)
NDK_TOOLCHAIN_VERSION := @GCC_VERSION@
LOCAL_LDLIBS := -landroid -llog
LOCAL_MODULE := example
LOCAL_SHARED_LIBRARIES := yap0 yap1 sqliteX
LOCAL_SHARED_LIBRARIES := yap0 yap1 sqliteX yap2
LOCAL_STATIC_LIBRARIES := @abs_top_builddir@/libYap.ar
LOCAL_SRC_FILES += @abs_top_builddir@/packages/swig/android/jni/yap_wrap.cpp
LOCAL_SRC_FILES += @srcdir@/../prosqlite/c/prosqlite.c
LOCAL_SRC_FILES += @srcdir@/../prosqlite/c/prosqlite.c
LOCAL_C_INCLUDES := @abs_top_builddir@ @GMPDIR@/include @srcdir@/../../H @srcdir@/../../include @srcdir@/../../os @srcdir@/../../OPTYap @srcdir@/../../BEAM @srcdir@/../../CXX sqlite
LOCAL_CFLAGS := @YAP_EXTRAS@ @DEFS@ -D_YAP_NOT_INSTALLED_=1 -DDESTDIR=\"\"
LOCAL_CPP_FEATURES := rtti

9
packages/swig/Makefile.in
View File

@@ -89,19 +89,20 @@ JavaYap-debug.apk: android/libs/armeabi/libexample.so
android/libs/armeabi/libexample.so: android/jni/Android.mk android/jni/Application.mk android/jni/yap_wrap.cpp
( cd android/jni && NDK_DEBUG=1 ndk-build )
cp -r $(YAP_EXPORT_PLS)/* android/assets/share/Yap
cp -r $(YAP_EXPORT_DLLS)/*.so android/jni
cp -r $(YAP_EXPORT_SAVED_STATE) android/assets/lib/Yap
android/jni/Application.mk: android/jni/Android.mk
cp $(srcdir)/android/jni/Application.mk android/jni
android/jni/Android.mk: android/AndroidManifest.xml
cp Android.mk android/jni
cp $(srcdir)/android/JavaYap.java android/src/pt/up/fc/dcc/yap
cp $(srcdir)/android/main.xml android/res/layout
cp -r $(YAP_EXPORT_PLS)/* android/assets/share/Yap
cp -r $(YAP_EXPORT_DLLS)/*.so android/jni
cp -r $(YAP_EXPORT_SAVED_STATE) android/assets/lib/Yap
cp -r $(JNI_SQLITE) android/jni
cp -r $(JAVA_SQLITE) android/src
cp Android.mk android/jni
android/AndroidManifest.xml: $(ANDROID_PKG)
android create project --target $(ANDROID_TARGET) --name JavaYap --path ./android --activity JavaYap --package pt.up.fc.dcc.yap

15
packages/swig/android/JavaYap.java
View File

@@ -70,7 +70,7 @@ public class JavaYap extends Activity
{
// check if at initial query
if (!running) {
q = eng.query( str );
q = eng.query( str );
// get the uninstantiated query variables.
vs0 = q.namedVars();
running = true;
@@ -169,7 +169,7 @@ public class JavaYap extends Activity
}
eng.setYAPCallback(callback);
if (BuildConfig.DEBUG) {
Log.i(TAG, "callback done");
Log.i(TAG, "callback done");
}
}
@@ -181,8 +181,13 @@ public class JavaYap extends Activity
// Ensure scroll to end of text
scroller.post(new Runnable() {
public void run() {
scroller.fullScroll(ScrollView.FOCUS_DOWN);
text.setText("");
scroller.fullScroll(ScrollView.FOCUS_DOWN);
if (running) {
q.close();
q = null;
}
running = false;
text.setText("");
}
});
}
@@ -214,7 +219,7 @@ public class JavaYap extends Activity
public void run() {
scroller.fullScroll(ScrollView.FOCUS_DOWN);
str = text.getText().toString();
outputText.append("?- " + str+"\n\n");
outputText.append("?- " + str + "\n\n");
Log.i(TAG, "onAllButtonClick "+str + "\n");
runQuery(str, true);
}

4
packages/swig/android/jni/sqlite/Android.mk
View File

@@ -7,6 +7,7 @@ include $(CLEAR_VARS)
LOCAL_CFLAGS += -DHAVE_CONFIG_H -DKHTML_NO_EXCEPTIONS -DGKWQ_NO_JAVA
LOCAL_CFLAGS += -DNO_SUPPORT_JS_BINDING -DQT_NO_WHEELEVENT -DKHTML_NO_XBL
LOCAL_CFLAGS += -DSQLITE_ENABLE_COLUMN_METADATA
LOCAL_CFLAGS += -U__APPLE__
LOCAL_CFLAGS += -Wno-unused-parameter -Wno-int-to-pointer-cast
LOCAL_CFLAGS += -Wno-maybe-uninitialized -Wno-parentheses
@@ -31,7 +32,6 @@ LOCAL_SRC_FILES += sqlite3.c
LOCAL_C_INCLUDES += $(LOCAL_PATH) $(LOCAL_PATH)/nativehelper/
LOCAL_MODULE:= libsqliteX
LOCAL_LDLIBS += -ldl -llog
LOCAL_LDLIBS += -ldl -llog
include $(BUILD_SHARED_LIBRARY)