diff --git a/.gitignore b/.gitignore index eb89f3c..870c5b5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,92 +1,91 @@ # Compiled Object files *.slo *.lo *.o *.obj # Compiled Dynamic libraries *.so *.so.* *.dylib *.dll # Compiled Static libraries *.lai *.la *.a *.lib # Executables *.exe *.out *.app *.class # Mobile Tools for Java (J2ME) .mtj.tmp/ # Package Files # *.jar *.war *.ear # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml hs_err_pid* # Qt-es /.qmake.cache /.qmake.stash *.pro.user *.pro.user.* *.moc moc_*.cpp qrc_*.cpp ui_*.h Makefile* *-build-* # QtCreator *.autosave coco/*.old coco/*~ *~ cpp/build-*/* cpp/xreate-debug/* cpp/xreate-release/* cpp/.idea CMakeLists.txt.user cmake_install.cmake project/* nb*.xml .* target/* /tools/phabricator/xreate-frontend/nbproject/private/ documentation/trash4/ trash/ CMakeFiles/ gen-cpp/ generated-cpp/ gen-php/ generated-js/ books/ build/ coco/Parser.* coco/Scanner.* cpp/src/compilation/latecontextcompiler.cpp cpp/src/compilation/latecontextcompiler.h cpp/src/pass/environmenttestspass.cpp cpp/src/pass/environmenttestspass.h cpp/src/query/ptrvalid.cpp cpp/src/query/ptrvalid.h cpp/tests/deferred/ cpp/tests/vendorAPI/ -installation/ scripts/metatests/ tools/phabricator/administration/ diff --git a/installation/docker/Dockerfile-arm b/installation/docker/Dockerfile-arm new file mode 100644 index 0000000..68ed810 --- /dev/null +++ b/installation/docker/Dockerfile-arm @@ -0,0 +1,8 @@ +FROM armbuild/debian +MAINTAINER Melnychenko Volodymyr + +ARG LLVM_VERSION=3.8 +ARG BOOST_VERSION=_1_55 +ARG CLASP_VERSION=a363d9 + +RUN apt install libboost$BOOST_VERSION-dev libclang-$LLVM_VERSION-dev llvm-$LLVM_VERSION-dev diff --git a/installation/docker/Dockerfile-debian b/installation/docker/Dockerfile-debian new file mode 100644 index 0000000..23437b6 --- /dev/null +++ b/installation/docker/Dockerfile-debian @@ -0,0 +1,58 @@ +FROM debian:jessie +MAINTAINER Melnychenko Volodymyr + +ARG LLVM_VERSION=3.8 +ARG BOOST_VERSION=1.55 +ARG CLASP_VERSION=95cc1182f +ARG JEAYESON_VERSION=20389e5a + +ENV DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true + +RUN echo "deb http://httpredir.debian.org/debian jessie-backports main" >> /etc/apt/sources.list &&\ + apt update && apt-get install -y libboost$BOOST_VERSION-dev libclang-$LLVM_VERSION-dev llvm-$LLVM_VERSION-dev \ + libtbb-dev cmake git libgtest-dev libxml2-dev \ + coco-cpp bison re2c scons g++ zlib1g-dev +#coco build dep packages: wget unzip + + +# POTASSCO +WORKDIR /opt/potassco/clingo/ + +RUN git clone https://github.com/potassco/clingo.git ./ &&\ + git reset --hard $CLASP_VERSION + +#potassco patches: +#ADD patches/potassco-patch-$CLASP_VERSION . +#git apply potassco-patch-$CLASP_VERSION &&\ + +RUN scons configure --build-dir=debug &&\ + sed -i "s/, '-fvisibility=hidden'//" build/debug.py &&\ + sed -i "s/CXXFLAGS = \[\(.*\)\]/CXXFLAGS = \['-fPIC', \1\]/" build/debug.py &&\ + sed -i "s/WITH_LUA = 'auto'/WITH_LUA = None/" build/debug.py &&\ + sed -i "s/WITH_PYTHON = 'auto'/WITH_PYTHON = None/" build/debug.py &&\ + sed -i "s/'-std=c++11'/'-std=c++14'/" build/debug.py &&\ + cat build/debug.py &&\ + scons --build-dir=debug + +##sed -i "s/CXX = 'c++'/CXX = 'g++-6'/" build/debug.py &&\ + + +# GTEST +RUN cd /usr/src/gtest/ && cmake CMakeLists.txt && make +ENV GTEST_ROOT="/usr/src/gtest/" + +# COCO + + +# XREATE +WORKDIR /opt/xreate +RUN git clone --recursive https://pgess@bitbucket.org/pgess/xreate.git ./ +ADD patches/jeayeson-patch-$JEAYESON_VERSION vendors/jeayeson/ + +RUN cd vendors/jeayeson/ &&\ + git apply jeayeson-patch-$JEAYESON_VERSION &&\ + ./configure &&\ + mkdir ../../build &&\ + cd ../../build &&\ + cmake -DBUILD_XREATE_TESTS=1 ../cpp &&\ + make -j4 VERBOSE=1 diff --git a/installation/docker/patches/jeayeson-patch-20389e5a b/installation/docker/patches/jeayeson-patch-20389e5a new file mode 100644 index 0000000..eee1bde --- /dev/null +++ b/installation/docker/patches/jeayeson-patch-20389e5a @@ -0,0 +1,32 @@ +diff --git a/include/jeayeson/detail/stream.hpp b/include/jeayeson/detail/stream.hpp +index 2a6937a..b9fedd3 100644 +--- a/include/jeayeson/detail/stream.hpp ++++ b/include/jeayeson/detail/stream.hpp +@@ -40,11 +40,11 @@ namespace jeayeson + inline std::ostream& operator <<(std::ostream &stream, value::null_t const &) + { return (stream << "null"); } + +- template <> ++ //template <> + inline std::ostream& operator <<(std::ostream &stream, array_t const &arr) + { + stream << arr.delim_open; +- streamjoin(arr.values_.begin(), arr.values_.end(), stream); ++ streamjoin(arr.begin(), arr.end(), stream); + stream << arr.delim_close; + return stream; + } +@@ -56,11 +56,11 @@ namespace jeayeson + ) + { return (stream << "\"" << detail::escape(p.first) << "\":" << p.second); } + +- template <> ++ //template <> + inline std::ostream& operator <<(std::ostream &stream, map_t const &m) + { + stream << m.delim_open; +- streamjoin(m.values_.begin(), m.values_.end(), stream); ++ streamjoin(m.begin(), m.end(), stream); + stream << m.delim_close; + return stream; + }