Skip to content

Commit

Permalink
When handling the ABC dependency of STP, compare the version with 2.3…
Browse files Browse the repository at this point in the history
….4 instead of master, which will also handle future releases
  • Loading branch information
ccadar authored and ocelaiwo committed Oct 22, 2024
1 parent 277a670 commit 4edfe7e
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions scripts/build/p-stp.inc
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
# Build scripts for STP
# Variables that any artifact of this package might depend on
setup_build_variables_stp() {
source "${DIR}/common-functions"

STP_SUFFIX="${SANITIZER_SUFFIX}"

MINISAT_BUILD_PATH="${BASE}/minisat-build${STP_SUFFIX}"
MINISAT_INSTALL_PATH="${BASE}/minisat-install${STP_SUFFIX}"

if [[ "${STP_VERSION}" == "master" ]]; then
if version_gt "${STP_VERSION}" "2.3.4"; then
ABC_INSTALL_PATH="${BASE}/stp-${STP_VERSION}-build${STP_SUFFIX}/lib/extlib-abc/build/"
fi

Expand All @@ -18,14 +20,13 @@ setup_build_variables_stp() {
}

download_stp() {
source "${DIR}/common-functions"
# Download minisat
git_clone_or_update https://github.com/stp/minisat "${BASE}/minisat" "master"

# Download STP
git_clone_or_update "${stp_url}" "${BASE}/stp-${STP_VERSION}" "${STP_VERSION}"

if [[ "${STP_VERSION}" == "master" ]]; then
if version_gt "${STP_VERSION}" "2.3.4"; then
cd "${BASE}/stp-${STP_VERSION}" || return 1
git submodule init
git submodule update
Expand Down Expand Up @@ -108,7 +109,7 @@ get_build_artifacts_stp() {
setup_build_variables_stp
echo "${MINISAT_INSTALL_PATH}"
echo "${STP_INSTALL_PATH}"
if [[ "${STP_VERSION}" == "master" ]]; then
if version_gt "${STP_VERSION}" "2.3.4"; then
echo "${ABC_INSTALL_PATH}"
fi
)
Expand Down

0 comments on commit 4edfe7e

Please sign in to comment.