diff --git a/CHANGES.md b/CHANGES.md index b8fcd22..fe2fb89 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,5 +1,6 @@ 3.3.0 - updated to clingo-5.2.0 release + - python and lua support is disabled for this version - support for #include . - switched to MIT license - switched build system from scons to cmake diff --git a/CMakeLists.txt b/CMakeLists.txt index 74cd1ea..5ec6159 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -55,6 +55,8 @@ set(clingcon_library_targets libclingo libgringo libpotassco libclasp libreify l set(CLINGO_BUILD_STATIC ON CACHE BOOL "need to build static") set(CLINGO_BUILD_APPS OFF CACHE BOOL "no other apps") set(CLASP_BUILD_TEST OFF CACHE BOOL "no clasp tests") +set(CLINGO_BUILD_WITH_PYTHON OFF CACHE BOOL "no python support - use version 3.2.1") +set(CLINGO_BUILD_WITH_LUA OFF CACHE BOOL "no lua support - use version 3.2.1") add_subdirectory(clingo) add_subdirectory(libcsp) diff --git a/README.md b/README.md index c976aec..a7a1fc5 100644 --- a/README.md +++ b/README.md @@ -7,11 +7,12 @@ Features: * based on clingo 5.x and libcsp 1.x * lazy nogood generation based on the order encoding * lazy variable generation allows for huge domains - * supports multi-shot solving + * supports multi-shot solving (currently only supported * supports optimization * no blackbox csp libraries used * uses gringo-5.x theory language interface, please include "csp.lp" * use --help=2 to find specific options for constraint solving + * python and lua support is disabled for this version Call clingcon --help=2 for further options on constraint processing. Please consult the following resources for further information: diff --git a/scratch/release.sh b/scratch/release.sh index a5deb11..111f6b3 100755 --- a/scratch/release.sh +++ b/scratch/release.sh @@ -9,15 +9,16 @@ cd release VERSION=3.3.0 git clone https://github.com/potassco/clingcon.git . -git checkout v${VERSION} +#git checkout v${VERSION} git submodule update --init --recursive GRINGO="clingcon-${VERSION}" GRINGO_LIN64="${GRINGO}-linux-x86_64" SRC="${GRINGO}-source" CMAKE=/home/wv/bin/linux/64/cmake-3.5.2/bin/cmake +#CMAKE=cmake -${CMAKE} -H. -Bbuild -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DCLINGO_REQUIRE_LUA=ON -DCLINGO_BUILD_WITH_LUA=ON -DCLINGO_BUILD_WITH_PYTHON=OFF -DCMAKE_CXX_COMPILER=g++ -DCMAKE_C_COMPILER=gcc -DCMAKE_BUILD_TYPE=release -DCLINGO_BUILD_STATIC=ON -DCLINGO_MANAGE_RPATH=Off -DCMAKE_EXE_LINKER_FLAGS="-pthread -static -s -Wl,-u,pthread_cond_broadcast,-u,pthread_cond_destroy,-u,pthread_cond_signal,-u,pthread_cond_timedwait,-u,pthread_cond_wait,-u,pthread_create,-u,pthread_detach,-u,pthread_equal,-u,pthread_getspecific,-u,pthread_join,-u,pthread_key_create,-u,pthread_key_delete,-u,pthread_mutex_lock,-u,pthread_mutex_unlock,-u,pthread_once,-u,pthread_setspecific" +${CMAKE} -H. -Bbuild -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DCLINGO_REQUIRE_LUA=OFF -DCLINGO_BUILD_WITH_LUA=ON -DCLINGO_BUILD_WITH_PYTHON=OFF -DCMAKE_CXX_COMPILER=g++ -DCMAKE_C_COMPILER=gcc -DCMAKE_BUILD_TYPE=release -DCLINGO_BUILD_STATIC=ON -DCLINGO_MANAGE_RPATH=Off -DCMAKE_EXE_LINKER_FLAGS="-pthread -static -s -Wl,-u,pthread_cond_broadcast,-u,pthread_cond_destroy,-u,pthread_cond_signal,-u,pthread_cond_timedwait,-u,pthread_cond_wait,-u,pthread_create,-u,pthread_detach,-u,pthread_equal,-u,pthread_getspecific,-u,pthread_join,-u,pthread_key_create,-u,pthread_key_delete,-u,pthread_mutex_lock,-u,pthread_mutex_unlock,-u,pthread_once,-u,pthread_setspecific" ${CMAKE} --build build -- -j4