Fix bug of the logreplayer amb plugin

2 files changed, 29 insertions, 10 deletions

diff --git a/src/script/build.sh b/src/script/build.sh
index 93ec390..8912b26 100755
--- a/src/script/build.sh
+++ b/src/script/build.sh
@@ -25,12 +25,15 @@ source fsa-config.sh
 # by default no ilm 
 lm=0
 
+# by default no debug
+dbg=0
+
+
 #--------------------------------------------------------------------------
 # Compiler Flags
 #--------------------------------------------------------------------------
 # modify the following flags as needed:
 #--------------------------------------------------------------------------
-FUEL_STOP_ADVISOR_FLAGS='-DWITH_DEBUG=OFF'
 
 usage() {
     echo "Usage: ./build.sh [command]"
@@ -38,6 +41,7 @@ usage() {
     echo "command:"
     echo "  make            Build"
     echo "  makelm          Build with layer manager"
+    echo "  maked           Build in debug mode"
     echo "  clean           Clean the bin"
     echo "  src-clean       Clean the cloned sources and the bin"
     echo "  clone           Clone the sources"
@@ -76,11 +80,14 @@ build() {
 	# Build the navigation service (including DBus files generation)
     cd $NAVIGATION_SERVICE_BUILD_SCRIPT_DIR 
 	if [ $lm -eq 0 ]; then
-		bash ./build.sh make $NAVIGATION_SERVICE_BIN_DIR $POSITIONING_SRC_DIR $IVI_LAYER_MANAGER_SRC_DIR
+		if [ $dbg -eq 0 ]; then
+			bash ./build.sh make $NAVIGATION_SERVICE_BIN_DIR $POSITIONING_SRC_DIR $IVI_LAYER_MANAGER_SRC_DIR
+		else
+			bash ./build.sh maked $NAVIGATION_SERVICE_BIN_DIR $POSITIONING_SRC_DIR $IVI_LAYER_MANAGER_SRC_DIR
+		fi
 	else
-		bash ./build.sh makelm $NAVIGATION_SERVICE_BIN_DIR $POSITIONING_SRC_DIR $IVI_LAYER_MANAGER_SRC_DIR
+			bash ./build.sh makelm $NAVIGATION_SERVICE_BIN_DIR $POSITIONING_SRC_DIR $IVI_LAYER_MANAGER_SRC_DIR
 	fi
-
     cd $TOP_BIN_DIR 
     mkdir -p $FUEL_STOP_ADVISOR
     cd $FUEL_STOP_ADVISOR_BIN_DIR
@@ -90,11 +97,12 @@ build() {
     mkdir -p $AUTOMOTIVE_MESSAGE_BROKER
     cd $AUTOMOTIVE_MESSAGE_BROKER_BIN_DIR
     cmake $AUTOMOTIVE_MESSAGE_BROKER_SRC_DIR && make
+	sudo make install
 
     cd $TOP_BIN_DIR 
     mkdir -p $LOG_REPLAYER
     cd $LOG_REPLAYER_BIN_DIR
-    cmake $LOG_REPLAYER_SRC_DIR && make
+    cmake $FUEL_STOP_ADVISOR_FLAGS $LOG_REPLAYER_SRC_DIR && make
 
     cd $TOP_BIN_DIR 
     mkdir -p $GENIVI_LOGREPLAYER
@@ -132,10 +140,16 @@ if [ $# -ge 1 ]; then
     if [ $1 = help ]; then
         usage
     elif [ $1 = make ]; then
+		FUEL_STOP_ADVISOR_FLAGS='-DWITH_DEBUG=OFF'
         build
     elif [ $1 = makelm ]; then
+		FUEL_STOP_ADVISOR_FLAGS='-DWITH_DEBUG=OFF'
         lm=1
         build
+    elif [ $1 = maked ]; then
+		FUEL_STOP_ADVISOR_FLAGS='-DWITH_DEBUG=ON'
+		dbg=1
+        build
     elif [ $1 = clean ]; then
         clean
     elif [ $1 = src-clean ]; then
diff --git a/src/script/run b/src/script/run
index ab09450..9d55331 100755
--- a/src/script/run
+++ b/src/script/run
@@ -112,7 +112,7 @@ enhpos=1 #enhanced position server enabled
 replayer=1 #replayer enabled
 lm=0 #layer manager disabled
 wm="" #to store the current window manager (in case of start with the layer manager)
-verbose=0 #no debug or log messages
+verbose=0 #no debug or log messages displayed
 center="4612 N 0608 E"
 
 # hmi panel launched
@@ -206,7 +206,7 @@ then
 	# Create Window OpenGL (Default gtk_drawing_area)
 	export NAVIT_GRAPHICS=opengl
 
-	# Graphics OpneGL Platfrom
+	# Graphics OpenGL Platfrom
 	export NAVIT_PLATFORM=wayland
 
 	# ILM library path(for hmi-launcher& genivi_mapviewer_mapviewercontrol.cxx)
@@ -229,7 +229,12 @@ set -e #exit on error now
 
 # start the automotive message broker and wait for dbus service
 cd $AUTOMOTIVE_MESSAGE_BROKER_BIN_DIR
-run "Automotive Message Broker" ./ambd/ambd > /dev/null 2>&1 --config $GENIVI_LOGREPLAYER_SRC_DIR/logreplayerconfig
+if [ "$verbose" = "1" ]
+then
+	run "Automotive Message Broker" ./ambd/ambd --config $GENIVI_LOGREPLAYER_SRC_DIR/logreplayerconfig
+else
+	run "Automotive Message Broker" ./ambd/ambd > /dev/null 2>&1 --config $GENIVI_LOGREPLAYER_SRC_DIR/logreplayerconfig
+fi
 wait_for_service org.automotive.message.broker /
 
 # start the poi server and wait for dbus service
@@ -261,8 +266,8 @@ wait_for_service org.genivi.navigationcore.Routing /org/genivi/navigationcore
 wait_for_service org.genivi.navigationcore.Session /org/genivi/navigationcore
 
 if [ "$replayer" = 1 ]
-then # start the log replayer (of the fsa)
-	run "Log Replayer" $LOG_REPLAYER_BIN_DIR/src/$LOG_REPLAYER > /dev/null 2>&1 $POSITIONING_LOG_REPLAYER_SRC_DIR/logs/geneve-cologny.log
+then # start the log replayer (of the fsa) with a sample log file
+	run "Log Replayer" $LOG_REPLAYER_BIN_DIR/src/$LOG_REPLAYER  $POSITIONING_LOG_REPLAYER_SRC_DIR/logs/geneve-cologny.log
 fi
 
 sleep 3 # need a sleep here (to be improved)