Coverity upgrade (#313)

* Switching to a pre-built image to build Tomtom builds

* Archive less artifacts for Tomtom builds

* Ensures that the /output directory for build artefacts exists

* Updated coverity tools version

* Run coverity report for the coverity_upgrade branch

* Fixed potential path issues

* Fixed coverity path issues for ci v2

* Fixed tar permission issues for ci v2

* Ensures that curl is installed, needed for coverity

* Run coverity builds only for trunk

8 files changed, 140 insertions, 19 deletions

diff --git a/.circleci/config.yml b/.circleci/config.yml
index ca49945be..8a5161cf7 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -60,6 +60,8 @@ jobs:
             bash ci/build_win32.sh
   build_tomtom_minimal:
     <<: *defaults
+    docker:
+      - image: navit/tomtom-build-image
     steps:
       - checkout
       - run:
@@ -67,17 +69,15 @@ jobs:
           command: |
             bash ci/setup_common_requirements.sh
       - run:
-          name: Build the Tomtom toolchain
-          command: |
-            bash ci/setup_tomtom_requirements.sh
-      - run:
           name: Build for Tomtom (minimal)
           command: |
             bash ci/build_tomtom_minimal.sh
       - store_artifacts:
-          path: /tmp/tomtom/sdcard
+          path: /output
   build_tomtom_plugin:
     <<: *defaults
+    docker:
+      - image: navit/tomtom-build-image
     steps:
       - checkout
       - run:
@@ -85,15 +85,11 @@ jobs:
           command: |
             bash ci/setup_common_requirements.sh
       - run:
-          name: Build the Tomtom toolchain
-          command: |
-            bash ci/setup_tomtom_requirements.sh
-      - run:
           name: Build for Tomtom (plugin)
           command: |
             bash ci/build_tomtom_plugin.sh
       - store_artifacts:
-          path: /tmp/tomtom/sdcard
+          path: /output
 
 workflows:
   version: 2
diff --git a/ci/build_linux.sh b/ci/build_linux.sh
index 061ebd019..14abb7597 100644
--- a/ci/build_linux.sh
+++ b/ci/build_linux.sh
@@ -1,17 +1,20 @@
 set -e
 
-apt-get install -y libpng12-dev librsvg2-bin libfreetype6-dev libdbus-glib-1-dev libgtk2.0-dev
+COVERITY_VERSION="2017.07"
+
+apt-get install -y libpng12-dev librsvg2-bin libfreetype6-dev libdbus-glib-1-dev libgtk2.0-dev curl
 
 cmake_opts="-Dgraphics/qt_qpainter:BOOL=FALSE -Dgui/qml:BOOL=FALSE -DSVG2PNG:BOOL=FALSE -DSAMPLE_MAP=n -Dgraphics/gtk_drawing_area:BOOL=TRUE"
 
+mkdir ${CIRCLE_WORKING_DIRECTORY}/linux-bin && cd ${CIRCLE_WORKING_DIRECTORY}/linux-bin
+
 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
+	wget -nv -c -O /tmp/cov-analysis-linux64-${COVERITY_VERSION}.tar.gz http://sd-55475.dedibox.fr/cov-analysis-linux64-${COVERITY_VERSION}.tar.gz
+	tar xfz /tmp/cov-analysis-linux64-${COVERITY_VERSION}.tar.gz --no-same-owner -C /usr/local/share/
+	export PATH=/usr/local/share/cov-analysis-linux64-${COVERITY_VERSION}/bin:$PATH
 	
-	mkdir ~/linux-bin && cd ~/linux-bin
-	cov-build --dir cov-int cmake ~/${CIRCLE_PROJECT_REPONAME}/ ${cmake_opts}
+	cov-build --dir cov-int cmake ${CIRCLE_WORKING_DIRECTORY}/ ${cmake_opts}
 	cov-build --dir cov-int make -j $(nproc --all) || exit -1
 	tar czvf navit.tgz cov-int
 	
@@ -28,7 +31,6 @@ if [[ "${CIRCLE_PROJECT_USERNAME}" == "navit-gps" && "${CIRCLE_BRANCH}" == "trun
 	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=@po/navit.pot | grep title
 
 else
-	mkdir ${CIRCLE_WORKING_DIRECTORY}/linux-bin && cd ${CIRCLE_WORKING_DIRECTORY}/linux-bin
 	cmake ${CIRCLE_WORKING_DIRECTORY}/ ${cmake_opts} || exit -1
 	make -j $(nproc --all) || exit -1
 fi
diff --git a/ci/build_tomtom_minimal.sh b/ci/build_tomtom_minimal.sh
index 6af14fe5d..a178b9733 100644
--- a/ci/build_tomtom_minimal.sh
+++ b/ci/build_tomtom_minimal.sh
@@ -65,4 +65,5 @@ cp -r $PREFIX/share/locale $OUT_PATH/navit/share/locale
 
 
 cd $OUT_PATH
-zip -r navitom_minimal.zip navit
+mkdir /output
+zip -r /output/navitom_minimal.zip navit
diff --git a/ci/build_tomtom_plugin.sh b/ci/build_tomtom_plugin.sh
index 98346e903..51a15f815 100644
--- a/ci/build_tomtom_plugin.sh
+++ b/ci/build_tomtom_plugin.sh
@@ -136,4 +136,5 @@ convert -background none ../navit/icons/tomtom_minus.svg -resize 80x80 $OUT_PATH
 
 
 cd $OUT_PATH
-zip -r $CIRCLE_ARTIFACTS/navitom.zip navit SDKRegistry
+mkdir /output
+zip -r /output/navitom_plugin.zip navit SDKRegistry ts
diff --git a/ci/docker/tomtom/Dockerfile b/ci/docker/tomtom/Dockerfile
new file mode 100644
index 000000000..adddbdbf8
--- /dev/null
+++ b/ci/docker/tomtom/Dockerfile
@@ -0,0 +1,106 @@
+FROM ubuntu:14.04
+
+RUN apt-get update  && apt-get install -y libglib2.0-dev git autogen autoconf libtool imagemagick zip \
+	wget build-essential gettext cmake \
+	&& apt-get clean && apt-get autoremove && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+RUN dpkg --add-architecture i386 && apt-get update \
+	&& apt-get install -y libc6:i386 libncurses5:i386 libstdc++6:i386 \
+	&& apt-get clean && apt-get autoremove && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+
+ENV ARCH=arm-linux
+ENV TOMTOM_SDK_DIR=/opt/tomtom-sdk
+ENV PREFIX=$TOMTOM_SDK_DIR/gcc-3.3.4_glibc-2.3.2/$ARCH/sys-root
+ENV PATH=$TOMTOM_SDK_DIR/gcc-3.3.4_glibc-2.3.2/bin:$PREFIX/bin/:$PATH
+ENV CFLAGS="-O2 -I$PREFIX/include -I$PREFIX/usr/include"
+ENV CPPFLAGS="-I$PREFIX/include -I$PREFIX/usr/include"
+ENV LDFLAGS="-L$PREFIX/lib -L$PREFIX/usr/lib"
+ENV CC=$ARCH-gcc
+ENV CXX=$ARCH-g++
+ENV LD=$ARCH-ld
+ENV NM="$ARCH-nm -B"
+ENV AR=$ARCH-ar
+ENV RANLIB=$ARCH-ranlib
+ENV STRIP=$ARCH-strip
+ENV OBJCOPY=$ARCH-objcopy
+ENV LN_S="ln -s"
+ENV PKG_CONFIG_LIBDIR=$PREFIX/lib/pkgconfig
+RUN mkdir -p $TOMTOM_SDK_DIR
+
+RUN wget -nv -c https://github.com/navit-gps/dependencies/raw/master/tomtom/toolchain_redhat_gcc-3.3.4_glibc-2.3.2-20060131a.tar.gz -P /tmp \
+	&& tar xzf /tmp/toolchain_redhat_gcc-3.3.4_glibc-2.3.2-20060131a.tar.gz -C $TOMTOM_SDK_DIR \
+	&& rm /tmp/toolchain_redhat_gcc-3.3.4_glibc-2.3.2-20060131a.tar.gz
+
+# zlib
+RUN wget -nv -c http://zlib.net/zlib-1.2.11.tar.gz -P /tmp && cd /tmp/ \
+	&& tar xzf zlib-1.2.11.tar.gz && cd zlib-1.2.11 \
+	&& ./configure --prefix=$PREFIX && make && make install \
+	&& rm -rf /tmp/zlib-1.2.11 /tmp/zlib-1.2.11.tar.gz
+
+# libxml
+RUN  wget -nv -c http://xmlsoft.org/sources/libxml2-2.7.8.tar.gz -P /tmp && cd /tmp/ \
+	&& tar xzf libxml2-2.7.8.tar.gz && cd libxml2-2.7.8/ \
+	&& ./configure --prefix=$PREFIX --host=$ARCH --without-python && make && make install \
+	&& rm -rf /tmp/libxml2-2.7.8/ /tmp/libxml2-2.7.8.tar.gz
+
+# libpng
+RUN wget -nv -c https://github.com/navit-gps/dependencies/raw/master/tomtom/libpng-1.6.29.tar.gz -P /tmp && cd /tmp/ \
+	&& tar xzf libpng-1.6.29.tar.gz && cd libpng-1.6.29/ \
+	&& ./configure --prefix=$PREFIX --host=$ARCH  && make && make install \
+	&& rm -rf /tmp/libpng-1.6.29/ /tmp/libpng-1.6.29.tar.gz
+
+# Freetype
+RUN wget -nv -c http://download.savannah.gnu.org/releases/freetype/freetype-2.5.0.tar.gz -P /tmp && cd /tmp/ \
+	&& tar xzf freetype-2.5.0.tar.gz && cd freetype-2.5.0 \
+	&& ./configure --prefix=$PREFIX --host=$ARCH &&  make && make install \
+	&& rm -rf /tmp/freetype-2.5.0 /tmp/freetype-2.5.0.tar.gz
+ 
+# freetype-config --cflags
+
+# glib
+
+# chmod a-w tomtom.cache
+COPY tomtom.cache /tmp/
+
+RUN wget -nv -c http://ftp.gnome.org/pub/gnome/sources/glib/2.25/glib-2.25.17.tar.gz -P /tmp && cd /tmp / \
+	&& tar xzf glib-2.25.17.tar.gz && cd glib-2.25.17 \
+	&& mv /tmp/tomtom.cache . \
+	&& ./configure --prefix=$PREFIX --host=$ARCH --cache-file=tomtom.cache \
+	&& sed -i "s|cp xgen-gmc gmarshal.c |cp xgen-gmc gmarshal.c \&\& sed -i \"s\|g_value_get_schar\|g_value_get_char\|g\" gmarshal.c |g" gobject/Makefile \
+	&& make && make install \
+	&& rm -rf /tmp/glib-2.25.17 /tmp/glib-2.25.17.tar.gz
+
+# tslib
+RUN git clone https://github.com/playya/tslib-svn.git /tmp/tslib-svn  && cd /tmp/tslib-svn/ \
+	&& sed -i "s|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g" configure.ac \
+	&& sed -i "119i\#ifdef EVIOCGRAB" plugins/input-raw.c \
+	&& sed -i "124i\#endif" plugins/input-raw.c \
+	&& sed -i "290i\#ifdef EVIOCGRAB" plugins/input-raw.c \
+	&& sed -i "294i\#endif" plugins/input-raw.c \
+	&& sed -i "s|# module_raw h3600|module_raw h3600|g" etc/ts.conf \
+	&& ./autogen.sh && ./configure --prefix=$PREFIX --host=$ARCH \
+	&& make && make install \
+	&& rm -rf /tmp/tslib-svn/
+
+# SDL
+RUN wget -nv -c http://www.libsdl.org/release/SDL-1.2.15.tar.gz -P /tmp && cd /tmp/ \
+	&& tar xzf SDL-1.2.15.tar.gz && cd SDL-1.2.15 \
+	&& 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 \
+	   --disable-x11-vm --disable-dga --disable-video-x11-dgamouse \
+	   --disable-video-x11-xv --disable-video-x11-xinerama --disable-video-directfb \
+	   --enable-video-fbcon --disable-audio CFLAGS="$CFLAGS -DFBCON_NOTTY" \
+	&& make && make install \
+	&& cd test && ./configure --prefix=$PREFIX --host=$ARCH \
+	&& make testvidinfo && cp testvidinfo $PREFIX/usr/bin/ \
+	&& rm -rf /tmp/SDL-1.2.15 /tmp/SDL-1.2.15.tar.gz
+
+# sdl image
+RUN wget -nv -c http://www.libsdl.org/projects/SDL_image/release/SDL_image-1.2.12.tar.gz -P /tmp/ && cd /tmp/ \
+	&& tar xzf SDL_image-1.2.12.tar.gz && cd SDL_image-1.2.12 \
+	&& ./configure --prefix=$PREFIX --host=$ARCH && make && make install \
+	&& rm -rf /tmp/SDL_image-1.2.12 /tmp/SDL_image-1.2.12.tar.gz
+
+COPY entrypoint.sh /
+CMD bash /entrypoint.sh
diff --git a/ci/docker/tomtom/README.md b/ci/docker/tomtom/README.md
new file mode 100644
index 000000000..badaf2707
--- /dev/null
+++ b/ci/docker/tomtom/README.md
@@ -0,0 +1,7 @@
+This is the code used to build the image available at https://hub.docker.com/r/navit/tomtom-build-image/
+
+If you want to build and use that image locally, you can do the following:
+docker build . -t navit/tomtom-build-image
+docker run -ti -v /tmp:/output navit/tomtom-build-image /bin/bash /entrypoint.sh
+
+The resulting build will be in your /tmp/ folder.
diff --git a/ci/docker/tomtom/entrypoint.sh b/ci/docker/tomtom/entrypoint.sh
new file mode 100644
index 000000000..e70e1cb5e
--- /dev/null
+++ b/ci/docker/tomtom/entrypoint.sh
@@ -0,0 +1,3 @@
+git clone https://github.com/navit-gps/navit.git
+cd navit
+bash ci/build_tomtom_minimal.sh
diff --git a/ci/docker/tomtom/tomtom.cache b/ci/docker/tomtom/tomtom.cache
new file mode 100644
index 000000000..ea2cb3faf
--- /dev/null
+++ b/ci/docker/tomtom/tomtom.cache
@@ -0,0 +1,5 @@
+glib_cv_long_long_format=ll
+glib_cv_stack_grows=no
+glib_cv_uscore=no
+ac_cv_func_posix_getgrgid_r=yes
+ac_cv_func_posix_getpwuid_r=yes