Skip to content

Commit 48d9476

Browse files
pmienkpmienk
authored
Merge pull request #298 from pmienk/master
Regenerate artifacts.
2 parents 5cba526 + 61751b7 commit 48d9476

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
@@ -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";;
@@ -332,11 +332,6 @@ set_os_specific_compiler_settings()
332332
else # Linux
333333
STDLIB="stdc++"
334334
fi
335-
336-
if [[ ($OS == Darwin) && ($CC == clang*) ]]; then
337-
CFLAGS="${CFLAGS} -DBOOST_NO_CXX98_FUNCTION_BASE"
338-
CXXFLAGS="${CXXFLAGS} -DBOOST_NO_CXX98_FUNCTION_BASE"
339-
fi
340335
}
341336

342337
link_to_standard_library()
@@ -488,7 +483,7 @@ display_configuration()
488483
display_message "BUILD_BOOST : $BUILD_BOOST"
489484
display_message "BUILD_SECP256K1 : $BUILD_SECP256K1"
490485
display_message "BOOST_ROOT : $BOOST_ROOT"
491-
display_message "BUILD_DIR : $BUILD_DIR"
486+
display_message "BUILD_SRC_DIR : $BUILD_SRC_DIR"
492487
display_message "CUMULATIVE_FILTERED_ARGS : $CUMULATIVE_FILTERED_ARGS"
493488
display_message "CUMULATIVE_FILTERED_ARGS_CMAKE : $CUMULATIVE_FILTERED_ARGS_CMAKE"
494489
display_message "PREFIX : $PREFIX"
@@ -1070,10 +1065,10 @@ BITCOIN_PROTOCOL_OPTIONS=(
10701065
display_configuration
10711066

10721067
if [[ ! ($CI == true) ]]; then
1073-
create_directory "$BUILD_DIR"
1074-
push_directory "$BUILD_DIR"
1068+
create_directory "$BUILD_SRC_DIR"
1069+
push_directory "$BUILD_SRC_DIR"
10751070
else
1076-
push_directory "$BUILD_DIR"
1071+
push_directory "$BUILD_SRC_DIR"
10771072
fi
10781073

10791074
initialize_git

‎install-cmakepresets.sh‎

Lines changed: 8 additions & 13 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
@@ -340,11 +340,6 @@ set_os_specific_compiler_settings()
340340
else # Linux
341341
STDLIB="stdc++"
342342
fi
343-
344-
if [[ ($OS == Darwin) && ($CC == clang*) ]]; then
345-
CFLAGS="${CFLAGS} -DBOOST_NO_CXX98_FUNCTION_BASE"
346-
CXXFLAGS="${CXXFLAGS} -DBOOST_NO_CXX98_FUNCTION_BASE"
347-
fi
348343
}
349344

350345
link_to_standard_library()
@@ -523,7 +518,7 @@ display_configuration()
523518
display_message "BUILD_BOOST : $BUILD_BOOST"
524519
display_message "BUILD_SECP256K1 : $BUILD_SECP256K1"
525520
display_message "BOOST_ROOT : $BOOST_ROOT"
526-
display_message "BUILD_DIR : $BUILD_DIR"
521+
display_message "BUILD_SRC_DIR : $BUILD_SRC_DIR"
527522
display_message "PRESET_ID : $PRESET_ID"
528523
display_message "CUMULATIVE_FILTERED_ARGS : $CUMULATIVE_FILTERED_ARGS"
529524
display_message "CUMULATIVE_FILTERED_ARGS_CMAKE : $CUMULATIVE_FILTERED_ARGS_CMAKE"
@@ -1112,10 +1107,10 @@ BITCOIN_PROTOCOL_OPTIONS=(
11121107
display_configuration
11131108

11141109
if [[ ! ($CI == true) ]]; then
1115-
create_directory "$BUILD_DIR"
1116-
push_directory "$BUILD_DIR"
1110+
create_directory "$BUILD_SRC_DIR"
1111+
push_directory "$BUILD_SRC_DIR"
11171112
else
1118-
push_directory "$BUILD_DIR"
1113+
push_directory "$BUILD_SRC_DIR"
11191114
fi
11201115

11211116
initialize_git

‎install.sh‎

Lines changed: 8 additions & 13 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
}
@@ -327,11 +327,6 @@ set_os_specific_compiler_settings()
327327
else # Linux
328328
STDLIB="stdc++"
329329
fi
330-
331-
if [[ ($OS == Darwin) && ($CC == clang*) ]]; then
332-
CFLAGS="${CFLAGS} -DBOOST_NO_CXX98_FUNCTION_BASE"
333-
CXXFLAGS="${CXXFLAGS} -DBOOST_NO_CXX98_FUNCTION_BASE"
334-
fi
335330
}
336331

337332
link_to_standard_library()
@@ -433,7 +428,7 @@ display_configuration()
433428
display_message "BUILD_BOOST : $BUILD_BOOST"
434429
display_message "BUILD_SECP256K1 : $BUILD_SECP256K1"
435430
display_message "BOOST_ROOT : $BOOST_ROOT"
436-
display_message "BUILD_DIR : $BUILD_DIR"
431+
display_message "BUILD_SRC_DIR : $BUILD_SRC_DIR"
437432
display_message "PREFIX : $PREFIX"
438433
display_message "DISABLE_SHARED : $DISABLE_SHARED"
439434
display_message "DISABLE_STATIC : $DISABLE_STATIC"
@@ -944,10 +939,10 @@ BITCOIN_PROTOCOL_OPTIONS=(
944939
display_configuration
945940

946941
if [[ ! ($CI == true) ]]; then
947-
create_directory "$BUILD_DIR"
948-
push_directory "$BUILD_DIR"
942+
create_directory "$BUILD_SRC_DIR"
943+
push_directory "$BUILD_SRC_DIR"
949944
else
950-
push_directory "$BUILD_DIR"
945+
push_directory "$BUILD_SRC_DIR"
951946
fi
952947

953948
initialize_git

0 commit comments

Comments
 (0)