nou/astro-soft-build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Autodetect number of CPU cores

Browse Source
This commit is contained in:
Dušan Poizl
2021-07-07 08:04:16 +02:00
parent 1f3862c358
commit 22baf6e220
2 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build-soft-latest.sh
+8 -6
View File
@@ -6,6 +6,8 @@ export CXXFLAGS="-march=native -w -Wno-psabi -D_FILE_OFFSET_BITS=64"
CHECKOUT=0 CHECKOUT=0
ROOTDIR="$HOME/astro-soft" ROOTDIR="$HOME/astro-soft"
JOBS=$(grep -c ^processor /proc/cpuinfo)
[ ! -d "$ROOTDIR" ] && mkdir $ROOTDIR [ ! -d "$ROOTDIR" ] && mkdir $ROOTDIR
cd "$ROOTDIR" cd "$ROOTDIR"
@@ -14,7 +16,7 @@ cd indi
git pull origin git pull origin
[ ! -d ../build-indi ] && { cmake -B ../build-indi ../indi -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release || { echo "INDI failed"; exit 1; } } [ ! -d ../build-indi ] && { cmake -B ../build-indi ../indi -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release || { echo "INDI failed"; exit 1; } }
cd ../build-indi cd ../build-indi
make -j 4 || { echo "INDI failed"; exit 1; } make -j $JOBS || { echo "INDI failed"; exit 1; }
sudo make install || { echo "INDI failed"; exit 1; } sudo make install || { echo "INDI failed"; exit 1; }
cd "$ROOTDIR" cd "$ROOTDIR"
@@ -23,12 +25,12 @@ cd indi-3rdparty
git pull origin git pull origin
[ ! -d ../build-indi-lib ] && { cmake -B ../build-indi-lib ../indi-3rdparty -DCMAKE_INSTALL_PREFIX=/usr -DBUILD_LIBS=1 -DCMAKE_BUILD_TYPE=Release || { echo "INDI lib failed"; exit 1; } } [ ! -d ../build-indi-lib ] && { cmake -B ../build-indi-lib ../indi-3rdparty -DCMAKE_INSTALL_PREFIX=/usr -DBUILD_LIBS=1 -DCMAKE_BUILD_TYPE=Release || { echo "INDI lib failed"; exit 1; } }
cd ../build-indi-lib cd ../build-indi-lib
make -j 4 || { echo "INDI lib failed"; exit 1; } make -j $JOBS || { echo "INDI lib failed"; exit 1; }
sudo make install || { echo "INDI lib failed"; exit 1; } sudo make install || { echo "INDI lib failed"; exit 1; }
[ ! -d ../build-indi-3rdparty ] && { cmake -B ../build-indi-3rdparty ../indi-3rdparty -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release || { echo "INDI lib failed"; exit 1; } } [ ! -d ../build-indi-3rdparty ] && { cmake -B ../build-indi-3rdparty ../indi-3rdparty -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release || { echo "INDI lib failed"; exit 1; } }
cd ../build-indi-3rdparty cd ../build-indi-3rdparty
make -j 4 || { echo "INDI 3rd-party failed"; exit 1; } make -j $JOBS || { echo "INDI 3rd-party failed"; exit 1; }
sudo make install || { echo "INDI lib failed"; exit 1; } sudo make install || { echo "INDI lib failed"; exit 1; }
cd "$ROOTDIR" cd "$ROOTDIR"
@@ -37,7 +39,7 @@ cd stellarsolver
git pull origin git pull origin
[ ! -d ../build-stellarsolver ] && { cmake -B ../build-stellarsolver ../stellarsolver -DCMAKE_BUILD_TYPE=Release || { echo "Stellarsolfer failed"; exit 1; } } [ ! -d ../build-stellarsolver ] && { cmake -B ../build-stellarsolver ../stellarsolver -DCMAKE_BUILD_TYPE=Release || { echo "Stellarsolfer failed"; exit 1; } }
cd ../build-stellarsolver cd ../build-stellarsolver
make -j 4 || { echo "Stellarsolver failed"; exit 1; } make -j $JOBS || { echo "Stellarsolver failed"; exit 1; }
sudo make install || { echo "Stellarsolver failed"; exit 1; } sudo make install || { echo "Stellarsolver failed"; exit 1; }
cd "$ROOTDIR" cd "$ROOTDIR"
@@ -46,7 +48,7 @@ cd kstars
git pull origin git pull origin
[ ! -d ../build-kstars ] && { cmake -B ../build-kstars -DBUILD_TESTING=Off ../kstars -DCMAKE_BUILD_TYPE=Release || { echo "KStars failed"; exit 1; } } [ ! -d ../build-kstars ] && { cmake -B ../build-kstars -DBUILD_TESTING=Off ../kstars -DCMAKE_BUILD_TYPE=Release || { echo "KStars failed"; exit 1; } }
cd ../build-kstars cd ../build-kstars
make -j 4 || { echo "KStars failed"; exit 1; } make -j $JOBS || { echo "KStars failed"; exit 1; }
sudo make install || { echo "KStars failed"; exit 1; } sudo make install || { echo "KStars failed"; exit 1; }
exit exit
@@ -56,5 +58,5 @@ cd phd2
[ $CHECKOUT == 1 ] && git pull origin [ $CHECKOUT == 1 ] && git pull origin
[ ! -d ../build-phd2 ] && cmake -B ../build-phd2 ../phd2 -DCMAKE_BUILD_TYPE=Release || { echo "PHD2 failed"; exit 1; } [ ! -d ../build-phd2 ] && cmake -B ../build-phd2 ../phd2 -DCMAKE_BUILD_TYPE=Release || { echo "PHD2 failed"; exit 1; }
cd ../build-phd2 || { echo "PHD2 failed"; exit 1; } cd ../build-phd2 || { echo "PHD2 failed"; exit 1; }
make -j 4 || { echo "PHD2 failed"; exit 1; } make -j $JOBS || { echo "PHD2 failed"; exit 1; }
sudo make install sudo make install
build-soft-stable.sh
+8 -6
View File
@@ -10,6 +10,8 @@ KSTARS_COMMIT="413c9421b0774ff05d3453dfad0eb4b234639dce"
ROOTDIR="$HOME/astro-soft-stable" ROOTDIR="$HOME/astro-soft-stable"
JOBS=$(grep -c ^processor /proc/cpuinfo)
[ ! -d "$ROOTDIR" ] && mkdir $ROOTDIR [ ! -d "$ROOTDIR" ] && mkdir $ROOTDIR
cd "$ROOTDIR" cd "$ROOTDIR"
@@ -19,7 +21,7 @@ git fetch origin
git checkout $INDI_COMMIT git checkout $INDI_COMMIT
[ ! -d ../build-indi ] && { cmake -B ../build-indi ../indi -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release || { echo "INDI failed"; exit 1; } } [ ! -d ../build-indi ] && { cmake -B ../build-indi ../indi -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release || { echo "INDI failed"; exit 1; } }
cd ../build-indi cd ../build-indi
make -j 4 || { echo "INDI failed"; exit 1; } make -j $JOBS || { echo "INDI failed"; exit 1; }
sudo make install || { echo "INDI failed"; exit 1; } sudo make install || { echo "INDI failed"; exit 1; }
cd "$ROOTDIR" cd "$ROOTDIR"
@@ -29,12 +31,12 @@ git fetch origin
git checkout $INDI_3RD_COMMIT git checkout $INDI_3RD_COMMIT
[ ! -d ../build-indi-lib ] && { cmake -B ../build-indi-lib ../indi-3rdparty -DCMAKE_INSTALL_PREFIX=/usr -DBUILD_LIBS=1 -DCMAKE_BUILD_TYPE=Release || { echo "INDI lib failed"; exit 1; } } [ ! -d ../build-indi-lib ] && { cmake -B ../build-indi-lib ../indi-3rdparty -DCMAKE_INSTALL_PREFIX=/usr -DBUILD_LIBS=1 -DCMAKE_BUILD_TYPE=Release || { echo "INDI lib failed"; exit 1; } }
cd ../build-indi-lib cd ../build-indi-lib
make -j 4 || { echo "INDI lib failed"; exit 1; } make -j $JOBS || { echo "INDI lib failed"; exit 1; }
sudo make install || { echo "INDI lib failed"; exit 1; } sudo make install || { echo "INDI lib failed"; exit 1; }
[ ! -d ../build-indi-3rdparty ] && { cmake -B ../build-indi-3rdparty ../indi-3rdparty -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release || { echo "INDI lib failed"; exit 1; } } [ ! -d ../build-indi-3rdparty ] && { cmake -B ../build-indi-3rdparty ../indi-3rdparty -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release || { echo "INDI lib failed"; exit 1; } }
cd ../build-indi-3rdparty cd ../build-indi-3rdparty
make -j 4 || { echo "INDI 3rd-party failed"; exit 1; } make -j $JOBS || { echo "INDI 3rd-party failed"; exit 1; }
sudo make install || { echo "INDI lib failed"; exit 1; } sudo make install || { echo "INDI lib failed"; exit 1; }
cd "$ROOTDIR" cd "$ROOTDIR"
@@ -44,7 +46,7 @@ git fetch origin
git checkout $STELLAR_COMMIT git checkout $STELLAR_COMMIT
[ ! -d ../build-stellarsolver ] && { cmake -B ../build-stellarsolver ../stellarsolver -DCMAKE_BUILD_TYPE=Release || { echo "Stellarsolfer failed"; exit 1; } } [ ! -d ../build-stellarsolver ] && { cmake -B ../build-stellarsolver ../stellarsolver -DCMAKE_BUILD_TYPE=Release || { echo "Stellarsolfer failed"; exit 1; } }
cd ../build-stellarsolver cd ../build-stellarsolver
make -j 4 || { echo "Stellarsolver failed"; exit 1; } make -j $JOBS || { echo "Stellarsolver failed"; exit 1; }
sudo make install || { echo "Stellarsolver failed"; exit 1; } sudo make install || { echo "Stellarsolver failed"; exit 1; }
cd "$ROOTDIR" cd "$ROOTDIR"
@@ -54,7 +56,7 @@ git fetch origin
git checkout $KSTARS_COMMIT git checkout $KSTARS_COMMIT
[ ! -d ../build-kstars ] && { cmake -B ../build-kstars -DBUILD_TESTING=Off ../kstars -DCMAKE_BUILD_TYPE=Release || { echo "KStars failed"; exit 1; } } [ ! -d ../build-kstars ] && { cmake -B ../build-kstars -DBUILD_TESTING=Off ../kstars -DCMAKE_BUILD_TYPE=Release || { echo "KStars failed"; exit 1; } }
cd ../build-kstars cd ../build-kstars
make -j 4 || { echo "KStars failed"; exit 1; } make -j $JOBS || { echo "KStars failed"; exit 1; }
sudo make install || { echo "KStars failed"; exit 1; } sudo make install || { echo "KStars failed"; exit 1; }
exit exit
@@ -64,5 +66,5 @@ cd phd2
[ $CHECKOUT == 1 ] && git pull origin [ $CHECKOUT == 1 ] && git pull origin
[ ! -d ../build-phd2 ] && cmake -B ../build-phd2 ../phd2 -DCMAKE_BUILD_TYPE=Release || { echo "PHD2 failed"; exit 1; } [ ! -d ../build-phd2 ] && cmake -B ../build-phd2 ../phd2 -DCMAKE_BUILD_TYPE=Release || { echo "PHD2 failed"; exit 1; }
cd ../build-phd2 || { echo "PHD2 failed"; exit 1; } cd ../build-phd2 || { echo "PHD2 failed"; exit 1; }
make -j 4 || { echo "PHD2 failed"; exit 1; } make -j $JOBS || { echo "PHD2 failed"; exit 1; }
sudo make install sudo make install