summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorJoseph Herlant <herlantj@gmail.com>2018-05-25 22:07:07 -0700
committerJoseph Herlant <aerostitch@users.noreply.github.com>2018-05-25 22:17:50 -0700
commit41a1264cdd43a11695de85eab0bd3c941abf2b70 (patch)
tree3da1ef3bebc674807258ae824ff9156a64adf370 /scripts
parent8a76acb966f7059caf9d72c853175bd923b1e9d7 (diff)
downloadnavit-41a1264cdd43a11695de85eab0bd3c941abf2b70.tar.gz
cleanup:cmake:remove trailing spaces
Diffstat (limited to 'scripts')
-rw-r--r--scripts/build_linux.sh4
-rw-r--r--scripts/build_tomtom_plugin.sh6
-rw-r--r--scripts/build_wince.sh2
-rw-r--r--scripts/docker/tomtom/Dockerfile2
-rw-r--r--scripts/generate_contributors.sh6
-rw-r--r--scripts/setup_tomtom_requirements.sh10
-rw-r--r--scripts/update_download_center.sh4
7 files changed, 17 insertions, 17 deletions
diff --git a/scripts/build_linux.sh b/scripts/build_linux.sh
index f84d247af..90ba8a9a0 100644
--- a/scripts/build_linux.sh
+++ b/scripts/build_linux.sh
@@ -18,11 +18,11 @@ if [[ "${CIRCLE_PROJECT_USERNAME}" == "navit-gps" && "${CIRCLE_BRANCH}" == "trun
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
-
+
cmake ${cmake_opts} ../
cov-build --dir cov-int make -j $(nproc --all)
tar czvf navit.tgz cov-int
-
+
curl --form token=$COVERITY_TOKEN \
--form email=$COVERITY_EMAIL \
--form file=@navit.tgz \
diff --git a/scripts/build_tomtom_plugin.sh b/scripts/build_tomtom_plugin.sh
index 51a15f815..a4f19fda3 100644
--- a/scripts/build_tomtom_plugin.sh
+++ b/scripts/build_tomtom_plugin.sh
@@ -11,7 +11,7 @@ cp Toolchain/$ARCH.cmake /tmp
# toolchain
export TOMTOM_SDK_DIR=/opt/tomtom-sdk
-mkdir -p $TOMTOM_SDK_DIR >/dev/null 2>&1 || export TOMTOM_SDK_DIR=$HOME/tomtom-sdk
+mkdir -p $TOMTOM_SDK_DIR >/dev/null 2>&1 || export TOMTOM_SDK_DIR=$HOME/tomtom-sdk
export PREFIX=$TOMTOM_SDK_DIR/gcc-3.3.4_glibc-2.3.2/$ARCH/sys-root
export PATH=$TOMTOM_SDK_DIR/gcc-3.3.4_glibc-2.3.2/bin:$PREFIX/bin/:$PATH
export CFLAGS="-O2 -I$PREFIX/include -I$PREFIX/usr/include"
@@ -27,7 +27,7 @@ export STRIP=$ARCH-strip
export OBJCOPY=$ARCH-objcopy
export LN_S="ln -s"
export PKG_CONFIG_LIBDIR=$PREFIX/lib/pkgconfig
-JOBS=$(nproc --all)
+JOBS=$(nproc --all)
echo "Jobs"
echo $JOBS
@@ -99,7 +99,7 @@ cp $PREFIX/usr/bin/testvidinfo $OUT_PATH/navit/sdl
# navit executable and wrapper
cp $PREFIX/bin/navit $OUT_PATH/navit/bin
-cp ../contrib/tomtom/navit-wrapper $OUT_PATH/navit/bin/navit-wrapper
+cp ../contrib/tomtom/navit-wrapper $OUT_PATH/navit/bin/navit-wrapper
# fonts
cp -r ../navit/fonts/*.ttf $OUT_PATH/navit/share/fonts
diff --git a/scripts/build_wince.sh b/scripts/build_wince.sh
index 6e0514e1c..af6620477 100644
--- a/scripts/build_wince.sh
+++ b/scripts/build_wince.sh
@@ -2,7 +2,7 @@
set -e
mkdir wince && cd wince
-cmake ../ -DCMAKE_TOOLCHAIN_FILE=Toolchain/arm-mingw32ce.cmake -DXSLTS=windows -DCACHE_SIZE=10485760 -Dsvg2png_scaling:STRING=16,32 -Dsvg2png_scaling_nav:STRING=32 -Dsvg2png_scaling_flag=16 -DSAMPLE_MAP=y
+cmake ../ -DCMAKE_TOOLCHAIN_FILE=Toolchain/arm-mingw32ce.cmake -DXSLTS=windows -DCACHE_SIZE=10485760 -Dsvg2png_scaling:STRING=16,32 -Dsvg2png_scaling_nav:STRING=32 -Dsvg2png_scaling_flag=16 -DSAMPLE_MAP=y
make
mkdir output
diff --git a/scripts/docker/tomtom/Dockerfile b/scripts/docker/tomtom/Dockerfile
index adddbdbf8..01942d1d2 100644
--- a/scripts/docker/tomtom/Dockerfile
+++ b/scripts/docker/tomtom/Dockerfile
@@ -53,7 +53,7 @@ RUN wget -nv -c http://download.savannah.gnu.org/releases/freetype/freetype-2.5.
&& 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
diff --git a/scripts/generate_contributors.sh b/scripts/generate_contributors.sh
index b957d486d..cec9c4511 100644
--- a/scripts/generate_contributors.sh
+++ b/scripts/generate_contributors.sh
@@ -21,12 +21,12 @@ git log --encoding=utf-8 --full-history --date=short --use-mailmap "--format=for
IFS=';'; arrLine=($line); unset IFS;
author=${arrLine[1]}
commitDate=`date +%s --date="${arrLine[0]}"`
-
+
# Exclude circleci
if [[ $author =~ [Cc]ircle\s*[Cc][Ii] ]]; then
continue
fi
-
+
# indicates that the commits are now older than 2 years so we print the
# sorted list of active contributors and reset the authors array
if [ "$retiredTitleWritten" = false ]; then
@@ -38,7 +38,7 @@ git log --encoding=utf-8 --full-history --date=short --use-mailmap "--format=for
retiredTitleWritten=true
fi
fi
-
+
# using the map as an easy way to check if the author has already been listed
if [ -z "${CONTRIBUTORS[${author}]}" ]; then
CONTRIBUTORS[${author}]=${arrLine[0]}
diff --git a/scripts/setup_tomtom_requirements.sh b/scripts/setup_tomtom_requirements.sh
index 98d6de3cd..4e8415daf 100644
--- a/scripts/setup_tomtom_requirements.sh
+++ b/scripts/setup_tomtom_requirements.sh
@@ -17,7 +17,7 @@ cp Toolchain/$ARCH.cmake /tmp
# toolchain
export TOMTOM_SDK_DIR=/opt/tomtom-sdk
-mkdir -p $TOMTOM_SDK_DIR >/dev/null 2>&1 || export TOMTOM_SDK_DIR=$HOME/tomtom-sdk
+mkdir -p $TOMTOM_SDK_DIR >/dev/null 2>&1 || export TOMTOM_SDK_DIR=$HOME/tomtom-sdk
export PREFIX=$TOMTOM_SDK_DIR/gcc-3.3.4_glibc-2.3.2/$ARCH/sys-root
export PATH=$TOMTOM_SDK_DIR/gcc-3.3.4_glibc-2.3.2/bin:$PREFIX/bin/:$PATH
export CFLAGS="-O2 -I$PREFIX/include -I$PREFIX/usr/include"
@@ -33,7 +33,7 @@ export STRIP=$ARCH-strip
export OBJCOPY=$ARCH-objcopy
export LN_S="ln -s"
export PKG_CONFIG_LIBDIR=$PREFIX/lib/pkgconfig
-JOBS=$(nproc --all)
+JOBS=$(nproc --all)
echo "Jobs"
echo $JOBS
@@ -41,12 +41,12 @@ echo $JOBS
mkdir -p ~/tomtom_assets
if ! [ -e "~/tomtom_assets/toolchain_redhat_gcc-3.3.4_glibc-2.3.2-20060131a.tar.gz" ]
- then
+ 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
+then
wget -nv -c https://github.com/navit-gps/dependencies/raw/master/tomtom/libpng-1.6.29.tar.gz -P ~/tomtom_assets
fi
@@ -77,7 +77,7 @@ make install
# libpng
cd /tmp/
tar xzf ~/tomtom_assets/libpng-1.6.29.tar.gz
-cd libpng-1.6.29/
+cd libpng-1.6.29/
./configure --prefix=$PREFIX --host=$ARCH
make -j$JOBS
make install
diff --git a/scripts/update_download_center.sh b/scripts/update_download_center.sh
index 34d4a95de..9b59b457e 100644
--- a/scripts/update_download_center.sh
+++ b/scripts/update_download_center.sh
@@ -56,7 +56,7 @@ trap cleanup EXIT
#############################################
echo "Init Git Repo"
-export GIT_TERMINAL_PROMPT=0
+export GIT_TERMINAL_PROMPT=0
cd $TMP_DIR
mkdir -p ~/.ssh/
ssh-keyscan -t rsa github.com >> ~/.ssh/known_hosts
@@ -83,7 +83,7 @@ git config --global push.default simple
git config user.name "Circle CI"
git config user.email "circleci@navit-project.org"
git add ${BUILD_NUM}.json
-git commit -m "add:artifacts:Add artifacts for build #${BUILD_NUM} with SHA1:${CIRCLE_SHA1}"
+git commit -m "add:artifacts:Add artifacts for build #${BUILD_NUM} with SHA1:${CIRCLE_SHA1}"
git push
RC=$?
if [ $RC -ne 0 ]; then