From 1391a11e46618adbbed180854f51fc7f15938b58 Mon Sep 17 00:00:00 2001 From: Vinnie Falco Date: Sat, 31 Aug 2013 22:21:09 -0700 Subject: [PATCH] Move BuildInfo to ripple_data --- Builds/VisualStudio2012/RippleD.vcxproj | 14 +++++++------- Builds/VisualStudio2012/RippleD.vcxproj.filters | 12 ++++++------ modules/ripple_app/ripple_app.cpp | 2 -- modules/ripple_app/ripple_app.h | 11 ----------- .../protocol/BuildInfo.cpp} | 0 .../protocol/BuildInfo.h} | 0 modules/ripple_data/ripple_data.cpp | 1 + modules/ripple_data/ripple_data.h | 1 + 8 files changed, 15 insertions(+), 26 deletions(-) rename modules/{ripple_app/basics/ripple_BuildInfo.cpp => ripple_data/protocol/BuildInfo.cpp} (100%) rename modules/{ripple_app/basics/ripple_BuildInfo.h => ripple_data/protocol/BuildInfo.h} (100%) diff --git a/Builds/VisualStudio2012/RippleD.vcxproj b/Builds/VisualStudio2012/RippleD.vcxproj index 8dcb534e36..05ad0ac20c 100644 --- a/Builds/VisualStudio2012/RippleD.vcxproj +++ b/Builds/VisualStudio2012/RippleD.vcxproj @@ -19,12 +19,6 @@ - - true - true - true - true - true true @@ -885,6 +879,12 @@ true true + + true + true + true + true + true true @@ -1370,7 +1370,6 @@ - @@ -1528,6 +1527,7 @@ + diff --git a/Builds/VisualStudio2012/RippleD.vcxproj.filters b/Builds/VisualStudio2012/RippleD.vcxproj.filters index 3e62374dd0..200b3d846b 100644 --- a/Builds/VisualStudio2012/RippleD.vcxproj.filters +++ b/Builds/VisualStudio2012/RippleD.vcxproj.filters @@ -849,9 +849,6 @@ [0] Subtrees\beast - - [1] Ripple\ripple_app\basics - [1] Ripple\ripple_app\main @@ -882,6 +879,9 @@ [1] Ripple\ripple_app\websocket + + [1] Ripple\ripple_data\protocol + @@ -1622,9 +1622,6 @@ [1] Ripple\ripple_core\validator - - [1] Ripple\ripple_app\basics - [1] Ripple\ripple_app\main @@ -1679,6 +1676,9 @@ [1] Ripple\ripple_app\main + + [1] Ripple\ripple_data\protocol + diff --git a/modules/ripple_app/ripple_app.cpp b/modules/ripple_app/ripple_app.cpp index 9786a303b9..436bf6d74b 100644 --- a/modules/ripple_app/ripple_app.cpp +++ b/modules/ripple_app/ripple_app.cpp @@ -197,7 +197,6 @@ namespace ripple #include "contracts/ripple_Interpreter.h" #include "contracts/ripple_Operation.h" -#include "basics/ripple_BuildInfo.h" // private #include "basics/ripple_RPCServerHandler.h" #include "rpc/RPCDoor.h" // needs RPCServer @@ -245,7 +244,6 @@ static const uint64 tenTo17m1 = tenTo17 - 1; #if ! defined (RIPPLE_MAIN_PART) || RIPPLE_MAIN_PART == 1 -#include "basics/ripple_BuildInfo.cpp" #include "basics/ripple_RPCServerHandler.cpp" #include "node/ripple_NodeObject.cpp" #include "node/ripple_NodeStore.cpp" diff --git a/modules/ripple_app/ripple_app.h b/modules/ripple_app/ripple_app.h index 9c832762c6..24cc2650c0 100644 --- a/modules/ripple_app/ripple_app.h +++ b/modules/ripple_app/ripple_app.h @@ -4,17 +4,6 @@ */ //============================================================================== -/** Include this to get the @ref ripple_app module. - - @file ripple_app.h - @ingroup ripple_app -*/ - -/** Core classes. - This module contains the Ripple core instance object and related objects. - @defgroup ripple_app -*/ - #ifndef RIPPLE_APP_H_INCLUDED #define RIPPLE_APP_H_INCLUDED diff --git a/modules/ripple_app/basics/ripple_BuildInfo.cpp b/modules/ripple_data/protocol/BuildInfo.cpp similarity index 100% rename from modules/ripple_app/basics/ripple_BuildInfo.cpp rename to modules/ripple_data/protocol/BuildInfo.cpp diff --git a/modules/ripple_app/basics/ripple_BuildInfo.h b/modules/ripple_data/protocol/BuildInfo.h similarity index 100% rename from modules/ripple_app/basics/ripple_BuildInfo.h rename to modules/ripple_data/protocol/BuildInfo.h diff --git a/modules/ripple_data/ripple_data.cpp b/modules/ripple_data/ripple_data.cpp index 55db3617fc..cc0ad42e34 100644 --- a/modules/ripple_data/ripple_data.cpp +++ b/modules/ripple_data/ripple_data.cpp @@ -69,6 +69,7 @@ namespace ripple #include "crypto/ripple_Base58Data.cpp" #include "crypto/ripple_RFC1751.cpp" +#include "protocol/BuildInfo.cpp" #include "protocol/ripple_FieldNames.cpp" #include "protocol/ripple_LedgerFormats.cpp" #include "protocol/ripple_PackedMessage.cpp" diff --git a/modules/ripple_data/ripple_data.h b/modules/ripple_data/ripple_data.h index c24302cf87..502a4ffe3f 100644 --- a/modules/ripple_data/ripple_data.h +++ b/modules/ripple_data/ripple_data.h @@ -35,6 +35,7 @@ namespace ripple #include "crypto/ripple_Base58Data.h" #include "crypto/ripple_RFC1751.h" +#include "protocol/BuildInfo.h" #include "protocol/ripple_FieldNames.h" #include "protocol/ripple_HashPrefix.h" #include "protocol/ripple_PackedMessage.h"