Merge branch 'master' of https://github.com/vscosta/yap-6.3

DisabledFeatures.txt

@@ -1,2 +0,0 @@
-   * Threads Support  <http://www.gnu.org/software/threads>
-     GNU Threads Library (or similar)

EnabledFeatures.txt

@@ -1,2 +0,0 @@
-   * GNU libgmp (in some cases MPIR - GNU big integers and rationals
-   * libreadline - Readline line editing library

cmake/FindCUDD.cmake

@@ -10,19 +10,10 @@
 # Redistribution and use is allowed according to the terms of the BSD license.
 # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
 
-if (NOT DEFINED CUDD_ROOT)
+SET( CUDD_FOUND "NO" )
-  set(CUDD_ROOT $ENV{CUDD_ROOT})
-endif()
 
-# Check if we have cached results in case the last round was successful.
+set (CUDD_INCLUDE_SEARCH_PATH 
-
+    ${CMAKE_INSTALL_PREFIX}/include
-  find_package(PkgConfig)
-
-  
-  find_path(CUDD_INCLUDE_DIR
-    NAMES cudd.h cudd/cudd.h
-    $ENV{CUDD_ROOT}/include
-    $ENV{CUDD_ROOT}
     /usr/local/yap/include
     /usr/local/Yap/include
     /usr/local/cudd/include
@@ -36,100 +27,124 @@ endif()
     /opt/csw/include   # Blastwave
     /opt/include
     /usr/freeware/include
-    NO_DEFAULT_PATHS
-    
-    )
-  
- mark_as_advanced(CUDD_INCLUDE_DIR)
-
-if (${CUDD_ROOT}) 
-  set (CUDD_LIB_SEARCH_PATH 
-    $ENV{CUDD_ROOT}/lib
-    $ENV{CUDD_ROOT}/lib64
-    $ENV{CUDD_ROOT}/lib-dbg
-    $ENV{CUDD_ROOT}
-    ${CUDD_ROOT}/cudd
-    /usr/lib
-    ${CUDD_ROOT}/lib
-    ${CUDD_ROOT}/lib64
-    ${CUDD_ROOT}/lib-dbg
-    ${CUDD_ROOT}
-    ${CUDD_ROOT}/cudd
  )
- endif()
 
- mark_as_advanced(CUDD_LIB_SEARCH_PATH on)
 
 
 set (CUDD_LIB_SEARCH_PATH 
-    ${CUDD_LIB_SEARCH_PATH}
+    ${CMAKE_INSTALL_PREFIX}/lib
-    /usr/lib64
     /usr/lib
     /usr/local/lib/cudd
     /usr/local/cudd/lib
     /usr/lib/cudd
     /usr/lib/cudd/lib
-    /usr/lib64/cudds
+    /usr/freeware/lib )
-    /usr/freeware/lib64 )
+
+if ($ENV{CUDD_ROOT}) 
+  list (APPEND CUDD_LIB_SEARCH_PATH 
+    $ENV{CUDD_ROOT}/lib
+    $ENV{CUDD_ROOT}/lib-dbg
+    $ENV{CUDD_ROOT} )
+
+  list (APPEND CUDD_INCLUDE_SEARCH_PATH 
+    $ENV{CUDD_ROOT}/include )
+endif()
+
+if (${CUDD_ROOT}) 
+  list (APPEND CUDD_LIB_SEARCH_PATH 
+    ${CUDD_ROOT}/lib
+    ${CUDD_ROOT}/lib-dbg
+    ${CUDD_ROOT} )
+  list (APPEND CUDD_INCLUDE_SEARCH_PATH 
+    ${CUDD_ROOT}/include )
+endif()
+
+# Check if we have cached results in case the last round was successful.
+
+  find_package(PkgConfig)
+  
+  find_path(CUDD_INCLUDE_DIR
+    NAMES cudd.h cudd/cudd.h
+    ${CUDD_INCLUDE_SEARCH_PATH}
+    )
+  
+ mark_as_advanced(CUDD_INCLUDE_DIR)
+
+if (CUDD_INCLUDE_DIR)
 
   find_library(CUDD_LIBRARIES
     NAMES cudd
     PATHS
     ${CUDD_LIB_SEARCH_PATH}
     )
-    
- IF (NOT EXISTS ${CUDD_INCLUDE_DIR}/epdInt.h )
 
+    if (CUDD_LIBRARIES)
+    
+    SET( CUDD_FOUND "YES" )
+ 
 find_library(CUDD_DDDMP_LIBRARY
     NAMES dddmp
     PATHS
     ${CUDD_LIB_SEARCH_PATH}
     )
 
+if (CUDD_DDMP_LIBRARY)
+   list( APPEND CUDD_LIBRARIES ${CUDD_DDMP_LIBRARY} )
+endif()
+
 find_library(CUDD_EPD_LIBRARY
     NAMES  epd
     PATHS
      ${CUDD_LIB_SEARCH_PATH}
     )
 
+if (CUDD_EPD_LIBRARY)
+   list( APPEND CUDD_LIBRARIES ${CUDD_EPD_LIBRARY} )
+endif()
+
   find_library(CUDD_ST_LIBRARY
-    NAMES cuddst st
+    NAMES cuddst 
     PATHS
      ${CUDD_LIB_SEARCH_PATH}
    )
 
+if (CUDD_ST_LIBRARY)
+   list( APPEND CUDD_LIBRARIES ${CUDD_ST_LIBRARY} )
+endif()
+
+
   
   find_library(CUDD_UTIL_LIBRARY
-    NAMES cuddutil util 
+    NAMES cuddutil  
     
     PATHS
      ${CUDD_LIB_SEARCH_PATH}
-    NO_DEFAULT_PATHS
-    NO_SYSTEM_ENVIRONMENT_PATH
-    NO_CMAKE_SYSTEM_PATH
     )
  
+if (CUDD_UTIL_LIBRARY)
+   list( APPEND CUDD_LIBRARIES ${CUDD_ST_LIBRARY} )
+endif()
+
   find_library(CUDD_MTR_LIBRARY
     NAMES  mtr
     PATHS
       ${CUDD_LIB_SEARCH_PATH}
     )
 
+if (CUDD_MTR_LIBRARY)
+   list( APPEND CUDD_LIBRARIES ${CUDD_MTR_LIBRARY} )
+endif()
 
-set(CUDD_LIBRARIES
+endif()
-  ${CUDD_LIBRARIES} ${CUDD_ST_LIBRARY} ${CUDD_UTIL_LIBRARY}
-  ${CUDD_MTR_LIBRARY}  ${CUDD_EPD_LIBRARY} ${CUDD_DDDMP_LIBRARY} )
 
-endif () # Check for cudd 2.
+endif()
+
+ mark_as_advanced(CUDD_LIBRARIES)
 
 
-SET( CUDD_FOUND "NO" )
-IF(CUDD_INCLUDE_DIR AND CUDD_LIBRARIES)
-    SET( CUDD_FOUND "YES" )
-ENDIF()
 
 mark_as_advanced (CUDD_FOUND)
 
 
-find_package_handle_standard_args(R DEFAULT_MSG CUDD_LIBRARIES CUDD_INCLUDE_DIR )
+find_package_handle_standard_args(CUDD DEFAULT_MSG CUDD_LIBRARIES CUDD_INCLUDE_DIR )
 

cmake/FindGecode.cmake

@@ -2,11 +2,11 @@
 
 #Works under the assumption than when gecode is installed at least the kernel component exists
 # Look for the header file
-find_path(GECODE_INCLUDE_DIR NAMES gecode/kernel.hh )
+find_path(GECODE_INCLUDE_DIR NAMES gecode/kernel.hh PATHS ${CMAKE_INSTALL_PREFIX}/include)
-find_file(GECODE_CONFIG gecode/support/config.hpp)
+find_file(GECODE_CONFIG gecode/support/config.hpp PATHS ${CMAKE_INSTALL_PREFIX}/include)
 # Look for the library
-find_library(GECODE_LIBRARY NAMES gecodekernel)
+find_library(GECODE_LIBRARY NAMES gecodekernel PATHS ${CMAKE_INSTALL_PREFIX}/lib)
-find_library(GECODE_SUPPORT_LIBRARY NAMES gecodesupport)
+find_library(GECODE_SUPPORT_LIBRARY NAMES gecodesupportl PATHS ${CMAKE_INSTALL_PREFIX}/lib)
 
 if(GECODE_CONFIG)
   file(STRINGS ${GECODE_CONFIG} GECODE_LINE_VERSION REGEX "^#define GECODE_VERSION .*")
@@ -20,39 +20,39 @@ endif()
 if(GECODE_FOUND)
   set(GECODE_LIBRARIES ${GECODE_LIBRARY} ${GECODE_SUPPORT_LIBRARY})
   set(GECODE_INCLUDE_DIRS ${GECODE_INCLUDE_DIR})
-  find_library(GECODE_DRIVER_LIBRARY gecodedriver)
+  find_library(GECODE_DRIVER_LIBRARY gecodedriverl PATHS ${CMAKE_INSTALL_PREFIX}/lib)
   if(GECODE_FZ_LIBRARY)
     list(APPEND GECODE_LIBRARIES ${GECODE_FZ_LIBRARY})
   endif()
-  find_library(GECODE_GIST_LIBRARY gecodegist)
+  find_library(GECODE_GIST_LIBRARY gecodegistl PATHS ${CMAKE_INSTALL_PREFIX}/lib)
   if(GECODE_GIST_LIBRARY)
     list(APPEND GECODE_LIBRARIES ${GECODE_GIST_LIBRARY})
   endif()
-  find_library(GECODE_GRAPH_LIBRARY gecodegraph)
+  find_library(GECODE_GRAPH_LIBRARY gecodegraphl PATHS ${CMAKE_INSTALL_PREFIX}/lib)
   if(GECODE_GRAPH_LIBRARY)
     list(APPEND GECODE_LIBRARIES ${GECODE_GRAPH_LIBRARY})
   endif()
-  find_library(GECODE_INT_LIBRARY gecodeint)
+  find_library(GECODE_INT_LIBRARY gecodeintl PATHS ${CMAKE_INSTALL_PREFIX}/lib)
   if(GECODE_INT_LIBRARY)
     list(APPEND GECODE_LIBRARIES ${GECODE_INT_LIBRARY})
   endif()
-  find_library(GECODE_FLOAT_LIBRARY gecodefloat)
+  find_library(GECODE_FLOAT_LIBRARY gecodefloatl PATHS ${CMAKE_INSTALL_PREFIX}/lib)
   if(GECODE_FLOAT_LIBRARY)
     list(APPEND GECODE_LIBRARIES ${GECODE_FLOAT_LIBRARY})
   endif()
-  find_library(GECODE_MM_LIBRARY gecodeminimodel)
+  find_library(GECODE_MM_LIBRARY gecodeminimodell PATHS ${CMAKE_INSTALL_PREFIX}/lib)
   if(GECODE_MM_LIBRARY)
     list(APPEND GECODE_LIBRARIES ${GECODE_MM_LIBRARY})
   endif()
-  find_library(GECODE_SCHEDULING_LIBRARY gecodescheduling)
+  find_library(GECODE_SCHEDULING_LIBRARY gecodeschedulingl PATHS ${CMAKE_INSTALL_PREFIX}/lib)
   if(GECODE_SCHEDULING_LIBRARY)
     list(APPEND GECODE_LIBRARIES ${GECODE_SCHEDULING_LIBRARY})
   endif()
-  find_library(GECODE_SEARCH_LIBRARY gecodesearch)
+  find_library(GECODE_SEARCH_LIBRARY gecodesearchl PATHS ${CMAKE_INSTALL_PREFIX}/lib)
   if(GECODE_SEARCH_LIBRARY)
     list(APPEND GECODE_LIBRARIES ${GECODE_SEARCH_LIBRARY})
   endif()
-  find_library(GECODE_SET_LIBRARY gecodeset)
+  find_library(GECODE_SET_LIBRARY gecodesetl PATHS ${CMAKE_INSTALL_PREFIX}/lib)
   if(GECODE_SET_LIBRARY)
     list(APPEND GECODE_LIBRARIES ${GECODE_SET_LIBRARY})
   endif()

cmake/cudd.cmake

@@ -1,6 +1,7 @@
 
  
-  option (WITH_CUDD "BDD CUDD package" ON)
+option (WITH_CUDD "BDD CUDD package" ON)
+
 if (WITH_CUDD)
 #detect cudd setup, as it is shared between different installations.
 
@@ -9,13 +10,18 @@ find_package(CUDD)
 #  CUDD_LIBRARIES   - Link these to use CUDD
 #  CUDD_INCLUDE_DIR - Include directory for using CUDD
 #
+macro_log_feature (CUDD_FOUND "CUDD"
+    "Use CUDD BDD library"
+    "http://vlsi.colorado.edu/~fabio/CUDD/" FALSE)
+
 if (CUDD_FOUND)
+
     set( CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${CUDD_INCLUDE_DIR} )
 
-check_include_files( cudd.h HAVE_CUDD_H )
+check_include_files( "stdio.h;cudd.h" HAVE_CUDD_H )
 check_include_files( "stdio.h;cudd/cudd.h" HAVE_CUDD_CUDD_H )
-check_include_files( cuddInt.h HAVE_CUDDINT_H )
+check_include_files( "cuddInt.h"  HAVE_CUDDINT_H )
-check_include_files( "stdio.h;cudd/cudd.h;cudd/cuddInt.h" HAVE_CUDD_CUDDINT_H )
+check_include_files( "cudd/cuddInt.h" HAVE_CUDD_CUDDINT_H )
 endif (CUDD_FOUND)
 
 endif(WITH_CUDD)

compile_commands.json

@@ -1 +0,0 @@
-Debug/compile_commands.json

library/system.yap

@@ -45,6 +45,7 @@
 				     mktemp/2,
 	make_directory/1,
 	popen/3,
+     read_link/3,
      rename_file/2,
 	shell/0,
 	shell/1,
@@ -318,6 +319,14 @@ Create file  _OldFile_ to  _NewFile_. This predicate uses the
 `C` built-in function `rename`.
 
 
+*/
+/** @pred read_link(+ SymbolicLink, -Link, -NewPath)
+
+
+Follow a _SymbolicLink_, and obtain the actual _Link_ and the target _newPath_). This predicate uses the
+`C` built-in function `readlink` and is not yet operational in WIN32.
+
+
 */
 /** @pred shell
 
@@ -797,3 +806,8 @@ tmpdir(TmpDir):-
 path_separator('\\'):-
   win, !.
 path_separator('/').
+
+read_link(P,D,F) :-
+	read_link(P, D),
+	absolute_file_name(D, [], F).
+

library/system/sys.c

@@ -312,6 +312,27 @@ static YAP_Bool rename_file(void) {
   return (TRUE);
 }
 
+
+ static YAP_Bool read_link(void) {
+  char *s1 = (char *)YAP_AtomName(YAP_AtomOfTerm(YAP_ARG1));
+#if HAVE_READLINK
+  char buf[PATH_MAX + 1];
+
+  if (readlink(s1, buf, PATH_MAX) < 0)
+    return false;
+  
+  
+    /* return an error number */
+  if (!YAP_Unify(YAP_ARG2, YAP_MkAtomTerm(YAP_LookupAtom(buf)))) {
+      return false;
+  }
+#endif
+# if _WIN32
+  return false;
+#endif
+  return true;
+}
+
 static YAP_Bool dir_separator(void) {
   return (YAP_Unify(YAP_ARG1, YAP_MkAtomTerm(YAP_LookupAtom("/"))));
 }
@@ -1038,6 +1059,7 @@ void init_sys(void) {
   YAP_UserCPredicate("tmpdir", p_tmpdir, 2);
   YAP_UserCPredicate("rename_file", rename_file, 3);
   YAP_UserCPredicate("sleep", p_sleep, 2);
+  YAP_UserCPredicate("read_link", read_link, 2);
   YAP_UserCPredicate("error_message", error_message, 2);
   YAP_UserCPredicate("win", win, 0);
   YAP_UserCPredicate("md5", md5, 3);

packages/bdd/cudd_config.h.cmake

@@ -1,5 +1,15 @@
 // cmake template file
 
+/* Define to 1 if you have the <cuddInt.h> header file. */
+#ifndef HAVE_CUDD_H
+#cmakedefine HAVE_CUDD_H ${HAVE_CUDD_H}
+#endif
+
+/* Define to 1 if you have the <cudd/cuddInt.h> header file. */
+#ifndef HAVE_CUDD_CUDD_H
+#cmakedefine HAVE_CUDD_CUDD_H ${HAVE_CUDD_CUDD_H}
+#endif
+
 /* Define to 1 if you have the <cuddInt.h> header file. */
 #ifndef HAVE_CUDDINT_H
 #cmakedefine HAVE_CUDDINT_H ${HAVE_CUDDINT_H}

packages/cplint/cplint.h

@@ -12,7 +12,7 @@ for the relative license.
 #include "cudd_config.h"
 #if HAVE_CUDD_CUDDINT_H
 #include "cudd/cuddInt.h"
-#else
+#elif HAVE_CUDDINT_H
 #include "cuddInt.h"
 #endif
 #include "YapInterface.h"

packages/cplint/slipcase/bddem.c

@@ -15,10 +15,10 @@ for the relative license.
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#if HAVE_CUDD_CUDDINT_H
+#if HAVE_CUDD_CUDD_H
-#include <cudd/cuddInt.h>
+#include <cudd/cudd.h>
-#elif HAVE_CUDDINT_H
+#elif HAVE_CUDD_H
-#include "cuddInt.h"
+#include "cudd.h"
 #endif
 #include "YapInterface.h"
 #define LOGZERO log(0.000001)

packages/raptor/CMakeLists.txt

@@ -15,9 +15,9 @@ IF (NOT YAP_FOUND)
 ENDIF (NOT YAP_FOUND)
 
 macro_optional_find_package (LibXml2 ON)
-macro_log_feature (LIBXML2_FOUND "RAPTOR"
+macro_log_feature (LIBXML2_FOUND "LIBXML2"
   "Use XML2 Library"
-  "http://www.r.org" FALSE)
+  "http://www.xmlsoft.org" FALSE)
 IF (LIBXML2_FOUND)
   #   LIBXML2_FOUND - System has LibXml2
 #   LIBXML2_INCLUDE_DIR - The LibXml2 include directory
@@ -76,7 +76,7 @@ ENDIF (LIBXML2_FOUND)
 macro_optional_find_package (RAPTOR ON)
 macro_log_feature (RAPTOR_FOUND "RAPTOR"
   "Use RAPTOR Library"
-  "http://www.r.org" FALSE)
+  "http://www.librdf.org" FALSE)
 IF (RAPTOR_FOUND)
   #  RAPTOR_FOUND       - system has Raptor
   #  RAPTOR_LIBRARIES   - Link these to use Raptor

packages/raptor/cmake/FindRAPTOR.cmake

@@ -45,6 +45,7 @@ if ( NOT( RAPTOR_INCLUDE_DIR AND RAPTOR_LIBRARIES ) OR NOT RAPTOR_FOUND )
       NAMES raptor2.h raptor2/raptor2.h raptor.h raptor/raptor.h
 	    PATHS $ENV{RAPTOR_DIR}/include
 	          $ENV{RAPTOR_DIR}
+		  ${CMAKE_INSTALL_PREFIX}/include
 	          ~/Library/Frameworks
 	          /Library/Frameworks
 	          /usr/local/include
@@ -64,6 +65,7 @@ if ( NOT( RAPTOR_INCLUDE_DIR AND RAPTOR_LIBRARIES ) OR NOT RAPTOR_FOUND )
 	    PATHS $ENV{RAPTOR_DIR}/lib
 	          $ENV{RAPTOR_DIR}/lib-dbg
 	          $ENV{RAPTOR_DIR}
+		  ${CMAKE_INSTALL_PREFIX}/lib
 	          ~/Library/Frameworks
 	          /Library/Frameworks
 	          /usr/local/lib

packages/real/real.pl

@@ -66,6 +66,7 @@
 :- use_module(library(charsio)).
 :- use_module(library(readutil)).
 :- use_module(library(debug)).
+:- use_module(library(system)).
 
 :- dynamic( real:r_started/1 ).
 

packages/swig/python/CMakeLists.txt

@@ -12,7 +12,7 @@ if (PYTHONLIBS_FOUND)
 
   INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/CXX)
 
-  SET(CMAKE_SWIG_FLAGS "")
+  SET(CMAKE_SWIG_FLAGS "-py3")
 
   SET_SOURCE_FILES_PROPERTIES(../yap.i PROPERTIES CPLUSPLUS ON)
   SET_SOURCE_FILES_PROPERTIES(../yap.i PROPERTIES SWIG_FLAGS "-includeall")

packages/swig/python/_yap.c

@@ -0,0 +1,3 @@
+
+// make Python happy...
+

packages/swig/python/setup.py.cmake

@@ -4,7 +4,7 @@ import os
 import platform
 
 if platform.system() == 'Darwin':
-    my_extra_link_args = ['-Wl,-rpath','${dlls}']
+    my_extra_link_args = ['-Wl,-rpath','-Wl,${dlls}']
 else:
     my_extra_link_args = []
                            
@@ -23,6 +23,7 @@ setup(
 					extra_link_args=my_extra_link_args,
 					libraries=['Yap++','Yap','YAPPython'],
                              include_dirs=['../../..',
+                                         '${GMP_INCLUDE_DIRS}',
                                          '${CMAKE_SOURCE_DIR}/H',
                                          '${CMAKE_SOURCE_DIR}/H/generated',
                                          '${CMAKE_SOURCE_DIR}/OPTYap',