diff options
author | Christian Linke <christian.linke@bmw.de> | 2013-06-26 17:31:10 +0200 |
---|---|---|
committer | Christian Linke <christian.linke@bmw.de> | 2013-06-26 17:46:46 +0200 |
commit | efd0872cbb07b975e19717b35ab1e4ea7ab1b6ec (patch) | |
tree | 2caed791ad665e456c690fc1f057386cecbe6236 | |
parent | 6a5f434ff19963d0b37d89c06c0dab9249f34fd9 (diff) | |
download | audiomanager-efd0872cbb07b975e19717b35ab1e4ea7ab1b6ec.tar.gz |
* update documentation and readme
Signed-off-by: Christian Linke <christian.linke@bmw.de>
-rwxr-xr-x | AudioManagerDaemon/docx/images/dependencies.png | bin | 33324 -> 34175 bytes | |||
-rw-r--r--[-rwxr-xr-x] | AudioManagerDaemon/docx/images/dependencies_test.png | bin | 53955 -> 55504 bytes | |||
-rwxr-xr-x | README | 56 | ||||
-rw-r--r-- | README.html | 24 |
4 files changed, 48 insertions, 32 deletions
diff --git a/AudioManagerDaemon/docx/images/dependencies.png b/AudioManagerDaemon/docx/images/dependencies.png Binary files differindex d2dcddd..f5c925d 100755 --- a/AudioManagerDaemon/docx/images/dependencies.png +++ b/AudioManagerDaemon/docx/images/dependencies.png diff --git a/AudioManagerDaemon/docx/images/dependencies_test.png b/AudioManagerDaemon/docx/images/dependencies_test.png Binary files differindex eca6a9e..05a30ad 100755..100644 --- a/AudioManagerDaemon/docx/images/dependencies_test.png +++ b/AudioManagerDaemon/docx/images/dependencies_test.png @@ -57,27 +57,32 @@ make === Compile Options These are the compile options with default values: - BUILD_SHARED_LIBS OFF - CMAKE_BUILD_TYPE - CMAKE_INSTALL_PREFIX /usr/local - GLIB_DBUS_TYPES_TOLERANT ON - USE_BUILD_LIBS ON - WITH_DBUS_WRAPPER ON - WITH_DLT ON - WITH_DOCUMENTATION OFF - WITH_PLUGIN_COMMAND ON - WITH_PLUGIN_CONTROL ON - WITH_PLUGIN_ROUTING ON - WITH_SYSTEMD_WATCHDOG OFF - WITH_TELNET ON - WITH_TESTS ON - WITH_NSM ON - gmock_build_tests OFF - gtest_build_samples OFF - gtest_build_tests OFF - gtest_disable_pthreads OFF - gtest_force_shared_crt OFF - + BUILD_SHARED_LIBS OFF + CMAKE_BUILD_TYPE + CMAKE_INSTALL_PREFIX /usr/local + GLIB_DBUS_TYPES_TOLERANT ON + USE_BUILD_LIBS ON + WITH_COMMAND_INTERFACE_DBUS ON + WITH_DATABASE_STORAGE ON + WITH_DBUS_WRAPPER ON + WITH_DLT OFF + WITH_DOCUMENTATION ON + WITH_NSM OFF + WITH_PLUGIN_COMMAND ON + WITH_PLUGIN_CONTROL ON + WITH_PLUGIN_ROUTING ON + WITH_ROUTING_INTERFACE_ASYNC OFF + WITH_ROUTING_INTERFACE_DBUS ON + WITH_SYSTEMD_WATCHDOG OFF + WITH_TELNET OFF + WITH_TESTS OFF + WITH_TEST_CONTROLLER OFF + gmock_build_tests OFF + gtest_build_samples OFF + gtest_build_tests OFF + gtest_disable_pthreads OFF + gtest_force_shared_crt OFF + === Passing options to cmake: .-DVERSION="XXX" @@ -105,11 +110,14 @@ In order to change these options, you can modify this values with ccmake, do the CmakeList.txt or via the commandline for cmake or (when installed via ccmake) === Build dependencies -You will need to fullfill some dependencies in order to comile the GENIVI AudioManager Daemon, these are: +Basically, all build dependencies are optional- but you might need to use some if you want to have support for Dbus, +for example... + +You will need optionally fullfill some dependencies in order to comile the GENIVI AudioManager Daemon, these are: * dbus (only when DBUS_WRAPPER==ON) [tested on version 1.2.16] -* sqlite3 [tested on version 3.6.22] -* automotive-dlt [greater 2.5.0] +* sqlite3 [tested on version 3.6.22] (only when WITH_DATABASE_STORAGE==ON) +* automotive-dlt [greater 2.5.0] (only when WITH_DLT==ON) * doxygen (only when WITH_DOCUMENTATION==ON) [tested on version 1.6.3] To install them in a build environment like Ubuntu you can use: diff --git a/README.html b/README.html index e37c8c9..97e8328 100644 --- a/README.html +++ b/README.html @@ -807,15 +807,21 @@ CMAKE_BUILD_TYPE CMAKE_INSTALL_PREFIX /usr/local
GLIB_DBUS_TYPES_TOLERANT ON
USE_BUILD_LIBS ON
+WITH_COMMAND_INTERFACE_DBUS ON
+WITH_DATABASE_STORAGE ON
WITH_DBUS_WRAPPER ON
-WITH_DLT ON
-WITH_DOCUMENTATION OFF
+WITH_DLT OFF
+WITH_DOCUMENTATION ON
+WITH_NSM OFF
WITH_PLUGIN_COMMAND ON
WITH_PLUGIN_CONTROL ON
WITH_PLUGIN_ROUTING ON
+WITH_ROUTING_INTERFACE_ASYNC OFF
+WITH_ROUTING_INTERFACE_DBUS ON
WITH_SYSTEMD_WATCHDOG OFF
-WITH_TELNET ON
-WITH_TESTS ON
+WITH_TELNET OFF
+WITH_TESTS OFF
+WITH_TEST_CONTROLLER OFF
gmock_build_tests OFF
gtest_build_samples OFF
gtest_build_tests OFF
@@ -837,7 +843,9 @@ CmakeList.txt or via the commandline for cmake or (when installed via ccmake)</p </div>
<div class="sect2">
<h3 id="_build_dependencies">Build dependencies</h3>
-<div class="paragraph"><p>You will need to fullfill some dependencies in order to comile the GENIVI AudioManager Daemon, these are:</p></div>
+<div class="paragraph"><p>Basically, all build dependencies are optional- but you might need to use some if you want to have support for Dbus,
+for example…</p></div>
+<div class="paragraph"><p>You will need optionally fullfill some dependencies in order to comile the GENIVI AudioManager Daemon, these are:</p></div>
<div class="ulist"><ul>
<li>
<p>
@@ -846,12 +854,12 @@ dbus (only when DBUS_WRAPPER==ON) [tested on version 1.2.16] </li>
<li>
<p>
-sqlite3 [tested on version 3.6.22]
+sqlite3 [tested on version 3.6.22] (only when WITH_DATABASE_STORAGE==ON)
</p>
</li>
<li>
<p>
-automotive-dlt [greater 2.5.0]
+automotive-dlt [greater 2.5.0] (only when WITH_DLT==ON)
</p>
</li>
<li>
@@ -1202,7 +1210,7 @@ handle later on.</p></div> <div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2013-01-07 13:31:14 CET
+Last updated 2013-06-26 17:30:25 CEST
</div>
</div>
</body>
|