[PACKAGING] - packaging changes

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 794fe04..57360b8 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10,7 +10,7 @@ set(PROJECT_NAME "automotive-message-broker")
 set(PROJECT_PRETTY_NAME "Automotive Message Broker")
 set(PROJECT_SERIES "0.14")
 set(PROJECT_MAJOR_VERSION "0.13")
-set(PROJECT_MINOR_VERSION "802")
+set(PROJECT_MINOR_VERSION "803")
 set(PROJECT_VERSION "${PROJECT_MAJOR_VERSION}.${PROJECT_MINOR_VERSION}")
 set(PROJECT_CODENAME "74A")
 set(PROJECT_QUALITY "alpha")

diff --git a/README.md b/README.md
index b32a3b2..64d33b3 100644 (file)
--- a/README.md
+++ b/README.md
@@ -60,7 +60,7 @@ You will also need to edit your config to enable the Qt-based mainloop:
 
 ~~~~~~~~~~~~~{.json}
 {
-       "mainloop" : "/usr/lib/i386-linux-gnu/automotive-message-broker/qtmainloopplugin.so",
+       "mainloop" : "/usr/local/lib/i386-linux-gnu/automotive-message-broker/qtmainloopplugin.so",
        "plugins" : "/etc/ambd/plugins.d"
 }
 ~~~~~~~~~~~~~

diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
index 5758dc6..ead8bf2 100644 (file)
--- a/docs/CMakeLists.txt
+++ b/docs/CMakeLists.txt
@@ -10,7 +10,7 @@ if(DOXYGEN_FOUND)
 
        #generate mappings documentation
        add_custom_target(genmappings_libamb
-                                               python ${CMAKE_SOURCE_DIR}/tools/genmapping --output ${CMAKE_CURRENT_BINARY_DIR}/ambdbusmappings.idl ${dbus_mapping_headers}
+                                               python ${CMAKE_BINARY_DIR}/tools/genmapping --output ${CMAKE_CURRENT_BINARY_DIR}/ambdbusmappings.idl ${dbus_mapping_headers}
                                                COMMENT "running genmapping")
        add_dependencies(docs genmappings_libamb)
 

diff --git a/packaging.in/automotive-message-broker.spec.in b/packaging.in/automotive-message-broker.spec.in
index c780c81..bce7a02 100644 (file)
--- a/packaging.in/automotive-message-broker.spec.in
+++ b/packaging.in/automotive-message-broker.spec.in
@@ -308,12 +308,14 @@ cp packaging/config.tizen %{buildroot}%{_sysconfdir}/ambd/
 %defattr(-,root,root,-)
 %manifest packaging.in/amb.manifest.plugins
 %{_libdir}/%{name}/opencvluxplugin.so
+%{_sysconfdir}/ambd/plugins.d/opencvlux
 
 %files plugins-bluetooth
 %defattr(-,root,root,-)
 %manifest packaging.in/amb.manifest.plugins
 %{_libdir}/%{name}/bluetoothplugin.so
 %config %{_sysconfdir}/dbus-1/system.d/ambbt.conf
+%{_sysconfdir}/ambd/plugins.d/bluetooth
 %{_bindir}/testAmbBt
 %endif
 
@@ -325,6 +327,9 @@ cp packaging/config.tizen %{buildroot}%{_sysconfdir}/ambd/
 %{_libdir}/%{name}/dbussinkplugin.so
 %{_libdir}/%{name}/demosinkplugin.so
 %config %{_sysconfdir}/dbus-1/system.d/amb.conf
+%{_sysconfdir}/ambd/plugins.d/dbus
+%{_sysconfdir}/ambd/plugins.d/examplesink
+%{_sysconfdir}/ambd/plugins.d/examplesource
 
 %files plugins-common
 %manifest packaging.in/amb.manifest.plugins
@@ -340,11 +345,13 @@ cp packaging/config.tizen %{buildroot}%{_sysconfdir}/ambd/
 %defattr(-,root,root,-)
 %manifest packaging.in/amb.manifest.plugins
 %{_libdir}/%{name}/obd2sourceplugin.so
+%{_sysconfdir}/ambd/plugins.d/obd2
 
 %files plugins-database
 %defattr(-,root,root,-)
 %manifest packaging.in/amb.manifest.plugins
 %{_libdir}/%{name}/databasesinkplugin.so
+%{_sysconfdir}/ambd/plugins.d/database
 
 %files plugins-murphy
 %defattr(-,root,root,-)
@@ -385,6 +392,7 @@ cp packaging/config.tizen %{buildroot}%{_sysconfdir}/ambd/
 %manifest packaging.in/amb.manifest.plugins
 %{_libdir}/%{name}/bluemonkeyplugin.so
 %config %{_sysconfdir}/ambd/bluemonkey
+%{_sysconfdir}/ambd/plugins.d/bluemonkey
 
 %files -n bluemonkey-modules-db
 %manifest packaging.in/amb.manifest.plugins

diff --git a/packaging.in/debian/automotive-message-broker-plugins-qtmainloop.debian.install b/packaging.in/debian/automotive-message-broker-plugins-qtmainloop.debian.install
new file mode 100644 (file)
index 0000000..9691ea6
--- /dev/null
+++ b/packaging.in/debian/automotive-message-broker-plugins-qtmainloop.debian.install
@@ -0,0 +1,3 @@
+debian/tmp/@PLUGIN_INSTALL_PATH@/qtmainloopplugin.so
+
+

diff --git a/plugins/bluemonkey/bmdbus.cpp b/plugins/bluemonkey/bmdbus.cpp
index cbe624c..41a3dd1 100644 (file)
--- a/plugins/bluemonkey/bmdbus.cpp
+++ b/plugins/bluemonkey/bmdbus.cpp
@@ -49,7 +49,7 @@ bool BMDBus::exportObject(const QString &path, const QString &interface, BMDBus:
 #if (QT_VERSION >= QT_VERSION_CHECK(5, 5, 0))
        con.registerObject(path, interface, object, QDBusConnection::ExportAllContents);
 #else
-       DebugOut(DebugOut::Warning) << ___FUNCTION___ << " interface is ignored in qt 5.4 and lower" << endl;
+       DebugOut(DebugOut::Warning) << "BMDBus::exportObject() interface is ignored in qt 5.4 and lower" << endl;
        con.registerObject(path, object, QDBusConnection::ExportAllContents);
 #endif
 

diff --git a/plugins/obd2plugin/CMakeLists.txt b/plugins/obd2plugin/CMakeLists.txt
index 1c64c05..807796b 100644 (file)
--- a/plugins/obd2plugin/CMakeLists.txt
+++ b/plugins/obd2plugin/CMakeLists.txt
@@ -19,4 +19,7 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/README ${CMAKE_CURRENT_BINARY_DIR}/ob
 
 install (FILES ${CMAKE_CURRENT_BINARY_DIR}/obd2.README.md DESTINATION ${DOC_INSTALL_DIR}/plugins)
 
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/obd2.in.json ${CMAKE_CURRENT_BINARY_DIR}/obd2 @ONLY)
+install (FILES ${CMAKE_CURRENT_BINARY_DIR}/obd2 DESTINATION ${PLUGIN_SEGMENT_INSTALL_PATH})
+
 endif(obd2_plugin)

diff --git a/plugins/obd2plugin/obd2.in.json b/plugins/obd2plugin/obd2.in.json
new file mode 100644 (file)
index 0000000..06c8450
--- /dev/null
+++ b/plugins/obd2plugin/obd2.in.json
@@ -0,0 +1,7 @@
+{
+       "name" : "Obd2",
+       "path" : "@PLUGIN_INSTALL_PATH@/obd2sourceplugin.so",
+       "device" : "/dev/ttyUSB0",
+       "baud" : "115200",
+       "enabled" : false
+}

diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index 2d1e602..9ab1df8 100644 (file)
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -1,4 +1,4 @@
-configure_file (${CMAKE_CURRENT_SOURCE_DIR}/genmapping.py ${CMAKE_CURRENT_SOURCE_DIR}/genmapping @ONLY)
+configure_file (${CMAKE_CURRENT_SOURCE_DIR}/genmapping.py ${CMAKE_CURRENT_BINARY_DIR}/genmapping @ONLY)
 configure_file (${CMAKE_CURRENT_SOURCE_DIR}/ambctl.py ${CMAKE_CURRENT_BINARY_DIR}/ambctl @ONLY)
 
 install (PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/ambctl DESTINATION bin)