From 785778b22ee95c139dbc74b83215a59ae42e32fe Mon Sep 17 00:00:00 2001 From: Jan Tattermusch Date: Wed, 11 Feb 2015 13:54:48 -0800 Subject: [PATCH 1/6] added projects for shared libraries --- .../gpr_shared.vcxproj.filters.template | 2 + .../vs2013/gpr_shared.vcxproj.template | 2 + .../gprc_csharp_ext_shared.vcxproj.template | 2 + .../gprc_shared.vcxproj.filters.template | 2 + .../vs2013/gprc_shared.vcxproj.template | 2 + templates/vsprojects/vs2013/grpc.sln.template | 20 +- .../vsprojects/vs2013/vcxproj_defs.include | 15 +- vsprojects/vs2013/gpr_shared.vcxproj | 177 +++++ vsprojects/vs2013/gpr_shared.vcxproj.filters | 211 ++++++ .../vs2013/gprc_csharp_ext_shared.vcxproj | 91 +++ vsprojects/vs2013/gprc_shared.vcxproj | 419 +++++++++++ vsprojects/vs2013/gprc_shared.vcxproj.filters | 703 ++++++++++++++++++ vsprojects/vs2013/grpc.sln | 18 + 13 files changed, 1658 insertions(+), 6 deletions(-) create mode 100644 templates/vsprojects/vs2013/gpr_shared.vcxproj.filters.template create mode 100644 templates/vsprojects/vs2013/gpr_shared.vcxproj.template create mode 100644 templates/vsprojects/vs2013/gprc_csharp_ext_shared.vcxproj.template create mode 100644 templates/vsprojects/vs2013/gprc_shared.vcxproj.filters.template create mode 100644 templates/vsprojects/vs2013/gprc_shared.vcxproj.template create mode 100644 vsprojects/vs2013/gpr_shared.vcxproj create mode 100644 vsprojects/vs2013/gpr_shared.vcxproj.filters create mode 100644 vsprojects/vs2013/gprc_csharp_ext_shared.vcxproj create mode 100644 vsprojects/vs2013/gprc_shared.vcxproj create mode 100644 vsprojects/vs2013/gprc_shared.vcxproj.filters diff --git a/templates/vsprojects/vs2013/gpr_shared.vcxproj.filters.template b/templates/vsprojects/vs2013/gpr_shared.vcxproj.filters.template new file mode 100644 index 00000000000..c8b2ce099ea --- /dev/null +++ b/templates/vsprojects/vs2013/gpr_shared.vcxproj.filters.template @@ -0,0 +1,2 @@ +<%namespace file="vcxproj.filters_defs.include" import="gen_filters"/>\ +${gen_filters('gpr', libs, targets)} diff --git a/templates/vsprojects/vs2013/gpr_shared.vcxproj.template b/templates/vsprojects/vs2013/gpr_shared.vcxproj.template new file mode 100644 index 00000000000..d1b1dd3c8ba --- /dev/null +++ b/templates/vsprojects/vs2013/gpr_shared.vcxproj.template @@ -0,0 +1,2 @@ +<%namespace file="vcxproj_defs.include" import="gen_project"/>\ +${gen_project('gpr', libs, targets, configuration_type = 'DynamicLibrary', project_guid = '{3D304D6B-AAF8-428B-AC7D-A698DDDE93C0}')} diff --git a/templates/vsprojects/vs2013/gprc_csharp_ext_shared.vcxproj.template b/templates/vsprojects/vs2013/gprc_csharp_ext_shared.vcxproj.template new file mode 100644 index 00000000000..d389792c450 --- /dev/null +++ b/templates/vsprojects/vs2013/gprc_csharp_ext_shared.vcxproj.template @@ -0,0 +1,2 @@ +<%namespace file="vcxproj_defs.include" import="gen_project"/>\ +${gen_project('grpc_csharp_ext', libs, targets, configuration_type = 'DynamicLibrary', project_guid = '{C26D04A8-37C6-44C7-B458-906C9FCE928C}')} diff --git a/templates/vsprojects/vs2013/gprc_shared.vcxproj.filters.template b/templates/vsprojects/vs2013/gprc_shared.vcxproj.filters.template new file mode 100644 index 00000000000..b8e91bd61c4 --- /dev/null +++ b/templates/vsprojects/vs2013/gprc_shared.vcxproj.filters.template @@ -0,0 +1,2 @@ +<%namespace file="vcxproj.filters_defs.include" import="gen_filters"/>\ +${gen_filters('grpc', libs, targets)} diff --git a/templates/vsprojects/vs2013/gprc_shared.vcxproj.template b/templates/vsprojects/vs2013/gprc_shared.vcxproj.template new file mode 100644 index 00000000000..55c2da45332 --- /dev/null +++ b/templates/vsprojects/vs2013/gprc_shared.vcxproj.template @@ -0,0 +1,2 @@ +<%namespace file="vcxproj_defs.include" import="gen_project"/>\ +${gen_project('grpc', libs, targets, configuration_type = 'DynamicLibrary', project_guid = '{F2EE8FDB-F1E0-43A0-A297-6F255BB52AAA}', additional_props = ['ssl', 'winsock'])} diff --git a/templates/vsprojects/vs2013/grpc.sln.template b/templates/vsprojects/vs2013/grpc.sln.template index 18dfb1af423..d17f4a31aa4 100644 --- a/templates/vsprojects/vs2013/grpc.sln.template +++ b/templates/vsprojects/vs2013/grpc.sln.template @@ -23,7 +23,13 @@ Project("${cpp_proj_type}") = "${project.name}", "${project.name}.vcxproj", "${p % endif EndProject % endfor -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlibvc", "third_party\zlibvc.vcxproj", "{8FD826F8-3739-44E6-8CC8-997122E53B8D}" +Project("${cpp_proj_type}") = "gpr_shared", "gpr_shared.vcxproj", "{3D304D6B-AAF8-428B-AC7D-A698DDDE93C0}" +EndProject +Project("${cpp_proj_type}") = "grpc_shared", "grpc_shared.vcxproj", "{F2EE8FDB-F1E0-43A0-A297-6F255BB52AAA}" +EndProject +Project("${cpp_proj_type}") = "grpc_csharp_ext_shared", "grpc_csharp_ext_shared.vcxproj", "{C26D04A8-37C6-44C7-B458-906C9FCE928C}" +EndProject +Project("${cpp_proj_type}") = "zlibvc", "third_party\zlibvc.vcxproj", "{8FD826F8-3739-44E6-8CC8-997122E53B8D}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "third_party", "third_party", "{DD51818F-0BCA-4035-9E5B-F28A9F87DED4}" EndProject @@ -43,6 +49,18 @@ Global {8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|Win32.Build.0 = Debug|Win32 {8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|Win32.ActiveCfg = Release|Win32 {8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|Win32.Build.0 = Release|Win32 + {3D304D6B-AAF8-428B-AC7D-A698DDDE93C0}.Debug|Win32.ActiveCfg = Debug|Win32 + {3D304D6B-AAF8-428B-AC7D-A698DDDE93C0}.Debug|Win32.Build.0 = Debug|Win32 + {3D304D6B-AAF8-428B-AC7D-A698DDDE93C0}.Release|Win32.ActiveCfg = Release|Win32 + {3D304D6B-AAF8-428B-AC7D-A698DDDE93C0}.Release|Win32.Build.0 = Release|Win32 + {F2EE8FDB-F1E0-43A0-A297-6F255BB52AAA}.Debug|Win32.ActiveCfg = Debug|Win32 + {F2EE8FDB-F1E0-43A0-A297-6F255BB52AAA}.Debug|Win32.Build.0 = Debug|Win32 + {F2EE8FDB-F1E0-43A0-A297-6F255BB52AAA}.Release|Win32.ActiveCfg = Release|Win32 + {F2EE8FDB-F1E0-43A0-A297-6F255BB52AAA}.Release|Win32.Build.0 = Release|Win32 + {C26D04A8-37C6-44C7-B458-906C9FCE928C}.Debug|Win32.ActiveCfg = Debug|Win32 + {C26D04A8-37C6-44C7-B458-906C9FCE928C}.Debug|Win32.Build.0 = Debug|Win32 + {C26D04A8-37C6-44C7-B458-906C9FCE928C}.Release|Win32.ActiveCfg = Release|Win32 + {C26D04A8-37C6-44C7-B458-906C9FCE928C}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/templates/vsprojects/vs2013/vcxproj_defs.include b/templates/vsprojects/vs2013/vcxproj_defs.include index e21230abb76..bb758037720 100644 --- a/templates/vsprojects/vs2013/vcxproj_defs.include +++ b/templates/vsprojects/vs2013/vcxproj_defs.include @@ -1,7 +1,6 @@ <%def name="to_windows_path(path)">${path.replace('/','\\')}\ -<%def name="get_configuration_type(is_library)">${'StaticLibrary' if is_library else 'Application'}\ <%def name="get_subsystem(is_library)">${'Windows' if is_library else 'Console'}\ -<%def name="gen_project(name, libs, targets)">\ +<%def name="gen_project(name, libs, targets, configuration_type = 'StaticLibrary', project_guid = None, additional_props = [])">\ % for project in vsprojects: % if project.name == name: @@ -17,18 +16,18 @@ - ${project.vs_project_guid} + ${project_guid if project_guid else project.vs_project_guid} - ${get_configuration_type(project.is_library)} + ${configuration_type} true v120 Unicode $(Configuration)\$(ProjectName)\ - ${get_configuration_type(project.is_library)} + ${configuration_type} false v120 true @@ -41,10 +40,16 @@ + % for prop in additional_props: + + % endfor + % for prop in additional_props: + + % endfor diff --git a/vsprojects/vs2013/gpr_shared.vcxproj b/vsprojects/vs2013/gpr_shared.vcxproj new file mode 100644 index 00000000000..e52eac8d176 --- /dev/null +++ b/vsprojects/vs2013/gpr_shared.vcxproj @@ -0,0 +1,177 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + {3D304D6B-AAF8-428B-AC7D-A698DDDE93C0} + + + + DynamicLibrary + true + v120 + Unicode + $(Configuration)\$(ProjectName)\ + + + DynamicLibrary + false + v120 + true + Unicode + $(Configuration)\$(ProjectName)\ + + + + + + + + + + + + + + + + + NotUsing + Level3 + Disabled + WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) + true + + + Windows + true + + + + + Level3 + NotUsing + MaxSpeed + true + true + WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) + true + + + Windows + true + true + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/vsprojects/vs2013/gpr_shared.vcxproj.filters b/vsprojects/vs2013/gpr_shared.vcxproj.filters new file mode 100644 index 00000000000..20e4e07c49d --- /dev/null +++ b/vsprojects/vs2013/gpr_shared.vcxproj.filters @@ -0,0 +1,211 @@ + + + + + src\core\support + + + src\core\support + + + src\core\support + + + src\core\support + + + src\core\support + + + src\core\support + + + src\core\support + + + src\core\support + + + src\core\support + + + src\core\support + + + src\core\support + + + src\core\support + + + src\core\support + + + src\core\support + + + src\core\support + + + src\core\support + + + src\core\support + + + src\core\support + + + src\core\support + + + src\core\support + + + src\core\support + + + src\core\support + + + src\core\support + + + src\core\support + + + src\core\support + + + src\core\support + + + src\core\support + + + src\core\support + + + src\core\support + + + src\core\support + + + src\core\support + + + src\core\support + + + + + include\grpc\support + + + include\grpc\support + + + include\grpc\support + + + include\grpc\support + + + include\grpc\support + + + include\grpc\support + + + include\grpc\support + + + include\grpc\support + + + include\grpc\support + + + include\grpc\support + + + include\grpc\support + + + include\grpc\support + + + include\grpc\support + + + include\grpc\support + + + include\grpc\support + + + include\grpc\support + + + include\grpc\support + + + include\grpc\support + + + include\grpc\support + + + include\grpc\support + + + include\grpc\support + + + + + src\core\support + + + src\core\support + + + src\core\support + + + src\core\support + + + src\core\support + + + src\core\support + + + src\core\support + + + + + + {9ea89137-2bf7-b6d9-b7af-7cb4d1b74928} + + + {e6957ec1-85ba-6515-03c0-e12878045b1f} + + + {31c42000-3ed7-95e1-d076-df814b72cdee} + + + {60eb2826-e58b-cb10-a98d-fe04727398a2} + + + {c5e1baa7-de77-beb1-9675-942261648f79} + + + {bb116f2a-ea2a-c233-82da-0c54e3cbfec1} + + + + diff --git a/vsprojects/vs2013/gprc_csharp_ext_shared.vcxproj b/vsprojects/vs2013/gprc_csharp_ext_shared.vcxproj new file mode 100644 index 00000000000..1ae420e27eb --- /dev/null +++ b/vsprojects/vs2013/gprc_csharp_ext_shared.vcxproj @@ -0,0 +1,91 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + {C26D04A8-37C6-44C7-B458-906C9FCE928C} + + + + DynamicLibrary + true + v120 + Unicode + $(Configuration)\$(ProjectName)\ + + + DynamicLibrary + false + v120 + true + Unicode + $(Configuration)\$(ProjectName)\ + + + + + + + + + + + + + + + + + NotUsing + Level3 + Disabled + WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) + true + + + Windows + true + + + + + Level3 + NotUsing + MaxSpeed + true + true + WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) + true + + + Windows + true + true + true + + + + + + + + + {B23D3D1A-9438-4EDA-BEB6-9A0A03D17792} + + + {29D16885-7228-4C31-81ED-5F9187C7F2A9} + + + + + + + diff --git a/vsprojects/vs2013/gprc_shared.vcxproj b/vsprojects/vs2013/gprc_shared.vcxproj new file mode 100644 index 00000000000..a6a2caadadc --- /dev/null +++ b/vsprojects/vs2013/gprc_shared.vcxproj @@ -0,0 +1,419 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + {F2EE8FDB-F1E0-43A0-A297-6F255BB52AAA} + + + + DynamicLibrary + true + v120 + Unicode + $(Configuration)\$(ProjectName)\ + + + DynamicLibrary + false + v120 + true + Unicode + $(Configuration)\$(ProjectName)\ + + + + + + + + + + + + + + + + + + + + + NotUsing + Level3 + Disabled + WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) + true + + + Windows + true + + + + + Level3 + NotUsing + MaxSpeed + true + true + WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) + true + + + Windows + true + true + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {B23D3D1A-9438-4EDA-BEB6-9A0A03D17792} + + + + + + + diff --git a/vsprojects/vs2013/gprc_shared.vcxproj.filters b/vsprojects/vs2013/gprc_shared.vcxproj.filters new file mode 100644 index 00000000000..fed8fb10bfb --- /dev/null +++ b/vsprojects/vs2013/gprc_shared.vcxproj.filters @@ -0,0 +1,703 @@ + + + + + src\core\security + + + src\core\security + + + src\core\security + + + src\core\security + + + src\core\security + + + src\core\security + + + src\core\security + + + src\core\security + + + src\core\security + + + src\core\security + + + src\core\tsi + + + src\core\tsi + + + src\core\tsi + + + src\core\channel + + + src\core\channel + + + src\core\channel + + + src\core\channel + + + src\core\channel + + + src\core\channel + + + src\core\channel + + + src\core\channel + + + src\core\channel + + + src\core\channel + + + src\core\channel + + + src\core\channel + + + src\core\channel + + + src\core\compression + + + src\core\compression + + + src\core\httpcli + + + src\core\httpcli + + + src\core\httpcli + + + src\core\httpcli + + + src\core\iomgr + + + src\core\iomgr + + + src\core\iomgr + + + src\core\iomgr + + + src\core\iomgr + + + src\core\iomgr + + + src\core\iomgr + + + src\core\iomgr + + + src\core\iomgr + + + src\core\iomgr + + + src\core\iomgr + + + src\core\iomgr + + + src\core\iomgr + + + src\core\iomgr + + + src\core\iomgr + + + src\core\iomgr + + + src\core\iomgr + + + src\core\iomgr + + + src\core\iomgr + + + src\core\iomgr + + + src\core\iomgr + + + src\core\iomgr + + + src\core\iomgr + + + src\core\iomgr + + + src\core\iomgr + + + src\core\iomgr + + + src\core\iomgr + + + src\core\iomgr + + + src\core\iomgr + + + src\core\iomgr + + + src\core\json + + + src\core\json + + + src\core\json + + + src\core\json + + + src\core\statistics + + + src\core\statistics + + + src\core\statistics + + + src\core\statistics + + + src\core\statistics + + + src\core\statistics + + + src\core\surface + + + src\core\surface + + + src\core\surface + + + src\core\surface + + + src\core\surface + + + src\core\surface + + + src\core\surface + + + src\core\surface + + + src\core\surface + + + src\core\surface + + + src\core\surface + + + src\core\surface + + + src\core\surface + + + src\core\surface + + + src\core\surface + + + src\core\surface + + + src\core\surface + + + src\core\surface + + + src\core\transport\chttp2 + + + src\core\transport\chttp2 + + + src\core\transport\chttp2 + + + src\core\transport\chttp2 + + + src\core\transport\chttp2 + + + src\core\transport\chttp2 + + + src\core\transport\chttp2 + + + src\core\transport\chttp2 + + + src\core\transport\chttp2 + + + src\core\transport\chttp2 + + + src\core\transport\chttp2 + + + src\core\transport\chttp2 + + + src\core\transport\chttp2 + + + src\core\transport\chttp2 + + + src\core\transport\chttp2 + + + src\core\transport\chttp2 + + + src\core\transport + + + src\core\transport + + + src\core\transport + + + src\core\transport + + + + + include\grpc + + + include\grpc + + + include\grpc + + + include\grpc + + + include\grpc + + + + + src\core\security + + + src\core\security + + + src\core\security + + + src\core\security + + + src\core\security + + + src\core\security + + + src\core\security + + + src\core\tsi + + + src\core\tsi + + + src\core\tsi + + + src\core\tsi + + + src\core\channel + + + src\core\channel + + + src\core\channel + + + src\core\channel + + + src\core\channel + + + src\core\channel + + + src\core\channel + + + src\core\channel + + + src\core\channel + + + src\core\channel + + + src\core\channel + + + src\core\channel + + + src\core\compression + + + src\core\compression + + + src\core\httpcli + + + src\core\httpcli + + + src\core\httpcli + + + src\core\httpcli + + + src\core\iomgr + + + src\core\iomgr + + + src\core\iomgr + + + src\core\iomgr + + + src\core\iomgr + + + src\core\iomgr + + + src\core\iomgr + + + src\core\iomgr + + + src\core\iomgr + + + src\core\iomgr + + + src\core\iomgr + + + src\core\iomgr + + + src\core\iomgr + + + src\core\iomgr + + + src\core\iomgr + + + src\core\iomgr + + + src\core\iomgr + + + src\core\iomgr + + + src\core\iomgr + + + src\core\iomgr + + + src\core\iomgr + + + src\core\iomgr + + + src\core\iomgr + + + src\core\iomgr + + + src\core\iomgr + + + src\core\iomgr + + + src\core\iomgr + + + src\core\iomgr + + + src\core\iomgr + + + src\core\iomgr + + + src\core\json + + + src\core\json + + + src\core\json + + + src\core\json + + + src\core\statistics + + + src\core\statistics + + + src\core\statistics + + + src\core\statistics + + + src\core\statistics + + + src\core\statistics + + + src\core\surface + + + src\core\surface + + + src\core\surface + + + src\core\surface + + + src\core\surface + + + src\core\surface + + + src\core\surface + + + src\core\surface + + + src\core\surface + + + src\core\transport\chttp2 + + + src\core\transport\chttp2 + + + src\core\transport\chttp2 + + + src\core\transport\chttp2 + + + src\core\transport\chttp2 + + + src\core\transport\chttp2 + + + src\core\transport\chttp2 + + + src\core\transport\chttp2 + + + src\core\transport\chttp2 + + + src\core\transport\chttp2 + + + src\core\transport\chttp2 + + + src\core\transport\chttp2 + + + src\core\transport\chttp2 + + + src\core\transport\chttp2 + + + src\core\transport\chttp2 + + + src\core\transport\chttp2 + + + src\core\transport\chttp2 + + + src\core\transport + + + src\core\transport + + + src\core\transport + + + src\core\transport + + + src\core\transport + + + + + + {968de0a1-346d-b75a-6f19-6a55119b8235} + + + {880c644d-b84f-cfca-98bd-e145f36232ab} + + + {d538af37-07b2-062b-fa2a-d9f882cb2737} + + + {ea745680-21ea-9c5e-679b-64dc40562d08} + + + {d897b6c3-c555-234e-a589-b4f008063615} + + + {263cb913-dfe6-42a4-096b-cac231f76305} + + + {a9bc00ad-835f-c625-c6d9-6a1324f98b9f} + + + {1baf3894-af37-e647-bdbc-95dc17ed0073} + + + {e665cc0e-b994-d7c5-cc18-2007392019f0} + + + {1d850ac6-e639-4eab-5338-4ba40272fcc9} + + + {0ef49896-2313-4a3f-1ce2-716fa0e5c6ca} + + + {aeb18e82-5d25-0aad-8b02-a0a3470073ce} + + + {168fa1b1-1c18-eb55-9a4d-746bc58df2c1} + + + {b8b623c3-a168-a2b1-0d5f-b70a1f1cd8d2} + + + {0b0f9ab1-efa4-7f03-e446-6fb9b5227e84} + + + + diff --git a/vsprojects/vs2013/grpc.sln b/vsprojects/vs2013/grpc.sln index efc4725ed18..424ae0adbda 100644 --- a/vsprojects/vs2013/grpc.sln +++ b/vsprojects/vs2013/grpc.sln @@ -25,6 +25,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "grpc_unsecure", "grpc_unsec {B23D3D1A-9438-4EDA-BEB6-9A0A03D17792} = {B23D3D1A-9438-4EDA-BEB6-9A0A03D17792} EndProjectSection EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gpr_shared", "gpr_shared.vcxproj", "{3D304D6B-AAF8-428B-AC7D-A698DDDE93C0}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "grpc_shared", "grpc_shared.vcxproj", "{F2EE8FDB-F1E0-43A0-A297-6F255BB52AAA}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "grpc_csharp_ext_shared", "grpc_csharp_ext_shared.vcxproj", "{C26D04A8-37C6-44C7-B458-906C9FCE928C}" +EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlibvc", "third_party\zlibvc.vcxproj", "{8FD826F8-3739-44E6-8CC8-997122E53B8D}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "third_party", "third_party", "{DD51818F-0BCA-4035-9E5B-F28A9F87DED4}" @@ -63,6 +69,18 @@ Global {8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|Win32.Build.0 = Debug|Win32 {8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|Win32.ActiveCfg = Release|Win32 {8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|Win32.Build.0 = Release|Win32 + {3D304D6B-AAF8-428B-AC7D-A698DDDE93C0}.Debug|Win32.ActiveCfg = Debug|Win32 + {3D304D6B-AAF8-428B-AC7D-A698DDDE93C0}.Debug|Win32.Build.0 = Debug|Win32 + {3D304D6B-AAF8-428B-AC7D-A698DDDE93C0}.Release|Win32.ActiveCfg = Release|Win32 + {3D304D6B-AAF8-428B-AC7D-A698DDDE93C0}.Release|Win32.Build.0 = Release|Win32 + {F2EE8FDB-F1E0-43A0-A297-6F255BB52AAA}.Debug|Win32.ActiveCfg = Debug|Win32 + {F2EE8FDB-F1E0-43A0-A297-6F255BB52AAA}.Debug|Win32.Build.0 = Debug|Win32 + {F2EE8FDB-F1E0-43A0-A297-6F255BB52AAA}.Release|Win32.ActiveCfg = Release|Win32 + {F2EE8FDB-F1E0-43A0-A297-6F255BB52AAA}.Release|Win32.Build.0 = Release|Win32 + {C26D04A8-37C6-44C7-B458-906C9FCE928C}.Debug|Win32.ActiveCfg = Debug|Win32 + {C26D04A8-37C6-44C7-B458-906C9FCE928C}.Debug|Win32.Build.0 = Debug|Win32 + {C26D04A8-37C6-44C7-B458-906C9FCE928C}.Release|Win32.ActiveCfg = Release|Win32 + {C26D04A8-37C6-44C7-B458-906C9FCE928C}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE From 9fb0116148cf91f7597c125875f1f1d6903fd9ec Mon Sep 17 00:00:00 2001 From: Jan Tattermusch Date: Wed, 11 Feb 2015 14:09:43 -0800 Subject: [PATCH 2/6] fixed filename of grpc VS project templates --- ...d.vcxproj.template => grpc_csharp_ext_shared.vcxproj.template} | 0 ...proj.filters.template => grpc_shared.vcxproj.filters.template} | 0 ...{gprc_shared.vcxproj.template => grpc_shared.vcxproj.template} | 0 ...c_csharp_ext_shared.vcxproj => grpc_csharp_ext_shared.vcxproj} | 0 vsprojects/vs2013/{gprc_shared.vcxproj => grpc_shared.vcxproj} | 0 .../{gprc_shared.vcxproj.filters => grpc_shared.vcxproj.filters} | 0 6 files changed, 0 insertions(+), 0 deletions(-) rename templates/vsprojects/vs2013/{gprc_csharp_ext_shared.vcxproj.template => grpc_csharp_ext_shared.vcxproj.template} (100%) rename templates/vsprojects/vs2013/{gprc_shared.vcxproj.filters.template => grpc_shared.vcxproj.filters.template} (100%) rename templates/vsprojects/vs2013/{gprc_shared.vcxproj.template => grpc_shared.vcxproj.template} (100%) rename vsprojects/vs2013/{gprc_csharp_ext_shared.vcxproj => grpc_csharp_ext_shared.vcxproj} (100%) rename vsprojects/vs2013/{gprc_shared.vcxproj => grpc_shared.vcxproj} (100%) rename vsprojects/vs2013/{gprc_shared.vcxproj.filters => grpc_shared.vcxproj.filters} (100%) diff --git a/templates/vsprojects/vs2013/gprc_csharp_ext_shared.vcxproj.template b/templates/vsprojects/vs2013/grpc_csharp_ext_shared.vcxproj.template similarity index 100% rename from templates/vsprojects/vs2013/gprc_csharp_ext_shared.vcxproj.template rename to templates/vsprojects/vs2013/grpc_csharp_ext_shared.vcxproj.template diff --git a/templates/vsprojects/vs2013/gprc_shared.vcxproj.filters.template b/templates/vsprojects/vs2013/grpc_shared.vcxproj.filters.template similarity index 100% rename from templates/vsprojects/vs2013/gprc_shared.vcxproj.filters.template rename to templates/vsprojects/vs2013/grpc_shared.vcxproj.filters.template diff --git a/templates/vsprojects/vs2013/gprc_shared.vcxproj.template b/templates/vsprojects/vs2013/grpc_shared.vcxproj.template similarity index 100% rename from templates/vsprojects/vs2013/gprc_shared.vcxproj.template rename to templates/vsprojects/vs2013/grpc_shared.vcxproj.template diff --git a/vsprojects/vs2013/gprc_csharp_ext_shared.vcxproj b/vsprojects/vs2013/grpc_csharp_ext_shared.vcxproj similarity index 100% rename from vsprojects/vs2013/gprc_csharp_ext_shared.vcxproj rename to vsprojects/vs2013/grpc_csharp_ext_shared.vcxproj diff --git a/vsprojects/vs2013/gprc_shared.vcxproj b/vsprojects/vs2013/grpc_shared.vcxproj similarity index 100% rename from vsprojects/vs2013/gprc_shared.vcxproj rename to vsprojects/vs2013/grpc_shared.vcxproj diff --git a/vsprojects/vs2013/gprc_shared.vcxproj.filters b/vsprojects/vs2013/grpc_shared.vcxproj.filters similarity index 100% rename from vsprojects/vs2013/gprc_shared.vcxproj.filters rename to vsprojects/vs2013/grpc_shared.vcxproj.filters From 31e40652a975c8b633224d0bba3f90a840b9d693 Mon Sep 17 00:00:00 2001 From: Jan Tattermusch Date: Wed, 11 Feb 2015 14:23:38 -0800 Subject: [PATCH 3/6] fixes to make shared libraries build --- .../vs2013/grpc_csharp_ext_shared.vcxproj.template | 2 +- templates/vsprojects/vs2013/grpc_shared.vcxproj.template | 2 +- templates/vsprojects/vs2013/vcxproj_defs.include | 7 ++++++- vsprojects/vs2013/grpc_csharp_ext_shared.vcxproj | 2 ++ vsprojects/vs2013/grpc_shared.vcxproj | 3 +++ 5 files changed, 13 insertions(+), 3 deletions(-) diff --git a/templates/vsprojects/vs2013/grpc_csharp_ext_shared.vcxproj.template b/templates/vsprojects/vs2013/grpc_csharp_ext_shared.vcxproj.template index d389792c450..45f37a8c47b 100644 --- a/templates/vsprojects/vs2013/grpc_csharp_ext_shared.vcxproj.template +++ b/templates/vsprojects/vs2013/grpc_csharp_ext_shared.vcxproj.template @@ -1,2 +1,2 @@ <%namespace file="vcxproj_defs.include" import="gen_project"/>\ -${gen_project('grpc_csharp_ext', libs, targets, configuration_type = 'DynamicLibrary', project_guid = '{C26D04A8-37C6-44C7-B458-906C9FCE928C}')} +${gen_project('grpc_csharp_ext', libs, targets, configuration_type = 'DynamicLibrary', project_guid = '{C26D04A8-37C6-44C7-B458-906C9FCE928C}', additional_props = ['winsock'])} diff --git a/templates/vsprojects/vs2013/grpc_shared.vcxproj.template b/templates/vsprojects/vs2013/grpc_shared.vcxproj.template index 55c2da45332..890189c28db 100644 --- a/templates/vsprojects/vs2013/grpc_shared.vcxproj.template +++ b/templates/vsprojects/vs2013/grpc_shared.vcxproj.template @@ -1,2 +1,2 @@ <%namespace file="vcxproj_defs.include" import="gen_project"/>\ -${gen_project('grpc', libs, targets, configuration_type = 'DynamicLibrary', project_guid = '{F2EE8FDB-F1E0-43A0-A297-6F255BB52AAA}', additional_props = ['ssl', 'winsock'])} +${gen_project('grpc', libs, targets, configuration_type = 'DynamicLibrary', project_guid = '{F2EE8FDB-F1E0-43A0-A297-6F255BB52AAA}', additional_props = ['ssl', 'winsock'], depends_on_zlib = True)} diff --git a/templates/vsprojects/vs2013/vcxproj_defs.include b/templates/vsprojects/vs2013/vcxproj_defs.include index bb758037720..c8e6fd3c06c 100644 --- a/templates/vsprojects/vs2013/vcxproj_defs.include +++ b/templates/vsprojects/vs2013/vcxproj_defs.include @@ -1,6 +1,6 @@ <%def name="to_windows_path(path)">${path.replace('/','\\')}\ <%def name="get_subsystem(is_library)">${'Windows' if is_library else 'Console'}\ -<%def name="gen_project(name, libs, targets, configuration_type = 'StaticLibrary', project_guid = None, additional_props = [])">\ +<%def name="gen_project(name, libs, targets, configuration_type = 'StaticLibrary', project_guid = None, additional_props = [], depends_on_zlib = False)">\ % for project in vsprojects: % if project.name == name: @@ -112,6 +112,11 @@ ${vsproject_dict[dep].vs_project_guid} % endfor + % if depends_on_zlib: + + {8fd826f8-3739-44e6-8cc8-997122e53b8d} + + % endif % endif diff --git a/vsprojects/vs2013/grpc_csharp_ext_shared.vcxproj b/vsprojects/vs2013/grpc_csharp_ext_shared.vcxproj index 1ae420e27eb..6ad268e0e97 100644 --- a/vsprojects/vs2013/grpc_csharp_ext_shared.vcxproj +++ b/vsprojects/vs2013/grpc_csharp_ext_shared.vcxproj @@ -35,10 +35,12 @@ + + diff --git a/vsprojects/vs2013/grpc_shared.vcxproj b/vsprojects/vs2013/grpc_shared.vcxproj index a6a2caadadc..53886467673 100644 --- a/vsprojects/vs2013/grpc_shared.vcxproj +++ b/vsprojects/vs2013/grpc_shared.vcxproj @@ -411,6 +411,9 @@ {B23D3D1A-9438-4EDA-BEB6-9A0A03D17792} + + {8fd826f8-3739-44e6-8cc8-997122e53b8d} + From a61221664565fb7fbebc7e48a9cc5f2c3937ddca Mon Sep 17 00:00:00 2001 From: Jan Tattermusch Date: Wed, 11 Feb 2015 14:25:24 -0800 Subject: [PATCH 4/6] fixes to zlib VS project --- vsprojects/vs2013/third_party/zlibvc.vcxproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vsprojects/vs2013/third_party/zlibvc.vcxproj b/vsprojects/vs2013/third_party/zlibvc.vcxproj index dc81fba58c8..b8f0dc10ba1 100644 --- a/vsprojects/vs2013/third_party/zlibvc.vcxproj +++ b/vsprojects/vs2013/third_party/zlibvc.vcxproj @@ -55,7 +55,7 @@ Disabled ..\..\..\third_party\zlib;..\..\..\third_party\zlib\masmx86;%(AdditionalIncludeDirectories) - WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF;%(PreprocessorDefinitions) + WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) MultiThreadedDebugDLL @@ -106,7 +106,7 @@ OnlyExplicitInline ..\..\..\third_party\zlib;..\..\..\third_party\zlib\contrib\masmx86;%(AdditionalIncludeDirectories) - WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF;%(PreprocessorDefinitions) + WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) true From f6ff8f6fcf6b9cdcde226e755ef00fa0bd248b20 Mon Sep 17 00:00:00 2001 From: Jan Tattermusch Date: Wed, 11 Feb 2015 14:43:11 -0800 Subject: [PATCH 5/6] remove _shared suffix from target dll names --- templates/vsprojects/vs2013/vcxproj_defs.include | 7 ++++++- vsprojects/vs2013/gpr.vcxproj | 7 ++++++- vsprojects/vs2013/gpr_shared.vcxproj | 7 ++++++- vsprojects/vs2013/gpr_test_util.vcxproj | 7 ++++++- vsprojects/vs2013/grpc.vcxproj | 7 ++++++- vsprojects/vs2013/grpc_csharp_ext.vcxproj | 7 ++++++- vsprojects/vs2013/grpc_csharp_ext_shared.vcxproj | 7 ++++++- vsprojects/vs2013/grpc_shared.vcxproj | 7 ++++++- vsprojects/vs2013/grpc_test_util.vcxproj | 7 ++++++- vsprojects/vs2013/grpc_unsecure.vcxproj | 7 ++++++- 10 files changed, 60 insertions(+), 10 deletions(-) diff --git a/templates/vsprojects/vs2013/vcxproj_defs.include b/templates/vsprojects/vs2013/vcxproj_defs.include index c8e6fd3c06c..2bdf0b94ea9 100644 --- a/templates/vsprojects/vs2013/vcxproj_defs.include +++ b/templates/vsprojects/vs2013/vcxproj_defs.include @@ -52,7 +52,12 @@ % endfor - + + ${name} + + + ${name} + NotUsing diff --git a/vsprojects/vs2013/gpr.vcxproj b/vsprojects/vs2013/gpr.vcxproj index e54029390da..959ea331a12 100644 --- a/vsprojects/vs2013/gpr.vcxproj +++ b/vsprojects/vs2013/gpr.vcxproj @@ -41,7 +41,12 @@ - + + gpr + + + gpr + NotUsing diff --git a/vsprojects/vs2013/gpr_shared.vcxproj b/vsprojects/vs2013/gpr_shared.vcxproj index e52eac8d176..0b3d4eab7c6 100644 --- a/vsprojects/vs2013/gpr_shared.vcxproj +++ b/vsprojects/vs2013/gpr_shared.vcxproj @@ -41,7 +41,12 @@ - + + gpr + + + gpr + NotUsing diff --git a/vsprojects/vs2013/gpr_test_util.vcxproj b/vsprojects/vs2013/gpr_test_util.vcxproj index 544d737bdaf..59e9ef2aefa 100644 --- a/vsprojects/vs2013/gpr_test_util.vcxproj +++ b/vsprojects/vs2013/gpr_test_util.vcxproj @@ -41,7 +41,12 @@ - + + gpr_test_util + + + gpr_test_util + NotUsing diff --git a/vsprojects/vs2013/grpc.vcxproj b/vsprojects/vs2013/grpc.vcxproj index 12428bd4b16..bd87569a3f9 100644 --- a/vsprojects/vs2013/grpc.vcxproj +++ b/vsprojects/vs2013/grpc.vcxproj @@ -41,7 +41,12 @@ - + + grpc + + + grpc + NotUsing diff --git a/vsprojects/vs2013/grpc_csharp_ext.vcxproj b/vsprojects/vs2013/grpc_csharp_ext.vcxproj index 0f355661869..d3ac4725595 100644 --- a/vsprojects/vs2013/grpc_csharp_ext.vcxproj +++ b/vsprojects/vs2013/grpc_csharp_ext.vcxproj @@ -41,7 +41,12 @@ - + + grpc_csharp_ext + + + grpc_csharp_ext + NotUsing diff --git a/vsprojects/vs2013/grpc_csharp_ext_shared.vcxproj b/vsprojects/vs2013/grpc_csharp_ext_shared.vcxproj index 6ad268e0e97..3c55e608c18 100644 --- a/vsprojects/vs2013/grpc_csharp_ext_shared.vcxproj +++ b/vsprojects/vs2013/grpc_csharp_ext_shared.vcxproj @@ -43,7 +43,12 @@ - + + grpc_csharp_ext + + + grpc_csharp_ext + NotUsing diff --git a/vsprojects/vs2013/grpc_shared.vcxproj b/vsprojects/vs2013/grpc_shared.vcxproj index 53886467673..b1890cf6e73 100644 --- a/vsprojects/vs2013/grpc_shared.vcxproj +++ b/vsprojects/vs2013/grpc_shared.vcxproj @@ -45,7 +45,12 @@ - + + grpc + + + grpc + NotUsing diff --git a/vsprojects/vs2013/grpc_test_util.vcxproj b/vsprojects/vs2013/grpc_test_util.vcxproj index e0e33c0086e..a935fb4feb0 100644 --- a/vsprojects/vs2013/grpc_test_util.vcxproj +++ b/vsprojects/vs2013/grpc_test_util.vcxproj @@ -41,7 +41,12 @@ - + + grpc_test_util + + + grpc_test_util + NotUsing diff --git a/vsprojects/vs2013/grpc_unsecure.vcxproj b/vsprojects/vs2013/grpc_unsecure.vcxproj index 3dab86c6e94..0e5bdae62f3 100644 --- a/vsprojects/vs2013/grpc_unsecure.vcxproj +++ b/vsprojects/vs2013/grpc_unsecure.vcxproj @@ -41,7 +41,12 @@ - + + grpc_unsecure + + + grpc_unsecure + NotUsing From 8f24bec047e17154c1514174cd939f9472f433b8 Mon Sep 17 00:00:00 2001 From: Jan Tattermusch Date: Wed, 11 Feb 2015 15:12:21 -0800 Subject: [PATCH 6/6] set RuntimeLibrary for zlib project to default --- vsprojects/vs2013/third_party/zlibvc.vcxproj | 2 -- 1 file changed, 2 deletions(-) diff --git a/vsprojects/vs2013/third_party/zlibvc.vcxproj b/vsprojects/vs2013/third_party/zlibvc.vcxproj index b8f0dc10ba1..fb8dea583fe 100644 --- a/vsprojects/vs2013/third_party/zlibvc.vcxproj +++ b/vsprojects/vs2013/third_party/zlibvc.vcxproj @@ -58,7 +58,6 @@ WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreadedDebugDLL false $(IntDir)zlibvc.pch $(IntDir) @@ -110,7 +109,6 @@ true - MultiThreaded false true $(IntDir)zlibvc.pch