Skip to content

Commit b626ec8

Browse files
evoskuilevoskuil
committed
Move configuration sources into subdirectory.
1 parent 709bc34 commit b626ec8

22 files changed

Lines changed: 61 additions & 52 deletions

‎Makefile.am‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,15 +35,15 @@ lib_LTLIBRARIES = src/libbitcoin-server.la
3535
src_libbitcoin_server_la_CPPFLAGS = -I${srcdir}/include -DSYSCONFDIR=\"${sysconfdir}\" ${bitcoin_node_CPPFLAGS} ${sodium_CPPFLAGS} ${czmq___CPPFLAGS}
3636
src_libbitcoin_server_la_LIBADD = ${bitcoin_node_LIBS} ${sodium_LIBS} ${czmq___LIBS}
3737
src_libbitcoin_server_la_SOURCES = \
38-
src/config.cpp \
3938
src/dispatch.cpp \
40-
src/endpoint.cpp \
4139
src/message.cpp \
4240
src/publisher.cpp \
4341
src/server_node.cpp \
44-
src/settings.cpp \
4542
src/subscribe_manager.cpp \
4643
src/worker.cpp \
44+
src/config/config.cpp \
45+
src/config/endpoint.cpp \
46+
src/config/settings.cpp \
4747
src/service/blockchain.cpp \
4848
src/service/compat.cpp \
4949
src/service/fetch_x.cpp \
@@ -86,18 +86,21 @@ include_bitcoin_HEADERS = \
8686

8787
include_bitcoin_serverdir = ${includedir}/bitcoin/server
8888
include_bitcoin_server_HEADERS = \
89-
include/bitcoin/server/config.hpp \
9089
include/bitcoin/server/define.hpp \
9190
include/bitcoin/server/dispatch.hpp \
92-
include/bitcoin/server/endpoint.hpp \
9391
include/bitcoin/server/message.hpp \
9492
include/bitcoin/server/publisher.hpp \
9593
include/bitcoin/server/server_node.hpp \
96-
include/bitcoin/server/settings.hpp \
9794
include/bitcoin/server/subscribe_manager.hpp \
9895
include/bitcoin/server/version.hpp \
9996
include/bitcoin/server/worker.hpp
10097

98+
include_bitcoin_server_configdir = ${includedir}/bitcoin/server/config
99+
include_bitcoin_server_config_HEADERS = \
100+
include/bitcoin/server/config/config.hpp \
101+
include/bitcoin/server/config/endpoint.hpp \
102+
include/bitcoin/server/config/settings.hpp
103+
101104
include_bitcoin_server_servicedir = ${includedir}/bitcoin/server/service
102105
include_bitcoin_server_service_HEADERS = \
103106
include/bitcoin/server/service/blockchain.hpp \

‎builds/msvc/vs2013/libbitcoin-server/libbitcoin-server.vcxproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,10 @@
7171
<None Include="packages.config" />
7272
</ItemGroup>
7373
<ItemGroup>
74-
<ClInclude Include="..\..\..\..\include\bitcoin\server\config.hpp" />
74+
<ClInclude Include="..\..\..\..\include\bitcoin\server\config\config.hpp" />
75+
<ClInclude Include="..\..\..\..\include\bitcoin\server\config\endpoint.hpp" />
76+
<ClInclude Include="..\..\..\..\include\bitcoin\server\config\settings.hpp" />
7577
<ClInclude Include="..\..\..\..\include\bitcoin\server\define.hpp" />
76-
<ClInclude Include="..\..\..\..\include\bitcoin\server\endpoint.hpp" />
7778
<ClInclude Include="..\..\..\..\include\bitcoin\server\message.hpp" />
7879
<ClInclude Include="..\..\..\..\include\bitcoin\server\server_node.hpp" />
7980
<ClInclude Include="..\..\..\..\include\bitcoin\server\publisher.hpp" />
@@ -84,17 +85,16 @@
8485
<ClInclude Include="..\..\..\..\include\bitcoin\server\service\protocol.hpp" />
8586
<ClInclude Include="..\..\..\..\include\bitcoin\server\service\transaction_pool.hpp" />
8687
<ClInclude Include="..\..\..\..\include\bitcoin\server\service\util.hpp" />
87-
<ClInclude Include="..\..\..\..\include\bitcoin\server\settings.hpp" />
8888
<ClInclude Include="..\..\..\..\include\bitcoin\server\subscribe_manager.hpp" />
8989
<ClInclude Include="..\..\..\..\include\bitcoin\server\version.hpp" />
9090
<ClInclude Include="..\..\..\..\include\bitcoin\server\worker.hpp" />
9191
<ClInclude Include="..\..\resource.h" />
9292
</ItemGroup>
9393
<ItemGroup>
94-
<ClCompile Include="..\..\..\..\src\config.cpp" />
95-
<ClCompile Include="..\..\..\..\src\endpoint.cpp" />
94+
<ClCompile Include="..\..\..\..\src\config\config.cpp" />
95+
<ClCompile Include="..\..\..\..\src\config\endpoint.cpp" />
96+
<ClCompile Include="..\..\..\..\src\config\settings.cpp" />
9697
<ClCompile Include="..\..\..\..\src\message.cpp" />
97-
<ClCompile Include="..\..\..\..\src\settings.cpp" />
9898
<ClCompile Include="..\..\..\..\src\server_node.cpp" />
9999
<ClCompile Include="..\..\..\..\src\publisher.cpp" />
100100
<ClCompile Include="..\..\..\..\src\dispatch.cpp" />

‎builds/msvc/vs2013/libbitcoin-server/libbitcoin-server.vcxproj.filters‎

Lines changed: 24 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,12 @@
2222
<Filter Include="include\bitcoin\server\service">
2323
<UniqueIdentifier>{12ff4913-25e2-4e09-aada-cccc3ba3f796}</UniqueIdentifier>
2424
</Filter>
25+
<Filter Include="src\config">
26+
<UniqueIdentifier>{426ae8b7-d26d-4451-85c8-30865a3de442}</UniqueIdentifier>
27+
</Filter>
28+
<Filter Include="include\bitcoin\server\config">
29+
<UniqueIdentifier>{3a649328-f790-43cc-bd32-c82477416648}</UniqueIdentifier>
30+
</Filter>
2531
</ItemGroup>
2632
<ItemGroup>
2733
<ClInclude Include="..\..\resource.h" />
@@ -34,21 +40,12 @@
3440
<ClInclude Include="..\..\..\..\include\bitcoin\server\worker.hpp">
3541
<Filter>include\bitcoin\server</Filter>
3642
</ClInclude>
37-
<ClInclude Include="..\..\..\..\include\bitcoin\server\config.hpp">
38-
<Filter>include\bitcoin\server</Filter>
39-
</ClInclude>
40-
<ClInclude Include="..\..\..\..\include\bitcoin\server\endpoint.hpp">
41-
<Filter>include\bitcoin\server</Filter>
42-
</ClInclude>
4343
<ClInclude Include="..\..\..\..\include\bitcoin\server\message.hpp">
4444
<Filter>include\bitcoin\server</Filter>
4545
</ClInclude>
4646
<ClInclude Include="..\..\..\..\include\bitcoin\server\publisher.hpp">
4747
<Filter>include\bitcoin\server</Filter>
4848
</ClInclude>
49-
<ClInclude Include="..\..\..\..\include\bitcoin\server\settings.hpp">
50-
<Filter>include\bitcoin\server</Filter>
51-
</ClInclude>
5249
<ClInclude Include="..\..\..\..\include\bitcoin\server\service\protocol.hpp">
5350
<Filter>include\bitcoin\server\service</Filter>
5451
</ClInclude>
@@ -76,6 +73,15 @@
7673
<ClInclude Include="..\..\..\..\include\bitcoin\server\server_node.hpp">
7774
<Filter>include\bitcoin\server</Filter>
7875
</ClInclude>
76+
<ClInclude Include="..\..\..\..\include\bitcoin\server\config\endpoint.hpp">
77+
<Filter>include\bitcoin\server\config</Filter>
78+
</ClInclude>
79+
<ClInclude Include="..\..\..\..\include\bitcoin\server\config\settings.hpp">
80+
<Filter>include\bitcoin\server\config</Filter>
81+
</ClInclude>
82+
<ClInclude Include="..\..\..\..\include\bitcoin\server\config\config.hpp">
83+
<Filter>include\bitcoin\server\config</Filter>
84+
</ClInclude>
7985
</ItemGroup>
8086
<ItemGroup>
8187
<ClCompile Include="..\..\..\..\src\service\blockchain.cpp">
@@ -90,9 +96,6 @@
9096
<ClCompile Include="..\..\..\..\src\service\transaction_pool.cpp">
9197
<Filter>src\service</Filter>
9298
</ClCompile>
93-
<ClCompile Include="..\..\..\..\src\config.cpp">
94-
<Filter>src</Filter>
95-
</ClCompile>
9699
<ClCompile Include="..\..\..\..\src\message.cpp">
97100
<Filter>src</Filter>
98101
</ClCompile>
@@ -108,18 +111,21 @@
108111
<ClCompile Include="..\..\..\..\src\service\compat.cpp">
109112
<Filter>src\service</Filter>
110113
</ClCompile>
111-
<ClCompile Include="..\..\..\..\src\settings.cpp">
112-
<Filter>src</Filter>
113-
</ClCompile>
114-
<ClCompile Include="..\..\..\..\src\endpoint.cpp">
115-
<Filter>src</Filter>
116-
</ClCompile>
117114
<ClCompile Include="..\..\..\..\src\dispatch.cpp">
118115
<Filter>src</Filter>
119116
</ClCompile>
120117
<ClCompile Include="..\..\..\..\src\server_node.cpp">
121118
<Filter>src</Filter>
122119
</ClCompile>
120+
<ClCompile Include="..\..\..\..\src\config\endpoint.cpp">
121+
<Filter>src\config</Filter>
122+
</ClCompile>
123+
<ClCompile Include="..\..\..\..\src\config\settings.cpp">
124+
<Filter>src\config</Filter>
125+
</ClCompile>
126+
<ClCompile Include="..\..\..\..\src\config\config.cpp">
127+
<Filter>src\config</Filter>
128+
</ClCompile>
123129
</ItemGroup>
124130
<ItemGroup>
125131
<ResourceCompile Include="..\..\resource.rc" />

‎include/bitcoin/server.hpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,17 @@
1515
*/
1616

1717
#include <bitcoin/node.hpp>
18-
#include <bitcoin/server/config.hpp>
1918
#include <bitcoin/server/define.hpp>
2019
#include <bitcoin/server/dispatch.hpp>
21-
#include <bitcoin/server/endpoint.hpp>
2220
#include <bitcoin/server/message.hpp>
2321
#include <bitcoin/server/publisher.hpp>
2422
#include <bitcoin/server/server_node.hpp>
25-
#include <bitcoin/server/settings.hpp>
2623
#include <bitcoin/server/subscribe_manager.hpp>
2724
#include <bitcoin/server/version.hpp>
2825
#include <bitcoin/server/worker.hpp>
26+
#include <bitcoin/server/config/config.hpp>
27+
#include <bitcoin/server/config/endpoint.hpp>
28+
#include <bitcoin/server/config/settings.hpp>
2929
#include <bitcoin/server/service/blockchain.hpp>
3030
#include <bitcoin/server/service/compat.hpp>
3131
#include <bitcoin/server/service/fetch_x.hpp>

include/bitcoin/server/config.hpp renamed to include/bitcoin/server/config/config.hpp

File renamed without changes.

include/bitcoin/server/endpoint.hpp renamed to include/bitcoin/server/config/endpoint.hpp

File renamed without changes.

include/bitcoin/server/settings.hpp renamed to include/bitcoin/server/config/settings.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
#include <vector>
2626
#include <boost/filesystem.hpp>
2727
#include <boost/program_options.hpp>
28-
#include <bitcoin/server/endpoint.hpp>
28+
#include <bitcoin/server/config/endpoint.hpp>
2929

3030
// Not localizable.
3131
#define BS_HELP_VARIABLE "help"

‎include/bitcoin/server/publisher.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222

2323
#include <czmq++/czmqpp.hpp>
2424
#include <bitcoin/bitcoin.hpp>
25+
#include <bitcoin/server/config/settings.hpp>
2526
#include <bitcoin/server/server_node.hpp>
26-
#include <bitcoin/server/settings.hpp>
2727

2828
namespace libbitcoin {
2929
namespace server {

‎include/bitcoin/server/server_node.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@
2121
#define LIBBITCOIN_SERVER_NODE_IMPL_HPP
2222

2323
#include <bitcoin/node.hpp>
24+
#include <bitcoin/server/config/settings.hpp>
2425
#include <bitcoin/server/message.hpp>
2526
#include <bitcoin/server/service/util.hpp>
26-
#include <bitcoin/server/settings.hpp>
2727

2828
namespace libbitcoin {
2929
namespace server {

‎include/bitcoin/server/worker.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727
#include <vector>
2828
#include <boost/date_time/posix_time/posix_time.hpp>
2929
#include <czmq++/czmqpp.hpp>
30+
#include <bitcoin/server/config/settings.hpp>
3031
#include <bitcoin/server/message.hpp>
31-
#include <bitcoin/server/settings.hpp>
3232
#include <bitcoin/server/service/util.hpp>
3333

3434
namespace libbitcoin {

0 commit comments

Comments
 (0)