Fixing the tomtom plugin build for CI v2

3 files changed, 18 insertions, 129 deletions

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 593b62806..b5c9f8541 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -40,7 +40,7 @@ jobs:
           command: |
             bash ci/setup_common_requirements.sh
             bash ci/build_win32.sh
-  build_tomtom:
+  build_tomtom_minimal:
     <<: *defaults
     steps:
       - checkout
@@ -53,7 +53,7 @@ jobs:
           command: |
             bash ci/setup_tomtom_requirements.sh
       - run:
-          name: Build for Tomtom
+          name: Build for Tomtom (minimal)
           command: |
             bash ci/build_tomtom_minimal.sh
       - store_artifacts:
@@ -63,10 +63,19 @@ jobs:
     steps:
       - checkout
       - run:
-          name: Build for Tomtom as a plugin
+          name: Setup common requirements
           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
 
 workflows:
   version: 2
diff --git a/ci/build_tomtom_plugin.sh b/ci/build_tomtom_plugin.sh
index 08966ddb7..5b27d74d7 100644
--- a/ci/build_tomtom_plugin.sh
+++ b/ci/build_tomtom_plugin.sh
@@ -32,23 +32,6 @@ JOBS=$(nproc --all)
 echo "Jobs"
 echo $JOBS
 
-mkdir -p ~/tomtom_assets
-
-if ! [ -e "~/tomtom_assets/toolchain_redhat_gcc-3.3.4_glibc-2.3.2-20060131a.tar.gz" ]
- then 
-  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 ~/tomtom_assets
-fi
-
-if ! test -f "~/tomtom_assets/libpng-1.6.29.tar.gz"
-then 
-  wget -nv -c https://github.com/navit-gps/dependencies/raw/master/tomtom/libpng-1.6.29.tar.gz -P ~/tomtom_assets
-fi
-
-# toolchain
-cd /tmp
-mkdir -p $TOMTOM_SDK_DIR
-tar xzf ~/tomtom_assets/toolchain_redhat_gcc-3.3.4_glibc-2.3.2-20060131a.tar.gz -C $TOMTOM_SDK_DIR
-
 # espeak
 cd /tmp
 # this one includes the precompiled voices
@@ -175,115 +158,6 @@ int  main(int argc, char *argv[],char *envp[])
 EOF
 arm-linux-gcc -O2 -I$PREFIX/include -I$PREFIX/usr/include espeakdsp.c -o espeakdsp
 
-# zlib
-cd /tmp
-wget -nv -c http://zlib.net/zlib-1.2.11.tar.gz
-tar xzf zlib-1.2.11.tar.gz
-cd zlib-1.2.11
-./configure --prefix=$PREFIX
-make -j$JOBS
-make install
-
-# libxml
-cd /tmp/
-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
-make -j$JOBS
-make install
-
-# libpng
-cd /tmp/
-tar xzf ~/tomtom_assets/libpng-1.6.29.tar.gz
-cd libpng-1.6.29/ 
-./configure --prefix=$PREFIX --host=$ARCH
-make -j$JOBS
-make install
-
-
-cd /tmp
-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
-make -j$JOBS
-make install
-
-freetype-config --cflags
-
-# glib
-cd /tmp
-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
-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
-EOF
-chmod a-w 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 -j$JOBS
-make install
-
-
-# tslib
-cd /tmp
-rm -rf tslib-svn
-git clone https://github.com/playya/tslib-svn.git
-cd 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 # tomtom go 710
-./autogen.sh
-./configure --prefix=$PREFIX --host=$ARCH
-make -j$JOBS
-make install
-
-
-cd /tmp
-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 -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 -j$JOBS
-make install
-
-# sdl test utilities
-cd test
-./configure --prefix=$PREFIX --host=$ARCH
-make testvidinfo
-cp testvidinfo $PREFIX/usr/bin/
-
-# to find sdl-config
-export PATH=$PREFIX/bin:$PATH
-
-# sdl image
-cd /tmp
-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
-make -j$JOBS
-make install
-
-
-# in the end we only want Navit locale
-rm -r $PREFIX/share/locale
-
 cat > ~/navit/navit/icons/tomtom_minus.svg << EOF
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
diff --git a/ci/setup_tomtom_requirements.sh b/ci/setup_tomtom_requirements.sh
index 9e2208758..00bd33c44 100644
--- a/ci/setup_tomtom_requirements.sh
+++ b/ci/setup_tomtom_requirements.sh
@@ -143,6 +143,12 @@ patch -p0 -i sdl-fbcon-notty.patch
 make -j$JOBS
 make install
 
+# sdl test utilities
+cd test
+./configure --prefix=$PREFIX --host=$ARCH
+make testvidinfo
+cp testvidinfo $PREFIX/usr/bin/
+
 # to find sdl-config
 export PATH=$PREFIX/bin:$PATH