From 063e2c7ebdc1771de1bc7da7012ab2e2d6041540 Mon Sep 17 00:00:00 2001 From: Pierre GRANDIN Date: Tue, 5 Sep 2017 10:07:06 -0700 Subject: Upgrade to CircleCI v2 (#310) * Switching to circleci v2 * Only build for Linux for now * Sudo is not required anymore * Update before installing packages * Cope with non interactive terminals * Use ci's working_directory * Fixed typo * Disable QT5 for now * Build for more platforms * Fixed workflow definition * sudo is not required anymore * Update before installing * Install wget when building for tomtom * Revert to 14.04 base image * Install unzip for build_tomtom_* * Install wget for build_android_* * Install wget for build_android_* * Install cmake for win32 build * Install gettext for the win32 build * Install build-essential for tomtom builds * Setup common requirements * Install packages to build tt environment install packages need to build tt environment correct navit path remove arm-genmarshal which disturbing a second build run * Splitting the tomtom builds into more steps * Splitting the tomtom builds into more steps * Working on the tomtom minimal build * Fixed some paths issues for tomtom_minimal * Added missing exports for tomtom_minimal * Added missing tomtom requirements * Save the result of the tomtom_minimal build * Fixing the tomtom plugin build for CI v2 * Fixed job name misconfiguration * Use less relative paths * Fixed espeakdsp.c path * Adding tomtom assets * Removed superfluous popd * Fixed contrib path * Adding tomtom assets * Compile espeakdsp directly to the correct path * Compile espeakdsp directly to the correct path * Compile espeakdsp directly to the correct path * Recursively copy contrib/tomtom assets * Fixed tomtom specific icons path * Preparing the android ARM build for CI v2 * Adapting build path * Added missing packages for android builds * Updating android x86 scripts for ci v2 * Android-25 will require jdk-8 * Install openjdk-8 for Ubuntu 14.04 * Ensures that add-apt is available for android builds * Cope with non interactive terminals * Ensures that openjdk-7 isn't installed * Updated artifacts for ci v2 / android arm * Fixed apk path for ci_v2 * Fixed leftovers path for ci_v2 * Fixed artifacts path for android arm * Fixed typos * Fixed toolchain misconfiguration * Specify android's api/nkd api versions * Fixed apk path for ci_v2 * Store android/x86 artifacts --- contrib/tomtom/SDKRegistry/navit.cap | 7 +++++ contrib/tomtom/SDKRegistry/ts.cap | 8 +++++ contrib/tomtom/navit-wrapper | 59 ++++++++++++++++++++++++++++++++++++ contrib/tomtom/ts/ts-wrapper | 15 +++++++++ 4 files changed, 89 insertions(+) create mode 100644 contrib/tomtom/SDKRegistry/navit.cap create mode 100644 contrib/tomtom/SDKRegistry/ts.cap create mode 100755 contrib/tomtom/navit-wrapper create mode 100644 contrib/tomtom/ts/ts-wrapper (limited to 'contrib') diff --git a/contrib/tomtom/SDKRegistry/navit.cap b/contrib/tomtom/SDKRegistry/navit.cap new file mode 100644 index 000000000..d9bae49b7 --- /dev/null +++ b/contrib/tomtom/SDKRegistry/navit.cap @@ -0,0 +1,7 @@ +Version|100| +AppName|navit-wrapper| +AppPath|/mnt/sdcard/navit/bin/| +AppIconFile|navit.bmp| +AppMainTitle|Navit| +AppPort|2001| +COMMAND|CMD|hallo|navit.bmp|Navit| diff --git a/contrib/tomtom/SDKRegistry/ts.cap b/contrib/tomtom/SDKRegistry/ts.cap new file mode 100644 index 000000000..c10c831a4 --- /dev/null +++ b/contrib/tomtom/SDKRegistry/ts.cap @@ -0,0 +1,8 @@ +Version|100| +AppName|ts-wrapper| +AppPath|/mnt/sdcard/navit/ts/| +AppIconFile|| +AppMainTitle|Touchscreen| +AppPort|| +COMMAND|CMD|hallo||Touchscreen| + diff --git a/contrib/tomtom/navit-wrapper b/contrib/tomtom/navit-wrapper new file mode 100755 index 000000000..f4eadb9e0 --- /dev/null +++ b/contrib/tomtom/navit-wrapper @@ -0,0 +1,59 @@ +#!/bin/sh + +cd /mnt/sdcard/navit/bin + +# Set some paths. +export PATH=$PATH:/mnt/sdcard/navit/bin +export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/mnt/sdcard/navit/lib:/mnt/sdcard/LoquendoTTS/lib +export HOME=/mnt/sdcard/navit +export NAVIT_LIBDIR=/mnt/sdcard/navit/lib/navit +export NAVIT_SHAREDIR=/mnt/sdcard/navit/share +export NAVIT_LOCALEDIR=/mnt/sdcard/navit/share/locale + +# tslib requirements. +export TSLIB_CONSOLEDEVICE=none +export TSLIB_FBDEVICE=/dev/fb +export TSLIB_TSDEVICE=/dev/ts +export TSLIB_CALIBFILE=/mnt/sdcard/navit/ts/pointercal +export TSLIB_CONFFILE=/mnt/sdcard/navit/ts/ts.conf +export TSLIB_PLUGINDIR=/mnt/sdcard/navit/lib/ts + +# SDL requirements. +export SDL_MOUSEDRV=TSLIB +export SDL_MOUSEDEV=$TSLIB_TSDEVICE +export SDL_NOMOUSE=1 +export SDL_FBDEV=/dev/fb +export SDL_VIDEODRIVER=fbcon +export SDL_AUDIODRIVER=dsp + +# Set time zone. +export TZ="CEDT-01:00:00CEST-02:00:00,M3.4.0,M10.4.0" + +# Set language. +export LANG=en_US + +export ESPEAK_DATA_PATH=/mnt/sdcard/navit/share + +# Run Navit. +if /mnt/sdcard/navit/sdl/testvidinfo | grep 480x272 +then + /mnt/sdcard/navit/bin/navit /mnt/sdcard/navit/share/tomtom480.xml 2>/mnt/sdcard/navit/navit.log& +# tomtom320xml is not provided yet +# elif /mnt/sdcard/navit/sdl/testvidinfo | grep 320x240 +# then +# /mnt/sdcard/navit/bin/navit /mnt/sdcard/navit/share/config/tomtom320.xml 2>/mnt/sdcard/navit/navit.log& +else + exit 1 +fi + +# Kill TTN while Navit is running. +killall ttn + +while [ $? -eq 0 ] +do +echo "\0" > /dev/watchdog +sleep 10 +ps | grep -v grep | grep -v wrapper | grep navit +done + +/sbin/reboot diff --git a/contrib/tomtom/ts/ts-wrapper b/contrib/tomtom/ts/ts-wrapper new file mode 100644 index 000000000..6f8f8e2d5 --- /dev/null +++ b/contrib/tomtom/ts/ts-wrapper @@ -0,0 +1,15 @@ +#!/bin/sh + +cd /mnt/sdcard + +export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/mnt/sdcard/navit/lib + +export TSLIB_CONSOLEDEVICE=none +export TSLIB_FBDEVICE=/dev/fb +export TSLIB_TSDEVICE=/dev/ts +export TSLIB_CALIBFILE=/mnt/sdcard/navit/ts/pointercal +export TSLIB_CONFFILE=/mnt/sdcard/navit/ts/ts.conf +export TSLIB_PLUGINDIR=/mnt/sdcard/navit/lib/ts + +/mnt/sdcard/navit/ts/ts_calibrate +/mnt/sdcard/navit/ts/ts_test -- cgit v1.2.1