diff options
author | christian linke <christian.linke@bmw.de> | 2012-10-25 16:21:04 +0200 |
---|---|---|
committer | christian linke <christian.linke@bmw.de> | 2012-10-25 16:21:04 +0200 |
commit | f9de38ac41d5da1d5cc52e8797dd47bdac4b3116 (patch) | |
tree | af303cfd892add0bbc2c1f6faab11c326c24c4be | |
parent | e33f72e932661784affc0f24d56f0e78fbac783f (diff) | |
download | audiomanager-f9de38ac41d5da1d5cc52e8797dd47bdac4b3116.tar.gz |
* changes to make the package and documentation easier
Signed-off-by: christian linke <christian.linke@bmw.de>
-rwxr-xr-x | CMakeLists.txt | 8 | ||||
-rw-r--r-- | PluginCommandInterfaceDbus/CMakeLists.txt | 25 | ||||
-rw-r--r-- | PluginCommandInterfaceDbus/cmake/config.cmake | 6 | ||||
-rw-r--r-- | PluginCommandInterfaceDbus/include/configCommandDbus.h | 6 | ||||
-rw-r--r-- | PluginCommandInterfaceDbus/src/IAmCommandReceiverShadow.cpp | 4 | ||||
-rw-r--r-- | PluginRoutingInterfaceDbus/CMakeLists.txt | 33 | ||||
-rw-r--r-- | PluginRoutingInterfaceDbus/cmake/config.cmake | 6 | ||||
-rw-r--r-- | PluginRoutingInterfaceDbus/include/configRoutingDbus.h | 6 | ||||
-rw-r--r-- | PluginRoutingInterfaceDbus/src/IAmRoutingReceiverShadow.cpp | 4 | ||||
-rwxr-xr-x | README | 7 | ||||
-rw-r--r-- | README.html | 14 | ||||
-rwxr-xr-x | cmake/cmake_uninstall.cmake.in | 2 |
12 files changed, 94 insertions, 27 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 86395f2..f7af947 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -59,7 +59,7 @@ OPTION( WITH_PLUGIN_COMMAND "Build command pluings" ON) OPTION( WITH_PLUGIN_CONTROL - "Build control pluing" ON) + "Build control plugin" ON) OPTION( WITH_PLUGIN_ROUTING "Build routing pluings" ON) @@ -266,7 +266,7 @@ IF (${CMAKE_VERSION} VERSION_GREATER 2.8.5) SET(CPACK_COMPONENTS_IGNORE_GROUPS 1) SET(CPACK_DEB_COMPONENT_INSTALL ON) ADD_CUSTOM_TARGET(genivi_package - COMMAND ${CMAKE_COMMAND} ${CMAKE_BINARY_DIR} -DUSE_BUILD_LIBS=ON + COMMAND ${CMAKE_COMMAND} ${CMAKE_BINARY_DIR} -DUSE_BUILD_LIBS=OFF COMMAND make package COMMAND ${CMAKE_CURRENT_BINARY_DIR}/add_package_dependencies.sh ${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-Linux-bin.deb ${CPACK_OUTPUT_FILE_PREFIX} \"${bin_DEPENDENCIES}\" COMMAND ${CMAKE_CURRENT_BINARY_DIR}/add_package_dependencies.sh ${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-Linux-sampleplugins.deb ${CPACK_OUTPUT_FILE_PREFIX} \"${sampleplugins_DEPENDENCIES}\" @@ -276,13 +276,13 @@ IF (${CMAKE_VERSION} VERSION_GREATER 2.8.5) ELSE (${CMAKE_VERSION} VERSION_GREATER 2.8.5) IF(${CMAKE_VERSION} VERSION_GREATER 2.8.3) ADD_CUSTOM_TARGET(genivi_package - COMMAND ${CMAKE_COMMAND} ${CMAKE_BINARY_DIR} -DUSE_BUILD_LIBS=ON + COMMAND ${CMAKE_COMMAND} ${CMAKE_BINARY_DIR} -DUSE_BUILD_LIBS=OFF COMMAND make package COMMAND ${CMAKE_CURRENT_BINARY_DIR}A logical block opening on t/add_package_dependencies.sh ${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-Linux.deb ${CPACK_OUTPUT_FILE_PREFIX} \"${all_DEPENDENCIES}\" ) ELSE(${CMAKE_VERSION} VERSION_GREATER 2.8.3) ADD_CUSTOM_TARGET(genivi_package - COMMAND ${CMAKE_COMMAND} ${CMAKE_BINARY_DIR} -DUSE_BUILD_LIBS=ON + COMMAND ${CMAKE_COMMAND} ${CMAKE_BINARY_DIR} -DUSE_BUILD_LIBS=OFF COMMAND make package COMMAND mkdir -p ../${CPACK_OUTPUT_FILE_PREFIX} COMMAND mv ${CMAKE_CURRENT_BINARY_DIR}/${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-Linux.deb ${CPACK_OUTPUT_FILE_PREFIX} diff --git a/PluginCommandInterfaceDbus/CMakeLists.txt b/PluginCommandInterfaceDbus/CMakeLists.txt index e4face2..06e3c30 100644 --- a/PluginCommandInterfaceDbus/CMakeLists.txt +++ b/PluginCommandInterfaceDbus/CMakeLists.txt @@ -21,12 +21,24 @@ PROJECT(PluginCommandInterfaceDbus) set(LIBRARY_OUTPUT_PATH ${PLUGINS_OUTPUT_PATH}/command) set(DOC_OUTPUT_PATH ${DOC_OUTPUT_PATH}/CommandDBusPlugin) set(INCLUDE_FOLDER "include") +message(STATUS "prefix ${CMAKE_INSTALL_PREFIX}") +SET(SHARED_FOLDER "${CMAKE_INSTALL_PREFIX}/share") FILE(READ "${AUDIO_INCLUDE_FOLDER}/command/IAmCommandSend.h" VERSION_BUFFER LIMIT 6000) STRING(REGEX MATCH "CommandSendVersion*.[^0-9]*[0-9].[0-9]*[0-9]" LIB_INTERFACE_VERSION_STRING ${VERSION_BUFFER}) STRING(REGEX REPLACE "CommandSendVersion*.." "" LIB_INTERFACE_VERSION ${LIB_INTERFACE_VERSION_STRING}) MESSAGE(STATUS "Building against command interface version ${LIB_INTERFACE_VERSION}") +IF(USE_BUILD_LIBS) + SET(COMMAND_DBUS_INTROSPECTION_FOLDER ${EXECUTABLE_OUTPUT_PATH}) + SET(COMMAND_DBUS_INTROSPECTION_FILE ${EXECUTABLE_OUTPUT_PATH}/CommandInterface.xml) +ELSE(USE_BUILD_LIBS) + SET(COMMAND_DBUS_INTROSPECTION_FOLDER ${SHARED_FOLDER}/audiomanager) + SET(COMMAND_DBUS_INTROSPECTION_FILE ${SHARED_FOLDER}/audiomanager/CommandInterface.xml) +ENDIF(USE_BUILD_LIBS) + +CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/cmake/config.cmake ${CMAKE_CURRENT_SOURCE_DIR}/include/configCommandDbus.h ) + FIND_PACKAGE(DBUS REQUIRED) INCLUDE_DIRECTORIES( @@ -73,9 +85,16 @@ INSTALL(TARGETS PluginCommandInterfaceDbus COMPONENT sampleplugins ) -execute_process( - COMMAND mkdir -p "${CMAKE_SOURCE_DIR}/bin" - COMMAND cp "${CMAKE_SOURCE_DIR}/PluginCommandInterfaceDbus/${INCLUDE_FOLDER}/CommandInterface.xml" ${EXECUTABLE_OUTPUT_PATH}/CommandInterface.xml) +INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/include/CommandInterface.xml + DESTINATION "${COMMAND_DBUS_INTROSPECTION_FOLDER}" + COMPONENT sampleplugins +) + +IF(USE_BUILD_LIBS) + execute_process( + COMMAND mkdir -p "${CMAKE_SOURCE_DIR}/bin" + COMMAND cp "${CMAKE_SOURCE_DIR}/PluginCommandInterfaceDbus/${INCLUDE_FOLDER}/CommandInterface.xml" ${EXECUTABLE_OUTPUT_PATH}/CommandInterface.xml) +ENDIF(USE_BUILD_LIBS) SET(ADD_DEPEND "audiomanager-bin" "dlt" "libdbus-1-3(>=1.2.16)") set_property(GLOBAL APPEND PROPERTY sampleplugins_prop "${ADD_DEPEND}") diff --git a/PluginCommandInterfaceDbus/cmake/config.cmake b/PluginCommandInterfaceDbus/cmake/config.cmake new file mode 100644 index 0000000..35c9aeb --- /dev/null +++ b/PluginCommandInterfaceDbus/cmake/config.cmake @@ -0,0 +1,6 @@ +#ifndef _COMMANDDBUS_CONFIG_H +#define _COMMANDDBUS_CONFIG_H + +#cmakedefine COMMAND_DBUS_INTROSPECTION_FILE "@COMMAND_DBUS_INTROSPECTION_FILE@" + +#endif /* _COMMANDDBUS_CONFIG_H */ diff --git a/PluginCommandInterfaceDbus/include/configCommandDbus.h b/PluginCommandInterfaceDbus/include/configCommandDbus.h new file mode 100644 index 0000000..685d911 --- /dev/null +++ b/PluginCommandInterfaceDbus/include/configCommandDbus.h @@ -0,0 +1,6 @@ +#ifndef _COMMANDDBUS_CONFIG_H +#define _COMMANDDBUS_CONFIG_H + +#define COMMAND_DBUS_INTROSPECTION_FILE "/usr/share/audiomanager/CommandInterface.xml" + +#endif /* _COMMANDDBUS_CONFIG_H */ diff --git a/PluginCommandInterfaceDbus/src/IAmCommandReceiverShadow.cpp b/PluginCommandInterfaceDbus/src/IAmCommandReceiverShadow.cpp index 2b411b3..7322b99 100644 --- a/PluginCommandInterfaceDbus/src/IAmCommandReceiverShadow.cpp +++ b/PluginCommandInterfaceDbus/src/IAmCommandReceiverShadow.cpp @@ -23,6 +23,7 @@ #include "audiomanagertypes.h" #include "CAmCommandSenderDbus.h" #include "shared/CAmDltWrapper.h" +#include "configCommandDbus.h" using namespace am; @@ -344,8 +345,7 @@ void IAmCommandReceiverShadow::sendIntrospection(DBusConnection *conn, DBusMessa // create a reply from the message reply = dbus_message_new_method_return(msg); - std::string fullpath(EXECUTABLE_OUTPUT_PATH); - fullpath.append("/CommandInterface.xml"); + std::string fullpath(COMMAND_DBUS_INTROSPECTION_FILE); std::ifstream in(fullpath.c_str(), std::ifstream::in); if (!in) { 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) { @@ -1,7 +1,10 @@ -GENIVI AudioManager +GENIVI_AudioManager =================== -Christian Linke <christian.linke@bmw.de> +:Author: Christian Linke <christian.linke@bmw.de> +:doctitle: GENIVI_AudioManager +Copyright +--------- Copyright (C) 2012, GENIVI Alliance, Inc. Copyright (C) 2012, BMW AG diff --git a/README.html b/README.html index b4f7aca..d805a5f 100644 --- a/README.html +++ b/README.html @@ -4,7 +4,7 @@ <head>
<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
<meta name="generator" content="AsciiDoc 8.6.6" />
-<title>GENIVI AudioManager</title>
+<title>GENIVI_AudioManager</title>
<style type="text/css">
/* Shared CSS for AsciiDoc xhtml11 and html5 backends */
@@ -735,12 +735,12 @@ asciidoc.install(); </head>
<body class="article">
<div id="header">
-<h1>GENIVI AudioManager</h1>
-<span id="author">Christian Linke</span><br />
-<span id="email"><tt><<a href="mailto:christian.linke@bmw.de">christian.linke@bmw.de</a>></tt></span><br />
+<h1>GENIVI_AudioManager</h1>
+<span id="author">Christian Linke <christian.linke@bmw.de></span><br />
</div>
<div id="content">
-<div id="preamble">
+<div class="sect1">
+<h2 id="_copyright">Copyright</h2>
<div class="sectionbody">
<div class="paragraph"><p>Copyright © 2012, GENIVI Alliance, Inc.
Copyright © 2012, BMW AG</p></div>
@@ -973,7 +973,7 @@ Just add a folder with the name <em>ProjectSpecific</em> (be sure to name it exc </tr></table>
</div>
<div class="listingblock">
-<div class="title">Here is a sample CMakeLists.txt that can be places in ProjectSpecific folder:</div>
+<div class="title">Here is a sample CMakeLists.txt that can be placed in ProjectSpecific folder:</div>
<div class="content">
<pre><tt>cmake_minimum_required(VERSION 2.6)
@@ -1191,7 +1191,7 @@ handle later on.</p></div> <div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2012-10-22 14:07:11 CEST
+Last updated 2012-10-25 16:17:52 CEST
</div>
</div>
</body>
diff --git a/cmake/cmake_uninstall.cmake.in b/cmake/cmake_uninstall.cmake.in index bfa406d..648ad51 100755 --- a/cmake/cmake_uninstall.cmake.in +++ b/cmake/cmake_uninstall.cmake.in @@ -1,5 +1,5 @@ # Copyright (C) 2012, GENIVI Alliance, Inc. - * Copyright (C) 2012, BMW AG +# Copyright (C) 2012, BMW AG # # This file is part of GENIVI Project AudioManager. # |