From e0ff7aead9f8dcf7f3451b2073268ff721045bdd Mon Sep 17 00:00:00 2001 From: Phillip Mienk Date: Sat, 4 Jan 2025 00:44:04 -0800 Subject: [PATCH] Regenerate artifacts. --- install-cmake.sh | 12 +++++++++--- install-cmakepresets.sh | 12 +++++++++--- install.sh | 12 +++++++++--- 3 files changed, 27 insertions(+), 9 deletions(-) diff --git a/install-cmake.sh b/install-cmake.sh index 99679774..2eb014ee 100755 --- a/install-cmake.sh +++ b/install-cmake.sh @@ -38,6 +38,12 @@ # Define constants. #============================================================================== +# Branches for github dependencies. +#------------------------------------------------------------------------------ +SECP256K1_BRANCH="v0.5.1" +BITCOIN_SYSTEM_BRANCH="master" +BITCOIN_DATABASE_BRANCH="master" + # Sentinel for comparison of sequential build. #------------------------------------------------------------------------------ SEQUENTIAL=1 @@ -919,12 +925,12 @@ build_all() export CPPFLAGS="$CPPFLAGS ${BOOST_FLAGS[@]}" build_from_tarball_boost "$BOOST_ARCHIVE" "$PARALLEL" "$BUILD_BOOST" "${BOOST_OPTIONS[@]}" export CPPFLAGS=$SAVE_CPPFLAGS - create_from_github bitcoin-core secp256k1 v0.5.1 "$BUILD_SECP256K1" + create_from_github bitcoin-core secp256k1 ${SECP256K1_BRANCH} "$BUILD_SECP256K1" local SAVE_CPPFLAGS="$CPPFLAGS" export CPPFLAGS="$CPPFLAGS ${SECP256K1_FLAGS[@]}" build_from_github secp256k1 "$PARALLEL" false "$BUILD_SECP256K1" "${SECP256K1_OPTIONS[@]}" $CUMULATIVE_FILTERED_ARGS export CPPFLAGS=$SAVE_CPPFLAGS - create_from_github libbitcoin libbitcoin-system master "yes" + create_from_github libbitcoin libbitcoin-system ${BITCOIN_SYSTEM_BRANCH} "yes" local SAVE_CPPFLAGS="$CPPFLAGS" export CPPFLAGS="$CPPFLAGS ${BITCOIN_SYSTEM_FLAGS[@]}" build_from_github_cmake libbitcoin-system "$PARALLEL" false "yes" "${BITCOIN_SYSTEM_OPTIONS[@]}" $CUMULATIVE_FILTERED_ARGS_CMAKE "$@" @@ -932,7 +938,7 @@ build_all() local SAVE_CPPFLAGS="$CPPFLAGS" export CPPFLAGS="$CPPFLAGS ${BITCOIN_DATABASE_FLAGS[@]}" if [[ ! ($CI == true) ]]; then - create_from_github libbitcoin libbitcoin-database master "yes" + create_from_github libbitcoin libbitcoin-database ${BITCOIN_DATABASE_BRANCH} "yes" build_from_github_cmake libbitcoin-database "$PARALLEL" true "yes" "${BITCOIN_DATABASE_OPTIONS[@]}" $CUMULATIVE_FILTERED_ARGS_CMAKE "$@" else push_directory "$PRESUMED_CI_PROJECT_PATH" diff --git a/install-cmakepresets.sh b/install-cmakepresets.sh index de0bfa5e..457b5408 100755 --- a/install-cmakepresets.sh +++ b/install-cmakepresets.sh @@ -39,6 +39,12 @@ # Define constants. #============================================================================== +# Branches for github dependencies. +#------------------------------------------------------------------------------ +SECP256K1_BRANCH="v0.5.1" +BITCOIN_SYSTEM_BRANCH="master" +BITCOIN_DATABASE_BRANCH="master" + # Declare associative array for computed presets. #------------------------------------------------------------------------------ @@ -958,12 +964,12 @@ build_all() export CPPFLAGS="$CPPFLAGS ${BOOST_FLAGS[@]}" build_from_tarball_boost "$BOOST_ARCHIVE" "$PARALLEL" "$BUILD_BOOST" "${BOOST_OPTIONS[@]}" export CPPFLAGS=$SAVE_CPPFLAGS - create_from_github bitcoin-core secp256k1 v0.5.1 "$BUILD_SECP256K1" + create_from_github bitcoin-core secp256k1 ${SECP256K1_BRANCH} "$BUILD_SECP256K1" local SAVE_CPPFLAGS="$CPPFLAGS" export CPPFLAGS="$CPPFLAGS ${SECP256K1_FLAGS[@]}" build_from_github secp256k1 "$PARALLEL" false "$BUILD_SECP256K1" "${SECP256K1_OPTIONS[@]}" $CUMULATIVE_FILTERED_ARGS export CPPFLAGS=$SAVE_CPPFLAGS - create_from_github libbitcoin libbitcoin-system master "yes" + create_from_github libbitcoin libbitcoin-system ${BITCOIN_SYSTEM_BRANCH} "yes" local SAVE_CPPFLAGS="$CPPFLAGS" export CPPFLAGS="$CPPFLAGS ${BITCOIN_SYSTEM_FLAGS[@]}" display_message "libbitcoin-system PRESET ${REPO_PRESET[libbitcoin-system]}" @@ -972,7 +978,7 @@ build_all() local SAVE_CPPFLAGS="$CPPFLAGS" export CPPFLAGS="$CPPFLAGS ${BITCOIN_DATABASE_FLAGS[@]}" if [[ ! ($CI == true) ]]; then - create_from_github libbitcoin libbitcoin-database master "yes" + create_from_github libbitcoin libbitcoin-database ${BITCOIN_DATABASE_BRANCH} "yes" display_message "libbitcoin-database PRESET ${REPO_PRESET[libbitcoin-database]}" build_from_github_cmake libbitcoin-database ${REPO_PRESET[libbitcoin-database]} "$PARALLEL" true "yes" "${BITCOIN_DATABASE_OPTIONS[@]}" $CUMULATIVE_FILTERED_ARGS_CMAKE "$@" else diff --git a/install.sh b/install.sh index 0c0ac1d7..c041a899 100755 --- a/install.sh +++ b/install.sh @@ -38,6 +38,12 @@ # Define constants. #============================================================================== +# Branches for github dependencies. +#------------------------------------------------------------------------------ +SECP256K1_BRANCH="v0.5.1" +BITCOIN_SYSTEM_BRANCH="master" +BITCOIN_DATABASE_BRANCH="master" + # Sentinel for comparison of sequential build. #------------------------------------------------------------------------------ SEQUENTIAL=1 @@ -794,12 +800,12 @@ build_all() export CPPFLAGS="$CPPFLAGS ${BOOST_FLAGS[@]}" build_from_tarball_boost "$BOOST_ARCHIVE" "$PARALLEL" "$BUILD_BOOST" "${BOOST_OPTIONS[@]}" export CPPFLAGS=$SAVE_CPPFLAGS - create_from_github bitcoin-core secp256k1 v0.5.1 "$BUILD_SECP256K1" + create_from_github bitcoin-core secp256k1 ${SECP256K1_BRANCH} "$BUILD_SECP256K1" local SAVE_CPPFLAGS="$CPPFLAGS" export CPPFLAGS="$CPPFLAGS ${SECP256K1_FLAGS[@]}" build_from_github secp256k1 "$PARALLEL" false "$BUILD_SECP256K1" "${SECP256K1_OPTIONS[@]}" "$@" export CPPFLAGS=$SAVE_CPPFLAGS - create_from_github libbitcoin libbitcoin-system master "yes" + create_from_github libbitcoin libbitcoin-system ${BITCOIN_SYSTEM_BRANCH} "yes" local SAVE_CPPFLAGS="$CPPFLAGS" export CPPFLAGS="$CPPFLAGS ${BITCOIN_SYSTEM_FLAGS[@]}" build_from_github libbitcoin-system "$PARALLEL" false "yes" "${BITCOIN_SYSTEM_OPTIONS[@]}" "$@" @@ -807,7 +813,7 @@ build_all() local SAVE_CPPFLAGS="$CPPFLAGS" export CPPFLAGS="$CPPFLAGS ${BITCOIN_DATABASE_FLAGS[@]}" if [[ ! ($CI == true) ]]; then - create_from_github libbitcoin libbitcoin-database master "yes" + create_from_github libbitcoin libbitcoin-database ${BITCOIN_DATABASE_BRANCH} "yes" build_from_github libbitcoin-database "$PARALLEL" true "yes" "${BITCOIN_DATABASE_OPTIONS[@]}" "$@" else push_directory "$PRESUMED_CI_PROJECT_PATH"