diff --git a/SConstruct b/SConstruct index d7ac9c49b4..7fc150d8ea 100644 --- a/SConstruct +++ b/SConstruct @@ -109,7 +109,10 @@ COMPILED_FILES = [ 'modules/ripple_db/ripple_db.cpp', 'modules/ripple_json/ripple_json.cpp', 'modules/ripple_ledger/ripple_ledger.cpp', - 'modules/ripple_main/ripple_main.cpp', + 'modules/ripple_main/ripple_main_pt1.cpp', + 'modules/ripple_main/ripple_main_pt2.cpp', + 'modules/ripple_main/ripple_main_pt3.cpp', + 'modules/ripple_main/ripple_main_pt4.cpp', 'modules/ripple_mess/ripple_mess.cpp', 'modules/ripple_net/ripple_net.cpp', 'Subtrees/beast/modules/beast_core/beast_core.cpp' diff --git a/modules/ripple_main/ripple_main.cpp b/modules/ripple_main/ripple_main.cpp index 0f72e445a1..15279c65b3 100644 --- a/modules/ripple_main/ripple_main.cpp +++ b/modules/ripple_main/ripple_main.cpp @@ -65,8 +65,6 @@ #include #include #include -#include -#include #include #include #include @@ -77,6 +75,12 @@ #include #include +#if ! defined (RIPPLE_MAIN_PART) || RIPPLE_MAIN_PART == 1 +#include +#endif + +#include + #include #include #include @@ -250,19 +254,15 @@ static const uint64 tenTo14m1 = tenTo14 - 1; static const uint64 tenTo17 = tenTo14 * 1000; static const uint64 tenTo17m1 = tenTo17 - 1; -// This is for PeerDoor and WSDoor -// Generate DH for SSL connection. -static DH* handleTmpDh(SSL* ssl, int is_export, int iKeyLength) -{ -// VFALCO TODO eliminate this horrendous dependency on theApp and Wallet - return 512 == iKeyLength ? theApp->getWallet().getDh512() : theApp->getWallet().getDh1024(); -} +//------------------------------------------------------------------------------ +//------------------------------------------------------------------------------ +//------------------------------------------------------------------------------ +//------------------------------------------------------------------------------ +//------------------------------------------------------------------------------ //------------------------------------------------------------------------------ -//------------------------------------------------------------------------------ -//------------------------------------------------------------------------------ -//------------------------------------------------------------------------------ -//------------------------------------------------------------------------------ + +#if ! defined (RIPPLE_MAIN_PART) || RIPPLE_MAIN_PART == 1 #include "src/cpp/database/database.cpp" #include "src/cpp/database/SqliteDatabase.cpp" @@ -294,6 +294,21 @@ static DH* handleTmpDh(SSL* ssl, int is_export, int iKeyLength) #include "src/cpp/ripple/Operation.cpp" // no log #include "src/cpp/ripple/OrderBook.cpp" // no log #include "src/cpp/ripple/OrderBookDB.cpp" + +#endif + +//------------------------------------------------------------------------------ + +#if ! defined (RIPPLE_MAIN_PART) || RIPPLE_MAIN_PART == 2 + +// This is for PeerDoor and WSDoor +// Generate DH for SSL connection. +static DH* handleTmpDh(SSL* ssl, int is_export, int iKeyLength) +{ +// VFALCO TODO eliminate this horrendous dependency on theApp and Wallet + return 512 == iKeyLength ? theApp->getWallet().getDh512() : theApp->getWallet().getDh1024(); +} + #include "src/cpp/ripple/ParameterTable.cpp" // no log #include "src/cpp/ripple/ParseSection.cpp" #include "src/cpp/ripple/Pathfinder.cpp" @@ -320,9 +335,16 @@ static DH* handleTmpDh(SSL* ssl, int is_export, int iKeyLength) #include "src/cpp/ripple/TransactionQueue.cpp" // no log #include "src/cpp/ripple/Transactor.cpp" #include "src/cpp/ripple/TrustSetTransactor.cpp" +#include "src/cpp/ripple/WSDoor.cpp" // uses logging in WSConnection.h + +#endif + +//------------------------------------------------------------------------------ + +#if ! defined (RIPPLE_MAIN_PART) || RIPPLE_MAIN_PART == 3 + #include "src/cpp/ripple/Wallet.cpp" #include "src/cpp/ripple/WalletAddTransactor.cpp" -#include "src/cpp/ripple/WSDoor.cpp" // uses logging in WSConnection.h #include "src/cpp/ripple/ripple_HashedObject.cpp" @@ -344,6 +366,13 @@ static DH* handleTmpDh(SSL* ssl, int is_export, int iKeyLength) #include "src/cpp/ripple/ripple_HashedObjectStore.cpp" #include "src/cpp/ripple/ripple_HashRouter.cpp" //#include "src/cpp/ripple/ripple_InfoSub.cpp" + +#endif + +//------------------------------------------------------------------------------ + +#if ! defined (RIPPLE_MAIN_PART) || RIPPLE_MAIN_PART == 4 + #include "src/cpp/ripple/ripple_Job.cpp" #include "src/cpp/ripple/ripple_JobQueue.cpp" #include "src/cpp/ripple/ripple_LedgerAcquire.cpp" @@ -366,6 +395,10 @@ static DH* handleTmpDh(SSL* ssl, int is_export, int iKeyLength) #include "src/cpp/ripple/ripple_SHAMapSyncFilters.cpp" // requires Application +#endif + +//------------------------------------------------------------------------------ + //------------------------------------------------------------------------------ #ifdef _MSC_VER diff --git a/modules/ripple_main/ripple_main_pt1.cpp b/modules/ripple_main/ripple_main_pt1.cpp new file mode 100644 index 0000000000..221a56d054 --- /dev/null +++ b/modules/ripple_main/ripple_main_pt1.cpp @@ -0,0 +1,2 @@ +#define RIPPLE_MAIN_PART 1 +#include "ripple_main.cpp" diff --git a/modules/ripple_main/ripple_main_pt2.cpp b/modules/ripple_main/ripple_main_pt2.cpp new file mode 100644 index 0000000000..ee603ca3a8 --- /dev/null +++ b/modules/ripple_main/ripple_main_pt2.cpp @@ -0,0 +1,2 @@ +#define RIPPLE_MAIN_PART 2 +#include "ripple_main.cpp" diff --git a/modules/ripple_main/ripple_main_pt3.cpp b/modules/ripple_main/ripple_main_pt3.cpp new file mode 100644 index 0000000000..8057b5df39 --- /dev/null +++ b/modules/ripple_main/ripple_main_pt3.cpp @@ -0,0 +1,2 @@ +#define RIPPLE_MAIN_PART 3 +#include "ripple_main.cpp" diff --git a/modules/ripple_main/ripple_main_pt4.cpp b/modules/ripple_main/ripple_main_pt4.cpp new file mode 100644 index 0000000000..6602b5b3d9 --- /dev/null +++ b/modules/ripple_main/ripple_main_pt4.cpp @@ -0,0 +1,2 @@ +#define RIPPLE_MAIN_PART 4 +#include "ripple_main.cpp"