diff options
| author | Philip Rauwolf <rauwolf@itestra.de> | 2013-09-13 18:51:47 +0200 |
|---|---|---|
| committer | Johannes Schanda <schanda@itestra.de> | 2013-09-18 17:50:09 +0200 |
| commit | bee917e24eb806eb8ee7239fd563b9df6987d74b (patch) | |
| tree | 97648541bc2e7e000d5406fd623f9ebd44e3022d | |
| parent | 04e4944d29ddd2702e9c811edd66ef9c134c4fd0 (diff) | |
| download | genivi-common-api-dbus-runtime-bee917e24eb806eb8ee7239fd563b9df6987d74b.tar.gz | |
Added version information to MiddlewareInfo.
The version information used for compilation is taken from the version
given in the Makefile.am.
| -rw-r--r-- | Makefile.am | 14 | ||||
| -rw-r--r-- | src/CommonAPI/DBus/DBusRuntime.cpp | 4 | ||||
| -rw-r--r-- | src/test/dbusDynamicLoadingTests/fakeTestBinding/FakeBinding.cpp | 2 |
3 files changed, 12 insertions, 8 deletions
diff --git a/Makefile.am b/Makefile.am index 2d28267..d20ed01 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3,13 +3,20 @@ ACLOCAL_AMFLAGS = -I m4 EXTRA_DIST = LICENSE LICENSE_dbus_patch LICENSE_MurmurHash MOSTLYCLEANFILES = +# Library interface (not package version!) +LIBCOMMONAPI_DBUS_CURRENT=3 +LIBCOMMONAPI_DBUS_REVISION=0 +LIBCOMMONAPI_DBUS_AGE=0 + AM_CPPFLAGS = \ -include $(top_builddir)/build-aux/config.h \ -I$(top_srcdir)/src \ -I$(top_srcdir)/src/test \ ${COMMONAPI_CFLAGS} \ ${DBUS_CFLAGS} \ - -DCOMMONAPI_INTERNAL_COMPILATION + -DCOMMONAPI_INTERNAL_COMPILATION \ + -DCOMMONAPI_DBUS_VERSION_MAJOR=${LIBCOMMONAPI_DBUS_CURRENT} \ + -DCOMMONAPI_DBUS_VERSION_MINOR=${LIBCOMMONAPI_DBUS_REVISION} AM_LDFLAGS = \ @@ -19,11 +26,6 @@ AM_LDFLAGS = \ noinst_LTLIBRARIES = lib_LTLIBRARIES = -# Library interface (not package version!) -LIBCOMMONAPI_DBUS_CURRENT=3 -LIBCOMMONAPI_DBUS_REVISION=0 -LIBCOMMONAPI_DBUS_AGE=0 - # ------------------------------------------------------------------------------ noinst_LTLIBRARIES += libmurmurhash-internal.la diff --git a/src/CommonAPI/DBus/DBusRuntime.cpp b/src/CommonAPI/DBus/DBusRuntime.cpp index 24f81f3..9da7bea 100644 --- a/src/CommonAPI/DBus/DBusRuntime.cpp +++ b/src/CommonAPI/DBus/DBusRuntime.cpp @@ -13,7 +13,9 @@ const char middlewareIdentifier[] = "DBus"; -const CommonAPI::MiddlewareInfo middlewareInfo(middlewareIdentifier, &CommonAPI::DBus::DBusRuntime::getInstance); +const CommonAPI::MiddlewareInfo middlewareInfo(middlewareIdentifier, + &CommonAPI::DBus::DBusRuntime::getInstance, + {COMMONAPI_DBUS_VERSION_MAJOR, COMMONAPI_DBUS_VERSION_MINOR} ); namespace CommonAPI { diff --git a/src/test/dbusDynamicLoadingTests/fakeTestBinding/FakeBinding.cpp b/src/test/dbusDynamicLoadingTests/fakeTestBinding/FakeBinding.cpp index b5280a4..ba05a13 100644 --- a/src/test/dbusDynamicLoadingTests/fakeTestBinding/FakeBinding.cpp +++ b/src/test/dbusDynamicLoadingTests/fakeTestBinding/FakeBinding.cpp @@ -7,7 +7,7 @@ #include "FakeBinding.h" -const CommonAPI::MiddlewareInfo middlewareInfo("Fake", &CommonAPI::Fake::FakeRuntime::getInstance); +const CommonAPI::MiddlewareInfo middlewareInfo("Fake", &CommonAPI::Fake::FakeRuntime::getInstance, {55, 4} ); namespace CommonAPI { |