diff --git a/.dir-locals.el b/.dir-locals.el deleted file mode 100644 index 4c10e984fa..0000000000 --- a/.dir-locals.el +++ /dev/null @@ -1,10 +0,0 @@ -;; Emacs - Code style and formatting settings - -;; C++ -((c++-mode - (indent-tabs-mode . t) - (tab-width . 4) - (c-basic-offset . 4))) - -;; Headers should open in C++ mode -((c-mode . ((mode . c++)))) diff --git a/Builds/VisualStudio2012/RippleD.vcxproj b/Builds/VisualStudio2012/RippleD.vcxproj index 108751893c..d9fbfe4487 100644 --- a/Builds/VisualStudio2012/RippleD.vcxproj +++ b/Builds/VisualStudio2012/RippleD.vcxproj @@ -1645,9 +1645,8 @@ - - - + + Document protoc --cpp_out=$(RepoDir)\build\proto -I=$(RepoDir)\modules\ripple_data\protocol\ "$(RepoDir)\modules\ripple_data\protocol\%(Filename)%(Extension)" @@ -1659,17 +1658,20 @@ $(RepoDir)\build\proto\%(Filename).pb.h;$(RepoDir)\build\proto\%(Filename).pb.cc $(RepoDir)\build\proto\%(Filename).pb.h;$(RepoDir)\build\proto\%(Filename).pb.cc + + - + - + + {B7F39ECD-473C-484D-BC34-31F8362506A5} diff --git a/Builds/VisualStudio2012/RippleD.vcxproj.filters b/Builds/VisualStudio2012/RippleD.vcxproj.filters index 5ed399c2a2..497e812fc4 100644 --- a/Builds/VisualStudio2012/RippleD.vcxproj.filters +++ b/Builds/VisualStudio2012/RippleD.vcxproj.filters @@ -1737,18 +1737,6 @@ - - %28Notes%29 - - - %28Notes%29 - - - [2] Build - - - [2] Build - [2] Build @@ -1770,9 +1758,25 @@ [1] Ripple\ripple_basics\json + + %28Notes%29 + + + %28Notes%29 + + + + [2] Build + + + [2] Build + - + + %28Notes%29 + + %28Notes%29 diff --git a/README.md b/README.md index 8cc68221c6..beb55e5b42 100644 --- a/README.md +++ b/README.md @@ -1,18 +1,43 @@ -Ripple - P2P Payment Network -============================ +#Ripple - P2P Payment Network -[![Build Status](https://ci.ripple.com/jenkins/buildStatus/icon?job=rippled)](https://ci.ripple.com/jenkins/job/rippled/) +##[![Build Status](https://ci.ripple.com/jenkins/buildStatus/icon?job=rippled)](https://ci.ripple.com/jenkins/job/rippled/) Some portions of this source code are currently closed source. This is the repository for Ripple's `rippled`, reference P2P network server. -Build instructions: +###Build instructions: * https://ripple.com/wiki/Rippled_build_instructions -Setup instructions: +###Setup instructions: * https://ripple.com/wiki/Rippled_setup_instructions -For more information: +### Repository Contents + +#### ./bin +Scripts and data files for Ripple integrators. + +#### ./build +Intermediate and final build outputs. + +#### ./Builds +Platform or IDE-specific project files. + +#### ./doc +Documentation and example configuration files. + +#### ./modules +Ripple source code. + +#### ./src +Legacy source code directory (contains protoc sources). + +#### ./Subtrees +External dependencies inlined into the repository as full source trees via `git subtree`. + +#### ./test +Javascript / Mocha tests. + +###For more information: * https://ripple.com * https://ripple.com/wiki diff --git a/Notes/CHANGELOG b/doc/CHANGELOG similarity index 92% rename from Notes/CHANGELOG rename to doc/CHANGELOG index a163ecedae..7a52c3c1de 100644 --- a/Notes/CHANGELOG +++ b/doc/CHANGELOG @@ -1,3 +1,5 @@ +VFALCO NOTE - This file appears to be unmaintained. + Critical protocol changes ------------------------- diff --git a/Notes/CheatSheet.md b/doc/CheatSheet.md similarity index 100% rename from Notes/CheatSheet.md rename to doc/CheatSheet.md diff --git a/Notes/CodingStyle.md b/doc/CodingStyle.md similarity index 100% rename from Notes/CodingStyle.md rename to doc/CodingStyle.md diff --git a/Doxyfile b/doc/Doxyfile similarity index 100% rename from Doxyfile rename to doc/Doxyfile diff --git a/Notes/LogoForDocumentation.png b/doc/LogoForDocumentation.png similarity index 100% rename from Notes/LogoForDocumentation.png rename to doc/LogoForDocumentation.png diff --git a/Notes/NodeStoreRefactoringCaseStudy.pdf b/doc/NodeStoreRefactoringCaseStudy.pdf similarity index 100% rename from Notes/NodeStoreRefactoringCaseStudy.pdf rename to doc/NodeStoreRefactoringCaseStudy.pdf diff --git a/ripple-example.txt b/doc/ripple-example.txt similarity index 100% rename from ripple-example.txt rename to doc/ripple-example.txt diff --git a/rippled-example.cfg b/doc/rippled-example.cfg similarity index 100% rename from rippled-example.cfg rename to doc/rippled-example.cfg diff --git a/Notes/NIKB_TODO.txt b/doc/todo/NIKB_TODO.txt similarity index 100% rename from Notes/NIKB_TODO.txt rename to doc/todo/NIKB_TODO.txt diff --git a/Notes/VFALCO_TODO.txt b/doc/todo/VFALCO_TODO.txt similarity index 100% rename from Notes/VFALCO_TODO.txt rename to doc/todo/VFALCO_TODO.txt diff --git a/validators-example.txt b/doc/validators-example.txt similarity index 100% rename from validators-example.txt rename to doc/validators-example.txt