* changes to make the package and documentation easier

Signed-off-by: christian linke <christian.linke@bmw.de>

4 files changed, 41 insertions, 8 deletions

diff --git a/PluginRoutingInterfaceDbus/CMakeLists.txt b/PluginRoutingInterfaceDbus/CMakeLists.txt
index 927122f..2bab903 100644
--- a/PluginRoutingInterfaceDbus/CMakeLists.txt
+++ b/PluginRoutingInterfaceDbus/CMakeLists.txt
@@ -22,11 +22,23 @@ set(LIBRARY_OUTPUT_PATH ${PLUGINS_OUTPUT_PATH}/routing)
 set(DOC_OUTPUT_PATH ${DOC_OUTPUT_PATH}/RoutingPlugin)
 set(INCLUDE_FOLDER "include")
 
+SET(SHARED_FOLDER "${CMAKE_INSTALL_PREFIX}/share")
 FILE(READ "${AUDIO_INCLUDE_FOLDER}/routing/IAmRoutingSend.h" VERSION_BUFFER LIMIT 6000)
 STRING(REGEX MATCH "RoutingSendVersion*.[^0-9]*[0-9].[0-9]*[0-9]" LIB_INTERFACE_VERSION_STRING ${VERSION_BUFFER})
 STRING(REGEX REPLACE "RoutingSendVersion*.." "" LIB_INTERFACE_VERSION ${LIB_INTERFACE_VERSION_STRING})
 MESSAGE(STATUS "Building against routing interface version ${LIB_INTERFACE_VERSION}")
 
+IF(USE_BUILD_LIBS) 
+    SET(ROUTING_DBUS_INTROSPECTION_FOLDER ${EXECUTABLE_OUTPUT_PATH})
+    SET(ROUTING_DBUS_INTROSPECTION_FILE ${EXECUTABLE_OUTPUT_PATH}/RoutingReceiver.xml)
+ELSE(USE_BUILD_LIBS) 
+    SET(ROUTING_DBUS_INTROSPECTION_FOLDER ${SHARED_FOLDER}/audiomanager)
+    SET(ROUTING_DBUS_INTROSPECTION_FILE ${SHARED_FOLDER}/audiomanager/RoutingReceiver.xml)
+ENDIF(USE_BUILD_LIBS)
+
+
+CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/cmake/config.cmake ${CMAKE_CURRENT_SOURCE_DIR}/include/configRoutingDbus.h )
+
 FIND_PACKAGE(DBUS REQUIRED)
 
 INCLUDE_DIRECTORIES(
@@ -58,12 +70,15 @@ IF(WITH_TESTS)
 #	add_subdirectory (test)
 ENDIF(WITH_TESTS)
 
-execute_process(
-		COMMAND mkdir -p "${CMAKE_SOURCE_DIR}/bin"
-		COMMAND cp "${CMAKE_SOURCE_DIR}/PluginRoutingInterfaceDbus/${INCLUDE_FOLDER}/RoutingReceiver.xml" ${EXECUTABLE_OUTPUT_PATH}/RoutingReceiver.xml)
-execute_process(
-		COMMAND mkdir -p "${CMAKE_SOURCE_DIR}/bin"
-		COMMAND cp "${CMAKE_SOURCE_DIR}/PluginRoutingInterfaceDbus/${INCLUDE_FOLDER}/RoutingSender.xml" ${EXECUTABLE_OUTPUT_PATH}/RoutingSender.xml)
+IF(USE_BUILD_LIBS) 
+    execute_process(
+    		COMMAND mkdir -p "${CMAKE_SOURCE_DIR}/bin"
+    		COMMAND cp "${CMAKE_SOURCE_DIR}/PluginRoutingInterfaceDbus/${INCLUDE_FOLDER}/RoutingReceiver.xml" ${EXECUTABLE_OUTPUT_PATH}/RoutingReceiver.xml)
+    execute_process(
+    		COMMAND mkdir -p "${CMAKE_SOURCE_DIR}/bin"
+    		COMMAND cp "${CMAKE_SOURCE_DIR}/PluginRoutingInterfaceDbus/${INCLUDE_FOLDER}/RoutingSender.xml" ${EXECUTABLE_OUTPUT_PATH}/RoutingSender.xml)
+ENDIF(USE_BUILD_LIBS) 
+
 
 #IF(WITH_DOCUMENTATION)
 #	file(MAKE_DIRECTORY ${DOC_OUTPUT_PATH})
@@ -80,6 +95,12 @@ INSTALL(TARGETS PluginRoutingInterfaceDbus
         COMPONENT sampleplugins
 )
 
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/include/RoutingReceiver.xml 
+        DESTINATION "${ROUTING_DBUS_INTROSPECTION_FOLDER}"
+        COMPONENT sampleplugins
+)
+
+
 SET(ADD_DEPEND "audiomanager-bin" "dlt" "libdbus-1-3(>=1.2.16)")
 set_property(GLOBAL APPEND PROPERTY sampleplugins_prop "${ADD_DEPEND}")
 
diff --git a/PluginRoutingInterfaceDbus/cmake/config.cmake b/PluginRoutingInterfaceDbus/cmake/config.cmake
new file mode 100644
index 0000000..20ce881
--- /dev/null
+++ b/PluginRoutingInterfaceDbus/cmake/config.cmake
@@ -0,0 +1,6 @@
+#ifndef _ROUTINGDBUS_CONFIG_H
+#define _ROUTINGDBUS_CONFIG_H
+
+#cmakedefine ROUTING_DBUS_INTROSPECTION_FILE "@ROUTING_DBUS_INTROSPECTION_FILE@"
+
+#endif /* _ROUTINGDBUS_CONFIG_H */
diff --git a/PluginRoutingInterfaceDbus/include/configRoutingDbus.h b/PluginRoutingInterfaceDbus/include/configRoutingDbus.h
new file mode 100644
index 0000000..6ce5638
--- /dev/null
+++ b/PluginRoutingInterfaceDbus/include/configRoutingDbus.h
@@ -0,0 +1,6 @@
+#ifndef _ROUTINGDBUS_CONFIG_H
+#define _ROUTINGDBUS_CONFIG_H
+
+#define ROUTING_DBUS_INTROSPECTION_FILE "/usr/share/audiomanager/RoutingReceiver.xml"
+
+#endif /* _ROUTINGDBUS_CONFIG_H */
diff --git a/PluginRoutingInterfaceDbus/src/IAmRoutingReceiverShadow.cpp b/PluginRoutingInterfaceDbus/src/IAmRoutingReceiverShadow.cpp
index 39bad94..91004c4 100644
--- a/PluginRoutingInterfaceDbus/src/IAmRoutingReceiverShadow.cpp
+++ b/PluginRoutingInterfaceDbus/src/IAmRoutingReceiverShadow.cpp
@@ -25,6 +25,7 @@
 #include "CAmRoutingSenderDbus.h"
 #include "shared/CAmDbusWrapper.h"
 #include "shared/CAmDltWrapper.h"
+#include "configRoutingDbus.h"
 
 namespace am
 {
@@ -591,8 +592,7 @@ void IAmRoutingReceiverShadowDbus::sendIntrospection(DBusConnection* conn, DBusM
 
     // create a reply from the message
     reply = dbus_message_new_method_return(msg);
-    std::string fullpath(EXECUTABLE_OUTPUT_PATH);
-    fullpath.append("/RoutingReceiver.xml");
+    std::string fullpath(ROUTING_DBUS_INTROSPECTION_FILE);
     std::ifstream in(fullpath.c_str(), std::ifstream::in);
     if (!in)
     {