diff options
-rw-r--r-- | src/navigation/CMakeLists.txt | 274 | ||||
-rw-r--r-- | src/navigation/navigation-core/enhancedposition-plugin/genivi_positioning_enhancedposition.cxx | 2 | ||||
-rw-r--r-- | src/navigation/plugins.pro | 24 | ||||
-rw-r--r-- | src/navigation/script/0positioning.mk | 69 | ||||
-rw-r--r-- | src/navigation/script/1navit.mk | 71 | ||||
-rwxr-xr-x | src/navigation/script/build.sh | 250 | ||||
-rw-r--r-- | src/navigation/script/map-viewer.mk | 74 | ||||
-rw-r--r-- | src/navigation/script/navigation-core.mk | 123 | ||||
-rw-r--r-- | src/navigation/script/poi-cam.mk | 47 | ||||
-rw-r--r-- | src/poi-service/poi-server/CMakeLists.txt | 4 | ||||
-rw-r--r-- | src/poi-service/script/Makefile | 70 | ||||
-rwxr-xr-x | src/poi-service/script/build.sh | 2 | ||||
-rw-r--r-- | src/poi-service/script/poi-server.mk | 68 |
13 files changed, 528 insertions, 550 deletions
diff --git a/src/navigation/CMakeLists.txt b/src/navigation/CMakeLists.txt new file mode 100644 index 0000000..b061572 --- /dev/null +++ b/src/navigation/CMakeLists.txt @@ -0,0 +1,274 @@ +########################################################################### +# @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_package(PkgConfig REQUIRED) +find_program(XSLTPROC xsltproc REQUIRED) +find_program(GIT git) +find_program(SVN svn) + +include_directories(${CMAKE_CURRENT_BINARY_DIR}) + +set (git_get_src_version git rev-parse HEAD) +set (git_executable ${GIT}) + +set (svn_executable ${SVN}) +set (svn_get_src_version svnversion) + +set(cmake_create_dir cmake -E make_directory) + +# Check if positioning stuff with the right version has been cloned and do it if necessary +set(positioning_SRC_DIR ${CMAKE_CURRENT_SOURCE_DIR}/positioning) +set(positioning_URL http://git.projects.genivi.org/lbs/positioning.git) +set(positioning_VERSION 09698f63ea27a24c533b4c015155ee9ebd7a3026) + +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") + execute_process( + 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") + execute_process( + 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() + +# Check if navit stuff with the right version has been cloned and do it if necessary +set(navit_SRC_DIR ${CMAKE_CURRENT_SOURCE_DIR}/navit) +set(navit_URL http://svn.code.sf.net/p/navit/code/trunk) +set(navit_VERSION 5532) + +if (EXISTS ${navit_SRC_DIR}) + execute_process(COMMAND ${svn_get_src_version} + WORKING_DIRECTORY "${navit_SRC_DIR}" + RESULT_VARIABLE result + OUTPUT_VARIABLE version) + if (${version} MATCHES ${navit_VERSION}) + message(STATUS "version of navit up to date") + else() + message(STATUS "get the right version") + execute_process( + COMMAND "${svn_executable}" checkout ${navit_URL} navit -r ${navit_VERSION} + WORKING_DIRECTORY "${navit_SRC_DIR}/.." + RESULT_VARIABLE error_code + ) + if(error_code) + message(FATAL_ERROR "Failed to checkout version: '${navit_VERSION}'") + endif() + endif() +else() + message(STATUS "clone navit") + execute_process( + COMMAND "${svn_executable}" checkout ${navit_URL} navit -r ${navit_VERSION} + WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}" + RESULT_VARIABLE error_code + ) + if(error_code) + message(FATAL_ERROR "Failed to clone repository: '${navit_URL}'") + endif() +endif() + +# Check if the map has been got and do it if necessary (no version checked for the moment) +set(map_SRC_DIR ${CMAKE_CURRENT_SOURCE_DIR}/map) +set(MAP_FILE switzerland.bin) +set(MAP_XML_FILE switzerland.xml) +set(map_URL http://www.navit-project.org/${MAP_FILE}) +set(NAVIT_BIN_DIR ${CMAKE_CURRENT_BINARY_DIR}/navit) +set(wget wget -O) +execute_process( + WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}" + COMMAND ${cmake_create_dir} map +) + +if (NOT EXISTS ${map_SRC_DIR}/${MAP_FILE}) + message(STATUS "get the map") + execute_process( + COMMAND ${wget} "${map_SRC_DIR}/${MAP_FILE}.tmp" "${map_URL}" + COMMAND mv "${map_SRC_DIR}/${MAP_FILE}.tmp" ${map_SRC_DIR}/${MAP_FILE} + RESULT_VARIABLE error_code + ) + if(error_code) + message(FATAL_ERROR "Failed to get map: '${MAP_FILE}', what about your proxy ?") + endif() +endif() + +if (NOT EXISTS ${NAVIT_BIN_DIR}/navit/maps/${MAP_XML_FILE}) + message(STATUS "generate xml file for the map") + file(WRITE ${NAVIT_BIN_DIR}/navit/maps/${MAP_XML_FILE} "<map type=\"binfile\" data=\"${map_SRC_DIR}/${MAP_FILE}\" />") +endif() + +# Generate the DBus files used by the plugins before building the code +set(API_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../api) +execute_process( + COMMAND ${cmake_create_dir} navit +) +execute_process( + WORKING_DIRECTORY "${NAVIT_BIN_DIR}" + COMMAND ${cmake_create_dir} navit +) +set(CONSTANTS_BIN_DIR ${CMAKE_CURRENT_BINARY_DIR}/constants) +execute_process( + COMMAND ${cmake_create_dir} constants +) + +# Do it for navigation-core +set(NAVIGATION_CORE_SRC ${CMAKE_CURRENT_SOURCE_DIR}/navigation-core) +set(positioning_API_DIR ${positioning_SRC}/enhanced-position-service/api) + +if(NOT EXISTS ${NAVIT_BIN_DIR}/navit/navit_genivi_navigationcore.xml) + execute_process( + OUTPUT_FILE ${NAVIT_BIN_DIR}/navit/navit_genivi_navigationcore.xml + COMMAND ${XSLTPROC} ${NAVIGATION_CORE_SRC}/navit_genivi_navigationcore.xsl ${navit_SRC_DIR}/navit/navit/navit_shipped.xml + ) +else() + if(${NAVIGATION_CORE_SRC}/navit_genivi_navigationcore.xsl IS_NEWER_THAN ${NAVIT_BIN_DIR}/navit/navit_genivi_navigationcore.xml) + execute_process( + OUTPUT_FILE ${NAVIT_BIN_DIR}/navit/navit_genivi_navigationcore.xml + COMMAND ${XSLTPROC} ${NAVIGATION_CORE_SRC}/navit_genivi_navigationcore.xsl ${navit_SRC_DIR}/navit/navit/navit_shipped.xml + ) + endif() +endif() + +file (GLOB XML_TO_DBUS_CONSTANT + ${API_DIR}/navigation-core/genivi-navigationcore-constants.xml +) +foreach (RAW_FILE ${XML_TO_DBUS_CONSTANT}) + get_filename_component(FILE ${RAW_FILE} NAME_WE) + if(NOT EXISTS ${CONSTANTS_BIN_DIR}/${FILE}.h) + execute_process( + OUTPUT_FILE ${CONSTANTS_BIN_DIR}/${FILE}.h + COMMAND ${XSLTPROC} ${API_DIR}/navigation-core/enum.xsl ${RAW_FILE} + ) + else() + if(${RAW_FILE} IS_NEWER_THAN ${CONSTANTS_BIN_DIR}/${FILE}.h) + execute_process( + OUTPUT_FILE ${CONSTANTS_BIN_DIR}/${FILE}.h + COMMAND ${XSLTPROC} ${API_DIR}/navigation-core/enum.xsl ${RAW_FILE} + ) + endif() + endif() +endforeach() + +file (GLOB XML_TO_DBUS_CONSTANT_FROM_POSITIONING + ${positioning_SRC_DIR}/enhanced-position-service/api/genivi-positioning-constants.xml +) +foreach (RAW_FILE ${XML_TO_DBUS_CONSTANT_FROM_POSITIONING}) + get_filename_component(FILE ${RAW_FILE} NAME_WE) + if(NOT EXISTS ${CONSTANTS_BIN_DIR}/${FILE}.h) + execute_process( + OUTPUT_FILE ${CONSTANTS_BIN_DIR}/${FILE}.h + COMMAND ${XSLTPROC} ${API_DIR}/navigation-core/enum.xsl ${RAW_FILE} + ) + else() + if(${RAW_FILE} IS_NEWER_THAN ${CONSTANTS_BIN_DIR}/${FILE}.h) + execute_process( + OUTPUT_FILE ${CONSTANTS_BIN_DIR}/${FILE}.h + COMMAND ${XSLTPROC} ${API_DIR}/navigation-core/enum.xsl ${RAW_FILE} + ) + endif() + endif() +endforeach() + +# Do it for map-viewer +set(MAP_VIEWER_SRC ${CMAKE_CURRENT_SOURCE_DIR}/map-viewer) + +if(NOT EXISTS ${NAVIT_BIN_DIR}/navit/navit_genivi_mapviewer.xml) + execute_process( + OUTPUT_FILE ${NAVIT_BIN_DIR}/navit/navit_genivi_mapviewer.xml + COMMAND ${XSLTPROC} ${MAP_VIEWER_SRC}/navit_genivi_mapviewer.xsl ${navit_SRC_DIR}/navit/navit/navit_shipped.xml + ) +else() + if(${MAP_VIEWER_SRC}/navit_genivi_mapviewer.xsl IS_NEWER_THAN ${NAVIT_BIN_DIR}/navit/navit_genivi_mapviewer.xml) + execute_process( + OUTPUT_FILE ${NAVIT_BIN_DIR}/navit/navit_genivi_mapviewer.xml + COMMAND ${XSLTPROC} ${MAP_VIEWER_SRC}/navit_genivi_mapviewer.xsl ${navit_SRC_DIR}/navit/navit/navit_shipped.xml + ) + endif() +endif() + +file (GLOB XML_TO_DBUS_CONSTANT + ${API_DIR}/map-viewer/genivi-mapviewer-constants.xml +) +foreach (RAW_FILE ${XML_TO_DBUS_CONSTANT}) + get_filename_component(FILE ${RAW_FILE} NAME_WE) + if(NOT EXISTS ${CONSTANTS_BIN_DIR}/${FILE}.h) + execute_process( + OUTPUT_FILE ${CONSTANTS_BIN_DIR}/${FILE}.h + COMMAND ${XSLTPROC} ${API_DIR}/map-viewer/enum.xsl ${RAW_FILE} + ) + else() + if(${RAW_FILE} IS_NEWER_THAN ${CONSTANTS_BIN_DIR}/${FILE}.h) + execute_process( + OUTPUT_FILE ${CONSTANTS_BIN_DIR}/${FILE}.h + COMMAND ${XSLTPROC} ${API_DIR}/map-viewer/enum.xsl ${RAW_FILE} + ) + endif() + endif() +endforeach() + +# Do it for poi-service +file (GLOB XML_TO_DBUS_CONSTANT + ${API_DIR}/poi-service/genivi-poiservice-constants.xml +) +foreach (RAW_FILE ${XML_TO_DBUS_CONSTANT}) + get_filename_component(FILE ${RAW_FILE} NAME_WE) + if(NOT EXISTS ${CONSTANTS_BIN_DIR}/${FILE}.h) + execute_process( + OUTPUT_FILE ${CONSTANTS_BIN_DIR}/${FILE}.h + COMMAND ${XSLTPROC} ${API_DIR}/poi-service/enum.xsl ${RAW_FILE} + ) + else() + if(${RAW_FILE} IS_NEWER_THAN ${CONSTANTS_BIN_DIR}/${FILE}.h) + execute_process( + OUTPUT_FILE ${CONSTANTS_BIN_DIR}/${FILE}.h + COMMAND ${XSLTPROC} ${API_DIR}/poi-service/enum.xsl ${RAW_FILE} + ) + endif() + endif() +endforeach() 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 701cb30..4429747 100644 --- a/src/navigation/navigation-core/enhancedposition-plugin/genivi_positioning_enhancedposition.cxx +++ b/src/navigation/navigation-core/enhancedposition-plugin/genivi_positioning_enhancedposition.cxx @@ -49,7 +49,7 @@ #include <dbus-c++/glib-integration.h> #include "constants/genivi-navigationcore-constants.h" -#include "constants/genivi-enhancedpositionservice-constants.h" +#include "constants/genivi-positioning-constants.h" #include <glib.h> #include <string.h> #include <stdbool.h> diff --git a/src/navigation/plugins.pro b/src/navigation/plugins.pro deleted file mode 100644 index 6cdf14b..0000000 --- a/src/navigation/plugins.pro +++ /dev/null @@ -1,24 +0,0 @@ -TEMPLATE = app -CONFIG += console -CONFIG -= app_bundle -CONFIG -= qt - -SOURCES += \ - map-viewer/configuration-plugin/genivi_mapviewer_configuration.cxx \ - map-viewer/mapviewercontrol-plugin/genivi_mapviewer_mapviewercontrol.cxx \ - map-viewer/session-plugin/genivi_mapviewer_session.cxx \ - navigation-core/configuration-plugin/genivi_navigationcore_configuration.cxx \ - navigation-core/enhancedposition-plugin/genivi_positioning_enhancedposition.cxx \ - navigation-core/guidance-plugin/genivi_navigationcore_guidance.cxx \ - navigation-core/locationinput-plugin/genivi_navigationcore_locationinput.cxx \ - navigation-core/mapmatchedposition-plugin/genivi_navigationcore_mapmatchedposition.cxx \ - navigation-core/routing-plugin/genivi_navigationcore_routing.cxx \ - navigation-core/session-plugin/genivi_navigationcore_session.cxx - -INCLUDEPATH += ./bin/mapviewer-configuration \ - ./bin/mapviewer-mapviewercontrol \ - ./bin/mapviewer-session \ - ./bin/navigationcore-configuration \ - ./bin/navigationcore-guidance \ - ./bin \ - navit/navit diff --git a/src/navigation/script/0positioning.mk b/src/navigation/script/0positioning.mk deleted file mode 100644 index b32f494..0000000 --- a/src/navigation/script/0positioning.mk +++ /dev/null @@ -1,69 +0,0 @@ -# @licence app begin@ -# SPDX-License-Identifier: MPL-2.0 -# -# \copyright Copyright (C) 2013-2014, PCA Peugeot Citroen -# -# \file 0positioning.mk -# -# \brief This file is part of the Build System. -# -# \author Martin Schaller <martin.schaller@it-schaller.de> -# \author Philippe Colliot <philippe.colliot@mpsa.com> -# -# \version 1.1 -# -# This Source Code Form is subject to the terms of the -# Mozilla Public License (MPL), 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/. -# -# For further information see http://www.genivi.org/. -# -# List of changes: -# -# 4/6/2014, Philippe Colliot, complete src-clean option -# -# 26/6/2014, Marco Residori, add support of new enhanced-position-service -# -# @licence end@ - -positioning_BIN=$(BIN_DIR)/positioning - -log-replayer_BIN=$(positioning_BIN)/log-replayer -gnss-service_BIN=$(positioning_BIN)/gnss-service -sensors-service_BIN=$(positioning_BIN)/sensors-service -enhanced-position-service_BIN=$(positioning_BIN)/enhanced-position-service - -positioning_URL=http://git.projects.genivi.org/lbs/positioning.git -positioning_VERSION=09698f63ea27a24c533b4c015155ee9ebd7a3026 -positioning_SRC=$(SRC_DIR)/positioning_$(positioning_VERSION) -positioning_API=$(positioning_SRC)/enhanced-position-service/api - -ALL+=positioning - -SRC_CLEAN+=clean-positioning_SRC - -help:: - @echo "positioning: Build positioning" - -clean-positioning_SRC:: - rm -rf $(SRC_DIR)/positioning_* - -positioning: $(positioning_BIN)/enhanced-position-service - -$(positioning_BIN)/enhanced-position-service: $(positioning_BIN)/Makefile - cd $(gnss-service_BIN) && make - cd $(sensors-service_BIN) && make - cd $(log-replayer_BIN) && make - cd $(enhanced-position-service_BIN) && make - -$(positioning_BIN)/Makefile: $(positioning_SRC)/enhanced-position-service/CMakeLists.txt - mkdir -p $(positioning_BIN) $(gnss-service_BIN) $(sensors-service_BIN) $(log-replayer_BIN) $(enhanced-position-service_BIN) - cd $(gnss-service_BIN) && cmake $(positioning_SRC)/gnss-service - cd $(sensors-service_BIN) && cmake $(positioning_SRC)/sensors-service - cd $(log-replayer_BIN) && cmake $(positioning_SRC)/log-replayer - cd $(enhanced-position-service_BIN) && cmake -DWITH_GPSD=OFF -DWITH_DLT=OFF -DWITH_REPLAYER=ON -DWITH_TESTS=OFF $(positioning_SRC)/enhanced-position-service - -$(positioning_SRC)/enhanced-position-service/CMakeLists.txt: - cd $(positioning_SRC)/.. && git clone $(positioning_URL) $(positioning_SRC) - cd $(positioning_SRC) && git checkout $(positioning_VERSION) diff --git a/src/navigation/script/1navit.mk b/src/navigation/script/1navit.mk deleted file mode 100644 index fc0bff5..0000000 --- a/src/navigation/script/1navit.mk +++ /dev/null @@ -1,71 +0,0 @@ -# @licence app begin@ -# SPDX-License-Identifier: MPL-2.0 -# -# \copyright Copyright (C) 2013-2014, PCA Peugeot Citroen -# -# \file 1navit.mk -# -# \brief This file is part of the Build System. -# -# \author Martin Schaller <martin.schaller@it-schaller.de> -# \author Philippe Colliot <philippe.colliot@mpsa.com> -# -# \version 1.0 -# -# This Source Code Form is subject to the terms of the -# Mozilla Public License (MPL), 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/. -# -# For further information see http://www.genivi.org/. -# -# List of changes: -# -# 4/6/2014, Philippe Colliot, complete src-clean option -# 12/9/2014, Philippe Colliot, get navit from the svn -# -# @licence end@ -navit_SRC=$(SRC_DIR)/navit -navit_SRC2=$(navit_SRC)/navit -navit_BIN=$(BIN_DIR)/navit -navit_URL=http://git.navit-project.org/navit.git -navit_URL_SVN=http://svn.code.sf.net/p/navit/code/trunk -#navit_VERSION=6d7a8e00a67e133981e322ad13a60c9a6a9896de -navit_VERSION=8396f6f94ef9a16db679e9de353242899966a735 -navit_VERSION_SVN=5532 #the one that fits the git version primary used -navit_DEPS=gtk2.0-dev cmake - -DEPS+=$(navit_DEPS) -ALL+=navit navit_map -SRC_CLEAN+=clean-navit_SRC - -help:: - @echo "navit: Build navit" - @echo "navit_map: Download and install navit map" - -clean-navit_SRC:: - rm -rf $(navit_SRC) - -navit: $(navit_BIN)/navit/navit - -$(navit_BIN)/navit/navit: $(navit_BIN)/Makefile - make -C $(navit_BIN) - -$(navit_BIN)/Makefile: $(navit_SRC2)/CMakeLists.txt - mkdir -p $(navit_BIN) - cd $(navit_BIN) && cmake -DDISABLE_QT=1 -DSAMPLE_MAP=0 -Dvehicle/null=1 -Dgraphics/qt_qpainter=0 $(navit_SRC2) - -$(navit_SRC2)/CMakeLists.txt: - cd $(navit_SRC)/.. && svn checkout $(navit_URL_SVN) navit -r $(navit_VERSION_SVN) -# cd $(navit_SRC)/.. && git clone $(navit_URL) -# cd $(navit_SRC) && git checkout $(navit_VERSION) - -navit_map: $(navit_BIN)/navit/maps/switzerland.xml - -$(navit_BIN)/navit/maps/switzerland.xml: $(MAP_DIR)/switzerland.bin - echo '<map type="binfile" data="$(MAP_DIR)/switzerland.bin" />' >$(navit_BIN)/navit/maps/switzerland.xml - -$(MAP_DIR)/switzerland.bin: - mkdir -p $(MAP_DIR) - wget -O $(MAP_DIR)/switzerland.bin.tmp http://www.navit-project.org/switzerland.bin - mv $(MAP_DIR)/switzerland.bin.tmp $(MAP_DIR)/switzerland.bin diff --git a/src/navigation/script/build.sh b/src/navigation/script/build.sh new file mode 100755 index 0000000..eef03c2 --- /dev/null +++ b/src/navigation/script/build.sh @@ -0,0 +1,250 @@ +#!/bin/bash + +########################################################################### +# @licence app begin@ +# SPDX-License-Identifier: MPL-2.0 +# +# Component Name: navigation +# Author: Philippe Colliot <philippe.colliot@mpsa.com> +# +# Copyright (C) 2013-2014, PCA Peugeot Citroen +# +# 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@ +########################################################################### +TOP_DIR=$PWD/.. +TOP_BIN_DIR=$PWD/../bin + +NAVIGATION_CORE=navigation-core +NAVIGATION_CORE_SRC_DIR=$TOP_DIR/$NAVIGATION_CORE +NAVIGATION_CORE_API_DIR=$TOP_DIR/../../api/$NAVIGATION_CORE + +MAP_VIEWER=map-viewer +MAP_VIEWER_SRC_DIR=$TOP_DIR/$MAP_VIEWER +MAP_VIEWER_API_DIR=$TOP_DIR/../../api/$MAP_VIEWER + +POI_SERVICE=poi-service +POI_SERVICE_API_DIR=$TOP_DIR/../../api/$POI_SERVICE + +POI_CAM=poi-cam +POI_CAM_SRC_DIR=$TOP_DIR/$POI_CAM +POI_CAM_BIN_DIR=$TOP_BIN_DIR/$POI_CAM + +NAVIGATION_CORE_CONFIGURATION=navigationcore-configuration +NAVIGATION_CORE_CONFIGURATION_SRC_DIR=$NAVIGATION_CORE_SRC_DIR/configuration-plugin +NAVIGATION_CORE_CONFIGURATION_BIN_DIR=$TOP_BIN_DIR/$NAVIGATION_CORE_CONFIGURATION + +NAVIGATION_CORE_GUIDANCE=navigationcore-guidance +NAVIGATION_CORE_GUIDANCE_SRC_DIR=$NAVIGATION_CORE_SRC_DIR/guidance-plugin +NAVIGATION_CORE_GUIDANCE_BIN_DIR=$TOP_BIN_DIR/$NAVIGATION_CORE_GUIDANCE + +NAVIGATION_CORE_LOCATIONINPUT=navigationcore-locationinput +NAVIGATION_CORE_LOCATIONINPUT_SRC_DIR=$NAVIGATION_CORE_SRC_DIR/locationinput-plugin +NAVIGATION_CORE_LOCATIONINPUT_BIN_DIR=$TOP_BIN_DIR/$NAVIGATION_CORE_LOCATIONINPUT + +NAVIGATION_CORE_MAPMATCHEDPOSITION=navigationcore-mapmatchedposition +NAVIGATION_CORE_MAPMATCHEDPOSITION_SRC_DIR=$NAVIGATION_CORE_SRC_DIR/mapmatchedposition-plugin +NAVIGATION_CORE_MAPMATCHEDPOSITION_BIN_DIR=$TOP_BIN_DIR/$NAVIGATION_CORE_MAPMATCHEDPOSITION + +NAVIGATION_CORE_ROUTING=navigationcore-routing +NAVIGATION_CORE_ROUTING_SRC_DIR=$NAVIGATION_CORE_SRC_DIR/routing-plugin +NAVIGATION_CORE_ROUTING_BIN_DIR=$TOP_BIN_DIR/$NAVIGATION_CORE_ROUTING + +NAVIGATION_CORE_SESSION=navigationcore-session +NAVIGATION_CORE_SESSION_SRC_DIR=$NAVIGATION_CORE_SRC_DIR/session-plugin +NAVIGATION_CORE_SESSION_BIN_DIR=$TOP_BIN_DIR/$NAVIGATION_CORE_SESSION + +NAVIGATION_CORE_ENHANCEDPOSITION=navigationcore-enhancedposition +NAVIGATION_CORE_ENHANCEDPOSITION_SRC_DIR=$NAVIGATION_CORE_SRC_DIR/enhancedposition-plugin +NAVIGATION_CORE_ENHANCEDPOSITION_BIN_DIR=$TOP_BIN_DIR/$NAVIGATION_CORE_ENHANCEDPOSITION + +MAP_VIEWER_CONFIGURATION=mapviewer-configuration +MAP_VIEWER_CONFIGURATION_SRC_DIR=$MAP_VIEWER_SRC_DIR/configuration-plugin +MAP_VIEWER_CONFIGURATION_BIN_DIR=$TOP_BIN_DIR/$MAP_VIEWER_CONFIGURATION + +MAP_VIEWER_MAPVIEWERCONTROL=mapviewer-mapviewercontrol +MAP_VIEWER_MAPVIEWERCONTROL_SRC_DIR=$MAP_VIEWER_SRC_DIR/mapviewercontrol-plugin +MAP_VIEWER_MAPVIEWERCONTROL_BIN_DIR=$TOP_BIN_DIR/$MAP_VIEWER_MAPVIEWERCONTROL + +MAP_VIEWER_SESSION=mapviewer-session +MAP_VIEWER_SESSION_SRC_DIR=$MAP_VIEWER_SRC_DIR/session-plugin +MAP_VIEWER_SESSION_BIN_DIR=$TOP_BIN_DIR/$MAP_VIEWER_SESSION + +POSITIONING=positioning +POSITIONING_SRC_DIR=$TOP_DIR/$POSITIONING +POSITIONING_BIN_DIR=$TOP_BIN_DIR/$POSITIONING +LOG_REPLAYER=log-replayer +LOG_REPLAYER_SRC_DIR=$POSITIONING_SRC_DIR/$LOG_REPLAYER +LOG_REPLAYER_BIN_DIR=$POSITIONING_BIN_DIR/$LOG_REPLAYER +GNSS_SERVICE=gnss-service +GNSS_SERVICE_SRC_DIR=$POSITIONING_SRC_DIR/$GNSS_SERVICE +GNSS_SERVICE_BIN_DIR=$POSITIONING_BIN_DIR/$GNSS_SERVICE +SENSORS_SERVICE=sensors-service +SENSORS_SERVICE_SRC_DIR=$POSITIONING_SRC_DIR/$SENSORS_SERVICE +SENSORS_SERVICE_BIN_DIR=$POSITIONING_BIN_DIR/$SENSORS_SERVICE +ENHANCED_POSITION_SERVICE=enhanced-position-service +ENHANCED_POSITION_SERVICE_SRC_DIR=$POSITIONING_SRC_DIR/$ENHANCED_POSITION_SERVICE +ENHANCED_POSITION_SERVICE_BIN_DIR=$POSITIONING_BIN_DIR/$ENHANCED_POSITION_SERVICE +POSITIONING_API_DIR=$TOP_DIR/$POSITIONING/$ENHANCED_POSITION_SERVICE/api + +NAVIT=navit +NAVIT_SRC_DIR=$TOP_DIR/$NAVIT +NAVIT_BIN_DIR=$TOP_BIN_DIR/$NAVIT + +#-------------------------------------------------------------------------- +# Compiler Flags +#-------------------------------------------------------------------------- +# modify the following flags as needed: +NAVIT_FLAGS='-DDISABLE_QT=1 -DSAMPLE_MAP=0 -Dvehicle/null=1 -Dgraphics/qt_qpainter=0' +# + +usage() { + echo "Usage: ./build.sh Build navigation" + echo " or: ./build.sh [command]" + echo + echo "command:" + echo " make Build" + echo " clean Clean" + echo " src-clean Clean the cloned sources" + echo " help Print Help" + echo + echo +} + +build() { + echo '' + echo 'Building navigation' + + cd $TOP_DIR + mkdir -p bin + cd $TOP_BIN_DIR + cmake $TOP_DIR + + # make navit first, because plugins need navit built stuff + echo '' + echo 'Building navit' + cd $TOP_BIN_DIR + mkdir -p $NAVIT + cd $NAVIT_BIN_DIR + cmake $NAVIT_FLAGS $NAVIT_SRC_DIR/navit && make + + echo '' + echo 'Building positioning' + cd $TOP_BIN_DIR + mkdir -p $POSITIONING + + cd $POSITIONING_BIN_DIR + mkdir -p $GNSS_SERVICE + cd $GNSS_SERVICE_BIN_DIR + cmake $GNSS_SERVICE_SRC_DIR && make + + cd $POSITIONING_BIN_DIR + mkdir -p $SENSORS_SERVICE + cd $SENSORS_SERVICE_BIN_DIR + cmake $SENSORS_SERVICE_SRC_DIR && make + + cd $POSITIONING_BIN_DIR + mkdir -p $LOG_REPLAYER + cd $LOG_REPLAYER_BIN_DIR + cmake $LOG_REPLAYER_SRC_DIR && make + + cd $POSITIONING_BIN_DIR + mkdir -p $ENHANCED_POSITION_SERVICE + cd $ENHANCED_POSITION_SERVICE_BIN_DIR + cmake -DWITH_GPSD=OFF -DWITH_DLT=OFF -DWITH_REPLAYER=ON -DWITH_TESTS=OFF $ENHANCED_POSITION_SERVICE_SRC_DIR && make + + echo '' + echo 'Building plugins' + cd $TOP_BIN_DIR + mkdir -p $NAVIGATION_CORE_CONFIGURATION + cd $NAVIGATION_CORE_CONFIGURATION_BIN_DIR + cmake -C $NAVIT_BIN_DIR/cmake_plugin_settings.txt -Dnavigationcore_API=$NAVIGATION_CORE_API_DIR $NAVIGATION_CORE_CONFIGURATION_SRC_DIR && make + + cd $TOP_BIN_DIR + mkdir -p $NAVIGATION_CORE_GUIDANCE + cd $NAVIGATION_CORE_GUIDANCE_BIN_DIR + cmake -C $NAVIT_BIN_DIR/cmake_plugin_settings.txt -Dnavigationcore_API=$NAVIGATION_CORE_API_DIR $NAVIGATION_CORE_GUIDANCE_SRC_DIR && make + + cd $TOP_BIN_DIR + mkdir -p $NAVIGATION_CORE_LOCATIONINPUT + cd $NAVIGATION_CORE_LOCATIONINPUT_BIN_DIR + cmake -C $NAVIT_BIN_DIR/cmake_plugin_settings.txt -Dnavigationcore_API=$NAVIGATION_CORE_API_DIR $NAVIGATION_CORE_LOCATIONINPUT_SRC_DIR && make + + cd $TOP_BIN_DIR + mkdir -p $NAVIGATION_CORE_MAPMATCHEDPOSITION + cd $NAVIGATION_CORE_MAPMATCHEDPOSITION_BIN_DIR + cmake -C $NAVIT_BIN_DIR/cmake_plugin_settings.txt -Dnavigationcore_API=$NAVIGATION_CORE_API_DIR $NAVIGATION_CORE_MAPMATCHEDPOSITION_SRC_DIR && make + + cd $TOP_BIN_DIR + mkdir -p $NAVIGATION_CORE_ROUTING + cd $NAVIGATION_CORE_ROUTING_BIN_DIR + cmake -C $NAVIT_BIN_DIR/cmake_plugin_settings.txt -Dnavigationcore_API=$NAVIGATION_CORE_API_DIR $NAVIGATION_CORE_ROUTING_SRC_DIR && make + + cd $TOP_BIN_DIR + mkdir -p $NAVIGATION_CORE_SESSION + cd $NAVIGATION_CORE_SESSION_BIN_DIR + cmake -C $NAVIT_BIN_DIR/cmake_plugin_settings.txt -Dnavigationcore_API=$NAVIGATION_CORE_API_DIR $NAVIGATION_CORE_SESSION_SRC_DIR && make + + cd $TOP_BIN_DIR + mkdir -p $NAVIGATION_CORE_ENHANCEDPOSITION + cd $NAVIGATION_CORE_ENHANCEDPOSITION_BIN_DIR + cmake -C $NAVIT_BIN_DIR/cmake_plugin_settings.txt -Dpositioning_API=$POSITIONING_API_DIR $NAVIGATION_CORE_ENHANCEDPOSITION_SRC_DIR && make + + cd $TOP_BIN_DIR + mkdir -p $MAP_VIEWER_CONFIGURATION + cd $MAP_VIEWER_CONFIGURATION_BIN_DIR + cmake -C $NAVIT_BIN_DIR/cmake_plugin_settings.txt -Dmapviewer_API=$MAP_VIEWER_API_DIR $MAP_VIEWER_CONFIGURATION_SRC_DIR && make + + cd $TOP_BIN_DIR + mkdir -p $MAP_VIEWER_MAPVIEWERCONTROL + cd $MAP_VIEWER_MAPVIEWERCONTROL_BIN_DIR + cmake -C $NAVIT_BIN_DIR/cmake_plugin_settings.txt -Dlayer_management_INST=$(layer_management_INST) -Dmapviewer_API=$MAP_VIEWER_API_DIR -Dnavigationcore_API=$NAVIGATION_CORE_API_DIR $MAP_VIEWER_MAPVIEWERCONTROL_SRC_DIR && make + + cd $TOP_BIN_DIR + mkdir -p $MAP_VIEWER_SESSION + cd $MAP_VIEWER_SESSION_BIN_DIR + cmake -C $NAVIT_BIN_DIR/cmake_plugin_settings.txt -Dmapviewer_API=$MAP_VIEWER_API_DIR $MAP_VIEWER_SESSION_SRC_DIR && make + + cd $TOP_BIN_DIR + mkdir -p $POI_CAM + cd $POI_CAM_BIN_DIR + cmake -C $NAVIT_BIN_DIR/cmake_plugin_settings.txt -Dpoi-service_API=$POI_SERVICE_API_DIR $POI_CAM_SRC_DIR && make + +} + +clean() { + echo 'delete' $TOP_BIN_DIR + rm -rf $TOP_BIN_DIR +} + +src-clean() { + echo 'delete' $POSITIONING_SRC_DIR + rm -rf $POSITIONING_SRC_DIR + echo 'delete' $NAVIT_SRC_DIR + rm -rf $NAVIT_SRC_DIR + clean +} + +set -e + +if [ $# -ge 1 ]; then + if [ $1 = help ]; then + usage + elif [ $1 = make ]; then + build + elif [ $1 = clean ]; then + clean + elif [ $1 = src-clean ]; then + src-clean + else + usage + fi +elif [ $# -eq 0 ]; then + build +else + usage +fi diff --git a/src/navigation/script/map-viewer.mk b/src/navigation/script/map-viewer.mk deleted file mode 100644 index 3e7e4a5..0000000 --- a/src/navigation/script/map-viewer.mk +++ /dev/null @@ -1,74 +0,0 @@ -# @licence app begin@ -# SPDX-License-Identifier: MPL-2.0 -# -# \copyright Copyright (C) 2013-2014, PCA Peugeot Citroen -# -# \file map-viewer.mk -# -# \brief This file is part of the Build System. -# -# \author Martin Schaller <martin.schaller@it-schaller.de> -# -# \version 1.0 -# -# This Source Code Form is subject to the terms of the -# Mozilla Public License (MPL), 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/. -# -# For further information see http://www.genivi.org/. -# -# List of changes: -# -# <date>, <name>, <description of change> -# -# @licence end@ -mapviewer_SRC=$(SRC_DIR)/map-viewer -mapviewer_API=$(API_DIR)/map-viewer -mapviewer-configuration_SRC=$(mapviewer_SRC)/configuration-plugin -mapviewer-configuration_BIN=$(BIN_DIR)/mapviewer-configuration -mapviewer-mapviewercontrol_SRC=$(mapviewer_SRC)/mapviewercontrol-plugin -mapviewer-mapviewercontrol_BIN=$(BIN_DIR)/mapviewer-mapviewercontrol -mapviewer-session_SRC=$(mapviewer_SRC)/session-plugin -mapviewer-session_BIN=$(BIN_DIR)/mapviewer-session - -ALL+=mapviewer - -help:: - @echo "mapviewer: Build all mapviewer modules" - @echo "mapviewer-configuration: Build mapviewer configuration module" - @echo "mapviewer-mapviewercontrol: Build mapviewer mapviewercontrol module" - @echo "mapviewer-session: Build mapviewer session module" - - -mapviewer: mapviewer-configuration mapviewer-mapviewercontrol mapviewer-session $(navit_BIN)/navit/navit_genivi_mapviewer.xml - - -$(navit_BIN)/navit/navit_genivi_mapviewer.xml: $(mapviewer_SRC)/navit_genivi_mapviewer.xsl $(navit_SRC2)/navit/navit_shipped.xml - xsltproc $(mapviewer_SRC)/navit_genivi_mapviewer.xsl $(navit_SRC2)/navit/navit_shipped.xml > $(navit_BIN)/navit/navit_genivi_mapviewer.xml - -mapviewer-configuration: $(mapviewer-configuration_BIN)/.libs/libgenivi_mapviewer_configuration.so - -$(mapviewer-configuration_BIN)/.libs/libgenivi_mapviewer_configuration.so: $(mapviewer-configuration_BIN)/Makefile $(CONSTANTS_BIN)/genivi-mapviewer-constants.h - make -C $(mapviewer-configuration_BIN) -$(mapviewer-configuration_BIN)/Makefile: $(mapviewer-configuration_SRC)/CMakeLists.txt - mkdir -p $(mapviewer-configuration_BIN) - cd $(mapviewer-configuration_BIN) && cmake -C $(navit_BIN)/cmake_plugin_settings.txt -Dmapviewer_API=$(mapviewer_API) $(mapviewer-configuration_SRC) - -mapviewer-mapviewercontrol: $(mapviewer-mapviewercontrol_BIN)/.libs/libgenivi_mapviewer_mapviewercontrol.so -$(mapviewer-mapviewercontrol_BIN)/.libs/libgenivi_mapviewer_mapviewercontrol.so: $(mapviewer-mapviewercontrol_BIN)/Makefile $(CONSTANTS_BIN)/genivi-mapviewer-constants.h $(CONSTANTS_BIN)/genivi-navigationcore-constants.h - make -C $(mapviewer-mapviewercontrol_BIN) -$(mapviewer-mapviewercontrol_BIN)/Makefile: $(mapviewer-mapviewercontrol_SRC)/CMakeLists.txt - mkdir -p $(mapviewer-mapviewercontrol_BIN) - cd $(mapviewer-mapviewercontrol_BIN) && cmake -C $(navit_BIN)/cmake_plugin_settings.txt -Dlayer_management_INST=$(layer_management_INST) -Dmapviewer_API=$(mapviewer_API) -Dnavigationcore_API=$(navigationcore_API) $(mapviewer-mapviewercontrol_SRC) - -mapviewer-session: $(mapviewer-session_BIN)/.libs/libgenivi_mapviewer_session.so -$(mapviewer-session_BIN)/.libs/libgenivi_mapviewer_session.so: $(mapviewer-session_BIN)/Makefile $(CONSTANTS_BIN)/genivi-mapviewer-constants.h - make -C $(mapviewer-session_BIN) -$(mapviewer-session_BIN)/Makefile: $(mapviewer-session_SRC)/CMakeLists.txt - mkdir -p $(mapviewer-session_BIN) - cd $(mapviewer-session_BIN) && cmake -C $(navit_BIN)/cmake_plugin_settings.txt -Dmapviewer_API=$(mapviewer_API) $(mapviewer-session_SRC) - -$(CONSTANTS_BIN)/genivi-mapviewer-constants.h: $(mapviewer_API)/genivi-mapviewer-constants.xml $(mapviewer_API)/enum.xsl - mkdir -p $(CONSTANTS_BIN) - xsltproc $(mapviewer_API)/enum.xsl $(mapviewer_API)/genivi-mapviewer-constants.xml >$(CONSTANTS_BIN)/genivi-mapviewer-constants.h diff --git a/src/navigation/script/navigation-core.mk b/src/navigation/script/navigation-core.mk deleted file mode 100644 index 26b7a54..0000000 --- a/src/navigation/script/navigation-core.mk +++ /dev/null @@ -1,123 +0,0 @@ -# @licence app begin@ -# SPDX-License-Identifier: MPL-2.0 -# -# \copyright Copyright (C) 2013-2014, PCA Peugeot Citroen -# -# \file navigation-core.mk -# -# \brief This file is part of the Build System. -# -# \author Martin Schaller <martin.schaller@it-schaller.de> -# -# \version 1.0 -# -# This Source Code Form is subject to the terms of the -# Mozilla Public License (MPL), 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/. -# -# For further information see http://www.genivi.org/. -# -# List of changes: -# -# <date>, <name>, <description of change> -# -# @licence end@ -navigationcore_SRC=$(SRC_DIR)/navigation-core -navigationcore_API=$(API_DIR)/navigation-core -navigationcore-configuration_SRC=$(navigationcore_SRC)/configuration-plugin -navigationcore-configuration_BIN=$(BIN_DIR)/navigationcore-configuration -navigationcore-guidance_SRC=$(navigationcore_SRC)/guidance-plugin -navigationcore-guidance_BIN=$(BIN_DIR)/navigationcore-guidance -navigationcore-locationinput_SRC=$(navigationcore_SRC)/locationinput-plugin -navigationcore-locationinput_BIN=$(BIN_DIR)/navigationcore-locationinput -navigationcore-mapmatchedposition_SRC=$(navigationcore_SRC)/mapmatchedposition-plugin -navigationcore-mapmatchedposition_BIN=$(BIN_DIR)/navigationcore-mapmatchedposition -navigationcore-routing_SRC=$(navigationcore_SRC)/routing-plugin -navigationcore-routing_BIN=$(BIN_DIR)/navigationcore-routing -navigationcore-session_SRC=$(navigationcore_SRC)/session-plugin -navigationcore-session_BIN=$(BIN_DIR)/navigationcore-session -navigationcore-enhancedposition_SRC=$(navigationcore_SRC)/enhancedposition-plugin -navigationcore-enhancedposition_BIN=$(BIN_DIR)/navigationcore-enhancedposition - -NAVIGATIONCORE_DEPS=cmake xsltproc libdbus-c++-dev libdbus-1-dev libdbus-c++-bin - -DEPS+=$(NAVIGATIONCORE_DEPS) -ALL+=navigationcore - -help:: - @echo "navigationcore: Build all navigationcore modules" - @echo "navigationcore-configuration: Build navigationcore configuration module" - @echo "navigationcore-guidance: Build navigationcore guidance module" - @echo "navigationcore-locationinput: Build navigationcore locationinput module" - @echo "navigationcore-mapmatchedposition: Build navigationcore mapmatchedposition module" - @echo "navigationcore-routing: Build navigationcore routing module" - @echo "navigationcore-session: Build navigationcore session module" - @echo "navigationcore-enhancedposition: Build navigationcore enhancedposition module" - -navigationcore: navigationcore-configuration navigationcore-guidance navigationcore-locationinput navigationcore-mapmatchedposition navigationcore-routing navigationcore-session navigationcore-enhancedposition $(navit_BIN)/navit/navit_genivi_navigationcore.xml - -$(navit_BIN)/navit/navit_genivi_navigationcore.xml: $(navigationcore_SRC)/navit_genivi_navigationcore.xsl $(navit_SRC2)/navit/navit_shipped.xml - xsltproc $(navigationcore_SRC)/navit_genivi_navigationcore.xsl $(navit_SRC2)/navit/navit_shipped.xml > $(navit_BIN)/navit/navit_genivi_navigationcore.xml - -$(CONSTANTS_BIN)/genivi-navigationcore-constants.h: $(navigationcore_API)/genivi-navigationcore-constants.xml $(navigationcore_API)/enum.xsl - mkdir -p $(CONSTANTS_BIN) - xsltproc $(navigationcore_API)/enum.xsl $(navigationcore_API)/genivi-navigationcore-constants.xml >$(CONSTANTS_BIN)/genivi-navigationcore-constants.h - -$(CONSTANTS_BIN)/genivi-enhancedpositionservice-constants.h: positioning $(positioning_API)/genivi-positioning-constants.xml $(navigationcore_API)/enum.xsl - mkdir -p $(CONSTANTS_BIN) - xsltproc $(navigationcore_API)/enum.xsl $(positioning_API)/genivi-positioning-constants.xml >$(CONSTANTS_BIN)/genivi-enhancedpositionservice-constants.h - -navigationcore-configuration: $(navigationcore-configuration_BIN)/.libs/libgenivi-navigationcore-configuration.so - -navigationcore-configuration: $(navigationcore-configuration_BIN)/.libs/libgenivi-navigationcore-configuration.so -$(navigationcore-configuration_BIN)/.libs/libgenivi-navigationcore-configuration.so: $(navigationcore-configuration_BIN)/Makefile - make -C $(navigationcore-configuration_BIN) -$(navigationcore-configuration_BIN)/Makefile: $(navigationcore-configuration_SRC)/CMakeLists.txt $(CONSTANTS_BIN)/genivi-navigationcore-constants.h - mkdir -p $(navigationcore-configuration_BIN) - cd $(navigationcore-configuration_BIN) && cmake -C $(navit_BIN)/cmake_plugin_settings.txt -Dnavigationcore_API=$(navigationcore_API) $(navigationcore-configuration_SRC) - -navigationcore-guidance: $(navigationcore-guidance_BIN)/.libs/libgenivi-navigationcore-guidance.so -$(navigationcore-guidance_BIN)/.libs/libgenivi-navigationcore-guidance.so: $(navigationcore-guidance_BIN)/Makefile - make -C $(navigationcore-guidance_BIN) -$(navigationcore-guidance_BIN)/Makefile: $(navigationcore-guidance_SRC)/CMakeLists.txt $(CONSTANTS_BIN)/genivi-navigationcore-constants.h - mkdir -p $(navigationcore-guidance_BIN) - cd $(navigationcore-guidance_BIN) && cmake -C $(navit_BIN)/cmake_plugin_settings.txt -Dnavigationcore_API=$(navigationcore_API) $(navigationcore-guidance_SRC) - -navigationcore-locationinput: $(navigationcore-locationinput_BIN)/.libs/libgenivi-navigationcore-locationinput.so -$(navigationcore-locationinput_BIN)/.libs/libgenivi-navigationcore-locationinput.so: $(navigationcore-locationinput_BIN)/Makefile - make -C $(navigationcore-locationinput_BIN) -$(navigationcore-locationinput_BIN)/Makefile: $(navigationcore-locationinput_SRC)/CMakeLists.txt $(CONSTANTS_BIN)/genivi-navigationcore-constants.h - mkdir -p $(navigationcore-locationinput_BIN) - cd $(navigationcore-locationinput_BIN) && cmake -C $(navit_BIN)/cmake_plugin_settings.txt -Dnavigationcore_API=$(navigationcore_API) $(navigationcore-locationinput_SRC) - -navigationcore-mapmatchedposition: $(navigationcore-mapmatchedposition_BIN)/.libs/libgenivi-navigationcore-mapmatchedposition.so -$(navigationcore-mapmatchedposition_BIN)/.libs/libgenivi-navigationcore-mapmatchedposition.so: $(navigationcore-mapmatchedposition_BIN)/Makefile - make -C $(navigationcore-mapmatchedposition_BIN) -$(navigationcore-mapmatchedposition_BIN)/Makefile: $(navigationcore-mapmatchedposition_SRC)/CMakeLists.txt $(CONSTANTS_BIN)/genivi-navigationcore-constants.h - mkdir -p $(navigationcore-mapmatchedposition_BIN) - cd $(navigationcore-mapmatchedposition_BIN) && cmake -C $(navit_BIN)/cmake_plugin_settings.txt -Dnavigationcore_API=$(navigationcore_API) $(navigationcore-mapmatchedposition_SRC) - -navigationcore-routing: $(navigationcore-routing_BIN)/.libs/libgenivi-navigationcore-routing.so -$(navigationcore-routing_BIN)/.libs/libgenivi-navigationcore-routing.so: $(navigationcore-routing_BIN)/Makefile - make -C $(navigationcore-routing_BIN) -$(navigationcore-routing_BIN)/Makefile: $(navigationcore-routing_SRC)/CMakeLists.txt $(CONSTANTS_BIN)/genivi-navigationcore-constants.h - mkdir -p $(navigationcore-routing_BIN) - cd $(navigationcore-routing_BIN) && cmake -C $(navit_BIN)/cmake_plugin_settings.txt -Dnavigationcore_API=$(navigationcore_API) $(navigationcore-routing_SRC) - -navigationcore-session: $(navigationcore-session_BIN)/.libs/libgenivi-navigationcore-session.so -$(navigationcore-session_BIN)/.libs/libgenivi-navigationcore-session.so: $(navigationcore-session_BIN)/Makefile - make -C $(navigationcore-session_BIN) -$(navigationcore-session_BIN)/Makefile: $(navigationcore-session_SRC)/CMakeLists.txt $(CONSTANTS_BIN)/genivi-navigationcore-constants.h - mkdir -p $(navigationcore-session_BIN) - cd $(navigationcore-session_BIN) && cmake -C $(navit_BIN)/cmake_plugin_settings.txt -Dnavigationcore_API=$(navigationcore_API) $(navigationcore-session_SRC) - -# NOTE: extended by thomas.bader@bmw.de -navigationcore-enhancedposition: $(navigationcore-enhancedposition_BIN)/.libs/libgenivi_positioning_enhancedposition.so - -$(navigationcore-enhancedposition_BIN)/.libs/libgenivi_positioning_enhancedposition.so: $(navigationcore-enhancedposition_BIN)/Makefile - make -C $(navigationcore-enhancedposition_BIN) - -$(navigationcore-enhancedposition_BIN)/Makefile: $(navigationcore-enhancedposition_SRC)/CMakeLists.txt $(CONSTANTS_BIN)/genivi-navigationcore-constants.h $(CONSTANTS_BIN)/genivi-enhancedpositionservice-constants.h - mkdir -p $(navigationcore-enhancedposition_BIN) - cd $(navigationcore-enhancedposition_BIN) && cmake -C $(navit_BIN)/cmake_plugin_settings.txt -Dpositioning_API=$(positioning_API) $(navigationcore-enhancedposition_SRC) diff --git a/src/navigation/script/poi-cam.mk b/src/navigation/script/poi-cam.mk deleted file mode 100644 index d26e407..0000000 --- a/src/navigation/script/poi-cam.mk +++ /dev/null @@ -1,47 +0,0 @@ -# @licence app begin@ -# SPDX-License-Identifier: MPL-2.0 -# -# \copyright Copyright (C) 2013-2014, PCA Peugeot Citroen -# -# \file poi-cam.mk -# -# \brief This file is part of the Build System. -# -# \author Martin Schaller <martin.schaller@it-schaller.de> -# -# \version 1.0 -# -# This Source Code Form is subject to the terms of the -# Mozilla Public License (MPL), 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/. -# -# For further information see http://www.genivi.org/. -# -# List of changes: -# -# <date>, <name>, <description of change> -# -# @licence end@ -poiservice_SRC=$(SRC_DIR)/poi-cam -poiservice_BIN=$(BIN_DIR)/poi-cam -poi-service_API= - -ifneq ($(poi-service_API),) -ALL+=poiservice - -help:: - @echo "poiservice: Build poiservice module" - -poiservice: $(poiservice_BIN)/.libs/libgenivi_poiservice_configuration.so - -$(poiservice_BIN)/.libs/libgenivi_poiservice_configuration.so: $(poiservice_BIN)/Makefile $(CONSTANTS_BIN)/genivi-poiservice-constants.h - make -C $(poiservice_BIN) -$(poiservice_BIN)/Makefile: $(poiservice_SRC)/CMakeLists.txt - mkdir -p $(poiservice_BIN) - cd $(poiservice_BIN) && cmake -C $(navit_BIN)/cmake_plugin_settings.txt -Dpoi-service_API=$(poi-service_API) $(poiservice_SRC) - -$(CONSTANTS_BIN)/genivi-poiservice-constants.h: $(poi-service_API)/genivi-poiservice-constants.xml $(poi-service_API)/enum.xsl - mkdir -p $(CONSTANTS_BIN) - xsltproc $(poi-service_API)/enum.xsl $(poi-service_API)/genivi-poiservice-constants.xml >$(CONSTANTS_BIN)/genivi-poiservice-constants.h -endif diff --git a/src/poi-service/poi-server/CMakeLists.txt b/src/poi-service/poi-server/CMakeLists.txt index e48d782..e536bd5 100644 --- a/src/poi-service/poi-server/CMakeLists.txt +++ b/src/poi-service/poi-server/CMakeLists.txt @@ -162,13 +162,13 @@ foreach (RAW_FILE ${XML_TO_DBUS_CONSTANT_FROM_POSITIONING}) if(NOT EXISTS ${TARGET_GENERATED_API_DIR}/${FILE}.h) execute_process( OUTPUT_FILE ${TARGET_GENERATED_API_DIR}/${FILE}.h - COMMAND ${XSLTPROC} ${positioning_SRC_DIR}/enhanced-position-service/api/enum.xsl ${RAW_FILE} + COMMAND ${XSLTPROC} ${API_DIR}/poi-service/enum.xsl ${RAW_FILE} ) else() if(${RAW_FILE} IS_NEWER_THAN ${TARGET_GENERATED_API_DIR}/${FILE}.h) execute_process( OUTPUT_FILE ${TARGET_GENERATED_API_DIR}/${FILE}.h - COMMAND ${XSLTPROC} ${positioning_SRC_DIR}/enhanced-position-service/api/enum.xsl ${RAW_FILE} + COMMAND ${XSLTPROC} ${API_DIR}/poi-service/enum.xsl ${RAW_FILE} ) endif() endif() diff --git a/src/poi-service/script/Makefile b/src/poi-service/script/Makefile deleted file mode 100644 index 8e91761..0000000 --- a/src/poi-service/script/Makefile +++ /dev/null @@ -1,70 +0,0 @@ -# @licence app begin@ -# SPDX-License-Identifier: MPL-2.0 -# -# \copyright Copyright (C) 2013-2014, PCA Peugeot Citroen -# -# \file Makefile -# -# \brief This file is part of the Build System. -# -# \author Philippe Colliot <philippe.colliot@mpsa.com> -# -# \version 1.1 -# -# This Source Code Form is subject to the terms of the -# Mozilla Public License (MPL), 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/. -# -# For further information see http://www.genivi.org/. -# -# List of changes: -# -# 4/6/2014, Philippe Colliot, complete src-clean option -# 18/6/2014, Philippe Colliot, APT_GET option for Fedora -# -# @licence end@ - -ROOT_DIR=$(CURDIR)/.. -API_DIR=$(CURDIR)/../../../api -BIN_DIR=$(ROOT_DIR)/bin -COMMON_DIR=$(ROOT_DIR)/poi-common -EXE_DIR=$(BIN_DIR) -QMAKE=qmake -CXX=g++ -CXXFLAGS=-pipe -O2 -Wall -CHK_DIR_EXISTS=test -d -MKDIR=mkdir -p - -ifndef $(APT_GET) - APT_GET=apt-get -endif - -default: help - -help:: - @echo "The following targets exist" - @echo "all: Build $(ALL)" - @echo "clean: Clean up build dir" - @echo "src-clean: Clean up all checked out sources" - @echo "all2: Get $(DEPS) and build $(ALL)" - @echo "make APT_GET=yum for Fedora, by default APT_GET is set to apt-get" - -#Clone the positioning repository for getting the API, generate the proxies and adaptors for the DBus APIs firstly -include get-positioning.mk -include generate-api.mk - -include poi-server.mk - -all: $(ALL) - -src-clean: $(SRC_CLEAN) - -deps:: - sudo $(APT_GET) install $(DEPS) - -all2: deps all - -clean: $(CLEAN) - - diff --git a/src/poi-service/script/build.sh b/src/poi-service/script/build.sh index 0918fe7..8cce950 100755 --- a/src/poi-service/script/build.sh +++ b/src/poi-service/script/build.sh @@ -42,7 +42,7 @@ usage() { build() { echo '' - echo 'Building poi-server ->' $POI_SERVER_SRC_DIR + echo 'Building poi-server' mkdir -p $POI_SERVER_BIN_DIR cd $POI_SERVER_BIN_DIR cmake $POI_SERVER_SRC_DIR && make diff --git a/src/poi-service/script/poi-server.mk b/src/poi-service/script/poi-server.mk deleted file mode 100644 index 02db469..0000000 --- a/src/poi-service/script/poi-server.mk +++ /dev/null @@ -1,68 +0,0 @@ -# @licence app begin@ -# SPDX-License-Identifier: MPL-2.0 -# -# \copyright Copyright (C) 2013-2014, PCA Peugeot Citroen -# -# \file poi-server.mk -# -# \brief This file is part of the Build System. -# -# \author Philippe Colliot <philippe.colliot@mpsa.com> -# -# \version 1.0 -# -# This Source Code Form is subject to the terms of the -# Mozilla Public License (MPL), 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/. -# -# For further information see http://www.genivi.org/. -# -# List of changes: -# -# <date>, <name>, <description of change> -# -# @licence end@ -POI_SERVER_SRC_DIR=$(ROOT_DIR)/poi-server -POI_SERVER_BIN_DIR=$(BIN_DIR)/poi-server-bin -POI_SERVER_DEPS=libsqlite3-dev sqlite3 libdbus-c++-dev -POI_SERVER_INCPATH=-I$(COMMON_DIR) -I$(POI_SERVER_SRC_DIR) -I/usr/include/glibmm-2.4 -I/usr/lib/i386-linux-gnu/glibmm-2.4/include -I/usr/include/glib-2.0 -I/usr/lib/i386-linux-gnu/glib-2.0/include -I/usr/include/dbus-c++-1 -I/usr/include/dbus-1.0 -I/usr/lib/i386-linux-gnu/dbus-1.0/include -POI_SERVER_LIBS=-lglibmm-2.4 -lglib-2.0 -lgobject-2.0 -lsqlite3 -ldbus-c++-glib-1 -ldbus-c++-1 -ldbus-1 -POI_SERVER_LINK=g++ -POI_SERVER_LFLAGS=-Wl,-O1 - -DEPS+=$(POI_SERVER_DEPS) -ALL+=poi-server -CLEAN+=clean-poi-server - -help:: - @echo "poi-server: Build the poi server" - -clean-poi-server:: - rm -rf $(POI_SERVER_BIN_DIR) - rm -rf $(BIN_DIR)/poi-server - -poi-server: $(POI_SERVER_BIN_DIR)/main.o $(POI_SERVER_BIN_DIR)/database.o - $(POI_SERVER_LINK) $(POI_SERVER_LFLAGS) $(POI_SERVER_BIN_DIR)/main.o $(POI_SERVER_BIN_DIR)/database.o $(POI_SERVER_LIBS) -o $(EXE_DIR)/poi-server - -$(POI_SERVER_BIN_DIR)/main.o: $(POI_SERVER_SRC_DIR)/main.cpp $(POI_SERVER_SRC_DIR)/poi-server-class.h \ - $(COMMON_DIR)/genivi-positioning-constants.h \ - $(COMMON_DIR)/genivi-mapviewer-constants.h \ - $(COMMON_DIR)/genivi-navigationcore-constants.h \ - $(COMMON_DIR)/genivi-poiservice-constants.h \ - $(COMMON_DIR)/genivi-poiservice-poisearch_adaptor.h \ - $(COMMON_DIR)/genivi-poiservice-poicontentaccess_adaptor.h \ - $(COMMON_DIR)/genivi-navigationcore-routing_proxy.h \ - $(COMMON_DIR)/genivi-positioning-enhancedposition_proxy.h \ - $(COMMON_DIR)/genivi-poiservice-contentaccessmodule_proxy.h \ - $(COMMON_DIR)/common-data-model.h \ - $(POI_SERVER_SRC_DIR)/poi-datamodel.h \ - $(POI_SERVER_SRC_DIR)/database.h - @$(CHK_DIR_EXISTS) $(POI_SERVER_BIN_DIR) || $(MKDIR) $(POI_SERVER_BIN_DIR) - $(CXX) -c $(CXXFLAGS) $(POI_SERVER_INCPATH) -o $(POI_SERVER_BIN_DIR)/main.o $(POI_SERVER_SRC_DIR)/main.cpp - -$(POI_SERVER_BIN_DIR)/database.o: $(POI_SERVER_SRC_DIR)/database.cpp $(POI_SERVER_SRC_DIR)/database.h - @$(CHK_DIR_EXISTS) $(POI_SERVER_BIN_DIR) || $(MKDIR) $(POI_SERVER_BIN_DIR) - $(CXX) -c $(CXXFLAGS) $(POI_SERVER_INCPATH) -o $(POI_SERVER_BIN_DIR)/database.o $(POI_SERVER_SRC_DIR)/database.cpp - - |