Skip to content

Commit 4a990f5

Browse files
pmienkpmienk
authored
Merge pull request #1777 from pmienk/master
Regenerate artifacts.
2 parents 11f4e09 + e82e640 commit 4a990f5

4 files changed

Lines changed: 79 additions & 38 deletions

File tree

‎builds/msvc/vs2022/libbitcoin-system-test/libbitcoin-system-test.vcxproj‎

Lines changed: 30 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,9 @@
139139
<ClCompile Include="..\..\..\..\test\chain\output.cpp" />
140140
<ClCompile Include="..\..\..\..\test\chain\point.cpp" />
141141
<ClCompile Include="..\..\..\..\test\chain\satoshi_words.cpp" />
142-
<ClCompile Include="..\..\..\..\test\chain\script.cpp" />
142+
<ClCompile Include="..\..\..\..\test\chain\script.cpp">
143+
<ObjectFileName>$(IntDir)test_chain_script.obj</ObjectFileName>
144+
</ClCompile>
143145
<ClCompile Include="..\..\..\..\test\chain\stripper.cpp" />
144146
<ClCompile Include="..\..\..\..\test\chain\taproot.cpp" />
145147
<ClCompile Include="..\..\..\..\test\chain\tapscript.cpp" />
@@ -212,11 +214,15 @@
212214
<ClCompile Include="..\..\..\..\test\hash\functions.cpp" />
213215
<ClCompile Include="..\..\..\..\test\hash\hmac.cpp" />
214216
<ClCompile Include="..\..\..\..\test\hash\pbkd.cpp" />
215-
<ClCompile Include="..\..\..\..\test\hash\performance\baseline\rmd160.cpp" />
217+
<ClCompile Include="..\..\..\..\test\hash\performance\baseline\rmd160.cpp">
218+
<ObjectFileName>$(IntDir)test_hash_performance_baseline_rmd160.obj</ObjectFileName>
219+
</ClCompile>
216220
<ClCompile Include="..\..\..\..\test\hash\performance\baseline\sha256.cpp">
217221
<ObjectFileName>$(IntDir)test_hash_performance_baseline_sha256.obj</ObjectFileName>
218222
</ClCompile>
219-
<ClCompile Include="..\..\..\..\test\hash\performance\performance.cpp" />
223+
<ClCompile Include="..\..\..\..\test\hash\performance\performance.cpp">
224+
<ObjectFileName>$(IntDir)test_hash_performance_performance.obj</ObjectFileName>
225+
</ClCompile>
220226
<ClCompile Include="..\..\..\..\test\hash\rmd\algorithm.cpp">
221227
<ObjectFileName>$(IntDir)test_hash_rmd_algorithm.obj</ObjectFileName>
222228
</ClCompile>
@@ -236,7 +242,9 @@
236242
</ClCompile>
237243
<ClCompile Include="..\..\..\..\test\hash\sha\sha512.cpp" />
238244
<ClCompile Include="..\..\..\..\test\hash\sha\vector.cpp" />
239-
<ClCompile Include="..\..\..\..\test\hash\siphash.cpp" />
245+
<ClCompile Include="..\..\..\..\test\hash\siphash.cpp">
246+
<ObjectFileName>$(IntDir)test_hash_siphash.obj</ObjectFileName>
247+
</ClCompile>
240248
<ClCompile Include="..\..\..\..\test\intrinsics\byte_swap.cpp" />
241249
<ClCompile Include="..\..\..\..\test\intrinsics\cpuid.cpp" />
242250
<ClCompile Include="..\..\..\..\test\intrinsics\detection.cpp" />
@@ -262,7 +270,9 @@
262270
<ClCompile Include="..\..\..\..\test\math\addition.cpp" />
263271
<ClCompile Include="..\..\..\..\test\math\bits.cpp" />
264272
<ClCompile Include="..\..\..\..\test\math\bytes.cpp" />
265-
<ClCompile Include="..\..\..\..\test\math\byteswap.cpp" />
273+
<ClCompile Include="..\..\..\..\test\math\byteswap.cpp">
274+
<ObjectFileName>$(IntDir)test_math_byteswap.obj</ObjectFileName>
275+
</ClCompile>
266276
<ClCompile Include="..\..\..\..\test\math\cast.cpp" />
267277
<ClCompile Include="..\..\..\..\test\math\division.cpp" />
268278
<ClCompile Include="..\..\..\..\test\math\limits.cpp" />
@@ -310,7 +320,9 @@
310320
<ClCompile Include="..\..\..\..\test\stream\streamers\sha256_writer.cpp" />
311321
<ClCompile Include="..\..\..\..\test\stream\streamers\sha256t_writer.cpp" />
312322
<ClCompile Include="..\..\..\..\test\stream\streamers\sha256x2_writer.cpp" />
313-
<ClCompile Include="..\..\..\..\test\test.cpp" />
323+
<ClCompile Include="..\..\..\..\test\test.cpp">
324+
<ObjectFileName>$(IntDir)test_test.obj</ObjectFileName>
325+
</ClCompile>
314326
<ClCompile Include="..\..\..\..\test\typelets.cpp" />
315327
<ClCompile Include="..\..\..\..\test\types.cpp">
316328
<ObjectFileName>$(IntDir)test_types.obj</ObjectFileName>
@@ -325,7 +337,9 @@
325337
<ClCompile Include="..\..\..\..\test\unicode\utf8_everywhere\paths.cpp" />
326338
<ClCompile Include="..\..\..\..\test\unicode\utf8_everywhere\unicode_istream.cpp" />
327339
<ClCompile Include="..\..\..\..\test\unicode\utf8_everywhere\unicode_ostream.cpp" />
328-
<ClCompile Include="..\..\..\..\test\utreexo\utreexo.cpp" />
340+
<ClCompile Include="..\..\..\..\test\utreexo\utreexo.cpp">
341+
<ObjectFileName>$(IntDir)test_utreexo_utreexo.obj</ObjectFileName>
342+
</ClCompile>
329343
<ClCompile Include="..\..\..\..\test\wallet\addresses\bitcoin_uri.cpp" />
330344
<ClCompile Include="..\..\..\..\test\wallet\addresses\checked.cpp" />
331345
<ClCompile Include="..\..\..\..\test\wallet\addresses\payment_address.cpp" />
@@ -371,9 +385,15 @@
371385
<ClCompile Include="..\..\..\..\test\words\catalogs\mnemonic.cpp">
372386
<ObjectFileName>$(IntDir)test_words_catalogs_mnemonic.obj</ObjectFileName>
373387
</ClCompile>
374-
<ClCompile Include="..\..\..\..\test\words\dictionaries.cpp" />
375-
<ClCompile Include="..\..\..\..\test\words\dictionary.cpp" />
376-
<ClCompile Include="..\..\..\..\test\words\languages.cpp" />
388+
<ClCompile Include="..\..\..\..\test\words\dictionaries.cpp">
389+
<ObjectFileName>$(IntDir)test_words_dictionaries.obj</ObjectFileName>
390+
</ClCompile>
391+
<ClCompile Include="..\..\..\..\test\words\dictionary.cpp">
392+
<ObjectFileName>$(IntDir)test_words_dictionary.obj</ObjectFileName>
393+
</ClCompile>
394+
<ClCompile Include="..\..\..\..\test\words\languages.cpp">
395+
<ObjectFileName>$(IntDir)test_words_languages.obj</ObjectFileName>
396+
</ClCompile>
377397
</ItemGroup>
378398
<ItemGroup>
379399
<ClInclude Include="..\..\..\..\test\chain\script.hpp" />

‎builds/msvc/vs2022/libbitcoin-system/libbitcoin-system.vcxproj‎

Lines changed: 39 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,9 @@
198198
<ClCompile Include="..\..\..\..\src\config\version.cpp" />
199199
<ClCompile Include="..\..\..\..\src\crypto\aes256.cpp" />
200200
<ClCompile Include="..\..\..\..\src\crypto\der_parser.cpp" />
201-
<ClCompile Include="..\..\..\..\src\crypto\ec_context.cpp" />
201+
<ClCompile Include="..\..\..\..\src\crypto\ec_context.cpp">
202+
<ObjectFileName>$(IntDir)src_crypto_ec_context.obj</ObjectFileName>
203+
</ClCompile>
202204
<ClCompile Include="..\..\..\..\src\crypto\pseudo_random.cpp" />
203205
<ClCompile Include="..\..\..\..\src\crypto\ring_signature.cpp" />
204206
<ClCompile Include="..\..\..\..\src\crypto\secp256k1.cpp" />
@@ -242,15 +244,33 @@
242244
<ClCompile Include="..\..\..\..\src\wallet\addresses\bitcoin_uri.cpp" />
243245
<ClCompile Include="..\..\..\..\src\wallet\addresses\payment_address.cpp" />
244246
<ClCompile Include="..\..\..\..\src\wallet\addresses\qr_code.cpp" />
245-
<ClCompile Include="..\..\..\..\src\wallet\addresses\qrencode\bitstream.c" />
246-
<ClCompile Include="..\..\..\..\src\wallet\addresses\qrencode\mask.c" />
247-
<ClCompile Include="..\..\..\..\src\wallet\addresses\qrencode\mmask.c" />
248-
<ClCompile Include="..\..\..\..\src\wallet\addresses\qrencode\mqrspec.c" />
249-
<ClCompile Include="..\..\..\..\src\wallet\addresses\qrencode\qrencode.c" />
250-
<ClCompile Include="..\..\..\..\src\wallet\addresses\qrencode\qrinput.c" />
251-
<ClCompile Include="..\..\..\..\src\wallet\addresses\qrencode\qrspec.c" />
252-
<ClCompile Include="..\..\..\..\src\wallet\addresses\qrencode\rsecc.c" />
253-
<ClCompile Include="..\..\..\..\src\wallet\addresses\qrencode\split.c" />
247+
<ClCompile Include="..\..\..\..\src\wallet\addresses\qrencode\bitstream.c">
248+
<ObjectFileName>$(IntDir)src_wallet_addresses_qrencode_bitstream.c.obj</ObjectFileName>
249+
</ClCompile>
250+
<ClCompile Include="..\..\..\..\src\wallet\addresses\qrencode\mask.c">
251+
<ObjectFileName>$(IntDir)src_wallet_addresses_qrencode_mask.c.obj</ObjectFileName>
252+
</ClCompile>
253+
<ClCompile Include="..\..\..\..\src\wallet\addresses\qrencode\mmask.c">
254+
<ObjectFileName>$(IntDir)src_wallet_addresses_qrencode_mmask.c.obj</ObjectFileName>
255+
</ClCompile>
256+
<ClCompile Include="..\..\..\..\src\wallet\addresses\qrencode\mqrspec.c">
257+
<ObjectFileName>$(IntDir)src_wallet_addresses_qrencode_mqrspec.c.obj</ObjectFileName>
258+
</ClCompile>
259+
<ClCompile Include="..\..\..\..\src\wallet\addresses\qrencode\qrencode.c">
260+
<ObjectFileName>$(IntDir)src_wallet_addresses_qrencode_qrencode.c.obj</ObjectFileName>
261+
</ClCompile>
262+
<ClCompile Include="..\..\..\..\src\wallet\addresses\qrencode\qrinput.c">
263+
<ObjectFileName>$(IntDir)src_wallet_addresses_qrencode_qrinput.c.obj</ObjectFileName>
264+
</ClCompile>
265+
<ClCompile Include="..\..\..\..\src\wallet\addresses\qrencode\qrspec.c">
266+
<ObjectFileName>$(IntDir)src_wallet_addresses_qrencode_qrspec.c.obj</ObjectFileName>
267+
</ClCompile>
268+
<ClCompile Include="..\..\..\..\src\wallet\addresses\qrencode\rsecc.c">
269+
<ObjectFileName>$(IntDir)src_wallet_addresses_qrencode_rsecc.c.obj</ObjectFileName>
270+
</ClCompile>
271+
<ClCompile Include="..\..\..\..\src\wallet\addresses\qrencode\split.c">
272+
<ObjectFileName>$(IntDir)src_wallet_addresses_qrencode_split.c.obj</ObjectFileName>
273+
</ClCompile>
254274
<ClCompile Include="..\..\..\..\src\wallet\addresses\stealth_address.cpp" />
255275
<ClCompile Include="..\..\..\..\src\wallet\addresses\stealth_receiver.cpp" />
256276
<ClCompile Include="..\..\..\..\src\wallet\addresses\stealth_sender.cpp" />
@@ -271,9 +291,15 @@
271291
<ClCompile Include="..\..\..\..\src\wallet\keys\hd_private.cpp" />
272292
<ClCompile Include="..\..\..\..\src\wallet\keys\hd_public.cpp" />
273293
<ClCompile Include="..\..\..\..\src\wallet\keys\mini_keys.cpp" />
274-
<ClCompile Include="..\..\..\..\src\wallet\keys\parse_encrypted_keys\parse_encrypted_private.cpp" />
275-
<ClCompile Include="..\..\..\..\src\wallet\keys\parse_encrypted_keys\parse_encrypted_public.cpp" />
276-
<ClCompile Include="..\..\..\..\src\wallet\keys\parse_encrypted_keys\parse_encrypted_token.cpp" />
294+
<ClCompile Include="..\..\..\..\src\wallet\keys\parse_encrypted_keys\parse_encrypted_private.cpp">
295+
<ObjectFileName>$(IntDir)src_wallet_keys_parse_encrypted_keys_parse_encrypted_private.obj</ObjectFileName>
296+
</ClCompile>
297+
<ClCompile Include="..\..\..\..\src\wallet\keys\parse_encrypted_keys\parse_encrypted_public.cpp">
298+
<ObjectFileName>$(IntDir)src_wallet_keys_parse_encrypted_keys_parse_encrypted_public.obj</ObjectFileName>
299+
</ClCompile>
300+
<ClCompile Include="..\..\..\..\src\wallet\keys\parse_encrypted_keys\parse_encrypted_token.cpp">
301+
<ObjectFileName>$(IntDir)src_wallet_keys_parse_encrypted_keys_parse_encrypted_token.obj</ObjectFileName>
302+
</ClCompile>
277303
<ClCompile Include="..\..\..\..\src\wallet\keys\stealth.cpp" />
278304
<ClCompile Include="..\..\..\..\src\wallet\message.cpp" />
279305
<ClCompile Include="..\..\..\..\src\wallet\mnemonics\electrum.cpp">

‎configure.ac‎

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -451,15 +451,13 @@ AC_MSG_NOTICE([rt_LIBS : ${rt_LIBS}])
451451
# Require icu-i18n of at least version 55.2 and output ${icu_i18n_CPPFLAGS/LIBS/PKG}.
452452
#------------------------------------------------------------------------------
453453
AS_CASE([${with_icu}], [yes],
454-
[PKG_CHECK_MODULES([icu_i18n], [icu-i18n >= 55.2],
455-
[icu_i18n_INCLUDEDIR="`$PKG_CONFIG --variable=includedir "icu-i18n >= 55.2" 2>/dev/null`"
456-
icu_i18n_OTHER_CFLAGS="`$PKG_CONFIG --cflags-only-other "icu-i18n >= 55.2" 2>/dev/null`"],
457-
[AC_MSG_ERROR([--with-icu specified but icu-i18n >= 55.2 was not found.])])
454+
[PKG_CHECK_MODULES([icu_i18n], [icu-i18n >= 55.2], [],
455+
[
456+
AC_MSG_ERROR([--with-icu specified but icu-i18n >= 55.2 was not found.])
457+
])
458458
AC_SUBST([icu_i18n_PKG], ['icu-i18n >= 55.2'])
459459
AC_SUBST([icu_i18n_CPPFLAGS], [${icu_i18n_CFLAGS}])
460-
AS_IF([test x${icu_i18n_INCLUDEDIR} != "x"],
461-
[AC_SUBST([icu_i18n_ISYS_CPPFLAGS], ["-isystem${icu_i18n_INCLUDEDIR} ${icu_i18n_OTHER_CFLAGS}"])],
462-
[AC_SUBST([icu_i18n_ISYS_CPPFLAGS], [${icu_i18n_OTHER_CFLAGS}])])
460+
AC_SUBST([icu_i18n_ISYS_CPPFLAGS], [`echo ${icu_i18n_CPPFLAGS} | $SED s/^-I/-isystem/g | $SED s/' -I'/' -isystem'/g`]])
463461
AC_MSG_NOTICE([icu_i18n_CPPFLAGS : ${icu_i18n_CPPFLAGS}])
464462
AC_MSG_NOTICE([icu_i18n_ISYS_CPPFLAGS : ${icu_i18n_ISYS_CPPFLAGS}])
465463
AC_MSG_NOTICE([icu_i18n_OTHER_CFLAGS : ${icu_i18n_OTHER_CFLAGS}])
@@ -487,15 +485,13 @@ AC_MSG_NOTICE([dl_LIBS : ${dl_LIBS}])
487485

488486
# Require secp256k1 of at least version 0.5.1.0 and output ${secp256k1_CPPFLAGS/LIBS/PKG}.
489487
#------------------------------------------------------------------------------
490-
PKG_CHECK_MODULES([secp256k1], [libsecp256k1 >= 0.5.1.0],
491-
[secp256k1_INCLUDEDIR="`$PKG_CONFIG --variable=includedir "libsecp256k1 >= 0.5.1.0" 2>/dev/null`"
492-
secp256k1_OTHER_CFLAGS="`$PKG_CONFIG --cflags-only-other "libsecp256k1 >= 0.5.1.0" 2>/dev/null`"],
493-
[AC_MSG_ERROR([libsecp256k1 >= 0.5.1.0 is required but was not found.])])
488+
PKG_CHECK_MODULES([secp256k1], [libsecp256k1 >= 0.5.1.0], [],
489+
[
490+
AC_MSG_ERROR([libsecp256k1 >= 0.5.1.0 is required but was not found.])
491+
])
494492
AC_SUBST([secp256k1_PKG], ['libsecp256k1 >= 0.5.1.0'])
495493
AC_SUBST([secp256k1_CPPFLAGS], [${secp256k1_CFLAGS}])
496-
AS_IF([test x${secp256k1_INCLUDEDIR} != "x"],
497-
[AC_SUBST([secp256k1_ISYS_CPPFLAGS], ["-isystem${secp256k1_INCLUDEDIR} ${secp256k1_OTHER_CFLAGS}"])],
498-
[AC_SUBST([secp256k1_ISYS_CPPFLAGS], [${secp256k1_OTHER_CFLAGS}])])
494+
AC_SUBST([secp256k1_ISYS_CPPFLAGS], [`echo ${secp256k1_CPPFLAGS} | $SED s/^-I/-isystem/g | $SED s/' -I'/' -isystem'/g`]])
499495
AC_MSG_NOTICE([secp256k1_CPPFLAGS : ${secp256k1_CPPFLAGS}])
500496
AC_MSG_NOTICE([secp256k1_ISYS_CPPFLAGS : ${secp256k1_ISYS_CPPFLAGS}])
501497
AC_MSG_NOTICE([secp256k1_OTHER_CFLAGS : ${secp256k1_OTHER_CFLAGS}])

‎libbitcoin-system.pc.in‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ exec_prefix=@exec_prefix@
1212
libdir=@libdir@
1313
includedir=@includedir@
1414

15-
1615
# Metadata
1716
#==============================================================================
1817
Name: libbitcoin-system

0 commit comments

Comments
 (0)