Skip to content

Commit

Permalink
Merge pull request #1477 from jonjove/issue-1473-fix-cereal
Browse files Browse the repository at this point in the history
Replace lib/cereal folder with a submodule

Reviewed-by: MonsieurNicolas
  • Loading branch information
latobarita authored Jan 17, 2018
2 parents 4aa79d4 + 2e0db44 commit 37bd354
Show file tree
Hide file tree
Showing 52 changed files with 248 additions and 10,605 deletions.
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,6 @@
[submodule "lib/libmedida"]
path = lib/libmedida
url = https://github.com/stellar/medida.git
[submodule "lib/cereal"]
path = lib/cereal
url = https://github.com/USCiLab/cereal
6 changes: 6 additions & 0 deletions Builds/VisualStudio/stellar-core.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,7 @@
</CustomBuild>
<PostBuildEvent>
<Command>robocopy $(MSBuildProjectDirectory)\..\..\docs $(OutDir)\testdata *.cfg &gt; nul
robocopy $(MSBuildProjectDirectory)\..\..\src\history\serialize-tests $(OutDir)\testdata *.json &gt; nul
exit /b 0
</Command>
</PostBuildEvent>
Expand Down Expand Up @@ -179,6 +180,7 @@ exit /b 0
</CustomBuild>
<PostBuildEvent>
<Command>robocopy $(MSBuildProjectDirectory)\..\..\docs $(OutDir)\testdata *.cfg &gt; nul
robocopy $(MSBuildProjectDirectory)\..\..\src\history\serialize-tests $(OutDir)\testdata *.json &gt; nul
exit /b 0
</Command>
</PostBuildEvent>
Expand Down Expand Up @@ -233,6 +235,7 @@ exit /b 0
</CustomBuild>
<PostBuildEvent>
<Command>robocopy $(MSBuildProjectDirectory)\..\..\docs $(OutDir)\testdata *.cfg &gt; nul
robocopy $(MSBuildProjectDirectory)\..\..\src\history\serialize-tests $(OutDir)\testdata *.json &gt; nul
exit /b 0
</Command>
</PostBuildEvent>
Expand Down Expand Up @@ -309,6 +312,7 @@ exit /b 0
<ClCompile Include="..\..\src\history\HistoryTestsUtils.cpp" />
<ClCompile Include="..\..\src\history\InferredQuorum.cpp" />
<ClCompile Include="..\..\src\history\InferredQuorumTests.cpp" />
<ClCompile Include="..\..\src\history\SerializeTests.cpp" />
<ClCompile Include="..\..\src\history\StateSnapshot.cpp" />
<ClCompile Include="..\..\src\invariant\AccountSubEntriesCountIsValid.cpp" />
<ClCompile Include="..\..\src\invariant\AccountSubEntriesCountIsValidTests.cpp" />
Expand Down Expand Up @@ -743,6 +747,8 @@ exit /b 0
<None Include="..\..\src\database\readme.md" />
<None Include="..\..\src\herder\readme.md" />
<None Include="..\..\src\history\readme.md" />
<None Include="..\..\src\history\serialize-tests\stellar-history.livenet.15686975.json" />
<None Include="..\..\src\history\serialize-tests\stellar-history.testnet.6714239.json" />
<None Include="..\..\src\ledger\readme.md" />
<None Include="..\..\lib\xdrpp\tests\xdrtest.x" />
<CustomBuild Include="..\..\src\xdr\Stellar-ledger.x">
Expand Down
12 changes: 12 additions & 0 deletions Builds/VisualStudio/stellar-core.vcxproj.filters
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,9 @@
<Filter Include="work\tests">
<UniqueIdentifier>{e28534ec-c0fa-46c7-83f5-92058298855b}</UniqueIdentifier>
</Filter>
<Filter Include="history\tests\serialize-tests">
<UniqueIdentifier>{be18f522-3b16-4f78-9e18-85751659363e}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\src\ledger\LedgerManagerImpl.cpp">
Expand Down Expand Up @@ -825,6 +828,9 @@
<ClCompile Include="..\..\src\database\DatabaseConnectionStringTest.cpp">
<Filter>database\tests</Filter>
</ClCompile>
<ClCompile Include="..\..\src\history\SerializeTests.cpp">
<Filter>history\tests</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\src\ledger\LedgerManager.h">
Expand Down Expand Up @@ -1517,6 +1523,12 @@
<None Include="..\..\src\history\readme.md">
<Filter>history</Filter>
</None>
<None Include="..\..\src\history\serialize-tests\stellar-history.livenet.15686975.json">
<Filter>history\tests\serialize-tests</Filter>
</None>
<None Include="..\..\src\history\serialize-tests\stellar-history.testnet.6714239.json">
<Filter>history\tests\serialize-tests</Filter>
</None>
</ItemGroup>
<ItemGroup>
<CustomBuild Include="..\..\src\xdr\Stellar-ledger.x">
Expand Down
1 change: 1 addition & 0 deletions lib/cereal
Submodule cereal added at 51cbda
Loading

0 comments on commit 37bd354

Please sign in to comment.