CommonAPI version: fix path pb due to new version in Franca fidl

7 files changed, 19 insertions, 13 deletions

diff --git a/README.md b/README.md
index 38ab2d0..cf2a68f 100644
--- a/README.md
+++ b/README.md
@@ -67,7 +67,8 @@ cmake -DWITH_DBUS_INTERFACE=OFF -DWITH_FRANCA_DBUS_INTERFACE=ON -DWITH_FRANCA_SO
 -DWITH_TESTS=ON -DWITH_DEBUG=ON -DWITH_DLT=OFF -DCMAKE_BUILD_TYPE=Debug 
 -DCOMMONAPI_TOOL_GENERATOR=<path to generator> 
 -DCOMMONAPI_DBUS_TOOL_GENERATOR=<path to generator> 
--DCOMMONAPI_SOMEIP_TOOL_GENERATOR=<path to generator> ../
+-DCOMMONAPI_SOMEIP_TOOL_GENERATOR=<path to generator> 
+-DDBUS_LIB_PATH=<path to patched DBus> ../
 make
 ```
 
diff --git a/enhanced-position-service/franca/src/CMakeLists.txt b/enhanced-position-service/franca/src/CMakeLists.txt
index 55ad41e..d98fb35 100755
--- a/enhanced-position-service/franca/src/CMakeLists.txt
+++ b/enhanced-position-service/franca/src/CMakeLists.txt
@@ -18,7 +18,7 @@ set(CMAKE_VERBOSE_MAKEFILE on)
 set(CMAKE_CXX_FLAGS "-Wall -std=c++0x")
 set(CMAKE_BUILD_TYPE Debug)
 
-find_package(CommonAPI 3.1.5 REQUIRED)
+find_package(CommonAPI 3.1.9 REQUIRED)
 
 message(STATUS "WITH_DLT = ${WITH_DLT}")
 message(STATUS "WITH_GPSD = ${WITH_GPSD}")
@@ -31,13 +31,13 @@ message(STATUS "WITH_FRANCA_SOMEIP_INTERFACE = ${WITH_FRANCA_SOMEIP_INTERFACE}")
 # Source Files
 set(PRJ_SRC_PATH ${CMAKE_CURRENT_SOURCE_DIR})
 set(PRJ_SRC_GEN_ROOT ${CMAKE_BINARY_DIR}/enhanced-position-service/franca/api)
-set(PRJ_SRC_GEN_PATH ${PRJ_SRC_GEN_ROOT}/org/genivi/EnhancedPositionService)
+set(PRJ_SRC_GEN_PATH ${PRJ_SRC_GEN_ROOT}/v5/org/genivi/EnhancedPositionService)
 
 if (WITH_FRANCA_DBUS_INTERFACE)
 
     message(STATUS "ENHANCED-POSITION-SERVICE-FRANCA-DBUS")
     
-    find_package(CommonAPI-DBus 3.1.5 REQUIRED)
+    find_package(CommonAPI-DBus 3.1.9 REQUIRED)
 
 
     # CommonAPI
@@ -53,8 +53,8 @@ if (WITH_FRANCA_DBUS_INTERFACE)
       # There's a package config file in the PATH
       pkg_check_modules (DBUS "dbus-1 >= 1.4")
     endif()
-    pkg_check_modules (COMMONAPI "CommonAPI >= 3.1")
-    pkg_check_modules (COMMONAPI_DBUS "CommonAPI-DBus >= 3.1")
+    pkg_check_modules (COMMONAPI "CommonAPI >= 3.1.9")
+    pkg_check_modules (COMMONAPI_DBUS "CommonAPI-DBus >= 3.1.9")
 
     FILE(GLOB PRJ_PROXY_GEN_SRCS ${PRJ_SRC_GEN_PATH}/*DBusProxy.cpp ${PRJ_SRC_GEN_PATH}/*Types.cpp ${PRJ_SRC_GEN_PATH}/*DBusDeployment.cpp)
     FILE(GLOB PRJ_STUB_GEN_SRCS ${PRJ_SRC_GEN_PATH}/*DBusStub*.cpp ${PRJ_SRC_GEN_PATH}/*Types.cpp ${PRJ_SRC_GEN_PATH}/*DBusDeployment.cpp ${PRJ_SRC_GEN_PATH}/*StubDefault.cpp)
@@ -77,6 +77,7 @@ if (WITH_FRANCA_DBUS_INTERFACE)
         ${COMMONAPI_INCLUDE_DIRS}
         ${COMMONAPI_DBUS_INCLUDE_DIRS}
         ${CMAKE_CURRENT_BINARY_DIR}
+        ${COMMONAPI_GEN_DIR}
         ${gnss-service_INCLUDE_DIRS}
         ${sensors-service_INCLUDE_DIRS}
     )
diff --git a/enhanced-position-service/franca/src/ConfigurationStubImpl.cpp b/enhanced-position-service/franca/src/ConfigurationStubImpl.cpp
index 68270fb..216dc03 100644
--- a/enhanced-position-service/franca/src/ConfigurationStubImpl.cpp
+++ b/enhanced-position-service/franca/src/ConfigurationStubImpl.cpp
@@ -27,8 +27,6 @@
 
 DLT_IMPORT_CONTEXT(gCtx);
 
-using namespace org::genivi::EnhancedPositionService;
-
 ConfigurationStubImpl::ConfigurationStubImpl() {
 
    setUpdateIntervalAttribute(1000); //set default time interval
diff --git a/enhanced-position-service/franca/src/ConfigurationStubImpl.hpp b/enhanced-position-service/franca/src/ConfigurationStubImpl.hpp
index 661da8f..6defc85 100644
--- a/enhanced-position-service/franca/src/ConfigurationStubImpl.hpp
+++ b/enhanced-position-service/franca/src/ConfigurationStubImpl.hpp
@@ -20,8 +20,10 @@
 #define CONFIGURATIONSTUBIMPL_H_
 
 #include <CommonAPI/CommonAPI.hpp>
-#include <org/genivi/EnhancedPositionService/ConfigurationStubDefault.hpp>
+#include <v5/org/genivi/EnhancedPositionService/ConfigurationStubDefault.hpp>
+#include <org/genivi/EnhancedPositionService/EnhancedPositionServiceTypes.hpp>
 
+using namespace v5::org::genivi::EnhancedPositionService;
 using namespace org::genivi::EnhancedPositionService;
 
 class ConfigurationStubImpl: public ConfigurationStubDefault {
diff --git a/enhanced-position-service/franca/src/EnhancedPositionClient.cpp b/enhanced-position-service/franca/src/EnhancedPositionClient.cpp
index 8f93c9b..89a52f9 100755
--- a/enhanced-position-service/franca/src/EnhancedPositionClient.cpp
+++ b/enhanced-position-service/franca/src/EnhancedPositionClient.cpp
@@ -5,12 +5,14 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include <CommonAPI/CommonAPI.hpp>
-#include <org/genivi/EnhancedPositionService/EnhancedPositionProxy.hpp>
+#include <v5/org/genivi/EnhancedPositionService/EnhancedPositionProxy.hpp>
+#include <org/genivi/EnhancedPositionService/EnhancedPositionServiceTypes.hpp>
 #include "log.h"
 #include <unistd.h>
 
 DLT_DECLARE_CONTEXT(gCtx);
 
+using namespace v5::org::genivi::EnhancedPositionService;
 using namespace org::genivi::EnhancedPositionService;
 
 void getPositionInfoAsyncCallback(const CommonAPI::CallStatus& callStatus, const EnhancedPositionServiceTypes::Timestamp& timestamp, const EnhancedPositionServiceTypes::PositionInfo& posInfo)
diff --git a/enhanced-position-service/franca/src/EnhancedPositionStubImpl.hpp b/enhanced-position-service/franca/src/EnhancedPositionStubImpl.hpp
index 1b45369..7729901 100644
--- a/enhanced-position-service/franca/src/EnhancedPositionStubImpl.hpp
+++ b/enhanced-position-service/franca/src/EnhancedPositionStubImpl.hpp
@@ -20,11 +20,11 @@
 #define ENHANCEDPOSITIONSTUBIMPL_H_
 
 #include <CommonAPI/CommonAPI.hpp>
-#include <org/genivi/EnhancedPositionService/EnhancedPositionStubDefault.hpp>
+#include <v5/org/genivi/EnhancedPositionService/EnhancedPositionStubDefault.hpp>
 #include "gnss-init.h"
 #include "gnss.h"
 
-using namespace org::genivi::EnhancedPositionService;
+using namespace v5::org::genivi::EnhancedPositionService;
 
 class EnhancedPositionStubImpl: public EnhancedPositionStubDefault {
 
diff --git a/enhanced-position-service/franca/src/PositionFeedbackStubImpl.hpp b/enhanced-position-service/franca/src/PositionFeedbackStubImpl.hpp
index f304dd7..9f5331c 100644
--- a/enhanced-position-service/franca/src/PositionFeedbackStubImpl.hpp
+++ b/enhanced-position-service/franca/src/PositionFeedbackStubImpl.hpp
@@ -20,8 +20,10 @@
 #define POSITIONFEEDBACKSTUBIMPL_H_
 
 #include <CommonAPI/CommonAPI.hpp>
-#include <org/genivi/EnhancedPositionService/PositionFeedbackStubDefault.hpp>
+#include <v5/org/genivi/EnhancedPositionService/PositionFeedbackStubDefault.hpp>
+#include <org/genivi/EnhancedPositionService/EnhancedPositionServiceTypes.hpp>
 
+using namespace v5::org::genivi::EnhancedPositionService;
 using namespace org::genivi::EnhancedPositionService;
 
 class PositionFeedbackStubImpl: public PositionFeedbackStubDefault {