From 8f43ba9159a4f9f5efbf9c2515f314cc58737d48 Mon Sep 17 00:00:00 2001
From: christian linke
Date: Mon, 7 Jan 2013 13:32:52 +0100
Subject: * take away mandatory NSM dependency and ship NSM headers as fallback
Signed-off-by: christian linke
---
AudioManagerDaemon/CMakeLists.txt | 3 +
PluginControlInterface/CMakeLists.txt | 3 +
README | 11 +-
README.html | 16 +-
cmake/FindNSM.cmake | 32 ++++
nodeStateManagerIncludes/NodeStateManager.h | 129 ++++++++++++++
nodeStateManagerIncludes/NodeStateTypes.h | 252 ++++++++++++++++++++++++++++
7 files changed, 438 insertions(+), 8 deletions(-)
create mode 100644 cmake/FindNSM.cmake
create mode 100644 nodeStateManagerIncludes/NodeStateManager.h
create mode 100644 nodeStateManagerIncludes/NodeStateTypes.h
diff --git a/AudioManagerDaemon/CMakeLists.txt b/AudioManagerDaemon/CMakeLists.txt
index 4704864..bfc026f 100644
--- a/AudioManagerDaemon/CMakeLists.txt
+++ b/AudioManagerDaemon/CMakeLists.txt
@@ -40,6 +40,8 @@ IF(WITH_DBUS_WRAPPER)
FIND_PACKAGE(DBUS REQUIRED)
ENDIF(WITH_DBUS_WRAPPER)
+FIND_PACKAGE(NSM REQUIRED)
+
SET(AUDIOMAN_SRCS_CXX
src/main.cpp
src/CAmCommandReceiver.cpp
@@ -86,6 +88,7 @@ INCLUDE_DIRECTORIES(
${AUDIO_INCLUDE_FOLDER}
${PROJECT_INCLUDE_FOLDER}
${INCLUDE_FOLDER}
+ ${NSM_INCLUDE_DIR}
)
IF(WITH_DLT)
diff --git a/PluginControlInterface/CMakeLists.txt b/PluginControlInterface/CMakeLists.txt
index b1be2d1..f90fe04 100644
--- a/PluginControlInterface/CMakeLists.txt
+++ b/PluginControlInterface/CMakeLists.txt
@@ -27,6 +27,8 @@ STRING(REGEX MATCH "ControlSendVersion*.[^0-9]*[0-9].[0-9]*[0-9]" LIB_INTERFACE_
STRING(REGEX REPLACE "ControlSendVersion*.." "" LIB_INTERFACE_VERSION ${LIB_INTERFACE_VERSION_STRING})
MESSAGE(STATUS "Building against control interface version ${LIB_INTERFACE_VERSION}")
+FIND_PACKAGE(NSM REQUIRED)
+
INCLUDE_DIRECTORIES(
${CMAKE_SOURCE_DIR}
${STD_INCLUDE_DIRS}
@@ -34,6 +36,7 @@ INCLUDE_DIRECTORIES(
${AUDIO_INCLUDE_FOLDER}
${PROJECT_INCLUDE_FOLDER}
${INCLUDE_FOLDER}
+ ${NSM_INCLUDE_DIR}
)
# all source files go here
diff --git a/README b/README
index 4ae427c..5306d45 100755
--- a/README
+++ b/README
@@ -94,6 +94,12 @@ sets the default telnetport, default 6060. Can be overwriten by command line par
.-DMAX_TELNETCONNECTIONS="XXX"
sets the default maximum number of telnetconnections, default is 3
+.-DNSM_PATH="XXX"
+sets the path of the NSM DBUS interface
+
+.-DNSM_INTERFACE="XXX"
+sets the interface to the NSM DBUS interface
+
In order to change these options, you can modify this values with ccmake, do the appropriate changes in
CmakeList.txt or via the commandline for cmake or (when installed via ccmake)
@@ -104,13 +110,16 @@ You will need to fullfill some dependencies in order to comile the GENIVI AudioM
* sqlite3 [tested on version 3.6.22]
* automotive-dlt [greater 2.5.0]
* doxygen (only when WITH_DOCUMENTATION==ON) [tested on version 1.6.3]
-* nodestatemanager headers [tested with version 0.1.0]
To install them in a build environment like Ubuntu you can use:
----
sudo apt-get install libdbus-1-dev libsqlite3-dev doxygen git cmake build-essential
----
+=== The NodeStateManager
+
+The nodestatemanager headers are needed to compile the audiomanager. If the nodestatemanagerincludes are not found,
+the headers shipped with the audiomanager are used.
The nodestatemanager can be retrieved from projects.genivi.org . You can install the headers on you system by
----
diff --git a/README.html b/README.html
index c1be5ea..e37c8c9 100644
--- a/README.html
+++ b/README.html
@@ -830,6 +830,8 @@ gtest_force_shared_crt OFF
-DDBUS_SERVICE_OBJECT_PATH="XXX"
sets the object path for Dbus, default "/org/genivi/audiomanager\0"
-DDEFAULT_TELNETPORT="XXX"
sets the default telnetport, default 6060. Can be overwriten by command line parameter
-DMAX_TELNETCONNECTIONS="XXX"
sets the default maximum number of telnetconnections, default is 3
+-DNSM_PATH="XXX"
sets the path of the NSM DBUS interface
+-DNSM_INTERFACE="XXX"
sets the interface to the NSM DBUS interface
In order to change these options, you can modify this values with ccmake, do the appropriate changes in
CmakeList.txt or via the commandline for cmake or (when installed via ccmake)
@@ -857,18 +859,18 @@ automotive-dlt [greater 2.5.0]
doxygen (only when WITH_DOCUMENTATION==ON) [tested on version 1.6.3]
-
-
-nodestatemanager headers [tested with version 0.1.0]
-
-
To install them in a build environment like Ubuntu you can use:
sudo apt-get install libdbus-1-dev libsqlite3-dev doxygen git cmake build-essential
-The nodestatemanager can be retrieved from projects.genivi.org . You can install the headers on you system by
+
+
+
The NodeStateManager
+
The nodestatemanager headers are needed to compile the audiomanager. If the nodestatemanagerincludes are not found,
+the headers shipped with the audiomanager are used.
+The nodestatemanager can be retrieved from projects.genivi.org . You can install the headers on you system by
sudo make install-includeHEADERS
@@ -1200,7 +1202,7 @@ handle later on.