Tidy up LevelDB support into ripple_leveldb

Builds/VisualStudio2012/RippleD.vcxproj

@@ -169,6 +169,7 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClCompile Include="..\..\modules\ripple_leveldb\ripple_leveldb.cpp" />
     <ClCompile Include="..\..\modules\ripple_sqlite\ripple_sqlite.c">
       <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Level4</WarningLevel>
       <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Level4</WarningLevel>
@@ -753,12 +754,6 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\..\modules\ripple_json\ripple_json.cpp" />
-    <ClCompile Include="..\..\src\cpp\leveldb_core.cpp">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
     <ClCompile Include="..\..\src\cpp\protobuf\src\google\protobuf\descriptor.cc">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
@@ -1555,6 +1550,7 @@
     <ClInclude Include="..\..\modules\ripple_json\json\json_value.h" />
     <ClInclude Include="..\..\modules\ripple_json\json\json_writer.h" />
     <ClInclude Include="..\..\modules\ripple_json\ripple_json.h" />
+    <ClInclude Include="..\..\modules\ripple_leveldb\ripple_leveldb.h" />
     <ClInclude Include="..\..\modules\ripple_sqlite\ripple_sqlite.h" />
     <ClInclude Include="..\..\modules\ripple_websocket\autosocket\ripple_AutoSocket.h" />
     <ClInclude Include="..\..\modules\ripple_websocket\ripple_websocket.h" />

Builds/VisualStudio2012/RippleD.vcxproj.filters

@@ -136,11 +136,11 @@
     <Filter Include="1. Modules\ripple_sqlite">
       <UniqueIdentifier>{6bbe236f-79ff-4e30-928c-bf5f302b3a21}</UniqueIdentifier>
     </Filter>
+    <Filter Include="1. Modules\ripple_leveldb">
+      <UniqueIdentifier>{82d79c26-4932-4a48-b134-09969f45d75a}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\src\cpp\leveldb_core.cpp">
-      <Filter>0. Third Party Code\LevelDB</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\cpp\protobuf_core.cpp">
       <Filter>0. Third Party Code\protobuf</Filter>
     </ClCompile>
@@ -885,6 +885,9 @@
     <ClCompile Include="..\..\modules\ripple_sqlite\ripple_sqlite.c">
       <Filter>1. Modules\ripple_sqlite</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\modules\ripple_leveldb\ripple_leveldb.cpp">
+      <Filter>1. Modules\ripple_leveldb</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\src\cpp\protobuf\src\google\protobuf\service.h">
@@ -1698,6 +1701,9 @@
     <ClInclude Include="..\..\modules\ripple_sqlite\ripple_sqlite.h">
       <Filter>1. Modules\ripple_sqlite</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\modules\ripple_leveldb\ripple_leveldb.h">
+      <Filter>1. Modules\ripple_leveldb</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\src\cpp\protobuf\src\google\protobuf\descriptor.proto">

SConstruct

@@ -101,12 +101,12 @@ INCLUDE_PATHS = [
     ]
 
 COMPILED_FILES = [
-    'src/cpp/leveldb_core.cpp',
     'Subtrees/beast/modules/beast_core/beast_core.cpp',
     'Subtrees/beast/modules/beast_basics/beast_basics.cpp',
     'modules/ripple_basics/ripple_basics.cpp',
     'modules/ripple_data/ripple_data.cpp',
     'modules/ripple_json/ripple_json.cpp',
+    'modules/ripple_leveldb/ripple_leveldb.cpp',
     'modules/ripple_websocket/ripple_websocket.cpp',
     'modules/ripple_sqlite/ripple_sqlite.c',
     'modules/ripple_app/ripple_app_pt1.cpp',

modules/ripple_data/ripple_data.h

@@ -45,14 +45,8 @@
 // VFALCO TODO try to reduce these dependencies
 #include "../ripple_basics/ripple_basics.h"
 
-//------------------------------------------------------------------------------
-
-// VFALCO TODO prepare a unity header for LevelDB
 // VFALCO TODO don't expose leveldb throughout the headers
-#include "leveldb/cache.h"
+#include "../ripple_leveldb/ripple_leveldb.h"
-#include "leveldb/filter_policy.h"
-#include "leveldb/db.h"
-#include "leveldb/write_batch.h"
 
 // VFALCO TODO figure out a good place for this file, perhaps give it some
 //         additional hierarchy via directories.

modules/ripple_leveldb/ripple_leveldb.cpp

@@ -1,14 +1,33 @@
+//------------------------------------------------------------------------------
+/*
+    Copyright (c) 2011-2013, OpenCoin, Inc.
+*/
+//==============================================================================
 
-// Unity build file for LevelDB by Vinnie Falco <vinnie.falco@gmail.com>
+// Unity build file for LevelDB
+
+#include "ripple_leveldb.h"
+
+#include "beast/modules/beast_core/system/beast_TargetPlatform.h"
+
+// Set the appropriate LevelDB platform macro based on our platform.
 //
+#if BEAST_WIN32
+ #define LEVELDB_PLATFORM_WINDOWS
+
+#elif BEAST_MAC || BEAST_IOS
+ #define OS_MACOSX
+
+// VFALCO TODO Distinguish between BEAST_BSD and BEAST_FREEBSD
+#elif BEAST_BSD
+ #define OS_FREEBSD
 
-#ifdef _WIN32
-# define LEVELDB_PLATFORM_WINDOWS
 #else
-# define LEVELDB_PLATFORM_POSIX
+ #define LEVELDB_PLATFORM_POSIX
+
 #endif
 
-#ifdef _MSC_VER
+#if BEAST_MSVC
 #pragma warning (push)
 #pragma warning (disable: 4018) // signed/unsigned mismatch
 #pragma warning (disable: 4244) // conversion, possible loss of data
@@ -67,32 +86,6 @@
 
 #endif
 
-//#include "leveldb/db/c.cc"
+#ifdef BEAST_MSVC
-//#include "leveldb/db/corruption_test.cc"
-//#include "leveldb/db/db_bench.cc"
-//#include "leveldb/db/db_test.cc"
-//#include "leveldb/db/dbformat_test.cc"
-//#include "leveldb/db/filename_test.cc"
-//#include "leveldb/db/leveldb_main.cc"
-//#include "leveldb/db/log_test.cc"
-//#include "leveldb/db/skiplist_test.cc"
-//#include "leveldb/db/version_edit_test.cc"
-//#include "leveldb/db/version_set_test.cc"
-//#include "leveldb/db/write_batch_test.cc"
-
-//#include "leveldb/util/arena_test.cc"
-//#include "leveldb/util/bloom_test.cc"
-//#include "leveldb/util/cache_test.cc"
-//#include "leveldb/util/coding_test.cc"
-//#include "leveldb/util/crc32c_test.cc"
-//#include "leveldb/util/env_test.cc"
-//#include "leveldb/util/testharness.cc"
-//#include "leveldb/util/testutil.cc"
-
-//#include "leveldb/table/filter_block_test.cc"
-//#include "leveldb/table/table_test.cc"
-
-#ifdef _MSC_VER
 #pragma warning (pop)
 #endif
-

modules/ripple_leveldb/ripple_leveldb.h

@@ -0,0 +1,15 @@
+//------------------------------------------------------------------------------
+/*
+    Copyright (c) 2011-2013, OpenCoin, Inc.
+*/
+//==============================================================================
+
+#ifndef RIPPLE_LEVELDB_RIPPLEHEADER
+#define RIPPLE_LEVELDB_RIPPLEHEADER
+
+#include "leveldb/cache.h"
+#include "leveldb/filter_policy.h"
+#include "leveldb/db.h"
+#include "leveldb/write_batch.h"
+
+#endif