Skip to content

Commit 8d6acbb

Browse files
committed
Regenerate artifacts.
1 parent 576de7b commit 8d6acbb

3 files changed

Lines changed: 24 additions & 24 deletions

File tree

install-cmake.sh

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

5858
# The default build directory.
5959
#------------------------------------------------------------------------------
60-
BUILD_DIR="build-libbitcoin-system"
60+
BUILD_SRC_DIR="build-libbitcoin-system"
6161

6262
PRESUMED_CI_PROJECT_PATH=$(pwd)
6363

@@ -159,13 +159,13 @@ make_jobs()
159159
shift 1
160160

161161
VERBOSITY=""
162-
if [[ DISPLAY_VERBOSE ]]; then
162+
if [[ $DISPLAY_VERBOSE ]]; then
163163
VERBOSITY="VERBOSE=1"
164164
fi
165165

166166
SEQUENTIAL=1
167167
# Avoid setting -j1 (causes problems on single threaded systems [TRAVIS]).
168-
if [[ $JOBS > $SEQUENTIAL ]]; then
168+
if [[ $JOBS -gt $SEQUENTIAL ]]; then
169169
make -j"$JOBS" "$@" $VERBOSITY
170170
else
171171
make "$@" $VERBOSITY
@@ -269,7 +269,7 @@ parse_command_line_options()
269269
(--build-secp256k1) BUILD_SECP256K1="yes";;
270270

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

274274
# Handle ndebug declarations due to disabled argument passthrough
275275
(--enable-ndebug) ENABLE_NDEBUG="yes";;
@@ -473,7 +473,7 @@ display_configuration()
473473
display_message "BUILD_BOOST : $BUILD_BOOST"
474474
display_message "BUILD_SECP256K1 : $BUILD_SECP256K1"
475475
display_message "BOOST_ROOT : $BOOST_ROOT"
476-
display_message "BUILD_DIR : $BUILD_DIR"
476+
display_message "BUILD_SRC_DIR : $BUILD_SRC_DIR"
477477
display_message "CUMULATIVE_FILTERED_ARGS : $CUMULATIVE_FILTERED_ARGS"
478478
display_message "CUMULATIVE_FILTERED_ARGS_CMAKE : $CUMULATIVE_FILTERED_ARGS_CMAKE"
479479
display_message "PREFIX : $PREFIX"
@@ -1026,10 +1026,10 @@ BITCOIN_SYSTEM_OPTIONS=(
10261026
display_configuration
10271027

10281028
if [[ ! ($CI == true) ]]; then
1029-
create_directory "$BUILD_DIR"
1030-
push_directory "$BUILD_DIR"
1029+
create_directory "$BUILD_SRC_DIR"
1030+
push_directory "$BUILD_SRC_DIR"
10311031
else
1032-
push_directory "$BUILD_DIR"
1032+
push_directory "$BUILD_SRC_DIR"
10331033
fi
10341034

10351035
initialize_git

install-cmakepresets.sh

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

6464
# The default build directory.
6565
#------------------------------------------------------------------------------
66-
BUILD_DIR="build-libbitcoin-system"
66+
BUILD_SRC_DIR="build-libbitcoin-system"
6767

6868
PRESUMED_CI_PROJECT_PATH=$(pwd)
6969

@@ -165,13 +165,13 @@ make_jobs()
165165
shift 1
166166

167167
VERBOSITY=""
168-
if [[ DISPLAY_VERBOSE ]]; then
168+
if [[ $DISPLAY_VERBOSE ]]; then
169169
VERBOSITY="VERBOSE=1"
170170
fi
171171

172172
SEQUENTIAL=1
173173
# Avoid setting -j1 (causes problems on single threaded systems [TRAVIS]).
174-
if [[ $JOBS > $SEQUENTIAL ]]; then
174+
if [[ $JOBS -gt $SEQUENTIAL ]]; then
175175
make -j"$JOBS" "$@" $VERBOSITY
176176
else
177177
make "$@" $VERBOSITY
@@ -276,7 +276,7 @@ parse_command_line_options()
276276
(--build-secp256k1) BUILD_SECP256K1="yes";;
277277

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

282282
# Handle ndebug declarations due to disabled argument passthrough
@@ -512,7 +512,7 @@ display_configuration()
512512
display_message "BUILD_BOOST : $BUILD_BOOST"
513513
display_message "BUILD_SECP256K1 : $BUILD_SECP256K1"
514514
display_message "BOOST_ROOT : $BOOST_ROOT"
515-
display_message "BUILD_DIR : $BUILD_DIR"
515+
display_message "BUILD_SRC_DIR : $BUILD_SRC_DIR"
516516
display_message "PRESET_ID : $PRESET_ID"
517517
display_message "CUMULATIVE_FILTERED_ARGS : $CUMULATIVE_FILTERED_ARGS"
518518
display_message "CUMULATIVE_FILTERED_ARGS_CMAKE : $CUMULATIVE_FILTERED_ARGS_CMAKE"
@@ -1071,10 +1071,10 @@ BITCOIN_SYSTEM_OPTIONS=(
10711071
display_configuration
10721072

10731073
if [[ ! ($CI == true) ]]; then
1074-
create_directory "$BUILD_DIR"
1075-
push_directory "$BUILD_DIR"
1074+
create_directory "$BUILD_SRC_DIR"
1075+
push_directory "$BUILD_SRC_DIR"
10761076
else
1077-
push_directory "$BUILD_DIR"
1077+
push_directory "$BUILD_SRC_DIR"
10781078
fi
10791079

10801080
initialize_git

install.sh

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

5858
# The default build directory.
5959
#------------------------------------------------------------------------------
60-
BUILD_DIR="build-libbitcoin-system"
60+
BUILD_SRC_DIR="build-libbitcoin-system"
6161

6262
PRESUMED_CI_PROJECT_PATH=$(pwd)
6363

@@ -159,13 +159,13 @@ make_jobs()
159159
shift 1
160160

161161
VERBOSITY=""
162-
if [[ DISPLAY_VERBOSE ]]; then
162+
if [[ $DISPLAY_VERBOSE ]]; then
163163
VERBOSITY="VERBOSE=1"
164164
fi
165165

166166
SEQUENTIAL=1
167167
# Avoid setting -j1 (causes problems on single threaded systems [TRAVIS]).
168-
if [[ $JOBS > $SEQUENTIAL ]]; then
168+
if [[ $JOBS -gt $SEQUENTIAL ]]; then
169169
make -j"$JOBS" "$@" $VERBOSITY
170170
else
171171
make "$@" $VERBOSITY
@@ -269,7 +269,7 @@ parse_command_line_options()
269269
(--build-secp256k1) BUILD_SECP256K1="yes";;
270270

271271
# Unique script options.
272-
(--build-dir=*) BUILD_DIR="${OPTION#*=}";;
272+
(--build-dir=*) BUILD_SRC_DIR="${OPTION#*=}";;
273273
esac
274274
done
275275
}
@@ -418,7 +418,7 @@ display_configuration()
418418
display_message "BUILD_BOOST : $BUILD_BOOST"
419419
display_message "BUILD_SECP256K1 : $BUILD_SECP256K1"
420420
display_message "BOOST_ROOT : $BOOST_ROOT"
421-
display_message "BUILD_DIR : $BUILD_DIR"
421+
display_message "BUILD_SRC_DIR : $BUILD_SRC_DIR"
422422
display_message "PREFIX : $PREFIX"
423423
display_message "DISABLE_SHARED : $DISABLE_SHARED"
424424
display_message "DISABLE_STATIC : $DISABLE_STATIC"
@@ -900,10 +900,10 @@ BITCOIN_SYSTEM_OPTIONS=(
900900
display_configuration
901901

902902
if [[ ! ($CI == true) ]]; then
903-
create_directory "$BUILD_DIR"
904-
push_directory "$BUILD_DIR"
903+
create_directory "$BUILD_SRC_DIR"
904+
push_directory "$BUILD_SRC_DIR"
905905
else
906-
push_directory "$BUILD_DIR"
906+
push_directory "$BUILD_SRC_DIR"
907907
fi
908908

909909
initialize_git

0 commit comments

Comments
 (0)