diff options
Diffstat (limited to 'AudioManagerDaemon')
-rw-r--r-- | AudioManagerDaemon/CMakeLists.txt | 12 | ||||
-rw-r--r-- | AudioManagerDaemon/src/CommandSender.cpp | 1 | ||||
-rw-r--r-- | AudioManagerDaemon/src/ControlSender.cpp | 10 | ||||
-rw-r--r-- | AudioManagerDaemon/test/controlInterface/CMakeLists.txt | 10 | ||||
-rw-r--r-- | AudioManagerDaemon/test/database/CMakeLists.txt | 12 | ||||
-rw-r--r-- | AudioManagerDaemon/test/routingInterface/CMakeLists.txt | 9 | ||||
-rw-r--r-- | AudioManagerDaemon/test/sockethandler/CMakeLists.txt | 8 |
7 files changed, 59 insertions, 3 deletions
diff --git a/AudioManagerDaemon/CMakeLists.txt b/AudioManagerDaemon/CMakeLists.txt index d54b17b..7e8946d 100644 --- a/AudioManagerDaemon/CMakeLists.txt +++ b/AudioManagerDaemon/CMakeLists.txt @@ -100,5 +100,17 @@ INSTALL(TARGETS AudioManager RUNTIME DESTINATION bin PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ + COMPONENT bin ) +INSTALL(DIRECTORY "${AUDIO_INCLUDES_FOLDER}/" + DESTINATION include + COMPONENT dev +) + +SET(ADD_DEPEND "sqlite3(>=3.6.22)" "dlt" "libdbus-1-3(>=1.2.16)") +set_property(GLOBAL APPEND PROPERTY bin_prop "${ADD_DEPEND}") + +SET(ADD_DEPEND "audiomanager-bin" "sqlite3(>=3.6.22)" "dlt" "libdbus-1-3(>=1.2.16)") +set_property(GLOBAL APPEND PROPERTY dev_prop "${ADD_DEPEND}") + diff --git a/AudioManagerDaemon/src/CommandSender.cpp b/AudioManagerDaemon/src/CommandSender.cpp index 92734c4..a481317 100644 --- a/AudioManagerDaemon/src/CommandSender.cpp +++ b/AudioManagerDaemon/src/CommandSender.cpp @@ -61,6 +61,7 @@ CommandSender::CommandSender(const std::vector<std::string>& listOfPluginDirecto if (!directory) { DLT_LOG(AudioManager,DLT_LOG_INFO, DLT_STRING("Error opening directory "),DLT_STRING(directoryName)); + continue; } // iterate content of directory diff --git a/AudioManagerDaemon/src/ControlSender.cpp b/AudioManagerDaemon/src/ControlSender.cpp index a9e9220..3371fb2 100644 --- a/AudioManagerDaemon/src/ControlSender.cpp +++ b/AudioManagerDaemon/src/ControlSender.cpp @@ -25,6 +25,7 @@ #include "ControlSender.h" #include <assert.h> #include <dlt/dlt.h> +#include <fstream> #include "PluginTemplate.h" DLT_IMPORT_CONTEXT(AudioManager) @@ -37,7 +38,12 @@ ControlSender::ControlSender(std::string controlPluginFile) :mlibHandle(NULL), mController(NULL) { - if (!controlPluginFile.empty()) + std::ifstream isfile(controlPluginFile.c_str()); + if (!isfile) + { + DLT_LOG(AudioManager,DLT_LOG_ERROR, DLT_STRING("ControlSender::ControlSender: Controller plugin not found:"),DLT_STRING(controlPluginFile.c_str())); + } + else if (!controlPluginFile.empty()) { ControlSendInterface* (*createFunc)(); createFunc = getCreateFunction<ControlSendInterface*()>(controlPluginFile,mlibHandle); @@ -49,7 +55,7 @@ ControlSender::ControlSender(std::string controlPluginFile) } else { - DLT_LOG(AudioManager,DLT_LOG_ERROR, DLT_STRING("No controller loaded !")); + DLT_LOG(AudioManager,DLT_LOG_ERROR, DLT_STRING("ControlSender::ControlSender: No controller loaded !")); } } diff --git a/AudioManagerDaemon/test/controlInterface/CMakeLists.txt b/AudioManagerDaemon/test/controlInterface/CMakeLists.txt index 6e0acad..024e6b2 100644 --- a/AudioManagerDaemon/test/controlInterface/CMakeLists.txt +++ b/AudioManagerDaemon/test/controlInterface/CMakeLists.txt @@ -67,5 +67,15 @@ TARGET_LINK_LIBRARIES(controlInterfaceTest gmock ) +INSTALL(TARGETS controlInterfaceTest + DESTINATION "~/AudioManagerTest/" + PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ + COMPONENT tests +) + +SET(ADD_DEPEND "audiomanager-bin" "sqlite3(>=3.6.22)" "dlt" "libdbus-1-3(>=1.2.16)" "libgtest-dev(>=1.6.0-1)" "google-mock" "libpthread-stubs0") +set_property(GLOBAL APPEND PROPERTY tests_prop "${ADD_DEPEND}") + + diff --git a/AudioManagerDaemon/test/database/CMakeLists.txt b/AudioManagerDaemon/test/database/CMakeLists.txt index 1f368aa..6a8b742 100644 --- a/AudioManagerDaemon/test/database/CMakeLists.txt +++ b/AudioManagerDaemon/test/database/CMakeLists.txt @@ -62,4 +62,14 @@ TARGET_LINK_LIBRARIES( databasetest ${CMAKE_THREAD_LIBS_INIT} ${GTEST_LIBRARIES} gmock -)
\ No newline at end of file +) + +INSTALL(TARGETS databasetest + DESTINATION "~/AudioManagerTest/" + PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ + COMPONENT tests +) + +SET(ADD_DEPEND "audiomanager-bin" "sqlite3(>=3.6.22)" "dlt" "libdbus-1-3(>=1.2.16)" "libgtest-dev(>=1.6.0-1)" "google-mock" "libpthread-stubs0") +set_property(GLOBAL APPEND PROPERTY tests_prop "${ADD_DEPEND}") + diff --git a/AudioManagerDaemon/test/routingInterface/CMakeLists.txt b/AudioManagerDaemon/test/routingInterface/CMakeLists.txt index 292065b..dc12a93 100644 --- a/AudioManagerDaemon/test/routingInterface/CMakeLists.txt +++ b/AudioManagerDaemon/test/routingInterface/CMakeLists.txt @@ -65,5 +65,14 @@ TARGET_LINK_LIBRARIES(routinginterfacetest gmock ) +INSTALL(TARGETS routinginterfacetest + DESTINATION "~/AudioManagerTest/" + PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ + COMPONENT tests +) + +SET(ADD_DEPEND "audiomanager-bin" "sqlite3(>=3.6.22)" "dlt" "libdbus-1-3(>=1.2.16)" "libgtest-dev(>=1.6.0-1)" "google-mock" "libpthread-stubs0") +set_property(GLOBAL APPEND PROPERTY tests_prop "${ADD_DEPEND}") + diff --git a/AudioManagerDaemon/test/sockethandler/CMakeLists.txt b/AudioManagerDaemon/test/sockethandler/CMakeLists.txt index 787b120..ba1eb80 100644 --- a/AudioManagerDaemon/test/sockethandler/CMakeLists.txt +++ b/AudioManagerDaemon/test/sockethandler/CMakeLists.txt @@ -65,5 +65,13 @@ TARGET_LINK_LIBRARIES(socketHandlerTest gmock ) +INSTALL(TARGETS socketHandlerTest + DESTINATION "~/AudioManagerTest/" + PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ + COMPONENT tests +) + +SET(ADD_DEPEND "sqlite3(>=3.6.22)" "dlt" "libdbus-1-3(>=1.2.16)" "libgtest-dev(>=1.6.0-1)" "google-mock" "libpthread-stubs0") +set_property(GLOBAL APPEND PROPERTY tests_prop "${ADD_DEPEND}") |