From b08afb22374b42a65d69d9148265d6065cad6a5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Du=C5=A1an=20Poizl?= Date: Thu, 6 Apr 2023 09:35:23 +0200 Subject: [PATCH] Update INDI 2.0.1, KStars 3.6.4 --- build-soft-latest.sh | 39 ++++++++++++++++++++++-------------- build-soft-stable.sh | 47 +++++++++++++++++++++++++++----------------- 2 files changed, 53 insertions(+), 33 deletions(-) diff --git a/build-soft-latest.sh b/build-soft-latest.sh index efa5f6c..a757d05 100755 --- a/build-soft-latest.sh +++ b/build-soft-latest.sh @@ -17,45 +17,54 @@ fi [ ! -d "$ROOTDIR" ] && mkdir $ROOTDIR cd "$ROOTDIR" +[ ! -d "libXISF" ] && git clone https://gitea.nouspiro.space/nou/libXISF.git +cd libXISF +git pull origin +[ ! -d ../build-libXISF ] && { cmake -B ../build-libXISF ../libXISF -DCMAKE_BUILD_TYPE=Release || { echo "LibXISF configuration failed"; exit 1; } } +cd ../build-libXISF +make -j $JOBS || { echo "LibXISF compilation failed"; exit 1; } +sudo make install || { echo "LibXISF installation failed"; exit 1; } + +cd "$ROOTDIR" [ ! -d "indi" ] && git clone --depth=1 https://github.com/indilib/indi.git cd indi 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 configuration failed"; exit 1; } } cd ../build-indi -make -j $JOBS || { echo "INDI failed"; exit 1; } -sudo make install || { echo "INDI failed"; exit 1; } +make -j $JOBS || { echo "INDI compilation failed"; exit 1; } +sudo make install || { echo "INDI installation failed"; exit 1; } cd "$ROOTDIR" [ ! -d "indi-3rdparty" ] && git clone --depth=1 https://github.com/indilib/indi-3rdparty.git cd indi-3rdparty 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 configuration failed"; exit 1; } } cd ../build-indi-lib -make -j $JOBS || { echo "INDI lib failed"; exit 1; } -sudo make install || { echo "INDI lib failed"; exit 1; } +make -j $JOBS || { echo "INDI lib compilation failed"; exit 1; } +sudo make install || { echo "INDI lib installation 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 configuration failed"; exit 1; } } cd ../build-indi-3rdparty -make -j $JOBS || { echo "INDI 3rd-party failed"; exit 1; } -sudo make install || { echo "INDI lib failed"; exit 1; } +make -j $JOBS || { echo "INDI 3rd-party compilation failed"; exit 1; } +sudo make install || { echo "INDI lib installation failed"; exit 1; } cd "$ROOTDIR" [ ! -d "stellarsolver" ] && git clone --depth=1 https://github.com/rlancaste/stellarsolver.git cd stellarsolver 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 configuration failed"; exit 1; } } cd ../build-stellarsolver -make -j $JOBS || { echo "Stellarsolver failed"; exit 1; } -sudo make install || { echo "Stellarsolver failed"; exit 1; } +make -j $JOBS || { echo "Stellarsolver compilation failed"; exit 1; } +sudo make install || { echo "Stellarsolver installation failed"; exit 1; } cd "$ROOTDIR" [ ! -d "kstars" ] && git clone --depth=1 https://invent.kde.org/education/kstars.git cd kstars 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 configuration failed"; exit 1; } } cd ../build-kstars -make -j $JOBS || { echo "KStars failed"; exit 1; } -sudo make install || { echo "KStars failed"; exit 1; } +make -j $JOBS || { echo "KStars compilation failed"; exit 1; } +sudo make install || { echo "KStars installation failed"; exit 1; } exit cd "$ROOTDIR" diff --git a/build-soft-stable.sh b/build-soft-stable.sh index 38c97ae..a87de2f 100755 --- a/build-soft-stable.sh +++ b/build-soft-stable.sh @@ -3,10 +3,11 @@ export CFLAGS="-march=native -w -Wno-psabi -D_FILE_OFFSET_BITS=64" export CXXFLAGS="-march=native -w -Wno-psabi -D_FILE_OFFSET_BITS=64" -INDI_COMMIT="431869ffe400053fea79f227f80b175c593b3db8" -INDI_3RD_COMMIT="6e677050e9ca39e0055ec29e140fac28998dd0f1" +LIBXISF_COMMIT="164183f348e8e01351dcd04e47bc32993677d628" +INDI_COMMIT="7249943e04e927108c5972eb4921c42497fb64b5" +INDI_3RD_COMMIT="b36aed0cef7da8b4faacbf7cb2c768e3be3b25be" STELLAR_COMMIT="9013092ce5791514cf48a32b0b73923fe879eabf" -KSTARS_COMMIT="origin/stable-3.6.3" +KSTARS_COMMIT="origin/stable-3.6.4" ROOTDIR="$HOME/astro-soft-stable" @@ -22,49 +23,59 @@ fi [ ! -d "$ROOTDIR" ] && mkdir $ROOTDIR cd "$ROOTDIR" +[ ! -d "libXISF" ] && git clone https://gitea.nouspiro.space/nou/libXISF.git +cd libXISF +git fetch origin +git checkout $LIBXISF_COMMIT +[ ! -d ../build-libXISF ] && { cmake -B ../build-libXISF ../libXISF -DCMAKE_BUILD_TYPE=Release || { echo "LibXISF configuration failed"; exit 1; } } +cd ../build-libXISF +make -j $JOBS || { echo "LibXISF compilation failed"; exit 1; } +sudo make install || { echo "LibXISF installation failed"; exit 1; } + +cd "$ROOTDIR" [ ! -d "indi" ] && git clone https://github.com/indilib/indi.git cd indi git fetch origin 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 configuration failed"; exit 1; } } cd ../build-indi -make -j $JOBS || { echo "INDI failed"; exit 1; } -sudo make install || { echo "INDI failed"; exit 1; } +make -j $JOBS || { echo "INDI compilation failed"; exit 1; } +sudo make install || { echo "INDI installation failed"; exit 1; } cd "$ROOTDIR" [ ! -d "indi-3rdparty" ] && git clone https://github.com/indilib/indi-3rdparty.git cd indi-3rdparty git fetch origin 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 configuration failed"; exit 1; } } cd ../build-indi-lib -make -j $JOBS || { echo "INDI lib failed"; exit 1; } -sudo make install || { echo "INDI lib failed"; exit 1; } +make -j $JOBS || { echo "INDI lib compilation failed"; exit 1; } +sudo make install || { echo "INDI lib installation 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 configuration failed"; exit 1; } } cd ../build-indi-3rdparty -make -j $JOBS || { echo "INDI 3rd-party failed"; exit 1; } -sudo make install || { echo "INDI lib failed"; exit 1; } +make -j $JOBS || { echo "INDI 3rd-party compilation failed"; exit 1; } +sudo make install || { echo "INDI lib installation failed"; exit 1; } cd "$ROOTDIR" [ ! -d "stellarsolver" ] && git clone https://github.com/rlancaste/stellarsolver.git cd stellarsolver git fetch origin 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 configuration failed"; exit 1; } } cd ../build-stellarsolver -make -j $JOBS || { echo "Stellarsolver failed"; exit 1; } -sudo make install || { echo "Stellarsolver failed"; exit 1; } +make -j $JOBS || { echo "Stellarsolver compilation failed"; exit 1; } +sudo make install || { echo "Stellarsolver installation failed"; exit 1; } cd "$ROOTDIR" [ ! -d "kstars" ] && git clone https://invent.kde.org/education/kstars.git cd kstars git fetch origin git checkout --detach $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 configuration failed"; exit 1; } } cd ../build-kstars -make -j $JOBS || { echo "KStars failed"; exit 1; } -sudo make install || { echo "KStars failed"; exit 1; } +make -j $JOBS || { echo "KStars compilation failed"; exit 1; } +sudo make install || { echo "KStars installation failed"; exit 1; } exit cd "$ROOTDIR"