Merge branch 'working_codes' into master

diff --cc CMakeLists.txt
Simple merge

diff --cc cion/CMakeLists.txt
index 8e1eaa06b425c24916c2cda15d810bb0eddf09cd,4847cc5d1a8576874a25e9db19060b4755f0ab20..c5167b8a6bbeb1e76d2c6ba6eefe54a65ffe5711
--- 1/cion/CMakeLists.txt
--- 2/cion/CMakeLists.txt
+++ b/cion/CMakeLists.txt
@@@ -1,39 -1,61 +1,47 @@@
 -CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
 -PROJECT(cion CXX)
 -
 -SET(PREFIX "${CMAKE_INSTALL_PREFIX}")
 -SET(EXEC_PREFIX "\${prefix}")
 -SET(PROJECT_NAME "${PROJECT_NAME}")
 -SET(INCLUDEDIR "\${prefix}/include")
 -SET(VERSION ${FULLVER})
 -
 -INCLUDE(FindPkgConfig)
 -
 -SET(requires "aul capi-system-info capi-system-system-settings glib-2.0 parcel pkgmgr-info dlog parcel")
 -SET(pc_requires "")
 -
 -pkg_check_modules(cion REQUIRED ${requires})
 -
 -FOREACH(flag ${cion_CFLAGS})
 -      SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")
 -ENDFOREACH(flag)
 -SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} -fvisibility=hidden -Wall -Werror")
 -
 -SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${EXTRA_CFLAGS} -std=c++14")
 -SET(CMAKE_CXX_FLAGS_DEBUG "-O0 -g")
 -SET(CMAKE_CXX_FLAGS_RELEASE "-O2")
 -
 -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../)
 -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/tizen-api/)
 -
  AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR}/common/ COMMON_SOURCES)
 +AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR}/common/util COMMON_SOURCES)
  AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR}/channel/ CHANNEL_SOURCES)
 +AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR}/security SECURITY_SOURCES)
  AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR}/tizen-api/ SOURCES)
 -ADD_LIBRARY (${PROJECT_NAME} SHARED ${SOURCES} ${COMMON_SOURCES} ${CHANNEL_SOURCES})
 -SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES VERSION ${FULLVER})
 -SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES SOVERSION ${MAJORVER})
 +ADD_LIBRARY(${TARGET_CION} SHARED ${SOURCES} ${COMMON_SOURCES} ${CHANNEL_SOURCES} ${SECURITY_SOURCES})
 +
 +TARGET_INCLUDE_DIRECTORIES(${TARGET_CION} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../)
 +TARGET_INCLUDE_DIRECTORIES(${TARGET_CION} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/tizen-api/)
  
 -TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${cion_LDFLAGS})
 +APPLY_PKG_CONFIG(${TARGET_CION} PUBLIC
 +    AUL_DEPS
 +    CAPI_SYSTEM_INFO_DEPS
 +    CAPI_SYSTEM_SYSTEM_SETTINGS_DEPS
 +    DLOG_DEPS
 +    GLIB_DEPS
 +    PARCEL_DEPS
 +    PKGMGR_INFO_DEPS
 +    UUID_DEPS
 +)
 +
 +SET_TARGET_PROPERTIES(${TARGET_CION} PROPERTIES VERSION ${FULLVER})
 +SET_TARGET_PROPERTIES(${TARGET_CION} PROPERTIES SOVERSION ${MAJORVER})
  
  SET(PC_NAME cion)
 -SET(PC_REQUIRED ${pc_requires})
 +SET(PC_REQUIRED "")
  
 -CONFIGURE_FILE(${PROJECT_NAME}.pc.in ${PROJECT_NAME}.pc @ONLY)
 +CONFIGURE_FILE(${TARGET_CION}.pc.in ${TARGET_CION}.pc @ONLY)
  
 -INSTALL(TARGETS ${PROJECT_NAME}
 -      DESTINATION ${LIB_INSTALL_DIR}
 -      COMPONENT RuntimeLibraries)
 +INSTALL(TARGETS ${TARGET_CION}
 +    DESTINATION ${LIB_INSTALL_DIR}
 +    COMPONENT RuntimeLibraries)
  
 -INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc
 -      DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
 +INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${TARGET_CION}.pc
 +    DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
  
  INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/tizen-api/
 -      DESTINATION ${INCLUDE_INSTALL_DIR}/cion/tizen-api/
 -      FILES_MATCHING PATTERN "*.h")
 +    DESTINATION ${INCLUDE_INSTALL_DIR}/cion
 +    FILES_MATCHING PATTERN "*.h")
+ 
+ INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/channel/
 -      DESTINATION ${INCLUDE_INSTALL_DIR}/cion/channel/
 -      FILES_MATCHING PATTERN "*.hh")
++    DESTINATION ${INCLUDE_INSTALL_DIR}/cion/channel/
++    FILES_MATCHING PATTERN "*.hh")
+ 
+ INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/common/
 -      DESTINATION ${INCLUDE_INSTALL_DIR}/cion/common/
 -      FILES_MATCHING PATTERN "*.hh")
 -
++    DESTINATION ${INCLUDE_INSTALL_DIR}/cion/common/
++    FILES_MATCHING PATTERN "*.hh")

diff --cc cion/channel/event_sender.hh
index 1f20089d05aa06590cd46ddc9e76a41be96f9e3f,e044fedb821110db81341b9843c46a044168ea49..2b795344d1f5f69b69008bfa8acf4ff9b1b894b1
--- 1/cion/channel/event_sender.hh
--- 2/cion/channel/event_sender.hh
+++ b/cion/channel/event_sender.hh
@@@ -22,8 -23,8 +23,9 @@@
  
  #include "data_info.hh"
  #include "control_info.hh"
 +#include "../common/peer_info.hh"
  #include "../security/security_info.hh"
+ #include "../common/peer_info.hh"
  
  namespace cion {
  namespace channel {

diff --cc packaging/cion.spec
Simple merge

diff --cc unittests/CMakeLists.txt
index f6cd32b9c5075fb437cf2a6bf40ff43cc65ff679,78a156743d8c676f61d045e3b04152a4ad066ff2..fff09a112a538624fa4678429cd7d21f32021973
--- 1/unittests/CMakeLists.txt
--- 2/unittests/CMakeLists.txt
+++ b/unittests/CMakeLists.txt
@@@ -1,19 -1,39 +1,19 @@@
  #AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR}/../vine_wrapper VINE_WRAPPER_SOURCE)
  AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR}/src SOURCES)
  AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR}/mock MOCK_SRCS)
 -ADD_EXECUTABLE(${PROJECT_NAME}
 +ADD_EXECUTABLE(${TARGET_CION_UNITTESTS}
      ${SOURCES}
      ${MOCK_SRCS}
-     ${VINE_WRAPPER_SOURCE}
 -#    ${VINE_WRAPPER_SOURCE}
++    #${VINE_WRAPPER_SOURCE}
  )
  
 -TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${cion_unittests_LDFLAGS}
 -    ${pkgs_LDFLAGS}
 -    ${pkgs_LIBRARIES}
 -    gmock
 +TARGET_INCLUDE_DIRECTORIES(${TARGET_CION_UNITTESTS} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../)
 +
 +APPLY_PKG_CONFIG(${TARGET_CION_UNITTESTS} PUBLIC
 +    DLOG_DEPS
 +    GMOCK_DEPS
  )
  
 -INSTALL(TARGETS ${PROJECT_NAME} DESTINATION /usr/bin/)
 +TARGET_LINK_LIBRARIES(${TARGET_CION_UNITTESTS} PRIVATE ${TARGET_CION} ${TARGET_VINE_MANAGER} ${TARGET_VINE_WRAPPER})
 +
 +INSTALL(TARGETS ${TARGET_CION_UNITTESTS} DESTINATION ${BINDIR})

diff --cc vine_manager/vine_sender_implementation.hh
Simple merge