* rework of buildsystem

* now everything depends on a toplevel CMakefile
* cleanup of makefiles and compiler options

5 files changed, 33 insertions, 16 deletions

diff --git a/PluginCommandInterfaceDbus/test/CMakeLists.txt b/PluginCommandInterfaceDbus/test/CMakeLists.txt
index 93c3f88..7038af9 100644
--- a/PluginCommandInterfaceDbus/test/CMakeLists.txt
+++ b/PluginCommandInterfaceDbus/test/CMakeLists.txt
@@ -25,15 +25,12 @@ cmake_minimum_required(VERSION 2.6)
 
 PROJECT(controlInterfacetest)
 
-#set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -pedantic")
 set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -DUNIT_TEST=1 -DDLT_CONTEXT=AudioManager")
 
 set(STD_INCLUDE_DIRS "/usr/include")
-set(EXECUTABLE_OUTPUT_PATH ../../../test/)
-set(AUDIO2_INCLUDES_FOLDER ${CMAKE_SOURCE_DIR}/../../includes)
-set(AUDIO_INCLUDES_FOLDER ${CMAKE_SOURCE_DIR}/../AudioManagerDaemon/include)
-set(DBUS_INCLUDES_FOLDER ${CMAKE_SOURCE_DIR}/../../dbusIncludes)
-set(INCLUDES_FOLDER ${CMAKE_SOURCE_DIR}/../include)
+
+set(EXECUTABLE_OUTPUT_PATH ${TEST_EXECUTABLE_OUTPUT_PATH})
+FIND_PACKAGE(GTest REQUIRED) 
 
 find_package (Threads)
 FIND_PACKAGE(DBUS REQUIRED)
@@ -45,7 +42,6 @@ INCLUDE_DIRECTORIES(
     ${CMAKE_SOURCE_DIR} 
     ${CMAKE_CURRENT_BINARY_DIR}
     ${AUDIO_INCLUDES_FOLDER}
-    ${AUDIO2_INCLUDES_FOLDER}
     ${DBUS_ARCH_INCLUDE_DIR}
     ${DBUS_INCLUDES_FOLDER} 
     ${CMAKE_SOURCE_DIR} 
@@ -53,11 +49,15 @@ INCLUDE_DIRECTORIES(
     ${DBUS_INCLUDE_DIR}
     ${INCLUDES_FOLDER}
     ${PYTHON_INCLUDE_DIRS}
+    ${GTEST_INCLUDE_DIR}
+    "../../AudioManagerDaemon/include"
+    "../include"
 )
    
 file(GLOB DBUS_PLUGIN_INTERFACE_SRCS_CXX 
      "../../AudioManagerDaemon/src/DBusWrapper.cpp"
      "../../AudioManagerDaemon/src/CommandSender.cpp"
+     "../../AudioManagerDaemon/src/SocketHandler.cpp"
      "../src/*.cpp"  
      "dbuscommandpluginInterfaceTest.cpp" 
      "DbusCommanInterfaceBackdoor.cpp"
@@ -66,11 +66,11 @@ file(GLOB DBUS_PLUGIN_INTERFACE_SRCS_CXX
 file(GLOB DBUS_SIGNAL_INTERFACE_SRCS_CXX 
      "../../AudioManagerDaemon/src/DBusWrapper.cpp"
      "../../AudioManagerDaemon/src/CommandSender.cpp"
+     "../../AudioManagerDaemon/src/SocketHandler.cpp"
      "../src/*.cpp" 
      "dbuscommaninterfacesignalsTest.cpp" 
      "DbusCommandInterfaceBackdoor.cpp"
 )
-
 ADD_EXECUTABLE(dbusCommandMessages ${DBUS_PLUGIN_INTERFACE_SRCS_CXX})
 
 ADD_EXECUTABLE(dbusCommandSignals ${DBUS_SIGNAL_INTERFACE_SRCS_CXX})
@@ -81,7 +81,7 @@ TARGET_LINK_LIBRARIES(dbusCommandMessages
     ${CMAKE_DL_LIBS}
     ${CMAKE_THREAD_LIBS_INIT}
     ${PYTHON_LIBRARY}
-    gtest
+    ${GTEST_LIBRARIES}
     gmock
 )
 
@@ -92,7 +92,7 @@ TARGET_LINK_LIBRARIES(dbusCommandSignals
     ${CMAKE_DL_LIBS}
     ${CMAKE_THREAD_LIBS_INIT}
     ${PYTHON_LIBRARY}
-    gtest
+    ${GTEST_LIBRARIES}
     gmock
 )
 
diff --git a/PluginCommandInterfaceDbus/test/MockInterfaces.h b/PluginCommandInterfaceDbus/test/MockInterfaces.h
index c8dbaba..0a1004c 100644
--- a/PluginCommandInterfaceDbus/test/MockInterfaces.h
+++ b/PluginCommandInterfaceDbus/test/MockInterfaces.h
@@ -66,8 +66,10 @@ class MockCommandReceiveInterface : public CommandReceiveInterface {
       am_Error_e(const am_mainConnectionID_t mainConnectionID, am_timeSync_t& delay));
   MOCK_CONST_METHOD1(getDBusConnectionWrapper,
       am_Error_e(DBusWrapper*& dbusConnectionWrapper));
-};
+  MOCK_CONST_METHOD1(getSocketHandler,
+      am_Error_e(SocketHandler*& socketHandler));
 
+};
 }  // namespace am
 
 
diff --git a/PluginCommandInterfaceDbus/test/config.h b/PluginCommandInterfaceDbus/test/config.h
new file mode 100644
index 0000000..ea737e0
--- /dev/null
+++ b/PluginCommandInterfaceDbus/test/config.h
@@ -0,0 +1,17 @@
+#ifndef _CONFIG_H
+#define _CONFIG_H
+
+#define WITH_DBUS_WRAPPER
+#define WITH_SOCKETHANDLER_LOOP 
+/* #undef WITH_SIMPLEDBUS_LOOP */
+
+#define DEFAULT_PLUGIN_COMMAND_DIR "/home/christian/workspace/gitserver/bin/plugins/command"
+#define DEFAULT_PLUGIN_ROUTING_DIR "/home/christian/workspace/gitserver/bin/plugins/routing"
+#define CONTROLLER_PLUGIN "/home/christian/workspace/gitserver/bin/plugins/control/libPluginControlInterface.so"
+
+#define DBUS_SERVICE_PREFIX "org.genivi.audiomanager"
+#define DBUS_SERVICE_OBJECT_PATH "/org/genivi/audiomanager"
+
+#define INTROSPECTION_COMMAND_XML_FILE "/home/christian/workspace/gitserver/includes/dbus/CommandInterface.xml"
+
+#endif /* _CONFIG_H */
diff --git a/PluginCommandInterfaceDbus/test/dbuscommandpluginInterfaceTest.cpp b/PluginCommandInterfaceDbus/test/dbuscommandpluginInterfaceTest.cpp
index 213d8a3..d1faced 100644
--- a/PluginCommandInterfaceDbus/test/dbuscommandpluginInterfaceTest.cpp
+++ b/PluginCommandInterfaceDbus/test/dbuscommandpluginInterfaceTest.cpp
@@ -23,16 +23,15 @@
 * THIS CODE HAS BEEN GENERATED BY ENTERPRISE ARCHITECT GENIVI MODEL. PLEASE CHANGE ONLY IN ENTERPRISE ARCHITECT AND GENERATE AGAIN
 */
 
-
+#include <python2.6/Python.h>
+#include <dbus/DBusWrapper.h>
 #include "dbuscommandpluginInterfaceTest.h"
 #include <iostream>
 #include <fstream>
-#include <Python.h>
 #include "../include/DBusCommandSender.h"
 #include "../include/DBusMessageHandler.h"
 #include "DbusCommandInterfaceBackdoor.h"
 #include "MockInterfaces.h"
-#include "DBusWrapper.h"
 
 using namespace am;
 using namespace testing;
@@ -632,3 +631,4 @@ int main(int argc, char **argv)
 
 
 
+
diff --git a/PluginCommandInterfaceDbus/test/dbuscommandpluginInterfaceTest.h b/PluginCommandInterfaceDbus/test/dbuscommandpluginInterfaceTest.h
index 2e738f7..d9f1fca 100644
--- a/PluginCommandInterfaceDbus/test/dbuscommandpluginInterfaceTest.h
+++ b/PluginCommandInterfaceDbus/test/dbuscommandpluginInterfaceTest.h
@@ -39,8 +39,6 @@
 #include "MockInterfaces.h"
 #include "DbusCommandInterfaceBackdoor.h"
 
-
-#define DEFAULT_PLUGIN_COMMAND_DIR "/home/christian/workspace/gitserver/build/plugins/command"
 #define UNIT_TEST 1
 
 namespace am {