changes to support eclipse compat

support of Android assets as /assets files.

packages/prism/src/c/core/glue.c

@@ -18,6 +18,9 @@ SYM_REC_PTR insert_cpred(const char *, int, int(*)(void));
 void exit(int);
 
 #ifdef __YAP_PROLOG__
+typedef int (*CPredicate)(void);
+void
+YAP_UserCPredicate(const char *name, CPredicate def, uintptr_t arity);
 
 SYM_REC_PTR insert_cpred(const char *s, int n, int(*f)(void))
 {

packages/python/Makefile.in

@@ -27,7 +27,7 @@ install-dummy::
 install-pitf:	$(SOLIBS) $(addprefix $(srcdir)/, $(LIBPL)) install-examples
 		mkdir -p $(DESTDIR)$(SOLIBDIR)
 		rm -f $(DESTDIR)$(SOLIBDIR)/python.@SO@
-		$(INSTALL_PROGRAM) $(SOLIBS) $(SOLIBDIR)
+		$(INSTALL_PROGRAM) $(SOLIBS) $(DESTDIR)$(SOLIBDIR)
 		mkdir -p $(DESTDIR)$(PLLIBDIR)
 		for f in $(LIBPL); do \
 		  $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(PLLIBDIR); \

packages/swig/Makefile.in

@@ -11,7 +11,7 @@ srcdir=@srcdir@
 CPPFLAGS=@CPPFLAGS@  -I../.. -I$(srcdir)/../../H -I$(srcdir)/../../include  -I$(srcdir)/../../os -I$(srcdir)/../../OPTYap -I$(srcdir)/../../BEAM -I$(srcdir)/../../CXX
 CXXFLAGS=  @SHLIB_CXXFLAGS@ $(YAP_EXTRAS) $(DEFS) $(CPPFLAGS)
 
-PROGRAMS= \
+PROGRAMS= $(srcdir)/python/demo.py \
 
 SWIG_FILES= \
 	$(srcdir)/yap.i
@@ -19,11 +19,13 @@ SWIG_FILES= \
 all: python java R
 
 python: $(SWIG_FILES) python/_yap.so python/yap.py
+	cp $(srcdir)/python/demo.py python
 
 python/_yap.so: python/yap_wrap.o
 	$(CXX) -shared $(LDSOFLAGS) -o python/_yap.so python/yap_wrap.o ../../yapi.o $(LIBS) @PYTHON_LIBS@ -L ../.. -lYap -lpthread
 
 python/yap_wrap.c: $(srcdir)/yap.i
+	mkdir -p python
 	$(SWIG) -c++ -python  -outdir python -o $@ $(DEFS) $(CPPFLAGS) -Wall $<
 
 python/yap_wrap.o:  python/yap_wrap.c
@@ -41,14 +43,24 @@ jni/yap_wrap.cpp: $(srcdir)/yap.i
 jni/yap_wrap.o:  jni/yap_wrap.cpp
 	$(CXX) -c $(CXXFLAGS) @JPLCFLAGS@  $< -o $@
 
-android: android/jni/yap_wrap.cpp
+# depends on make install on top-level
+# also, should have an android device running, say
+#   emulator -avd first &
+#
+# adb uninstall org.swig.simple  ( if not the first time )
+# adb install bin/SwigSimple-debug.apk
+#
+#
+android: android/jni/yap_wrap.cpp 
 
 android/jni/yap_wrap.cpp:  $(srcdir)/yap.i
 	android create project --target 1 --name SwigSimple --path ./android --activity SwigSimple --package org.swig.simple
-	( cd android ; mkdir -p jni;\
+	( cd android ; mkdir -p jni; mkdir -p assets/share/Yap; mkdir -p assets/lib/Yap;\
 	$(SWIG) -c++ -java -I$(srcdir)/../../CXX -package org.swig.simple -outdir src/org/swig/simple -o jni/yap_wrap.cpp  $< ;\
 	cp $(srcdir)/android/SwigSimple.java src/org/swig/simple/ ;\
 	cp $(srcdir)/android/main.xml res/layout ;\
+	cp -r $(DESTDIR)$(PLLIBDIR)/* assets/share/Yap;\
+	cp -r $(DESTDIR)$(SOLIBDIR)/* assets/lib/Yap;\
 	cp ../Android.mk jni ;\
 	ndk-build; \
 	ant debug \