Skip to content

Commit f8a5a50

Browse files
pmienkpmienk
authored
Merge pull request #581 from pmienk/master
Regenerate artifacts.
2 parents 46f2c1e + b48202e commit f8a5a50

File tree

3 files changed

+24
-39
lines changed

3 files changed

+24
-39
lines changed

‎install-cmake.sh‎

Lines changed: 8 additions & 13 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-server"
66+
BUILD_SRC_DIR="build-libbitcoin-server"
6767

6868
PRESUMED_CI_PROJECT_PATH=$(pwd)
6969

@@ -170,13 +170,13 @@ make_jobs()
170170
shift 1
171171

172172
VERBOSITY=""
173-
if [[ DISPLAY_VERBOSE ]]; then
173+
if [[ $DISPLAY_VERBOSE ]]; then
174174
VERBOSITY="VERBOSE=1"
175175
fi
176176

177177
SEQUENTIAL=1
178178
# Avoid setting -j1 (causes problems on single threaded systems [TRAVIS]).
179-
if [[ $JOBS > $SEQUENTIAL ]]; then
179+
if [[ $JOBS -gt $SEQUENTIAL ]]; then
180180
make -j"$JOBS" "$@" $VERBOSITY
181181
else
182182
make "$@" $VERBOSITY
@@ -282,7 +282,7 @@ parse_command_line_options()
282282
(--build-zmq) BUILD_ZMQ="yes";;
283283

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

287287
# Handle ndebug declarations due to disabled argument passthrough
288288
(--enable-ndebug) ENABLE_NDEBUG="yes";;
@@ -336,11 +336,6 @@ set_os_specific_compiler_settings()
336336
else # Linux
337337
STDLIB="stdc++"
338338
fi
339-
340-
if [[ ($OS == Darwin) && ($CC == clang*) ]]; then
341-
CFLAGS="${CFLAGS} -DBOOST_NO_CXX98_FUNCTION_BASE"
342-
CXXFLAGS="${CXXFLAGS} -DBOOST_NO_CXX98_FUNCTION_BASE"
343-
fi
344339
}
345340

346341
link_to_standard_library()
@@ -492,7 +487,7 @@ display_configuration()
492487
display_message "BUILD_SECP256K1 : $BUILD_SECP256K1"
493488
display_message "BUILD_ZMQ : $BUILD_ZMQ"
494489
display_message "BOOST_ROOT : $BOOST_ROOT"
495-
display_message "BUILD_DIR : $BUILD_DIR"
490+
display_message "BUILD_SRC_DIR : $BUILD_SRC_DIR"
496491
display_message "CUMULATIVE_FILTERED_ARGS : $CUMULATIVE_FILTERED_ARGS"
497492
display_message "CUMULATIVE_FILTERED_ARGS_CMAKE : $CUMULATIVE_FILTERED_ARGS_CMAKE"
498493
display_message "PREFIX : $PREFIX"
@@ -1125,10 +1120,10 @@ BITCOIN_SERVER_OPTIONS=(
11251120
display_configuration
11261121

11271122
if [[ ! ($CI == true) ]]; then
1128-
create_directory "$BUILD_DIR"
1129-
push_directory "$BUILD_DIR"
1123+
create_directory "$BUILD_SRC_DIR"
1124+
push_directory "$BUILD_SRC_DIR"
11301125
else
1131-
push_directory "$BUILD_DIR"
1126+
push_directory "$BUILD_SRC_DIR"
11321127
fi
11331128

11341129
initialize_git

‎install-cmakepresets.sh‎

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ fi
6969

7070
# The default build directory.
7171
#------------------------------------------------------------------------------
72-
BUILD_DIR="build-libbitcoin-server"
72+
BUILD_SRC_DIR="build-libbitcoin-server"
7373

7474
PRESUMED_CI_PROJECT_PATH=$(pwd)
7575

@@ -176,13 +176,13 @@ make_jobs()
176176
shift 1
177177

178178
VERBOSITY=""
179-
if [[ DISPLAY_VERBOSE ]]; then
179+
if [[ $DISPLAY_VERBOSE ]]; then
180180
VERBOSITY="VERBOSE=1"
181181
fi
182182

183183
SEQUENTIAL=1
184184
# Avoid setting -j1 (causes problems on single threaded systems [TRAVIS]).
185-
if [[ $JOBS > $SEQUENTIAL ]]; then
185+
if [[ $JOBS -gt $SEQUENTIAL ]]; then
186186
make -j"$JOBS" "$@" $VERBOSITY
187187
else
188188
make "$@" $VERBOSITY
@@ -289,7 +289,7 @@ parse_command_line_options()
289289
(--build-zmq) BUILD_ZMQ="yes";;
290290

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

295295
# Handle ndebug declarations due to disabled argument passthrough
@@ -344,11 +344,6 @@ set_os_specific_compiler_settings()
344344
else # Linux
345345
STDLIB="stdc++"
346346
fi
347-
348-
if [[ ($OS == Darwin) && ($CC == clang*) ]]; then
349-
CFLAGS="${CFLAGS} -DBOOST_NO_CXX98_FUNCTION_BASE"
350-
CXXFLAGS="${CXXFLAGS} -DBOOST_NO_CXX98_FUNCTION_BASE"
351-
fi
352347
}
353348

354349
link_to_standard_library()
@@ -535,7 +530,7 @@ display_configuration()
535530
display_message "BUILD_SECP256K1 : $BUILD_SECP256K1"
536531
display_message "BUILD_ZMQ : $BUILD_ZMQ"
537532
display_message "BOOST_ROOT : $BOOST_ROOT"
538-
display_message "BUILD_DIR : $BUILD_DIR"
533+
display_message "BUILD_SRC_DIR : $BUILD_SRC_DIR"
539534
display_message "PRESET_ID : $PRESET_ID"
540535
display_message "CUMULATIVE_FILTERED_ARGS : $CUMULATIVE_FILTERED_ARGS"
541536
display_message "CUMULATIVE_FILTERED_ARGS_CMAKE : $CUMULATIVE_FILTERED_ARGS_CMAKE"
@@ -1179,10 +1174,10 @@ BITCOIN_SERVER_OPTIONS=(
11791174
display_configuration
11801175

11811176
if [[ ! ($CI == true) ]]; then
1182-
create_directory "$BUILD_DIR"
1183-
push_directory "$BUILD_DIR"
1177+
create_directory "$BUILD_SRC_DIR"
1178+
push_directory "$BUILD_SRC_DIR"
11841179
else
1185-
push_directory "$BUILD_DIR"
1180+
push_directory "$BUILD_SRC_DIR"
11861181
fi
11871182

11881183
initialize_git

‎install.sh‎

Lines changed: 8 additions & 13 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-server"
66+
BUILD_SRC_DIR="build-libbitcoin-server"
6767

6868
PRESUMED_CI_PROJECT_PATH=$(pwd)
6969

@@ -170,13 +170,13 @@ make_jobs()
170170
shift 1
171171

172172
VERBOSITY=""
173-
if [[ DISPLAY_VERBOSE ]]; then
173+
if [[ $DISPLAY_VERBOSE ]]; then
174174
VERBOSITY="VERBOSE=1"
175175
fi
176176

177177
SEQUENTIAL=1
178178
# Avoid setting -j1 (causes problems on single threaded systems [TRAVIS]).
179-
if [[ $JOBS > $SEQUENTIAL ]]; then
179+
if [[ $JOBS -gt $SEQUENTIAL ]]; then
180180
make -j"$JOBS" "$@" $VERBOSITY
181181
else
182182
make "$@" $VERBOSITY
@@ -282,7 +282,7 @@ parse_command_line_options()
282282
(--build-zmq) BUILD_ZMQ="yes";;
283283

284284
# Unique script options.
285-
(--build-dir=*) BUILD_DIR="${OPTION#*=}";;
285+
(--build-dir=*) BUILD_SRC_DIR="${OPTION#*=}";;
286286
esac
287287
done
288288
}
@@ -331,11 +331,6 @@ set_os_specific_compiler_settings()
331331
else # Linux
332332
STDLIB="stdc++"
333333
fi
334-
335-
if [[ ($OS == Darwin) && ($CC == clang*) ]]; then
336-
CFLAGS="${CFLAGS} -DBOOST_NO_CXX98_FUNCTION_BASE"
337-
CXXFLAGS="${CXXFLAGS} -DBOOST_NO_CXX98_FUNCTION_BASE"
338-
fi
339334
}
340335

341336
link_to_standard_library()
@@ -437,7 +432,7 @@ display_configuration()
437432
display_message "BUILD_SECP256K1 : $BUILD_SECP256K1"
438433
display_message "BUILD_ZMQ : $BUILD_ZMQ"
439434
display_message "BOOST_ROOT : $BOOST_ROOT"
440-
display_message "BUILD_DIR : $BUILD_DIR"
435+
display_message "BUILD_SRC_DIR : $BUILD_SRC_DIR"
441436
display_message "PREFIX : $PREFIX"
442437
display_message "DISABLE_SHARED : $DISABLE_SHARED"
443438
display_message "DISABLE_STATIC : $DISABLE_STATIC"
@@ -999,10 +994,10 @@ BITCOIN_SERVER_OPTIONS=(
999994
display_configuration
1000995

1001996
if [[ ! ($CI == true) ]]; then
1002-
create_directory "$BUILD_DIR"
1003-
push_directory "$BUILD_DIR"
997+
create_directory "$BUILD_SRC_DIR"
998+
push_directory "$BUILD_SRC_DIR"
1004999
else
1005-
push_directory "$BUILD_DIR"
1000+
push_directory "$BUILD_SRC_DIR"
10061001
fi
10071002

10081003
initialize_git

0 commit comments

Comments
 (0)