From c5be9b96debcbe77859d2249832d4edc27292d69 Mon Sep 17 00:00:00 2001 From: mehrdadn Date: Sat, 16 Jul 2016 13:02:51 -0700 Subject: [PATCH] Visual Studio - Project cleanup, warning suppression, and removal of zlib dependency (#272) * windows_intermodule_singleton warning * Fix some warnings from Visual Studio * More Visual Studio project changes * Replace zlib Visual Studio project with stub; it's not needed * Un-enable link-time code generation --- Ray.sln | 15 - src/ipc.h | 3 +- thirdparty/download_thirdparty.bat | 1 - .../patches/windows/grpc-projects.patch | 296 +++++++++++------ .../patches/windows/protobuf-projects.patch | 307 ++---------------- vsprojects/base.props | 4 +- vsprojects/ray.vcxproj | 14 +- vsprojects/ray.vcxproj.filters | 3 + vsprojects/zstub.c | 16 + 9 files changed, 245 insertions(+), 414 deletions(-) create mode 100644 vsprojects/zstub.c diff --git a/Ray.sln b/Ray.sln index 55858c6fd..1e6be6a34 100644 --- a/Ray.sln +++ b/Ray.sln @@ -8,7 +8,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ray", "vsprojects\ray.vcxpr {29D16885-7228-4C31-81ED-5F9187C7F2A9} = {29D16885-7228-4C31-81ED-5F9187C7F2A9} {DB653289-E887-4B13-AC08-EE3EAC1F34C9} = {DB653289-E887-4B13-AC08-EE3EAC1F34C9} {C187A093-A0FE-489D-A40A-6E33DE0F9FEB} = {C187A093-A0FE-489D-A40A-6E33DE0F9FEB} - {FBADE9E3-6A3F-36D3-D676-C1B808451DD7} = {FBADE9E3-6A3F-36D3-D676-C1B808451DD7} {10E7D8E8-0EEB-46EA-A58D-F9236B5960AD} = {10E7D8E8-0EEB-46EA-A58D-F9236B5960AD} EndProjectSection EndProject @@ -49,11 +48,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "grpc++", "thirdparty\grpc\v lib = "True" EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "z", "thirdparty\grpc\vsprojects\vcxproj\z\z.vcxproj", "{FBADE9E3-6A3F-36D3-D676-C1B808451DD7}" - ProjectSection(myProperties) = preProject - lib = "True" - EndProjectSection -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "GRPC", "GRPC", "{42700964-831F-4B47-B556-75CBCCA48D8E}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Arrow", "Arrow", "{C9B26FA8-8665-4806-872F-347ACB231CAD}" @@ -158,14 +152,6 @@ Global {C187A093-A0FE-489D-A40A-6E33DE0F9FEB}.Release|Win32.Build.0 = Release|Win32 {C187A093-A0FE-489D-A40A-6E33DE0F9FEB}.Release|x64.ActiveCfg = Release|x64 {C187A093-A0FE-489D-A40A-6E33DE0F9FEB}.Release|x64.Build.0 = Release|x64 - {FBADE9E3-6A3F-36D3-D676-C1B808451DD7}.Debug|Win32.ActiveCfg = Debug|Win32 - {FBADE9E3-6A3F-36D3-D676-C1B808451DD7}.Debug|Win32.Build.0 = Debug|Win32 - {FBADE9E3-6A3F-36D3-D676-C1B808451DD7}.Debug|x64.ActiveCfg = Debug|x64 - {FBADE9E3-6A3F-36D3-D676-C1B808451DD7}.Debug|x64.Build.0 = Debug|x64 - {FBADE9E3-6A3F-36D3-D676-C1B808451DD7}.Release|Win32.ActiveCfg = Release|Win32 - {FBADE9E3-6A3F-36D3-D676-C1B808451DD7}.Release|Win32.Build.0 = Release|Win32 - {FBADE9E3-6A3F-36D3-D676-C1B808451DD7}.Release|x64.ActiveCfg = Release|x64 - {FBADE9E3-6A3F-36D3-D676-C1B808451DD7}.Release|x64.Build.0 = Release|x64 {10E7D8E8-0EEB-46EA-A58D-F9236B5960AD}.Debug|Win32.ActiveCfg = Debug|Win32 {10E7D8E8-0EEB-46EA-A58D-F9236B5960AD}.Debug|Win32.Build.0 = Debug|Win32 {10E7D8E8-0EEB-46EA-A58D-F9236B5960AD}.Debug|x64.ActiveCfg = Debug|x64 @@ -230,7 +216,6 @@ Global {B23D3D1A-9438-4EDA-BEB6-9A0A03D17792} = {42700964-831F-4B47-B556-75CBCCA48D8E} {29D16885-7228-4C31-81ED-5F9187C7F2A9} = {42700964-831F-4B47-B556-75CBCCA48D8E} {C187A093-A0FE-489D-A40A-6E33DE0F9FEB} = {42700964-831F-4B47-B556-75CBCCA48D8E} - {FBADE9E3-6A3F-36D3-D676-C1B808451DD7} = {42700964-831F-4B47-B556-75CBCCA48D8E} {10E7D8E8-0EEB-46EA-A58D-F9236B5960AD} = {C9B26FA8-8665-4806-872F-347ACB231CAD} {5B5857E1-64E2-4CED-A12E-45E1B3880496} = {ACA43A22-BCCD-487F-B92F-8EB0D6FF1DA4} {ACA43A22-BCCD-487F-B92F-8EB0D6FF1DA4} = {C9B26FA8-8665-4806-872F-347ACB231CAD} diff --git a/src/ipc.h b/src/ipc.h index 793727bbc..29e09a788 100644 --- a/src/ipc.h +++ b/src/ipc.h @@ -5,11 +5,10 @@ #include #if defined(WIN32) || defined(_WIN32) +#include namespace boost { namespace interprocess { namespace ipcdetail { - template - class windows_intermodule_singleton; struct windows_bootstamp; template<> class windows_intermodule_singleton { diff --git a/thirdparty/download_thirdparty.bat b/thirdparty/download_thirdparty.bat index eab56949d..b2dbf231a 100644 --- a/thirdparty/download_thirdparty.bat +++ b/thirdparty/download_thirdparty.bat @@ -7,7 +7,6 @@ git -C "arrow" submodule update --init git -C "grpc" submodule update --init "third_party/protobuf" git -C "grpc" submodule update --init "third_party/nanopb" - git -C "grpc" submodule update --init "third_party/zlib" Call :GitApply "grpc" "%CD%/patches/grpc-source.patch" Call :GitApply "grpc" "%CD%/patches/windows/grpc-projects.patch" Call :GitApply "grpc/third_party/protobuf" "%CD%/patches/windows/protobuf-projects.patch" diff --git a/thirdparty/patches/windows/grpc-projects.patch b/thirdparty/patches/windows/grpc-projects.patch index 5ccc11bb7..e0fb2aa9b 100644 --- a/thirdparty/patches/windows/grpc-projects.patch +++ b/thirdparty/patches/windows/grpc-projects.patch @@ -21,10 +21,10 @@ index c0792e1..3299131 diff --git a/vsprojects/protobuf.props b/vsprojects/protobuf.props -index b1de8af..1dad9ff +index b1de8af..b63b603 --- a/vsprojects/protobuf.props +++ b/vsprojects/protobuf.props -@@ -1 +1,15 @@ +@@ -1 +1,26 @@ - libprotobuf.lib;%(AdditionalDependencies) $(SolutionDir)\..\third_party\protobuf\cmake\$(Configuration);%(AdditionalLibraryDirectories) \ No newline at end of file + @@ -35,12 +35,23 @@ index b1de8af..1dad9ff + $(SolutionDir)build\$(Platform)\$(Configuration)\$(MSBuildProjectName)\ + $(SolutionDir)build\$(Platform)\$(Configuration)\ + ++ ++ true ++ + ++ ++ _CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) ++ $(ProjectDir)..\src;%(AdditionalIncludeDirectories) ++ true ++ false ++ 4506;%(DisableSpecificWarnings) ++ + + $(SolutionDir)\..\third_party\protobuf\cmake\$(Configuration);%(AdditionalLibraryDirectories) ++ true ++ Console + + -+ + \ No newline at end of file diff --git a/vsprojects/protoc.props b/vsprojects/protoc.props @@ -67,7 +78,7 @@ index 1bdc071..87a4bf4 + \ No newline at end of file diff --git a/vsprojects/vcxproj/gpr/gpr.vcxproj b/vsprojects/vcxproj/gpr/gpr.vcxproj -index db8594e..623f3d5 +index db8594e..d2ddaff --- a/vsprojects/vcxproj/gpr/gpr.vcxproj +++ b/vsprojects/vcxproj/gpr/gpr.vcxproj @@ -21,7 +21,6 @@ @@ -78,7 +89,15 @@ index db8594e..623f3d5 -@@ -52,16 +51,10 @@ +@@ -44,7 +43,6 @@ + + StaticLibrary + false +- true + Unicode + + +@@ -52,16 +50,10 @@ @@ -97,7 +116,7 @@ index db8594e..623f3d5 NotUsing -@@ -69,7 +62,6 @@ +@@ -69,7 +61,6 @@ Disabled WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true @@ -105,7 +124,7 @@ index db8594e..623f3d5 true None false -@@ -88,7 +80,6 @@ +@@ -88,7 +79,6 @@ Disabled WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true @@ -113,7 +132,7 @@ index db8594e..623f3d5 true None false -@@ -109,7 +100,6 @@ +@@ -109,7 +99,6 @@ true true true @@ -121,7 +140,7 @@ index db8594e..623f3d5 true None false -@@ -132,7 +122,6 @@ +@@ -132,7 +121,6 @@ true true true @@ -129,7 +148,7 @@ index db8594e..623f3d5 true None false -@@ -147,152 +136,152 @@ +@@ -147,152 +135,152 @@ @@ -786,7 +805,7 @@ index 9bab373..d13e9c4 diff --git a/vsprojects/vcxproj/grpc++/grpc++.vcxproj b/vsprojects/vcxproj/grpc++/grpc++.vcxproj -index cb9e41e..05bbf99 +index cb9e41e..f3b8b27 --- a/vsprojects/vcxproj/grpc++/grpc++.vcxproj +++ b/vsprojects/vcxproj/grpc++/grpc++.vcxproj @@ -37,7 +37,6 @@ @@ -797,7 +816,23 @@ index cb9e41e..05bbf99 -@@ -79,16 +78,10 @@ +@@ -60,7 +59,6 @@ + + StaticLibrary + false +- true + Unicode + + +@@ -71,7 +69,6 @@ + + StaticLibrary + false +- true + Unicode + + +@@ -79,16 +76,10 @@ @@ -816,7 +851,7 @@ index cb9e41e..05bbf99 NotUsing -@@ -96,7 +89,6 @@ +@@ -96,7 +87,6 @@ Disabled WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true @@ -824,7 +859,7 @@ index cb9e41e..05bbf99 true None false -@@ -115,7 +107,6 @@ +@@ -115,7 +105,6 @@ Disabled WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true @@ -832,7 +867,7 @@ index cb9e41e..05bbf99 true None false -@@ -136,7 +127,6 @@ +@@ -136,7 +125,6 @@ true true true @@ -840,7 +875,7 @@ index cb9e41e..05bbf99 true None false -@@ -159,7 +149,6 @@ +@@ -159,7 +147,6 @@ true true true @@ -848,7 +883,7 @@ index cb9e41e..05bbf99 true None false -@@ -180,7 +169,6 @@ +@@ -180,7 +167,6 @@ Disabled WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true @@ -856,7 +891,7 @@ index cb9e41e..05bbf99 true None false -@@ -199,7 +187,6 @@ +@@ -199,7 +185,6 @@ Disabled WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true @@ -864,7 +899,7 @@ index cb9e41e..05bbf99 true None false -@@ -220,7 +207,6 @@ +@@ -220,7 +205,6 @@ true true true @@ -872,7 +907,7 @@ index cb9e41e..05bbf99 true None false -@@ -243,7 +229,6 @@ +@@ -243,7 +227,6 @@ true true true @@ -880,7 +915,7 @@ index cb9e41e..05bbf99 true None false -@@ -258,184 +243,184 @@ +@@ -258,184 +241,187 @@ @@ -987,7 +1022,7 @@ index cb9e41e..05bbf99 + + + -+ ++ true + + + @@ -996,7 +1031,7 @@ index cb9e41e..05bbf99 + + + -+ ++ true + + + @@ -1016,7 +1051,7 @@ index cb9e41e..05bbf99 + + + -+ ++ true + + + @@ -1130,6 +1165,7 @@ index cb9e41e..05bbf99 - + ++ true - + @@ -1151,6 +1187,7 @@ index cb9e41e..05bbf99 - + ++ true - + @@ -1178,6 +1215,7 @@ index cb9e41e..05bbf99 - + ++ true - + @@ -1205,10 +1243,10 @@ index cb9e41e..05bbf99 diff --git a/vsprojects/vcxproj/grpc++/grpc++.vcxproj.filters b/vsprojects/vcxproj/grpc++/grpc++.vcxproj.filters -index a905118..22bde52 +index a905118..cfea49a --- a/vsprojects/vcxproj/grpc++/grpc++.vcxproj.filters +++ b/vsprojects/vcxproj/grpc++/grpc++.vcxproj.filters -@@ -1,422 +1,422 @@ +@@ -1,426 +1,411 @@ @@ -1253,71 +1291,68 @@ index a905118..22bde52 src\cpp\client - -+ - src\cpp\client - -- + src\cpp\client -- +- + src\cpp\client -- +- + src\cpp\client +- +- src\cpp\client +- - +- src\cpp\common +- +- + src\cpp\common -- +- + src\cpp\common -- +- + src\cpp\common -- -+ - src\cpp\common - - +- src\cpp\server +- +- + src\cpp\server -- +- + src\cpp\server -- +- + src\cpp\server -- +- + src\cpp\server -- +- + src\cpp\server -- +- + src\cpp\server -- +- + src\cpp\server -- -+ - src\cpp\server - - -+ ++ src\cpp\server - @@ -1344,6 +1379,7 @@ index a905118..22bde52 + src\cpp\codegen ++ - @@ -1367,9 +1403,8 @@ index a905118..22bde52 include\grpc++ - -+ - include\grpc++ - +- include\grpc++ +- - + include\grpc++\generic @@ -1395,15 +1430,14 @@ index a905118..22bde52 include\grpc++\impl\codegen - +- include\grpc++\impl +- +- + include\grpc++\impl -- -+ - include\grpc++\impl - - -+ ++ include\grpc++\impl - @@ -1471,19 +1505,18 @@ index a905118..22bde52 include\grpc++\security - +- include\grpc++ +- +- + include\grpc++ -- +- + include\grpc++ -- -+ - include\grpc++ - - -+ ++ include\grpc++ - @@ -1738,6 +1771,9 @@ index a905118..22bde52 + include\grpc\impl\codegen ++ ++ ++ - @@ -1769,8 +1805,20 @@ index a905118..22bde52 src\cpp\server +- + + + {82445414-24cd-8198-1fe1-4267c3f3df00} +@@ -477,5 +462,4 @@ + {f842537a-2bf1-1ec3-b495-7d62c64a1c06} + + +- +- ++ +\ No newline at end of file diff --git a/vsprojects/vcxproj/grpc/grpc.vcxproj b/vsprojects/vcxproj/grpc/grpc.vcxproj -index a9e96da..f5b9a47 +index a9e96da..d95a974 --- a/vsprojects/vcxproj/grpc/grpc.vcxproj +++ b/vsprojects/vcxproj/grpc/grpc.vcxproj @@ -1,6 +1,6 @@ @@ -1789,7 +1837,23 @@ index a9e96da..f5b9a47 -@@ -80,19 +79,17 @@ +@@ -61,7 +60,6 @@ + + StaticLibrary + false +- true + Unicode + + +@@ -72,7 +70,6 @@ + + StaticLibrary + false +- true + Unicode + + +@@ -80,19 +77,17 @@ @@ -1811,7 +1875,7 @@ index a9e96da..f5b9a47 static Release static -@@ -105,7 +102,6 @@ +@@ -105,7 +100,6 @@ Disabled WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true @@ -1819,7 +1883,7 @@ index a9e96da..f5b9a47 true None false -@@ -124,7 +120,6 @@ +@@ -124,7 +118,6 @@ Disabled WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true @@ -1827,7 +1891,7 @@ index a9e96da..f5b9a47 true None false -@@ -145,7 +140,6 @@ +@@ -145,7 +138,6 @@ true true true @@ -1835,7 +1899,7 @@ index a9e96da..f5b9a47 true None false -@@ -168,7 +162,6 @@ +@@ -168,7 +160,6 @@ true true true @@ -1843,7 +1907,7 @@ index a9e96da..f5b9a47 true None false -@@ -189,7 +182,6 @@ +@@ -189,7 +180,6 @@ Disabled WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true @@ -1851,7 +1915,7 @@ index a9e96da..f5b9a47 true None false -@@ -208,7 +200,6 @@ +@@ -208,7 +198,6 @@ Disabled WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true @@ -1859,7 +1923,7 @@ index a9e96da..f5b9a47 true None false -@@ -229,7 +220,6 @@ +@@ -229,7 +218,6 @@ true true true @@ -1867,7 +1931,7 @@ index a9e96da..f5b9a47 true None false -@@ -252,7 +242,6 @@ +@@ -252,7 +240,6 @@ true true true @@ -1875,7 +1939,7 @@ index a9e96da..f5b9a47 true None false -@@ -267,592 +256,595 @@ +@@ -267,570 +254,570 @@ @@ -2817,12 +2881,8 @@ index a9e96da..f5b9a47 + {B23D3D1A-9438-4EDA-BEB6-9A0A03D17792} -+ -+ {fbade9e3-6a3f-36d3-d676-c1b808451dd7} -+ - - +@@ -839,20 +826,20 @@ @@ -2833,7 +2893,7 @@ index a9e96da..f5b9a47 + + + -+ ++ @@ -2853,7 +2913,7 @@ index a9e96da..f5b9a47 diff --git a/vsprojects/vcxproj/grpc/grpc.vcxproj.filters b/vsprojects/vcxproj/grpc/grpc.vcxproj.filters -index be77e53..7c8ea36 +index be77e53..ba69b28 --- a/vsprojects/vcxproj/grpc/grpc.vcxproj.filters +++ b/vsprojects/vcxproj/grpc/grpc.vcxproj.filters @@ -1,1121 +1,1121 @@ @@ -4349,19 +4409,17 @@ index be77e53..7c8ea36 src\core\ext\census -@@ -1299,5 +1299,7 @@ +@@ -1299,5 +1299,8 @@ {93d6596d-330c-1d27-6f84-3c840e57869e} -- -- + + + -+ -\ No newline at end of file + + diff --git a/vsprojects/vcxproj/grpc_cpp_plugin/grpc_cpp_plugin.vcxproj b/vsprojects/vcxproj/grpc_cpp_plugin/grpc_cpp_plugin.vcxproj -index a521414..1779af5 +index a521414..5415b24 --- a/vsprojects/vcxproj/grpc_cpp_plugin/grpc_cpp_plugin.vcxproj +++ b/vsprojects/vcxproj/grpc_cpp_plugin/grpc_cpp_plugin.vcxproj @@ -21,7 +21,6 @@ @@ -4372,7 +4430,15 @@ index a521414..1779af5 -@@ -52,17 +51,11 @@ +@@ -44,7 +43,6 @@ + + Application + false +- true + Unicode + + +@@ -52,17 +50,11 @@ @@ -4393,7 +4459,7 @@ index a521414..1779af5 NotUsing -@@ -70,7 +63,6 @@ +@@ -70,7 +62,6 @@ Disabled WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true @@ -4401,7 +4467,7 @@ index a521414..1779af5 true None false -@@ -89,7 +81,6 @@ +@@ -89,7 +80,6 @@ Disabled WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true @@ -4409,7 +4475,7 @@ index a521414..1779af5 true None false -@@ -110,7 +101,6 @@ +@@ -110,7 +100,6 @@ true true true @@ -4417,7 +4483,7 @@ index a521414..1779af5 true None false -@@ -133,7 +123,6 @@ +@@ -133,7 +122,6 @@ true true true @@ -4425,7 +4491,7 @@ index a521414..1779af5 true None false -@@ -148,13 +137,16 @@ +@@ -148,13 +136,16 @@ @@ -4458,7 +4524,7 @@ index 421c308..bfa41be diff --git a/vsprojects/vcxproj/grpc_plugin_support/grpc_plugin_support.vcxproj b/vsprojects/vcxproj/grpc_plugin_support/grpc_plugin_support.vcxproj -index 9828b8b..ac30116 +index 9828b8b..bc4716b --- a/vsprojects/vcxproj/grpc_plugin_support/grpc_plugin_support.vcxproj +++ b/vsprojects/vcxproj/grpc_plugin_support/grpc_plugin_support.vcxproj @@ -21,7 +21,6 @@ @@ -4469,7 +4535,15 @@ index 9828b8b..ac30116 -@@ -52,17 +51,11 @@ +@@ -44,7 +43,6 @@ + + StaticLibrary + false +- true + Unicode + + +@@ -52,17 +50,11 @@ @@ -4490,7 +4564,7 @@ index 9828b8b..ac30116 NotUsing -@@ -70,7 +63,6 @@ +@@ -70,7 +62,6 @@ Disabled WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true @@ -4498,7 +4572,7 @@ index 9828b8b..ac30116 true None false -@@ -89,7 +81,6 @@ +@@ -89,7 +80,6 @@ Disabled WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true @@ -4506,7 +4580,7 @@ index 9828b8b..ac30116 true None false -@@ -110,7 +101,6 @@ +@@ -110,7 +100,6 @@ true true true @@ -4514,7 +4588,7 @@ index 9828b8b..ac30116 true None false -@@ -133,7 +123,6 @@ +@@ -133,7 +122,6 @@ true true true @@ -4522,7 +4596,7 @@ index 9828b8b..ac30116 true None false -@@ -148,37 +137,37 @@ +@@ -148,37 +136,37 @@ @@ -4685,7 +4759,7 @@ index 27eb935..207944a diff --git a/vsprojects/vcxproj/z/z.vcxproj b/vsprojects/vcxproj/z/z.vcxproj -index 4505dfa..8ad76d1 +index 4505dfa..92b378d --- a/vsprojects/vcxproj/z/z.vcxproj +++ b/vsprojects/vcxproj/z/z.vcxproj @@ -21,7 +21,6 @@ @@ -4696,7 +4770,15 @@ index 4505dfa..8ad76d1 -@@ -52,16 +51,10 @@ +@@ -44,7 +43,6 @@ + + StaticLibrary + false +- true + Unicode + + +@@ -52,16 +50,10 @@ @@ -4715,7 +4797,7 @@ index 4505dfa..8ad76d1 NotUsing -@@ -69,7 +62,6 @@ +@@ -69,7 +61,6 @@ Disabled WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true @@ -4723,7 +4805,7 @@ index 4505dfa..8ad76d1 true None false -@@ -88,7 +80,6 @@ +@@ -88,7 +79,6 @@ Disabled WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true @@ -4731,7 +4813,7 @@ index 4505dfa..8ad76d1 true None false -@@ -109,7 +100,6 @@ +@@ -109,7 +99,6 @@ true true true @@ -4739,7 +4821,7 @@ index 4505dfa..8ad76d1 true None false -@@ -132,7 +122,6 @@ +@@ -132,7 +121,6 @@ true true true @@ -4747,7 +4829,7 @@ index 4505dfa..8ad76d1 true None false -@@ -147,48 +136,48 @@ +@@ -147,48 +135,48 @@ diff --git a/thirdparty/patches/windows/protobuf-projects.patch b/thirdparty/patches/windows/protobuf-projects.patch index 07fca6cfe..f1a95df9c 100644 --- a/thirdparty/patches/windows/protobuf-projects.patch +++ b/thirdparty/patches/windows/protobuf-projects.patch @@ -1,9 +1,21 @@ +diff --git a/src/google/protobuf/compiler/js/js_generator.cc b/src/google/protobuf/compiler/js/js_generator.cc +index 3de61e8..ea83c82 +--- a/src/google/protobuf/compiler/js/js_generator.cc ++++ b/src/google/protobuf/compiler/js/js_generator.cc +@@ -488,6 +488,7 @@ string JSByteGetterSuffix(BytesMode bytes_mode) { + return "U8"; + default: + assert(false); ++ return NULL; + } + } + diff --git a/vsprojects/libprotobuf.vcxproj b/vsprojects/libprotobuf.vcxproj new file -index e69de29..a3267ed +index 0000000..73f9bea --- /dev/null +++ b/vsprojects/libprotobuf.vcxproj -@@ -0,0 +1,207 @@ +@@ -0,0 +1,116 @@ + + + @@ -27,104 +39,17 @@ index e69de29..a3267ed + + {07ABD431-1515-4140-932E-E8C150FF7D1A} + Win32Proj -+ 8.1 + + -+ ++ + StaticLibrary -+ true -+ v140 -+ -+ -+ StaticLibrary -+ false -+ v140 -+ -+ -+ StaticLibrary -+ true -+ v140 -+ -+ -+ StaticLibrary -+ false + v140 + + -+ -+ -+ -+ -+ ++ + + + -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ true -+ -+ -+ true -+ -+ -+ -+ -+ -+ _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) -+ Level3 -+ ProgramDatabase -+ Disabled -+ $(ProjectDir)..\src;%(AdditionalIncludeDirectories) -+ true -+ false -+ -+ -+ MachineX86 -+ true -+ Console -+ -+ -+ -+ -+ _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) -+ Level3 -+ ProgramDatabase -+ $(ProjectDir)..\src;%(AdditionalIncludeDirectories) -+ true -+ -+ -+ MachineX86 -+ true -+ Console -+ true -+ true -+ -+ -+ -+ -+ $(ProjectDir)..\src;%(AdditionalIncludeDirectories) -+ true -+ false -+ -+ -+ -+ -+ $(ProjectDir)..\src;%(AdditionalIncludeDirectories) -+ true -+ -+ + + + @@ -135,7 +60,6 @@ index e69de29..a3267ed + + + -+ + + + @@ -184,7 +108,6 @@ index e69de29..a3267ed + + + -+ + + + @@ -208,16 +131,14 @@ index e69de29..a3267ed + + + -+ -+ + \ No newline at end of file diff --git a/vsprojects/libprotoc.vcxproj b/vsprojects/libprotoc.vcxproj new file -index e69de29..af4a242 +index 0000000..ee5aeee --- /dev/null +++ b/vsprojects/libprotoc.vcxproj -@@ -0,0 +1,223 @@ +@@ -0,0 +1,134 @@ + + + @@ -241,104 +162,17 @@ index e69de29..af4a242 + + {2B4F3BB4-ADDE-4CB7-B832-C964DE4E0087} + Win32Proj -+ 8.1 + + -+ ++ + StaticLibrary -+ true -+ v140 -+ -+ -+ StaticLibrary -+ false -+ v140 -+ -+ -+ StaticLibrary -+ true -+ v140 -+ -+ -+ StaticLibrary -+ false + v140 + + -+ -+ -+ -+ -+ ++ + + + -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ true -+ -+ -+ true -+ -+ -+ -+ -+ -+ WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) -+ Level3 -+ ProgramDatabase -+ Disabled -+ $(ProjectDir)..\src;%(AdditionalIncludeDirectories) -+ true -+ false -+ -+ -+ MachineX86 -+ true -+ Console -+ -+ -+ -+ -+ WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) -+ Level3 -+ ProgramDatabase -+ $(ProjectDir)..\src;%(AdditionalIncludeDirectories) -+ true -+ -+ -+ MachineX86 -+ true -+ Console -+ true -+ true -+ -+ -+ -+ -+ $(ProjectDir)..\src;%(AdditionalIncludeDirectories) -+ true -+ false -+ -+ -+ -+ -+ $(ProjectDir)..\src;%(AdditionalIncludeDirectories) -+ true -+ -+ + + + @@ -438,13 +272,11 @@ index e69de29..af4a242 + + + -+ -+ + \ No newline at end of file diff --git a/vsprojects/protobuf.sln b/vsprojects/protobuf.sln new file -index e69de29..27d6b04 +index 0000000..27d6b04 --- /dev/null +++ b/vsprojects/protobuf.sln @@ -0,0 +1,48 @@ @@ -498,10 +330,10 @@ index e69de29..27d6b04 +EndGlobal diff --git a/vsprojects/protoc.vcxproj b/vsprojects/protoc.vcxproj new file -index e69de29..971fab7 +index 0000000..5b0afa9 --- /dev/null +++ b/vsprojects/protoc.vcxproj -@@ -0,0 +1,136 @@ +@@ -0,0 +1,47 @@ + + + @@ -525,104 +357,17 @@ index e69de29..971fab7 + + {DB653289-E887-4B13-AC08-EE3EAC1F34C9} + Win32Proj -+ 8.1 + + -+ ++ + Application -+ true -+ v140 -+ -+ -+ Application -+ false -+ v140 -+ -+ -+ Application -+ true -+ v140 -+ -+ -+ Application -+ false + v140 + + -+ -+ -+ -+ -+ ++ + + + -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ true -+ -+ -+ true -+ -+ -+ -+ -+ -+ WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) -+ Level3 -+ ProgramDatabase -+ Disabled -+ $(ProjectDir)..\src;%(AdditionalIncludeDirectories) -+ true -+ false -+ -+ -+ MachineX86 -+ true -+ Console -+ -+ -+ -+ -+ WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) -+ Level3 -+ ProgramDatabase -+ $(ProjectDir)..\src;%(AdditionalIncludeDirectories) -+ true -+ -+ -+ MachineX86 -+ true -+ Console -+ true -+ true -+ -+ -+ -+ -+ $(ProjectDir)..\src;%(AdditionalIncludeDirectories) -+ true -+ false -+ -+ -+ -+ -+ $(ProjectDir)..\src;%(AdditionalIncludeDirectories) -+ true -+ -+ + + + @@ -635,7 +380,5 @@ index e69de29..971fab7 + + + -+ -+ + \ No newline at end of file diff --git a/vsprojects/base.props b/vsprojects/base.props index d6e7f7bf2..38fe7ac89 100644 --- a/vsprojects/base.props +++ b/vsprojects/base.props @@ -17,7 +17,7 @@ $(PYTHONHOME)\Lib\site-packages\numpy\core\include;$(THIRD_PARTY)python\inc;$(THIRD_PARTY)python\inc\Windows;$(ProjectDir)..\build\generated;$(ProjectDir)..\include;$(THIRD_PARTY)numbuf\cpp\src;$(THIRD_PARTY)numbuf\python\src;$(THIRD_PARTY)grpc\include;$(THIRD_PARTY)grpc\third_party\protobuf\src;$(THIRD_PARTY)arrow\cpp\src;$(BOOST_ROOT);$(BOOST_ROOT)\libs\interprocess\include;%(AdditionalIncludeDirectories) - _WIN32_WINNT=0x0600;BOOST_DATE_TIME_NO_LIB=1;%(PreprocessorDefinitions) + _WIN32_WINNT=0x0600;BOOST_DATE_TIME_NO_LIB=1;HAVE_ROUND;%(PreprocessorDefinitions) 4191;;4100;4371;4514;4571;4619;4668;4710;4820 /FS %(AdditionalOptions) true @@ -25,7 +25,7 @@ $(THIRD_PARTY)python\lib\Windows\$(PlatformTarget);$(SolutionDir)packages\grpc.dependencies.openssl.1.0.204.1\build\native\lib\$(PlatformToolset)\$(Platform)\$(Configuration)\static;%(AdditionalLibraryDirectories) - /NoDefaultLib:libcmt.lib /NoDefaultLib:libcmtd.lib /NoDefaultLib:libcpmt.lib /NoDefaultLib:libcpmtd.lib /ignore:4099 %(AdditionalOptions) + /NoDefaultLib:libcmt.lib /NoDefaultLib:libcmtd.lib /NoDefaultLib:libcpmt.lib /NoDefaultLib:libcpmtd.lib /ignore:4099 /ignore:4217 %(AdditionalOptions) libeay32.lib;ssleay32.lib;ws2_32.lib;%(AdditionalDependencies) diff --git a/vsprojects/ray.vcxproj b/vsprojects/ray.vcxproj index ad64a5ed0..47b6ed5bf 100644 --- a/vsprojects/ray.vcxproj +++ b/vsprojects/ray.vcxproj @@ -44,8 +44,13 @@ - - + + _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + + + _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) 4125;4355;4365;4800;;4623;4625;4626;4267;5026;5027;%(DisableSpecificWarnings) @@ -57,6 +62,7 @@ _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) 4125;4355;4365;4800;;4623;4625;4626;4267;5026;5027;%(DisableSpecificWarnings) + true _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) @@ -64,6 +70,7 @@ + @@ -121,9 +128,6 @@ protoc --proto_path="$(SolutionDir)protos" --python_out="$(ProjectDir)..\lib\pyt {7e51a25f-ac59-488f-906c-c60faae706aa} - - {fbade9e3-6a3f-36d3-d676-c1b808451dd7} - diff --git a/vsprojects/ray.vcxproj.filters b/vsprojects/ray.vcxproj.filters index 5595f91bd..49e1d1104 100644 --- a/vsprojects/ray.vcxproj.filters +++ b/vsprojects/ray.vcxproj.filters @@ -45,6 +45,9 @@ Source Files + + Source Files + diff --git a/vsprojects/zstub.c b/vsprojects/zstub.c new file mode 100644 index 000000000..a1e7cba89 --- /dev/null +++ b/vsprojects/zstub.c @@ -0,0 +1,16 @@ +#ifdef __cplusplus +extern "C" { +#endif +int deflate(struct z_stream_s *strm, int flush) { return -2; } +int deflateEnd(struct z_stream_s *strm) { return -2; } +int deflateInit_(struct z_stream_s *stream, int level, const char *version, int stream_size) { return -2; } +int deflateInit2_(struct z_stream_s *strm, int level, int method, int windowBits, int memLevel, int strategy, const char *version, int stream_size) { return -2; } +int inflate(struct z_stream_s *strm, int flush) { return -2; } +int inflateEnd(struct z_stream_s *strm) { return -2; } +int inflateInit_(struct z_stream_s *stream, const char *version, int stream_size) { return -2; } +int inflateInit2_(struct z_stream_s *strm, int windowBits, const char *version, int stream_size) { return -2; } +const char *gzerror(struct gzFile_s * file, int *errnum) { return 0; } +const char *zError(int err) { return 0; } +#ifdef __cplusplus +} +#endif