From 8358890d9aad725b734b25b5b2ab41b9cc116cc6 Mon Sep 17 00:00:00 2001
From: jandegr <jandegr@users.noreply.github.com>
Date: Thu, 3 Nov 2016 19:00:04 +0100
Subject: convert CI to trusty

---
 circle.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/circle.yml b/circle.yml
index ff3df2850..e379c4285 100644
--- a/circle.yml
+++ b/circle.yml
@@ -30,7 +30,7 @@ dependencies:
     - sudo apt-get install lib32stdc++6
     - sudo apt-get install lib32z1
     - bash ci/build_android.sh
-    - bash ci/build_android_x86.sh
+#    - bash ci/build_android_x86.sh
 # Tomtom minimal build
     - bash ci/build_tomtom_minimal.sh
 # Windows build
-- 
cgit v1.2.1


From 0ed04f23c292866ab6db46a68968bea73b8c0e53 Mon Sep 17 00:00:00 2001
From: jandegr <jandegr@users.noreply.github.com>
Date: Thu, 3 Nov 2016 19:04:40 +0100
Subject: install ndk

---
 circle.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/circle.yml b/circle.yml
index e379c4285..90efda43e 100644
--- a/circle.yml
+++ b/circle.yml
@@ -29,6 +29,7 @@ dependencies:
 # for aapt
     - sudo apt-get install lib32stdc++6
     - sudo apt-get install lib32z1
+    - wget http://dl.google.com/android/repository/android-ndk-r13-linux-x86_64.zip && unzip -d ~ android-ndk-r13-linux-x86_64.zip
     - bash ci/build_android.sh
 #    - bash ci/build_android_x86.sh
 # Tomtom minimal build
-- 
cgit v1.2.1


From 737bc60ba8471ad88acc758945f5116bd90b4dc1 Mon Sep 17 00:00:00 2001
From: jandegr <jandegr@users.noreply.github.com>
Date: Thu, 3 Nov 2016 19:06:26 +0100
Subject: Update build_android.sh

---
 ci/build_android.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ci/build_android.sh b/ci/build_android.sh
index a063bf2fa..89e5f34cc 100644
--- a/ci/build_android.sh
+++ b/ci/build_android.sh
@@ -9,7 +9,7 @@ export START_PATH=~/
 export SOURCE_PATH=$START_PATH"/"${CIRCLE_PROJECT_REPONAME}"/"
 export CMAKE_FILE=$SOURCE_PATH"/Toolchain/arm-eabi.cmake"
 
-export ANDROID_NDK="/usr/local/android-ndk/"
+export ANDROID_NDK=~/android-ndk-r13
 export ANDROID_NDK_BIN=$ANDROID_NDK"/toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86_64/bin"
  
 export ANDROID_SDK="/usr/local/android-sdk-linux/"
-- 
cgit v1.2.1


From f395040fa7699de37f341c189a3f2b846d33219e Mon Sep 17 00:00:00 2001
From: jandegr <jandegr@users.noreply.github.com>
Date: Thu, 3 Nov 2016 19:08:10 +0100
Subject: Update arm-eabi.cmake

---
 Toolchain/arm-eabi.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Toolchain/arm-eabi.cmake b/Toolchain/arm-eabi.cmake
index 9f5473b4b..7c8190667 100755
--- a/Toolchain/arm-eabi.cmake
+++ b/Toolchain/arm-eabi.cmake
@@ -1,7 +1,7 @@
 set(CMAKE_SYSTEM_NAME GNU)
 
 set(ANDROID TRUE)
-set(ANDROID_API_VERSION 8 CACHE STRING "Andriod API Version")
+set(ANDROID_API_VERSION 9 CACHE STRING "Andriod API Version")
 set(ANDROID_NDK_API_VERSION ${ANDROID_API_VERSION} CACHE STRING "Andriod NDK API Version")
 set(ANDROID_ARCH "armeabi" CACHE STRING "Android architecture")
 
-- 
cgit v1.2.1


From 9c0a440ed80e38bfb3c2621abf8f45d6fea0c66d Mon Sep 17 00:00:00 2001
From: jandegr <jandegr@users.noreply.github.com>
Date: Thu, 3 Nov 2016 19:17:39 +0100
Subject: Update build_android.sh

---
 ci/build_android.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ci/build_android.sh b/ci/build_android.sh
index 89e5f34cc..5c3542b25 100644
--- a/ci/build_android.sh
+++ b/ci/build_android.sh
@@ -46,7 +46,7 @@ android list targets
 mkdir $CIRCLE_ARTIFACTS/android/
 cp ~/navit/navit/android/CMakeLists.txt $CIRCLE_ARTIFACTS/android/
 
-cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_FILE -DCACHE_SIZE='(20*1024*1024)' -DAVOID_FLOAT=1 -DSAMPLE_MAP=n -DBUILD_MAPTOOL=n -DANDROID_API_VERSION=21 -DANDROID_NDK_API_VERSION=19 $SOURCE_PATH
+cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_FILE -DCACHE_SIZE='(20*1024*1024)' -DAVOID_FLOAT=1 -DSAMPLE_MAP=n -DBUILD_MAPTOOL=n -DANDROID_API_VERSION=23 -DANDROID_NDK_API_VERSION=19 $SOURCE_PATH
 make || exit 1
 if [[ "${CIRCLE_BRANCH}" == "master" ]]; then
   make apkg-release && mv navit/android/bin/Navit-release-unsigned.apk $CIRCLE_ARTIFACTS/navit-$CIRCLE_SHA1-release-unsigned.apk || exit 1
-- 
cgit v1.2.1


From a6754f7ffe3c5dae57e28a927442fe4bf8141588 Mon Sep 17 00:00:00 2001
From: jandegr <jandegr@users.noreply.github.com>
Date: Thu, 3 Nov 2016 19:29:58 +0100
Subject: sdk 23

---
 navit/android/src/org/navitproject/navit/NavitGraphics.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/navit/android/src/org/navitproject/navit/NavitGraphics.java b/navit/android/src/org/navitproject/navit/NavitGraphics.java
index 031331f68..a41ab52be 100644
--- a/navit/android/src/org/navitproject/navit/NavitGraphics.java
+++ b/navit/android/src/org/navitproject/navit/NavitGraphics.java
@@ -369,7 +369,7 @@ public class NavitGraphics
 		{
 			float x = a.x - b.x;
 			float y = a.y - b.y;
-			return FloatMath.sqrt(x * x + y * y);
+			return (float)Math.sqrt(x * x + y * y);
 		}
 
 		private PointF getFloatValue(Object instance, Object argument)
-- 
cgit v1.2.1


From 759a24a5937fb2ac38bc47fad7a225f19f37ce67 Mon Sep 17 00:00:00 2001
From: jandegr <jandegr@users.noreply.github.com>
Date: Thu, 3 Nov 2016 19:37:54 +0100
Subject: Update build_android_x86.sh

---
 ci/build_android_x86.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ci/build_android_x86.sh b/ci/build_android_x86.sh
index 6755ad347..6eea4c7bb 100644
--- a/ci/build_android_x86.sh
+++ b/ci/build_android_x86.sh
@@ -1,7 +1,7 @@
 export START_PATH=~/
 export SOURCE_PATH=$START_PATH"/"${CIRCLE_PROJECT_REPONAME}"/"
 export CMAKE_FILE=$SOURCE_PATH"/Toolchain/i686-android.cmake"
-export ANDROID_NDK="/usr/local/android-ndk/"
+export ANDROID_NDK=~/android-ndk-r13
 export ANDROID_NDK_BIN=$ANDROID_NDK"/toolchains/x86-4.9/prebuilt/linux-x86_64/bin"
 export ANDROID_SDK="/usr/local/android-sdk-linux/"
 export ANDROID_SDK_PLATFORM_TOOLS=$ANDROID_SDK"/platform-tools"
@@ -11,7 +11,7 @@ mkdir android-x86 && cd android-x86
 
 android list targets
 
-cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_FILE -DAVOID_FLOAT=1 -DSAMPLE_MAP=n -DBUILD_MAPTOOL=n -DANDROID_API_VERSION=21 -DANDROID_NDK_API_VERSION=19 -DDISABLE_CXX=1 -DDISABLE_QT=1 ../ || exit -1
+cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_FILE -DAVOID_FLOAT=1 -DSAMPLE_MAP=n -DBUILD_MAPTOOL=n -DANDROID_API_VERSION=23 -DANDROID_NDK_API_VERSION=19 -DDISABLE_CXX=1 -DDISABLE_QT=1 ../ || exit -1
 make || exit -1
 
 if [[ "${CIRCLE_BRANCH}" == "master" ]]; then
-- 
cgit v1.2.1


From f1ec8e38848ed656be7da7d95c8f5bb046e12a67 Mon Sep 17 00:00:00 2001
From: jandegr <jandegr@users.noreply.github.com>
Date: Thu, 3 Nov 2016 19:38:18 +0100
Subject: Update circle.yml

---
 circle.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/circle.yml b/circle.yml
index 90efda43e..6965a225e 100644
--- a/circle.yml
+++ b/circle.yml
@@ -31,7 +31,7 @@ dependencies:
     - sudo apt-get install lib32z1
     - wget http://dl.google.com/android/repository/android-ndk-r13-linux-x86_64.zip && unzip -d ~ android-ndk-r13-linux-x86_64.zip
     - bash ci/build_android.sh
-#    - bash ci/build_android_x86.sh
+    - bash ci/build_android_x86.sh
 # Tomtom minimal build
     - bash ci/build_tomtom_minimal.sh
 # Windows build
-- 
cgit v1.2.1


From bc09016a5bc5200d2de8abdfcf8f6c53170ddc56 Mon Sep 17 00:00:00 2001
From: jandegr <jandegr@users.noreply.github.com>
Date: Thu, 3 Nov 2016 19:42:17 +0100
Subject: Update Navit.java

---
 navit/android/src/org/navitproject/navit/Navit.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/navit/android/src/org/navitproject/navit/Navit.java b/navit/android/src/org/navitproject/navit/Navit.java
index a0c61bd72..c8578df07 100644
--- a/navit/android/src/org/navitproject/navit/Navit.java
+++ b/navit/android/src/org/navitproject/navit/Navit.java
@@ -301,7 +301,8 @@ public class Navit extends Activity
 		NotificationManager nm = (NotificationManager) getSystemService(NOTIFICATION_SERVICE);	// Grab a handle to the NotificationManager
 		Notification NavitNotification = new Notification(R.drawable.ic_notify, getString(R.string.notification_ticker), System.currentTimeMillis());	// Create a new notification, with the text string to show when the notification first appears
 		PendingIntent appIntent = PendingIntent.getActivity(getApplicationContext(), 0, getIntent(), 0);
-		NavitNotification.setLatestEventInfo(getApplicationContext(), "Navit", getString(R.string.notification_event_default), appIntent);	// Set the text in the notification
+//		FIXME : needs a fix for sdk 23
+//		NavitNotification.setLatestEventInfo(getApplicationContext(), "Navit", getString(R.string.notification_event_default), appIntent);	// Set the text in the notification
 		NavitNotification.flags|=Notification.FLAG_ONGOING_EVENT;	// Ensure that the notification appears in Ongoing
 		nm.notify(R.string.app_name, NavitNotification);	// Set the notification
 		
-- 
cgit v1.2.1


From f5935f67a7d03a87a7229fac9faefb6d1851182f Mon Sep 17 00:00:00 2001
From: jandegr <jandegr@users.noreply.github.com>
Date: Thu, 3 Nov 2016 20:11:59 +0100
Subject: Update build_linux.sh

---
 ci/build_linux.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ci/build_linux.sh b/ci/build_linux.sh
index 4f90d5d98..ac9bbbc13 100644
--- a/ci/build_linux.sh
+++ b/ci/build_linux.sh
@@ -3,7 +3,7 @@ if [[ "${CIRCLE_PROJECT_USERNAME}" == "navit-gps" && "${CIRCLE_BRANCH}" == "trun
 	export PATH=~/navit/cov-analysis-linux64-7.6.0/bin:$PATH
 	
 	mkdir bin && cd bin
-	cov-build --dir cov-int cmake ../ -Dgraphics/qt_qpainter:BOOL=FALSE -Dgui/qml:BOOL=FALSE -DSVG2PNG:BOOL=FALSE -DSAMPLE_MAP=n
+	cov-build --dir cov-int cmake ../ -Dgraphics/qt_qpainter:BOOL=FALSE -Dgui/qml:BOOL=FALSE -DSVG2PNG:BOOL=FALSE
 	cov-build --dir cov-int make || exit -1
 	tar czvf navit.tgz cov-int
 	
@@ -15,7 +15,7 @@ if [[ "${CIRCLE_PROJECT_USERNAME}" == "navit-gps" && "${CIRCLE_BRANCH}" == "trun
   https://scan.coverity.com/builds?project=$CIRCLE_PROJECT_USERNAME
 else
 	mkdir bin && cd bin
-	cmake ../ -Dgraphics/qt_qpainter:BOOL=FALSE -Dgui/qml:BOOL=FALSE -DSVG2PNG:BOOL=FALSE -DSAMPLE_MAP=n|| exit -1
+	cmake ../ -Dgraphics/qt_qpainter:BOOL=FALSE -Dgui/qml:BOOL=FALSE -DSVG2PNG:BOOL=FALSE || exit -1
 	make  || exit -1
 fi
 cp -r navit/xpm $CIRCLE_ARTIFACTS
-- 
cgit v1.2.1


From 8dd2b4c9840cff4cbe98526f63cabd952ee9b2d3 Mon Sep 17 00:00:00 2001
From: Pierre Grandin <grandinp@altern.org>
Date: Tue, 29 Nov 2016 22:12:30 +0000
Subject: Ensures that libgtk2.0-dev is installed for CircleCI/14.04

---
 ci/build_linux.sh | 4 +++-
 circle.yml        | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/ci/build_linux.sh b/ci/build_linux.sh
index ac9bbbc13..74fe4a136 100644
--- a/ci/build_linux.sh
+++ b/ci/build_linux.sh
@@ -18,4 +18,6 @@ else
 	cmake ../ -Dgraphics/qt_qpainter:BOOL=FALSE -Dgui/qml:BOOL=FALSE -DSVG2PNG:BOOL=FALSE || exit -1
 	make  || exit -1
 fi
-cp -r navit/xpm $CIRCLE_ARTIFACTS
+if [[ "$CIRCLE_ARTIFACTS" != "" ]]; then
+	cp -r navit/xpm $CIRCLE_ARTIFACTS
+fi
diff --git a/circle.yml b/circle.yml
index 6965a225e..31ba6d2d7 100644
--- a/circle.yml
+++ b/circle.yml
@@ -18,6 +18,7 @@ dependencies:
     - sudo apt-get install libfreetype6-dev
     - sudo apt-get install libdbus-glib-1-dev
     - sudo apt-get install g++
+    - sudo apt-get install libgtk2.0-dev
     - bash ci/update_version.sh prepare
     - bash ci/build_linux.sh
     - sed -i '/INTEGER/d' bin/po/navit.pot
-- 
cgit v1.2.1


From 25fd4d4f0607677f221397912b7eec6e17602925 Mon Sep 17 00:00:00 2001
From: Pierre Grandin <grandinp@altern.org>
Date: Tue, 29 Nov 2016 22:42:23 +0000
Subject: Moving linux dependencies installation to the build script

---
 ci/build_linux.sh | 2 ++
 circle.yml        | 7 -------
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/ci/build_linux.sh b/ci/build_linux.sh
index 74fe4a136..8c3ca1b9b 100644
--- a/ci/build_linux.sh
+++ b/ci/build_linux.sh
@@ -1,3 +1,5 @@
+sudo apt-get install cmake libpng12-dev librsvg2-bin libfreetype6-dev libdbus-glib-1-dev g++ libgtk2.0-dev
+
 if [[ "${CIRCLE_PROJECT_USERNAME}" == "navit-gps" && "${CIRCLE_BRANCH}" == "trunk" ]]; then
 	tar xfz ~/assets/cov-analysis-linux64-7.6.0.tar.gz
 	export PATH=~/navit/cov-analysis-linux64-7.6.0/bin:$PATH
diff --git a/circle.yml b/circle.yml
index 31ba6d2d7..7c1f19333 100644
--- a/circle.yml
+++ b/circle.yml
@@ -12,13 +12,6 @@ dependencies:
     - "[ -d ~/android ] || mkdir ~/android"
     - wget -c -O ~/assets/cov-analysis-linux64-7.6.0.tar.gz http://sd-55475.dedibox.fr/cov-analysis-linux64-7.6.0.tar.gz
     - sudo apt-get update
-    - sudo apt-get install cmake
-    - sudo apt-get install libpng12-dev
-    - sudo apt-get install librsvg2-bin 
-    - sudo apt-get install libfreetype6-dev
-    - sudo apt-get install libdbus-glib-1-dev
-    - sudo apt-get install g++
-    - sudo apt-get install libgtk2.0-dev
     - bash ci/update_version.sh prepare
     - bash ci/build_linux.sh
     - sed -i '/INTEGER/d' bin/po/navit.pot
-- 
cgit v1.2.1


From 40ff85b5e31c7bddfb8f6b234ba364d51c980492 Mon Sep 17 00:00:00 2001
From: Pierre Grandin <grandinp@altern.org>
Date: Tue, 29 Nov 2016 23:07:03 +0000
Subject: Reduced tomtom CI downloads verbosity

---
 ci/build_tomtom_minimal.sh | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/ci/build_tomtom_minimal.sh b/ci/build_tomtom_minimal.sh
index cb0bf7472..ddc3d35e4 100644
--- a/ci/build_tomtom_minimal.sh
+++ b/ci/build_tomtom_minimal.sh
@@ -37,12 +37,12 @@ mkdir -p ~/tomtom_assets
 
 if ! [ -e "~/tomtom_assets/toolchain_redhat_gcc-3.3.4_glibc-2.3.2-20060131a.tar.gz" ]
  then 
-  wget -c http://www.tomtom.com/gpl/toolchain_redhat_gcc-3.3.4_glibc-2.3.2-20060131a.tar.gz -P ~/tomtom_assets
+  wget -nv -c http://www.tomtom.com/gpl/toolchain_redhat_gcc-3.3.4_glibc-2.3.2-20060131a.tar.gz -P ~/tomtom_assets
 fi
 
 if ! test -f "~/tomtom_assets/libpng-1.6.25.tar.gz"
  then 
-  wget -c ftp://ftp.simplesystems.org/pub/libpng/png/src/libpng16/libpng-1.6.26.tar.gz -P ~/tomtom_assets
+  wget -nv -c ftp://ftp.simplesystems.org/pub/libpng/png/src/libpng16/libpng-1.6.26.tar.gz -P ~/tomtom_assets
 fi
 
 # toolchain
@@ -53,7 +53,7 @@ tar xzf ~/tomtom_assets/toolchain_redhat_gcc-3.3.4_glibc-2.3.2-20060131a.tar.gz
 
 # zlib
 cd /tmp
-wget -c http://zlib.net/zlib-1.2.8.tar.gz
+wget -nv -c http://zlib.net/zlib-1.2.8.tar.gz
 tar xzf zlib-1.2.8.tar.gz
 cd zlib-1.2.8
 ./configure --prefix=$PREFIX
@@ -62,7 +62,7 @@ make install
 
 # libxml
 cd /tmp/
-wget -c http://xmlsoft.org/sources/libxml2-2.7.8.tar.gz
+wget -nv -c http://xmlsoft.org/sources/libxml2-2.7.8.tar.gz
 tar xzf libxml2-2.7.8.tar.gz
 cd libxml2-2.7.8/
 ./configure --prefix=$PREFIX --host=$ARCH --without-python
@@ -79,7 +79,7 @@ make install
 
 
 cd /tmp
-wget -c http://download.savannah.gnu.org/releases/freetype/freetype-2.5.0.tar.gz
+wget -nv -c http://download.savannah.gnu.org/releases/freetype/freetype-2.5.0.tar.gz
 tar xzf freetype-2.5.0.tar.gz
 cd freetype-2.5.0
 ./configure --prefix=$PREFIX --host=$ARCH
@@ -90,7 +90,7 @@ freetype-config --cflags
 
 # glib
 cd /tmp
-wget -c http://ftp.gnome.org/pub/gnome/sources/glib/2.25/glib-2.25.17.tar.gz
+wget -nv -c http://ftp.gnome.org/pub/gnome/sources/glib/2.25/glib-2.25.17.tar.gz
 tar xzf glib-2.25.17.tar.gz
 cd glib-2.25.17
 cat > tomtom.cache << EOF
@@ -125,10 +125,10 @@ make install
 
 
 cd /tmp
-wget -c http://www.libsdl.org/release/SDL-1.2.15.tar.gz
+wget -nv -c http://www.libsdl.org/release/SDL-1.2.15.tar.gz
 tar xzf SDL-1.2.15.tar.gz
 cd SDL-1.2.15
-wget -c http://tracks.yaina.de/source/sdl-fbcon-notty.patch
+wget -nv -c http://tracks.yaina.de/source/sdl-fbcon-notty.patch
 patch -p0 -i sdl-fbcon-notty.patch
 ./configure --prefix=$PREFIX --host=$ARCH \
   --disable-esd --disable-cdrom --disable-joystick --disable-video-x11 \
@@ -143,7 +143,7 @@ export PATH=$PREFIX/bin:$PATH
 
 # sdl image
 cd /tmp
-wget -c http://www.libsdl.org/projects/SDL_image/release/SDL_image-1.2.12.tar.gz
+wget -nv -c http://www.libsdl.org/projects/SDL_image/release/SDL_image-1.2.12.tar.gz
 tar xzf SDL_image-1.2.12.tar.gz
 cd SDL_image-1.2.12
 ./configure --prefix=$PREFIX --host=$ARCH
-- 
cgit v1.2.1


From 21e0a71b2a98a34b2fed075b77f8d986fed6054d Mon Sep 17 00:00:00 2001
From: Pierre Grandin <grandinp@altern.org>
Date: Tue, 29 Nov 2016 23:16:55 +0000
Subject: Ensures that python-dbus is installed, needed for tests

---
 circle.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/circle.yml b/circle.yml
index 7c1f19333..201e69fb4 100644
--- a/circle.yml
+++ b/circle.yml
@@ -39,6 +39,7 @@ dependencies:
     - cp win32/*.exe $CIRCLE_ARTIFACTS/
 # For python testing with junit reporting
     - sudo pip install junit-xml
+    - sudo apt-get install python-dbus
 #
     - ls -la $CIRCLE_ARTIFACTS
 test:
-- 
cgit v1.2.1


From 60918fcdd2ce03233cf6c66dfd669f260f8b14c5 Mon Sep 17 00:00:00 2001
From: Pierre Grandin <grandinp@altern.org>
Date: Tue, 29 Nov 2016 23:44:57 +0000
Subject: Enabling build parallelization

---
 ci/build_win32.sh |  6 ++++++
 circle.yml        | 18 +++++++-----------
 2 files changed, 13 insertions(+), 11 deletions(-)
 create mode 100644 ci/build_win32.sh

diff --git a/ci/build_win32.sh b/ci/build_win32.sh
new file mode 100644
index 000000000..8a84ca5d6
--- /dev/null
+++ b/ci/build_win32.sh
@@ -0,0 +1,6 @@
+mkdir win32
+pushd win32
+cmake -Dbinding/python:BOOL=FALSE -DSAMPLE_MAP=n -DCMAKE_TOOLCHAIN_FILE=../Toolchain/mingw32.cmake ../ && make && make package
+popd
+
+cp win32/*.exe $CIRCLE_ARTIFACTS/
diff --git a/circle.yml b/circle.yml
index 201e69fb4..2041c8b0e 100644
--- a/circle.yml
+++ b/circle.yml
@@ -13,7 +13,7 @@ dependencies:
     - wget -c -O ~/assets/cov-analysis-linux64-7.6.0.tar.gz http://sd-55475.dedibox.fr/cov-analysis-linux64-7.6.0.tar.gz
     - sudo apt-get update
     - bash ci/update_version.sh prepare
-    - bash ci/build_linux.sh
+#    - bash ci/build_linux.sh
     - sed -i '/INTEGER/d' bin/po/navit.pot
     - cp bin/po/navit.pot $CIRCLE_ARTIFACTS/
     - "[ $CIRCLE_PROJECT_USERNAME != navit-gps ] || curl \"https://translations.launchpad.net/navit/${CIRCLE_BRANCH}/+translations-upload\" -H \"$lp_cookie\" -H \"Referer: https://translations.launchpad.net/navit/${CIRCLE_BRANCH}/+translations-upload\" -F file=@bin/po/navit.pot | grep title"
@@ -24,25 +24,21 @@ dependencies:
     - sudo apt-get install lib32stdc++6
     - sudo apt-get install lib32z1
     - wget http://dl.google.com/android/repository/android-ndk-r13-linux-x86_64.zip && unzip -d ~ android-ndk-r13-linux-x86_64.zip
-    - bash ci/build_android.sh
-    - bash ci/build_android_x86.sh
-# Tomtom minimal build
-    - bash ci/build_tomtom_minimal.sh
 # Windows build
     - sudo apt-get install mingw32 mingw32-binutils mingw32-runtime
     - sudo apt-get install default-jdk nsis
-# for sys/select.h
-#    - sudo apt-get install -y libc6-dev
-    - mkdir win32
-    - cmake -Dbinding/python:BOOL=FALSE -DSAMPLE_MAP=n -DCMAKE_TOOLCHAIN_FILE=../Toolchain/mingw32.cmake ../ && make && make package:
-        pwd: win32/
-    - cp win32/*.exe $CIRCLE_ARTIFACTS/
 # For python testing with junit reporting
     - sudo pip install junit-xml
     - sudo apt-get install python-dbus
 #
     - ls -la $CIRCLE_ARTIFACTS
 test:
+
+  override:
+    - bash
+        parallel: true
+        files:
+          - ci/build_*.sh
   post:
     - sed -i -e 's@name="Local GPS" profilename="car" enabled="yes" active="1"@name="Local GPS" profilename="car" enabled="no" active="0"@' navit.xml:
         pwd: bin/navit/
-- 
cgit v1.2.1


From 9a7b5856538615b873240b36286f2527c399afa6 Mon Sep 17 00:00:00 2001
From: Pierre Grandin <grandinp@altern.org>
Date: Tue, 29 Nov 2016 23:46:54 +0000
Subject: Fixed typo in circle.yaml

---
 circle.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/circle.yml b/circle.yml
index 2041c8b0e..02a8c46ce 100644
--- a/circle.yml
+++ b/circle.yml
@@ -35,7 +35,7 @@ dependencies:
 test:
 
   override:
-    - bash
+    - bash:
         parallel: true
         files:
           - ci/build_*.sh
-- 
cgit v1.2.1


From f71f0761f326166615f1790fc90044ec14845ef8 Mon Sep 17 00:00:00 2001
From: Pierre Grandin <grandinp@altern.org>
Date: Tue, 29 Nov 2016 23:49:27 +0000
Subject: Temporarily disabled translation updates

---
 circle.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/circle.yml b/circle.yml
index 02a8c46ce..77254436e 100644
--- a/circle.yml
+++ b/circle.yml
@@ -14,9 +14,9 @@ dependencies:
     - sudo apt-get update
     - bash ci/update_version.sh prepare
 #    - bash ci/build_linux.sh
-    - sed -i '/INTEGER/d' bin/po/navit.pot
-    - cp bin/po/navit.pot $CIRCLE_ARTIFACTS/
-    - "[ $CIRCLE_PROJECT_USERNAME != navit-gps ] || curl \"https://translations.launchpad.net/navit/${CIRCLE_BRANCH}/+translations-upload\" -H \"$lp_cookie\" -H \"Referer: https://translations.launchpad.net/navit/${CIRCLE_BRANCH}/+translations-upload\" -F file=@bin/po/navit.pot | grep title"
+#     - sed -i '/INTEGER/d' bin/po/navit.pot
+#     - cp bin/po/navit.pot $CIRCLE_ARTIFACTS/
+#     - "[ $CIRCLE_PROJECT_USERNAME != navit-gps ] || curl \"https://translations.launchpad.net/navit/${CIRCLE_BRANCH}/+translations-upload\" -H \"$lp_cookie\" -H \"Referer: https://translations.launchpad.net/navit/${CIRCLE_BRANCH}/+translations-upload\" -F file=@bin/po/navit.pot | grep title"
 # Android build    
     - sudo apt-get install gettext
     - sudo apt-get install libsaxonb-java
-- 
cgit v1.2.1


From 34adb1e9e9148d559ba01bfec90028d10a8cf00b Mon Sep 17 00:00:00 2001
From: Pierre Grandin <grandinp@altern.org>
Date: Tue, 29 Nov 2016 23:55:48 +0000
Subject: Fixed libpng version check

---
 ci/build_tomtom_minimal.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ci/build_tomtom_minimal.sh b/ci/build_tomtom_minimal.sh
index ddc3d35e4..6a8582be1 100644
--- a/ci/build_tomtom_minimal.sh
+++ b/ci/build_tomtom_minimal.sh
@@ -40,7 +40,7 @@ if ! [ -e "~/tomtom_assets/toolchain_redhat_gcc-3.3.4_glibc-2.3.2-20060131a.tar.
   wget -nv -c http://www.tomtom.com/gpl/toolchain_redhat_gcc-3.3.4_glibc-2.3.2-20060131a.tar.gz -P ~/tomtom_assets
 fi
 
-if ! test -f "~/tomtom_assets/libpng-1.6.25.tar.gz"
+if ! test -f "~/tomtom_assets/libpng-1.6.26.tar.gz"
  then 
   wget -nv -c ftp://ftp.simplesystems.org/pub/libpng/png/src/libpng16/libpng-1.6.26.tar.gz -P ~/tomtom_assets
 fi
-- 
cgit v1.2.1


From 3e0ab9c6a4d67e9cff9b374dfed588f1fc9f848e Mon Sep 17 00:00:00 2001
From: Pierre Grandin <grandinp@altern.org>
Date: Tue, 29 Nov 2016 23:58:11 +0000
Subject: Bumped libpng version to 1.6.26

---
 ci/build_tomtom_plugin.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/ci/build_tomtom_plugin.sh b/ci/build_tomtom_plugin.sh
index 93dcce3dd..3080b39c1 100644
--- a/ci/build_tomtom_plugin.sh
+++ b/ci/build_tomtom_plugin.sh
@@ -39,9 +39,9 @@ if ! [ -e "~/tomtom_assets/toolchain_redhat_gcc-3.3.4_glibc-2.3.2-20060131a.tar.
   wget -c http://www.tomtom.com/gpl/toolchain_redhat_gcc-3.3.4_glibc-2.3.2-20060131a.tar.gz -P ~/tomtom_assets
 fi
 
-if ! test -f "~/tomtom_assets/libpng-1.6.25.tar.gz"
+if ! test -f "~/tomtom_assets/libpng-1.6.26.tar.gz"
 then 
-  wget -c ftp://ftp.simplesystems.org/pub/libpng/png/src/libpng16/libpng-1.6.25.tar.gz -P ~/tomtom_assets
+  wget -c ftp://ftp.simplesystems.org/pub/libpng/png/src/libpng16/libpng-1.6.26.tar.gz -P ~/tomtom_assets
 fi
 
 # toolchain
@@ -195,8 +195,8 @@ make install
 
 # libpng
 cd /tmp/
-tar xzf ~/tomtom_assets/libpng-1.6.25.tar.gz
-cd libpng-1.6.25/ 
+tar xzf ~/tomtom_assets/libpng-1.6.26.tar.gz
+cd libpng-1.6.26/ 
 ./configure --prefix=$PREFIX --host=$ARCH
 make -j$JOBS
 make install
-- 
cgit v1.2.1


From f465d60395566620c7d2694925006936b844d8e4 Mon Sep 17 00:00:00 2001
From: Pierre Grandin <grandinp@altern.org>
Date: Wed, 30 Nov 2016 00:51:54 +0000
Subject: Fixing dbus tests dependencies

---
 circle.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/circle.yml b/circle.yml
index 77254436e..da8ddec40 100644
--- a/circle.yml
+++ b/circle.yml
@@ -28,8 +28,10 @@ dependencies:
     - sudo apt-get install mingw32 mingw32-binutils mingw32-runtime
     - sudo apt-get install default-jdk nsis
 # For python testing with junit reporting
-    - sudo pip install junit-xml
-    - sudo apt-get install python-dbus
+    - sudo apt-get install python-gobject
+    - sudo pip install junit-xml dbus-python
+    - ln -s /usr/lib/python2.7/dist-packages/gobject /opt/circleci/python/2.7.11/lib/python2.7/site-packages/
+    - ln -s /usr/lib/python2.7/dist-packages/glib /opt/circleci/python/2.7.11/lib/python2.7/site-packages/
 #
     - ls -la $CIRCLE_ARTIFACTS
 test:
-- 
cgit v1.2.1


From a1d7e1f610138523ef714557564abdf3518337aa Mon Sep 17 00:00:00 2001
From: Pierre Grandin <grandinp@altern.org>
Date: Wed, 30 Nov 2016 01:01:50 +0000
Subject: Ensures that libdbus-glib-1-dev is installed for tests

---
 circle.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/circle.yml b/circle.yml
index da8ddec40..0b225e56d 100644
--- a/circle.yml
+++ b/circle.yml
@@ -28,7 +28,7 @@ dependencies:
     - sudo apt-get install mingw32 mingw32-binutils mingw32-runtime
     - sudo apt-get install default-jdk nsis
 # For python testing with junit reporting
-    - sudo apt-get install python-gobject
+    - sudo apt-get install python-gobject libdbus-glib-1-dev
     - sudo pip install junit-xml dbus-python
     - ln -s /usr/lib/python2.7/dist-packages/gobject /opt/circleci/python/2.7.11/lib/python2.7/site-packages/
     - ln -s /usr/lib/python2.7/dist-packages/glib /opt/circleci/python/2.7.11/lib/python2.7/site-packages/
-- 
cgit v1.2.1


From a889d7c53d612d1762d5f896cfd232db2036dcc3 Mon Sep 17 00:00:00 2001
From: Pierre Grandin <grandinp@altern.org>
Date: Wed, 30 Nov 2016 01:06:40 +0000
Subject: Ensures that python-dev is installed for tests

---
 circle.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/circle.yml b/circle.yml
index 0b225e56d..ac710bd43 100644
--- a/circle.yml
+++ b/circle.yml
@@ -28,7 +28,7 @@ dependencies:
     - sudo apt-get install mingw32 mingw32-binutils mingw32-runtime
     - sudo apt-get install default-jdk nsis
 # For python testing with junit reporting
-    - sudo apt-get install python-gobject libdbus-glib-1-dev
+    - sudo apt-get install python-gobject libdbus-glib-1-dev python-dev
     - sudo pip install junit-xml dbus-python
     - ln -s /usr/lib/python2.7/dist-packages/gobject /opt/circleci/python/2.7.11/lib/python2.7/site-packages/
     - ln -s /usr/lib/python2.7/dist-packages/glib /opt/circleci/python/2.7.11/lib/python2.7/site-packages/
-- 
cgit v1.2.1


From 6ee5e17b2523b49be9254827e98e46564d938342 Mon Sep 17 00:00:00 2001
From: Pierre Grandin <grandinp@altern.org>
Date: Wed, 30 Nov 2016 02:40:51 +0000
Subject: Install ndk only when needed

---
 ci/build_android.sh | 3 +++
 circle.yml          | 4 ----
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/ci/build_android.sh b/ci/build_android.sh
index 5c3542b25..650c9808e 100644
--- a/ci/build_android.sh
+++ b/ci/build_android.sh
@@ -4,6 +4,9 @@ grn='\e[0;32m'
 yel='\e[1;33m'
 off='\e[0m'
 
+wget -nv -c wget http://dl.google.com/android/repository/android-ndk-r13-linux-x86_64.zip
+unzip -d ~ android-ndk-r13-linux-x86_64.zip
+
 # setup var's to perform environment setup and cmake
 export START_PATH=~/
 export SOURCE_PATH=$START_PATH"/"${CIRCLE_PROJECT_REPONAME}"/"
diff --git a/circle.yml b/circle.yml
index ac710bd43..5a020f455 100644
--- a/circle.yml
+++ b/circle.yml
@@ -23,10 +23,6 @@ dependencies:
 # for aapt
     - sudo apt-get install lib32stdc++6
     - sudo apt-get install lib32z1
-    - wget http://dl.google.com/android/repository/android-ndk-r13-linux-x86_64.zip && unzip -d ~ android-ndk-r13-linux-x86_64.zip
-# Windows build
-    - sudo apt-get install mingw32 mingw32-binutils mingw32-runtime
-    - sudo apt-get install default-jdk nsis
 # For python testing with junit reporting
     - sudo apt-get install python-gobject libdbus-glib-1-dev python-dev
     - sudo pip install junit-xml dbus-python
-- 
cgit v1.2.1


From a7187c5adbc8cd552fa890cb693b921eaa7ca1d5 Mon Sep 17 00:00:00 2001
From: Pierre Grandin <grandinp@altern.org>
Date: Wed, 30 Nov 2016 02:53:41 +0000
Subject: Install junit-xml dbus-python in the user's env

---
 circle.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/circle.yml b/circle.yml
index 5a020f455..e6fdc993d 100644
--- a/circle.yml
+++ b/circle.yml
@@ -25,7 +25,7 @@ dependencies:
     - sudo apt-get install lib32z1
 # For python testing with junit reporting
     - sudo apt-get install python-gobject libdbus-glib-1-dev python-dev
-    - sudo pip install junit-xml dbus-python
+    - pip install junit-xml dbus-python
     - ln -s /usr/lib/python2.7/dist-packages/gobject /opt/circleci/python/2.7.11/lib/python2.7/site-packages/
     - ln -s /usr/lib/python2.7/dist-packages/glib /opt/circleci/python/2.7.11/lib/python2.7/site-packages/
 #
-- 
cgit v1.2.1


From 58894b51f744a7ddb3410ebfdce0942bc2c98f27 Mon Sep 17 00:00:00 2001
From: Pierre Grandin <grandinp@altern.org>
Date: Wed, 30 Nov 2016 03:19:36 +0000
Subject: Moved win32 dependencies to the build script

---
 ci/build_win32.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ci/build_win32.sh b/ci/build_win32.sh
index 8a84ca5d6..de5156843 100644
--- a/ci/build_win32.sh
+++ b/ci/build_win32.sh
@@ -1,3 +1,5 @@
+sudo apt-get install mingw32 mingw32-binutils mingw32-runtime default-jdk nsis
+
 mkdir win32
 pushd win32
 cmake -Dbinding/python:BOOL=FALSE -DSAMPLE_MAP=n -DCMAKE_TOOLCHAIN_FILE=../Toolchain/mingw32.cmake ../ && make && make package
-- 
cgit v1.2.1


From 2f2c51614cb96d3ff31b2bea9f4811de283373c3 Mon Sep 17 00:00:00 2001
From: Pierre Grandin <grandinp@altern.org>
Date: Wed, 30 Nov 2016 03:39:00 +0000
Subject: Ensure that we build all targets in 4 containers

---
 circle.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/circle.yml b/circle.yml
index e6fdc993d..f8fcd7650 100644
--- a/circle.yml
+++ b/circle.yml
@@ -33,7 +33,7 @@ dependencies:
 test:
 
   override:
-    - bash:
+    - bash ci/build.sh:
         parallel: true
         files:
           - ci/build_*.sh
-- 
cgit v1.2.1


From c510977a01862f29629e3ee3c8dc133324293929 Mon Sep 17 00:00:00 2001
From: Pierre Grandin <grandinp@altern.org>
Date: Wed, 30 Nov 2016 03:46:06 +0000
Subject: Ensure that we build all targets in 4 containers

---
 ci/build.sh | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 ci/build.sh

diff --git a/ci/build.sh b/ci/build.sh
new file mode 100644
index 000000000..7f8f46279
--- /dev/null
+++ b/ci/build.sh
@@ -0,0 +1,7 @@
+echo "$# build script (s) to run"
+
+for i in $(seq 1 $#); do
+	eval s=\$$i
+	echo "Starting build script #$i : $s"
+	bash -e $s
+done
-- 
cgit v1.2.1


From 5736d23d91fd3d2b921bec31758b0f03a3519204 Mon Sep 17 00:00:00 2001
From: Pierre Grandin <grandinp@altern.org>
Date: Wed, 30 Nov 2016 18:18:07 +0000
Subject: Fixed typo in build_android.sh

---
 ci/build_android.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ci/build_android.sh b/ci/build_android.sh
index 650c9808e..04ff64fa7 100644
--- a/ci/build_android.sh
+++ b/ci/build_android.sh
@@ -4,7 +4,7 @@ grn='\e[0;32m'
 yel='\e[1;33m'
 off='\e[0m'
 
-wget -nv -c wget http://dl.google.com/android/repository/android-ndk-r13-linux-x86_64.zip
+wget -nv -c http://dl.google.com/android/repository/android-ndk-r13-linux-x86_64.zip
 unzip -d ~ android-ndk-r13-linux-x86_64.zip
 
 # setup var's to perform environment setup and cmake
-- 
cgit v1.2.1


From ccdd226410d955b0571650e3841f05c21ba45517 Mon Sep 17 00:00:00 2001
From: Pierre Grandin <grandinp@altern.org>
Date: Wed, 30 Nov 2016 19:39:39 +0000
Subject: Reworking android build scripts

---
 ci/build_android.sh     | 4 ++--
 ci/build_android_x86.sh | 9 +++++++--
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/ci/build_android.sh b/ci/build_android.sh
index 04ff64fa7..a0a4659c8 100644
--- a/ci/build_android.sh
+++ b/ci/build_android.sh
@@ -5,7 +5,7 @@ yel='\e[1;33m'
 off='\e[0m'
 
 wget -nv -c http://dl.google.com/android/repository/android-ndk-r13-linux-x86_64.zip
-unzip -d ~ android-ndk-r13-linux-x86_64.zip
+unzip -q -d ~ android-ndk-r13-linux-x86_64.zip
 
 # setup var's to perform environment setup and cmake
 export START_PATH=~/
@@ -42,7 +42,7 @@ else
   echo
 fi
 
-mkdir -p $BUILD_PATH
+[ -d $BUILD_PATH ] || mkdir -p $BUILD_PATH
 cd $BUILD_PATH
 export PATH=$ANDROID_NDK_BIN:$ANDROID_SDK_TOOLS:$ANDROID_SDK_PLATFORM_TOOLS:$PATH
 android list targets
diff --git a/ci/build_android_x86.sh b/ci/build_android_x86.sh
index 6eea4c7bb..022b7f5af 100644
--- a/ci/build_android_x86.sh
+++ b/ci/build_android_x86.sh
@@ -6,12 +6,17 @@ export ANDROID_NDK_BIN=$ANDROID_NDK"/toolchains/x86-4.9/prebuilt/linux-x86_64/bi
 export ANDROID_SDK="/usr/local/android-sdk-linux/"
 export ANDROID_SDK_PLATFORM_TOOLS=$ANDROID_SDK"/platform-tools"
 export PATH=$ANDROID_NDK_BIN:$ANDROID_SDK_PLATFORM_TOOLS:$PATH
+export BUILD_PATH=$START_PATH"/android-x86"
 
-mkdir android-x86 && cd android-x86
+wget -nv -c http://dl.google.com/android/repository/android-ndk-r13-linux-x86_64.zip
+unzip -q -d ~ android-ndk-r13-linux-x86_64.zip
+
+[ -d $BUILD_PATH ] || mkdir -p $BUILD_PATH
+cd $BUILD_PATH
 
 android list targets
 
-cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_FILE -DAVOID_FLOAT=1 -DSAMPLE_MAP=n -DBUILD_MAPTOOL=n -DANDROID_API_VERSION=23 -DANDROID_NDK_API_VERSION=19 -DDISABLE_CXX=1 -DDISABLE_QT=1 ../ || exit -1
+cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_FILE -DAVOID_FLOAT=1 -DSAMPLE_MAP=n -DBUILD_MAPTOOL=n -DANDROID_API_VERSION=23 -DANDROID_NDK_API_VERSION=19 -DDISABLE_CXX=1 -DDISABLE_QT=1 $SOURCE_PATH || exit -1
 make || exit -1
 
 if [[ "${CIRCLE_BRANCH}" == "master" ]]; then
-- 
cgit v1.2.1


From 589056c1b82569afd55312a15deda13f1c38d7da Mon Sep 17 00:00:00 2001
From: Pierre Grandin <grandinp@altern.org>
Date: Wed, 30 Nov 2016 20:07:09 +0000
Subject: Only setup coverity when needed

---
 ci/build_linux.sh | 1 +
 circle.yml        | 3 ---
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/ci/build_linux.sh b/ci/build_linux.sh
index 8c3ca1b9b..d15ba965a 100644
--- a/ci/build_linux.sh
+++ b/ci/build_linux.sh
@@ -1,6 +1,7 @@
 sudo apt-get install cmake libpng12-dev librsvg2-bin libfreetype6-dev libdbus-glib-1-dev g++ libgtk2.0-dev
 
 if [[ "${CIRCLE_PROJECT_USERNAME}" == "navit-gps" && "${CIRCLE_BRANCH}" == "trunk" ]]; then
+	wget -nv -c -O ~/assets/cov-analysis-linux64-7.6.0.tar.gz http://sd-55475.dedibox.fr/cov-analysis-linux64-7.6.0.tar.gz
 	tar xfz ~/assets/cov-analysis-linux64-7.6.0.tar.gz
 	export PATH=~/navit/cov-analysis-linux64-7.6.0/bin:$PATH
 	
diff --git a/circle.yml b/circle.yml
index f8fcd7650..d62805e54 100644
--- a/circle.yml
+++ b/circle.yml
@@ -10,7 +10,6 @@ dependencies:
   pre:
     - "[ -d ~/assets ] || mkdir ~/assets"
     - "[ -d ~/android ] || mkdir ~/android"
-    - wget -c -O ~/assets/cov-analysis-linux64-7.6.0.tar.gz http://sd-55475.dedibox.fr/cov-analysis-linux64-7.6.0.tar.gz
     - sudo apt-get update
     - bash ci/update_version.sh prepare
 #    - bash ci/build_linux.sh
@@ -28,8 +27,6 @@ dependencies:
     - pip install junit-xml dbus-python
     - ln -s /usr/lib/python2.7/dist-packages/gobject /opt/circleci/python/2.7.11/lib/python2.7/site-packages/
     - ln -s /usr/lib/python2.7/dist-packages/glib /opt/circleci/python/2.7.11/lib/python2.7/site-packages/
-#
-    - ls -la $CIRCLE_ARTIFACTS
 test:
 
   override:
-- 
cgit v1.2.1


From 58985225ba09cd8fb77a7f51ec225536c6070e1c Mon Sep 17 00:00:00 2001
From: Pierre Grandin <grandinp@altern.org>
Date: Wed, 30 Nov 2016 22:06:12 +0000
Subject: Process translation template update as part of the linux build

---
 ci/build_linux.sh | 13 +++++++++++--
 circle.yml        |  4 ----
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/ci/build_linux.sh b/ci/build_linux.sh
index 1e8560b8b..3a28eb037 100644
--- a/ci/build_linux.sh
+++ b/ci/build_linux.sh
@@ -1,12 +1,15 @@
 sudo apt-get install cmake libpng12-dev librsvg2-bin libfreetype6-dev libdbus-glib-1-dev g++ libgtk2.0-dev
 
+cmake_opts="-Dgraphics/qt_qpainter:BOOL=FALSE -Dgui/qml:BOOL=FALSE -DSVG2PNG:BOOL=FALSE -DSAMPLE_MAP=n -Dgraphics/gtk_drawing_area:BOOL=TRUE"
+
 if [[ "${CIRCLE_PROJECT_USERNAME}" == "navit-gps" && "${CIRCLE_BRANCH}" == "trunk" ]]; then
+	# If we are building the official trunk code, push an update to coverity
 	wget -nv -c -O ~/assets/cov-analysis-linux64-7.6.0.tar.gz http://sd-55475.dedibox.fr/cov-analysis-linux64-7.6.0.tar.gz
 	tar xfz ~/assets/cov-analysis-linux64-7.6.0.tar.gz
 	export PATH=~/navit/cov-analysis-linux64-7.6.0/bin:$PATH
 	
 	mkdir bin && cd bin
-	cov-build --dir cov-int cmake ../ -Dgraphics/qt_qpainter:BOOL=FALSE -Dgui/qml:BOOL=FALSE -DSVG2PNG:BOOL=FALSE
+	cov-build --dir cov-int cmake ../ ${cmake_opts}
 	cov-build --dir cov-int make || exit -1
 	tar czvf navit.tgz cov-int
 	
@@ -16,9 +19,15 @@ if [[ "${CIRCLE_PROJECT_USERNAME}" == "navit-gps" && "${CIRCLE_BRANCH}" == "trun
   --form version="${CIRCLE_BRANCH}-$CIRCLE_SHA1" \
   --form description="${CIRCLE_BRANCH}-$CIRCLE_SHA1" \
   https://scan.coverity.com/builds?project=$CIRCLE_PROJECT_USERNAME
+
+	# Then update the translation template on launchpad
+	sed -i '/INTEGER/d' bin/po/navit.pot
+	cp bin/po/navit.pot $CIRCLE_ARTIFACTS/
+	curl "https://translations.launchpad.net/navit/${CIRCLE_BRANCH}/+translations-upload" -H "$lp_cookie" -H "Referer: https://translations.launchpad.net/navit/${CIRCLE_BRANCH}/+translations-upload" -F file=@bin/po/navit.pot | grep title
+
 else
 	mkdir bin && cd bin
-	cmake ../ -Dgraphics/qt_qpainter:BOOL=FALSE -Dgui/qml:BOOL=FALSE -DSVG2PNG:BOOL=FALSE -DSAMPLE_MAP=n -Dgraphics/gtk_drawing_area:BOOL=TRUE|| exit -1
+	cmake ../ ${cmake_opts} || exit -1
 	make  || exit -1
 fi
 
diff --git a/circle.yml b/circle.yml
index d62805e54..04470f87e 100644
--- a/circle.yml
+++ b/circle.yml
@@ -12,10 +12,6 @@ dependencies:
     - "[ -d ~/android ] || mkdir ~/android"
     - sudo apt-get update
     - bash ci/update_version.sh prepare
-#    - bash ci/build_linux.sh
-#     - sed -i '/INTEGER/d' bin/po/navit.pot
-#     - cp bin/po/navit.pot $CIRCLE_ARTIFACTS/
-#     - "[ $CIRCLE_PROJECT_USERNAME != navit-gps ] || curl \"https://translations.launchpad.net/navit/${CIRCLE_BRANCH}/+translations-upload\" -H \"$lp_cookie\" -H \"Referer: https://translations.launchpad.net/navit/${CIRCLE_BRANCH}/+translations-upload\" -F file=@bin/po/navit.pot | grep title"
 # Android build    
     - sudo apt-get install gettext
     - sudo apt-get install libsaxonb-java
-- 
cgit v1.2.1