diff --git a/build-soft-latest.sh b/build-soft-latest.sh index 9af7ca8..9a0a76f 100755 --- a/build-soft-latest.sh +++ b/build-soft-latest.sh @@ -20,12 +20,12 @@ fi cd "$ROOTDIR" # delete all previously installed files -[ -f build-libXISF/install_manifest.txt ] && echo "Deleting libXISF"; cat build-libXISF/install_manifest.txt | sudo xargs rm -f -[ -f build-indi/install_manifest.txt ] && echo "Deleting INDI"; cat build-indi/install_manifest.txt | sudo xargs rm -f +[ -f build-libXISF/install_manifest.txt ] && echo "Deleting libXISF" && cat build-libXISF/install_manifest.txt | sudo xargs rm -f +[ -f build-indi/install_manifest.txt ] && echo "Deleting INDI" && cat build-indi/install_manifest.txt | sudo xargs rm -f [ -f build-indi-lib/install_manifest.txt ] && cat build-indi-lib/install_manifest.txt | sudo xargs rm -f -[ -f build-indi-3rdparty/install_manifest.txt ] && echo "Deleting INDI 3rdparty"; cat build-indi-3rdparty/install_manifest.txt | sudo xargs rm -f -[ -f build-stellarsolver/install_manifest.txt ] && echo "Deleting stellarsolver"; cat build-stellarsolver/install_manifest.txt | sudo xargs rm -f -[ -f build-kstars/install_manifest.txt ] && echo "Deleting KStars"; cat build-kstars/install_manifest.txt | sudo xargs rm -f +[ -f build-indi-3rdparty/install_manifest.txt ] && echo "Deleting INDI 3rdparty" && cat build-indi-3rdparty/install_manifest.txt | sudo xargs rm -f +[ -f build-stellarsolver/install_manifest.txt ] && echo "Deleting stellarsolver" && cat build-stellarsolver/install_manifest.txt | sudo xargs rm -f +[ -f build-kstars/install_manifest.txt ] && echo "Deleting KStars" && cat build-kstars/install_manifest.txt | sudo xargs rm -f [ ! -d "libXISF" ] && { git clone https://gitea.nouspiro.space/nou/libXISF.git || { echo "Failed to clone LibXISF"; exit 1; } } cd libXISF @@ -62,7 +62,7 @@ cd "$ROOTDIR" [ ! -d "stellarsolver" ] && { git clone --depth=1 https://github.com/rlancaste/stellarsolver.git || { echo "Failed to clone stellarsolver"; exit 1; } } cd stellarsolver git pull origin -[ ! -d ../build-stellarsolver ] && { cmake -B ../build-stellarsolver ../stellarsolver -DCMAKE_BUILD_TYPE=Release || { echo "Stellarsolfer configuration failed"; exit 1; } } +[ ! -d ../build-stellarsolver ] && { cmake -B ../build-stellarsolver ../stellarsolver -DUSE_QT5=ON -DCMAKE_BUILD_TYPE=Release || { echo "Stellarsolver configuration failed"; exit 1; } } cd ../build-stellarsolver make -j $JOBS || { echo "Stellarsolver compilation failed"; exit 1; } sudo make install || { echo "Stellarsolver installation failed"; exit 1; } diff --git a/build-soft-stable.sh b/build-soft-stable.sh index 26f1b85..33a89e5 100755 --- a/build-soft-stable.sh +++ b/build-soft-stable.sh @@ -26,12 +26,12 @@ fi cd "$ROOTDIR" # delete all previously installed files -[ -f build-libXISF/install_manifest.txt ] && echo "Deleting libXISF"; cat build-libXISF/install_manifest.txt | sudo xargs rm -f -[ -f build-indi/install_manifest.txt ] && echo "Deleting INDI"; cat build-indi/install_manifest.txt | sudo xargs rm -f +[ -f build-libXISF/install_manifest.txt ] && echo "Deleting libXISF" && cat build-libXISF/install_manifest.txt | sudo xargs rm -f +[ -f build-indi/install_manifest.txt ] && echo "Deleting INDI" && cat build-indi/install_manifest.txt | sudo xargs rm -f [ -f build-indi-lib/install_manifest.txt ] && cat build-indi-lib/install_manifest.txt | sudo xargs rm -f -[ -f build-indi-3rdparty/install_manifest.txt ] && echo "Deleting INDI 3rdparty"; cat build-indi-3rdparty/install_manifest.txt | sudo xargs rm -f -[ -f build-stellarsolver/install_manifest.txt ] && echo "Deleting stellarsolver"; cat build-stellarsolver/install_manifest.txt | sudo xargs rm -f -[ -f build-kstars/install_manifest.txt ] && echo "Deleting KStars"; cat build-kstars/install_manifest.txt | sudo xargs rm -f +[ -f build-indi-3rdparty/install_manifest.txt ] && echo "Deleting INDI 3rdparty" && cat build-indi-3rdparty/install_manifest.txt | sudo xargs rm -f +[ -f build-stellarsolver/install_manifest.txt ] && echo "Deleting stellarsolver" && cat build-stellarsolver/install_manifest.txt | sudo xargs rm -f +[ -f build-kstars/install_manifest.txt ] && echo "Deleting KStars" && cat build-kstars/install_manifest.txt | sudo xargs rm -f [ ! -d "libXISF" ] && { git clone https://gitea.nouspiro.space/nou/libXISF.git || { echo "Failed to clone LibXISF"; exit 1; } } cd libXISF @@ -72,7 +72,7 @@ cd "$ROOTDIR" cd stellarsolver git fetch origin git switch -d --discard-changes $STELLAR_COMMIT -[ ! -d ../build-stellarsolver ] && { cmake -B ../build-stellarsolver ../stellarsolver -DCMAKE_BUILD_TYPE=Release || { echo "Stellarsolfer configuration failed"; exit 1; } } +[ ! -d ../build-stellarsolver ] && { cmake -B ../build-stellarsolver ../stellarsolver -DUSE_QT5=ON -DCMAKE_BUILD_TYPE=Release || { echo "Stellarsolver configuration failed"; exit 1; } } cd ../build-stellarsolver make -j $JOBS || { echo "Stellarsolver compilation failed"; exit 1; } sudo make install || { echo "Stellarsolver installation failed"; exit 1; }