diff options
| -rwxr-xr-x | contrib/get-abc | 1 | ||||
| -rwxr-xr-x | contrib/get-cadical | 1 | ||||
| -rwxr-xr-x | contrib/get-cryptominisat | 1 | ||||
| -rwxr-xr-x | contrib/get-drat2er | 1 | ||||
| -rwxr-xr-x | contrib/get-glpk-cut-log | 1 | ||||
| -rwxr-xr-x | contrib/get-gmp-dev | 2 | ||||
| -rwxr-xr-x | contrib/get-kissat | 2 | ||||
| -rwxr-xr-x | contrib/get-lfsc-checker | 1 | ||||
| -rwxr-xr-x | contrib/get-poly | 1 | ||||
| -rw-r--r-- | contrib/get-script-header.sh | 10 | ||||
| -rwxr-xr-x | contrib/get-symfpu | 1 |
11 files changed, 1 insertions, 21 deletions
diff --git a/contrib/get-abc b/contrib/get-abc index 108720066..9f37a69e3 100755 --- a/contrib/get-abc +++ b/contrib/get-abc @@ -5,7 +5,6 @@ source "$(dirname "$0")/get-script-header.sh" ABC_DIR="$DEPS_DIR/abc" commit=3d7034bf619aada30b0ba1e8afcb151d304ab556 -check_dep_dir "$ABC_DIR" setup_dep "https://github.com/berkeley-abc/abc/archive/$commit.tar.gz" "$ABC_DIR" cd "$ABC_DIR" diff --git a/contrib/get-cadical b/contrib/get-cadical index a253514e8..bb3fab2fa 100755 --- a/contrib/get-cadical +++ b/contrib/get-cadical @@ -5,7 +5,6 @@ source "$(dirname "$0")/get-script-header.sh" CADICAL_DIR="$DEPS_DIR/cadical" version="rel-1.2.1" -check_dep_dir "$CADICAL_DIR" setup_dep \ "https://github.com/arminbiere/cadical/archive/$version.tar.gz" "$CADICAL_DIR" cd "$CADICAL_DIR" diff --git a/contrib/get-cryptominisat b/contrib/get-cryptominisat index 476d1ff10..263939bcc 100755 --- a/contrib/get-cryptominisat +++ b/contrib/get-cryptominisat @@ -5,7 +5,6 @@ source "$(dirname "$0")/get-script-header.sh" CMS_DIR="$DEPS_DIR/cryptominisat5" version="5.8.0" -check_dep_dir "$CMS_DIR" setup_dep \ "https://github.com/msoos/cryptominisat/archive/$version.tar.gz" \ "$CMS_DIR" diff --git a/contrib/get-drat2er b/contrib/get-drat2er index f04365890..318de1b83 100755 --- a/contrib/get-drat2er +++ b/contrib/get-drat2er @@ -5,7 +5,6 @@ source "$(dirname "$0")/get-script-header.sh" DRAT2ER_DIR="$DEPS_DIR/drat2er" commit=521caf16149df3dfa46f700ec1fab56f8cc12a18 -check_dep_dir "$DRAT2ER_DIR" setup_dep \ "https://github.com/alex-ozdemir/drat2er/archive/$commit.tar.gz" \ "$DRAT2ER_DIR" diff --git a/contrib/get-glpk-cut-log b/contrib/get-glpk-cut-log index 17ace0dcd..f8eff85bb 100755 --- a/contrib/get-glpk-cut-log +++ b/contrib/get-glpk-cut-log @@ -12,7 +12,6 @@ patch_file=${contrib_dir}/glpk-cut-log.patch GLPK_DIR="$DEPS_DIR/glpk-cut-log" version="4.52" -check_dep_dir "$GLPK_DIR" setup_dep \ "https://ftp.gnu.org/gnu/glpk/glpk-${version}.tar.gz" \ "$GLPK_DIR" diff --git a/contrib/get-gmp-dev b/contrib/get-gmp-dev index ef2023d04..3fc913a7d 100755 --- a/contrib/get-gmp-dev +++ b/contrib/get-gmp-dev @@ -17,8 +17,6 @@ source "$(dirname "$0")/get-script-header.sh" GMP_DIR="$DEPS_DIR/gmp-$GMPVERSION" -check_dep_dir "$GMP_DIR" - echo ============================================================================= echo echo "This script should only be used if your distribution does not ship with the" diff --git a/contrib/get-kissat b/contrib/get-kissat index 7b513caef..2e21bb69b 100755 --- a/contrib/get-kissat +++ b/contrib/get-kissat @@ -7,8 +7,6 @@ source "$(dirname "$0")/get-script-header.sh" KISSAT_DIR="${DEPS_DIR}/kissat" version="sc2020-039805f2" -check_dep_dir "${KISSAT_DIR}" - # Download and build Kissat setup_dep \ "http://fmv.jku.at/kissat/kissat-$version.tar.xz" "$KISSAT_DIR" diff --git a/contrib/get-lfsc-checker b/contrib/get-lfsc-checker index e7bee86c0..0db781b4a 100755 --- a/contrib/get-lfsc-checker +++ b/contrib/get-lfsc-checker @@ -5,7 +5,6 @@ source "$(dirname "$0")/get-script-header.sh" LFSC_DIR="$DEPS_DIR/lfsc-checker" version="master" -check_dep_dir "$LFSC_DIR" setup_dep "https://github.com/CVC4/LFSC/archive/$version.tar.gz" "$LFSC_DIR" cd "$LFSC_DIR" diff --git a/contrib/get-poly b/contrib/get-poly index a0bc181ed..d2e0935b6 100755 --- a/contrib/get-poly +++ b/contrib/get-poly @@ -5,7 +5,6 @@ source "$(dirname "$0")/get-script-header.sh" POLY_DIR="$DEPS_DIR/poly" version="v0.1.8" -check_dep_dir "$POLY_DIR" setup_dep \ "https://github.com/SRI-CSL/libpoly/archive/master.tar.gz" "$POLY_DIR" # TODO(Gereon, #4706): Go back to fixed version with the next release diff --git a/contrib/get-script-header.sh b/contrib/get-script-header.sh index 7a88b3be2..64ef54401 100644 --- a/contrib/get-script-header.sh +++ b/contrib/get-script-header.sh @@ -50,6 +50,7 @@ function setup_dep url="$1" directory="$2" echo "Setting up $directory ..." + rm -rf "$directory" mkdir -p "$directory" cd "$directory" webget "$url" archive @@ -57,15 +58,6 @@ function setup_dep rm archive } -function check_dep_dir -{ - if [ -e "$1" ]; then - echo "error: file or directory '$1' exists; please move it out of the way." >&2 - exit 1 - fi -} - - # Some of our dependencies do not provide a make install rule. Use the # following helper functions to copy libraries/headers/binaries into the # corresponding directories in deps/install. diff --git a/contrib/get-symfpu b/contrib/get-symfpu index 885bad62e..383a620d9 100755 --- a/contrib/get-symfpu +++ b/contrib/get-symfpu @@ -5,7 +5,6 @@ source "$(dirname "$0")/get-script-header.sh" SYMFPU_DIR="$DEPS_DIR/symfpu-CVC4" commit="8fbe139bf0071cbe0758d2f6690a546c69ff0053" -check_dep_dir "$SYMFPU_DIR" setup_dep \ "https://github.com/martin-cs/symfpu/archive/$commit.tar.gz" "$SYMFPU_DIR" cd "$SYMFPU_DIR" |