Skip to content

Commit

Permalink
disabled python and lua support
Browse files Browse the repository at this point in the history
  • Loading branch information
root committed Jun 28, 2017
1 parent abde578 commit d36fd87
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 3 deletions.
1 change: 1 addition & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
@@ -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 <csp>.
- switched to MIT license
- switched build system from scons to cmake
Expand Down
2 changes: 2 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 <incmode> 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:
Expand Down
5 changes: 3 additions & 2 deletions scratch/release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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


0 comments on commit d36fd87

Please sign in to comment.