Use less relative paths

2 files changed, 54 insertions, 185 deletions

diff --git a/ci/build_tomtom_minimal.sh b/ci/build_tomtom_minimal.sh
index 11d761daa..6af14fe5d 100644
--- a/ci/build_tomtom_minimal.sh
+++ b/ci/build_tomtom_minimal.sh
@@ -42,6 +42,7 @@ mkdir -p $OUT_PATH/navit/bin
 mkdir -p $OUT_PATH/navit/share/fonts
 mkdir -p $OUT_PATH/navit/share/icons
 mkdir -p $OUT_PATH/navit/share/maps
+mkdir -p $OUT_PATH/navit/share/locale
 
 # navit executable
 cp navit/navit $OUT_PATH/navit/bin
@@ -50,17 +51,17 @@ cp navit/navit $OUT_PATH/navit/bin
 cp -r ../navit/fonts/*.ttf $OUT_PATH/navit/share/fonts
 
 # images and xml
-cp $PREFIX/share/navit/icons/*16.png ./
-cp $PREFIX/share/navit/icons/*32.png ./
-cp $PREFIX/share/navit/icons/*48.png ./
-cp $PREFIX/share/navit/icons/*64.png ./
-cp $PREFIX/share/navit/icons/nav*.* ./
-cp $PREFIX/share/navit/icons/country*.png ./
+cp $PREFIX/share/navit/icons/*16.png $OUT_PATH/navit/share/icons
+cp $PREFIX/share/navit/icons/*32.png $OUT_PATH/navit/share/icons
+cp $PREFIX/share/navit/icons/*48.png $OUT_PATH/navit/share/icons
+cp $PREFIX/share/navit/icons/*64.png $OUT_PATH/navit/share/icons
+cp $PREFIX/share/navit/icons/nav*.* $OUT_PATH/navit/share/icons
+cp $PREFIX/share/navit/icons/country*.png $OUT_PATH/navit/share/icons
 cd ..
 cp $PREFIX/share/navit/navit.xml ./tomtom480.xml
 
 # locale
-cp -r $PREFIX/share/locale ./
+cp -r $PREFIX/share/locale $OUT_PATH/navit/share/locale
 
 
 cd $OUT_PATH
diff --git a/ci/build_tomtom_plugin.sh b/ci/build_tomtom_plugin.sh
index 5b27d74d7..d6169bb84 100644
--- a/ci/build_tomtom_plugin.sh
+++ b/ci/build_tomtom_plugin.sh
@@ -33,201 +33,74 @@ echo "Jobs"
 echo $JOBS
 
 # espeak
-cd /tmp
+pushd /tmp
 # this one includes the precompiled voices
 wget -nv -c http://freefr.dl.sourceforge.net/project/espeak/espeak/espeak-1.48/espeak-1.48.04-source.zip
 unzip espeak-1.48.04-source.zip
-cd espeak-1.48.04-source
+pushd espeak-1.48.04-source
 sed -i "s/PREFIX=\/usr//g" src/Makefile
 sed -i "s/DATADIR=\/usr\/share\/espeak-data/DATADIR=~\/share\/espeak-data/g" src/Makefile
 sed -i "s/AUDIO = portaudio/#AUDIO = portaudio/g" src/Makefile
 sed -i "s/-fvisibility=hidden//g" src/Makefile
 cat src/Makefile
 make -C src
-cd src
+pushd src
 make install
+popd # src
+popd # espeak-*
+popd # /tmp
 
 # http://forum.navit-project.org/viewtopic.php?f=17&t=568
-cd /tmp
-cat > /tmp/espeakdsp.c << EOF
-#include <fcntl.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/soundcard.h>
-#include <sys/wait.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-
-#define IBUFFERLEN 1024
-#define MAXARGC 30
-
-
-int  main(int argc, char *argv[],char *envp[])
-{
-	int pipefd[2];
-	pid_t cpid;
-	char buf;
-	int co,wp,l,fh;
-	short bufi[IBUFFERLEN],bufo[IBUFFERLEN*2];	 
-	int rate=22050;
-
-	char *newargv[MAXARGC+2];
-
-	for(co=0;co<argc;co++)
-	{
-		if(co>=MAXARGC)break;
-		newargv[co]=argv[co];
-	}
-	newargv[co++]="--stdout";
-	newargv[co++]=NULL;
-
-	if (pipe(pipefd) == -1)
-	{
-		perror("pipe");
-		exit(EXIT_FAILURE);
-	}
-
-	if(setpriority(PRIO_PROCESS,0,-10))
-	perror ("setpriority");
-
-	cpid = fork();
-	if (cpid == -1)
-	{
-		perror("fork");
-		exit(EXIT_FAILURE);
-	}
-
-	if (cpid == 0)
-	{    /* Child writes to pipe */
-
-		close(pipefd[0]);          /* Close unused read end */
-		dup2(pipefd[1],1);	
-		execve("/mnt/sdcard/navit/bin/espeak",newargv,envp);	      
-		perror("exec /mnt/sdcard/navit/bin/espeak");	
-		close(pipefd[1]);          /* Reader will see EOF */
-		wait(NULL);                /* Wait for child */
-		exit(EXIT_SUCCESS);
-
-	} else { /* Parent read from  pipe */
-
-		close(pipefd[1]);          /* Close unused write end */
-
-		l=read(pipefd[0],bufi,64);
-		if(memcmp(bufi,"RIFF",4))
-		{
-			while(l>0)
-			{
-				write(1,bufi,l);
-				l=read(pipefd[0],bufi,IBUFFERLEN);
-			}
-			exit(EXIT_SUCCESS);
-		}
-		l=read(pipefd[0],bufi,IBUFFERLEN);
-		if(l<500)
-		{
-			printf("espeakdsp: avoid noise speaking a empty string\n");
-			exit(EXIT_SUCCESS); 	
-		} 			
-		usleep (50000);
-
-		fh=open("/dev/dsp",O_WRONLY);
-		if(fh<0)
-		{
-			perror("open /dev/dsp");	
-			exit(EXIT_FAILURE);
-		}
-		ioctl(fh, SNDCTL_DSP_SPEED , &rate);
-		ioctl(fh, SNDCTL_DSP_SYNC, 0);
-		while(l)
-		{
-			for(co=0,wp=0;co<IBUFFERLEN;co++)
-			{
-				bufo[wp++]=bufi[co]; /* mono->stereo */
-				bufo[wp++]=bufi[co];
-			}
-			write (fh,bufo,wp);
-			l=read(pipefd[0],bufi,IBUFFERLEN);
-		}
-		ioctl(fh, SNDCTL_DSP_SYNC, 0);
-		close(pipefd[0]);
-		exit(EXIT_SUCCESS);
-	}
-}
-EOF
-arm-linux-gcc -O2 -I$PREFIX/include -I$PREFIX/usr/include espeakdsp.c -o espeakdsp
-
-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">
-<svg width="64px" height="64px" viewBox="-100 -100 200 200" xmlns="http://www.w3.org/2000/svg" version="1.1">
-<rect x="-110" y="-110" width="220" height="220" fill="#000080" stroke="none" opacity="0.5"/>
-<path fill="none" stroke="#ffffff" stroke-width="20" stroke-linecap="round" d="M 60 0 L -60 0"/>
-</svg>
-EOF
-
-cat > ~/navit/navit/icons/tomtom_plus.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">
-<svg width="64px" height="64px" viewBox="-100 -100 200 200" xmlns="http://www.w3.org/2000/svg" version="1.1">
-<rect x="-110" y="-110" width="220" height="220" fill="#000080" stroke="none" opacity="0.5"/>
-<path fill="none" stroke="#ffffff" stroke-width="20" stroke-linecap="round" d="M 0 60 L 0 -60 M 60 0 L -60 0"/>
-</svg>
-EOF
-
+arm-linux-gcc -O2 -I$PREFIX/include -I$PREFIX/usr/include espeakdsp.c -o contrib/tomtom/espeakdsp
 
 # navit
-cd ~/navit
-sed -i "s|set ( TOMTOM_SDK_DIR /opt/tomtom-sdk )|set ( TOMTOM_SDK_DIR $TOMTOM_SDK_DIR )|g" /tmp/$ARCH.cmake
 mkdir -p build
-cd build
+pushd build
 cmake ../ -DCMAKE_INSTALL_PREFIX=$PREFIX -DFREETYPE_INCLUDE_DIRS=$PREFIX/include/freetype2/ -Dsupport/gettext_intl=TRUE \
 -DHAVE_API_TOMTOM=TRUE -DXSLTS=tomtom -DAVOID_FLOAT=TRUE -Dmap/mg=FALSE -DUSE_PLUGINS=0 -DCMAKE_TOOLCHAIN_FILE=/tmp/$ARCH.cmake \
 -DDISABLE_QT=ON -DSAMPLE_MAP=n -DBUILD_MAPTOOL=n
 make -j$JOBS
 make install
-cd ..
+popd
 
 
 # creating directories
 OUT_PATH="/tmp/tomtom/sdcard"
-rm -rf $OUT_PATH
-mkdir -p $OUT_PATH
-cd $OUT_PATH
-mkdir -p navit SDKRegistry
-cd navit
-mkdir -p bin lib share sdl ts
-cd share 
-mkdir -p fonts
-cd ..
-
-
-cp $PREFIX/lib/libfreetype.so.6 lib
-cp $PREFIX/lib/libSDL-1.2.so.0 lib
-cp $PREFIX/lib/libSDL_image-1.2.so.0 lib
-cp $PREFIX/lib/libfreetype.so.6 lib
-cp $PREFIX/lib/libgio-2.0.so lib
-cp $PREFIX/lib/libglib-2.0.so lib/libglib-2.0.so.0
-cp $PREFIX/lib/libgmodule-2.0.so lib/libgmodule-2.0.so.0
-cp $PREFIX/lib/libgobject-2.0.so lib/libgobject-2.0.so.0
-cp $PREFIX/lib/libgthread-2.0.so lib/libgthread-2.0.so.0
-cp $PREFIX/lib/libpng16.so.16 lib
-cp $PREFIX/lib/libts-1.0.so.0 lib
-cp $PREFIX/lib/libxml2.so.2 lib
-cp $PREFIX/lib/libz.so.1 lib
-cp $PREFIX/etc/ts.conf ts
-cp $TOMTOM_SDK_DIR/gcc-3.3.4_glibc-2.3.2/$ARCH/lib/libstdc++.so.5 lib
+[ -d $OUT_PATH ] && rm -rf $OUT_PATH
+mkdir -p $OUT_PATH/navit/bin
+mkdir -p $OUT_PATH/navit/lib
+mkdir -p $OUT_PATH/navit/sdl
+mkdir -p $OUT_PATH/navit/ts
+mkdir -p $OUT_PATH/navit/share/fonts
+mkdir -p $OUT_PATH/navit/share/icons
+mkdir -p $OUT_PATH/navit/share/maps
+mkdir -p $OUT_PATH/navit/share/locale
+
+cp $PREFIX/lib/libfreetype.so.6 $OUT_PATH/navit/lib
+cp $PREFIX/lib/libSDL-1.2.so.0 $OUT_PATH/navit/lib
+cp $PREFIX/lib/libSDL_image-1.2.so.0 $OUT_PATH/navit/lib
+cp $PREFIX/lib/libfreetype.so.6 $OUT_PATH/navit/lib
+cp $PREFIX/lib/libgio-2.0.so $OUT_PATH/navit/lib
+cp $PREFIX/lib/libglib-2.0.so $OUT_PATH/navit/lib/libglib-2.0.so.0
+cp $PREFIX/lib/libgmodule-2.0.so $OUT_PATH/navit/lib/libgmodule-2.0.so.0
+cp $PREFIX/lib/libgobject-2.0.so $OUT_PATH/navit/lib/libgobject-2.0.so.0
+cp $PREFIX/lib/libgthread-2.0.so $OUT_PATH/navit/lib/libgthread-2.0.so.0
+cp $PREFIX/lib/libpng16.so.16 $OUT_PATH/navit/lib
+cp $PREFIX/lib/libts-1.0.so.0 $OUT_PATH/navit/lib
+cp $PREFIX/lib/libxml2.so.2 $OUT_PATH/navit/lib
+cp $PREFIX/lib/libz.so.1 $OUT_PATH/navit/lib
+cp $TOMTOM_SDK_DIR/gcc-3.3.4_glibc-2.3.2/$ARCH/lib/libstdc++.so.5 $OUT_PATH/navit/lib
+cp $PREFIX/etc/ts.conf $OUT_PATH/navit/ts
 
 # flite
 # cp $PREFIX/bin/flite* bin/
 
 # SDL testvidinfo
-cp $PREFIX/usr/bin/testvidinfo sdl/
+cp $PREFIX/usr/bin/testvidinfo $OUT_PATH/navit/sdl
 
 # navit executable and wrapper
-cp $PREFIX/bin/navit bin/
-cat > bin/navit-wrapper << 'EOF'
+cp $PREFIX/bin/navit $OUT_PATH/navit/bin
+cat > $OUT_PATH/navit/bin/navit-wrapper << 'EOF'
 #!/bin/sh
 
 cd /mnt/sdcard/navit/bin
@@ -292,32 +165,27 @@ EOF
 chmod a+rx bin/navit-wrapper
 
 # fonts
-cp -r ~/navit/navit/fonts/*.ttf $OUT_PATH/navit/share/fonts
+cp -r ../navit/fonts/*.ttf $OUT_PATH/navit/share/fonts
 
 # ts
 cp -r $PREFIX/lib/ts $OUT_PATH/navit/lib/
 cp $PREFIX/bin/ts_* $OUT_PATH/navit/ts/
 
 # images and xml
-cd share
-mkdir icons
-cd icons
-cp $PREFIX/share/navit/icons/*16.png ./
-cp $PREFIX/share/navit/icons/*32.png ./
-cp $PREFIX/share/navit/icons/*48.png ./
-cp $PREFIX/share/navit/icons/*64.png ./
-cp $PREFIX/share/navit/icons/nav*.* ./
-cp $PREFIX/share/navit/icons/country*.png ./
-cd ..
+cp $PREFIX/share/navit/icons/*16.png $OUT_PATH/navit/share/icons
+cp $PREFIX/share/navit/icons/*32.png $OUT_PATH/navit/share/icons
+cp $PREFIX/share/navit/icons/*48.png $OUT_PATH/navit/share/icons
+cp $PREFIX/share/navit/icons/*64.png $OUT_PATH/navit/share/icons
+cp $PREFIX/share/navit/icons/nav*.* $OUT_PATH/navit/share/icons
+cp $PREFIX/share/navit/icons/country*.png $OUT_PATH/navit/share/icons
 cp $PREFIX/share/navit/navit.xml ./tomtom480.xml
-mkdir -p maps
 
 
 # locale
-cp -r $PREFIX/share/locale ./
+cp -r $PREFIX/share/locale $OUT_PATH/navit/share/locale
 
 # espeak
-cp -r ~/share/espeak-data ./
+cp -r ~/share/espeak-data $OUT_PATH/navit/share/
 cp $PREFIX/bin/espeak $OUT_PATH/navit/bin/
 cp $PREFIX/lib/libespeak.so.1 $OUT_PATH/navit/lib