Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 8 additions & 13 deletions install-cmake.sh
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ fi

# The default build directory.
#------------------------------------------------------------------------------
BUILD_DIR="build-libbitcoin-protocol"
BUILD_SRC_DIR="build-libbitcoin-protocol"

PRESUMED_CI_PROJECT_PATH=$(pwd)

Expand Down Expand Up @@ -166,13 +166,13 @@ make_jobs()
shift 1

VERBOSITY=""
if [[ DISPLAY_VERBOSE ]]; then
if [[ $DISPLAY_VERBOSE ]]; then
VERBOSITY="VERBOSE=1"
fi

SEQUENTIAL=1
# Avoid setting -j1 (causes problems on single threaded systems [TRAVIS]).
if [[ $JOBS > $SEQUENTIAL ]]; then
if [[ $JOBS -gt $SEQUENTIAL ]]; then
make -j"$JOBS" "$@" $VERBOSITY
else
make "$@" $VERBOSITY
Expand Down Expand Up @@ -278,7 +278,7 @@ parse_command_line_options()
(--build-secp256k1) BUILD_SECP256K1="yes";;

# Unique script options.
(--build-dir=*) BUILD_DIR="${OPTION#*=}";;
(--build-dir=*) BUILD_SRC_DIR="${OPTION#*=}";;

# Handle ndebug declarations due to disabled argument passthrough
(--enable-ndebug) ENABLE_NDEBUG="yes";;
Expand Down Expand Up @@ -332,11 +332,6 @@ set_os_specific_compiler_settings()
else # Linux
STDLIB="stdc++"
fi

if [[ ($OS == Darwin) && ($CC == clang*) ]]; then
CFLAGS="${CFLAGS} -DBOOST_NO_CXX98_FUNCTION_BASE"
CXXFLAGS="${CXXFLAGS} -DBOOST_NO_CXX98_FUNCTION_BASE"
fi
}

link_to_standard_library()
Expand Down Expand Up @@ -488,7 +483,7 @@ display_configuration()
display_message "BUILD_BOOST : $BUILD_BOOST"
display_message "BUILD_SECP256K1 : $BUILD_SECP256K1"
display_message "BOOST_ROOT : $BOOST_ROOT"
display_message "BUILD_DIR : $BUILD_DIR"
display_message "BUILD_SRC_DIR : $BUILD_SRC_DIR"
display_message "CUMULATIVE_FILTERED_ARGS : $CUMULATIVE_FILTERED_ARGS"
display_message "CUMULATIVE_FILTERED_ARGS_CMAKE : $CUMULATIVE_FILTERED_ARGS_CMAKE"
display_message "PREFIX : $PREFIX"
Expand Down Expand Up @@ -1070,10 +1065,10 @@ BITCOIN_PROTOCOL_OPTIONS=(
display_configuration

if [[ ! ($CI == true) ]]; then
create_directory "$BUILD_DIR"
push_directory "$BUILD_DIR"
create_directory "$BUILD_SRC_DIR"
push_directory "$BUILD_SRC_DIR"
else
push_directory "$BUILD_DIR"
push_directory "$BUILD_SRC_DIR"
fi

initialize_git
Expand Down
21 changes: 8 additions & 13 deletions install-cmakepresets.sh
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ fi

# The default build directory.
#------------------------------------------------------------------------------
BUILD_DIR="build-libbitcoin-protocol"
BUILD_SRC_DIR="build-libbitcoin-protocol"

PRESUMED_CI_PROJECT_PATH=$(pwd)

Expand Down Expand Up @@ -172,13 +172,13 @@ make_jobs()
shift 1

VERBOSITY=""
if [[ DISPLAY_VERBOSE ]]; then
if [[ $DISPLAY_VERBOSE ]]; then
VERBOSITY="VERBOSE=1"
fi

SEQUENTIAL=1
# Avoid setting -j1 (causes problems on single threaded systems [TRAVIS]).
if [[ $JOBS > $SEQUENTIAL ]]; then
if [[ $JOBS -gt $SEQUENTIAL ]]; then
make -j"$JOBS" "$@" $VERBOSITY
else
make "$@" $VERBOSITY
Expand Down Expand Up @@ -285,7 +285,7 @@ parse_command_line_options()
(--build-secp256k1) BUILD_SECP256K1="yes";;

# Unique script options.
(--build-dir=*) BUILD_DIR="${OPTION#*=}";;
(--build-dir=*) BUILD_SRC_DIR="${OPTION#*=}";;
(--preset=*) PRESET_ID="${OPTION#*=}";;

# Handle ndebug declarations due to disabled argument passthrough
Expand Down Expand Up @@ -340,11 +340,6 @@ set_os_specific_compiler_settings()
else # Linux
STDLIB="stdc++"
fi

if [[ ($OS == Darwin) && ($CC == clang*) ]]; then
CFLAGS="${CFLAGS} -DBOOST_NO_CXX98_FUNCTION_BASE"
CXXFLAGS="${CXXFLAGS} -DBOOST_NO_CXX98_FUNCTION_BASE"
fi
}

link_to_standard_library()
Expand Down Expand Up @@ -523,7 +518,7 @@ display_configuration()
display_message "BUILD_BOOST : $BUILD_BOOST"
display_message "BUILD_SECP256K1 : $BUILD_SECP256K1"
display_message "BOOST_ROOT : $BOOST_ROOT"
display_message "BUILD_DIR : $BUILD_DIR"
display_message "BUILD_SRC_DIR : $BUILD_SRC_DIR"
display_message "PRESET_ID : $PRESET_ID"
display_message "CUMULATIVE_FILTERED_ARGS : $CUMULATIVE_FILTERED_ARGS"
display_message "CUMULATIVE_FILTERED_ARGS_CMAKE : $CUMULATIVE_FILTERED_ARGS_CMAKE"
Expand Down Expand Up @@ -1112,10 +1107,10 @@ BITCOIN_PROTOCOL_OPTIONS=(
display_configuration

if [[ ! ($CI == true) ]]; then
create_directory "$BUILD_DIR"
push_directory "$BUILD_DIR"
create_directory "$BUILD_SRC_DIR"
push_directory "$BUILD_SRC_DIR"
else
push_directory "$BUILD_DIR"
push_directory "$BUILD_SRC_DIR"
fi

initialize_git
Expand Down
21 changes: 8 additions & 13 deletions install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ fi

# The default build directory.
#------------------------------------------------------------------------------
BUILD_DIR="build-libbitcoin-protocol"
BUILD_SRC_DIR="build-libbitcoin-protocol"

PRESUMED_CI_PROJECT_PATH=$(pwd)

Expand Down Expand Up @@ -166,13 +166,13 @@ make_jobs()
shift 1

VERBOSITY=""
if [[ DISPLAY_VERBOSE ]]; then
if [[ $DISPLAY_VERBOSE ]]; then
VERBOSITY="VERBOSE=1"
fi

SEQUENTIAL=1
# Avoid setting -j1 (causes problems on single threaded systems [TRAVIS]).
if [[ $JOBS > $SEQUENTIAL ]]; then
if [[ $JOBS -gt $SEQUENTIAL ]]; then
make -j"$JOBS" "$@" $VERBOSITY
else
make "$@" $VERBOSITY
Expand Down Expand Up @@ -278,7 +278,7 @@ parse_command_line_options()
(--build-secp256k1) BUILD_SECP256K1="yes";;

# Unique script options.
(--build-dir=*) BUILD_DIR="${OPTION#*=}";;
(--build-dir=*) BUILD_SRC_DIR="${OPTION#*=}";;
esac
done
}
Expand Down Expand Up @@ -327,11 +327,6 @@ set_os_specific_compiler_settings()
else # Linux
STDLIB="stdc++"
fi

if [[ ($OS == Darwin) && ($CC == clang*) ]]; then
CFLAGS="${CFLAGS} -DBOOST_NO_CXX98_FUNCTION_BASE"
CXXFLAGS="${CXXFLAGS} -DBOOST_NO_CXX98_FUNCTION_BASE"
fi
}

link_to_standard_library()
Expand Down Expand Up @@ -433,7 +428,7 @@ display_configuration()
display_message "BUILD_BOOST : $BUILD_BOOST"
display_message "BUILD_SECP256K1 : $BUILD_SECP256K1"
display_message "BOOST_ROOT : $BOOST_ROOT"
display_message "BUILD_DIR : $BUILD_DIR"
display_message "BUILD_SRC_DIR : $BUILD_SRC_DIR"
display_message "PREFIX : $PREFIX"
display_message "DISABLE_SHARED : $DISABLE_SHARED"
display_message "DISABLE_STATIC : $DISABLE_STATIC"
Expand Down Expand Up @@ -944,10 +939,10 @@ BITCOIN_PROTOCOL_OPTIONS=(
display_configuration

if [[ ! ($CI == true) ]]; then
create_directory "$BUILD_DIR"
push_directory "$BUILD_DIR"
create_directory "$BUILD_SRC_DIR"
push_directory "$BUILD_SRC_DIR"
else
push_directory "$BUILD_DIR"
push_directory "$BUILD_SRC_DIR"
fi

initialize_git
Expand Down
Loading