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

more C++/Android fixes

Browse Source
This commit is contained in:
Vitor Santos Costa
2014-09-19 14:20:22 -05:00
parent 1caf68972f
commit e06bcd659e
5 changed files with 70 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/swig/Makefile.in
View File

@@ -87,11 +87,11 @@ android/jni/Application.mk: android/jni/Android.mk
android/jni/Android.mk: android/AndroidManifest.xml
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_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 -r $(PROSQLITE) android/assets/share/Yap
cp Android.mk android/jni
android/AndroidManifest.xml: $(ANDROID_PKG)
@@ -99,9 +99,11 @@ android/AndroidManifest.xml: $(ANDROID_PKG)
mkdir -p android/assets
mkdir -p android/assets/share
mkdir -p android/assets/share/Yap
mkdir -p android/assets/lib
mkdir -p android/assets/lib/Yap
mkdir -p android/jni
android/jni/yap_wrap.cpp: $(srcdir)/yap.i android/AndroidManifest.xml
android/jni/yap_wrap.cpp: $(srcdir)/yap.i $(srcdir)/../../CXX/yapi.hh $(srcdir)/../../CXX/yapi.cpp android/AndroidManifest.xml
$(SWIG) -c++ -java -I$(srcdir)/../../CXX -package pt.up.fc.dcc.yap -outdir android/src/pt/up/fc/dcc/yap -o android/jni/yap_wrap.cpp $<
install-android: android

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

@@ -40,11 +40,17 @@ public class JavaYap extends Activity
{
YAPQuery q = eng.query( str );
if (BuildConfig.DEBUG) {
Log.i(TAG, "onQueryButtonClick called");
}
YAPListTerm vs0 = q.namedVars();
Boolean rc;
// text.setText("");
if (vs0.nil()) {
if (BuildConfig.DEBUG) {
Log.i(TAG, "q=");
}
if (q.next()) {
outputText.append( "yes\n" );
} else {
@@ -52,8 +58,16 @@ public class JavaYap extends Activity
}
} else {
int i=1;
if (BuildConfig.DEBUG) {
Log.i(TAG, "q=");
}
while (rc = q.next()) {
YAPListTerm vs = vs0;
if (BuildConfig.DEBUG) {
Log.i(TAG, "q=");
}
YAPListTerm vs = vs0;
while(!vs.nil()){
YAPTerm eq = vs.car();
//outputText.append(Integer.toString(i) + ": " + eq.text() );