Skip to content

Commit 3d3dc15

Browse files
evoskuilevoskuil
committed
Regenerate artifacts.
1 parent f1d87d2 commit 3d3dc15

4 files changed

Lines changed: 2 additions & 182 deletions

File tree

‎.github/workflows/ci.yml‎

Lines changed: 2 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ jobs:
2525
coverage: "nocov"
2626
detectcpuflags: "ignore"
2727
boost: "--build-boost"
28-
icu: ""
2928
llvm: ""
3029
secp256k1: "--build-secp256k1"
3130
cc: "clang-18"
@@ -42,7 +41,6 @@ jobs:
4241
coverage: "nocov"
4342
detectcpuflags: "ignore"
4443
boost: "--build-boost"
45-
icu: "--build-icu --with-icu"
4644
llvm: ""
4745
secp256k1: "--build-secp256k1"
4846
cc: "clang-18"
@@ -59,7 +57,6 @@ jobs:
5957
coverage: "nocov"
6058
detectcpuflags: "ignore"
6159
boost: "--build-boost"
62-
icu: ""
6360
llvm: ""
6461
secp256k1: "--build-secp256k1"
6562
cc: "gcc-12"
@@ -76,7 +73,6 @@ jobs:
7673
coverage: "cov"
7774
detectcpuflags: "detect"
7875
boost: "--build-boost"
79-
icu: "--build-icu --with-icu"
8076
llvm: ""
8177
secp256k1: "--build-secp256k1"
8278
cc: "gcc"
@@ -93,14 +89,13 @@ jobs:
9389
coverage: "nocov"
9490
detectcpuflags: "ignore"
9591
boost: "--build-boost"
96-
icu: "--with-icu"
9792
llvm: ""
9893
secp256k1: "--build-secp256k1"
9994
cc: "clang"
10095
flags: "-Os -fPIE"
10196
options: "--enable-isystem"
10297
packager: "brew"
103-
packages: "icu4c"
98+
packages: ""
10499

105100
- os: macos-latest
106101
cxx: "clang++"
@@ -110,7 +105,6 @@ jobs:
110105
coverage: "nocov"
111106
detectcpuflags: "ignore"
112107
boost: "--build-boost"
113-
icu: "--build-icu --with-icu"
114108
llvm: ""
115109
secp256k1: "--build-secp256k1"
116110
cc: "clang"
@@ -214,7 +208,6 @@ jobs:
214208
${{ env.ASSERT_NDEBUG }}
215209
${{ env.CPU_SUPPORTED_FLAGS }}
216210
${{ matrix.boost }}
217-
${{ matrix.icu }}
218211
${{ matrix.secp256k1 }}
219212
220213
- name: Coveralls Calculation
@@ -296,7 +289,6 @@ jobs:
296289
coverage: "nocov"
297290
detectcpuflags: "ignore"
298291
boost: "--build-boost"
299-
icu: ""
300292
llvm: ""
301293
secp256k1: "--build-secp256k1"
302294
cc: "clang-18"
@@ -313,7 +305,6 @@ jobs:
313305
coverage: "nocov"
314306
detectcpuflags: "ignore"
315307
boost: "--build-boost"
316-
icu: "--build-icu --with-icu"
317308
llvm: ""
318309
secp256k1: "--build-secp256k1"
319310
cc: "clang-18"
@@ -330,7 +321,6 @@ jobs:
330321
coverage: "nocov"
331322
detectcpuflags: "ignore"
332323
boost: "--build-boost"
333-
icu: ""
334324
llvm: ""
335325
secp256k1: "--build-secp256k1"
336326
cc: "gcc-12"
@@ -347,7 +337,6 @@ jobs:
347337
coverage: "nocov"
348338
detectcpuflags: "ignore"
349339
boost: "--build-boost"
350-
icu: "--build-icu --with-icu"
351340
llvm: ""
352341
secp256k1: "--build-secp256k1"
353342
cc: "gcc-12"
@@ -364,14 +353,13 @@ jobs:
364353
coverage: "nocov"
365354
detectcpuflags: "ignore"
366355
boost: "--build-boost"
367-
icu: "--with-icu"
368356
llvm: ""
369357
secp256k1: "--build-secp256k1"
370358
cc: "clang"
371359
flags: "-Os -fPIE"
372360
options: ""
373361
packager: "brew"
374-
packages: "icu4c"
362+
packages: ""
375363

376364
- os: macos-latest
377365
cxx: "clang++"
@@ -381,7 +369,6 @@ jobs:
381369
coverage: "nocov"
382370
detectcpuflags: "ignore"
383371
boost: "--build-boost"
384-
icu: "--build-icu --with-icu"
385372
llvm: ""
386373
secp256k1: "--build-secp256k1"
387374
cc: "clang"
@@ -488,7 +475,6 @@ jobs:
488475
${{ env.ASSERT_NDEBUG }}
489476
${{ env.CPU_SUPPORTED_FLAGS }}
490477
${{ matrix.boost }}
491-
${{ matrix.icu }}
492478
${{ matrix.secp256k1 }}
493479
494480
- name: Coveralls Calculation
@@ -581,7 +567,6 @@ jobs:
581567
coverage: "nocov"
582568
detectcpuflags: "ignore"
583569
boost: "--build-boost"
584-
icu: ""
585570
llvm: ""
586571
secp256k1: "--build-secp256k1"
587572
cc: "clang-18"
@@ -599,7 +584,6 @@ jobs:
599584
coverage: "nocov"
600585
detectcpuflags: "ignore"
601586
boost: "--build-boost"
602-
icu: "--build-icu --with-icu"
603587
llvm: ""
604588
secp256k1: "--build-secp256k1"
605589
cc: "clang-18"
@@ -617,7 +601,6 @@ jobs:
617601
coverage: "nocov"
618602
detectcpuflags: "ignore"
619603
boost: "--build-boost"
620-
icu: ""
621604
llvm: ""
622605
secp256k1: "--build-secp256k1"
623606
cc: "gcc-12"
@@ -725,7 +708,6 @@ jobs:
725708
${{ env.ASSERT_NDEBUG }}
726709
${{ env.CPU_SUPPORTED_FLAGS }}
727710
${{ matrix.boost }}
728-
${{ matrix.icu }}
729711
${{ matrix.secp256k1 }}
730712
731713
- name: Coveralls Calculation

‎install-cmake.sh‎

Lines changed: 0 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,6 @@
88
# Script to build and install libbitcoin-server.
99
#
1010
# Script options:
11-
# --with-icu Compile with International Components for Unicode.
12-
# Since the addition of BIP-39 and later BIP-38
13-
# support, libbitcoin conditionally incorporates ICU
14-
# to provide BIP-38 and BIP-39 passphrase
15-
# normalization features. Currently
16-
# libbitcoin-explorer is the only other library that
17-
# accesses this feature, so if you do not intend to
18-
# use passphrase normalization this dependency can
19-
# be avoided.
20-
# --build-icu Builds ICU libraries.
2111
# --build-boost Builds Boost libraries.
2212
# --build-dir=<path> Location of downloaded and intermediate files.
2313
# --prefix=<absolute-path> Library install location (defaults to /usr/local).
@@ -65,11 +55,6 @@ BUILD_SRC_DIR="build-libbitcoin-server"
6555

6656
PRESUMED_CI_PROJECT_PATH=$(pwd)
6757

68-
# ICU archive.
69-
#------------------------------------------------------------------------------
70-
ICU_URL="https://github.com/unicode-org/icu/releases/download/release-78.2/icu4c-78.2-sources.tgz"
71-
ICU_ARCHIVE="icu4c-78.2-sources.tgz"
72-
7358
# Boost archive.
7459
#------------------------------------------------------------------------------
7560
BOOST_URL="https://archives.boost.io/release/1.86.0/source/boost_1_86_0.tar.bz2"
@@ -227,16 +212,6 @@ display_help()
227212
display_message "Usage: ./install.sh [OPTION]..."
228213
display_message "Manage the installation of libbitcoin-server."
229214
display_message "Script options:"
230-
display_message " --with-icu Compile with International Components for Unicode."
231-
display_message " Since the addition of BIP-39 and later BIP-38 "
232-
display_message " support, libbitcoin conditionally incorporates ICU "
233-
display_message " to provide BIP-38 and BIP-39 passphrase "
234-
display_message " normalization features. Currently "
235-
display_message " libbitcoin-explorer is the only other library that "
236-
display_message " accesses this feature, so if you do not intend to "
237-
display_message " use passphrase normalization this dependency can "
238-
display_message " be avoided."
239-
display_message " --build-icu Build ICU libraries."
240215
display_message " --build-boost Build Boost libraries."
241216
display_message " --build-secp256k1 Build libsecp256k1 libraries."
242217
display_message " --build-dir=<path> Location of downloaded and intermediate files."
@@ -265,10 +240,8 @@ parse_command_line_options()
265240
(--disable-static) DISABLE_STATIC="yes";;
266241

267242
# Common project options.
268-
(--with-icu) WITH_ICU="yes";;
269243

270244
# Custom build options.
271-
(--build-icu) BUILD_ICU="yes";;
272245
(--build-boost) BUILD_BOOST="yes";;
273246
(--build-secp256k1) BUILD_SECP256K1="yes";;
274247

@@ -392,12 +365,6 @@ handle_custom_options()
392365
export CMAKE_LIBRARY_PATH="${PREFIX}/lib:${CMAKE_LIBRARY_PATH}"
393366
fi
394367
fi
395-
396-
# Process ICU
397-
if [[ $WITH_ICU ]]; then
398-
CUMULATIVE_FILTERED_ARGS+=" --with-icu"
399-
CUMULATIVE_FILTERED_ARGS_CMAKE+=" -Dwith-icu=yes"
400-
fi
401368
}
402369

403370
remove_build_options()
@@ -472,8 +439,6 @@ display_configuration()
472439
display_message "CXXFLAGS : $CXXFLAGS"
473440
display_message "LDFLAGS : $LDFLAGS"
474441
display_message "LDLIBS : $LDLIBS"
475-
display_message "WITH_ICU : $WITH_ICU"
476-
display_message "BUILD_ICU : $BUILD_ICU"
477442
display_message "BUILD_BOOST : $BUILD_BOOST"
478443
display_message "BUILD_SECP256K1 : $BUILD_SECP256K1"
479444
display_message "BOOST_ROOT : $BOOST_ROOT"
@@ -917,11 +882,6 @@ build_from_tarball_boost()
917882
#==============================================================================
918883
build_all()
919884
{
920-
unpack_from_tarball "$ICU_ARCHIVE" "$ICU_URL" gzip "$BUILD_ICU"
921-
local SAVE_CPPFLAGS="$CPPFLAGS"
922-
export CPPFLAGS="$CPPFLAGS ${ICU_FLAGS[@]}"
923-
build_from_tarball "$ICU_ARCHIVE" source "$PARALLEL" "$BUILD_ICU" "${ICU_OPTIONS[@]}" $CUMULATIVE_FILTERED_ARGS
924-
export CPPFLAGS=$SAVE_CPPFLAGS
925885
unpack_from_tarball "$BOOST_ARCHIVE" "$BOOST_URL" bzip2 "$BUILD_BOOST"
926886
local SAVE_CPPFLAGS="$CPPFLAGS"
927887
export CPPFLAGS="$CPPFLAGS ${BOOST_FLAGS[@]}"
@@ -988,11 +948,6 @@ remove_install_options
988948

989949
# Define build flags.
990950
#==============================================================================
991-
# Define icu flags.
992-
#------------------------------------------------------------------------------
993-
ICU_FLAGS=(
994-
"-w")
995-
996951
# Define boost flags.
997952
#------------------------------------------------------------------------------
998953
BOOST_FLAGS=(
@@ -1006,19 +961,6 @@ SECP256K1_FLAGS=(
1006961

1007962
# Define build options.
1008963
#==============================================================================
1009-
# Define icu options.
1010-
#------------------------------------------------------------------------------
1011-
ICU_OPTIONS=(
1012-
"--enable-draft" \
1013-
"--enable-rpath" \
1014-
"--enable-tools" \
1015-
"--disable-extras" \
1016-
"--disable-icuio" \
1017-
"--disable-layout" \
1018-
"--disable-layoutex" \
1019-
"--disable-tests" \
1020-
"--disable-samples")
1021-
1022964
# Define boost options.
1023965
#------------------------------------------------------------------------------
1024966
BOOST_OPTIONS=(

‎install-cmakepresets.sh‎

Lines changed: 0 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,6 @@
88
# Script to build and install libbitcoin-server.
99
#
1010
# Script options:
11-
# --with-icu Compile with International Components for Unicode.
12-
# Since the addition of BIP-39 and later BIP-38
13-
# support, libbitcoin conditionally incorporates ICU
14-
# to provide BIP-38 and BIP-39 passphrase
15-
# normalization features. Currently
16-
# libbitcoin-explorer is the only other library that
17-
# accesses this feature, so if you do not intend to
18-
# use passphrase normalization this dependency can
19-
# be avoided.
20-
# --build-icu Builds ICU libraries.
2111
# --build-boost Builds Boost libraries.
2212
# --build-dir=<path> Location of downloaded and intermediate files.
2313
# --preset=<label> CMakePreset label.
@@ -71,11 +61,6 @@ BUILD_SRC_DIR="build-libbitcoin-server"
7161

7262
PRESUMED_CI_PROJECT_PATH=$(pwd)
7363

74-
# ICU archive.
75-
#------------------------------------------------------------------------------
76-
ICU_URL="https://github.com/unicode-org/icu/releases/download/release-78.2/icu4c-78.2-sources.tgz"
77-
ICU_ARCHIVE="icu4c-78.2-sources.tgz"
78-
7964
# Boost archive.
8065
#------------------------------------------------------------------------------
8166
BOOST_URL="https://archives.boost.io/release/1.86.0/source/boost_1_86_0.tar.bz2"
@@ -233,16 +218,6 @@ display_help()
233218
display_message "Usage: ./install.sh [OPTION]..."
234219
display_message "Manage the installation of libbitcoin-server."
235220
display_message "Script options:"
236-
display_message " --with-icu Compile with International Components for Unicode."
237-
display_message " Since the addition of BIP-39 and later BIP-38 "
238-
display_message " support, libbitcoin conditionally incorporates ICU "
239-
display_message " to provide BIP-38 and BIP-39 passphrase "
240-
display_message " normalization features. Currently "
241-
display_message " libbitcoin-explorer is the only other library that "
242-
display_message " accesses this feature, so if you do not intend to "
243-
display_message " use passphrase normalization this dependency can "
244-
display_message " be avoided."
245-
display_message " --build-icu Build ICU libraries."
246221
display_message " --build-boost Build Boost libraries."
247222
display_message " --build-secp256k1 Build libsecp256k1 libraries."
248223
display_message " --build-dir=<path> Location of downloaded and intermediate files."
@@ -272,10 +247,8 @@ parse_command_line_options()
272247
(--disable-static) DISABLE_STATIC="yes";;
273248

274249
# Common project options.
275-
(--with-icu) WITH_ICU="yes";;
276250

277251
# Custom build options.
278-
(--build-icu) BUILD_ICU="yes";;
279252
(--build-boost) BUILD_BOOST="yes";;
280253
(--build-secp256k1) BUILD_SECP256K1="yes";;
281254

@@ -513,8 +486,6 @@ display_configuration()
513486
display_message "CXXFLAGS : $CXXFLAGS"
514487
display_message "LDFLAGS : $LDFLAGS"
515488
display_message "LDLIBS : $LDLIBS"
516-
display_message "WITH_ICU : $WITH_ICU"
517-
display_message "BUILD_ICU : $BUILD_ICU"
518489
display_message "BUILD_BOOST : $BUILD_BOOST"
519490
display_message "BUILD_SECP256K1 : $BUILD_SECP256K1"
520491
display_message "BOOST_ROOT : $BOOST_ROOT"
@@ -962,11 +933,6 @@ build_from_tarball_boost()
962933
#==============================================================================
963934
build_all()
964935
{
965-
unpack_from_tarball "$ICU_ARCHIVE" "$ICU_URL" gzip "$BUILD_ICU"
966-
local SAVE_CPPFLAGS="$CPPFLAGS"
967-
export CPPFLAGS="$CPPFLAGS ${ICU_FLAGS[@]}"
968-
build_from_tarball "$ICU_ARCHIVE" source "$PARALLEL" "$BUILD_ICU" "${ICU_OPTIONS[@]}" $CUMULATIVE_FILTERED_ARGS
969-
export CPPFLAGS=$SAVE_CPPFLAGS
970936
unpack_from_tarball "$BOOST_ARCHIVE" "$BOOST_URL" bzip2 "$BUILD_BOOST"
971937
local SAVE_CPPFLAGS="$CPPFLAGS"
972938
export CPPFLAGS="$CPPFLAGS ${BOOST_FLAGS[@]}"
@@ -1039,11 +1005,6 @@ remove_install_options
10391005

10401006
# Define build flags.
10411007
#==============================================================================
1042-
# Define icu flags.
1043-
#------------------------------------------------------------------------------
1044-
ICU_FLAGS=(
1045-
"-w")
1046-
10471008
# Define boost flags.
10481009
#------------------------------------------------------------------------------
10491010
BOOST_FLAGS=(
@@ -1057,19 +1018,6 @@ SECP256K1_FLAGS=(
10571018

10581019
# Define build options.
10591020
#==============================================================================
1060-
# Define icu options.
1061-
#------------------------------------------------------------------------------
1062-
ICU_OPTIONS=(
1063-
"--enable-draft" \
1064-
"--enable-rpath" \
1065-
"--enable-tools" \
1066-
"--disable-extras" \
1067-
"--disable-icuio" \
1068-
"--disable-layout" \
1069-
"--disable-layoutex" \
1070-
"--disable-tests" \
1071-
"--disable-samples")
1072-
10731021
# Define boost options.
10741022
#------------------------------------------------------------------------------
10751023
BOOST_OPTIONS=(

0 commit comments

Comments
 (0)