Skip to content

Commit

Permalink
Regenerate artifacts.
Browse files Browse the repository at this point in the history
  • Loading branch information
pmienk committed Jan 4, 2025
1 parent 243d520 commit f0d8b5a
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 9 deletions.
12 changes: 9 additions & 3 deletions install-cmake.sh
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,12 @@

# Define constants.
#==============================================================================
# Branches for github dependencies.
#------------------------------------------------------------------------------
SECP256K1_BRANCH="v0.5.1"
BITCOIN_SYSTEM_BRANCH="master"
BITCOIN_PROTOCOL_BRANCH="master"

# Sentinel for comparison of sequential build.
#------------------------------------------------------------------------------
SEQUENTIAL=1
Expand Down Expand Up @@ -933,20 +939,20 @@ 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 "$@"
export CPPFLAGS=$SAVE_CPPFLAGS
local SAVE_CPPFLAGS="$CPPFLAGS"
export CPPFLAGS="$CPPFLAGS ${BITCOIN_PROTOCOL_FLAGS[@]}"
if [[ ! ($CI == true) ]]; then
create_from_github libbitcoin libbitcoin-protocol master "yes"
create_from_github libbitcoin libbitcoin-protocol ${BITCOIN_PROTOCOL_BRANCH} "yes"
build_from_github_cmake libbitcoin-protocol "$PARALLEL" true "yes" "${BITCOIN_PROTOCOL_OPTIONS[@]}" $CUMULATIVE_FILTERED_ARGS_CMAKE "$@"
else
push_directory "$PRESUMED_CI_PROJECT_PATH"
Expand Down
12 changes: 9 additions & 3 deletions install-cmakepresets.sh
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,12 @@

# Define constants.
#==============================================================================
# Branches for github dependencies.
#------------------------------------------------------------------------------
SECP256K1_BRANCH="v0.5.1"
BITCOIN_SYSTEM_BRANCH="master"
BITCOIN_PROTOCOL_BRANCH="master"


# Declare associative array for computed presets.
#------------------------------------------------------------------------------
Expand Down Expand Up @@ -972,12 +978,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]}"
Expand All @@ -986,7 +992,7 @@ build_all()
local SAVE_CPPFLAGS="$CPPFLAGS"
export CPPFLAGS="$CPPFLAGS ${BITCOIN_PROTOCOL_FLAGS[@]}"
if [[ ! ($CI == true) ]]; then
create_from_github libbitcoin libbitcoin-protocol master "yes"
create_from_github libbitcoin libbitcoin-protocol ${BITCOIN_PROTOCOL_BRANCH} "yes"
display_message "libbitcoin-protocol PRESET ${REPO_PRESET[libbitcoin-protocol]}"
build_from_github_cmake libbitcoin-protocol ${REPO_PRESET[libbitcoin-protocol]} "$PARALLEL" true "yes" "${BITCOIN_PROTOCOL_OPTIONS[@]}" $CUMULATIVE_FILTERED_ARGS_CMAKE "$@"
else
Expand Down
12 changes: 9 additions & 3 deletions install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,12 @@

# Define constants.
#==============================================================================
# Branches for github dependencies.
#------------------------------------------------------------------------------
SECP256K1_BRANCH="v0.5.1"
BITCOIN_SYSTEM_BRANCH="master"
BITCOIN_PROTOCOL_BRANCH="master"

# Sentinel for comparison of sequential build.
#------------------------------------------------------------------------------
SEQUENTIAL=1
Expand Down Expand Up @@ -808,20 +814,20 @@ 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[@]}" "$@"
export CPPFLAGS=$SAVE_CPPFLAGS
local SAVE_CPPFLAGS="$CPPFLAGS"
export CPPFLAGS="$CPPFLAGS ${BITCOIN_PROTOCOL_FLAGS[@]}"
if [[ ! ($CI == true) ]]; then
create_from_github libbitcoin libbitcoin-protocol master "yes"
create_from_github libbitcoin libbitcoin-protocol ${BITCOIN_PROTOCOL_BRANCH} "yes"
build_from_github libbitcoin-protocol "$PARALLEL" true "yes" "${BITCOIN_PROTOCOL_OPTIONS[@]}" "$@"
else
push_directory "$PRESUMED_CI_PROJECT_PATH"
Expand Down

0 comments on commit f0d8b5a

Please sign in to comment.