mirror of
https://github.com/XRPLF/rippled.git
synced 2025-12-06 17:27:55 +00:00
Move ./modules to ./src
This commit is contained in:
Vinnie Falco
@@ -1,7 +1,7 @@
|
|||||||
|
|
||||||
# Ripple protocol buffers
|
# Ripple protocol buffers
|
||||||
|
|
||||||
PROTOS = ../../modules/ripple_data/protocol/ripple.proto
|
PROTOS = ../../src/ripple_data/protocol/ripple.proto
|
||||||
PROTOS_DIR = ../../build/proto
|
PROTOS_DIR = ../../build/proto
|
||||||
|
|
||||||
# Google Protocol Buffers support
|
# Google Protocol Buffers support
|
||||||
@@ -51,12 +51,12 @@ INCLUDEPATH += \
|
|||||||
$${PROTOS_DIR}
|
$${PROTOS_DIR}
|
||||||
|
|
||||||
OTHER_FILES += \
|
OTHER_FILES += \
|
||||||
|
# $$files(../../src/*, true) \
|
||||||
# $$files(../../src/beast/*) \
|
# $$files(../../src/beast/*) \
|
||||||
# $$files(../../src/beast/modules/beast_basics/diagnostic/*)
|
# $$files(../../src/beast/modules/beast_basics/diagnostic/*)
|
||||||
# $$files(../../src/beast/modules/beast_core/, true)
|
# $$files(../../src/beast/modules/beast_core/, true)
|
||||||
# $$files(../../modules/*, true) \
|
|
||||||
|
|
||||||
UI_HEADERS_DIR += ../../modules/ripple_basics
|
UI_HEADERS_DIR += ../../src/ripple_basics
|
||||||
|
|
||||||
SOURCES += \
|
SOURCES += \
|
||||||
../../src/beast/modules/beast_asio/beast_asio.cpp \
|
../../src/beast/modules/beast_asio/beast_asio.cpp \
|
||||||
@@ -66,23 +66,23 @@ SOURCES += \
|
|||||||
../../src/beast/modules/beast_extras/beast_extras.cpp \
|
../../src/beast/modules/beast_extras/beast_extras.cpp \
|
||||||
../../src/beast/modules/beast_sqdb/beast_sqdb.cpp \
|
../../src/beast/modules/beast_sqdb/beast_sqdb.cpp \
|
||||||
../../src/beast/modules/beast_sqlite/beast_sqlite.c \
|
../../src/beast/modules/beast_sqlite/beast_sqlite.c \
|
||||||
../../modules/ripple_app/ripple_app.cpp \
|
../../src/ripple_app/ripple_app.cpp \
|
||||||
../../modules/ripple_app/ripple_app_pt1.cpp \
|
../../src/ripple_app/ripple_app_pt1.cpp \
|
||||||
../../modules/ripple_app/ripple_app_pt2.cpp \
|
../../src/ripple_app/ripple_app_pt2.cpp \
|
||||||
../../modules/ripple_app/ripple_app_pt3.cpp \
|
../../src/ripple_app/ripple_app_pt3.cpp \
|
||||||
../../modules/ripple_app/ripple_app_pt4.cpp \
|
../../src/ripple_app/ripple_app_pt4.cpp \
|
||||||
../../modules/ripple_app/ripple_app_pt5.cpp \
|
../../src/ripple_app/ripple_app_pt5.cpp \
|
||||||
../../modules/ripple_app/ripple_app_pt6.cpp \
|
../../src/ripple_app/ripple_app_pt6.cpp \
|
||||||
../../modules/ripple_app/ripple_app_pt7.cpp \
|
../../src/ripple_app/ripple_app_pt7.cpp \
|
||||||
../../modules/ripple_app/ripple_app_pt8.cpp \
|
../../src/ripple_app/ripple_app_pt8.cpp \
|
||||||
../../modules/ripple_basics/ripple_basics.cpp \
|
../../src/ripple_basics/ripple_basics.cpp \
|
||||||
../../modules/ripple_core/ripple_core.cpp \
|
../../src/ripple_core/ripple_core.cpp \
|
||||||
../../modules/ripple_data/ripple_data.cpp \
|
../../src/ripple_data/ripple_data.cpp \
|
||||||
../../modules/ripple_hyperleveldb/ripple_hyperleveldb.cpp \
|
../../src/ripple_hyperleveldb/ripple_hyperleveldb.cpp \
|
||||||
../../modules/ripple_leveldb/ripple_leveldb.cpp \
|
../../src/ripple_leveldb/ripple_leveldb.cpp \
|
||||||
../../modules/ripple_mdb/ripple_mdb.c \
|
../../src/ripple_mdb/ripple_mdb.c \
|
||||||
../../modules/ripple_net/ripple_net.cpp \
|
../../src/ripple_net/ripple_net.cpp \
|
||||||
../../modules/ripple_websocket/ripple_websocket.cpp
|
../../src/ripple_websocket/ripple_websocket.cpp
|
||||||
|
|
||||||
LIBS += \
|
LIBS += \
|
||||||
-lboost_date_time-mt\
|
-lboost_date_time-mt\
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
37
SConstruct
37
SConstruct
@@ -136,23 +136,23 @@ COMPILED_FILES.extend([
|
|||||||
'src/beast/modules/beast_db/beast_db.cpp',
|
'src/beast/modules/beast_db/beast_db.cpp',
|
||||||
'src/beast/modules/beast_sqdb/beast_sqdb.cpp',
|
'src/beast/modules/beast_sqdb/beast_sqdb.cpp',
|
||||||
'src/beast/modules/beast_sqlite/beast_sqlite.c',
|
'src/beast/modules/beast_sqlite/beast_sqlite.c',
|
||||||
'modules/ripple_app/ripple_app.cpp',
|
'src/ripple_app/ripple_app.cpp',
|
||||||
'modules/ripple_app/ripple_app_pt1.cpp',
|
'src/ripple_app/ripple_app_pt1.cpp',
|
||||||
'modules/ripple_app/ripple_app_pt2.cpp',
|
'src/ripple_app/ripple_app_pt2.cpp',
|
||||||
'modules/ripple_app/ripple_app_pt3.cpp',
|
'src/ripple_app/ripple_app_pt3.cpp',
|
||||||
'modules/ripple_app/ripple_app_pt4.cpp',
|
'src/ripple_app/ripple_app_pt4.cpp',
|
||||||
'modules/ripple_app/ripple_app_pt5.cpp',
|
'src/ripple_app/ripple_app_pt5.cpp',
|
||||||
'modules/ripple_app/ripple_app_pt6.cpp',
|
'src/ripple_app/ripple_app_pt6.cpp',
|
||||||
'modules/ripple_app/ripple_app_pt7.cpp',
|
'src/ripple_app/ripple_app_pt7.cpp',
|
||||||
'modules/ripple_app/ripple_app_pt8.cpp',
|
'src/ripple_app/ripple_app_pt8.cpp',
|
||||||
'modules/ripple_basics/ripple_basics.cpp',
|
'src/ripple_basics/ripple_basics.cpp',
|
||||||
'modules/ripple_core/ripple_core.cpp',
|
'src/ripple_core/ripple_core.cpp',
|
||||||
'modules/ripple_data/ripple_data.cpp',
|
'src/ripple_data/ripple_data.cpp',
|
||||||
'modules/ripple_hyperleveldb/ripple_hyperleveldb.cpp',
|
'src/ripple_hyperleveldb/ripple_hyperleveldb.cpp',
|
||||||
'modules/ripple_leveldb/ripple_leveldb.cpp',
|
'src/ripple_leveldb/ripple_leveldb.cpp',
|
||||||
'modules/ripple_mdb/ripple_mdb.c',
|
'src/ripple_mdb/ripple_mdb.c',
|
||||||
'modules/ripple_net/ripple_net.cpp',
|
'src/ripple_net/ripple_net.cpp',
|
||||||
'modules/ripple_websocket/ripple_websocket.cpp'
|
'src/ripple_websocket/ripple_websocket.cpp'
|
||||||
])
|
])
|
||||||
|
|
||||||
#-------------------------------------------------------------------------------
|
#-------------------------------------------------------------------------------
|
||||||
@@ -161,7 +161,6 @@ COMPILED_FILES.extend([
|
|||||||
#
|
#
|
||||||
|
|
||||||
VariantDir('build/obj/src', 'src', duplicate=0)
|
VariantDir('build/obj/src', 'src', duplicate=0)
|
||||||
VariantDir('build/obj/modules', 'modules', duplicate=0)
|
|
||||||
|
|
||||||
#-------------------------------------------------------------------------------
|
#-------------------------------------------------------------------------------
|
||||||
|
|
||||||
@@ -224,7 +223,7 @@ if OSX:
|
|||||||
env.Append(LINKFLAGS = ['-L/usr/local/opt/openssl/lib'])
|
env.Append(LINKFLAGS = ['-L/usr/local/opt/openssl/lib'])
|
||||||
env.Append(CXXFLAGS = ['-I/usr/local/opt/openssl/include'])
|
env.Append(CXXFLAGS = ['-I/usr/local/opt/openssl/include'])
|
||||||
|
|
||||||
PROTO_SRCS = env.Protoc([], 'modules/ripple_data/protocol/ripple.proto', PROTOCOUTDIR='build/proto', PROTOCPYTHONOUTDIR=None)
|
PROTO_SRCS = env.Protoc([], 'src/ripple_data/protocol/ripple.proto', PROTOCOUTDIR='build/proto', PROTOCPYTHONOUTDIR=None)
|
||||||
env.Clean(PROTO_SRCS, 'site_scons/site_tools/protoc.pyc')
|
env.Clean(PROTO_SRCS, 'site_scons/site_tools/protoc.pyc')
|
||||||
|
|
||||||
# Only tag actual Ripple files.
|
# Only tag actual Ripple files.
|
||||||
|
|||||||
@@ -1030,9 +1030,6 @@
|
|||||||
</ClInclude>
|
</ClInclude>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ClCompile Include="..\..\modules\beast_core\beast_core.cpp">
|
|
||||||
<Filter>beast_core</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="..\..\modules\beast_core\containers\beast_AbstractFifo.cpp">
|
<ClCompile Include="..\..\modules\beast_core\containers\beast_AbstractFifo.cpp">
|
||||||
<Filter>beast_core\containers</Filter>
|
<Filter>beast_core\containers</Filter>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
@@ -1312,9 +1309,6 @@
|
|||||||
<ClCompile Include="..\..\modules\beast_core\diagnostic\beast_UnitTest.cpp">
|
<ClCompile Include="..\..\modules\beast_core\diagnostic\beast_UnitTest.cpp">
|
||||||
<Filter>beast_core\diagnostic</Filter>
|
<Filter>beast_core\diagnostic</Filter>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
<ClCompile Include="..\..\modules\beast_crypto\beast_crypto.cpp">
|
|
||||||
<Filter>beast_crypto</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="..\..\modules\beast_crypto\math\beast_UnsignedInteger.cpp">
|
<ClCompile Include="..\..\modules\beast_crypto\math\beast_UnsignedInteger.cpp">
|
||||||
<Filter>beast_crypto\math</Filter>
|
<Filter>beast_crypto\math</Filter>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
@@ -1393,9 +1387,6 @@
|
|||||||
<ClCompile Include="..\..\modules\beast_core\diagnostic\beast_SemanticVersion.cpp">
|
<ClCompile Include="..\..\modules\beast_core\diagnostic\beast_SemanticVersion.cpp">
|
||||||
<Filter>beast_core\diagnostic</Filter>
|
<Filter>beast_core\diagnostic</Filter>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
<ClCompile Include="..\..\modules\beast_asio\beast_asio.cpp">
|
|
||||||
<Filter>beast_asio</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="..\..\modules\beast_core\threads\beast_ReadWriteMutex.cpp">
|
<ClCompile Include="..\..\modules\beast_core\threads\beast_ReadWriteMutex.cpp">
|
||||||
<Filter>beast_core\threads</Filter>
|
<Filter>beast_core\threads</Filter>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
@@ -1543,6 +1534,15 @@
|
|||||||
<ClCompile Include="..\..\modules\beast_asio\http\UniformResourceLocator.cpp">
|
<ClCompile Include="..\..\modules\beast_asio\http\UniformResourceLocator.cpp">
|
||||||
<Filter>beast_asio\http</Filter>
|
<Filter>beast_asio\http</Filter>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
|
<ClCompile Include="..\..\modules\beast_crypto\beast_crypto.cpp">
|
||||||
|
<Filter>beast_crypto</Filter>
|
||||||
|
</ClCompile>
|
||||||
|
<ClCompile Include="..\..\modules\beast_core\beast_core.cpp">
|
||||||
|
<Filter>beast_core</Filter>
|
||||||
|
</ClCompile>
|
||||||
|
<ClCompile Include="..\..\modules\beast_asio\beast_asio.cpp">
|
||||||
|
<Filter>beast_asio</Filter>
|
||||||
|
</ClCompile>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Text Include="..\..\TODO.txt" />
|
<Text Include="..\..\TODO.txt" />
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user