Skip to content

Commit 61751b7

Browse files
committed
Regenerate artifacts.
1 parent e715ff1 commit 61751b7

File tree

3 files changed

+24
-24
lines changed

3 files changed

+24
-24
lines changed

install-cmake.sh

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ fi
5959

6060
# The default build directory.
6161
#------------------------------------------------------------------------------
62-
BUILD_DIR="build-libbitcoin-protocol"
62+
BUILD_SRC_DIR="build-libbitcoin-protocol"
6363

6464
PRESUMED_CI_PROJECT_PATH=$(pwd)
6565

@@ -166,13 +166,13 @@ make_jobs()
166166
shift 1
167167

168168
VERBOSITY=""
169-
if [[ DISPLAY_VERBOSE ]]; then
169+
if [[ $DISPLAY_VERBOSE ]]; then
170170
VERBOSITY="VERBOSE=1"
171171
fi
172172

173173
SEQUENTIAL=1
174174
# Avoid setting -j1 (causes problems on single threaded systems [TRAVIS]).
175-
if [[ $JOBS > $SEQUENTIAL ]]; then
175+
if [[ $JOBS -gt $SEQUENTIAL ]]; then
176176
make -j"$JOBS" "$@" $VERBOSITY
177177
else
178178
make "$@" $VERBOSITY
@@ -278,7 +278,7 @@ parse_command_line_options()
278278
(--build-secp256k1) BUILD_SECP256K1="yes";;
279279

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

283283
# Handle ndebug declarations due to disabled argument passthrough
284284
(--enable-ndebug) ENABLE_NDEBUG="yes";;
@@ -483,7 +483,7 @@ display_configuration()
483483
display_message "BUILD_BOOST : $BUILD_BOOST"
484484
display_message "BUILD_SECP256K1 : $BUILD_SECP256K1"
485485
display_message "BOOST_ROOT : $BOOST_ROOT"
486-
display_message "BUILD_DIR : $BUILD_DIR"
486+
display_message "BUILD_SRC_DIR : $BUILD_SRC_DIR"
487487
display_message "CUMULATIVE_FILTERED_ARGS : $CUMULATIVE_FILTERED_ARGS"
488488
display_message "CUMULATIVE_FILTERED_ARGS_CMAKE : $CUMULATIVE_FILTERED_ARGS_CMAKE"
489489
display_message "PREFIX : $PREFIX"
@@ -1065,10 +1065,10 @@ BITCOIN_PROTOCOL_OPTIONS=(
10651065
display_configuration
10661066

10671067
if [[ ! ($CI == true) ]]; then
1068-
create_directory "$BUILD_DIR"
1069-
push_directory "$BUILD_DIR"
1068+
create_directory "$BUILD_SRC_DIR"
1069+
push_directory "$BUILD_SRC_DIR"
10701070
else
1071-
push_directory "$BUILD_DIR"
1071+
push_directory "$BUILD_SRC_DIR"
10721072
fi
10731073

10741074
initialize_git

install-cmakepresets.sh

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ fi
6565

6666
# The default build directory.
6767
#------------------------------------------------------------------------------
68-
BUILD_DIR="build-libbitcoin-protocol"
68+
BUILD_SRC_DIR="build-libbitcoin-protocol"
6969

7070
PRESUMED_CI_PROJECT_PATH=$(pwd)
7171

@@ -172,13 +172,13 @@ make_jobs()
172172
shift 1
173173

174174
VERBOSITY=""
175-
if [[ DISPLAY_VERBOSE ]]; then
175+
if [[ $DISPLAY_VERBOSE ]]; then
176176
VERBOSITY="VERBOSE=1"
177177
fi
178178

179179
SEQUENTIAL=1
180180
# Avoid setting -j1 (causes problems on single threaded systems [TRAVIS]).
181-
if [[ $JOBS > $SEQUENTIAL ]]; then
181+
if [[ $JOBS -gt $SEQUENTIAL ]]; then
182182
make -j"$JOBS" "$@" $VERBOSITY
183183
else
184184
make "$@" $VERBOSITY
@@ -285,7 +285,7 @@ parse_command_line_options()
285285
(--build-secp256k1) BUILD_SECP256K1="yes";;
286286

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

291291
# Handle ndebug declarations due to disabled argument passthrough
@@ -518,7 +518,7 @@ display_configuration()
518518
display_message "BUILD_BOOST : $BUILD_BOOST"
519519
display_message "BUILD_SECP256K1 : $BUILD_SECP256K1"
520520
display_message "BOOST_ROOT : $BOOST_ROOT"
521-
display_message "BUILD_DIR : $BUILD_DIR"
521+
display_message "BUILD_SRC_DIR : $BUILD_SRC_DIR"
522522
display_message "PRESET_ID : $PRESET_ID"
523523
display_message "CUMULATIVE_FILTERED_ARGS : $CUMULATIVE_FILTERED_ARGS"
524524
display_message "CUMULATIVE_FILTERED_ARGS_CMAKE : $CUMULATIVE_FILTERED_ARGS_CMAKE"
@@ -1107,10 +1107,10 @@ BITCOIN_PROTOCOL_OPTIONS=(
11071107
display_configuration
11081108

11091109
if [[ ! ($CI == true) ]]; then
1110-
create_directory "$BUILD_DIR"
1111-
push_directory "$BUILD_DIR"
1110+
create_directory "$BUILD_SRC_DIR"
1111+
push_directory "$BUILD_SRC_DIR"
11121112
else
1113-
push_directory "$BUILD_DIR"
1113+
push_directory "$BUILD_SRC_DIR"
11141114
fi
11151115

11161116
initialize_git

install.sh

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ fi
5959

6060
# The default build directory.
6161
#------------------------------------------------------------------------------
62-
BUILD_DIR="build-libbitcoin-protocol"
62+
BUILD_SRC_DIR="build-libbitcoin-protocol"
6363

6464
PRESUMED_CI_PROJECT_PATH=$(pwd)
6565

@@ -166,13 +166,13 @@ make_jobs()
166166
shift 1
167167

168168
VERBOSITY=""
169-
if [[ DISPLAY_VERBOSE ]]; then
169+
if [[ $DISPLAY_VERBOSE ]]; then
170170
VERBOSITY="VERBOSE=1"
171171
fi
172172

173173
SEQUENTIAL=1
174174
# Avoid setting -j1 (causes problems on single threaded systems [TRAVIS]).
175-
if [[ $JOBS > $SEQUENTIAL ]]; then
175+
if [[ $JOBS -gt $SEQUENTIAL ]]; then
176176
make -j"$JOBS" "$@" $VERBOSITY
177177
else
178178
make "$@" $VERBOSITY
@@ -278,7 +278,7 @@ parse_command_line_options()
278278
(--build-secp256k1) BUILD_SECP256K1="yes";;
279279

280280
# Unique script options.
281-
(--build-dir=*) BUILD_DIR="${OPTION#*=}";;
281+
(--build-dir=*) BUILD_SRC_DIR="${OPTION#*=}";;
282282
esac
283283
done
284284
}
@@ -428,7 +428,7 @@ display_configuration()
428428
display_message "BUILD_BOOST : $BUILD_BOOST"
429429
display_message "BUILD_SECP256K1 : $BUILD_SECP256K1"
430430
display_message "BOOST_ROOT : $BOOST_ROOT"
431-
display_message "BUILD_DIR : $BUILD_DIR"
431+
display_message "BUILD_SRC_DIR : $BUILD_SRC_DIR"
432432
display_message "PREFIX : $PREFIX"
433433
display_message "DISABLE_SHARED : $DISABLE_SHARED"
434434
display_message "DISABLE_STATIC : $DISABLE_STATIC"
@@ -939,10 +939,10 @@ BITCOIN_PROTOCOL_OPTIONS=(
939939
display_configuration
940940

941941
if [[ ! ($CI == true) ]]; then
942-
create_directory "$BUILD_DIR"
943-
push_directory "$BUILD_DIR"
942+
create_directory "$BUILD_SRC_DIR"
943+
push_directory "$BUILD_SRC_DIR"
944944
else
945-
push_directory "$BUILD_DIR"
945+
push_directory "$BUILD_SRC_DIR"
946946
fi
947947

948948
initialize_git

0 commit comments

Comments
 (0)