Tidy up SQLite support into ripple_sqlite

This commit is contained in:
Vinnie Falco
2013-06-21 09:32:25 -07:00
parent bbaca7ebe9
commit cdc28c3fcf
11 changed files with 124 additions and 69 deletions

View File

@@ -12,7 +12,7 @@
</PropertyGroup>
<ItemDefinitionGroup>
<ClCompile>
<PreprocessorDefinitions>USE_LEVELDB;BOOST_TEST_ALTERNATIVE_INIT_API;BOOST_TEST_NO_MAIN;_WIN32_WINNT=0x0600;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>BOOST_TEST_ALTERNATIVE_INIT_API;BOOST_TEST_NO_MAIN;_WIN32_WINNT=0x0600;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<WarningLevel>Level3</WarningLevel>
<AdditionalIncludeDirectories>$(RepoDir);$(RepoDir)\src\cpp\protobuf\src;$(RepoDir)\src\cpp\protobuf\vsprojects;$(RepoDir)\build\proto;$(RepoDir)\Subtrees;$(RepoDir)\Subtrees\leveldb;$(RepoDir)\Subtrees\leveldb\include;$(RepoDir)\Subtrees\beast;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

View File

@@ -169,6 +169,12 @@
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\..\modules\ripple_sqlite\ripple_sqlite.c">
<WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Level4</WarningLevel>
<WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Level4</WarningLevel>
<WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Level4</WarningLevel>
<WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Level4</WarningLevel>
</ClCompile>
<ClCompile Include="..\..\modules\ripple_websocket\autosocket\ripple_AutoSocket.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
@@ -728,12 +734,6 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\modules\ripple_db\ripple_db.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>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\modules\ripple_json\json\json_reader.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
@@ -753,19 +753,6 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\modules\ripple_json\ripple_json.cpp" />
<ClCompile Include="..\..\modules\ripple_ledger\ripple_ledger.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>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\modules\ripple_net\ripple_net.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>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\src\cpp\database\sqlite3.c" />
<ClCompile Include="..\..\src\cpp\leveldb_core.cpp">
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -1511,8 +1498,6 @@
<ItemGroup>
<ClInclude Include="..\..\BeastConfig.h" />
<ClInclude Include="..\..\build\proto\ripple.pb.h" />
<ClInclude Include="..\..\database\sqlite3.h" />
<ClInclude Include="..\..\database\sqlite3ext.h" />
<ClInclude Include="..\..\modules\ripple_app\ripple_app.h" />
<ClInclude Include="..\..\modules\ripple_basics\containers\ripple_KeyCache.h" />
<ClInclude Include="..\..\modules\ripple_basics\containers\ripple_RangeSet.h" />
@@ -1561,7 +1546,6 @@
<ClInclude Include="..\..\modules\ripple_data\ripple_data.h" />
<ClInclude Include="..\..\modules\ripple_data\utility\ripple_JSONCache.h" />
<ClInclude Include="..\..\modules\ripple_data\utility\ripple_UptimeTimerAdapter.h" />
<ClInclude Include="..\..\modules\ripple_db\ripple_db.h" />
<ClInclude Include="..\..\modules\ripple_json\json\json_autolink.h" />
<ClInclude Include="..\..\modules\ripple_json\json\json_batchallocator.h" />
<ClInclude Include="..\..\modules\ripple_json\json\json_config.h" />
@@ -1571,8 +1555,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_ledger\ripple_ledger.h" />
<ClInclude Include="..\..\modules\ripple_net\ripple_net.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" />
<ClInclude Include="..\..\src\cpp\protobuf\src\google\protobuf\descriptor.h">

View File

@@ -7,9 +7,6 @@
<Filter Include="0. Third Party Code\beast">
<UniqueIdentifier>{290b7b39-a4e6-4b8b-b464-d1e458562fdd}</UniqueIdentifier>
</Filter>
<Filter Include="0. Third Party Code\SQLite">
<UniqueIdentifier>{60c3631e-8855-4a61-bdd3-9892d96242d5}</UniqueIdentifier>
</Filter>
<Filter Include="0. Third Party Code\LevelDB">
<UniqueIdentifier>{83e0c1a9-5ac4-4c68-ba62-45e24bf60c85}</UniqueIdentifier>
</Filter>
@@ -82,15 +79,6 @@
<Filter Include="2. %28Unused%29">
<UniqueIdentifier>{786657f9-b1b3-483c-a8e6-863cc2e02eb8}</UniqueIdentifier>
</Filter>
<Filter Include="2. %28Unused%29\ripple_net">
<UniqueIdentifier>{7f76ce57-c428-487e-97a0-979c0990a81d}</UniqueIdentifier>
</Filter>
<Filter Include="2. %28Unused%29\ripple_db">
<UniqueIdentifier>{a5190241-c5bc-4e23-8ef1-6adf757c75e3}</UniqueIdentifier>
</Filter>
<Filter Include="2. %28Unused%29\ripple_ledger">
<UniqueIdentifier>{b6175f9a-7d46-4b57-877f-f58b0b3bba89}</UniqueIdentifier>
</Filter>
<Filter Include="2. %28Unused%29\ripple_client">
<UniqueIdentifier>{97c96b68-70fd-4679-89fc-c1c8c87c265e}</UniqueIdentifier>
</Filter>
@@ -145,11 +133,11 @@
<Filter Include="1. Modules\ripple_websocket\autosocket">
<UniqueIdentifier>{9cd9dfb0-daa3-474e-b1c7-b048f5b85e71}</UniqueIdentifier>
</Filter>
<Filter Include="1. Modules\ripple_sqlite">
<UniqueIdentifier>{6bbe236f-79ff-4e30-928c-bf5f302b3a21}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\src\cpp\database\sqlite3.c">
<Filter>0. Third Party Code\SQLite</Filter>
</ClCompile>
<ClCompile Include="..\..\src\cpp\leveldb_core.cpp">
<Filter>0. Third Party Code\LevelDB</Filter>
</ClCompile>
@@ -306,21 +294,12 @@
<ClCompile Include="..\..\modules\ripple_basics\ripple_basics.cpp">
<Filter>1. Modules\ripple_basics</Filter>
</ClCompile>
<ClCompile Include="..\..\modules\ripple_ledger\ripple_ledger.cpp">
<Filter>2. %28Unused%29\ripple_ledger</Filter>
</ClCompile>
<ClCompile Include="..\..\modules\ripple_client\ripple_client.cpp">
<Filter>2. %28Unused%29\ripple_client</Filter>
</ClCompile>
<ClCompile Include="..\..\src\cpp\ripple\ChangeTransactor.cpp">
<Filter>1. Modules\ripple_app\_unfactored\transactions</Filter>
</ClCompile>
<ClCompile Include="..\..\modules\ripple_db\ripple_db.cpp">
<Filter>2. %28Unused%29\ripple_db</Filter>
</ClCompile>
<ClCompile Include="..\..\modules\ripple_net\ripple_net.cpp">
<Filter>2. %28Unused%29\ripple_net</Filter>
</ClCompile>
<ClCompile Include="..\..\src\cpp\ripple\Interpreter.cpp">
<Filter>1. Modules\ripple_app\_unfactored\contracts</Filter>
</ClCompile>
@@ -903,6 +882,9 @@
<ClCompile Include="..\..\src\cpp\ripple\ripple_SqliteDatabase.cpp">
<Filter>1. Modules\ripple_app\_unfactored\db</Filter>
</ClCompile>
<ClCompile Include="..\..\modules\ripple_sqlite\ripple_sqlite.c">
<Filter>1. Modules\ripple_sqlite</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\src\cpp\protobuf\src\google\protobuf\service.h">
@@ -1073,21 +1055,12 @@
<ClInclude Include="..\..\modules\ripple_basics\ripple_basics.h">
<Filter>1. Modules\ripple_basics</Filter>
</ClInclude>
<ClInclude Include="..\..\modules\ripple_ledger\ripple_ledger.h">
<Filter>2. %28Unused%29\ripple_ledger</Filter>
</ClInclude>
<ClInclude Include="..\..\modules\ripple_client\ripple_client.h">
<Filter>2. %28Unused%29\ripple_client</Filter>
</ClInclude>
<ClInclude Include="..\..\src\cpp\ripple\ChangeTransactor.h">
<Filter>1. Modules\ripple_app\_unfactored\transactions</Filter>
</ClInclude>
<ClInclude Include="..\..\modules\ripple_db\ripple_db.h">
<Filter>2. %28Unused%29\ripple_db</Filter>
</ClInclude>
<ClInclude Include="..\..\modules\ripple_net\ripple_net.h">
<Filter>2. %28Unused%29\ripple_net</Filter>
</ClInclude>
<ClInclude Include="..\..\src\cpp\ripple\Interpreter.h">
<Filter>1. Modules\ripple_app\_unfactored\contracts</Filter>
</ClInclude>
@@ -1503,12 +1476,6 @@
<ClInclude Include="..\..\modules\ripple_basics\utility\ripple_CountedObject.h">
<Filter>1. Modules\ripple_basics\utility</Filter>
</ClInclude>
<ClInclude Include="..\..\database\sqlite3.h">
<Filter>0. Third Party Code\SQLite</Filter>
</ClInclude>
<ClInclude Include="..\..\database\sqlite3ext.h">
<Filter>0. Third Party Code\SQLite</Filter>
</ClInclude>
<ClInclude Include="..\..\build\proto\ripple.pb.h">
<Filter>1. Modules\ripple_data\protocol</Filter>
</ClInclude>
@@ -1728,6 +1695,9 @@
<ClInclude Include="..\..\src\cpp\ripple\ripple_Database.h">
<Filter>1. Modules\ripple_app\_unfactored\db</Filter>
</ClInclude>
<ClInclude Include="..\..\modules\ripple_sqlite\ripple_sqlite.h">
<Filter>1. Modules\ripple_sqlite</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="..\..\src\cpp\protobuf\src\google\protobuf\descriptor.proto">