diff options
| author | Joseph Herlant <aerostitch@debian.org> | 2020-01-20 12:11:38 -0800 |
|---|---|---|
| committer | Joseph Herlant <aerostitch@debian.org> | 2020-01-20 12:11:38 -0800 |
| commit | ff9b167e044fca415267300b198ba24435cff8e7 (patch) | |
| tree | a11eb6e066cce7c5810ceee238fac6094a35b6be | |
| parent | b24b3ed0d76d3cb4886fc821b0c5fb8dad553f15 (diff) | |
| download | navit-pedestrian.tar.gz | |
add:ci: enable the pedestrian plugin by default on linux, win* and androidpedestrian
| -rwxr-xr-x | scripts/build_android.sh | 8 | ||||
| -rw-r--r-- | scripts/build_linux.sh | 11 | ||||
| -rw-r--r-- | scripts/build_win32.sh | 3 | ||||
| -rw-r--r-- | scripts/build_wince.sh | 1 |
4 files changed, 17 insertions, 6 deletions
diff --git a/scripts/build_android.sh b/scripts/build_android.sh index 6512dab1f..acdb6f401 100755 --- a/scripts/build_android.sh +++ b/scripts/build_android.sh @@ -28,7 +28,13 @@ export GRADLE_OPTS='-Dorg.gradle.jvmargs="-Xmx2048m -XX:+HeapDumpOnOutOfMemoryEr echo Run CMake test -z "$PKG_CONFIG_LIBDIR" && export PKG_CONFIG_LIBDIR="" # Force cmake below to run ignore build host libraries when using pkgconfig. # Note: If you want to compile against specific target libraries that are searched using pkgconfig, please run this script with variable PKG_CONFIG_LIBDIR set to the appropriate path -cmake ./ -Dvehicle/gpsd_dbus:BOOL=FALSE -Dsvg2png_scaling:STRING=-1,24,32,48,64,96,128,192,256 -Dsvg2png_scaling_nav:STRING=-1,24,32,48,64,96,128,192,256 -Dsvg2png_scaling_flag:STRING=-1,24,32,64,96 -DXSL_PROCESSING=y -DXSLTS=android -DANDROID=y || exit 1 +cmake ./ \ + -Dvehicle/gpsd_dbus:BOOL=FALSE \ + -Dsvg2png_scaling:STRING=-1,24,32,48,64,96,128,192,256 \ + -Dsvg2png_scaling_nav:STRING=-1,24,32,48,64,96,128,192,256 \ + -Dsvg2png_scaling_flag:STRING=-1,24,32,64,96 \ + -Dplugin/pedestrian=TRUE \ + -DXSL_PROCESSING=y -DXSLTS=android -DANDROID=y || exit 1 echo Process icons pushd navit/icons diff --git a/scripts/build_linux.sh b/scripts/build_linux.sh index 5d807ec45..8d812de95 100644 --- a/scripts/build_linux.sh +++ b/scripts/build_linux.sh @@ -4,14 +4,17 @@ set -e COVERITY_VERSION="2017.07" BUILD_PATH="linux" -cmake_opts="-Dgraphics/qt_qpainter:BOOL=FALSE -Dgui/qml:BOOL=FALSE -DSVG2PNG:BOOL=FALSE -DSAMPLE_MAP=n -Dgraphics/gtk_drawing_area:BOOL=TRUE" - [ -d $BUILD_PATH ] || mkdir -p $BUILD_PATH pushd $BUILD_PATH # Build everything - echo "Building..." -cmake ${cmake_opts} ../ +echo "Building..." +cmake \ + -Dgraphics/qt_qpainter:BOOL=FALSE -Dgui/qml:BOOL=FALSE \ + -DSVG2PNG:BOOL=FALSE -DSAMPLE_MAP=n \ + -Dgraphics/gtk_drawing_area:BOOL=TRUE \ + -Dplugin/pedestrian=TRUE \ + ../ make -j $(nproc --all) make package diff --git a/scripts/build_win32.sh b/scripts/build_win32.sh index ce0ec0c07..8481c3b3f 100644 --- a/scripts/build_win32.sh +++ b/scripts/build_win32.sh @@ -7,6 +7,7 @@ mkdir win32 pushd win32 cmake -DTARGET_ARCH=i686-w64-mingw32 -DCMAKE_SYSTEM_NAME=Windows \ + -Dplugin/pedestrian=TRUE \ -Dbinding/python:BOOL=FALSE -DSAMPLE_MAP=n -DBUILD_MAPTOOL=n \ -DXSLTS=windows -DCMAKE_TOOLCHAIN_FILE=../Toolchain/mingw.cmake .. @@ -15,4 +16,4 @@ make -j $(nproc --all) package popd -cp win32/*.exe $CIRCLE_ARTIFACTS/
\ No newline at end of file +cp win32/*.exe $CIRCLE_ARTIFACTS/ diff --git a/scripts/build_wince.sh b/scripts/build_wince.sh index bd8f6feb1..816f1390f 100644 --- a/scripts/build_wince.sh +++ b/scripts/build_wince.sh @@ -5,6 +5,7 @@ mkdir -p wince pushd wince # cmake \ + -Dplugin/pedestrian=TRUE \ -DTARGET_ARCH=arm-mingw32ce -DCMAKE_SYSTEM_NAME=WindowsCETest \ -DCMAKE_TOOLCHAIN_FILE=../Toolchain/mingw.cmake \ -DXSLTS=windows,wince -DCACHE_SIZE=10485760 -Dsvg2png_scaling:STRING=16,32 \ |