compile myddas interface to sqlite
This commit is contained in:
Vítor Santos Costa
parent
c9aa53350a
commit
4eeacd8b7b
52
Makefile.in
52
Makefile.in
|
|
@ -77,7 +77,7 @@ CPP=@CPP@
|
|||
RC=@RC@
|
||||
RCFLAGS=@RCFLAGS@
|
||||
DEFS=@DEFS@ -D_YAP_NOT_INSTALLED_=1 -DDESTDIR=\"$(DESTDIR)\"
|
||||
LIBS=@LIBS@
|
||||
LIBS=@LIBS@ @MYDDAS_LIBS@
|
||||
DLL_LIBS=@LIBS@ @EXTRA_LIBS_FOR_DLLS@
|
||||
LDFLAGS=@LDFLAGS@
|
||||
EXTRAYAPLIBS=@EXTRAYAPLIBS@
|
||||
|
|
@ -192,7 +192,7 @@ HEADERS = \
|
|||
H/inline-only.h \
|
||||
H/iopreds.h \
|
||||
H/iswiatoms.h \
|
||||
H/qly.h \
|
||||
H/qly.h \
|
||||
H/rclause.h \
|
||||
H/rglobals.h \
|
||||
H/rlocals.h \
|
||||
|
|
@ -208,7 +208,7 @@ H/qly.h \
|
|||
H/iatoms.h H/ratoms.h H/tatoms.h \
|
||||
CXX/yapdb.hh \
|
||||
CXX/yapi.hh \
|
||||
BEAM/eam.h BEAM/eamamasm.h \
|
||||
BEAM/eam.h BEAM/eamamasm.h \
|
||||
OPTYap/opt.config.h \
|
||||
OPTYap/opt.proto.h OPTYap/opt.structs.h \
|
||||
OPTYap/opt.macros.h OPTYap/or.macros.h \
|
||||
|
|
@ -301,10 +301,10 @@ C_SOURCES= \
|
|||
library/dialect/swi/fli/blobs.c \
|
||||
# library/mpi/mpi.c library/mpi/mpe.c \
|
||||
# library/lammpi/yap_mpi.c library/lamm1pi/hash.c library/lammpi/prologterms2c.c
|
||||
|
||||
CXX_SOURCES = \
|
||||
CXX/yapi.cpp \
|
||||
CXX/yapi.cpp \
|
||||
JIT/JIT_Compiler.cpp
|
||||
JIT/JIT_Compiler.cpp
|
||||
|
||||
PLCONS_SOURCES = \
|
||||
console/LGPL/pl-nt.c \
|
||||
|
|
@ -401,16 +401,28 @@ ENGINE_OBJECTS = \
|
|||
udi.o\
|
||||
unify.o userpreds.o utilpreds.o \
|
||||
yap-args.o write.o \
|
||||
blobs.o swi.o ypstdio.o $(IOLIB_OBJECTS)
|
||||
blobs.o swi.o ypstdio.o \
|
||||
$(IOLIB_OBJECTS)
|
||||
|
||||
JIT_OBJECTS = \
|
||||
@JITCOMPILER@ \
|
||||
@JITCONFIGPREDS@ \
|
||||
@JITANALYSISPREDS@ \
|
||||
@JITTRANSFORMPREDS@ \
|
||||
@JITCODEGENPREDS@ \
|
||||
@JITDEBUGPREDS@ \
|
||||
@JITSTATISTICPREDS@
|
||||
@JITCOMPILER@ \
|
||||
@JITCONFIGPREDS@ \
|
||||
@JITANALYSISPREDS@ \
|
||||
@JITTRANSFORMPREDS@ \
|
||||
@JITCODEGENPREDS@ \
|
||||
@JITDEBUGPREDS@ \
|
||||
@JITSTATISTICPREDS@
|
||||
|
||||
MYDDAS_OBJECTS = \
|
||||
@INCLUDE_MYDDAS@ myddas_initialization.o \
|
||||
myddas_mysql.o \
|
||||
myddas_odbc.o \
|
||||
myddas_postgres.o \
|
||||
myddas_shared.o \
|
||||
myddas_sqlite3.o \
|
||||
myddas_statistics.o \
|
||||
myddas_util.o \
|
||||
myddas_wkb2prolog.o
|
||||
|
||||
LIBTAI_OBJECTS = \
|
||||
tai_add.o tai_now.o tai_pack.o \
|
||||
|
|
@ -439,7 +451,11 @@ BEAM_OBJECTS = \
|
|||
STATIC_OBJECTS = \
|
||||
@STATIC_MODE@sys.o yap_random.o regexp.o @NO_BUILTIN_REGEXP@ regcomp.o regerror.o regfree.o regexec.o
|
||||
|
||||
LIB_OBJECTS = $(ENGINE_OBJECTS) $(C_INTERFACE_OBJECTS) $(OR_OBJECTS) $(BEAM_OBJECTS) $(STATIC_OBJECTS) $(LIBTAI_OBJECTS) $(JIT_OBJECTS)
|
||||
LIB_OBJECTS = $(ENGINE_OBJECTS) \
|
||||
$(C_INTERFACE_OBJECTS) $(OR_OBJECTS) \
|
||||
$(BEAM_OBJECTS) $(STATIC_OBJECTS) \
|
||||
$(LIBTAI_OBJECTS) $(JIT_OBJECTS) \
|
||||
$(MYDDAS_OBJECTS)
|
||||
|
||||
OBJECTS = yap.o yapi.o $(LIB_OBJECTS)
|
||||
|
||||
|
|
@ -482,6 +498,9 @@ save.o: C/save.c
|
|||
%.o: C/%.c config.h
|
||||
$(CC) -c $(CFLAGS) $< -o $@
|
||||
|
||||
%.o: packages/myddas/%.c config.h
|
||||
$(CC) -c $(CFLAGS) @MYDDAS_CPPFLAGS@ $< -o $@
|
||||
|
||||
%.o: OPTYap/%.c config.h
|
||||
$(CC) -c $(CFLAGS) $< -o $@
|
||||
|
||||
|
|
@ -544,7 +563,7 @@ c_interface.i: C/c_interface.c include/c_interface.h
|
|||
$(CC) -E $(C_INTERF_FLAGS) C/c_interface.c > $@
|
||||
#
|
||||
|
||||
INSTALLED_PACKAGES= \
|
||||
lINSTALLED_PACKAGES= \
|
||||
library/matrix \
|
||||
library/random \
|
||||
library/regex \
|
||||
|
|
@ -607,7 +626,7 @@ yapwin: yap-win@EXEC_SUFFIX@
|
|||
|
||||
yap-win@EXEC_SUFFIX@: $(PLCONS_OBJECTS) $(HEADERS) @YAPLIB@
|
||||
$(MAKE) -C swi/console
|
||||
$(MPI_CC) -municode -DUNICODE -D_UNICODE $(EXECUTABLE_CFLAGS) $(LDFLAGS) -Wl,-subsystem,windows -o yap-win@EXEC_SUFFIX@ $(PLCONS_OBJECTS) plterm.dll @YAPLIB@ $(LIBS) -lgdi32 @MPILDF@
|
||||
$(MPI_CC) -municode -DUNICODE -D_UNICODE $(EXECUTABLE_CFLAGS) $(LDFLAGS) -Wl,-subsystem,windows -o yap-win@EXEC_SUFFIX@ $(PLCONS_OBJECTS) plterm.dll @YAPLIB@ $(LIBS) @MYDDAS_LIBS@ -lgdi32 @MPILDF@
|
||||
|
||||
libYap.a: $(LIB_OBJECTS) yapi.o
|
||||
-rm -f libYap.a
|
||||
|
|
@ -637,6 +656,7 @@ libYap.a: $(LIB_OBJECTS) yapi.o
|
|||
adb shell $(LN_S) /data/yap/@DYNYAPLIB@ /data/yap/$$p; \
|
||||
done
|
||||
adb push $(GMPDIR)/lib/libgmp.so /data/yap
|
||||
adb push $(SQLITE3DIR)/lib/libsqliteX.so /data/yap
|
||||
#adb push packages/clib/*.so /data/yap
|
||||
#adb push library/system/*.so /data/yap
|
||||
adb push $(srcdir)/swi/library /data/yap/swi/library
|
||||
|
|
|
|||
|
|
@ -726,6 +726,7 @@ JITFLAGS
|
|||
LLVM_CONFIG
|
||||
MYDDAS_LIBS
|
||||
MYDDAS_CPPFLAGS
|
||||
INCLUDE_MYDDAS
|
||||
PKG_MYDDAS
|
||||
EXTRA_LIBS_FOR_SWIDLLS
|
||||
CLIB_PTHREADS
|
||||
|
|
@ -10755,6 +10756,7 @@ done
|
|||
fi
|
||||
|
||||
#from SWI PROSQLITE library.
|
||||
havelib=no
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqlite3_open in -lsqlite3" >&5
|
||||
$as_echo_n "checking for sqlite3_open in -lsqlite3... " >&6; }
|
||||
if ${ac_cv_lib_sqlite3_sqlite3_open+:} false; then :
|
||||
|
|
@ -10796,9 +10798,56 @@ if test "x$ac_cv_lib_sqlite3_sqlite3_open" = xyes; then :
|
|||
havelib=yes
|
||||
fi
|
||||
|
||||
if test "$havelib" = no
|
||||
then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqlite3_open in -lsqliteX" >&5
|
||||
$as_echo_n "checking for sqlite3_open in -lsqliteX... " >&6; }
|
||||
if ${ac_cv_lib_sqliteX_sqlite3_open+:} false; then :
|
||||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
ac_check_lib_save_LIBS=$LIBS
|
||||
LIBS="-lsqliteX $LIBS"
|
||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
/* end confdefs.h. */
|
||||
|
||||
/* Override any GCC internal prototype to avoid an error.
|
||||
Use char because int might match the return type of a GCC
|
||||
builtin and then its argument prototype would still apply. */
|
||||
#ifdef __cplusplus
|
||||
extern "C"
|
||||
#endif
|
||||
char sqlite3_open ();
|
||||
int
|
||||
main ()
|
||||
{
|
||||
return sqlite3_open ();
|
||||
;
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
if ac_fn_c_try_link "$LINENO"; then :
|
||||
ac_cv_lib_sqliteX_sqlite3_open=yes
|
||||
else
|
||||
ac_cv_lib_sqliteX_sqlite3_open=no
|
||||
fi
|
||||
rm -f core conftest.err conftest.$ac_objext \
|
||||
conftest$ac_exeext conftest.$ac_ext
|
||||
LIBS=$ac_check_lib_save_LIBS
|
||||
fi
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sqliteX_sqlite3_open" >&5
|
||||
$as_echo "$ac_cv_lib_sqliteX_sqlite3_open" >&6; }
|
||||
if test "x$ac_cv_lib_sqliteX_sqlite3_open" = xyes; then :
|
||||
# android
|
||||
LIBS="-lsqliteX $LIBS"
|
||||
havelib=yes
|
||||
fi
|
||||
|
||||
for ac_header in sqlite3.h
|
||||
fi
|
||||
if test "$havelib" = no
|
||||
then
|
||||
yap_cv_sqlite3=no
|
||||
else
|
||||
for ac_header in sqlite3.h
|
||||
do :
|
||||
ac_fn_c_check_header_mongrel "$LINENO" "sqlite3.h" "ac_cv_header_sqlite3_h" "$ac_includes_default"
|
||||
if test "x$ac_cv_header_sqlite3_h" = xyes; then :
|
||||
|
|
@ -10812,12 +10861,14 @@ fi
|
|||
|
||||
done
|
||||
|
||||
fi
|
||||
if test "$yap_cv_sqlite3" != no
|
||||
then
|
||||
use_myddas=true
|
||||
YAP_EXTRAS="$YAP_EXTRAS -DMYDDAS_SQLITE3"
|
||||
fi
|
||||
|
||||
havelib=no
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PQconnectdbParams in -lpq" >&5
|
||||
$as_echo_n "checking for PQconnectdbParams in -lpq... " >&6; }
|
||||
if ${ac_cv_lib_pq_PQconnectdbParams+:} false; then :
|
||||
|
|
@ -10903,6 +10954,14 @@ else
|
|||
ENABLE_MYDDAS=""
|
||||
fi
|
||||
|
||||
INCLUDE_MYDDAS="#"
|
||||
if test x"$ENABLE_MYDDAS" = x -a x"$STARTUP_ANDROID" = x
|
||||
then
|
||||
#in Android we have to actually include myddas in the binary
|
||||
INCLUDE_MYDDAS=""
|
||||
fi
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
@ -12071,7 +12130,69 @@ fi
|
|||
fi
|
||||
|
||||
|
||||
dl to be installed in various places.
|
||||
|
||||
# brew in OSX
|
||||
if test -d /usr/local/opt/ossp-uuid; then
|
||||
CPPFLAGS="$CPPFLAGS -I /usr/local/opt/ossp-uuid/include"
|
||||
UUID_LIB_PATH="-L /usr/local/opt/ossp-uuid/lib"
|
||||
fi
|
||||
|
||||
# /opt
|
||||
if test -d /opt/include/ossp; then
|
||||
CPPFLAGS="$CPPFLAGS -I /opt/include"
|
||||
UUID_LIB_PATH="-L /opt/lib"
|
||||
fi
|
||||
|
||||
# /usr/local
|
||||
if test -d /opt/include/ossp; then
|
||||
CPPFLAGS="$CPPFLAGS -I /opt/include"
|
||||
UUID_LIB_PATH="-L /opt/lib"
|
||||
fi
|
||||
|
||||
if test x"$UUID_H" = "x"; then
|
||||
ac_fn_c_check_header_compile "$LINENO" "ossp/uuid.h" "ac_cv_header_ossp_uuid_h" "/*first*/
|
||||
"
|
||||
if test "x$ac_cv_header_ossp_uuid_h" = xyes; then :
|
||||
UUID_H=ossp/uuid.h
|
||||
has_uuid=true
|
||||
fi
|
||||
|
||||
|
||||
fi
|
||||
if test x"$UUID_H" = "x" -a ! -d /usr/include/uuid; then
|
||||
ac_fn_c_check_header_compile "$LINENO" "uuid/uuid.h" "ac_cv_header_uuid_uuid_h" "/*first*/
|
||||
"
|
||||
if test "x$ac_cv_header_uuid_uuid_h" = xyes; then :
|
||||
UUID_H=uuid/uuid.h
|
||||
has_uuid=true
|
||||
fi
|
||||
|
||||
|
||||
fi
|
||||
if test x"$UUID_H" = "x"; then
|
||||
ac_fn_c_check_header_compile "$LINENO" "uuid.h" "ac_cv_header_uuid_h" "/*first*/
|
||||
"
|
||||
if test "x$ac_cv_header_uuid_h" = xyes; then :
|
||||
UUID_H=uuid.h
|
||||
has_uuid=true
|
||||
fi
|
||||
|
||||
|
||||
fi
|
||||
if test x"$UUID_H" = "x"; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Cannot find uuid.h -- dropping uuid.pl" >&5
|
||||
$as_echo "$as_me: WARNING: Cannot find uuid.h -- dropping uuid.pl" >&2;}
|
||||
else
|
||||
|
||||
cat >>confdefs.h <<_ACEOF
|
||||
#define UUID_H <$UUID_H>
|
||||
_ACEOF
|
||||
|
||||
has_uuid=true
|
||||
fi
|
||||
|
||||
if test x"$has_uuid" != "x"; then
|
||||
ac_fn_c_check_func "$LINENO" "uuid_create" "ac_cv_func_uuid_create"
|
||||
if test "x$ac_cv_func_uuid_create" = xyes; then :
|
||||
has_uuid=true
|
||||
|
|
@ -12115,7 +12236,7 @@ fi
|
|||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_uuid_uuid_create" >&5
|
||||
$as_echo "$ac_cv_lib_uuid_uuid_create" >&6; }
|
||||
if test "x$ac_cv_lib_uuid_uuid_create" = xyes; then :
|
||||
CLIB_LIBUUID=-luuid
|
||||
CLIB_LIBUUID="$UUID_LIB_PATH -luuid"
|
||||
has_uuid=true
|
||||
|
||||
fi
|
||||
|
|
@ -12129,45 +12250,6 @@ $as_echo "$as_me: WARNING: Cannot find libossp-uuid or libuuid -- dropping uuid
|
|||
|
||||
fi
|
||||
|
||||
if test x"$has_uuid" != "x"; then
|
||||
if test x"$UUID_H" = "x"; then
|
||||
ac_fn_c_check_header_compile "$LINENO" "ossp/uuid.h" "ac_cv_header_ossp_uuid_h" "/*first*/
|
||||
"
|
||||
if test "x$ac_cv_header_ossp_uuid_h" = xyes; then :
|
||||
UUID_H=ossp/uuid.h
|
||||
fi
|
||||
|
||||
|
||||
fi
|
||||
if test x"$UUID_H" = "x" -a ! -d /usr/include/uuid; then
|
||||
ac_fn_c_check_header_compile "$LINENO" "uuid/uuid.h" "ac_cv_header_uuid_uuid_h" "/*first*/
|
||||
"
|
||||
if test "x$ac_cv_header_uuid_uuid_h" = xyes; then :
|
||||
UUID_H=uuid/uuid.h
|
||||
fi
|
||||
|
||||
|
||||
fi
|
||||
if test x"$UUID_H" = "x"; then
|
||||
ac_fn_c_check_header_compile "$LINENO" "uuid.h" "ac_cv_header_uuid_h" "/*first*/
|
||||
"
|
||||
if test "x$ac_cv_header_uuid_h" = xyes; then :
|
||||
UUID_H=uuid.h
|
||||
fi
|
||||
|
||||
|
||||
fi
|
||||
if test x"$UUID_H" = "x"; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Cannot find uuid.h -- dropping uuid.pl" >&5
|
||||
$as_echo "$as_me: WARNING: Cannot find uuid.h -- dropping uuid.pl" >&2;}
|
||||
else
|
||||
|
||||
cat >>confdefs.h <<_ACEOF
|
||||
#define UUID_H <$UUID_H>
|
||||
_ACEOF
|
||||
|
||||
CLIB_TARGETS="$CLIB_TARGETS uuid.$SO"
|
||||
fi
|
||||
fi
|
||||
|
||||
|
||||
|
|
@ -14409,7 +14491,7 @@ else
|
|||
JAVA_TEST=Test.java
|
||||
CLASS_TEST=Test.class
|
||||
cat << \EOF > $JAVA_TEST
|
||||
/* #line 14412 "configure" */
|
||||
/* #line 14494 "configure" */
|
||||
public class Test {
|
||||
}
|
||||
EOF
|
||||
|
|
@ -14585,7 +14667,7 @@ EOF
|
|||
if uudecode$EXEEXT Test.uue; then
|
||||
ac_cv_prog_uudecode_base64=yes
|
||||
else
|
||||
echo "configure: 14588: uudecode had trouble decoding base 64 file 'Test.uue'" >&5
|
||||
echo "configure: 14670: uudecode had trouble decoding base 64 file 'Test.uue'" >&5
|
||||
echo "configure: failed file was:" >&5
|
||||
cat Test.uue >&5
|
||||
ac_cv_prog_uudecode_base64=no
|
||||
|
|
@ -14716,7 +14798,7 @@ else
|
|||
JAVA_TEST=Test.java
|
||||
CLASS_TEST=Test.class
|
||||
cat << \EOF > $JAVA_TEST
|
||||
/* #line 14719 "configure" */
|
||||
/* #line 14801 "configure" */
|
||||
public class Test {
|
||||
}
|
||||
EOF
|
||||
|
|
@ -14751,7 +14833,7 @@ JAVA_TEST=Test.java
|
|||
CLASS_TEST=Test.class
|
||||
TEST=Test
|
||||
cat << \EOF > $JAVA_TEST
|
||||
/* [#]line 14754 "configure" */
|
||||
/* [#]line 14836 "configure" */
|
||||
public class Test {
|
||||
public static void main (String args[]) {
|
||||
System.exit (0);
|
||||
|
|
|
|||
20
configure.in
20
configure.in
|
|
@ -89,7 +89,7 @@ dnl [ac_cv_xopen=true],
|
|||
dnl [ac_cv_xopen=false])])
|
||||
dnl if test "$ac_cv_xopen" = true; then
|
||||
dnl AC_DEFINE(_XOPEN_SOURCE, 700, [Define if _XOPEN_SOURCE is needed])
|
||||
dnl AC_MSG_RESULT(yes)
|
||||
dnl AC_MSG_RESULT(yes)
|
||||
dnl else
|
||||
dnl AC_MSG_RESULT(no)
|
||||
dnl fi
|
||||
|
|
@ -106,7 +106,7 @@ dnl [ac_cv_file_offset_bits=true],
|
|||
dnl [ac_cv_file_offset_bits=false])])
|
||||
dnl if test "$ac_cv_file_offset_bits" = true; then
|
||||
dnl AC_DEFINE(_FILE_OFFSET_BITS, 64, [Define if _FILE_OFFSET_BITS is needed])
|
||||
dnl AC_MSG_RESULT(yes)
|
||||
dnl AC_MSG_RESULT(yes)
|
||||
dnl else
|
||||
dnl AC_MSG_RESULT(no)
|
||||
dnl fi
|
||||
|
|
@ -122,7 +122,7 @@ dnl [ac_cv_isoc99_source=true],
|
|||
dnl [ac_cv_isoc99_source=false])])
|
||||
dnl if test "$ac_cv_isoc99_source" = true; then
|
||||
dnl AC_DEFINE(_ISOC99_SOURCE, 1, [Define if _ISOC99_SOURCE is needed])
|
||||
dnl AC_MSG_RESULT(yes)
|
||||
dnl AC_MSG_RESULT(yes)
|
||||
dnl else
|
||||
dnl AC_MSG_RESULT(no)
|
||||
dnl fi
|
||||
|
|
@ -138,7 +138,7 @@ dnl [ac_cv_isoc11_source=true],
|
|||
dnl [ac_cv_isoc11_source=false])])
|
||||
dnl if test "$ac_cv_isoc11_source" = true; then
|
||||
dnl AC_DEFINE(_ISOC11_SOURCE, 1, [Define if _ISOC11_SOURCE is needed])
|
||||
dnl AC_MSG_RESULT(yes)
|
||||
dnl AC_MSG_RESULT(yes)
|
||||
dnl else
|
||||
dnl AC_MSG_RESULT(no)
|
||||
dnl fi
|
||||
|
|
@ -184,8 +184,8 @@ case "$target_cpu" in
|
|||
YAP_TARGET=unknown
|
||||
;;
|
||||
esac
|
||||
|
||||
|
||||
|
||||
|
||||
dnl Check for nullptr (bug 626472)
|
||||
AC_LANG_CPLUSPLUS
|
||||
AC_MSG_CHECKING(for nullptr)
|
||||
|
|
@ -200,8 +200,8 @@ if test x"$ac_cv_nullptr" = xtrue -o 0$_MSC_VER -ge 01600; then
|
|||
else
|
||||
AC_MSG_RESULT(no)
|
||||
fi
|
||||
|
||||
AC_LANG_C
|
||||
|
||||
AC_LANG_C
|
||||
|
||||
dnl hardware/engine
|
||||
AC_DEFINE(MSHIFTOFFS, 1, [compiler should shift offsets.])
|
||||
|
|
@ -647,7 +647,7 @@ then
|
|||
fi
|
||||
if test "$target_cpu" = "x86_64"
|
||||
then
|
||||
PRE_INSTALL_ENV="wine64"
|
||||
PRE_INSTALL_ENV="wine64"
|
||||
prefix="$SYSTEMDRIVE/Yap64"
|
||||
else
|
||||
PRE_INSTALL_ENV="wine"
|
||||
|
|
@ -898,7 +898,7 @@ fi
|
|||
|
||||
dnl now this is where things get nasty.
|
||||
dnl trying to get the libraries
|
||||
|
||||
|
||||
case "$target_os" in
|
||||
*linux*)
|
||||
if test "$static_compilation" = "no"
|
||||
|
|
|
|||
|
|
@ -7,6 +7,7 @@
|
|||
# SDK_ROOT: where is the SDK
|
||||
# NDK_ROOT: and the NDK
|
||||
# GMPDIR: get your copy of GMP from
|
||||
# SQLite3DIr: a pre-compiled version of sqlite3
|
||||
# BUILDDROID: where we want to compile yap
|
||||
|
||||
|
||||
|
|
@ -27,7 +28,7 @@ fi
|
|||
# use `android list target` to check for available targets
|
||||
export ANDROID_TARGET=3
|
||||
|
||||
# what android to compile for, use
|
||||
# what android to compile for, use
|
||||
ANDROID_IMAGE=first
|
||||
|
||||
# YAP_SRC="$HOME/Yap/yap-6.3"
|
||||
|
|
@ -73,7 +74,7 @@ fi
|
|||
# This one is used to build myddas
|
||||
if test -d /scratch
|
||||
then
|
||||
export SQLITE3DIR=/scratch/vitor/sqlite3-android
|
||||
export SQLITE3DIR=/scratch/vitor/sqlite3-android
|
||||
else
|
||||
export SQLITE3DIR="$HOME"/Yap/sqlite3-android
|
||||
fi
|
||||
|
|
@ -155,16 +156,18 @@ else
|
|||
startemulator
|
||||
rm -rf "$BUILDDROID"/*
|
||||
cd "$BUILDDROID"
|
||||
export HOST="$ANDROID_ARCH"-linux-androideabi
|
||||
export CPP="$HOST"-cpp
|
||||
"$YAP_SRC"/configure \
|
||||
--host="$ANDROID_ARCH"-linux-androideabi \
|
||||
--host="$HOST" \
|
||||
--prefix=`pwd` \
|
||||
--enable-low-level-tracer \
|
||||
--enable-debug-yap \
|
||||
--enable-dynamic-loading \
|
||||
--with-swig \
|
||||
--with-gmp=$GMPDIR \
|
||||
--with-sqlite3=$SQLITE3DIR \
|
||||
--with-chr=no #--enable-threads
|
||||
--with-sqlite3=$SQLITE3DIR \
|
||||
--enable-chr=yes #--enable-threads
|
||||
make depend
|
||||
make -j install
|
||||
fi
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@ CWD=$(PWD)
|
|||
#
|
||||
|
||||
MYDDAS_HEADERS= \
|
||||
$(srcdir)/myddas.h $(srcdir)/myddas_structs.h \
|
||||
$(srcdir)/myddas.h $(srcdir)/myddas_structs.h \
|
||||
$(srcdir)/myddas_statistics.h \
|
||||
$(srcdir)/myddas_statistics_structs.h \
|
||||
$(srcdir)/myddas_wkb.h $(srcdir)/myddas_wkb2prolog.h
|
||||
|
|
@ -49,7 +49,7 @@ MYDDAS_SOURCES= \
|
|||
myddas_odbc.c \
|
||||
myddas_postgres.c \
|
||||
myddas_sqlite3.c \
|
||||
myddas_util.c \
|
||||
myddas_util.c \
|
||||
myddas_initialization.c \
|
||||
myddas_shared.c \
|
||||
myddas_statistics.c \
|
||||
|
|
@ -71,8 +71,7 @@ MYDDAS_PROLOG= \
|
|||
|
||||
OBJS= $(MYDDAS_SOURCES:.c=.o)
|
||||
MYDDAS_YAP= $(MYDDAS_PROLOG:.ypp=.yap)
|
||||
SOBJS= myddas.@SO@
|
||||
|
||||
SOBJS= libmyddas.@SO@
|
||||
|
||||
#in some systems we just create a single object, in others we need to
|
||||
# create a libray
|
||||
|
|
@ -85,10 +84,10 @@ all: $(SOBJS) $(MYDDAS_YAP)
|
|||
$(CC) -c $(CFLAGS) $< -o $@
|
||||
|
||||
%.yap: $(srcdir)/pl/%.ypp
|
||||
cpp $(YAP_EXTRAS) -P -E -w $< -o $@
|
||||
$(CPP) $(YAP_EXTRAS) -P -w $< -o $@
|
||||
|
||||
@DO_SECOND_LD@%.@SO@: $(OBJS)
|
||||
@DO_SECOND_LD@ @SHLIB_LD@ $(LDFLAGS) -o $@ $(OBJS) @EXTRA_LIBS_FOR_DLLS@ @MYDDAS_LIBS@
|
||||
@DO_SECOND_LD@ @SHLIB_LD@ $(LDFLAGS) -o $@ $(OBJS) @EXTRA_LIBS_FOR_DLLS@ @MYDDAS_LIBS@
|
||||
|
||||
install: all install_myddas install-examples
|
||||
mkdir -p $(DESTDIR)$(SHAREDIR)
|
||||
|
|
@ -99,11 +98,11 @@ install-examples:
|
|||
install_myddas:
|
||||
count=`echo "$(YAP_EXTRAS)" | grep MYDDAS | wc -l`; \
|
||||
if [ $$count -ne 0 ]; then \
|
||||
mkdir -p $(DESTDIR)$(SHAREDIR); \
|
||||
for p in $(MYDDAS_PROLOG); \
|
||||
do name=`basename $$p .ypp`; echo $$name;\
|
||||
$(INSTALL_DATA) $$name.yap $(DESTDIR)$(SHAREDIR); \
|
||||
done; \
|
||||
mkdir -p $(DESTDIR)$(SHAREDIR); \
|
||||
for p in $(MYDDAS_PROLOG); \
|
||||
do name=`basename $$p .ypp`; echo $$name;\
|
||||
$(INSTALL_DATA) $$name.yap $(DESTDIR)$(SHAREDIR); \
|
||||
done; \
|
||||
fi
|
||||
|
||||
clean:
|
||||
|
|
|
|||
|
|
@ -138,18 +138,29 @@ then
|
|||
fi
|
||||
|
||||
#from SWI PROSQLITE library.
|
||||
havelib=no
|
||||
AC_CHECK_LIB(sqlite3, sqlite3_open,
|
||||
LIBS="-lsqlite3 $LIBS"
|
||||
havelib=yes)
|
||||
|
||||
|
||||
AC_CHECK_HEADERS(sqlite3.h, [], [yap_cv_sqlite3="no"])
|
||||
if test "$havelib" = no
|
||||
then
|
||||
AC_CHECK_LIB(sqliteX, sqlite3_open, # android
|
||||
LIBS="-lsqliteX $LIBS"
|
||||
havelib=yes)
|
||||
fi
|
||||
if test "$havelib" = no
|
||||
then
|
||||
yap_cv_sqlite3=no
|
||||
else
|
||||
AC_CHECK_HEADERS(sqlite3.h, [], [yap_cv_sqlite3="no"])
|
||||
fi
|
||||
if test "$yap_cv_sqlite3" != no
|
||||
then
|
||||
use_myddas=true
|
||||
YAP_EXTRAS="$YAP_EXTRAS -DMYDDAS_SQLITE3"
|
||||
fi
|
||||
|
||||
havelib=no
|
||||
AC_CHECK_LIB(pq, PQconnectdbParams,
|
||||
LIBS="-lpq $LIBS"
|
||||
havelib=yes)
|
||||
|
|
@ -184,6 +195,14 @@ else
|
|||
ENABLE_MYDDAS=""
|
||||
fi
|
||||
|
||||
INCLUDE_MYDDAS="#"
|
||||
if test x"$ENABLE_MYDDAS" = x -a x"$STARTUP_ANDROID" = x
|
||||
then
|
||||
#in Android we have to actually include myddas in the binary
|
||||
INCLUDE_MYDDAS=""
|
||||
fi
|
||||
|
||||
AC_SUBST(PKG_MYDDAS)
|
||||
AC_SUBST(INCLUDE_MYDDAS)
|
||||
AC_SUBST(MYDDAS_CPPFLAGS)
|
||||
AC_SUBST(MYDDAS_LIBS)
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
|
||||
#if 1 //USE_MYDDAS
|
||||
|
||||
:- load_foreign_files([myddas], [], init_myddas).
|
||||
:- load_foreign_files([libmyddas], [], init_myddas).
|
||||
|
||||
/* Initialize MYDDAS GLOBAL STRUCTURES */
|
||||
:- c_db_initialize_myddas.
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
||||
|
|
|
|||
Reference in New Issue