Skip to content

Commit fe59fc7

Browse files
committed
Regenerate artifacts.
1 parent 7bea65b commit fe59fc7

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
@@ -60,7 +60,7 @@ fi
6060

6161
# The default build directory.
6262
#------------------------------------------------------------------------------
63-
BUILD_DIR="build-libbitcoin-node"
63+
BUILD_SRC_DIR="build-libbitcoin-node"
6464

6565
PRESUMED_CI_PROJECT_PATH=$(pwd)
6666

@@ -162,13 +162,13 @@ make_jobs()
162162
shift 1
163163

164164
VERBOSITY=""
165-
if [[ DISPLAY_VERBOSE ]]; then
165+
if [[ $DISPLAY_VERBOSE ]]; then
166166
VERBOSITY="VERBOSE=1"
167167
fi
168168

169169
SEQUENTIAL=1
170170
# Avoid setting -j1 (causes problems on single threaded systems [TRAVIS]).
171-
if [[ $JOBS > $SEQUENTIAL ]]; then
171+
if [[ $JOBS -gt $SEQUENTIAL ]]; then
172172
make -j"$JOBS" "$@" $VERBOSITY
173173
else
174174
make "$@" $VERBOSITY
@@ -272,7 +272,7 @@ parse_command_line_options()
272272
(--build-secp256k1) BUILD_SECP256K1="yes";;
273273

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

277277
# Handle ndebug declarations due to disabled argument passthrough
278278
(--enable-ndebug) ENABLE_NDEBUG="yes";;
@@ -476,7 +476,7 @@ display_configuration()
476476
display_message "BUILD_BOOST : $BUILD_BOOST"
477477
display_message "BUILD_SECP256K1 : $BUILD_SECP256K1"
478478
display_message "BOOST_ROOT : $BOOST_ROOT"
479-
display_message "BUILD_DIR : $BUILD_DIR"
479+
display_message "BUILD_SRC_DIR : $BUILD_SRC_DIR"
480480
display_message "CUMULATIVE_FILTERED_ARGS : $CUMULATIVE_FILTERED_ARGS"
481481
display_message "CUMULATIVE_FILTERED_ARGS_CMAKE : $CUMULATIVE_FILTERED_ARGS_CMAKE"
482482
display_message "PREFIX : $PREFIX"
@@ -1068,10 +1068,10 @@ BITCOIN_NODE_OPTIONS=(
10681068
display_configuration
10691069

10701070
if [[ ! ($CI == true) ]]; then
1071-
create_directory "$BUILD_DIR"
1072-
push_directory "$BUILD_DIR"
1071+
create_directory "$BUILD_SRC_DIR"
1072+
push_directory "$BUILD_SRC_DIR"
10731073
else
1074-
push_directory "$BUILD_DIR"
1074+
push_directory "$BUILD_SRC_DIR"
10751075
fi
10761076

10771077
initialize_git

install-cmakepresets.sh

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

6767
# The default build directory.
6868
#------------------------------------------------------------------------------
69-
BUILD_DIR="build-libbitcoin-node"
69+
BUILD_SRC_DIR="build-libbitcoin-node"
7070

7171
PRESUMED_CI_PROJECT_PATH=$(pwd)
7272

@@ -168,13 +168,13 @@ make_jobs()
168168
shift 1
169169

170170
VERBOSITY=""
171-
if [[ DISPLAY_VERBOSE ]]; then
171+
if [[ $DISPLAY_VERBOSE ]]; then
172172
VERBOSITY="VERBOSE=1"
173173
fi
174174

175175
SEQUENTIAL=1
176176
# Avoid setting -j1 (causes problems on single threaded systems [TRAVIS]).
177-
if [[ $JOBS > $SEQUENTIAL ]]; then
177+
if [[ $JOBS -gt $SEQUENTIAL ]]; then
178178
make -j"$JOBS" "$@" $VERBOSITY
179179
else
180180
make "$@" $VERBOSITY
@@ -279,7 +279,7 @@ parse_command_line_options()
279279
(--build-secp256k1) BUILD_SECP256K1="yes";;
280280

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

285285
# Handle ndebug declarations due to disabled argument passthrough
@@ -515,7 +515,7 @@ display_configuration()
515515
display_message "BUILD_BOOST : $BUILD_BOOST"
516516
display_message "BUILD_SECP256K1 : $BUILD_SECP256K1"
517517
display_message "BOOST_ROOT : $BOOST_ROOT"
518-
display_message "BUILD_DIR : $BUILD_DIR"
518+
display_message "BUILD_SRC_DIR : $BUILD_SRC_DIR"
519519
display_message "PRESET_ID : $PRESET_ID"
520520
display_message "CUMULATIVE_FILTERED_ARGS : $CUMULATIVE_FILTERED_ARGS"
521521
display_message "CUMULATIVE_FILTERED_ARGS_CMAKE : $CUMULATIVE_FILTERED_ARGS_CMAKE"
@@ -1116,10 +1116,10 @@ BITCOIN_NODE_OPTIONS=(
11161116
display_configuration
11171117

11181118
if [[ ! ($CI == true) ]]; then
1119-
create_directory "$BUILD_DIR"
1120-
push_directory "$BUILD_DIR"
1119+
create_directory "$BUILD_SRC_DIR"
1120+
push_directory "$BUILD_SRC_DIR"
11211121
else
1122-
push_directory "$BUILD_DIR"
1122+
push_directory "$BUILD_SRC_DIR"
11231123
fi
11241124

11251125
initialize_git

install.sh

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

6161
# The default build directory.
6262
#------------------------------------------------------------------------------
63-
BUILD_DIR="build-libbitcoin-node"
63+
BUILD_SRC_DIR="build-libbitcoin-node"
6464

6565
PRESUMED_CI_PROJECT_PATH=$(pwd)
6666

@@ -162,13 +162,13 @@ make_jobs()
162162
shift 1
163163

164164
VERBOSITY=""
165-
if [[ DISPLAY_VERBOSE ]]; then
165+
if [[ $DISPLAY_VERBOSE ]]; then
166166
VERBOSITY="VERBOSE=1"
167167
fi
168168

169169
SEQUENTIAL=1
170170
# Avoid setting -j1 (causes problems on single threaded systems [TRAVIS]).
171-
if [[ $JOBS > $SEQUENTIAL ]]; then
171+
if [[ $JOBS -gt $SEQUENTIAL ]]; then
172172
make -j"$JOBS" "$@" $VERBOSITY
173173
else
174174
make "$@" $VERBOSITY
@@ -272,7 +272,7 @@ parse_command_line_options()
272272
(--build-secp256k1) BUILD_SECP256K1="yes";;
273273

274274
# Unique script options.
275-
(--build-dir=*) BUILD_DIR="${OPTION#*=}";;
275+
(--build-dir=*) BUILD_SRC_DIR="${OPTION#*=}";;
276276
esac
277277
done
278278
}
@@ -421,7 +421,7 @@ display_configuration()
421421
display_message "BUILD_BOOST : $BUILD_BOOST"
422422
display_message "BUILD_SECP256K1 : $BUILD_SECP256K1"
423423
display_message "BOOST_ROOT : $BOOST_ROOT"
424-
display_message "BUILD_DIR : $BUILD_DIR"
424+
display_message "BUILD_SRC_DIR : $BUILD_SRC_DIR"
425425
display_message "PREFIX : $PREFIX"
426426
display_message "DISABLE_SHARED : $DISABLE_SHARED"
427427
display_message "DISABLE_STATIC : $DISABLE_STATIC"
@@ -942,10 +942,10 @@ BITCOIN_NODE_OPTIONS=(
942942
display_configuration
943943

944944
if [[ ! ($CI == true) ]]; then
945-
create_directory "$BUILD_DIR"
946-
push_directory "$BUILD_DIR"
945+
create_directory "$BUILD_SRC_DIR"
946+
push_directory "$BUILD_SRC_DIR"
947947
else
948-
push_directory "$BUILD_DIR"
948+
push_directory "$BUILD_SRC_DIR"
949949
fi
950950

951951
initialize_git

0 commit comments

Comments
 (0)