From 9be332b6ba33ce621f05f4d1d4b526a21698154d Mon Sep 17 00:00:00 2001 From: asanoaozora Date: Fri, 17 Nov 2017 12:58:10 +0100 Subject: Fix a bug in dbus-c++ to allow build with gcc 7.2.0 thanks to Orcan Ogetbil --- src/build.sh | 15 ++++-------- src/fuel-stop-advisor/fuel-stop-advisor.cpp | 30 +++++++++++++++++++++++ src/genivilogreplayer/genivilogreplayerplugin.cpp | 26 ++++++++++++++++++++ src/genivilogreplayer/genivilogreplayerplugin.h | 27 +++++++++++++++++++- src/update_third_party.sh | 6 ++--- 5 files changed, 90 insertions(+), 14 deletions(-) (limited to 'src') diff --git a/src/build.sh b/src/build.sh index f764ab5..a8977bf 100755 --- a/src/build.sh +++ b/src/build.sh @@ -142,33 +142,28 @@ then fi fi +#prepare directory structure for build mkdir -p build cd build mkdir -p navigation cd navigation mkdir -p navit -cd navit +cd ../ if [ "$navit" = 1 ] then + cd navigation/navit echo 'build navit' if [ "$clean" = 1 ] then cmake -DDISABLE_QT=1 -DSAMPLE_MAP=0 -DBUILD_MAPTOOL=0 -Dvehicle/null=1 -Dgraphics/qt_qpainter=0 ../../../navigation/src/navigation/navit/ fi make -else - if [ "$clean" = 1 ] - then - echo 'build navit' - cmake -DDISABLE_QT=1 -DSAMPLE_MAP=0 -DBUILD_MAPTOOL=0 -Dvehicle/null=1 -Dgraphics/qt_qpainter=0 ../../../navigation/src/navigation/navit/ - make - fi + cd ../../ fi if [ "$speech" = 1 ] then - cd ../../ mkdir -p speech-service cd speech-service echo 'build speech' @@ -177,9 +172,9 @@ then cmake -DWITH_DLT=$dlt_option -DWITH_DEBUG=$debug ../../navigation/src/speech-service fi make + cd ../ fi -cd ../ echo 'build fsa' diff --git a/src/fuel-stop-advisor/fuel-stop-advisor.cpp b/src/fuel-stop-advisor/fuel-stop-advisor.cpp index a687b7b..baf5a50 100644 --- a/src/fuel-stop-advisor/fuel-stop-advisor.cpp +++ b/src/fuel-stop-advisor/fuel-stop-advisor.cpp @@ -1,3 +1,33 @@ +/** +* @licence app begin@ +* SPDX license identifier: MPL-2.0 +* +* \copyright Copyright (C) 2017, PCA Peugeot Citroën +* +* +* \brief This file is part of lbs-fuel-stop-advisor. +* +* \author Philippe Colliot +* +* \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: +* , , +* , , +* +* @licence end@ +*/ + +#ifndef DBUS_HAS_RECURSIVE_MUTEX +#define DBUS_HAS_RECURSIVE_MUTEX +#endif #include #include #include diff --git a/src/genivilogreplayer/genivilogreplayerplugin.cpp b/src/genivilogreplayer/genivilogreplayerplugin.cpp index 764b2de..ef22f93 100644 --- a/src/genivilogreplayer/genivilogreplayerplugin.cpp +++ b/src/genivilogreplayer/genivilogreplayerplugin.cpp @@ -1,3 +1,29 @@ +/** +* @licence app begin@ +* SPDX license identifier: MPL-2.0 +* +* \copyright Copyright (C) 2017, PCA Peugeot Citroën +* +* +* \brief This file is part of lbs-fuel-stop-advisor. +* +* \author Philippe Colliot +* +* \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: +* , , +* , , +* +* @licence end@ +*/ #include "genivilogreplayerplugin.h" #include diff --git a/src/genivilogreplayer/genivilogreplayerplugin.h b/src/genivilogreplayer/genivilogreplayerplugin.h index 14edc74..6d44227 100644 --- a/src/genivilogreplayer/genivilogreplayerplugin.h +++ b/src/genivilogreplayer/genivilogreplayerplugin.h @@ -1,4 +1,29 @@ - +/** +* @licence app begin@ +* SPDX license identifier: MPL-2.0 +* +* \copyright Copyright (C) 2017, PCA Peugeot Citroën +* +* +* \brief This file is part of lbs-fuel-stop-advisor. +* +* \author Philippe Colliot +* +* \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: +* , , +* , , +* +* @licence end@ +*/ #ifndef GENIVILOGREPLAYERPLUGIN_H #define GENIVILOGREPLAYERPLUGIN_H diff --git a/src/update_third_party.sh b/src/update_third_party.sh index e84449c..a6f4c5b 100755 --- a/src/update_third_party.sh +++ b/src/update_third_party.sh @@ -1,8 +1,8 @@ #!/bin/bash -navigation_version='17dc03852f64ed02f3fbc1ca42ea25c5fb403ccd' -positioning_version='9725fe1f553197042d6445997690d452a73490c0' -navit_version='f5abdd317e10d56226300d001469595658a605e4' +navigation_version='eb90438a1d4729751c0768e0b65fc8c940741d65' +positioning_version='d4c46f13019aefb11aebd0fc1210a29a46f0b521' +navit_version='3f26accd04c0f9733f2c8bf7bf58235e2d47a734' echo "version of navigation is: $navigation_version" echo "version of positioning is: $positioning_version" -- cgit v1.2.1