Skip to content

Commit e9309f6

Browse files
committed
Regenerate artifacts.
1 parent 7738507 commit e9309f6

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
@@ -58,7 +58,7 @@ fi
5858

5959
# The default build directory.
6060
#------------------------------------------------------------------------------
61-
BUILD_DIR="build-libbitcoin-database"
61+
BUILD_SRC_DIR="build-libbitcoin-database"
6262

6363
PRESUMED_CI_PROJECT_PATH=$(pwd)
6464

@@ -160,13 +160,13 @@ make_jobs()
160160
shift 1
161161

162162
VERBOSITY=""
163-
if [[ DISPLAY_VERBOSE ]]; then
163+
if [[ $DISPLAY_VERBOSE ]]; then
164164
VERBOSITY="VERBOSE=1"
165165
fi
166166

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

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

275275
# Handle ndebug declarations due to disabled argument passthrough
276276
(--enable-ndebug) ENABLE_NDEBUG="yes";;
@@ -474,7 +474,7 @@ display_configuration()
474474
display_message "BUILD_BOOST : $BUILD_BOOST"
475475
display_message "BUILD_SECP256K1 : $BUILD_SECP256K1"
476476
display_message "BOOST_ROOT : $BOOST_ROOT"
477-
display_message "BUILD_DIR : $BUILD_DIR"
477+
display_message "BUILD_SRC_DIR : $BUILD_SRC_DIR"
478478
display_message "CUMULATIVE_FILTERED_ARGS : $CUMULATIVE_FILTERED_ARGS"
479479
display_message "CUMULATIVE_FILTERED_ARGS_CMAKE : $CUMULATIVE_FILTERED_ARGS_CMAKE"
480480
display_message "PREFIX : $PREFIX"
@@ -1040,10 +1040,10 @@ BITCOIN_DATABASE_OPTIONS=(
10401040
display_configuration
10411041

10421042
if [[ ! ($CI == true) ]]; then
1043-
create_directory "$BUILD_DIR"
1044-
push_directory "$BUILD_DIR"
1043+
create_directory "$BUILD_SRC_DIR"
1044+
push_directory "$BUILD_SRC_DIR"
10451045
else
1046-
push_directory "$BUILD_DIR"
1046+
push_directory "$BUILD_SRC_DIR"
10471047
fi
10481048

10491049
initialize_git

install-cmakepresets.sh

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

6565
# The default build directory.
6666
#------------------------------------------------------------------------------
67-
BUILD_DIR="build-libbitcoin-database"
67+
BUILD_SRC_DIR="build-libbitcoin-database"
6868

6969
PRESUMED_CI_PROJECT_PATH=$(pwd)
7070

@@ -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
@@ -277,7 +277,7 @@ parse_command_line_options()
277277
(--build-secp256k1) BUILD_SECP256K1="yes";;
278278

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

283283
# Handle ndebug declarations due to disabled argument passthrough
@@ -509,7 +509,7 @@ display_configuration()
509509
display_message "BUILD_BOOST : $BUILD_BOOST"
510510
display_message "BUILD_SECP256K1 : $BUILD_SECP256K1"
511511
display_message "BOOST_ROOT : $BOOST_ROOT"
512-
display_message "BUILD_DIR : $BUILD_DIR"
512+
display_message "BUILD_SRC_DIR : $BUILD_SRC_DIR"
513513
display_message "PRESET_ID : $PRESET_ID"
514514
display_message "CUMULATIVE_FILTERED_ARGS : $CUMULATIVE_FILTERED_ARGS"
515515
display_message "CUMULATIVE_FILTERED_ARGS_CMAKE : $CUMULATIVE_FILTERED_ARGS_CMAKE"
@@ -1082,10 +1082,10 @@ BITCOIN_DATABASE_OPTIONS=(
10821082
display_configuration
10831083

10841084
if [[ ! ($CI == true) ]]; then
1085-
create_directory "$BUILD_DIR"
1086-
push_directory "$BUILD_DIR"
1085+
create_directory "$BUILD_SRC_DIR"
1086+
push_directory "$BUILD_SRC_DIR"
10871087
else
1088-
push_directory "$BUILD_DIR"
1088+
push_directory "$BUILD_SRC_DIR"
10891089
fi
10901090

10911091
initialize_git

install.sh

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

5959
# The default build directory.
6060
#------------------------------------------------------------------------------
61-
BUILD_DIR="build-libbitcoin-database"
61+
BUILD_SRC_DIR="build-libbitcoin-database"
6262

6363
PRESUMED_CI_PROJECT_PATH=$(pwd)
6464

@@ -160,13 +160,13 @@ make_jobs()
160160
shift 1
161161

162162
VERBOSITY=""
163-
if [[ DISPLAY_VERBOSE ]]; then
163+
if [[ $DISPLAY_VERBOSE ]]; then
164164
VERBOSITY="VERBOSE=1"
165165
fi
166166

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

272272
# Unique script options.
273-
(--build-dir=*) BUILD_DIR="${OPTION#*=}";;
273+
(--build-dir=*) BUILD_SRC_DIR="${OPTION#*=}";;
274274
esac
275275
done
276276
}
@@ -419,7 +419,7 @@ display_configuration()
419419
display_message "BUILD_BOOST : $BUILD_BOOST"
420420
display_message "BUILD_SECP256K1 : $BUILD_SECP256K1"
421421
display_message "BOOST_ROOT : $BOOST_ROOT"
422-
display_message "BUILD_DIR : $BUILD_DIR"
422+
display_message "BUILD_SRC_DIR : $BUILD_SRC_DIR"
423423
display_message "PREFIX : $PREFIX"
424424
display_message "DISABLE_SHARED : $DISABLE_SHARED"
425425
display_message "DISABLE_STATIC : $DISABLE_STATIC"
@@ -914,10 +914,10 @@ BITCOIN_DATABASE_OPTIONS=(
914914
display_configuration
915915

916916
if [[ ! ($CI == true) ]]; then
917-
create_directory "$BUILD_DIR"
918-
push_directory "$BUILD_DIR"
917+
create_directory "$BUILD_SRC_DIR"
918+
push_directory "$BUILD_SRC_DIR"
919919
else
920-
push_directory "$BUILD_DIR"
920+
push_directory "$BUILD_SRC_DIR"
921921
fi
922922

923923
initialize_git

0 commit comments

Comments
 (0)