diff options
| author | Sven Gothel <[email protected]> | 2020-10-16 16:42:33 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2020-10-16 16:42:33 +0200 |
| commit | 541517248d973f33ddefa60bac4c4222f1be7bd1 (patch) | |
| tree | 9add5b0607d44e1ed22f66ad55afad064f1e8287 /scripts | |
| parent | 5ade37c19a2d705c63cfe75ec0c48c81b9c3e2a8 (diff) | |
Fix scripts/build.sh scripts/build-doc.shv0.1.0
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/build-doc.sh | 12 | ||||
| -rw-r--r-- | scripts/build.sh | 2 |
2 files changed, 8 insertions, 6 deletions
diff --git a/scripts/build-doc.sh b/scripts/build-doc.sh index ae4c816..f55454a 100644 --- a/scripts/build-doc.sh +++ b/scripts/build-doc.sh @@ -14,9 +14,12 @@ if [ ! -e $JAVA_HOME ] ; then exit 1 fi +CPU_COUNT=`getconf _NPROCESSORS_ONLN` + buildit() { echo rootdir $rootdir echo logfile $logfile + echo CPU_COUNT $CPU_COUNT cd $rootdir rm -rf dist-$archabi @@ -24,11 +27,10 @@ buildit() { rm -rf build-$archabi mkdir -p build-$archabi cd build-$archabi - # cmake -DCMAKE_INSTALL_PREFIX=$rootdir/dist-$archabi -DBUILDJAVA=ON -DBUILDEXAMPLES=ON -DBUILD_TESTING=ON .. - cmake -DCMAKE_INSTALL_PREFIX=$rootdir/dist-$archabi -DBUILDJAVA=ON -DBUILDEXAMPLES=ON -DBUILD_TESTING=ON -DDEBUG=ON .. - # cmake -DCMAKE_INSTALL_PREFIX=$rootdir/dist-$archabi -DSKIP_TINYB=ON -DBUILDJAVA=ON -DBUILDEXAMPLES=ON -DBUILD_TESTING=ON -DDEBUG=ON .. - #make install test - make doc + # CLANG_ARGS="-DCMAKE_C_COMPILER=/usr/bin/clang -DCMAKE_CXX_COMPILER=/usr/bin/clang++" + # cmake $CLANG_ARGS -DCMAKE_INSTALL_PREFIX=$rootdir/dist-$archabi -DBUILDJAVA=ON -DBUILDEXAMPLES=ON -DBUILD_TESTING=ON -DDEBUG=ON .. + cmake $CLANG_ARGS -DCMAKE_INSTALL_PREFIX=$rootdir/dist-$archabi -DBUILD_TESTING=ON .. + make -j $CPU_COUNT install test doc if [ $? -eq 0 ] ; then echo "BUILD SUCCESS $bname $archabi" cd $rootdir diff --git a/scripts/build.sh b/scripts/build.sh index 1a4da03..082e2bb 100644 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -28,8 +28,8 @@ buildit() { mkdir -p build-$archabi cd build-$archabi # CLANG_ARGS="-DCMAKE_C_COMPILER=/usr/bin/clang -DCMAKE_CXX_COMPILER=/usr/bin/clang++" - cmake $CLANG_ARGS -DCMAKE_INSTALL_PREFIX=$rootdir/dist-$archabi -DBUILDJAVA=ON -DBUILDEXAMPLES=ON -DBUILD_TESTING=ON .. # cmake $CLANG_ARGS -DCMAKE_INSTALL_PREFIX=$rootdir/dist-$archabi -DBUILDJAVA=ON -DBUILDEXAMPLES=ON -DBUILD_TESTING=ON -DDEBUG=ON .. + cmake $CLANG_ARGS -DCMAKE_INSTALL_PREFIX=$rootdir/dist-$archabi -DBUILD_TESTING=ON .. make -j $CPU_COUNT install test if [ $? -eq 0 ] ; then echo "BUILD SUCCESS $bname $archabi" |