Add bustle with patch to allow dbus log trace

6 files changed, 200 insertions, 5 deletions

diff --git a/.gitignore b/.gitignore
index 319dca2..54ade23 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,8 @@
 #folders used for building the code
 *-debug/
+*-Debug/
 *-release/
+*-Release/
 bin/
 positioning/
 
diff --git a/test/navigation/.gitignore b/test/navigation/.gitignore
new file mode 100644
index 0000000..e048b7c
--- /dev/null
+++ b/test/navigation/.gitignore
@@ -0,0 +1 @@
+bustle_*
diff --git a/test/navigation/Makefile b/test/navigation/Makefile
new file mode 100644
index 0000000..8297454
--- /dev/null
+++ b/test/navigation/Makefile
@@ -0,0 +1,53 @@
+# @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.
+#
+# 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:
+# 
+# 19/8/2014, Philippe Colliot, creation
+#
+# @licence end@
+
+SRC_DIR=$(CURDIR)/src
+PATCH_DIR=$(CURDIR)/patches
+BIN_DIR=$(CURDIR)/bin
+
+default: help
+
+help::
+	@echo "The following targets exist"
+	@echo "all: Build $(ALL)"
+	@echo "all2: Install all necessary dependencies and build all"
+	@echo "clean: Clean up build dir"
+	@echo "src-clean: Clean up all checked out sources"
+
+
+include *.mk
+
+all: $(ALL)
+
+src-clean: $(SRC_CLEAN)
+
+deps::
+	sudo apt-get install $(DEPS)
+
+all2: deps all
+
+clean:
+	rm -rf $(BIN_DIR)
diff --git a/test/navigation/README b/test/navigation/README
index 525a8af..b981974 100644
--- a/test/navigation/README
+++ b/test/navigation/README
@@ -1,21 +1,45 @@
-This folder only contains an example of test file.
+Release date of the file: 19-08-2014 
+Status: to be completed
+
+This folder contains some stuff for testing.
+
+-----------------------------------
+Python scripts for unitary testing:
+-----------------------------------
+
 In order to test the navigation core, please do:
 Into a terminal
 cd ../../src/navigation/script
 ./run -r 
+NB: Another way to check the state of the process is to run in separate xterms:
+./run -rx
+
 Into another terminal
 cd ../../../test/navigation/
 python test-route-calculation.py
-kill -9 `ps -ef | grep navit | grep -v grep | awk '{print $2}'`
 
 You can see some debug messages into the terminal
 
-Another way to check the state of the process is to run in separate xterms:
-./run -rx
+To clean up the navigation core, please do:
+kill -9 `ps -ef | grep navit | grep -v grep | awk '{print $2}'`
+
 
-For unitary testing of enhanced position with log replayer
+For intensive unitary testing of enhanced position with log replayer
 If you launch it from the formal navigation repos, just do
 python intensive-testing.py
 It will run the test at 5 frames per sec or can be set by parameter (duration 20 sec)
 If you launch it from the navigation-application repos, just do
 python intensive-testing.py -p ../../../../
+
+-----------------------------------
+Bustle viewer with special patch:
+-----------------------------------
+
+The bustle code has been patched for Genivi.
+To build it:
+make all2
+
+To run it (for example):
+./run_bustle org.genivi.
+
+
diff --git a/test/navigation/bustle.mk b/test/navigation/bustle.mk
new file mode 100644
index 0000000..f05e6e1
--- /dev/null
+++ b/test/navigation/bustle.mk
@@ -0,0 +1,57 @@
+# @licence app begin@
+# SPDX-License-Identifier: MPL-2.0
+#
+# \copyright Copyright (C) 2013-2014, PCA Peugeot Citroen
+#
+# \file bustle.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@
+bustle_URL="http://anongit.freedesktop.org/git/bustle.git"
+bustle_VERSION=61ac45d195476edb810a1c2345c886fdc51a20cc
+bustle_SRC=$(SRC_DIR)/bustle_$(bustle_VERSION)
+bustle_BIN=$(BIN_DIR)/bustle
+bustle_DEPS+= gtk2.0-dev haskell-platform libghc-gtk-dev libghc-glade-dev libpcap-dev language-pack-de language-pack-fr gtk2hs-buildtools libdbus-1-dev
+
+DEPS+=$(bustle_DEPS)
+ALL+=bustle
+SRC_CLEAN+=clean-bustle_SRC
+
+help::
+	@echo "bustle: Build bustle with patches"
+
+clean-bustle_SRC::
+	rm -rf $(SRC_DIR)/bustle_*
+
+$(bustle_SRC)/Makefile:
+	cd $(bustle_SRC)/.. && git clone $(bustle_URL) $(bustle_SRC)
+	cd $(bustle_SRC) && git checkout $(bustle_VERSION)
+
+$(bustle_SRC)/.patched: $(bustle_SRC)/Makefile
+	patch -d $(bustle_SRC) -p1 -s <$(PATCH_DIR)/bustle_filter.patch
+	touch $(bustle_SRC)/.patched
+
+$(HOME)/.cabal/packages/hackage.haskell.org/00-index.tar:
+	cabal update
+
+$(bustle_BIN)/bustle: $(bustle_SRC)/.patched $(HOME)/.cabal/packages/hackage.haskell.org/00-index.tar
+	cd $(bustle_SRC) && cabal install --builddir=$(bustle_BIN) && cabal build --builddir=$(bustle_BIN)
+
+bustle: $(bustle_BIN)/bustle
+
diff --git a/test/navigation/run_bustle b/test/navigation/run_bustle
new file mode 100755
index 0000000..155f0ff
--- /dev/null
+++ b/test/navigation/run_bustle
@@ -0,0 +1,58 @@
+#! /bin/sh
+
+# @licence app begin@
+# SPDX-License-Identifier: MPL-2.0
+#
+# \copyright Copyright (C) 2013-2014, PCA Peugeot Citroen
+#
+# \file run-bustle
+#
+# \brief This file is part of the test tool.
+#
+# \author Martin Schaller <martin.schaller@it-schaller.de>
+#
+# \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:
+# 
+# 19/8/2014, Philippe Colliot, update for the OSS migration
+#
+# @licence end@
+
+if [ -z "$1" ]
+then
+	cat <<EOT >&2
+Usage:
+	$0 filter_expr
+
+	filter_expr is a comma separated list of methods/signals to filter, with a prefix of '-' to exclude a method/signal
+Examples:
+	# Only get methods/signals starting with org.genivi.
+	$0 org.genivi.
+
+	# Like above, but exclude positioning
+	$0 org.genivi.,-org.genivi.positioning
+
+	# Like above, but exclude positioning and mapmatching
+	$0 org.genivi.,-org.genivi.positioning.,-org.genivi.navigationcore.MapMatchedPosition.
+
+	#Like above, but include GetPosition of mapmatching
+	$0 org.genivi.,-org.genivi.positioning.,-org.genivi.navigationcore.MapMatchedPosition.,org.genivi.navigationcore.MapMatchedPosition.GetPosition
+
+EOT
+	exit 1
+fi
+
+if [ ! -f ./bin/bustle/build/bustle/bustle ]
+then
+	echo "Build bustle first: make bustle"
+fi
+export BUSTLE_FILTER=$1
+exec ./bin/bustle/build/bustle/bustle
\ No newline at end of file