Refactoring of directory structure and CMake files

Directory structure inherited from security-server is confusing and doesn't
separate components that form the project.
New structure consists of the following directories:
* src/include - public security-manager interface
* src/dpl - sources and includes borrowed from wrt-commons dpl
* src/common - sources of libsecurity-manager-common library
* src/client - sources of libsecurity-manager-client library
* src/server - sources of security-manager binary
* pc - template of pkg-config file

Additionally common, client and server include files have been moved into
"include" subdirectory in each source dir.
CMake files are now more hierarchical, with separete file per component.
Previously not checked dependency on libcap is now checked in server CMake.
Library versioning is aligned with package versioning of security-manager.
Version of libsecurity-manager-common is better parametrized.

Change-Id: I8db728e53f912db2b15109f5502def7fc105f77f
Signed-off-by: Rafal Krypa <r.krypa@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 282a76b..50d2589 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (c) 2011 Samsung Electronics Co., Ltd All Rights Reserved
+# Copyright (c) 2011 - 2014 Samsung Electronics Co., Ltd All Rights Reserved
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -58,11 +58,6 @@ IF (CMAKE_BUILD_TYPE MATCHES "DEBUG")
     ADD_DEFINITIONS("-DBUILD_TYPE_DEBUG")
 ENDIF (CMAKE_BUILD_TYPE MATCHES "DEBUG")
 
-
-SET(TARGET_SECURITY_MANAGER "security-manager")
-SET(TARGET_SECURITY_MANAGER_CLIENT "security-manager-client")
-SET(TARGET_SERVER_COMMON "security-manager-commons")
-
 ADD_SUBDIRECTORY(src)
-ADD_SUBDIRECTORY(build)
+ADD_SUBDIRECTORY(pc)
 ADD_SUBDIRECTORY(systemd)

diff --git a/README b/README
index 106258d..6730c1e 100644 (file)
--- a/README
+++ b/README
@@ -12,7 +12,7 @@ The implementation of daemon part is divided into:
     a generalization for services that security-server provides.
 and
     services part: implemented as classes derived from GenericSocketService
-    grouped in src/server2/service directory that defines actions done by
+    grouped in src/server/service directory that defines actions done by
     security-manager after receiving certain requests from client side.
 
 The security-manager's manager part is fully inherited from security-server,

diff --git a/build/CMakeLists.txt b/build/CMakeLists.txt
deleted file mode 100644 (file)
index 77b8c60..0000000
--- a/build/CMakeLists.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright (c) 2011 Samsung Electronics Co., Ltd All Rights Reserved
-#
-#    Licensed under the Apache License, Version 2.0 (the "License");
-#    you may not use this file except in compliance with the License.
-#    You may obtain a copy of the License at
-#
-#        http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS,
-#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#    See the License for the specific language governing permissions and
-#    limitations under the License.
-#
-# @file        CMakeLists.txt
-# @author      Tomasz Swierczek (t.swierczek@samsung.com)
-#
-
-ADD_SUBDIRECTORY(security-manager)

diff --git a/build/security-manager/CMakeLists.txt b/pc/CMakeLists.txt
similarity index 78%
rename from build/security-manager/CMakeLists.txt
rename to pc/CMakeLists.txt
index 31be27b..d54b4db 100644 (file)
--- a/build/security-manager/CMakeLists.txt
+++ b/pc/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (c) 2011 Samsung Electronics Co., Ltd All Rights Reserved
+# Copyright (c) 2011-2014 Samsung Electronics Co., Ltd All Rights Reserved
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -19,8 +19,4 @@
 
 CONFIGURE_FILE(security-manager.pc.in security-manager.pc @ONLY)
 
-INSTALL(FILES
-    ${CMAKE_BINARY_DIR}/build/security-manager/security-manager.pc
-    DESTINATION
-    ${LIB_INSTALL_DIR}/pkgconfig
-    )
+INSTALL(FILES security-manager.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)

diff --git a/build/security-manager/security-manager.pc.in b/pc/security-manager.pc.in
similarity index 100%
rename from build/security-manager/security-manager.pc.in
rename to pc/security-manager.pc.in

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 08fe241..68f107f 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,94 +1,14 @@
-PKG_CHECK_MODULES(SECURITY_MANAGER_DEP
-    dlog
-    libsmack
-    libprivilege-control
-    libsystemd-daemon
-    REQUIRED
-    )
-
-SET(SECURITY_MANAGER_PATH ${PROJECT_SOURCE_DIR}/src)
-SET(SERVER2_PATH ${PROJECT_SOURCE_DIR}/src/server)
-
-SET(SECURITY_MANAGER_SOURCES
-    ${SERVER2_PATH}/main/security-manager-util.cpp
-    ${SERVER2_PATH}/main/generic-socket-manager.cpp
-    ${SERVER2_PATH}/main/socket-manager.cpp
-    ${SERVER2_PATH}/main/server2-main.cpp
-    ${SERVER2_PATH}/service/smack-common.cpp
-    ${SERVER2_PATH}/service/smack-rules.cpp
-    ${SERVER2_PATH}/service/installer.cpp
-    )
-
-SET_SOURCE_FILES_PROPERTIES(
-    ${SECURITY_MANAGER_SOURCES}
-    PROPERTIES
-        COMPILE_FLAGS "-D_GNU_SOURCE -fvisibility=hidden")
-
-INCLUDE_DIRECTORIES(SYSTEM
-    ${SECURITY_MANAGER_DEP_INCLUDE_DIRS}
-    )
-
-INCLUDE_DIRECTORIES(
-    ${SECURITY_MANAGER_PATH}/include
-    ${SERVER2_PATH}/main
-    ${SERVER2_PATH}/common
-    ${SERVER2_PATH}/service
-    ${SERVER2_PATH}/dpl/core/include
-    ${SERVER2_PATH}/dpl/log/include
-    )
-
-ADD_EXECUTABLE(${TARGET_SECURITY_MANAGER} ${SECURITY_MANAGER_SOURCES})
-
-TARGET_LINK_LIBRARIES(${TARGET_SECURITY_MANAGER}
-    ${SECURITY_MANAGER_DEP_LIBRARIES}
-    ${TARGET_SERVER_COMMON}
-    -lcap
-    )
-
-
-################################################################################
-
-SET(SECURITY_MANAGER_CLIENT_VERSION_MAJOR 1)
-SET(SECURITY_MANAGER_CLIENT_VERSION ${SECURITY_MANAGER_CLIENT_VERSION_MAJOR}.0.1)
-
-INCLUDE_DIRECTORIES(
-    ${SERVER2_PATH}/client
-    ${SERVER2_PATH}/common
-    ${SERVER2_PATH}/dpl/core/include
-    ${SERVER2_PATH}/dpl/log/include
-    )
-
-SET(SECURITY_MANAGER_CLIENT_SOURCES
-    ${SERVER2_PATH}/client/client-security-manager.cpp
-    ${SERVER2_PATH}/client/client-common.cpp
-    )
-
-ADD_LIBRARY(${TARGET_SECURITY_MANAGER_CLIENT} SHARED ${SECURITY_MANAGER_CLIENT_SOURCES})
-
-SET_TARGET_PROPERTIES(
-    ${TARGET_SECURITY_MANAGER_CLIENT}
-    PROPERTIES
-        COMPILE_FLAGS "-D_GNU_SOURCE -fPIC -fvisibility=hidden"
-        SOVERSION ${SECURITY_MANAGER_CLIENT_VERSION_MAJOR}
-        VERSION ${SECURITY_MANAGER_CLIENT_VERSION}
-    )
-
-TARGET_LINK_LIBRARIES(${TARGET_SECURITY_MANAGER_CLIENT}
-    ${SECURITY_MANAGER_DEP_LIBRARIES}
-    ${TARGET_SERVER_COMMON}
-    )
-
-################################################################################
-
-INSTALL(TARGETS ${TARGET_SECURITY_MANAGER_CLIENT} DESTINATION ${LIB_INSTALL_DIR})
-
-INSTALL(TARGETS ${TARGET_SECURITY_MANAGER} DESTINATION bin)
-
-INSTALL(FILES
-    ${SECURITY_MANAGER_PATH}/include/security-manager.h
-    DESTINATION  ${INCLUDE_INSTALL_DIR}/security-manager
-    )
-
-################################################################################
-
+SET(INCLUDE_PATH ${PROJECT_SOURCE_DIR}/src/include)
+SET(COMMON_PATH  ${PROJECT_SOURCE_DIR}/src/common)
+SET(CLIENT_PATH  ${PROJECT_SOURCE_DIR}/src/client)
+SET(SERVER_PATH  ${PROJECT_SOURCE_DIR}/src/server)
+SET(DPL_PATH     ${PROJECT_SOURCE_DIR}/src/dpl)
+
+SET(TARGET_SERVER "security-manager")
+SET(TARGET_CLIENT "security-manager-client")
+SET(TARGET_COMMON "security-manager-commons")
+
+ADD_SUBDIRECTORY(include)
+ADD_SUBDIRECTORY(common)
+ADD_SUBDIRECTORY(client)
 ADD_SUBDIRECTORY(server)

diff --git a/src/client/CMakeLists.txt b/src/client/CMakeLists.txt
new file mode 100644 (file)
index 0000000..9e4ad1c
--- /dev/null
+++ b/src/client/CMakeLists.txt
@@ -0,0 +1,30 @@
+SET(CLIENT_VERSION_MAJOR 0)
+SET(CLIENT_VERSION ${CLIENT_VERSION_MAJOR}.1.0)
+
+INCLUDE_DIRECTORIES(
+    ${INCLUDE_PATH}
+    ${COMMON_PATH}/include
+    ${CLIENT_PATH}/include
+    ${DPL_PATH}/core/include
+    ${DPL_PATH}/log/include
+    )
+
+SET(CLIENT_SOURCES
+    ${CLIENT_PATH}/client-security-manager.cpp
+    ${CLIENT_PATH}/client-common.cpp
+    )
+
+ADD_LIBRARY(${TARGET_CLIENT} SHARED ${CLIENT_SOURCES})
+
+SET_TARGET_PROPERTIES(${TARGET_CLIENT}
+    PROPERTIES
+        COMPILE_FLAGS "-D_GNU_SOURCE -fPIC -fvisibility=hidden"
+        SOVERSION ${CLIENT_VERSION_MAJOR}
+        VERSION ${CLIENT_VERSION}
+    )
+
+TARGET_LINK_LIBRARIES(${TARGET_CLIENT}
+    ${TARGET_COMMON}
+    )
+
+INSTALL(TARGETS ${TARGET_CLIENT} DESTINATION ${LIB_INSTALL_DIR})

diff --git a/src/server/client/client-common.cpp b/src/client/client-common.cpp
similarity index 100%
rename from src/server/client/client-common.cpp
rename to src/client/client-common.cpp

diff --git a/src/server/client/client-security-manager.cpp b/src/client/client-security-manager.cpp
similarity index 100%
rename from src/server/client/client-security-manager.cpp
rename to src/client/client-security-manager.cpp

diff --git a/src/server/client/client-common.h b/src/client/include/client-common.h
similarity index 100%
rename from src/server/client/client-common.h
rename to src/client/include/client-common.h

diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt
new file mode 100644 (file)
index 0000000..7e9cf2c
--- /dev/null
+++ b/src/common/CMakeLists.txt
@@ -0,0 +1,50 @@
+SET(COMMON_VERSION_MAJOR 0)
+SET(COMMON_VERSION ${COMMON_VERSION_MAJOR}.1.0)
+
+PKG_CHECK_MODULES(COMMON_DEP
+    REQUIRED
+    dlog
+    libsmack
+    )
+
+INCLUDE_DIRECTORIES(SYSTEM
+    ${COMMON_DEP_INCLUDE_DIRS}
+    )
+
+INCLUDE_DIRECTORIES(
+    ${COMMON_PATH}/include
+    ${DPL_PATH}/core/include
+    ${DPL_PATH}/log/include
+    )
+
+SET(COMMON_SOURCES
+    ${COMMON_PATH}/protocols.cpp
+    ${COMMON_PATH}/message-buffer.cpp
+    ${COMMON_PATH}/smack-check.cpp
+    ${DPL_PATH}/log/src/abstract_log_provider.cpp
+    ${DPL_PATH}/log/src/dlog_log_provider.cpp
+    ${DPL_PATH}/log/src/log.cpp
+    ${DPL_PATH}/log/src/old_style_log_provider.cpp
+    ${DPL_PATH}/core/src/assert.cpp
+    ${DPL_PATH}/core/src/binary_queue.cpp
+    ${DPL_PATH}/core/src/colors.cpp
+    ${DPL_PATH}/core/src/exception.cpp
+    ${DPL_PATH}/core/src/noncopyable.cpp
+    ${DPL_PATH}/core/src/serialization.cpp
+    ${DPL_PATH}/core/src/singleton.cpp
+    )
+
+ADD_LIBRARY(${TARGET_COMMON} SHARED ${COMMON_SOURCES})
+
+SET_TARGET_PROPERTIES(${TARGET_COMMON}
+    PROPERTIES
+        COMPILE_FLAGS "-D_GNU_SOURCE -fPIC -fvisibility=default"
+        SOVERSION ${COMMON_VERSION_MAJOR}
+        VERSION ${COMMON_VERSION}
+    )
+
+TARGET_LINK_LIBRARIES(${TARGET_COMMON}
+    ${COMMON_DEP_LIBRARIES}
+    )
+
+INSTALL(TARGETS ${TARGET_COMMON} DESTINATION ${LIB_INSTALL_DIR})

diff --git a/src/server/common/connection-info.h b/src/common/include/connection-info.h
similarity index 100%
rename from src/server/common/connection-info.h
rename to src/common/include/connection-info.h

diff --git a/src/server/common/message-buffer.h b/src/common/include/message-buffer.h
similarity index 100%
rename from src/server/common/message-buffer.h
rename to src/common/include/message-buffer.h

diff --git a/src/server/common/protocols.h b/src/common/include/protocols.h
similarity index 100%
rename from src/server/common/protocols.h
rename to src/common/include/protocols.h

diff --git a/src/server/common/smack-check.h b/src/common/include/smack-check.h
similarity index 100%
rename from src/server/common/smack-check.h
rename to src/common/include/smack-check.h

diff --git a/src/server/common/message-buffer.cpp b/src/common/message-buffer.cpp
similarity index 100%
rename from src/server/common/message-buffer.cpp
rename to src/common/message-buffer.cpp

diff --git a/src/server/common/protocols.cpp b/src/common/protocols.cpp
similarity index 100%
rename from src/server/common/protocols.cpp
rename to src/common/protocols.cpp

diff --git a/src/server/common/smack-check.cpp b/src/common/smack-check.cpp
similarity index 100%
rename from src/server/common/smack-check.cpp
rename to src/common/smack-check.cpp

diff --git a/src/server/dpl/core/include/dpl/assert.h b/src/dpl/core/include/dpl/assert.h
similarity index 100%
rename from src/server/dpl/core/include/dpl/assert.h
rename to src/dpl/core/include/dpl/assert.h

diff --git a/src/server/dpl/core/include/dpl/availability.h b/src/dpl/core/include/dpl/availability.h
similarity index 100%
rename from src/server/dpl/core/include/dpl/availability.h
rename to src/dpl/core/include/dpl/availability.h

diff --git a/src/server/dpl/core/include/dpl/binary_queue.h b/src/dpl/core/include/dpl/binary_queue.h
similarity index 100%
rename from src/server/dpl/core/include/dpl/binary_queue.h
rename to src/dpl/core/include/dpl/binary_queue.h

diff --git a/src/server/dpl/core/include/dpl/char_traits.h b/src/dpl/core/include/dpl/char_traits.h
similarity index 100%
rename from src/server/dpl/core/include/dpl/char_traits.h
rename to src/dpl/core/include/dpl/char_traits.h

diff --git a/src/server/dpl/core/include/dpl/colors.h b/src/dpl/core/include/dpl/colors.h
similarity index 100%
rename from src/server/dpl/core/include/dpl/colors.h
rename to src/dpl/core/include/dpl/colors.h

diff --git a/src/server/dpl/core/include/dpl/errno_string.h b/src/dpl/core/include/dpl/errno_string.h
similarity index 100%
rename from src/server/dpl/core/include/dpl/errno_string.h
rename to src/dpl/core/include/dpl/errno_string.h

diff --git a/src/server/dpl/core/include/dpl/exception.h b/src/dpl/core/include/dpl/exception.h
similarity index 100%
rename from src/server/dpl/core/include/dpl/exception.h
rename to src/dpl/core/include/dpl/exception.h

diff --git a/src/server/dpl/core/include/dpl/free_deleter.h b/src/dpl/core/include/dpl/free_deleter.h
similarity index 100%
rename from src/server/dpl/core/include/dpl/free_deleter.h
rename to src/dpl/core/include/dpl/free_deleter.h

diff --git a/src/server/dpl/core/include/dpl/fstream_accessors.h b/src/dpl/core/include/dpl/fstream_accessors.h
similarity index 100%
rename from src/server/dpl/core/include/dpl/fstream_accessors.h
rename to src/dpl/core/include/dpl/fstream_accessors.h

diff --git a/src/server/dpl/core/include/dpl/noncopyable.h b/src/dpl/core/include/dpl/noncopyable.h
similarity index 100%
rename from src/server/dpl/core/include/dpl/noncopyable.h
rename to src/dpl/core/include/dpl/noncopyable.h

diff --git a/src/server/dpl/core/include/dpl/noreturn.h b/src/dpl/core/include/dpl/noreturn.h
similarity index 100%
rename from src/server/dpl/core/include/dpl/noreturn.h
rename to src/dpl/core/include/dpl/noreturn.h

diff --git a/src/server/dpl/core/include/dpl/serialization.h b/src/dpl/core/include/dpl/serialization.h
similarity index 100%
rename from src/server/dpl/core/include/dpl/serialization.h
rename to src/dpl/core/include/dpl/serialization.h

diff --git a/src/server/dpl/core/include/dpl/singleton.h b/src/dpl/core/include/dpl/singleton.h
similarity index 100%
rename from src/server/dpl/core/include/dpl/singleton.h
rename to src/dpl/core/include/dpl/singleton.h

diff --git a/src/server/dpl/core/include/dpl/singleton_impl.h b/src/dpl/core/include/dpl/singleton_impl.h
similarity index 100%
rename from src/server/dpl/core/include/dpl/singleton_impl.h
rename to src/dpl/core/include/dpl/singleton_impl.h

diff --git a/src/server/dpl/core/include/dpl/singleton_safe_impl.h b/src/dpl/core/include/dpl/singleton_safe_impl.h
similarity index 100%
rename from src/server/dpl/core/include/dpl/singleton_safe_impl.h
rename to src/dpl/core/include/dpl/singleton_safe_impl.h

diff --git a/src/server/dpl/core/include/dpl/string.h b/src/dpl/core/include/dpl/string.h
similarity index 100%
rename from src/server/dpl/core/include/dpl/string.h
rename to src/dpl/core/include/dpl/string.h

diff --git a/src/server/dpl/core/src/assert.cpp b/src/dpl/core/src/assert.cpp
similarity index 100%
rename from src/server/dpl/core/src/assert.cpp
rename to src/dpl/core/src/assert.cpp

diff --git a/src/server/dpl/core/src/binary_queue.cpp b/src/dpl/core/src/binary_queue.cpp
similarity index 100%
rename from src/server/dpl/core/src/binary_queue.cpp
rename to src/dpl/core/src/binary_queue.cpp

diff --git a/src/server/dpl/core/src/colors.cpp b/src/dpl/core/src/colors.cpp
similarity index 100%
rename from src/server/dpl/core/src/colors.cpp
rename to src/dpl/core/src/colors.cpp

diff --git a/src/server/dpl/core/src/errno_string.cpp b/src/dpl/core/src/errno_string.cpp
similarity index 100%
rename from src/server/dpl/core/src/errno_string.cpp
rename to src/dpl/core/src/errno_string.cpp

diff --git a/src/server/dpl/core/src/exception.cpp b/src/dpl/core/src/exception.cpp
similarity index 100%
rename from src/server/dpl/core/src/exception.cpp
rename to src/dpl/core/src/exception.cpp

diff --git a/src/server/dpl/core/src/noncopyable.cpp b/src/dpl/core/src/noncopyable.cpp
similarity index 100%
rename from src/server/dpl/core/src/noncopyable.cpp
rename to src/dpl/core/src/noncopyable.cpp

diff --git a/src/server/dpl/core/src/serialization.cpp b/src/dpl/core/src/serialization.cpp
similarity index 100%
rename from src/server/dpl/core/src/serialization.cpp
rename to src/dpl/core/src/serialization.cpp

diff --git a/src/server/dpl/core/src/singleton.cpp b/src/dpl/core/src/singleton.cpp
similarity index 100%
rename from src/server/dpl/core/src/singleton.cpp
rename to src/dpl/core/src/singleton.cpp

diff --git a/src/server/dpl/core/src/string.cpp b/src/dpl/core/src/string.cpp
similarity index 100%
rename from src/server/dpl/core/src/string.cpp
rename to src/dpl/core/src/string.cpp

diff --git a/src/server/dpl/db/include/dpl/db/naive_synchronization_object.h b/src/dpl/db/include/dpl/db/naive_synchronization_object.h
similarity index 100%
rename from src/server/dpl/db/include/dpl/db/naive_synchronization_object.h
rename to src/dpl/db/include/dpl/db/naive_synchronization_object.h

diff --git a/src/server/dpl/db/include/dpl/db/sql_connection.h b/src/dpl/db/include/dpl/db/sql_connection.h
similarity index 100%
rename from src/server/dpl/db/include/dpl/db/sql_connection.h
rename to src/dpl/db/include/dpl/db/sql_connection.h

diff --git a/src/server/dpl/db/src/naive_synchronization_object.cpp b/src/dpl/db/src/naive_synchronization_object.cpp
similarity index 100%
rename from src/server/dpl/db/src/naive_synchronization_object.cpp
rename to src/dpl/db/src/naive_synchronization_object.cpp

diff --git a/src/server/dpl/db/src/sql_connection.cpp b/src/dpl/db/src/sql_connection.cpp
similarity index 100%
rename from src/server/dpl/db/src/sql_connection.cpp
rename to src/dpl/db/src/sql_connection.cpp

diff --git a/src/server/dpl/log/include/dpl/log/abstract_log_provider.h b/src/dpl/log/include/dpl/log/abstract_log_provider.h
similarity index 100%
rename from src/server/dpl/log/include/dpl/log/abstract_log_provider.h
rename to src/dpl/log/include/dpl/log/abstract_log_provider.h

diff --git a/src/server/dpl/log/include/dpl/log/dlog_log_provider.h b/src/dpl/log/include/dpl/log/dlog_log_provider.h
similarity index 100%
rename from src/server/dpl/log/include/dpl/log/dlog_log_provider.h
rename to src/dpl/log/include/dpl/log/dlog_log_provider.h

diff --git a/src/server/dpl/log/include/dpl/log/log.h b/src/dpl/log/include/dpl/log/log.h
similarity index 100%
rename from src/server/dpl/log/include/dpl/log/log.h
rename to src/dpl/log/include/dpl/log/log.h

diff --git a/src/server/dpl/log/include/dpl/log/old_style_log_provider.h b/src/dpl/log/include/dpl/log/old_style_log_provider.h
similarity index 100%
rename from src/server/dpl/log/include/dpl/log/old_style_log_provider.h
rename to src/dpl/log/include/dpl/log/old_style_log_provider.h

diff --git a/src/server/dpl/log/src/abstract_log_provider.cpp b/src/dpl/log/src/abstract_log_provider.cpp
similarity index 100%
rename from src/server/dpl/log/src/abstract_log_provider.cpp
rename to src/dpl/log/src/abstract_log_provider.cpp

diff --git a/src/server/dpl/log/src/dlog_log_provider.cpp b/src/dpl/log/src/dlog_log_provider.cpp
similarity index 100%
rename from src/server/dpl/log/src/dlog_log_provider.cpp
rename to src/dpl/log/src/dlog_log_provider.cpp

diff --git a/src/server/dpl/log/src/log.cpp b/src/dpl/log/src/log.cpp
similarity index 100%
rename from src/server/dpl/log/src/log.cpp
rename to src/dpl/log/src/log.cpp

diff --git a/src/server/dpl/log/src/old_style_log_provider.cpp b/src/dpl/log/src/old_style_log_provider.cpp
similarity index 100%
rename from src/server/dpl/log/src/old_style_log_provider.cpp
rename to src/dpl/log/src/old_style_log_provider.cpp

diff --git a/src/include/CMakeLists.txt b/src/include/CMakeLists.txt
new file mode 100644 (file)
index 0000000..6f9a45f
--- /dev/null
+++ b/src/include/CMakeLists.txt
@@ -0,0 +1,4 @@
+INSTALL(FILES
+    ${INCLUDE_PATH}/security-manager.h
+    DESTINATION ${INCLUDE_INSTALL_DIR}/security-manager
+    )

diff --git a/src/server/CMakeLists.txt b/src/server/CMakeLists.txt
index a53d379..d4349f6 100644 (file)
--- a/src/server/CMakeLists.txt
+++ b/src/server/CMakeLists.txt
@@ -1,52 +1,43 @@
-PKG_CHECK_MODULES(COMMON_DEP
-    dlog
+PKG_CHECK_MODULES(SERVER_DEP
     REQUIRED
-    )
-
-SET(COMMON_PATH ${PROJECT_SOURCE_DIR}/src/server)
-
-SET(COMMON_SOURCES
-    ${COMMON_PATH}/common/protocols.cpp
-    ${COMMON_PATH}/common/message-buffer.cpp
-    ${COMMON_PATH}/common/smack-check.cpp
-    ${COMMON_PATH}/dpl/log/src/abstract_log_provider.cpp
-    ${COMMON_PATH}/dpl/log/src/dlog_log_provider.cpp
-    ${COMMON_PATH}/dpl/log/src/log.cpp
-    ${COMMON_PATH}/dpl/log/src/old_style_log_provider.cpp
-    ${COMMON_PATH}/dpl/core/src/assert.cpp
-    ${COMMON_PATH}/dpl/core/src/binary_queue.cpp
-    ${COMMON_PATH}/dpl/core/src/colors.cpp
-    ${COMMON_PATH}/dpl/core/src/exception.cpp
-    ${COMMON_PATH}/dpl/core/src/noncopyable.cpp
-    ${COMMON_PATH}/dpl/core/src/serialization.cpp
-    ${COMMON_PATH}/dpl/core/src/singleton.cpp
+    libcap
+    libsmack
+    libprivilege-control
+    libsystemd-daemon
     )
 
 INCLUDE_DIRECTORIES(SYSTEM
-    ${COMMON_DEP_INCLUDE_DIRS}
+    ${SERVER_DEP_INCLUDE_DIRS}
     )
 
 INCLUDE_DIRECTORIES(
-    ${COMMON_PATH}/common
-    ${COMMON_PATH}/dpl/core/include
-    ${COMMON_PATH}/dpl/log/include
+    ${INCLUDE_PATH}
+    ${COMMON_PATH}/include
+    ${SERVER_PATH}/main/include
+    ${SERVER_PATH}/service/include
+    ${DPL_PATH}/core/include
+    ${DPL_PATH}/log/include
     )
 
-ADD_LIBRARY(${TARGET_SERVER_COMMON} SHARED ${COMMON_SOURCES})
-
-SET_TARGET_PROPERTIES(
-    ${TARGET_SERVER_COMMON}
-    PROPERTIES
-        COMPILE_FLAGS "-D_GNU_SOURCE -fPIC -fvisibility=default"
-        SOVERSION 1.0.0
-        VERSION 1.0.0
+SET(SERVER_SOURCES
+    ${SERVER_PATH}/main/security-manager-util.cpp
+    ${SERVER_PATH}/main/generic-socket-manager.cpp
+    ${SERVER_PATH}/main/socket-manager.cpp
+    ${SERVER_PATH}/main/server-main.cpp
+    ${SERVER_PATH}/service/smack-common.cpp
+    ${SERVER_PATH}/service/smack-rules.cpp
+    ${SERVER_PATH}/service/installer.cpp
     )
 
-TARGET_LINK_LIBRARIES(${TARGET_SERVER_COMMON}
-    ${COMMON_DEP_LIBRARIES}
-    )
+ADD_EXECUTABLE(${TARGET_SERVER} ${SERVER_SOURCES})
 
-################################################################################
+SET_TARGET_PROPERTIES(${TARGET_SERVER}
+    PROPERTIES
+        COMPILE_FLAGS "-D_GNU_SOURCE -fvisibility=hidden")
 
-INSTALL(TARGETS ${TARGET_SERVER_COMMON} DESTINATION ${LIB_INSTALL_DIR})
+TARGET_LINK_LIBRARIES(${TARGET_SERVER}
+    ${TARGET_COMMON}
+    ${SERVER_DEP_LIBRARIES}
+    )
 
+INSTALL(TARGETS ${TARGET_SERVER} DESTINATION bin)

diff --git a/src/server/main/generic-event.h b/src/server/main/include/generic-event.h
similarity index 100%
rename from src/server/main/generic-event.h
rename to src/server/main/include/generic-event.h

diff --git a/src/server/main/generic-socket-manager.h b/src/server/main/include/generic-socket-manager.h
similarity index 100%
rename from src/server/main/generic-socket-manager.h
rename to src/server/main/include/generic-socket-manager.h

diff --git a/src/server/main/security-manager-util.h b/src/server/main/include/security-manager-util.h
similarity index 100%
rename from src/server/main/security-manager-util.h
rename to src/server/main/include/security-manager-util.h

diff --git a/src/server/main/service-thread.h b/src/server/main/include/service-thread.h
similarity index 100%
rename from src/server/main/service-thread.h
rename to src/server/main/include/service-thread.h

diff --git a/src/server/main/socket-manager.h b/src/server/main/include/socket-manager.h
similarity index 100%
rename from src/server/main/socket-manager.h
rename to src/server/main/include/socket-manager.h

diff --git a/src/server/main/server2-main.cpp b/src/server/main/server-main.cpp
similarity index 98%
rename from src/server/main/server2-main.cpp
rename to src/server/main/server-main.cpp
index aba9373..6f67efa 100644 (file)
--- a/src/server/main/server2-main.cpp
+++ b/src/server/main/server-main.cpp
@@ -16,7 +16,7 @@
  *  limitations under the License
  */
 /*
- * @file        sever2-main.cpp
+ * @file        server-main.cpp
  * @author      Bartlomiej Grzelewski (b.grzelewski@samsung.com)
  * @version     1.0
  * @brief       Implementation of security-manager on basis of security-server

diff --git a/src/server/service/installer.h b/src/server/service/include/installer.h
similarity index 100%
rename from src/server/service/installer.h
rename to src/server/service/include/installer.h

diff --git a/src/server/service/smack-common.h b/src/server/service/include/smack-common.h
similarity index 100%
rename from src/server/service/smack-common.h
rename to src/server/service/include/smack-common.h

diff --git a/src/server/service/smack-rules.h b/src/server/service/include/smack-rules.h
similarity index 100%
rename from src/server/service/smack-rules.h
rename to src/server/service/include/smack-rules.h