From fec4a0ed4aac18b6c1ccbf2e23a34c6952cc63d6 Mon Sep 17 00:00:00 2001 From: Vinnie Falco Date: Fri, 3 May 2013 10:32:30 -0700 Subject: [PATCH 1/9] Add .gitattributes --- .gitattributes | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 000000000..a35e96cdf --- /dev/null +++ b/.gitattributes @@ -0,0 +1,7 @@ +# Set default behaviour, in case users don't have core.autocrlf set. +* text=auto + +# Visual Studio +*.sln text eol=crlf +*.vcproj text eol=crlf +*.vcxproj text eol=crlf From 743d335e70583a2a2d6b8dc8dc48e3c8a5ef744f Mon Sep 17 00:00:00 2001 From: Vinnie Falco Date: Fri, 3 May 2013 10:41:19 -0700 Subject: [PATCH 2/9] Change output and intermediate directories (MSVC) --- newcoin.vcxproj | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/newcoin.vcxproj b/newcoin.vcxproj index 3a1261fff..93751a58b 100644 --- a/newcoin.vcxproj +++ b/newcoin.vcxproj @@ -42,10 +42,14 @@ true rippled + $(SolutionDir)build\VisualStudio2012\$(Configuration)\ + $(SolutionDir)build\obj\VisualStudio2012\$(Configuration)\ false rippled + $(SolutionDir)build\VisualStudio2012\$(Configuration)\ + $(SolutionDir)build\obj\VisualStudio2012\$(Configuration)\ @@ -55,6 +59,8 @@ BOOST_TEST_ALTERNATIVE_INIT_API;BOOST_TEST_NO_MAIN;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0501;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) .\;..\OpenSSL\include;..\boost_1_52_0;..\protobuf\src ProgramDatabase + false + true Console @@ -79,6 +85,7 @@ true BOOST_TEST_ALTERNATIVE_INIT_API;BOOST_TEST_NO_MAIN;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0501;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) .\;..\OpenSSL\include;..\boost_1_52_0;..\protobuf\src + true Console From 1836cc0421f50aa3e6af84383fc8c6a2f0ca65f7 Mon Sep 17 00:00:00 2001 From: Vinnie Falco Date: Fri, 3 May 2013 10:54:16 -0700 Subject: [PATCH 3/9] Add project-wide property sheet for VS2012 --- RippleD.props | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 RippleD.props diff --git a/RippleD.props b/RippleD.props new file mode 100644 index 000000000..73bc6ee62 --- /dev/null +++ b/RippleD.props @@ -0,0 +1,8 @@ + + + + + + + + From 38fe3c40cd7c047b31f202eaed697373eed2ee02 Mon Sep 17 00:00:00 2001 From: Vinnie Falco Date: Fri, 3 May 2013 11:18:46 -0700 Subject: [PATCH 4/9] Add protoc-generated files to .gitignore --- .gitignore | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitignore b/.gitignore index 41a4891b8..ff81a1053 100644 --- a/.gitignore +++ b/.gitignore @@ -37,3 +37,7 @@ db/*.db-* rippled.cfg validators.txt test/config.js + +# These are generated by protoc +ripple.pb.cc +ripple.pb.h From 6ba265f89fee5ea4c42ee5a83eb738c436f79373 Mon Sep 17 00:00:00 2001 From: Vinnie Falco Date: Fri, 3 May 2013 11:23:05 -0700 Subject: [PATCH 5/9] Add .props to .gitattributes --- .gitattributes | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitattributes b/.gitattributes index a35e96cdf..59bb7e72c 100644 --- a/.gitattributes +++ b/.gitattributes @@ -5,3 +5,4 @@ *.sln text eol=crlf *.vcproj text eol=crlf *.vcxproj text eol=crlf +*.props text eol=crlf From 6ed1dd59a6531abdce94d1cd0f80be998f4a8200 Mon Sep 17 00:00:00 2001 From: Vinnie Falco Date: Fri, 3 May 2013 11:23:26 -0700 Subject: [PATCH 6/9] Fix protoc build step for VS2012 --- RippleD.props | 18 ++++++++++++++---- newcoin.vcxproj | 10 ++++++---- 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/RippleD.props b/RippleD.props index 73bc6ee62..b5c942e00 100644 --- a/RippleD.props +++ b/RippleD.props @@ -1,8 +1,18 @@ - + - + + . + $(RepoDir)\src\cpp\ripple + - - + + + $(RepoDir) + + + $(SrcDir) + + + \ No newline at end of file diff --git a/newcoin.vcxproj b/newcoin.vcxproj index 93751a58b..3e581fbee 100644 --- a/newcoin.vcxproj +++ b/newcoin.vcxproj @@ -34,9 +34,11 @@ + + @@ -335,10 +337,10 @@ Document - "../protobuf/protoc" -I=..\newcoin --cpp_out=..\newcoin\ ..\newcoin/src/cpp/ripple/ripple.proto - \code\newcoin\src\ripple.pb.h - /code/protobuf/protoc -I=..\newcoin --cpp_out=\code\newcoin\ ..\newcoin/src/cpp/ripple/ripple.proto - \code\newcoin\src\ripple.pb.h + protoc --cpp_out=$(SrcDir) -I=$(SrcDir) "$(SrcDir)\%(Filename)%(Extension)" + $(SrcDir)\%(Filename).pb.h;$(SrcDir)\%(Filename).pb.cc + protoc --cpp_out=$(SrcDir) -I=$(SrcDir) "$(SrcDir)\%(Filename)%(Extension)" + $(SrcDir)\%(Filename).pb.h;$(SrcDir)\%(Filename).pb.cc From 98b25ff3d99123670c562abd03555a6228eb378b Mon Sep 17 00:00:00 2001 From: Vinnie Falco Date: Fri, 3 May 2013 11:28:47 -0700 Subject: [PATCH 7/9] Disable VS2012 warnings regarding checked iterators and SCL --- RippleD.props | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/RippleD.props b/RippleD.props index b5c942e00..e5edb2372 100644 --- a/RippleD.props +++ b/RippleD.props @@ -6,7 +6,11 @@ $(RepoDir)\src\cpp\ripple - + + + _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + + $(RepoDir) From 738ba077fa11ce1ad9d80f61913730dc2067b9d1 Mon Sep 17 00:00:00 2001 From: Vinnie Falco Date: Fri, 3 May 2013 11:47:16 -0700 Subject: [PATCH 8/9] Add include for boost versions >=1.53 --- src/cpp/websocketpp/src/messages/data.hpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/cpp/websocketpp/src/messages/data.hpp b/src/cpp/websocketpp/src/messages/data.hpp index 2aa50455b..b59379183 100644 --- a/src/cpp/websocketpp/src/messages/data.hpp +++ b/src/cpp/websocketpp/src/messages/data.hpp @@ -36,6 +36,10 @@ #include #include #include +#include +#if BOOST_VERSION >= 105300 // 1.53.00 +#include +#endif #include #include #include From 99223f9fffb0b56f4e0563c2bf6ff22a25c1742b Mon Sep 17 00:00:00 2001 From: Vinnie Falco Date: Fri, 3 May 2013 11:48:11 -0700 Subject: [PATCH 9/9] Add ChangeTransactor to VS2012 project --- newcoin.vcxproj | 2 ++ newcoin.vcxproj.filters | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/newcoin.vcxproj b/newcoin.vcxproj index 3e581fbee..42abebc8c 100644 --- a/newcoin.vcxproj +++ b/newcoin.vcxproj @@ -115,6 +115,7 @@ + @@ -229,6 +230,7 @@ + diff --git a/newcoin.vcxproj.filters b/newcoin.vcxproj.filters index 8d4ed17ae..49dc81389 100644 --- a/newcoin.vcxproj.filters +++ b/newcoin.vcxproj.filters @@ -375,6 +375,9 @@ Source Files + + Source Files + @@ -716,6 +719,9 @@ Header Files\websocket + + Source Files +