Use all available Cores on CI (#273)

Ci has 32 Cores, not 4 Which is reportet from nproc

6 files changed, 11 insertions, 11 deletions

diff --git a/ci/build_android.sh b/ci/build_android.sh
index 93e250f95..97ac349a1 100644
--- a/ci/build_android.sh
+++ b/ci/build_android.sh
@@ -21,12 +21,12 @@ cd $BUILD_PATH
 android list targets
 
 cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_FILE -DCACHE_SIZE='(20*1024*1024)' -DAVOID_FLOAT=1 -DSAMPLE_MAP=n -DBUILD_MAPTOOL=n -DANDROID_API_VERSION=25 -DANDROID_NDK_API_VERSION=19 $SOURCE_PATH
-make
+make -j $(nproc --all)
 
 if [[ "${CIRCLE_BRANCH}" == "master" ]]; then
-  make apkg-release && mv $BUILD_PATH/navit/android/bin/Navit-release-unsigned.apk $CIRCLE_ARTIFACTS/navit-$CIRCLE_SHA1-${ARCH}-release-unsigned.apk || exit 1
+  make -j $(nproc --all) apkg-release && mv $BUILD_PATH/navit/android/bin/Navit-release-unsigned.apk $CIRCLE_ARTIFACTS/navit-$CIRCLE_SHA1-${ARCH}-release-unsigned.apk || exit 1
 else
-  make apkg && mv $BUILD_PATH/navit/android/bin/Navit-debug.apk $CIRCLE_ARTIFACTS/navit-$CIRCLE_SHA1-${ARCH}-debug.apk || exit 1
+  make -j $(nproc --all) apkg && mv $BUILD_PATH/navit/android/bin/Navit-debug.apk $CIRCLE_ARTIFACTS/navit-$CIRCLE_SHA1-${ARCH}-debug.apk || exit 1
 fi
 
 [ -d $CIRCLE_ARTIFACTS/android-${ARCH}/ ] || mkdir $CIRCLE_ARTIFACTS/android-${ARCH}/
diff --git a/ci/build_android_x86.sh b/ci/build_android_x86.sh
index 30ced4296..b9dff3a2c 100644
--- a/ci/build_android_x86.sh
+++ b/ci/build_android_x86.sh
@@ -21,12 +21,12 @@ cd $BUILD_PATH
 android list targets
 
 cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_FILE -DAVOID_FLOAT=1 -DSAMPLE_MAP=n -DBUILD_MAPTOOL=n -DANDROID_API_VERSION=25 -DANDROID_NDK_API_VERSION=19 -DDISABLE_CXX=1 -DDISABLE_QT=1 $SOURCE_PATH
-make
+make -j $(nproc --all)
 
 if [[ "${CIRCLE_BRANCH}" == "master" ]]; then
-  make apkg-release && mv $BUILD_PATH/navit/android/bin/Navit-release-unsigned.apk $CIRCLE_ARTIFACTS/navit-$CIRCLE_SHA1-${ARCH}-release-unsigned.apk || exit 1
+  make -j $(nproc --all) apkg-release && mv $BUILD_PATH/navit/android/bin/Navit-release-unsigned.apk $CIRCLE_ARTIFACTS/navit-$CIRCLE_SHA1-${ARCH}-release-unsigned.apk || exit 1
 else
-  make apkg && mv $BUILD_PATH/navit/android/bin/Navit-debug.apk $CIRCLE_ARTIFACTS/navit-$CIRCLE_SHA1-${ARCH}-debug.apk || exit 1
+  make -j $(nproc --all) apkg && mv $BUILD_PATH/navit/android/bin/Navit-debug.apk $CIRCLE_ARTIFACTS/navit-$CIRCLE_SHA1-${ARCH}-debug.apk || exit 1
 fi
 
 [ -d $CIRCLE_ARTIFACTS/android-${ARCH}/ ] || mkdir $CIRCLE_ARTIFACTS/android-${ARCH}/
diff --git a/ci/build_linux.sh b/ci/build_linux.sh
index afaac34e2..702709422 100644
--- a/ci/build_linux.sh
+++ b/ci/build_linux.sh
@@ -10,7 +10,7 @@ if [[ "${CIRCLE_PROJECT_USERNAME}" == "navit-gps" && "${CIRCLE_BRANCH}" == "trun
 	
 	mkdir ~/linux-bin && cd ~/linux-bin
 	cov-build --dir cov-int cmake ~/${CIRCLE_PROJECT_REPONAME}/ ${cmake_opts}
-	cov-build --dir cov-int make || exit -1
+	cov-build --dir cov-int make -j $(nproc --all) || exit -1
 	tar czvf navit.tgz cov-int
 	
 	curl --form token=$COVERITY_TOKEN \
@@ -28,7 +28,7 @@ if [[ "${CIRCLE_PROJECT_USERNAME}" == "navit-gps" && "${CIRCLE_BRANCH}" == "trun
 else
 	mkdir ~/linux-bin && cd ~/linux-bin
 	cmake ~/${CIRCLE_PROJECT_REPONAME}/ ${cmake_opts} || exit -1
-	make  || exit -1
+	make -j $(nproc --all) || exit -1
 fi
 
 if [[ "$CIRCLE_ARTIFACTS" != "" ]]; then
diff --git a/ci/build_tomtom_minimal.sh b/ci/build_tomtom_minimal.sh
index 585f79316..02394061c 100644
--- a/ci/build_tomtom_minimal.sh
+++ b/ci/build_tomtom_minimal.sh
@@ -28,7 +28,7 @@ export STRIP=$ARCH-strip
 export OBJCOPY=$ARCH-objcopy
 export LN_S="ln -s"
 export PKG_CONFIG_LIBDIR=$PREFIX/lib/pkgconfig
-JOBS=`getconf _NPROCESSORS_ONLN`
+JOBS=$(nproc --all) 
 
 echo "Jobs"
 echo $JOBS
diff --git a/ci/build_tomtom_plugin.sh b/ci/build_tomtom_plugin.sh
index 6acf3b376..0129f267c 100644
--- a/ci/build_tomtom_plugin.sh
+++ b/ci/build_tomtom_plugin.sh
@@ -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=`getconf _NPROCESSORS_ONLN`
+JOBS=$(nproc --all) 
 
 echo "Jobs"
 echo $JOBS
diff --git a/ci/build_win32.sh b/ci/build_win32.sh
index de5156843..a96653f33 100644
--- a/ci/build_win32.sh
+++ b/ci/build_win32.sh
@@ -2,7 +2,7 @@ sudo apt-get install mingw32 mingw32-binutils mingw32-runtime default-jdk nsis
 
 mkdir win32
 pushd win32
-cmake -Dbinding/python:BOOL=FALSE -DSAMPLE_MAP=n -DCMAKE_TOOLCHAIN_FILE=../Toolchain/mingw32.cmake ../ && make && make package
+cmake -Dbinding/python:BOOL=FALSE -DSAMPLE_MAP=n -DCMAKE_TOOLCHAIN_FILE=../Toolchain/mingw32.cmake ../ && make -j $(nproc --all)  && make -j $(nproc --all) package
 popd
 
 cp win32/*.exe $CIRCLE_ARTIFACTS/