Build scripts refactored. build.sh fix for exit code.

diff --git a/device-agent/CMakeLists.txt b/device-agent/CMakeLists.txt
index c79e630..d0c17aa 100644 (file)
--- a/device-agent/CMakeLists.txt
+++ b/device-agent/CMakeLists.txt
@@ -44,14 +44,10 @@ FOREACH(flag ${pkgs_CFLAGS})
        SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")
 ENDFOREACH(flag)
 
-SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} -DTB_LOG -D__TIZEN__ -DDPM_BUILD_${DPM_BUILD_TYPE} -DPROFILE_${BUILD_PROFILE} -DDATA_DIR=${DATA_DIR}")
+SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} -DTB_LOG -D__TIZEN__ -DPROFILE_${BUILD_PROFILE} -DDATA_DIR=${DATA_DIR}")
 
 SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} -DCONFIG_FILE_PATH=${DAEMON_CONFIG_DIR}/${DAEMON_CONFIG_FILE}")
 
-if (NOT DEFINED LIB_INCLUDE_DIR)
-       SET(LIB_INCLUDE_DIR "/usr/include")
-endif(NOT DEFINED LIB_INCLUDE_DIR)
-
 # Enable logging
 SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} -D__LOGGING__ ")
 

diff --git a/device-agent/communication/src/rest_request.cpp b/device-agent/communication/src/rest_request.cpp
index fdb878f..b70b7f6 100644 (file)
--- a/device-agent/communication/src/rest_request.cpp
+++ b/device-agent/communication/src/rest_request.cpp
@@ -114,7 +114,6 @@ RestRequest::Result RestRequest::doRequest(const QueryParameters& params, const
 {
     m_response_body.clear();
     std::ostringstream os;
-    std::string strParam;
 
     os << m_host << uri;
 

diff --git a/device-agent/daemon/CMakeLists.txt b/device-agent/daemon/CMakeLists.txt
index ab5642a..8b35e8b 100644 (file)
--- a/device-agent/daemon/CMakeLists.txt
+++ b/device-agent/daemon/CMakeLists.txt
@@ -27,21 +27,12 @@ target_link_libraries (${PROJECT_NAME}
        audit-trail
        jsoncpp
        boost_system
-       boost_thread
        boost_serialization
        curl
        capi-system-info
+       systemd
 )
 
-# systemd dependency handling
-find_library(LIBSYSTEMD_DEV systemd)
-if (LIBSYSTEMD_DEV)
-       message(STATUS "systemd library found ${LIBSYSTEMD_DEV}")
-       target_link_libraries(${PROJECT_NAME} systemd)
-else()
-       message(FATAL_ERROR "systemd library not found")
-endif()
-
 install(TARGETS ${PROJECT_NAME} DESTINATION ${BIN_DIR})
 install(FILES ${PROJECT_NAME}.manifest DESTINATION ${MANIFESTDIR})
 install(FILES sam.service DESTINATION ${SERVICE_INSTALL_DIR})

diff --git a/device-agent/packaging/sam.spec b/device-agent/packaging/sam.spec
index bd8ad77..ccf097a 100644 (file)
--- a/device-agent/packaging/sam.spec
+++ b/device-agent/packaging/sam.spec
@@ -16,6 +16,7 @@ BuildRequires: pkgconfig(boost)
 BuildRequires: pkgconfig(systemd)
 BuildRequires: pkgconfig(jsoncpp)
 BuildRequires: pkgconfig(audit-trail)
+BuildRequires: pkgconfig(libtzplatform-config)
 
 %if ("%{GTEST_TYPE}" == "mock")
 BuildRequires: pkgconfig(gmock)
@@ -35,7 +36,6 @@ BuildRequires: python-xml
 %define _manifestdir /usr/share/packages
 %define _service_dir /usr/lib/systemd/system
 %define _service_symlink_dir /etc/systemd/system/multi-user.target.wants
-%define _lib_include_dir /usr/include
 %define _conf_dir /etc/%{_project_name}
 %define _conf_file %{_project_name}.conf
 %define _data_dir /opt/data/%{_project_name}
@@ -56,18 +56,22 @@ Suspicious Activity Monitor
 
 %{!?build_type:%define build_type "RELEASE"}
 
+%if %{build_type} == "DEBUG" || %{build_type} == "PROFILING" || %{build_type} == "CCOV"
+       CFLAGS="$CFLAGS -Wp,-U_FORTIFY_SOURCE"
+       CXXFLAGS="$CXXFLAGS -Wp,-U_FORTIFY_SOURCE"
+%endif
+
+
 cmake -H./ -B./build-gbs \
     -DLIB_INSTALL_DIR=%{_libdir} \
        -DMANIFESTDIR=%{_manifestdir} \
        -DBIN_DIR=%{_app_dir} \
     -DGTEST_LIB=%{_gtest_lib} \
-       -DLIB_INCLUDE_DIR=%{_lib_include_dir} \
        -DSERVICE_INSTALL_DIR=%{_service_dir} \
        -DDAEMON_CONFIG_FILE=%{_conf_file} \
        -DDAEMON_CONFIG_DIR=%{_conf_dir} \
        -DDAEMON_APP_NAME=%{_app_name} \
        -DCMAKE_BUILD_TYPE=%{build_type} \
-       -DDPM_BUILD_TYPE=%{dpm_type} \
        -DDAEMON_NAME=%{_app_name} \
        -DDATA_DIR=%{_data_dir} \
        #eol
@@ -92,6 +96,8 @@ rm -rf %{buildroot}
 %package sam
 Summary: Suspicious Activity Monitor
 Provides: sam
+Requires: dpm
+Requires: libaudit-trail
 %description sam
 Suspicious Activity Monitor daemon
 

diff --git a/device-agent/scripts/build.sh b/device-agent/scripts/build.sh
index 140df84..e452fa6 100755 (executable)
--- a/device-agent/scripts/build.sh
+++ b/device-agent/scripts/build.sh
@@ -106,8 +106,9 @@ git commit -m "commit needed for GBS"
 trap cleanup INT
 
 function cleanup() {
+       SAVED_RETCODE=$?
        rm -rf ${ROOT_DIR}/.git
-       exit 0
+       exit $SAVED_RETCODE
 }
 
 NCPU=`nproc --ignore=1`
@@ -135,7 +136,6 @@ gbs --conf ${SCRIPT_DIR}/gbs.conf build -P ${PROFILE} -A ${TARGET_ARCH} \
        --define '_smp_nproc '$NCPU \
        --define 'build_type '$BUILD_TYPE \
        --define 'GTEST_TYPE '$GTEST_TYPE \
-       --define 'dpm_type '$DPM_TYPE \
-       #eol
+       --define 'dpm_type '$DPM_TYPE
 
 cleanup