diff --git a/Builds/QtCreator/rippled.pro b/Builds/QtCreator/rippled.pro index 6d60cfb793..4c4a96b3cf 100644 --- a/Builds/QtCreator/rippled.pro +++ b/Builds/QtCreator/rippled.pro @@ -62,42 +62,42 @@ UI_HEADERS_DIR += ../../src/ripple_basics # New style # SOURCES += \ - ../../src/ripple/beast/ripple_beast.cpp \ + ../../src/ripple/beast/ripple_beast.unity.cpp \ ../../src/ripple/beast/ripple_beastc.c \ - ../../src/ripple/common/ripple_common.cpp \ - ../../src/ripple/http/ripple_http.cpp \ - ../../src/ripple/json/ripple_json.cpp \ - ../../src/ripple/peerfinder/ripple_peerfinder.cpp \ - ../../src/ripple/radmap/ripple_radmap.cpp \ - ../../src/ripple/resource/ripple_resource.cpp \ - ../../src/ripple/sitefiles/ripple_sitefiles.cpp \ - ../../src/ripple/sslutil/ripple_sslutil.cpp \ - ../../src/ripple/testoverlay/ripple_testoverlay.cpp \ - ../../src/ripple/types/ripple_types.cpp \ - ../../src/ripple/validators/ripple_validators.cpp + ../../src/ripple/common/ripple_common.unity.cpp \ + ../../src/ripple/http/ripple_http.unity.cpp \ + ../../src/ripple/json/ripple_json.unity.cpp \ + ../../src/ripple/peerfinder/ripple_peerfinder.unity.cpp \ + ../../src/ripple/radmap/ripple_radmap.unity.cpp \ + ../../src/ripple/resource/ripple_resource.unity.cpp \ + ../../src/ripple/sitefiles/ripple_sitefiles.unity.cpp \ + ../../src/ripple/sslutil/ripple_sslutil.unity.cpp \ + ../../src/ripple/testoverlay/ripple_testoverlay.unity.cpp \ + ../../src/ripple/types/ripple_types.unity.cpp \ + ../../src/ripple/validators/ripple_validators.unity.cpp # --------- # Old style # SOURCES += \ - ../../src/ripple_app/ripple_app.cpp \ - ../../src/ripple_app/ripple_app_pt1.cpp \ - ../../src/ripple_app/ripple_app_pt2.cpp \ - ../../src/ripple_app/ripple_app_pt3.cpp \ - ../../src/ripple_app/ripple_app_pt4.cpp \ - ../../src/ripple_app/ripple_app_pt5.cpp \ - ../../src/ripple_app/ripple_app_pt6.cpp \ - ../../src/ripple_app/ripple_app_pt7.cpp \ - ../../src/ripple_app/ripple_app_pt8.cpp \ - ../../src/ripple_basics/ripple_basics.cpp \ - ../../src/ripple_core/ripple_core.cpp \ - ../../src/ripple_data/ripple_data.cpp \ - ../../src/ripple_hyperleveldb/ripple_hyperleveldb.cpp \ - ../../src/ripple_leveldb/ripple_leveldb.cpp \ - ../../src/ripple_net/ripple_net.cpp \ - ../../src/ripple_overlay/ripple_overlay.cpp \ - ../../src/ripple_rpc/ripple_rpc.cpp \ - ../../src/ripple_websocket/ripple_websocket.cpp + ../../src/ripple_app/ripple_app.unity.cpp \ + ../../src/ripple_app/ripple_app_pt1.unity.cpp \ + ../../src/ripple_app/ripple_app_pt2.unity.cpp \ + ../../src/ripple_app/ripple_app_pt3.unity.cpp \ + ../../src/ripple_app/ripple_app_pt4.unity.cpp \ + ../../src/ripple_app/ripple_app_pt5.unity.cpp \ + ../../src/ripple_app/ripple_app_pt6.unity.cpp \ + ../../src/ripple_app/ripple_app_pt7.unity.cpp \ + ../../src/ripple_app/ripple_app_pt8.unity.cpp \ + ../../src/ripple_basics/ripple_basics.unity.cpp \ + ../../src/ripple_core/ripple_core.unity.cpp \ + ../../src/ripple_data/ripple_data.unity.cpp \ + ../../src/ripple_hyperleveldb/ripple_hyperleveldb.unity.cpp \ + ../../src/ripple_leveldb/ripple_leveldb.unity.cpp \ + ../../src/ripple_net/ripple_net.unity.cpp \ + ../../src/ripple_overlay/ripple_overlay.unity.cpp \ + ../../src/ripple_rpc/ripple_rpc.unity.cpp \ + ../../src/ripple_websocket/ripple_websocket.unity.cpp LIBS += \ -lboost_date_time-mt\ diff --git a/Builds/VisualStudio2013/RippleD.vcxproj b/Builds/VisualStudio2013/RippleD.vcxproj index 9dde332060..e2a0ac1623 100644 --- a/Builds/VisualStudio2013/RippleD.vcxproj +++ b/Builds/VisualStudio2013/RippleD.vcxproj @@ -11,8 +11,8 @@ - - + + true true @@ -33,7 +33,7 @@ true true - + true true @@ -56,7 +56,7 @@ true true - + true true @@ -77,7 +77,7 @@ true true - + true true @@ -126,7 +126,7 @@ true true - + true true @@ -136,7 +136,7 @@ true true - + true true @@ -161,8 +161,8 @@ true true - - + + true true @@ -463,7 +463,7 @@ true true - + true true @@ -480,12 +480,12 @@ true true - + true true - + true true @@ -518,7 +518,7 @@ true true - + true true @@ -551,7 +551,7 @@ true true - + true true @@ -840,40 +840,16 @@ true true - - - false - false - - - false - false - - - false - false - - - false - false - - - false - false - - - false - false - - - false - false - - - false - false - - + + + + + + + + + + true true @@ -1060,7 +1036,7 @@ true true - + true true @@ -1197,7 +1173,7 @@ true true - + true true @@ -1274,9 +1250,9 @@ true true - - - + + + true true @@ -1293,7 +1269,8 @@ true true - + + true true @@ -1326,7 +1303,7 @@ true true - + true true @@ -1611,7 +1588,7 @@ true true - + true true @@ -1620,7 +1597,7 @@ true true - + true true @@ -1797,7 +1774,7 @@ true true - + true @@ -2394,9 +2371,8 @@ - - true - true + + true @@ -2420,6 +2396,10 @@ %(RelativeDir)%(Filename).pb.h;%(RelativeDir)%(Filename).pb.cc protoc --cpp_out=%(RelativeDir) --proto_path=%(RelativeDir) %(Identity) protoc --cpp_out=%(RelativeDir) --proto_path=%(RelativeDir) %(Identity) + false + false + false + false diff --git a/Builds/VisualStudio2013/RippleD.vcxproj.filters b/Builds/VisualStudio2013/RippleD.vcxproj.filters index 01d8153f60..f75e650c10 100644 --- a/Builds/VisualStudio2013/RippleD.vcxproj.filters +++ b/Builds/VisualStudio2013/RippleD.vcxproj.filters @@ -792,9 +792,6 @@ [2] Old Ripple\ripple_app\misc - - [0] Libraries\protobuf - [2] Old Ripple\ripple_core\functional @@ -837,66 +834,6 @@ [1] Ripple\validators\impl - - [2] Old Ripple\ripple_app - - - [2] Old Ripple\ripple_app - - - [2] Old Ripple\ripple_app - - - [2] Old Ripple\ripple_app - - - [2] Old Ripple\ripple_app - - - [2] Old Ripple\ripple_app - - - [2] Old Ripple\ripple_app - - - [2] Old Ripple\ripple_app - - - [2] Old Ripple\ripple_app - - - [2] Old Ripple\ripple_basics - - - [2] Old Ripple\ripple_core - - - [2] Old Ripple\ripple_data - - - [2] Old Ripple\ripple_hyperleveldb - - - [2] Old Ripple\ripple_net - - - [2] Old Ripple\ripple_websocket - - - [1] Ripple\validators - - - [1] Ripple\testoverlay - - - [2] Old Ripple\ripple_leveldb - - - [1] Ripple\beast - - - [1] Ripple\beast - [2] Old Ripple\ripple_app\main @@ -909,9 +846,6 @@ [1] Ripple\json\impl - - [1] Ripple\json - [2] Old Ripple\ripple_core\nodestore @@ -963,9 +897,6 @@ [2] Old Ripple\ripple_app\main - - [1] Ripple\http - [1] Ripple\http\impl @@ -978,15 +909,9 @@ [1] Ripple\http\impl - - [1] Ripple\types - [1] Ripple\types\impl - - [1] Ripple\sslutil - [1] Ripple\sslutil\impl @@ -1017,18 +942,12 @@ [2] Old Ripple\ripple_core\functional - - [1] Ripple\peerfinder - [1] Ripple\json\impl [1] Ripple\peerfinder\impl - - [1] Ripple\resource - [1] Ripple\resource\impl @@ -1047,9 +966,6 @@ [1] Ripple\resource\impl - - [1] Ripple\sitefiles - [1] Ripple\sitefiles\impl @@ -1059,9 +975,6 @@ [1] Ripple\sitefiles\impl - - [1] Ripple\rocksdb - [1] Ripple\rocksdb\rocksdb\db @@ -1293,9 +1206,6 @@ [1] Ripple\types\impl - - [1] Ripple\common - [2] Old Ripple\ripple_core\nodestore\backend @@ -1329,7 +1239,7 @@ [2] Old Ripple\ripple_app\ledger - + [1] Ripple\proto\radmap @@ -1365,9 +1275,6 @@ [1] Ripple\peerfinder\sim - - [2] Old Ripple\ripple_rpc - [2] Old Ripple\ripple_rpc\impl @@ -1386,9 +1293,6 @@ [2] Old Ripple\ripple_overlay\impl - - [2] Old Ripple\ripple_overlay - [1] Ripple\peerfinder\impl @@ -1404,9 +1308,6 @@ [1] Ripple\peerfinder\impl - - [2] Old Ripple\ripple_app - [2] Old Ripple\ripple_app\tx @@ -1713,8 +1614,107 @@ [0] Libraries\snappy - - [1] Ripple\common\tests + + [1] Ripple\beast + + + [1] Ripple\beast + + + [1] Ripple\common + + + [1] Ripple\http + + + [1] Ripple\json + + + [1] Ripple\peerfinder + + + [1] Ripple\radmap + + + [1] Ripple\resource + + + [1] Ripple\rocksdb + + + [1] Ripple\sitefiles + + + [1] Ripple\sslutil + + + [1] Ripple\testoverlay + + + [1] Ripple\types + + + [1] Ripple\validators + + + [2] Old Ripple\ripple_app + + + [2] Old Ripple\ripple_app + + + [2] Old Ripple\ripple_app + + + [2] Old Ripple\ripple_app + + + [2] Old Ripple\ripple_app + + + [2] Old Ripple\ripple_app + + + [2] Old Ripple\ripple_app + + + [2] Old Ripple\ripple_app + + + [2] Old Ripple\ripple_app + + + [2] Old Ripple\ripple_app + + + [2] Old Ripple\ripple_basics + + + [2] Old Ripple\ripple_core + + + [2] Old Ripple\ripple_data + + + [2] Old Ripple\ripple_hyperleveldb + + + [2] Old Ripple\ripple_leveldb + + + [2] Old Ripple\ripple_net + + + [2] Old Ripple\ripple_overlay + + + [2] Old Ripple\ripple_rpc + + + [2] Old Ripple\ripple_websocket + + + [0] Libraries\protobuf [1] Ripple\types\impl @@ -1767,6 +1767,9 @@ [2] Old Ripple\ripple_app\paths + + [1] Ripple\common\tests + @@ -3419,9 +3422,6 @@ - - [1] Ripple\beast - [1] Ripple\json\impl @@ -3530,6 +3530,9 @@ [2] Old Ripple\ripple_app\misc + + [1] Ripple\beast + [1] Ripple\proto diff --git a/SConstruct b/SConstruct index 83c6185dc4..74447b0abd 100644 --- a/SConstruct +++ b/SConstruct @@ -230,53 +230,54 @@ COMPILED_FILES = [] # if OSX: # OSX: Use the Objective C++ version of beast_core - COMPILED_FILES.extend (['src/ripple/beast/ripple_beastobjc.mm']) + COMPILED_FILES.extend (['src/ripple/beast/ripple_beastobjc.unity.mm']) else: - COMPILED_FILES.extend (['src/ripple/beast/ripple_beast.cpp']) -COMPILED_FILES.extend (['src/ripple/beast/ripple_beastc.c']) + COMPILED_FILES.extend (['src/ripple/beast/ripple_beast.unity.cpp']) +COMPILED_FILES.extend (['src/ripple/beast/ripple_beastc.unity.c']) # ------------------------------ # New-style Ripple unity sources # COMPILED_FILES.extend([ + 'src/ripple/http/ripple_http.unity.cpp', + 'src/ripple/json/ripple_json.unity.cpp', + 'src/ripple/peerfinder/ripple_peerfinder.unity.cpp', + 'src/ripple/radmap/ripple_radmap.unity.cpp', + 'src/ripple/resource/ripple_resource.unity.cpp', + 'src/ripple/rocksdb/ripple_rocksdb.unity.cpp', + 'src/ripple/sitefiles/ripple_sitefiles.unity.cpp', + 'src/ripple/sslutil/ripple_sslutil.unity.cpp', + 'src/ripple/testoverlay/ripple_testoverlay.unity.cpp', + 'src/ripple/types/ripple_types.unity.cpp', + 'src/ripple/validators/ripple_validators.unity.cpp', + 'src/ripple/common/ripple_common.unity.cpp', 'src/snappy/snappy.unity.cpp', - 'src/ripple/http/ripple_http.cpp', - 'src/ripple/json/ripple_json.cpp', - 'src/ripple/peerfinder/ripple_peerfinder.cpp', - 'src/ripple/radmap/ripple_radmap.cpp', - 'src/ripple/resource/ripple_resource.cpp', - 'src/ripple/rocksdb/ripple_rocksdb.cpp', - 'src/ripple/sitefiles/ripple_sitefiles.cpp', - 'src/ripple/sslutil/ripple_sslutil.cpp', - 'src/ripple/testoverlay/ripple_testoverlay.cpp', - 'src/ripple/types/ripple_types.cpp', - 'src/ripple/validators/ripple_validators.cpp', - 'src/ripple/common/ripple_common.cpp', ]) # ------------------------------ # Old-style Ripple unity sources # COMPILED_FILES.extend([ - 'src/ripple_app/ripple_app.cpp', - 'src/ripple_app/ripple_app_pt1.cpp', - 'src/ripple_app/ripple_app_pt2.cpp', - 'src/ripple_app/ripple_app_pt3.cpp', - 'src/ripple_app/ripple_app_pt4.cpp', - 'src/ripple_app/ripple_app_pt5.cpp', - 'src/ripple_app/ripple_app_pt6.cpp', - 'src/ripple_app/ripple_app_pt7.cpp', - 'src/ripple_app/ripple_app_pt8.cpp', - 'src/ripple_app/ripple_app_pt9.cpp', - 'src/ripple_basics/ripple_basics.cpp', - 'src/ripple_core/ripple_core.cpp', - 'src/ripple_data/ripple_data.cpp', - 'src/ripple_hyperleveldb/ripple_hyperleveldb.cpp', - 'src/ripple_leveldb/ripple_leveldb.cpp', - 'src/ripple_net/ripple_net.cpp', - 'src/ripple_overlay/ripple_overlay.cpp', - 'src/ripple_rpc/ripple_rpc.cpp', - 'src/ripple_websocket/ripple_websocket.cpp' + 'src/ripple_app/ripple_app.unity.cpp', + 'src/ripple_app/ripple_app_pt1.unity.cpp', + 'src/ripple_app/ripple_app_pt2.unity.cpp', + 'src/ripple_app/ripple_app_pt3.unity.cpp', + 'src/ripple_app/ripple_app_pt4.unity.cpp', + 'src/ripple_app/ripple_app_pt5.unity.cpp', + 'src/ripple_app/ripple_app_pt6.unity.cpp', + 'src/ripple_app/ripple_app_pt7.unity.cpp', + 'src/ripple_app/ripple_app_pt8.unity.cpp', + 'src/ripple_app/ripple_app_pt9.unity.cpp', + 'src/ripple_basics/ripple_basics.unity.cpp', + 'src/ripple_core/ripple_core.unity.cpp', + 'src/ripple_data/ripple_data.unity.cpp', + 'src/ripple_hyperleveldb/ripple_hyperleveldb.unity.cpp', + 'src/ripple_leveldb/ripple_leveldb.unity.cpp', + 'src/ripple_net/ripple_net.unity.cpp', + 'src/ripple_overlay/ripple_overlay.unity.cpp', + 'src/ripple_rpc/ripple_rpc.unity.cpp', + 'src/ripple_websocket/ripple_websocket.unity.cpp', + 'src/snappy/snappy.unity.cpp', ]) # diff --git a/src/beast/Builds/VisualStudio2013/beast.vcxproj b/src/beast/Builds/VisualStudio2013/beast.vcxproj index 9cb743adb2..11786b4c93 100644 --- a/src/beast/Builds/VisualStudio2013/beast.vcxproj +++ b/src/beast/Builds/VisualStudio2013/beast.vcxproj @@ -35,7 +35,7 @@ - + true true true @@ -379,7 +379,7 @@ true true - + true true @@ -410,8 +410,8 @@ true true - - + + true true @@ -436,7 +436,7 @@ true true - + true true @@ -467,7 +467,7 @@ true true - + true true @@ -516,14 +516,14 @@ true true - + true true true true - + true true @@ -620,7 +620,7 @@ true true - + true true @@ -645,14 +645,14 @@ true true - + true true true true - + true true @@ -671,7 +671,7 @@ true true - + true true @@ -714,7 +714,7 @@ true true - + true true @@ -775,7 +775,7 @@ true true - + true true @@ -788,7 +788,7 @@ true true - + true true @@ -909,7 +909,7 @@ true true - + true true @@ -1132,7 +1132,7 @@ true true - + true true @@ -1205,7 +1205,7 @@ true true - + true true diff --git a/src/beast/Builds/VisualStudio2013/beast.vcxproj.filters b/src/beast/Builds/VisualStudio2013/beast.vcxproj.filters index 0f9aac355e..d58e51fc03 100644 --- a/src/beast/Builds/VisualStudio2013/beast.vcxproj.filters +++ b/src/beast/Builds/VisualStudio2013/beast.vcxproj.filters @@ -55,9 +55,6 @@ beast\http\impl\http-parser - - beast_core - beast\crypto\impl\sha2 @@ -71,6 +68,9 @@ beast\asio + + beast_core + @@ -1296,15 +1296,9 @@ beast_core\diagnostic - - beast_sqlite - beast_sqlite\sqlite - - beast_sqdb - beast_sqdb\source @@ -1416,24 +1410,12 @@ beast_asio\http - - beast_core - - - beast_asio - beast_core\time beast_core\diagnostic - - beast\net - - - beast\utility - beast\utility\impl @@ -1452,18 +1434,12 @@ beast\http\impl\http-parser\contrib - - beast\http - beast\strings\impl beast\strings\impl - - beast\strings - beast\http\impl @@ -1479,9 +1455,6 @@ beast\crypto\impl\sha2 - - beast\crypto - beast\crypto\impl @@ -1512,9 +1485,6 @@ beast\threads\impl - - beast\threads - beast\threads\impl @@ -1527,24 +1497,15 @@ beast\threads\impl - - beast\boost - beast\utility\impl - - beast\asio - beast\asio\impl beast\crypto\impl - - beast\insight - beast\insight\impl @@ -1578,18 +1539,9 @@ beast\net\impl - - beast\chrono - - - beast\container - beast\container\tests - - beast\cxx14 - beast\cxx14\tests @@ -1647,9 +1599,6 @@ beast\streams\tests - - beast\streams - beast\threads\tests @@ -1671,6 +1620,57 @@ beast\utility\tests + + beast\asio + + + beast\boost + + + beast\chrono + + + beast\container + + + beast\crypto + + + beast\cxx14 + + + beast\http + + + beast\insight + + + beast\net + + + beast\streams + + + beast\strings + + + beast\threads + + + beast\utility + + + beast_core + + + beast_asio + + + beast_sqdb + + + beast_sqlite + diff --git a/src/beast/Doxyfile b/src/beast/Doxyfile index 869f9dd0e5..b6e7241066 100644 --- a/src/beast/Doxyfile +++ b/src/beast/Doxyfile @@ -102,7 +102,7 @@ INPUT_ENCODING = UTF-8 FILE_PATTERNS = RECURSIVE = YES EXCLUDE = modules/beast_core/beast_core.h \ - modules/beast_core/beast_core.cpp \ + modules/beast_core/beast_core.unity.cpp \ modules/beast_basics/beast_basics.cpp \ modules/beast_basics/native \ modules/beast_basics/zip/zlib diff --git a/src/beast/beast/asio/Asio.cpp b/src/beast/beast/asio/Asio.unity.cpp similarity index 100% rename from src/beast/beast/asio/Asio.cpp rename to src/beast/beast/asio/Asio.unity.cpp diff --git a/src/beast/beast/boost/Boost.cpp b/src/beast/beast/boost/Boost.unity.cpp similarity index 100% rename from src/beast/beast/boost/Boost.cpp rename to src/beast/beast/boost/Boost.unity.cpp diff --git a/src/beast/beast/chrono/Chrono.cpp b/src/beast/beast/chrono/Chrono.unity.cpp similarity index 100% rename from src/beast/beast/chrono/Chrono.cpp rename to src/beast/beast/chrono/Chrono.unity.cpp diff --git a/src/beast/beast/container/Container.cpp b/src/beast/beast/container/Container.unity.cpp similarity index 100% rename from src/beast/beast/container/Container.cpp rename to src/beast/beast/container/Container.unity.cpp diff --git a/src/beast/beast/crypto/Crypto.cpp b/src/beast/beast/crypto/Crypto.unity.cpp similarity index 100% rename from src/beast/beast/crypto/Crypto.cpp rename to src/beast/beast/crypto/Crypto.unity.cpp diff --git a/src/beast/beast/crypto/tests/BinaryEncoding.cpp b/src/beast/beast/crypto/tests/BinaryEncoding.cpp index eaf5a7104e..69e611e7c7 100644 --- a/src/beast/beast/crypto/tests/BinaryEncoding.cpp +++ b/src/beast/beast/crypto/tests/BinaryEncoding.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -// MODULES: ../../../modules/beast_core/beast_core.cpp ../../strings/Strings.cpp ../../chrono/Chrono.cpp ../../threads/Threads.cpp +// MODULES: ../../../modules/beast_core/beast_core.beast_core.unity.cpp ../../strings/Strings.cpp ../../chrono/Chrono.cpp ../../threads/Threads.cpp #include "../BinaryEncoding.h" #include "../UnsignedInteger.h" diff --git a/src/beast/beast/cxx14/cxx14.cpp b/src/beast/beast/cxx14/cxx14.unity.cpp similarity index 100% rename from src/beast/beast/cxx14/cxx14.cpp rename to src/beast/beast/cxx14/cxx14.unity.cpp diff --git a/src/beast/beast/http/HTTP.cpp b/src/beast/beast/http/HTTP.unity.cpp similarity index 100% rename from src/beast/beast/http/HTTP.cpp rename to src/beast/beast/http/HTTP.unity.cpp diff --git a/src/beast/beast/insight/Insight.cpp b/src/beast/beast/insight/Insight.unity.cpp similarity index 100% rename from src/beast/beast/insight/Insight.cpp rename to src/beast/beast/insight/Insight.unity.cpp diff --git a/src/beast/beast/net/Net.cpp b/src/beast/beast/net/Net.unity.cpp similarity index 100% rename from src/beast/beast/net/Net.cpp rename to src/beast/beast/net/Net.unity.cpp diff --git a/src/beast/beast/streams/streams.cpp b/src/beast/beast/streams/streams.unity.cpp similarity index 100% rename from src/beast/beast/streams/streams.cpp rename to src/beast/beast/streams/streams.unity.cpp diff --git a/src/beast/beast/strings/Strings.cpp b/src/beast/beast/strings/Strings.unity.cpp similarity index 100% rename from src/beast/beast/strings/Strings.cpp rename to src/beast/beast/strings/Strings.unity.cpp diff --git a/src/beast/beast/threads/Threads.cpp b/src/beast/beast/threads/Threads.unity.cpp similarity index 100% rename from src/beast/beast/threads/Threads.cpp rename to src/beast/beast/threads/Threads.unity.cpp diff --git a/src/beast/beast/utility/Utility.cpp b/src/beast/beast/utility/Utility.unity.cpp similarity index 100% rename from src/beast/beast/utility/Utility.cpp rename to src/beast/beast/utility/Utility.unity.cpp diff --git a/src/beast/modules/README.md b/src/beast/modules/README.md new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/beast/modules/beast_asio/beast_asio.cpp b/src/beast/modules/beast_asio/beast_asio.unity.cpp similarity index 100% rename from src/beast/modules/beast_asio/beast_asio.cpp rename to src/beast/modules/beast_asio/beast_asio.unity.cpp diff --git a/src/beast/modules/beast_core/beast_core.cpp b/src/beast/modules/beast_core/beast_core.unity.cpp similarity index 100% rename from src/beast/modules/beast_core/beast_core.cpp rename to src/beast/modules/beast_core/beast_core.unity.cpp diff --git a/src/beast/modules/beast_core/beast_core.mm b/src/beast/modules/beast_core/beast_core.unity.mm similarity index 96% rename from src/beast/modules/beast_core/beast_core.mm rename to src/beast/modules/beast_core/beast_core.unity.mm index 2b9492c624..037588b9c9 100644 --- a/src/beast/modules/beast_core/beast_core.mm +++ b/src/beast/modules/beast_core/beast_core.unity.mm @@ -21,4 +21,4 @@ */ //============================================================================== -#include "beast_core.cpp" +#include "beast_core.beast_core.unity.cpp" diff --git a/src/beast/modules/beast_sqdb/beast_sqdb.cpp b/src/beast/modules/beast_sqdb/beast_sqdb.unity.cpp similarity index 100% rename from src/beast/modules/beast_sqdb/beast_sqdb.cpp rename to src/beast/modules/beast_sqdb/beast_sqdb.unity.cpp diff --git a/src/beast/modules/beast_sqlite/beast_sqlite.c b/src/beast/modules/beast_sqlite/beast_sqlite.unity.c similarity index 100% rename from src/beast/modules/beast_sqlite/beast_sqlite.c rename to src/beast/modules/beast_sqlite/beast_sqlite.unity.c diff --git a/src/protobuf_core.cpp b/src/protobuf.unity.cpp similarity index 100% rename from src/protobuf_core.cpp rename to src/protobuf.unity.cpp diff --git a/src/ripple/beast/ripple_beast.cpp b/src/ripple/beast/ripple_beast.unity.cpp similarity index 59% rename from src/ripple/beast/ripple_beast.cpp rename to src/ripple/beast/ripple_beast.unity.cpp index b13b9ec0a5..b11fa8b4e1 100644 --- a/src/ripple/beast/ripple_beast.cpp +++ b/src/ripple/beast/ripple_beast.unity.cpp @@ -26,23 +26,23 @@ #include "../../BeastConfig.h" // Include this to get all the basic includes included, to prevent errors -#include "../beast/modules/beast_core/beast_core.cpp" -#include "../beast/modules/beast_asio/beast_asio.cpp" -#include "../beast/modules/beast_sqdb/beast_sqdb.cpp" +#include "../../beast/modules/beast_core/beast_core.unity.cpp" +#include "../../beast/modules/beast_asio/beast_asio.unity.cpp" +#include "../../beast/modules/beast_sqdb/beast_sqdb.unity.cpp" -#include "../beast/beast/asio/Asio.cpp" -#include "../beast/beast/boost/Boost.cpp" -#include "../beast/beast/chrono/Chrono.cpp" -#include "../beast/beast/container/Container.cpp" -#include "../beast/beast/crypto/Crypto.cpp" -#include "../beast/beast/http/HTTP.cpp" -#include "../beast/beast/insight/Insight.cpp" -#include "../beast/beast/net/Net.cpp" -#include "../beast/beast/streams/streams.cpp" -#include "../beast/beast/strings/Strings.cpp" -#include "../beast/beast/threads/Threads.cpp" -#include "../beast/beast/utility/Utility.cpp" +#include "../../beast/beast/asio/Asio.unity.cpp" +#include "../../beast/beast/boost/Boost.unity.cpp" +#include "../../beast/beast/chrono/Chrono.unity.cpp" +#include "../../beast/beast/container/Container.unity.cpp" +#include "../../beast/beast/crypto/Crypto.unity.cpp" +#include "../../beast/beast/http/HTTP.unity.cpp" +#include "../../beast/beast/insight/Insight.unity.cpp" +#include "../../beast/beast/net/Net.unity.cpp" +#include "../../beast/beast/streams/streams.unity.cpp" +#include "../../beast/beast/strings/Strings.unity.cpp" +#include "../../beast/beast/threads/Threads.unity.cpp" +#include "../../beast/beast/utility/Utility.unity.cpp" -#include "../beast/beast/cxx14/cxx14.cpp" +#include "../../beast/beast/cxx14/cxx14.unity.cpp" -#include "../beast/beast/unit_test/define_print.cpp" +#include "../../beast/beast/unit_test/define_print.cpp" diff --git a/src/ripple/beast/ripple_beastc.c b/src/ripple/beast/ripple_beastc.unity.c similarity index 95% rename from src/ripple/beast/ripple_beastc.c rename to src/ripple/beast/ripple_beastc.unity.c index c4122c5448..cb91d13d1b 100644 --- a/src/ripple/beast/ripple_beastc.c +++ b/src/ripple/beast/ripple_beastc.unity.c @@ -30,4 +30,4 @@ #error "Whoops! This file must be compiled with a C compiler!" #endif -#include "../beast/modules/beast_sqlite/beast_sqlite.c" +#include "../../beast/modules/beast_sqlite/beast_sqlite.unity.c" diff --git a/src/ripple/beast/ripple_beastobjc.mm b/src/ripple/beast/ripple_beastobjc.unity.mm similarity index 100% rename from src/ripple/beast/ripple_beastobjc.mm rename to src/ripple/beast/ripple_beastobjc.unity.mm diff --git a/src/ripple/common/MultiSocket.h b/src/ripple/common/MultiSocket.h index 1e1f66cf9b..0332417475 100644 --- a/src/ripple/common/MultiSocket.h +++ b/src/ripple/common/MultiSocket.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_COMMON_MULTISOCKET_H_INCLUDED #define RIPPLE_COMMON_MULTISOCKET_H_INCLUDED -#include "../beast/modules/beast_asio/beast_asio.h" +#include "../../beast/modules/beast_asio/beast_asio.h" namespace ripple { diff --git a/src/ripple/common/ResolverAsio.h b/src/ripple/common/ResolverAsio.h index ecd6e7c60d..d46fd658d2 100644 --- a/src/ripple/common/ResolverAsio.h +++ b/src/ripple/common/ResolverAsio.h @@ -22,7 +22,7 @@ #include -#include "../beast/beast/utility/Journal.h" +#include "../../beast/beast/utility/Journal.h" #include "Resolver.h" namespace ripple { diff --git a/src/ripple/common/RippleSSLContext.h b/src/ripple/common/RippleSSLContext.h index d4813856e5..c0a5a64718 100644 --- a/src/ripple/common/RippleSSLContext.h +++ b/src/ripple/common/RippleSSLContext.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_COMMON_SSLCONTEXT_H_INCLUDED #define RIPPLE_COMMON_SSLCONTEXT_H_INCLUDED -#include "../beast/modules/beast_asio/beast_asio.h" +#include "../../beast/modules/beast_asio/beast_asio.h" #include diff --git a/src/ripple/common/ripple_common.cpp b/src/ripple/common/ripple_common.unity.cpp similarity index 100% rename from src/ripple/common/ripple_common.cpp rename to src/ripple/common/ripple_common.unity.cpp diff --git a/src/ripple/http/ripple_http.h b/src/ripple/http/ripple_http.h index f4461af9ec..96d1c7ab92 100644 --- a/src/ripple/http/ripple_http.h +++ b/src/ripple/http/ripple_http.h @@ -22,7 +22,7 @@ // VFALCO NOTE this sucks that we have to include asio in the header // just for HTTPMessage!! -#include "../beast/modules/beast_asio/beast_asio.h" +#include "../../beast/modules/beast_asio/beast_asio.h" # include "api/Port.h" # include "api/ScopedStream.h" diff --git a/src/ripple/http/ripple_http.cpp b/src/ripple/http/ripple_http.unity.cpp similarity index 95% rename from src/ripple/http/ripple_http.cpp rename to src/ripple/http/ripple_http.unity.cpp index 012e9ee0ea..59cc900011 100644 --- a/src/ripple/http/ripple_http.cpp +++ b/src/ripple/http/ripple_http.unity.cpp @@ -23,7 +23,7 @@ #include "../ripple_net/ripple_net.h" -#include "../beast/modules/beast_core/system/BeforeBoost.h" +#include "../../beast/modules/beast_core/system/BeforeBoost.h" #include #include diff --git a/src/ripple/json/api/JsonPropertyStream.h b/src/ripple/json/api/JsonPropertyStream.h index 039ad7e3e4..6545725b27 100644 --- a/src/ripple/json/api/JsonPropertyStream.h +++ b/src/ripple/json/api/JsonPropertyStream.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_JSONPROPERTYSTREAM_H_INCLUDED #define RIPPLE_JSONPROPERTYSTREAM_H_INCLUDED -#include "../beast/beast/utility/PropertyStream.h" +#include "../../../beast/beast/utility/PropertyStream.h" namespace ripple { diff --git a/src/ripple/json/ripple_json.h b/src/ripple/json/ripple_json.h index 4d5990ce14..e70685ec2c 100644 --- a/src/ripple/json/ripple_json.h +++ b/src/ripple/json/ripple_json.h @@ -20,10 +20,10 @@ #ifndef RIPPLE_JSON_H_INCLUDED #define RIPPLE_JSON_H_INCLUDED -#include "../beast/beast/Config.h" +#include "../../beast/beast/Config.h" -#include "../beast/beast/strings/String.h" -#include "../beast/beast/utility/PropertyStream.h" +#include "../../beast/beast/strings/String.h" +#include "../../beast/beast/utility/PropertyStream.h" #include #include diff --git a/src/ripple/json/ripple_json.cpp b/src/ripple/json/ripple_json.unity.cpp similarity index 100% rename from src/ripple/json/ripple_json.cpp rename to src/ripple/json/ripple_json.unity.cpp diff --git a/src/ripple/peerfinder/api/Manager.h b/src/ripple/peerfinder/api/Manager.h index 5044d0a5bb..f3a850a7f3 100644 --- a/src/ripple/peerfinder/api/Manager.h +++ b/src/ripple/peerfinder/api/Manager.h @@ -26,7 +26,7 @@ #include "../../sitefiles/api/Manager.h" -#include "../../beast/modules/beast_core/files/File.h" +#include "../../../beast/modules/beast_core/files/File.h" namespace ripple { namespace PeerFinder { diff --git a/src/ripple/peerfinder/api/Slot.h b/src/ripple/peerfinder/api/Slot.h index 5dbf823f7b..6dd9785fba 100644 --- a/src/ripple/peerfinder/api/Slot.h +++ b/src/ripple/peerfinder/api/Slot.h @@ -22,7 +22,7 @@ #include "../../types/api/RipplePublicKey.h" -#include "../../beast/beast/net/IPEndpoint.h" +#include "../../../beast/beast/net/IPEndpoint.h" #include diff --git a/src/ripple/peerfinder/api/Types.h b/src/ripple/peerfinder/api/Types.h index aa19f3446d..278e8dfb49 100644 --- a/src/ripple/peerfinder/api/Types.h +++ b/src/ripple/peerfinder/api/Types.h @@ -22,7 +22,7 @@ #include "Endpoint.h" -#include "../../beast/beast/chrono/abstract_clock.h" +#include "../../../beast/beast/chrono/abstract_clock.h" namespace ripple { namespace PeerFinder { diff --git a/src/ripple/peerfinder/ripple_peerfinder.cpp b/src/ripple/peerfinder/ripple_peerfinder.unity.cpp similarity index 90% rename from src/ripple/peerfinder/ripple_peerfinder.cpp rename to src/ripple/peerfinder/ripple_peerfinder.unity.cpp index bcde828009..e1e3da14cb 100644 --- a/src/ripple/peerfinder/ripple_peerfinder.cpp +++ b/src/ripple/peerfinder/ripple_peerfinder.unity.cpp @@ -31,16 +31,16 @@ #include #include -#include "../beast/modules/beast_core/system/BeforeBoost.h" +#include "../../beast/modules/beast_core/system/BeforeBoost.h" #include #include #include -#include "../beast/modules/beast_sqdb/beast_sqdb.h" -#include "../beast/modules/beast_asio/beast_asio.h" +#include "../../beast/modules/beast_sqdb/beast_sqdb.h" +#include "../../beast/modules/beast_asio/beast_asio.h" -#include "../beast/beast/boost/ErrorCode.h" -#include "../beast/beast/chrono/chrono_io.h" +#include "../../beast/beast/boost/ErrorCode.h" +#include "../../beast/beast/chrono/chrono_io.h" #include "impl/iosformat.h" // VFALCO NOTE move to beast diff --git a/src/ripple/radmap/ripple_radmap.cpp b/src/ripple/radmap/ripple_radmap.unity.cpp similarity index 100% rename from src/ripple/radmap/ripple_radmap.cpp rename to src/ripple/radmap/ripple_radmap.unity.cpp diff --git a/src/ripple/resource/api/Gossip.h b/src/ripple/resource/api/Gossip.h index 1b65a8a2da..c6cf2b10c4 100644 --- a/src/ripple/resource/api/Gossip.h +++ b/src/ripple/resource/api/Gossip.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_RESOURCE_GOSSIP_H_INCLUDED #define RIPPLE_RESOURCE_GOSSIP_H_INCLUDED -#include "../../beast/beast/net/IPEndpoint.h" +#include "../../../beast/beast/net/IPEndpoint.h" namespace ripple { namespace Resource { diff --git a/src/ripple/resource/api/Manager.h b/src/ripple/resource/api/Manager.h index 9c8b1af28e..f9aa4c4859 100644 --- a/src/ripple/resource/api/Manager.h +++ b/src/ripple/resource/api/Manager.h @@ -23,9 +23,9 @@ #include "Consumer.h" #include "Gossip.h" -#include "../../beast/beast/insight/Collector.h" -#include "../../beast/beast/net/IPEndpoint.h" -#include "../../beast/beast/utility/Journal.h" +#include "../../../beast/beast/insight/Collector.h" +#include "../../../beast/beast/net/IPEndpoint.h" +#include "../../../beast/beast/utility/Journal.h" namespace ripple { namespace Resource { diff --git a/src/ripple/resource/impl/Logic.h b/src/ripple/resource/impl/Logic.h index c93d265022..4b9cf41bec 100644 --- a/src/ripple/resource/impl/Logic.h +++ b/src/ripple/resource/impl/Logic.h @@ -22,7 +22,7 @@ #include "../../common/UnorderedContainers.h" -#include "../../beast/beast/chrono/abstract_clock.h" +#include "../../../beast/beast/chrono/abstract_clock.h" namespace ripple { namespace Resource { diff --git a/src/ripple/resource/ripple_resource.cpp b/src/ripple/resource/ripple_resource.unity.cpp similarity index 88% rename from src/ripple/resource/ripple_resource.cpp rename to src/ripple/resource/ripple_resource.unity.cpp index 5e4b64423a..2e122e2f60 100644 --- a/src/ripple/resource/ripple_resource.cpp +++ b/src/ripple/resource/ripple_resource.unity.cpp @@ -21,15 +21,15 @@ #include "ripple_resource.h" -#include "../beast/modules/beast_core/system/BeforeBoost.h" +#include "../../beast/modules/beast_core/system/BeforeBoost.h" #include #include "../algorithm/api/DecayingSample.h" #include "../common/seconds_clock.h" -#include "../beast/beast/Insight.h" -#include "../beast/beast/cxx14/memory.h" -#include "../beast/beast/chrono/chrono_io.h" +#include "../../beast/beast/Insight.h" +#include "../../beast/beast/cxx14/memory.h" +#include "../../beast/beast/chrono/chrono_io.h" #include "impl/Fees.cpp" # include "impl/Kind.h" diff --git a/src/ripple/rocksdb/ripple_rocksdb.h b/src/ripple/rocksdb/ripple_rocksdb.h index 68fbd9e6aa..de4b239284 100644 --- a/src/ripple/rocksdb/ripple_rocksdb.h +++ b/src/ripple/rocksdb/ripple_rocksdb.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_ROCKSDB_H_INCLUDED #define RIPPLE_ROCKSDB_H_INCLUDED -#include "../beast/beast/Config.h" +#include "../../beast/beast/Config.h" #ifndef RIPPLE_ROCKSDB_AVAILABLE # if BEAST_WIN32 diff --git a/src/ripple/rocksdb/ripple_rocksdb.cpp b/src/ripple/rocksdb/ripple_rocksdb.unity.cpp similarity index 100% rename from src/ripple/rocksdb/ripple_rocksdb.cpp rename to src/ripple/rocksdb/ripple_rocksdb.unity.cpp diff --git a/src/ripple/sitefiles/api/Manager.h b/src/ripple/sitefiles/api/Manager.h index a3a693ffc8..bdd9d6b856 100644 --- a/src/ripple/sitefiles/api/Manager.h +++ b/src/ripple/sitefiles/api/Manager.h @@ -22,7 +22,7 @@ #include "Listener.h" -#include "../../beast/beast/utility/PropertyStream.h" +#include "../../../beast/beast/utility/PropertyStream.h" namespace ripple { namespace SiteFiles { diff --git a/src/ripple/sitefiles/ripple_sitefiles.h b/src/ripple/sitefiles/ripple_sitefiles.h index 4da75fdbda..ac1ced784a 100644 --- a/src/ripple/sitefiles/ripple_sitefiles.h +++ b/src/ripple/sitefiles/ripple_sitefiles.h @@ -22,10 +22,10 @@ #include -#include "../beast/modules/beast_core/system/BeforeBoost.h" +#include "../../beast/modules/beast_core/system/BeforeBoost.h" -#include "../beast/beast/http/URL.h" -#include "../beast/beast/Threads.h" +#include "../../beast/beast/http/URL.h" +#include "../../beast/beast/Threads.h" # include "api/Section.h" # include "api/SiteFile.h" diff --git a/src/ripple/sitefiles/ripple_sitefiles.cpp b/src/ripple/sitefiles/ripple_sitefiles.unity.cpp similarity index 90% rename from src/ripple/sitefiles/ripple_sitefiles.cpp rename to src/ripple/sitefiles/ripple_sitefiles.unity.cpp index cda5f37cd2..75d6f03806 100644 --- a/src/ripple/sitefiles/ripple_sitefiles.cpp +++ b/src/ripple/sitefiles/ripple_sitefiles.unity.cpp @@ -21,9 +21,9 @@ #include "ripple_sitefiles.h" -#include "../beast/modules/beast_asio/beast_asio.h" // HTTPClientBase +#include "../../beast/modules/beast_asio/beast_asio.h" // HTTPClientBase -#include "../beast/modules/beast_core/system/BeforeBoost.h" +#include "../../beast/modules/beast_core/system/BeforeBoost.h" #include #include diff --git a/src/ripple/sslutil/ripple_sslutil.cpp b/src/ripple/sslutil/ripple_sslutil.unity.cpp similarity index 100% rename from src/ripple/sslutil/ripple_sslutil.cpp rename to src/ripple/sslutil/ripple_sslutil.unity.cpp diff --git a/src/ripple/testoverlay/ripple_testoverlay.h b/src/ripple/testoverlay/ripple_testoverlay.h index f32eaa1acd..93efe91e9c 100644 --- a/src/ripple/testoverlay/ripple_testoverlay.h +++ b/src/ripple/testoverlay/ripple_testoverlay.h @@ -20,10 +20,10 @@ #ifndef RIPPLE_TESTOVERLAY_H_INCLUDED #define RIPPLE_TESTOVERLAY_H_INCLUDED -#include "../beast/modules/beast_core/system/BeforeBoost.h" +#include "../../beast/modules/beast_core/system/BeforeBoost.h" #include -#include "../beast/modules/beast_core/beast_core.h" +#include "../../beast/modules/beast_core/beast_core.h" #include diff --git a/src/ripple/testoverlay/ripple_testoverlay.cpp b/src/ripple/testoverlay/ripple_testoverlay.unity.cpp similarity index 100% rename from src/ripple/testoverlay/ripple_testoverlay.cpp rename to src/ripple/testoverlay/ripple_testoverlay.unity.cpp diff --git a/src/ripple/types/api/CryptoIdentifier.h b/src/ripple/types/api/CryptoIdentifier.h index 4695a2bd98..f7723b6253 100644 --- a/src/ripple/types/api/CryptoIdentifier.h +++ b/src/ripple/types/api/CryptoIdentifier.h @@ -20,8 +20,8 @@ #ifndef RIPPLE_TYPES_CRYPTOIDENTIFIER_H_INCLUDED #define RIPPLE_TYPES_CRYPTOIDENTIFIER_H_INCLUDED -#include "../../beast/beast/ByteOrder.h" -#include "../../beast/beast/crypto/Sha256.h" +#include "../../../beast/beast/ByteOrder.h" +#include "../../../beast/beast/crypto/Sha256.h" #include #include "Base58.h" diff --git a/src/ripple/types/api/IdentifierStorage.h b/src/ripple/types/api/IdentifierStorage.h index 30ab322871..62e2c5aaf6 100644 --- a/src/ripple/types/api/IdentifierStorage.h +++ b/src/ripple/types/api/IdentifierStorage.h @@ -20,8 +20,8 @@ #ifndef RIPPLE_TYPES_IDENTIFIERSTORAGE_H_INCLUDED #define RIPPLE_TYPES_IDENTIFIERSTORAGE_H_INCLUDED -#include "../../beast/beast/crypto/MurmurHash.h" -#include "../../beast/beast/container/hardened_hash.h" +#include "../../../beast/beast/crypto/MurmurHash.h" +#include "../../../beast/beast/container/hardened_hash.h" #include diff --git a/src/ripple/types/api/RandomNumbers.h b/src/ripple/types/api/RandomNumbers.h index 80d362f124..84602e26f4 100644 --- a/src/ripple/types/api/RandomNumbers.h +++ b/src/ripple/types/api/RandomNumbers.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_TYPES_RANDOMNUMBERS_H #define RIPPLE_TYPES_RANDOMNUMBERS_H -#include "../../beast/beast/utility/Journal.h" +#include "../../../beast/beast/utility/Journal.h" namespace ripple { diff --git a/src/ripple/types/api/base_uint.h b/src/ripple/types/api/base_uint.h index 81a6247db7..6f1cd40b54 100644 --- a/src/ripple/types/api/base_uint.h +++ b/src/ripple/types/api/base_uint.h @@ -29,7 +29,7 @@ #include "strHex.h" #include "ByteOrder.h" -#include "../../beast/beast/container/hardened_hash.h" +#include "../../../beast/beast/container/hardened_hash.h" #include diff --git a/src/ripple/types/ripple_types.h b/src/ripple/types/ripple_types.h index e00bc4322e..d5a6cb9bf5 100644 --- a/src/ripple/types/ripple_types.h +++ b/src/ripple/types/ripple_types.h @@ -22,9 +22,9 @@ #include "../json/ripple_json.h" -#include "../beast/beast/Crypto.h" +#include "../../beast/beast/Crypto.h" -#include "../beast/modules/beast_core/system/BeforeBoost.h" +#include "../../beast/modules/beast_core/system/BeforeBoost.h" #include #include #include diff --git a/src/ripple/types/ripple_types.cpp b/src/ripple/types/ripple_types.unity.cpp similarity index 97% rename from src/ripple/types/ripple_types.cpp rename to src/ripple/types/ripple_types.unity.cpp index 7547f3cb6f..dd73f87d0f 100644 --- a/src/ripple/types/ripple_types.cpp +++ b/src/ripple/types/ripple_types.unity.cpp @@ -20,7 +20,7 @@ #include "../../BeastConfig.h" #include "ripple_types.h" -#include "../ripple/sslutil/ripple_sslutil.h" +#include "../sslutil/ripple_sslutil.h" #ifdef BEAST_WIN32 # include // for ByteOrder.cpp diff --git a/src/ripple/validators/api/Manager.h b/src/ripple/validators/api/Manager.h index 61ee11a104..0147006c09 100644 --- a/src/ripple/validators/api/Manager.h +++ b/src/ripple/validators/api/Manager.h @@ -20,8 +20,8 @@ #ifndef RIPPLE_VALIDATORS_MANAGER_H_INCLUDED #define RIPPLE_VALIDATORS_MANAGER_H_INCLUDED -#include "../../beast/beast/threads/Stoppable.h" -#include "../../beast/modules/beast_core/files/File.h" +#include "../../../beast/beast/threads/Stoppable.h" +#include "../../../beast/modules/beast_core/files/File.h" namespace ripple { namespace Validators { diff --git a/src/ripple/validators/api/Source.h b/src/ripple/validators/api/Source.h index 42b5be93bf..5f1c0ad9b0 100644 --- a/src/ripple/validators/api/Source.h +++ b/src/ripple/validators/api/Source.h @@ -20,8 +20,8 @@ #ifndef RIPPLE_VALIDATORS_SOURCE_H_INCLUDED #define RIPPLE_VALIDATORS_SOURCE_H_INCLUDED -#include "../../beast/beast/smart_ptr/SharedObject.h" -#include "../../beast/modules/beast_core/time/Time.h" +#include "../../../beast/beast/smart_ptr/SharedObject.h" +#include "../../../beast/modules/beast_core/time/Time.h" namespace ripple { namespace Validators { diff --git a/src/ripple/validators/ripple_validators.h b/src/ripple/validators/ripple_validators.h index 548cb65fad..36a9e58d82 100644 --- a/src/ripple/validators/ripple_validators.h +++ b/src/ripple/validators/ripple_validators.h @@ -20,9 +20,9 @@ #ifndef RIPPLE_VALIDATORS_H_INCLUDED #define RIPPLE_VALIDATORS_H_INCLUDED -#include "../beast/beast/http/URL.h" +#include "../../beast/beast/http/URL.h" -#include "../ripple/types/ripple_types.h" +#include "../types/ripple_types.h" # include "api/Types.h" # include "api/Source.h" diff --git a/src/ripple/validators/ripple_validators.cpp b/src/ripple/validators/ripple_validators.unity.cpp similarity index 89% rename from src/ripple/validators/ripple_validators.cpp rename to src/ripple/validators/ripple_validators.unity.cpp index 8ddca7388c..f5f98afb4c 100644 --- a/src/ripple/validators/ripple_validators.cpp +++ b/src/ripple/validators/ripple_validators.unity.cpp @@ -21,7 +21,7 @@ #include "ripple_validators.h" -#include "../beast/modules/beast_core/system/BeforeBoost.h" +#include "../../beast/modules/beast_core/system/BeforeBoost.h" #include #include #include @@ -30,9 +30,9 @@ #include -#include "../beast/beast/threads/ScopedWrapperContext.h" -#include "../beast/modules/beast_asio/beast_asio.h" -#include "../beast/modules/beast_sqdb/beast_sqdb.h" +#include "../../beast/beast/threads/ScopedWrapperContext.h" +#include "../../beast/modules/beast_asio/beast_asio.h" +#include "../../beast/modules/beast_sqdb/beast_sqdb.h" #include "../algorithm/api/CycledSet.h" #include "../testoverlay/ripple_testoverlay.h" // for unit test diff --git a/src/ripple_app/ripple_app.cpp b/src/ripple_app/ripple_app.unity.cpp similarity index 100% rename from src/ripple_app/ripple_app.cpp rename to src/ripple_app/ripple_app.unity.cpp diff --git a/src/ripple_app/ripple_app_pt1.cpp b/src/ripple_app/ripple_app_pt1.unity.cpp similarity index 100% rename from src/ripple_app/ripple_app_pt1.cpp rename to src/ripple_app/ripple_app_pt1.unity.cpp diff --git a/src/ripple_app/ripple_app_pt2.cpp b/src/ripple_app/ripple_app_pt2.unity.cpp similarity index 100% rename from src/ripple_app/ripple_app_pt2.cpp rename to src/ripple_app/ripple_app_pt2.unity.cpp diff --git a/src/ripple_app/ripple_app_pt3.cpp b/src/ripple_app/ripple_app_pt3.unity.cpp similarity index 100% rename from src/ripple_app/ripple_app_pt3.cpp rename to src/ripple_app/ripple_app_pt3.unity.cpp diff --git a/src/ripple_app/ripple_app_pt4.cpp b/src/ripple_app/ripple_app_pt4.unity.cpp similarity index 100% rename from src/ripple_app/ripple_app_pt4.cpp rename to src/ripple_app/ripple_app_pt4.unity.cpp diff --git a/src/ripple_app/ripple_app_pt5.cpp b/src/ripple_app/ripple_app_pt5.unity.cpp similarity index 100% rename from src/ripple_app/ripple_app_pt5.cpp rename to src/ripple_app/ripple_app_pt5.unity.cpp diff --git a/src/ripple_app/ripple_app_pt6.cpp b/src/ripple_app/ripple_app_pt6.unity.cpp similarity index 100% rename from src/ripple_app/ripple_app_pt6.cpp rename to src/ripple_app/ripple_app_pt6.unity.cpp diff --git a/src/ripple_app/ripple_app_pt7.cpp b/src/ripple_app/ripple_app_pt7.unity.cpp similarity index 100% rename from src/ripple_app/ripple_app_pt7.cpp rename to src/ripple_app/ripple_app_pt7.unity.cpp diff --git a/src/ripple_app/ripple_app_pt8.cpp b/src/ripple_app/ripple_app_pt8.unity.cpp similarity index 100% rename from src/ripple_app/ripple_app_pt8.cpp rename to src/ripple_app/ripple_app_pt8.unity.cpp diff --git a/src/ripple_app/ripple_app_pt9.cpp b/src/ripple_app/ripple_app_pt9.unity.cpp similarity index 100% rename from src/ripple_app/ripple_app_pt9.cpp rename to src/ripple_app/ripple_app_pt9.unity.cpp diff --git a/src/ripple_basics/ripple_basics.cpp b/src/ripple_basics/ripple_basics.unity.cpp similarity index 100% rename from src/ripple_basics/ripple_basics.cpp rename to src/ripple_basics/ripple_basics.unity.cpp diff --git a/src/ripple_core/ripple_core.cpp b/src/ripple_core/ripple_core.unity.cpp similarity index 100% rename from src/ripple_core/ripple_core.cpp rename to src/ripple_core/ripple_core.unity.cpp diff --git a/src/ripple_data/ripple_data.cpp b/src/ripple_data/ripple_data.unity.cpp similarity index 100% rename from src/ripple_data/ripple_data.cpp rename to src/ripple_data/ripple_data.unity.cpp diff --git a/src/ripple_hyperleveldb/ripple_hyperleveldb.cpp b/src/ripple_hyperleveldb/ripple_hyperleveldb.unity.cpp similarity index 100% rename from src/ripple_hyperleveldb/ripple_hyperleveldb.cpp rename to src/ripple_hyperleveldb/ripple_hyperleveldb.unity.cpp diff --git a/src/ripple_leveldb/ripple_leveldb.cpp b/src/ripple_leveldb/ripple_leveldb.unity.cpp similarity index 100% rename from src/ripple_leveldb/ripple_leveldb.cpp rename to src/ripple_leveldb/ripple_leveldb.unity.cpp diff --git a/src/ripple_net/ripple_net.cpp b/src/ripple_net/ripple_net.unity.cpp similarity index 100% rename from src/ripple_net/ripple_net.cpp rename to src/ripple_net/ripple_net.unity.cpp diff --git a/src/ripple_overlay/ripple_overlay.cpp b/src/ripple_overlay/ripple_overlay.unity.cpp similarity index 100% rename from src/ripple_overlay/ripple_overlay.cpp rename to src/ripple_overlay/ripple_overlay.unity.cpp diff --git a/src/ripple_rpc/ripple_rpc.cpp b/src/ripple_rpc/ripple_rpc.unity.cpp similarity index 100% rename from src/ripple_rpc/ripple_rpc.cpp rename to src/ripple_rpc/ripple_rpc.unity.cpp diff --git a/src/ripple_websocket/ripple_websocket.cpp b/src/ripple_websocket/ripple_websocket.unity.cpp similarity index 100% rename from src/ripple_websocket/ripple_websocket.cpp rename to src/ripple_websocket/ripple_websocket.unity.cpp