diff options
author | <philippe colliot> | 2014-08-07 17:55:41 +0200 |
---|---|---|
committer | <philippe colliot> | 2014-08-07 17:55:41 +0200 |
commit | bd2f6945f79388ad7b8f16c60130b75e7e85dfa0 (patch) | |
tree | 38dacd90ffa95d7cf3c38c3cad61fe040a35e938 | |
parent | 01c066b8dac69bf4878f81fef84d591ac44b9aee (diff) | |
download | poi-service-bd2f6945f79388ad7b8f16c60130b75e7e85dfa0.tar.gz |
alignment with the latest version of navit, update files
6 files changed, 12 insertions, 8 deletions
diff --git a/src/navigation/map-viewer/mapviewercontrol-plugin/genivi_mapviewer_mapviewercontrol.cxx b/src/navigation/map-viewer/mapviewercontrol-plugin/genivi_mapviewer_mapviewercontrol.cxx index 0799b2e..5bc86b7 100644 --- a/src/navigation/map-viewer/mapviewercontrol-plugin/genivi_mapviewer_mapviewercontrol.cxx +++ b/src/navigation/map-viewer/mapviewercontrol-plugin/genivi_mapviewer_mapviewercontrol.cxx @@ -56,6 +56,7 @@ #include "navit/callback.h" #include "navit/vehicle.h" #include "navit/attr.h" +#include "navit/xmlconfig.h" #include "navit/layout.h" static DBus::Glib::BusDispatcher dispatchers[4]; diff --git a/src/navigation/navigation-core/routing-plugin/genivi_navigationcore_routing.cxx b/src/navigation/navigation-core/routing-plugin/genivi_navigationcore_routing.cxx index cd4063a..b5ad6ef 100644 --- a/src/navigation/navigation-core/routing-plugin/genivi_navigationcore_routing.cxx +++ b/src/navigation/navigation-core/routing-plugin/genivi_navigationcore_routing.cxx @@ -42,6 +42,7 @@ #include "navit/command.h" #include "navit/callback.h" #include "navit/vehicle.h" +#include "navit/xmlconfig.h" #include "navit/vehicleprofile.h" #include "navit/roadprofile.h" #include "navit/map.h" diff --git a/src/navigation/plugins.pro b/src/navigation/plugins.pro index 351f137..6cdf14b 100644 --- a/src/navigation/plugins.pro +++ b/src/navigation/plugins.pro @@ -20,4 +20,5 @@ INCLUDEPATH += ./bin/mapviewer-configuration \ ./bin/mapviewer-session \ ./bin/navigationcore-configuration \ ./bin/navigationcore-guidance \ - ./bin + ./bin \ + navit/navit diff --git a/src/navigation/script/0positioning.mk b/src/navigation/script/0positioning.mk index a9c85e6..b32f494 100644 --- a/src/navigation/script/0positioning.mk +++ b/src/navigation/script/0positioning.mk @@ -47,7 +47,7 @@ help:: @echo "positioning: Build positioning" clean-positioning_SRC:: - rm -rf $(positioning_SRC) + rm -rf $(SRC_DIR)/positioning_* positioning: $(positioning_BIN)/enhanced-position-service diff --git a/src/navigation/script/1navit.mk b/src/navigation/script/1navit.mk index 320ef3d..aeceb6c 100644 --- a/src/navigation/script/1navit.mk +++ b/src/navigation/script/1navit.mk @@ -28,7 +28,8 @@ 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_VERSION=6d7a8e00a67e133981e322ad13a60c9a6a9896de +#navit_VERSION=6d7a8e00a67e133981e322ad13a60c9a6a9896de +navit_VERSION=8396f6f94ef9a16db679e9de353242899966a735 navit_DEPS=gtk2.0-dev cmake DEPS+=$(navit_DEPS) diff --git a/test/navigation/intensive-testing.py b/test/navigation/intensive-testing.py index ace171b..d702672 100644 --- a/test/navigation/intensive-testing.py +++ b/test/navigation/intensive-testing.py @@ -24,7 +24,7 @@ * @licence end@ ************************************************************************** """ -import sys,tty,termios,select,gobject,time,dbus,re,argparse,subprocess,signal +import sys,tty,termios,select,gobject,time,dbus,re,argparse,subprocess,signal,os from subprocess import call from subprocess import Popen @@ -40,16 +40,16 @@ PATH_LOGFILES='./' def startEnhancedPositionServer(): global pathEnhancedposition enhancedposition=pathEnhancedposition + 'enhanced-position-service' - arguments='> /dev/null 2>&1 &' - pid = Popen([enhancedposition, arguments]) + FNULL = open(os.devnull,'w') + pid = Popen([enhancedposition], stdout=FNULL, stderr=FNULL) return pid def launchLog(file): global pathLogreplayer logreplayer=pathLogreplayer + 'log-replayer' file=PATH_LOGFILES + file - arguments='> /dev/null 2>&1 &' - call([logreplayer, file, arguments]) + FNULL = open(os.devnull,'w') + call([logreplayer, file], stdout=FNULL, stderr=FNULL) class Genivi(Enum): ENHANCEDPOSITIONSERVICE_LATITUDE = 0x0020 |