You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@marmotta.apache.org by ss...@apache.org on 2015/12/14 22:40:54 UTC
marmotta git commit: update Docker file dependencies. Any way to test
this?
Repository: marmotta
Updated Branches:
refs/heads/develop 12c13a717 -> 29e1bba20
update Docker file dependencies. Any way to test this?
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/29e1bba2
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/29e1bba2
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/29e1bba2
Branch: refs/heads/develop
Commit: 29e1bba204a3510934956c658165a63b1f44f784
Parents: 12c13a7
Author: Sebastian Schaffert <ss...@apache.org>
Authored: Mon Dec 14 22:42:30 2015 +0100
Committer: Sebastian Schaffert <ss...@apache.org>
Committed: Mon Dec 14 22:42:30 2015 +0100
----------------------------------------------------------------------
libraries/ostrich/backend/CMakeLists.txt | 9 ++++++---
libraries/ostrich/backend/Dockerfile | 10 +++++++---
libraries/ostrich/backend/client/CMakeLists.txt | 1 +
libraries/ostrich/backend/persistence/CMakeLists.txt | 1 +
libraries/ostrich/backend/sharding/CMakeLists.txt | 1 +
5 files changed, 16 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/marmotta/blob/29e1bba2/libraries/ostrich/backend/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/libraries/ostrich/backend/CMakeLists.txt b/libraries/ostrich/backend/CMakeLists.txt
index 608cb2a..6a96f63 100644
--- a/libraries/ostrich/backend/CMakeLists.txt
+++ b/libraries/ostrich/backend/CMakeLists.txt
@@ -19,10 +19,14 @@ find_package (Tcmalloc)
add_definitions(-DNDEBUG)
-if(Boost_IOSTREAMS_FOUND)
+if (Boost_IOSTREAMS_FOUND)
message(STATUS "Enabling gzip/bzip2 support (Boost iostreams found)")
add_definitions(-DHAVE_IOSTREAMS)
-endif(Boost_IOSTREAMS_FOUND)
+endif (Boost_IOSTREAMS_FOUND)
+
+if (Tcmalloc_FOUND)
+ message(STATUS "Enabling profiling support (Tcmalloc found)")
+endif (Tcmalloc_FOUND)
add_subdirectory(util)
add_subdirectory(model)
@@ -34,4 +38,3 @@ add_subdirectory(persistence)
add_subdirectory(sharding)
add_subdirectory(client)
add_subdirectory(test)
-
http://git-wip-us.apache.org/repos/asf/marmotta/blob/29e1bba2/libraries/ostrich/backend/Dockerfile
----------------------------------------------------------------------
diff --git a/libraries/ostrich/backend/Dockerfile b/libraries/ostrich/backend/Dockerfile
index 377e40b..76d5fcf 100644
--- a/libraries/ostrich/backend/Dockerfile
+++ b/libraries/ostrich/backend/Dockerfile
@@ -40,19 +40,23 @@ RUN apt-get update -qq \
libgflags-dev \
libgtest-dev \
libboost-all-dev \
- libtcmalloc-minimal4
+ libgoogle-perftools-dev
RUN git clone https://github.com/grpc/grpc.git \
&& cd grpc \
&& git submodule update --init --recursive \
&& make \
&& make install \
- && cd ..
+ && cd third_party/protobuf \
+ && ./configure \
+ && make \
+ && make install \
+ && cd ../../..
# build
RUN mkdir build \
&& cd build \
- && cmake .. \
+ && cmake cmake -D CMAKE_BUILD_TYPE=Release .... \
&& make \
&& cd ..
http://git-wip-us.apache.org/repos/asf/marmotta/blob/29e1bba2/libraries/ostrich/backend/client/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/libraries/ostrich/backend/client/CMakeLists.txt b/libraries/ostrich/backend/client/CMakeLists.txt
index 220799f..50b1009 100644
--- a/libraries/ostrich/backend/client/CMakeLists.txt
+++ b/libraries/ostrich/backend/client/CMakeLists.txt
@@ -5,4 +5,5 @@ target_link_libraries(marmotta_client
marmotta_model marmotta_service marmotta_parser marmotta_serializer
${GFLAGS_LIBRARY} ${Boost_LIBRARIES}
${CMAKE_THREAD_LIBS_INIT} ${PROTOBUF_LIBRARIES} ${GRPC_LIBRARIES})
+install(TARGETS marmotta_client DESTINATION bin)
http://git-wip-us.apache.org/repos/asf/marmotta/blob/29e1bba2/libraries/ostrich/backend/persistence/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/libraries/ostrich/backend/persistence/CMakeLists.txt b/libraries/ostrich/backend/persistence/CMakeLists.txt
index 3300940..d4a274a 100644
--- a/libraries/ostrich/backend/persistence/CMakeLists.txt
+++ b/libraries/ostrich/backend/persistence/CMakeLists.txt
@@ -7,4 +7,5 @@ target_link_libraries(marmotta_persistence
marmotta_model marmotta_service marmotta_util marmotta_sparql
${LevelDB_LIBRARY} ${GFLAGS_LIBRARY} ${GLOG_LIBRARY}
${CMAKE_THREAD_LIBS_INIT} ${PROTOBUF_LIBRARIES} ${GRPC_LIBRARIES} ${Tcmalloc_LIBRARIES})
+install(TARGETS marmotta_persistence DESTINATION bin)
http://git-wip-us.apache.org/repos/asf/marmotta/blob/29e1bba2/libraries/ostrich/backend/sharding/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/libraries/ostrich/backend/sharding/CMakeLists.txt b/libraries/ostrich/backend/sharding/CMakeLists.txt
index 9afb0ec..38c38b4 100644
--- a/libraries/ostrich/backend/sharding/CMakeLists.txt
+++ b/libraries/ostrich/backend/sharding/CMakeLists.txt
@@ -7,4 +7,5 @@ target_link_libraries(marmotta_sharding
marmotta_util marmotta_model marmotta_service
${LevelDB_LIBRARY} ${GFLAGS_LIBRARY} ${GLOG_LIBRARY}
${CMAKE_THREAD_LIBS_INIT} ${PROTOBUF_LIBRARIES} ${GRPC_LIBRARIES} ${Tcmalloc_LIBRARIES})
+install(TARGETS marmotta_sharding DESTINATION bin)