Skip to content

Commit a745e7c

Browse files
evoskuilevoskuil
committed
Regenerate artifacts.
1 parent e358e42 commit a745e7c

56 files changed

Lines changed: 1045 additions & 797 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.appveyor.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
###############################################################################
2-
# Copyright (c) 2014-2015 libbitcoin-database developers (see COPYING).
2+
# Copyright (c) 2014-2020 libbitcoin-database developers (see COPYING).
33
#
44
# GENERATED SOURCE CODE, DO NOT EDIT EXCEPT EXPERIMENTALLY
55
#
66
###############################################################################
7-
version: 3.6.0.{build}-{branch}
7+
version: 3.7.0.{build}-{branch}
88

99
image: Visual Studio 2013
1010

‎.travis.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
###############################################################################
2-
# Copyright (c) 2014-2015 libbitcoin-database developers (see COPYING).
2+
# Copyright (c) 2014-2020 libbitcoin-database developers (see COPYING).
33
#
44
# GENERATED SOURCE CODE, DO NOT EDIT EXCEPT EXPERIMENTALLY
55
#
@@ -60,7 +60,7 @@ before_install:
6060
- if [[ $TRAVIS_OS_NAME == linux ]]; then LINUX=true; fi
6161

6262
# Update homebrew.
63-
- if [[ $OSX && $CLANG ]]; then brew update; fi
63+
- if [[ $OSX && $CLANG && $DYNAMIC ]]; then brew update; fi
6464

6565
install:
6666

‎Makefile.am‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
###############################################################################
2-
# Copyright (c) 2014-2015 libbitcoin-database developers (see COPYING).
2+
# Copyright (c) 2014-2020 libbitcoin-database developers (see COPYING).
33
#
44
# GENERATED SOURCE CODE, DO NOT EDIT EXCEPT EXPERIMENTALLY
55
#
@@ -32,8 +32,8 @@ doc_DATA = \
3232
# src/libbitcoin-database.la => ${libdir}
3333
#------------------------------------------------------------------------------
3434
lib_LTLIBRARIES = src/libbitcoin-database.la
35-
src_libbitcoin_database_la_CPPFLAGS = -I${srcdir}/include ${bitcoin_BUILD_CPPFLAGS}
36-
src_libbitcoin_database_la_LIBADD = ${bitcoin_LIBS}
35+
src_libbitcoin_database_la_CPPFLAGS = -I${srcdir}/include ${bitcoin_system_BUILD_CPPFLAGS}
36+
src_libbitcoin_database_la_LIBADD = ${bitcoin_system_LIBS}
3737
src_libbitcoin_database_la_SOURCES = \
3838
src/data_base.cpp \
3939
src/settings.cpp \
@@ -65,8 +65,8 @@ if WITH_TESTS
6565
TESTS = libbitcoin-database-test_runner.sh
6666

6767
check_PROGRAMS = test/libbitcoin-database-test
68-
test_libbitcoin_database_test_CPPFLAGS = -I${srcdir}/include ${bitcoin_BUILD_CPPFLAGS}
69-
test_libbitcoin_database_test_LDADD = src/libbitcoin-database.la ${boost_unit_test_framework_LIBS} ${bitcoin_LIBS}
68+
test_libbitcoin_database_test_CPPFLAGS = -I${srcdir}/include ${bitcoin_system_BUILD_CPPFLAGS}
69+
test_libbitcoin_database_test_LDADD = src/libbitcoin-database.la ${boost_unit_test_framework_LIBS} ${bitcoin_system_LIBS}
7070
test_libbitcoin_database_test_SOURCES = \
7171
test/block_database.cpp \
7272
test/data_base.cpp \
@@ -86,8 +86,8 @@ endif WITH_TESTS
8686
if WITH_TOOLS
8787

8888
noinst_PROGRAMS = tools/initchain/initchain
89-
tools_initchain_initchain_CPPFLAGS = -I${srcdir}/include ${bitcoin_BUILD_CPPFLAGS}
90-
tools_initchain_initchain_LDADD = src/libbitcoin-database.la ${bitcoin_LIBS}
89+
tools_initchain_initchain_CPPFLAGS = -I${srcdir}/include ${bitcoin_system_BUILD_CPPFLAGS}
90+
tools_initchain_initchain_LDADD = src/libbitcoin-database.la ${bitcoin_system_LIBS}
9191
tools_initchain_initchain_SOURCES = \
9292
tools/initchain/initchain.cpp
9393

‎autogen.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/sh
22
###############################################################################
3-
# Copyright (c) 2014-2015 libbitcoin-database developers (see COPYING).
3+
# Copyright (c) 2014-2020 libbitcoin-database developers (see COPYING).
44
#
55
# GENERATED SOURCE CODE, DO NOT EDIT EXCEPT EXPERIMENTALLY
66
#

‎build.cmd‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
REM ###########################################################################
2-
REM # Copyright (c) 2014-2015 libbitcoin-database developers (see COPYING).
2+
REM # Copyright (c) 2014-2020 libbitcoin-database developers (see COPYING).
33
REM #
44
REM # GENERATED SOURCE CODE, DO NOT EDIT EXCEPT EXPERIMENTALLY
55
REM #
@@ -23,9 +23,9 @@ IF NOT EXIST "%nuget_pkg_path%" (
2323
)
2424
)
2525

26-
call :init libbitcoin libbitcoin version3
26+
call :init libbitcoin-system libbitcoin-system version3
2727
IF %ERRORLEVEL% NEQ 0 (
28-
call :failure "Initializing repository libbitcoin libbitcoin version3 failed."
28+
call :failure "Initializing repository libbitcoin-system libbitcoin-system version3 failed."
2929
exit /b 1
3030
)
3131
call :bld_repo libbitcoin-database

‎builds/cmake/modules/FindBitcoin-System.cmake‎

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
###############################################################################
2+
# Copyright (c) 2014-2020 libbitcoin-protocol developers (see COPYING).
3+
#
4+
# GENERATED SOURCE CODE, DO NOT EDIT EXCEPT EXPERIMENTALLY
5+
#
6+
###############################################################################
7+
# FindBitcoin
8+
#
9+
# Use this module by invoking find_package with the form::
10+
#
11+
# find_package( Bitcoin-System
12+
# [version] # Minimum version
13+
# [REQUIRED] # Fail with error if bitcoin is not found
14+
# )
15+
#
16+
# Defines the following for use:
17+
#
18+
# bitcoin_system_FOUND - true if headers and requested libraries were found
19+
# bitcoin_system_INCLUDE_DIRS - include directories for bitcoin-system libraries
20+
# bitcoin_system_LIBRARY_DIRS - link directories for bitcoin-system libraries
21+
# bitcoin_system_LIBRARIES - bitcoin-system libraries to be linked
22+
# bitcoin_system_PKG - bitcoin-system pkg-config package specification.
23+
#
24+
25+
if (MSVC)
26+
if ( Bitcoin-System_FIND_REQUIRED )
27+
set( _bitcoin_system_MSG_STATUS "SEND_ERROR" )
28+
else ()
29+
set( _bitcoin_system_MSG_STATUS "STATUS" )
30+
endif()
31+
32+
set( bitcoin_system_FOUND false )
33+
message( ${_bitcoin_system_MSG_STATUS} "MSVC environment detection for 'bitcoin-system' not currently supported." )
34+
else ()
35+
# required
36+
if ( Bitcoin-System_FIND_REQUIRED )
37+
set( _bitcoin_system_REQUIRED "REQUIRED" )
38+
endif()
39+
40+
# quiet
41+
if ( Bitcoin-System_FIND_QUIETLY )
42+
set( _bitcoin_system_QUIET "QUIET" )
43+
endif()
44+
45+
# modulespec
46+
if ( Bitcoin-System_FIND_VERSION_COUNT EQUAL 0 )
47+
set( _bitcoin_system_MODULE_SPEC "libbitcoin-system" )
48+
else ()
49+
if ( Bitcoin-System_FIND_VERSION_EXACT )
50+
set( _bitcoin_system_MODULE_SPEC_OP "=" )
51+
else ()
52+
set( _bitcoin_system_MODULE_SPEC_OP ">=" )
53+
endif()
54+
55+
set( _bitcoin_system_MODULE_SPEC "libbitcoin-system ${_bitcoin_system_MODULE_SPEC_OP} ${Bitcoin-System_FIND_VERSION}" )
56+
endif()
57+
58+
pkg_check_modules( bitcoin_system ${_bitcoin_system_REQUIRED} ${_bitcoin_system_QUIET} "${_bitcoin_system_MODULE_SPEC}" )
59+
set( bitcoin_system_PKG "${_bitcoin_system_MODULE_SPEC}" )
60+
endif()

‎builds/cmake/modules/FindBitcoin.cmake‎

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
###############################################################################
2+
# Copyright (c) 2014-2020 libbitcoin-protocol developers (see COPYING).
3+
#
4+
# GENERATED SOURCE CODE, DO NOT EDIT EXCEPT EXPERIMENTALLY
5+
#
6+
###############################################################################
7+
# FindBitcoin
8+
#
9+
# Use this module by invoking find_package with the form::
10+
#
11+
# find_package( Bitcoin
12+
# [version] # Minimum version
13+
# [REQUIRED] # Fail with error if bitcoin is not found
14+
# )
15+
#
16+
# Defines the following for use:
17+
#
18+
# bitcoin_FOUND - true if headers and requested libraries were found
19+
# bitcoin_INCLUDE_DIRS - include directories for bitcoin libraries
20+
# bitcoin_LIBRARY_DIRS - link directories for bitcoin libraries
21+
# bitcoin_LIBRARIES - bitcoin libraries to be linked
22+
# bitcoin_PKG - bitcoin pkg-config package specification.
23+
#
24+
25+
if (MSVC)
26+
if ( Bitcoin_FIND_REQUIRED )
27+
set( _bitcoin_MSG_STATUS "SEND_ERROR" )
28+
else ()
29+
set( _bitcoin_MSG_STATUS "STATUS" )
30+
endif()
31+
32+
set( bitcoin_FOUND false )
33+
message( ${_bitcoin_MSG_STATUS} "MSVC environment detection for 'bitcoin' not currently supported." )
34+
else ()
35+
# required
36+
if ( Bitcoin_FIND_REQUIRED )
37+
set( _bitcoin_REQUIRED "REQUIRED" )
38+
endif()
39+
40+
# quiet
41+
if ( Bitcoin_FIND_QUIETLY )
42+
set( _bitcoin_QUIET "QUIET" )
43+
endif()
44+
45+
# modulespec
46+
if ( Bitcoin_FIND_VERSION_COUNT EQUAL 0 )
47+
set( _bitcoin_MODULE_SPEC "libbitcoin" )
48+
else ()
49+
if ( Bitcoin_FIND_VERSION_EXACT )
50+
set( _bitcoin_MODULE_SPEC_OP "=" )
51+
else ()
52+
set( _bitcoin_MODULE_SPEC_OP ">=" )
53+
endif()
54+
55+
set( _bitcoin_MODULE_SPEC "libbitcoin ${_bitcoin_MODULE_SPEC_OP} ${Bitcoin_FIND_VERSION}" )
56+
endif()
57+
58+
pkg_check_modules( bitcoin ${_bitcoin_REQUIRED} ${_bitcoin_QUIET} "${_bitcoin_MODULE_SPEC}" )
59+
set( bitcoin_PKG "${_bitcoin_MODULE_SPEC}" )
60+
endif()

‎builds/msvc/vs2013/libbitcoin-database-test/libbitcoin-database-test.props‎

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,26 +6,24 @@
66
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
77
<RunCodeAnalysis>false</RunCodeAnalysis>
88
</PropertyGroup>
9-
9+
1010
<!-- Configuration -->
1111

1212
<ItemDefinitionGroup>
1313
<ClCompile>
1414
<AdditionalIncludeDirectories>$(RepoRoot)include\;(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
15-
<DisableSpecificWarnings>4244;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
1615
<EnablePREfast>false</EnablePREfast>
17-
<PreprocessorDefinitions>_WIN32_WINNT=0x0600;%(PreprocessorDefinitions)</PreprocessorDefinitions>
1816
<PreprocessorDefinitions Condition="'$(DefaultLinkage)' == 'dynamic'">BOOST_TEST_DYN_LINK;%(PreprocessorDefinitions)</PreprocessorDefinitions>
1917
</ClCompile>
2018
<PostBuildEvent Condition="'$(DebugOrRelease)' == 'release'">
2119
<Command>"$(TargetPath)" --run_test=* --show_progress=no --result_code=no --detect_memory_leak=0 --report_level=no --build_info=yes</Command>
2220
</PostBuildEvent>
2321
</ItemDefinitionGroup>
24-
22+
2523
<!-- Dependencies -->
26-
24+
2725
<ImportGroup Label="PropertySheets">
28-
<Import Project="$(SolutionDir)libbitcoin.import.props" />
26+
<Import Project="$(SolutionDir)libbitcoin-system.import.props" />
2927
<Import Project="$(SolutionDir)libbitcoin-database.import.props" />
3028
</ImportGroup>
3129

@@ -35,27 +33,26 @@
3533

3634
<PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
3735
<Linkage-secp256k1>dynamic</Linkage-secp256k1>
38-
<Linkage-libbitcoin>dynamic</Linkage-libbitcoin>
36+
<Linkage-libbitcoin-system>dynamic</Linkage-libbitcoin-system>
3937
<Linkage-libbitcoin-database>dynamic</Linkage-libbitcoin-database>
4038
</PropertyGroup>
4139
<PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
4240
<Linkage-secp256k1>ltcg</Linkage-secp256k1>
43-
<Linkage-libbitcoin>ltcg</Linkage-libbitcoin>
41+
<Linkage-libbitcoin-system>ltcg</Linkage-libbitcoin-system>
4442
<Linkage-libbitcoin-database>ltcg</Linkage-libbitcoin-database>
4543
</PropertyGroup>
4644
<PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
4745
<Linkage-secp256k1>static</Linkage-secp256k1>
48-
<Linkage-libbitcoin>static</Linkage-libbitcoin>
46+
<Linkage-libbitcoin-system>static</Linkage-libbitcoin-system>
4947
<Linkage-libbitcoin-database>static</Linkage-libbitcoin-database>
5048
</PropertyGroup>
5149

5250
<!-- Messages -->
5351

5452
<Target Name="LinkageInfo" BeforeTargets="PrepareForBuild">
55-
<Message Text="Linkage-secp256k1 : $(Linkage-secp256k1)" Importance="high"/>
56-
<Message Text="Linkage-libbitcoin : $(Linkage-libbitcoin)" Importance="high"/>
57-
<Message Text="Linkage-_database : $(Linkage-libbitcoin-database)" Importance="high"/>
53+
<Message Text="Linkage-secp256k1 : $(Linkage-secp256k1)" Importance="high"/>
54+
<Message Text="Linkage-_system : $(Linkage-libbitcoin-system)" Importance="high"/>
55+
<Message Text="Linkage-_database : $(Linkage-libbitcoin-database)" Importance="high"/>
5856
</Target>
5957

6058
</Project>
61-

‎builds/msvc/vs2013/libbitcoin-database-test/libbitcoin-database-test.vcxproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!--
3-
| Copyright (c) 2014-2015 libbitcoin-database developers (see COPYING).
3+
| Copyright (c) 2014-2020 libbitcoin-database developers (see COPYING).
44
|
55
| GENERATED SOURCE CODE, DO NOT EDIT EXCEPT EXPERIMENTALLY
66
|
@@ -100,7 +100,7 @@
100100
<Import Project="$(NuGetPackageRoot)boost_regex-vc120.1.57.0.0\build\native\boost_regex-vc120.targets" Condition="Exists('$(NuGetPackageRoot)boost_regex-vc120.1.57.0.0\build\native\boost_regex-vc120.targets')" />
101101
<Import Project="$(NuGetPackageRoot)boost_system-vc120.1.57.0.0\build\native\boost_system-vc120.targets" Condition="Exists('$(NuGetPackageRoot)boost_system-vc120.1.57.0.0\build\native\boost_system-vc120.targets')" />
102102
<Import Project="$(NuGetPackageRoot)boost_thread-vc120.1.57.0.0\build\native\boost_thread-vc120.targets" Condition="Exists('$(NuGetPackageRoot)boost_thread-vc120.1.57.0.0\build\native\boost_thread-vc120.targets')" />
103-
<Import Project="$(NuGetPackageRoot)secp256k1_vc120.0.1.0.16\build\native\secp256k1_vc120.targets" Condition="Exists('$(NuGetPackageRoot)secp256k1_vc120.0.1.0.16\build\native\secp256k1_vc120.targets')" />
103+
<Import Project="$(NuGetPackageRoot)secp256k1_vc120.0.1.0.19\build\native\secp256k1_vc120.targets" Condition="Exists('$(NuGetPackageRoot)secp256k1_vc120.0.1.0.19\build\native\secp256k1_vc120.targets')" />
104104
<Import Project="$(NuGetPackageRoot)boost_unit_test_framework-vc120.1.57.0.0\build\native\boost_unit_test_framework-vc120.targets" Condition="Exists('$(NuGetPackageRoot)boost_unit_test_framework-vc120.1.57.0.0\build\native\boost_unit_test_framework-vc120.targets')" />
105105
</ImportGroup>
106106
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
@@ -120,7 +120,7 @@
120120
<Error Condition="!Exists('$(NuGetPackageRoot)boost_regex-vc120.1.57.0.0\build\native\boost_regex-vc120.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_regex-vc120.1.57.0.0\build\native\boost_regex-vc120.targets'))" />
121121
<Error Condition="!Exists('$(NuGetPackageRoot)boost_system-vc120.1.57.0.0\build\native\boost_system-vc120.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_system-vc120.1.57.0.0\build\native\boost_system-vc120.targets'))" />
122122
<Error Condition="!Exists('$(NuGetPackageRoot)boost_thread-vc120.1.57.0.0\build\native\boost_thread-vc120.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_thread-vc120.1.57.0.0\build\native\boost_thread-vc120.targets'))" />
123-
<Error Condition="!Exists('$(NuGetPackageRoot)secp256k1_vc120.0.1.0.16\build\native\secp256k1_vc120.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)secp256k1_vc120.0.1.0.16\build\native\secp256k1_vc120.targets'))" />
123+
<Error Condition="!Exists('$(NuGetPackageRoot)secp256k1_vc120.0.1.0.19\build\native\secp256k1_vc120.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)secp256k1_vc120.0.1.0.19\build\native\secp256k1_vc120.targets'))" />
124124
<Error Condition="!Exists('$(NuGetPackageRoot)boost_unit_test_framework-vc120.1.57.0.0\build\native\boost_unit_test_framework-vc120.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_unit_test_framework-vc120.1.57.0.0\build\native\boost_unit_test_framework-vc120.targets'))" />
125125
</Target>
126126
<ItemGroup>

‎builds/msvc/vs2013/libbitcoin-database-test/libbitcoin-database-test.vcxproj.filters‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!--
3-
| Copyright (c) 2014-2015 libbitcoin-database developers (see COPYING).
3+
| Copyright (c) 2014-2020 libbitcoin-database developers (see COPYING).
44
|
55
| GENERATED SOURCE CODE, DO NOT EDIT EXCEPT EXPERIMENTALLY
66
|

0 commit comments

Comments
 (0)