Move startup into RippleMain

Builds/VisualStudio2012/RippleD.vcxproj

@@ -193,7 +193,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\modules\ripple_app\main\ripple_Main.cpp">
+    <ClCompile Include="..\..\modules\ripple_app\main\ripple_RippleMain.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
@@ -1405,6 +1405,7 @@
     <ClInclude Include="..\..\modules\ripple_app\main\ripple_FatalErrorReporter.h" />
     <ClInclude Include="..\..\modules\ripple_app\main\ripple_ILoadManager.h" />
     <ClInclude Include="..\..\modules\ripple_app\main\ripple_LocalCredentials.h" />
+    <ClInclude Include="..\..\modules\ripple_app\main\ripple_RippleMain.h" />
     <ClInclude Include="..\..\modules\ripple_app\misc\NetworkOPs.h" />
     <ClInclude Include="..\..\modules\ripple_app\misc\ripple_AccountItem.h" />
     <ClInclude Include="..\..\modules\ripple_app\misc\ripple_AccountItems.h" />

Builds/VisualStudio2012/RippleD.vcxproj.filters

@@ -678,9 +678,6 @@
     <ClCompile Include="..\..\modules\ripple_app\main\ripple_LocalCredentials.cpp">
       <Filter>[1] Ripple\ripple_app\main</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\modules\ripple_app\main\ripple_Main.cpp">
-      <Filter>[1] Ripple\ripple_app\main</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\modules\ripple_app\misc\ripple_AccountItem.cpp">
       <Filter>[1] Ripple\ripple_app\misc</Filter>
     </ClCompile>
@@ -885,6 +882,9 @@
     <ClCompile Include="..\..\modules\ripple_app\network\ripple_ProxyHandshake.cpp">
       <Filter>[1] Ripple\ripple_app\network</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\modules\ripple_app\main\ripple_RippleMain.cpp">
+      <Filter>[1] Ripple\ripple_app\main</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\Subtrees\sqlite\sqlite3.h">
@@ -1676,6 +1676,9 @@
     <ClInclude Include="..\..\modules\ripple_app\network\ripple_ProxyHandshake.h">
       <Filter>[1] Ripple\ripple_app\network</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\modules\ripple_app\main\ripple_RippleMain.h">
+      <Filter>[1] Ripple\ripple_app\main</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <CustomBuild Include="..\..\modules\ripple_data\protocol\ripple.proto">

Notes/VFALCO_LOG.txt

@@ -4,6 +4,8 @@ Vinnie Falco's Change Log
 
 - Add beast::SemanticVersion
 - Change rippled to use SemanticVersion
+- Add runStartup to UnitTest, allowing forced tests on startup
+- Force rippled BuildInfo unit test to run on every startup
 
 2013/07/31
 

modules/ripple_app/main/ripple_RippleMain.cpp

@@ -224,7 +224,7 @@ static int runUnitTests (String const& whichTests, String const& format)
 
 //------------------------------------------------------------------------------
 
-int rippleMain (int argc, char** argv)
+int RippleMain::run (int argc, char const* const* argv)
 {
     FatalErrorReporter reporter;
 

modules/ripple_app/main/ripple_RippleMain.h

@@ -0,0 +1,16 @@
+//------------------------------------------------------------------------------
+/*
+    Copyright (c) 2011-2013, OpenCoin, Inc.
+*/
+//==============================================================================
+
+#ifndef RIPPLE_RIPPLEMAIN_H_INCLUDED
+#define RIPPLE_RIPPLEMAIN_H_INCLUDED
+
+class RippleMain : public Main
+{
+public:
+    int run (int argc, char const* const* argv);
+};
+
+#endif

modules/ripple_app/ripple_app.cpp

@@ -379,9 +379,6 @@ static DH* handleTmpDh (SSL* ssl, int is_export, int iKeyLength)
 #include "ledger/ripple_AcceptedLedger.cpp"
 #include "consensus/ripple_DisputedTx.cpp"
 #include "misc/ripple_HashRouter.cpp"
- #include "main/ripple_FatalErrorReporter.h" // private
-#include "main/ripple_FatalErrorReporter.cpp"
-#include "main/ripple_Main.cpp"
 #include "misc/ripple_Offer.cpp"
 
 #endif
@@ -417,25 +414,24 @@ static DH* handleTmpDh (SSL* ssl, int is_export, int iKeyLength)
 
 #include "shamap/ripple_SHAMapSyncFilters.cpp" // requires Application
 
+ #include "main/ripple_FatalErrorReporter.h" // private
+#include "main/ripple_FatalErrorReporter.cpp"
+ #include "main/ripple_RippleMain.h" // private
+#include "main/ripple_RippleMain.cpp"
+
 #endif
 
 //------------------------------------------------------------------------------
 
 }
 
-//------------------------------------------------------------------------------
-
 #if ! defined (RIPPLE_MAIN_PART) || RIPPLE_MAIN_PART == 8
 
-namespace ripple
-{
-    extern int rippleMain (int argc, char** argv);
-}
-
 // Must be outside the namespace for obvious reasons
 int main (int argc, char** argv)
 {
-    return ripple::rippleMain (argc, argv);
+    ripple::RippleMain rippled;
+    return rippled.runFromMain (argc, argv);
 }
 
 #endif