fix scripts

CMakeLists.txt

@@ -59,10 +59,15 @@ include(Sources NO_POLICY_SCOPE)
 
 include(Model NO_POLICY_SCOPE)
 
-include_directories ( utf8proc packages/myddas packages/myddas/sqlite3
+include_directories ( utf8proc packages/myddas packages/myddas/sqlite3)
+
+if (ANDROID)
+    include_directories (
  packages/myddas/sqlite3/Android/jni/sqlite
   packages/myddas/sqlite3/Android/jni/sqlite/nativehelper
  )
+ endif (ANDROID)
+
 add_definitions(-DUSE_MYDDAS=1 -DMYDDAS_SQLITE3=1)
 
 if (MYSQL_FOUND)
@@ -87,6 +92,8 @@ if (ANDROID)
     ADD_SUBDIRECTORY(utf8proc)
     ADD_SUBDIRECTORY(CXX)
 
+set (SWIG_FILES    ${CMAKE_SOURCE_DIR}/../generated/jni/yap_wrap.cpp )
+
 else ()
     set(YLIBS
             $<TARGET_OBJECTS:libYAPOs>
@@ -112,7 +119,7 @@ add_library( # Sets the name of the library.
         SHARED
 
         ${ENGINE_SOURCES}
-        ${CMAKE_SOURCE_DIR}/../generated/jni/yap_wrap.cpp
+        ${SWIG_FILES}
         ${C_INTERFACE_SOURCES}
         ${STATIC_SOURCES}
         ${ALL_SOURCES}

logtalk_tester_logs/tester_versions.txt

@@ -1,43 +0,0 @@
-The environment variable LOGTALKHOME should be defined first, pointing
-to your Logtalk installation directory!
-Trying the default locations for the Logtalk installation...
-... using Logtalk installation found at /Users/vsc/share/logtalk
-
-The environment variable LOGTALKUSER should be defined first, pointing
-to your Logtalk user directory!
-Trying the default location for the Logtalk user directory...
-
-
-
-Logtalk 3.6.3-rc9
-Copyright (c) 1998-2016 Paulo Moura
-
-% Default lint compilation flags: 
-%   unknown_predicates: warning, undefined_predicates: warning
-%   portability: silent, unknown_entities: warning
-%   missing_directives: warning, redefined_built_ins: silent
-%   singleton_variables: warning, underscore_variables: singletons
-% Default optional features compiler flags:
-%   complements: deny, dynamic_declarations: deny
-%   context_switching_calls: allow, events: deny
-% Other default compilation flags:
-%   report: on, scratch_directory: ./.lgt_tmp/
-%   source_data: on, code_prefix: $, hook: (none)
-%   optimize: off, debug: off, clean: on, reload: changed
-% Backend Prolog compiler flags:
-%   prolog_compiler: []
-%   prolog_loader:   [silent(true),compilation_mode(compact)]
-% Read-only compilation flags (backend Prolog compiler features):
-%   prolog_dialect: yap, modules: supported, threads: unsupported
-%   tabling: unsupported, coinduction: supported
-%   unicode: full, encoding_directive: full
-% 
-% No settings file found in the startup or Logtalk user directories.
-% Using default flag values set in the backend Prolog compiler adapter file.
-% 
-% For Logtalk help, use ?- {help(loader)}. or ?- logtalk_load(help(loader)).
-% 
-*****         Logtalk version: 3.6.3-rc9
-*****         Prolog version: 6.3.4
-% [ /Users/vsc/logtalk/library/tester_versions.lgt loaded ]
-% (0 warnings)

os/readline.c

@@ -264,7 +264,7 @@ bool Yap_ReadlineOps(StreamDesc *s) {
 
 static int prolog_complete(int ignore, int key) {
   if (rl_point > 0 && rl_line_buffer[rl_point - 1] != ' ') {
-#if HAVE_DECL_RL_CATCH_SIGNALS_ /* actually version >= 1.2, or true readline   \
+#if HAVE_DECL_RL_CATCH_SIGNALS /* actually version >= 1.2, or true readline   \
                                    */
     rl_begin_undo_group();
     rl_complete(ignore, key);

packages/myddas/sqlite3/CMakeLists.txt

@@ -43,7 +43,8 @@ Android/jni/sqlite/nativehelper/JNIHelp.h
 Android/jni/sqlite/nativehelper/ScopedLocalRef.h
 )
 
-add_component( sqlite3
-    ${YAPSQLITE3_SOURCES} )
 endif (ANDROID)
 
+add_component(  Yapsqlite3                                           
+    ${YAPSQLITE3_SOURCES} )
+