From 90a066a53f841a336079a50a03f42a36b4a9ccbd Mon Sep 17 00:00:00 2001 From: Date: Mon, 8 Dec 2014 18:33:58 +0100 Subject: fix bug in enhanced position plugin --- src/navigation/CMakeLists.txt | 2 +- .../enhancedposition-plugin/CMakeLists.txt | 7 +- .../genivi_positioning_enhancedposition.cxx | 3 +- src/navigation/script/build.sh | 2 +- src/poi-service/CMakeLists.txt | 75 ---------------------- test/poi-service/CMakeLists.txt | 2 +- 6 files changed, 9 insertions(+), 82 deletions(-) delete mode 100644 src/poi-service/CMakeLists.txt diff --git a/src/navigation/CMakeLists.txt b/src/navigation/CMakeLists.txt index acab237..e84337d 100644 --- a/src/navigation/CMakeLists.txt +++ b/src/navigation/CMakeLists.txt @@ -159,7 +159,7 @@ endif() # Check if positioning stuff with the right version has been cloned and do it if necessary # positioning_SRC_DIR is set by cmake -Dpositioning_SRC_DIR= set(positioning_URL http://git.projects.genivi.org/lbs/positioning.git) -set(positioning_VERSION 98c626c1a3856f444e9441950f6500db6ae9b997) +set(positioning_VERSION fe164c14aa9594736656ff5c2ec0251a5f561376) if (EXISTS ${positioning_SRC_DIR}) execute_process(COMMAND ${git_get_src_version} diff --git a/src/navigation/navigation-core/enhancedposition-plugin/CMakeLists.txt b/src/navigation/navigation-core/enhancedposition-plugin/CMakeLists.txt index 29a008b..ae9bd32 100644 --- a/src/navigation/navigation-core/enhancedposition-plugin/CMakeLists.txt +++ b/src/navigation/navigation-core/enhancedposition-plugin/CMakeLists.txt @@ -48,10 +48,13 @@ include_directories(${navit_SRC_DIR}/navit) include_directories(${CMAKE_CURRENT_BINARY_DIR}) include_directories(${CMAKE_CURRENT_BINARY_DIR}/../..) -include_directories(${generated_api_DIR}) include_directories(${positioning_API}) set(genivi_positioning_enhancedposition_LIBS ${DBUS_CPP_LDFLAGS}) -module_add_library(genivi_positioning_enhancedposition genivi_positioning_enhancedposition.cxx ${generated_api_DIR}/genivi-positioning-enhancedposition_proxy.h) +module_add_library(genivi_positioning_enhancedposition + genivi_positioning_enhancedposition.cxx + ${positioning_API}/genivi-positioning-enhancedposition_proxy.h + ${positioning_API}/genivi-positioning-constants.h +) diff --git a/src/navigation/navigation-core/enhancedposition-plugin/genivi_positioning_enhancedposition.cxx b/src/navigation/navigation-core/enhancedposition-plugin/genivi_positioning_enhancedposition.cxx index 1aa7f2e..29caa62 100644 --- a/src/navigation/navigation-core/enhancedposition-plugin/genivi_positioning_enhancedposition.cxx +++ b/src/navigation/navigation-core/enhancedposition-plugin/genivi_positioning_enhancedposition.cxx @@ -48,8 +48,6 @@ */ #include -#include "genivi-navigationcore-constants.h" -#include "genivi-positioning-constants.h" #include #include #include @@ -73,6 +71,7 @@ #define dbg(level,...) ; #endif +#include "genivi-positioning-constants.h" #include "genivi-positioning-enhancedposition_proxy.h" DBus::Glib::BusDispatcher dispatcher; diff --git a/src/navigation/script/build.sh b/src/navigation/script/build.sh index 70baca7..98492cf 100755 --- a/src/navigation/script/build.sh +++ b/src/navigation/script/build.sh @@ -299,7 +299,7 @@ build() { cd $NAVIGATION_CORE_BIN_DIR mkdir -p $NAVIGATION_CORE_ENHANCEDPOSITION cd $NAVIGATION_CORE_ENHANCEDPOSITION_BIN_DIR - cmake -Wno-dev -C $NAVIT_BIN_DIR/cmake_plugin_settings.txt -Dpositioning_API=$ENHANCED_POSITION_SERVICE_GENERATED_API_DIR -Dapi_DIR=$API_DIR -Dgenerated_api_DIR=$GENERATED_API_DIR -Dnavit_SRC_DIR=$NAVIT_SRC_DIR $NAVIT_PLUGIN_FLAGS $NAVIGATION_CORE_ENHANCEDPOSITION_SRC_DIR && make + cmake -Wno-dev -C $NAVIT_BIN_DIR/cmake_plugin_settings.txt -Dpositioning_API=$ENHANCED_POSITION_SERVICE_GENERATED_API_DIR -Dnavit_SRC_DIR=$NAVIT_SRC_DIR $NAVIT_PLUGIN_FLAGS $NAVIGATION_CORE_ENHANCEDPOSITION_SRC_DIR && make cd $TOP_BIN_DIR mkdir -p $MAP_VIEWER diff --git a/src/poi-service/CMakeLists.txt b/src/poi-service/CMakeLists.txt deleted file mode 100644 index fbf7a2c..0000000 --- a/src/poi-service/CMakeLists.txt +++ /dev/null @@ -1,75 +0,0 @@ -########################################################################### -# @licence app begin@ -# SPDX-License-Identifier: MPL-2.0 -# -# Component Name: navigation -# -# Author: Philippe Colliot -# -# Copyright (C) 2014, PCA Peugeot Citroën -# -# License: -# This Source Code Form is subject to the terms of the -# Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with -# this file, You can obtain one at http://mozilla.org/MPL/2.0/. -# -# @licence end@ -########################################################################### -project(navigation) -cmake_minimum_required(VERSION 2.8) - -message(STATUS "navigation") - -find_program(XSLTPROC xsltproc REQUIRED) -find_program(GIT git) - -include_directories(${CMAKE_CURRENT_BINARY_DIR}) - -set (git_get_src_version git rev-parse HEAD) -set (git_executable ${GIT}) - -# Check if positioning stuff with the right version has been cloned and do it if necessary -# positioning_SRC_DIR is set by cmake -Dpositioning_SRC_DIR= -set(positioning_URL http://git.projects.genivi.org/lbs/positioning.git) -set(positioning_VERSION fde1a780f531389d5a05e3b0486c98ad34df3dcb) - -if (EXISTS ${positioning_SRC_DIR}) - execute_process(COMMAND ${git_get_src_version} - WORKING_DIRECTORY "${positioning_SRC_DIR}" - RESULT_VARIABLE result - OUTPUT_VARIABLE version) - if (${version} MATCHES ${positioning_VERSION}) - message(STATUS "version of positioning up to date") - else() - message(STATUS "get the right version of positioning") - execute_process( - COMMAND "${git_executable}" pull - COMMAND "${git_executable}" checkout ${positioning_VERSION} - WORKING_DIRECTORY "${positioning_SRC_DIR}" - RESULT_VARIABLE error_code - ) - if(error_code) - message(FATAL_ERROR "Failed to checkout version: '${positioning_VERSION}'") - endif() - endif() -else() - message(STATUS "clone positioning") - execute_process( - COMMAND "${git_executable}" clone "${positioning_URL}" "${positioning_SRC_DIR}" - RESULT_VARIABLE error_code - ) - if(error_code) - message(FATAL_ERROR "Failed to clone repository: '${positioning_URL}'") - endif() - - message(STATUS "get the right version of positioning") - execute_process( - COMMAND "${git_executable}" pull - COMMAND "${git_executable}" checkout ${positioning_VERSION} - WORKING_DIRECTORY "${positioning_SRC_DIR}" - RESULT_VARIABLE error_code - ) - if(error_code) - message(FATAL_ERROR "Failed to checkout version: '${positioning_VERSION}'") - endif() -endif() diff --git a/test/poi-service/CMakeLists.txt b/test/poi-service/CMakeLists.txt index 105e8b8..4e04d70 100644 --- a/test/poi-service/CMakeLists.txt +++ b/test/poi-service/CMakeLists.txt @@ -28,7 +28,7 @@ set (git_executable ${GIT}) # Check if positioning stuff with the right version has been cloned and do it if necessary # positioning_SRC_DIR is set by cmake -Dpositioning_SRC_DIR= set(positioning_URL http://git.projects.genivi.org/lbs/positioning.git) -set(positioning_VERSION 98c626c1a3856f444e9441950f6500db6ae9b997) +set(positioning_VERSION fe164c14aa9594736656ff5c2ec0251a5f561376) if (EXISTS ${positioning_SRC_DIR}) execute_process(COMMAND ${git_get_src_version} -- cgit v1.2.1