Merge branch 'cleaner-build' into third-coming

pull/3097/head
Craig Tiller 9 years ago
commit e0b8a42552
  1. 1
      BUILD
  2. 8710
      Makefile
  3. 2689
      build.json
  4. 1000
      build.yaml
  5. 454
      templates/BUILD.template
  6. 3696
      templates/Makefile.template
  7. 308
      templates/gRPC.podspec.template
  8. 78
      templates/src/core/surface/version.c.template
  9. 6
      templates/tools/doxygen/Doxyfile.c++.internal.template
  10. 6
      templates/tools/doxygen/Doxyfile.c++.template
  11. 6
      templates/tools/doxygen/Doxyfile.core.internal.template
  12. 6
      templates/tools/doxygen/Doxyfile.core.template
  13. 62
      templates/tools/run_tests/sources_and_headers.json.template
  14. 26
      templates/tools/run_tests/tests.json.template
  15. 414
      templates/vsprojects/Grpc.mak.template
  16. 18
      templates/vsprojects/cpptest.props.template
  17. 16
      templates/vsprojects/global.props.template
  18. 2
      templates/vsprojects/gpr/gpr.vcxproj.filters.template
  19. 2
      templates/vsprojects/gpr/gpr.vcxproj.template
  20. 2
      templates/vsprojects/gpr_test_util/gpr_test_util.vcxproj.template
  21. 2
      templates/vsprojects/grpc++/grpc++.vcxproj.filters.template
  22. 2
      templates/vsprojects/grpc++/grpc++.vcxproj.template
  23. 6
      templates/vsprojects/grpc++_unsecure/grpc++_unsecure.vcxproj.filters.template
  24. 6
      templates/vsprojects/grpc++_unsecure/grpc++_unsecure.vcxproj.template
  25. 7
      templates/vsprojects/grpc+tests.sln.template
  26. 12
      templates/vsprojects/grpc.sln.template
  27. 2
      templates/vsprojects/grpc/grpc.vcxproj.filters.template
  28. 2
      templates/vsprojects/grpc/grpc.vcxproj.template
  29. 2
      templates/vsprojects/grpc/packages.config.template
  30. 6
      templates/vsprojects/grpc_cpp_plugin/grpc_cpp_plugin.vcxproj.template
  31. 12
      templates/vsprojects/grpc_csharp_ext.sln.template
  32. 2
      templates/vsprojects/grpc_csharp_ext/grpc_csharp_ext.vcxproj.template
  33. 2
      templates/vsprojects/grpc_csharp_ext/packages.config.template
  34. 6
      templates/vsprojects/grpc_csharp_plugin/grpc_csharp_plugin.vcxproj.template
  35. 6
      templates/vsprojects/grpc_objective_c_plugin/grpc_objective_c_plugin.vcxproj.template
  36. 2
      templates/vsprojects/grpc_plugin_support/grpc_plugin_support.vcxproj.template
  37. 12
      templates/vsprojects/grpc_protoc_plugins.sln.template
  38. 6
      templates/vsprojects/grpc_python_plugin/grpc_python_plugin.vcxproj.template
  39. 6
      templates/vsprojects/grpc_ruby_plugin/grpc_ruby_plugin.vcxproj.template
  40. 2
      templates/vsprojects/grpc_test_util/grpc_test_util.vcxproj.template
  41. 2
      templates/vsprojects/grpc_test_util_unsecure/grpc_test_util_unsecure.vcxproj.template
  42. 2
      templates/vsprojects/grpc_unsecure/grpc_unsecure.vcxproj.filters.template
  43. 2
      templates/vsprojects/grpc_unsecure/grpc_unsecure.vcxproj.template
  44. 2
      templates/vsprojects/grpc_unsecure/packages.config.template
  45. 13
      templates/vsprojects/openssl.props.template
  46. 81
      templates/vsprojects/packages.include
  47. 13
      templates/vsprojects/protobuf.props.template
  48. 13
      templates/vsprojects/protoc.props.template
  49. 8
      templates/vsprojects/sln_defs.include
  50. 8
      templates/vsprojects/vcxproj.filters_defs.include
  51. 18
      templates/vsprojects/vcxproj.template
  52. 80
      templates/vsprojects/vcxproj_defs.include
  53. 14
      templates/vsprojects/winsock.props.template
  54. 15
      templates/vsprojects/zlib-dll.props.template
  55. 15
      templates/vsprojects/zlib.props.template
  56. 7
      test/core/bad_client/gen_build_yaml.py
  57. 0
      test/core/end2end/fixtures/h2_compress.c
  58. 0
      test/core/end2end/fixtures/h2_fakesec.c
  59. 0
      test/core/end2end/fixtures/h2_full+poll.c
  60. 0
      test/core/end2end/fixtures/h2_full.c
  61. 0
      test/core/end2end/fixtures/h2_oauth2.c
  62. 0
      test/core/end2end/fixtures/h2_proxy.c
  63. 0
      test/core/end2end/fixtures/h2_sockpair+trace.c
  64. 0
      test/core/end2end/fixtures/h2_sockpair.c
  65. 0
      test/core/end2end/fixtures/h2_sockpair_1byte.c
  66. 0
      test/core/end2end/fixtures/h2_ssl+poll.c
  67. 0
      test/core/end2end/fixtures/h2_ssl.c
  68. 0
      test/core/end2end/fixtures/h2_ssl_proxy.c
  69. 0
      test/core/end2end/fixtures/h2_uds+poll.c
  70. 0
      test/core/end2end/fixtures/h2_uds.c
  71. 71
      test/core/end2end/gen_build_yaml.py
  72. 0
      test/core/end2end/tests/binary_metadata.c
  73. 0
      test/core/end2end/tests/call_creds.c
  74. 0
      test/core/end2end/tests/cancel_after_client_done.c
  75. 0
      test/core/end2end/tests/compressed_payload.c
  76. 0
      test/core/end2end/tests/high_initial_seqno.c
  77. 0
      test/core/end2end/tests/large_metadata.c
  78. 0
      test/core/end2end/tests/metadata.c
  79. 0
      test/core/end2end/tests/payload.c
  80. 0
      test/core/end2end/tests/shutdown_finishes_calls.c
  81. 0
      test/core/end2end/tests/shutdown_finishes_tags.c
  82. 0
      test/core/end2end/tests/trailing_metadata.c
  83. 4
      test/core/util/reconnect_server.c
  84. 2
      test/cpp/qps/client_sync.cc
  85. 1
      test/cpp/qps/driver.cc
  86. 3
      test/cpp/qps/server_async.cc
  87. 2
      test/cpp/qps/server_sync.cc
  88. 15
      tools/buildgen/build-cleaner.py
  89. 6
      tools/buildgen/generate_build_additions.sh
  90. 6
      tools/buildgen/generate_projects-old.sh
  91. 4
      tools/buildgen/generate_projects.sh
  92. 57
      tools/buildgen/mako_renderer.py
  93. 2
      tools/buildgen/plugins/expand_bin_attrs.py
  94. 4
      tools/buildgen/plugins/expand_filegroups.py
  95. 33
      tools/buildgen/plugins/generate_vsprojects.py
  96. 2
      tools/buildgen/plugins/list_protos.py
  97. 4390
      tools/run_tests/sources_and_headers.json
  98. 4902
      tools/run_tests/tests.json
  99. 6098
      vsprojects/Grpc.mak
  100. 19
      vsprojects/cpptest.props
  101. Some files were not shown because too many files have changed in this diff Show More

@ -769,6 +769,7 @@ cc_library(
".", ".",
], ],
deps = [ deps = [
"//external:libssl",
"//external:protobuf_clib", "//external:protobuf_clib",
":gpr", ":gpr",
":grpc", ":grpc",

8710
Makefile

File diff suppressed because one or more lines are too long

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

@ -1,227 +1,229 @@
# GRPC Bazel BUILD file. %YAML 1.2
# This currently builds C, C++ and Objective-C code. --- |
# This file has been automatically generated from a template file. # GRPC Bazel BUILD file.
# Please look at the templates directory instead. # This currently builds C, C++ and Objective-C code.
# This file can be regenerated from the template by running # This file has been automatically generated from a template file.
# tools/buildgen/generate_projects.sh # Please look at the templates directory instead.
# This file can be regenerated from the template by running
# Copyright 2015, Google Inc. # tools/buildgen/generate_projects.sh
# All rights reserved.
# # Copyright 2015, Google Inc.
# Redistribution and use in source and binary forms, with or without # All rights reserved.
# modification, are permitted provided that the following conditions are #
# met: # Redistribution and use in source and binary forms, with or without
# # modification, are permitted provided that the following conditions are
# * Redistributions of source code must retain the above copyright # met:
# notice, this list of conditions and the following disclaimer. #
# * Redistributions in binary form must reproduce the above # * Redistributions of source code must retain the above copyright
# copyright notice, this list of conditions and the following disclaimer # notice, this list of conditions and the following disclaimer.
# in the documentation and/or other materials provided with the # * Redistributions in binary form must reproduce the above
# distribution. # copyright notice, this list of conditions and the following disclaimer
# * Neither the name of Google Inc. nor the names of its # in the documentation and/or other materials provided with the
# contributors may be used to endorse or promote products derived from # distribution.
# this software without specific prior written permission. # * Neither the name of Google Inc. nor the names of its
# # contributors may be used to endorse or promote products derived from
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS # this software without specific prior written permission.
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT #
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT # "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, # LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT # A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, # OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY # SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT # LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
licenses(["notice"]) # 3-clause BSD # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
package(default_visibility = ["//visibility:public"]) licenses(["notice"]) # 3-clause BSD
<%! package(default_visibility = ["//visibility:public"])
def get_deps(target_dict):
deps = [] <%!
if target_dict.get('secure', 'no') == 'yes': def get_deps(target_dict):
deps = []
if target_dict.get('secure', False):
deps = [
"//external:libssl",
]
if target_dict.get('build', None) == 'protoc':
deps.append("//external:protobuf_compiler")
if target_dict['name'] == 'grpc++_unsecure' or target_dict['name'] == 'grpc++':
deps.append("//external:protobuf_clib")
elif target_dict['name'] == 'grpc':
deps.append("//external:zlib")
for d in target_dict.get('deps', []):
if d.find('//') == 0 or d[0] == ':':
deps.append(d)
else:
deps.append(':%s' % (d))
return deps
%>
% for lib in libs:
% if lib.build in ("all", "protoc"):
${cc_library(lib)}
% endif
% endfor
% for lib in libs:
% if lib.name in ("grpc", "gpr"):
${objc_library(lib)}
% endif
% endfor
% for tgt in targets:
% if tgt.build == 'protoc':
${cc_binary(tgt)}
% endif
% endfor
<%def name="cc_library(lib)">
cc_library(
name = "${lib.name}",
srcs = [
% for hdr in lib.get("headers", []):
"${hdr}",
% endfor
% for src in lib.src:
"${src}",
% endfor
],
hdrs = [
% for hdr in lib.get("public_headers", []):
"${hdr}",
% endfor
],
includes = [
"include",
".",
],
deps = [ deps = [
"//external:libssl", % for dep in get_deps(lib):
] "${dep}",
if target_dict.get('build', None) == 'protoc': % endfor
deps.append("//external:protobuf_compiler") ],
if target_dict['name'] == 'grpc++_unsecure' or target_dict['name'] == 'grpc++': )
deps.append("//external:protobuf_clib") </%def>
elif target_dict['name'] == 'grpc':
deps.append("//external:zlib") <%def name="objc_library(lib)">
for d in target_dict.get('deps', []): objc_library(
if d.find('//') == 0 or d[0] == ':': name = "${lib.name}_objc",
deps.append(d) srcs = [
else: % for src in lib.src:
deps.append(':%s' % (d)) "${src}",
return deps % endfor
%> ],
hdrs = [
% for lib in libs: % for hdr in lib.get("public_headers", []):
% if lib.build in ("all", "protoc"): "${hdr}",
${cc_library(lib)} % endfor
% endif % for hdr in lib.get("headers", []):
% endfor "${hdr}",
% endfor
% for lib in libs: ],
% if lib.name in ("grpc", "gpr"): includes = [
${objc_library(lib)} "include",
% endif ".",
% endfor ],
deps = [
% for tgt in targets: % for dep in lib.get("deps", []):
% if tgt.build == 'protoc': ":${dep}_objc",
${cc_binary(tgt)} % endfor
% endif % if lib.get('secure', False):
% endfor "//external:libssl_objc",
% endif
<%def name="cc_library(lib)"> ],
cc_library( % if lib.get("baselib", false):
name = "${lib.name}", sdk_dylibs = ["libz"],
srcs = [ % endif
% for hdr in lib.get("headers", []): )
"${hdr}", </%def>
% endfor
% for src in lib.src: <%def name="cc_binary(tgt)">
"${src}", cc_binary(
% endfor name = "${tgt.name}",
], srcs = [
hdrs = [ % for src in tgt.src:
% for hdr in lib.get("public_headers", []): "${src}",
"${hdr}", % endfor
% endfor ],
], deps = [
includes = [ % for dep in get_deps(tgt):
"include", "${dep}",
".", % endfor
], ],
deps = [ )
% for dep in get_deps(lib): </%def>
"${dep}",
% endfor objc_path = "src/objective-c"
],
) rx_library_path = objc_path + "/RxLibrary"
</%def>
objc_library(
<%def name="objc_library(lib)"> name = "rx_library",
objc_library( hdrs = glob([
name = "${lib.name}_objc", rx_library_path + "/*.h",
srcs = [ rx_library_path + "/transformations/*.h",
% for src in lib.src: ]),
"${src}", srcs = glob([
% endfor rx_library_path + "/*.m",
], rx_library_path + "/transformations/*.m",
hdrs = [ ]),
% for hdr in lib.get("public_headers", []): includes = [objc_path],
"${hdr}", deps = [
% endfor ":rx_library_private",
% for hdr in lib.get("headers", []): ],
"${hdr}", )
% endfor
], objc_library(
includes = [ name = "rx_library_private",
"include", hdrs = glob([rx_library_path + "/private/*.h"]),
".", srcs = glob([rx_library_path + "/private/*.m"]),
], visibility = ["//visibility:private"],
deps = [ )
% for dep in lib.get("deps", []):
":${dep}_objc", objc_client_path = objc_path + "/GRPCClient"
% endfor
% if lib.get('secure', 'no') == 'yes': objc_library(
"//external:libssl_objc", name = "grpc_client",
% endif hdrs = glob([
], objc_client_path + "/*.h",
% if lib.get("baselib", false): objc_client_path + "/private/*.h",
sdk_dylibs = ["libz"], ]),
% endif srcs = glob([
) objc_client_path + "/*.m",
</%def> objc_client_path + "/private/*.m",
]),
<%def name="cc_binary(tgt)"> includes = [objc_path],
cc_binary( bundles = [":gRPCCertificates"],
name = "${tgt.name}", deps = [
srcs = [ ":grpc_objc",
% for src in tgt.src: ":rx_library",
"${src}", ],
% endfor )
],
deps = [ objc_bundle_library(
% for dep in get_deps(tgt): # The choice of name is signicant here, since it determines the bundle name.
"${dep}", name = "gRPCCertificates",
% endfor resources = ["etc/roots.pem"],
], )
)
</%def> proto_objc_rpc_path = objc_path + "/ProtoRPC"
objc_path = "src/objective-c" objc_library(
name = "proto_objc_rpc",
rx_library_path = objc_path + "/RxLibrary" hdrs = glob([
proto_objc_rpc_path + "/*.h",
objc_library( ]),
name = "rx_library", srcs = glob([
hdrs = glob([ proto_objc_rpc_path + "/*.m",
rx_library_path + "/*.h", ]),
rx_library_path + "/transformations/*.h", includes = [objc_path],
]), deps = [
srcs = glob([ ":grpc_client",
rx_library_path + "/*.m", ":rx_library",
rx_library_path + "/transformations/*.m", "//external:protobuf_objc",
]), ],
includes = [objc_path], )
deps = [
":rx_library_private",
],
)
objc_library(
name = "rx_library_private",
hdrs = glob([rx_library_path + "/private/*.h"]),
srcs = glob([rx_library_path + "/private/*.m"]),
visibility = ["//visibility:private"],
)
objc_client_path = objc_path + "/GRPCClient"
objc_library(
name = "grpc_client",
hdrs = glob([
objc_client_path + "/*.h",
objc_client_path + "/private/*.h",
]),
srcs = glob([
objc_client_path + "/*.m",
objc_client_path + "/private/*.m",
]),
includes = [objc_path],
bundles = [":gRPCCertificates"],
deps = [
":grpc_objc",
":rx_library",
],
)
objc_bundle_library(
# The choice of name is signicant here, since it determines the bundle name.
name = "gRPCCertificates",
resources = ["etc/roots.pem"],
)
proto_objc_rpc_path = objc_path + "/ProtoRPC"
objc_library(
name = "proto_objc_rpc",
hdrs = glob([
proto_objc_rpc_path + "/*.h",
]),
srcs = glob([
proto_objc_rpc_path + "/*.m",
]),
includes = [objc_path],
deps = [
":grpc_client",
":rx_library",
"//external:protobuf_objc",
],
)

File diff suppressed because it is too large Load Diff

@ -1,155 +1,157 @@
# GRPC CocoaPods podspec %YAML 1.2
# This file has been automatically generated from a template file. --- |
# Please look at the templates directory instead. # GRPC CocoaPods podspec
# This file can be regenerated from the template by running # This file has been automatically generated from a template file.
# tools/buildgen/generate_projects.sh # Please look at the templates directory instead.
# This file can be regenerated from the template by running
# Copyright 2015, Google Inc. # tools/buildgen/generate_projects.sh
# All rights reserved.
# # Copyright 2015, Google Inc.
# Redistribution and use in source and binary forms, with or without # All rights reserved.
# modification, are permitted provided that the following conditions are
# met:
#
# * Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
# * Redistributions in binary form must reproduce the above
# copyright notice, this list of conditions and the following disclaimer
# in the documentation and/or other materials provided with the
# distribution.
# * Neither the name of Google Inc. nor the names of its
# contributors may be used to endorse or promote products derived from
# this software without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
<%!
bad_header_names = ('time.h', 'string.h')
def fix_header_name(name):
split_name = name.split('/')
if split_name[-1] in bad_header_names:
split_name[-1] = 'grpc_' + split_name[-1]
if split_name[0] == 'include':
split_name = split_name[1:]
return '/'.join(split_name)
def grpc_files(libs):
out = []
for lib in libs:
if lib.name in ("grpc", "gpr"):
out.extend(fix_header_name(h) for h in lib.get('headers', []))
out.extend(fix_header_name(h) for h in lib.get('public_headers', []))
out.extend(lib.get('src', []))
return out;
def grpc_private_headers(libs):
out = []
for lib in libs:
if lib.name in ("grpc", "gpr"):
out.extend(lib.get('headers', []))
return out
%>
Pod::Spec.new do |s|
s.name = 'gRPC'
s.version = '0.7.0'
s.summary = 'gRPC client library for iOS/OSX'
s.homepage = 'http://www.grpc.io'
s.license = 'New BSD'
s.authors = { 'The gRPC contributors' => 'grpc-packages@google.com' }
# s.source = { :git => 'https://github.com/grpc/grpc.git',
# :tag => 'release-0_10_0-objectivec-0.6.0' }
s.ios.deployment_target = '6.0'
s.osx.deployment_target = '10.8'
s.requires_arc = true
objc_dir = 'src/objective-c'
# Reactive Extensions library for iOS.
s.subspec 'RxLibrary' do |ss|
src_dir = "#{objc_dir}/RxLibrary"
ss.source_files = "#{src_dir}/*.{h,m}", "#{src_dir}/**/*.{h,m}"
ss.private_header_files = "#{src_dir}/private/*.h"
ss.header_mappings_dir = "#{objc_dir}"
end
# Core cross-platform gRPC library, written in C.
s.subspec 'C-Core' do |ss|
ss.source_files = ${(',\n' + 22*' ').join('\'%s\'' % f for f in grpc_files(libs))}
ss.private_header_files = ${(',\n' + 30*' ').join('\'%s\'' % f for f in grpc_private_headers(libs))}
ss.header_mappings_dir = '.'
ss.requires_arc = false
ss.libraries = 'z'
ss.dependency 'OpenSSL', '~> 1.0.200'
# ss.compiler_flags = '-GCC_WARN_INHIBIT_ALL_WARNINGS', '-w'
end
# This is a workaround for Cocoapods Issue #1437.
# It renames time.h and string.h to grpc_time.h and grpc_string.h.
# It needs to be here (top-level) instead of in the C-Core subspec because Cocoapods doesn't run
# prepare_command's of subspecs.
# #
# TODO(jcanizales): Try out others' solutions at Issue #1437. # Redistribution and use in source and binary forms, with or without
s.prepare_command = <<-CMD # modification, are permitted provided that the following conditions are
# Move contents of include up a level to avoid manually specifying include paths # met:
cp -r "include/grpc" "." #
# * Redistributions of source code must retain the above copyright
DIR_TIME="grpc/support" # notice, this list of conditions and the following disclaimer.
BAD_TIME="$DIR_TIME/time.h" # * Redistributions in binary form must reproduce the above
GOOD_TIME="$DIR_TIME/grpc_time.h" # copyright notice, this list of conditions and the following disclaimer
grep -rl "$BAD_TIME" grpc src/core src/objective-c/GRPCClient | xargs sed -i '' -e s@$BAD_TIME@$GOOD_TIME@g # in the documentation and/or other materials provided with the
if [ -f "$BAD_TIME" ]; # distribution.
then # * Neither the name of Google Inc. nor the names of its
mv -f "$BAD_TIME" "$GOOD_TIME" # contributors may be used to endorse or promote products derived from
fi # this software without specific prior written permission.
#
DIR_STRING="src/core/support" # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
BAD_STRING="$DIR_STRING/string.h" # "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
GOOD_STRING="$DIR_STRING/grpc_string.h" # LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
grep -rl "$BAD_STRING" grpc src/core src/objective-c/GRPCClient | xargs sed -i '' -e s@$BAD_STRING@$GOOD_STRING@g # A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
if [ -f "$BAD_STRING" ]; # OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
then # SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
mv -f "$BAD_STRING" "$GOOD_STRING" # LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
fi # DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
CMD # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# Objective-C wrapper around the core gRPC library. # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
s.subspec 'GRPCClient' do |ss|
src_dir = "#{objc_dir}/GRPCClient" <%!
ss.source_files = "#{src_dir}/*.{h,m}", "#{src_dir}/**/*.{h,m}" bad_header_names = ('time.h', 'string.h')
ss.private_header_files = "#{src_dir}/private/*.h" def fix_header_name(name):
ss.header_mappings_dir = "#{objc_dir}" split_name = name.split('/')
if split_name[-1] in bad_header_names:
ss.dependency 'gRPC/C-Core' split_name[-1] = 'grpc_' + split_name[-1]
ss.dependency 'gRPC/RxLibrary' if split_name[0] == 'include':
split_name = split_name[1:]
# Certificates, to be able to establish TLS connections: return '/'.join(split_name)
ss.resource_bundles = { 'gRPCCertificates' => ['etc/roots.pem'] }
end def grpc_files(libs):
out = []
# RPC library for ProtocolBuffers, based on gRPC for lib in libs:
s.subspec 'ProtoRPC' do |ss| if lib.name in ("grpc", "gpr"):
src_dir = "#{objc_dir}/ProtoRPC" out.extend(fix_header_name(h) for h in lib.get('headers', []))
ss.source_files = "#{src_dir}/*.{h,m}" out.extend(fix_header_name(h) for h in lib.get('public_headers', []))
ss.header_mappings_dir = "#{objc_dir}" out.extend(lib.get('src', []))
return out;
ss.dependency 'gRPC/GRPCClient'
ss.dependency 'gRPC/RxLibrary' def grpc_private_headers(libs):
ss.dependency 'Protobuf', '~> 3.0.0-alpha-3' out = []
for lib in libs:
if lib.name in ("grpc", "gpr"):
out.extend(lib.get('headers', []))
return out
%>
Pod::Spec.new do |s|
s.name = 'gRPC'
s.version = '0.7.0'
s.summary = 'gRPC client library for iOS/OSX'
s.homepage = 'http://www.grpc.io'
s.license = 'New BSD'
s.authors = { 'The gRPC contributors' => 'grpc-packages@google.com' }
# s.source = { :git => 'https://github.com/grpc/grpc.git',
# :tag => 'release-0_10_0-objectivec-0.6.0' }
s.ios.deployment_target = '6.0'
s.osx.deployment_target = '10.8'
s.requires_arc = true
objc_dir = 'src/objective-c'
# Reactive Extensions library for iOS.
s.subspec 'RxLibrary' do |ss|
src_dir = "#{objc_dir}/RxLibrary"
ss.source_files = "#{src_dir}/*.{h,m}", "#{src_dir}/**/*.{h,m}"
ss.private_header_files = "#{src_dir}/private/*.h"
ss.header_mappings_dir = "#{objc_dir}"
end
# Core cross-platform gRPC library, written in C.
s.subspec 'C-Core' do |ss|
ss.source_files = ${(',\n' + 22*' ').join('\'%s\'' % f for f in grpc_files(libs))}
ss.private_header_files = ${(',\n' + 30*' ').join('\'%s\'' % f for f in grpc_private_headers(libs))}
ss.header_mappings_dir = '.'
ss.requires_arc = false
ss.libraries = 'z'
ss.dependency 'OpenSSL', '~> 1.0.200'
# ss.compiler_flags = '-GCC_WARN_INHIBIT_ALL_WARNINGS', '-w'
end
# This is a workaround for Cocoapods Issue #1437.
# It renames time.h and string.h to grpc_time.h and grpc_string.h.
# It needs to be here (top-level) instead of in the C-Core subspec because Cocoapods doesn't run
# prepare_command's of subspecs.
#
# TODO(jcanizales): Try out others' solutions at Issue #1437.
s.prepare_command = <<-CMD
# Move contents of include up a level to avoid manually specifying include paths
cp -r "include/grpc" "."
DIR_TIME="grpc/support"
BAD_TIME="$DIR_TIME/time.h"
GOOD_TIME="$DIR_TIME/grpc_time.h"
grep -rl "$BAD_TIME" grpc src/core src/objective-c/GRPCClient | xargs sed -i '' -e s@$BAD_TIME@$GOOD_TIME@g
if [ -f "$BAD_TIME" ];
then
mv -f "$BAD_TIME" "$GOOD_TIME"
fi
DIR_STRING="src/core/support"
BAD_STRING="$DIR_STRING/string.h"
GOOD_STRING="$DIR_STRING/grpc_string.h"
grep -rl "$BAD_STRING" grpc src/core src/objective-c/GRPCClient | xargs sed -i '' -e s@$BAD_STRING@$GOOD_STRING@g
if [ -f "$BAD_STRING" ];
then
mv -f "$BAD_STRING" "$GOOD_STRING"
fi
CMD
# Objective-C wrapper around the core gRPC library.
s.subspec 'GRPCClient' do |ss|
src_dir = "#{objc_dir}/GRPCClient"
ss.source_files = "#{src_dir}/*.{h,m}", "#{src_dir}/**/*.{h,m}"
ss.private_header_files = "#{src_dir}/private/*.h"
ss.header_mappings_dir = "#{objc_dir}"
ss.dependency 'gRPC/C-Core'
ss.dependency 'gRPC/RxLibrary'
# Certificates, to be able to establish TLS connections:
ss.resource_bundles = { 'gRPCCertificates' => ['etc/roots.pem'] }
end
# RPC library for ProtocolBuffers, based on gRPC
s.subspec 'ProtoRPC' do |ss|
src_dir = "#{objc_dir}/ProtoRPC"
ss.source_files = "#{src_dir}/*.{h,m}"
ss.header_mappings_dir = "#{objc_dir}"
ss.dependency 'gRPC/GRPCClient'
ss.dependency 'gRPC/RxLibrary'
ss.dependency 'Protobuf', '~> 3.0.0-alpha-3'
end
end end
end

@ -1,41 +1,43 @@
/* %YAML 1.2
* --- |
* Copyright 2015, Google Inc. /*
* All rights reserved. *
* * Copyright 2015, Google Inc.
* Redistribution and use in source and binary forms, with or without * All rights reserved.
* modification, are permitted provided that the following conditions are *
* met: * Redistribution and use in source and binary forms, with or without
* * modification, are permitted provided that the following conditions are
* * Redistributions of source code must retain the above copyright * met:
* notice, this list of conditions and the following disclaimer. *
* * Redistributions in binary form must reproduce the above * * Redistributions of source code must retain the above copyright
* copyright notice, this list of conditions and the following disclaimer * notice, this list of conditions and the following disclaimer.
* in the documentation and/or other materials provided with the * * Redistributions in binary form must reproduce the above
* distribution. * copyright notice, this list of conditions and the following disclaimer
* * Neither the name of Google Inc. nor the names of its * in the documentation and/or other materials provided with the
* contributors may be used to endorse or promote products derived from * distribution.
* this software without specific prior written permission. * * Neither the name of Google Inc. nor the names of its
* * contributors may be used to endorse or promote products derived from
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * this software without specific prior written permission.
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT *
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
*/ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
*/
/* This file is autogenerated from: /* This file is autogenerated from:
templates/src/core/surface/version.c.template */ templates/src/core/surface/version.c.template */
#include <grpc/grpc.h> #include <grpc/grpc.h>
const char *grpc_version_string(void) { const char *grpc_version_string(void) {
return "${settings.version.major}.${settings.version.minor}.${settings.version.micro}.${settings.version.build}"; return "${settings.version.major}.${settings.version.minor}.${settings.version.micro}.${settings.version.build}";
} }

@ -1,2 +1,4 @@
<%namespace file="Doxyfile.include" import="gen_doxyfile"/>\ %YAML 1.2
${gen_doxyfile(['grpc++'], 'C++', libs, True)} --- |
<%namespace file="Doxyfile.include" import="gen_doxyfile"/>\
${gen_doxyfile(['grpc++'], 'C++', libs, True)}

@ -1,2 +1,4 @@
<%namespace file="Doxyfile.include" import="gen_doxyfile"/>\ %YAML 1.2
${gen_doxyfile(['grpc++'], 'C++', libs, False)} --- |
<%namespace file="Doxyfile.include" import="gen_doxyfile"/>\
${gen_doxyfile(['grpc++'], 'C++', libs, False)}

@ -1,2 +1,4 @@
<%namespace file="Doxyfile.include" import="gen_doxyfile"/>\ %YAML 1.2
${gen_doxyfile(['grpc', 'gpr'], 'Core', libs, True)} --- |
<%namespace file="Doxyfile.include" import="gen_doxyfile"/>\
${gen_doxyfile(['grpc', 'gpr'], 'Core', libs, True)}

@ -1,2 +1,4 @@
<%namespace file="Doxyfile.include" import="gen_doxyfile"/>\ %YAML 1.2
${gen_doxyfile(['grpc', 'gpr'], 'Core', libs, False)} --- |
<%namespace file="Doxyfile.include" import="gen_doxyfile"/>\
${gen_doxyfile(['grpc', 'gpr'], 'Core', libs, False)}

@ -1,33 +1,35 @@
<%! %YAML 1.2
import json --- |
import os <%!
import json
import os
def proto_headers(src): def proto_headers(src):
out = [] out = []
for f in src: for f in src:
name, ext = os.path.splitext(f) name, ext = os.path.splitext(f)
if ext == '.proto': if ext == '.proto':
out.extend(fmt % name for fmt in ['%s.grpc.pb.h', '%s.pb.h']) out.extend(fmt % name for fmt in ['%s.grpc.pb.h', '%s.pb.h'])
return out return out
def no_protos(src): def no_protos(src):
out = [] out = []
for f in src: for f in src:
if os.path.splitext(f)[1] != '.proto': if os.path.splitext(f)[1] != '.proto':
out.append(f) out.append(f)
return out return out
%> %>
${json.dumps([{"name": tgt.name, ${json.dumps([{"name": tgt.name,
"language": tgt.language, "language": tgt.language,
"src": sorted( "src": sorted(
no_protos(tgt.src) + no_protos(tgt.src) +
tgt.get('public_headers', []) + tgt.get('public_headers', []) +
tgt.get('headers', [])), tgt.get('headers', [])),
"headers": sorted( "headers": sorted(
tgt.get('public_headers', []) + tgt.get('public_headers', []) +
tgt.get('headers', []) + tgt.get('headers', []) +
proto_headers(tgt.src)), proto_headers(tgt.src)),
"deps": sorted(tgt.get('deps', []))} "deps": sorted(tgt.get('deps', []))}
for tgt in (targets + libs)], for tgt in (targets + libs)],
sort_keys=True, indent=2)} sort_keys=True, indent=2)}

@ -1,13 +1,15 @@
<%! %YAML 1.2
import json --- |
%> <%!
import json
%>
${json.dumps([{"name": tgt.name, ${json.dumps([{"name": tgt.name,
"language": tgt.language, "language": tgt.language,
"platforms": tgt.platforms, "platforms": tgt.platforms,
"ci_platforms": tgt.ci_platforms, "ci_platforms": tgt.ci_platforms,
"exclude_configs": tgt.get("exclude_configs", []), "exclude_configs": tgt.get("exclude_configs", []),
"flaky": tgt.flaky} "flaky": tgt.flaky}
for tgt in targets for tgt in targets
if tgt.get('run', True) and tgt.build == 'test'], if tgt.get('run', True) and tgt.build == 'test'],
sort_keys=True, indent=2)} sort_keys=True, indent=2)}

@ -1,206 +1,208 @@
# Copyright 2015, Google Inc. %YAML 1.2
# All rights reserved. --- |
# # Copyright 2015, Google Inc.
# Redistribution and use in source and binary forms, with or without # All rights reserved.
# modification, are permitted provided that the following conditions are #
# met: # Redistribution and use in source and binary forms, with or without
# # modification, are permitted provided that the following conditions are
# * Redistributions of source code must retain the above copyright # met:
# notice, this list of conditions and the following disclaimer. #
# * Redistributions in binary form must reproduce the above # * Redistributions of source code must retain the above copyright
# copyright notice, this list of conditions and the following disclaimer # notice, this list of conditions and the following disclaimer.
# in the documentation and/or other materials provided with the # * Redistributions in binary form must reproduce the above
# distribution. # copyright notice, this list of conditions and the following disclaimer
# * Neither the name of Google Inc. nor the names of its # in the documentation and/or other materials provided with the
# contributors may be used to endorse or promote products derived from # distribution.
# this software without specific prior written permission. # * Neither the name of Google Inc. nor the names of its
# # contributors may be used to endorse or promote products derived from
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS # this software without specific prior written permission.
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT #
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT # "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, # LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT # A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, # OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY # SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT # LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
<%! # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
import re # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
%>\ <%!
<%namespace file="packages.include" import="get_openssl,get_zlib"/>\ import re
<%def name="to_windows_path(path)">${path.replace('/','\\')}</%def>\ %>\
<% <%namespace file="packages.include" import="get_name"/>\
build_from_project_file = set(['gpr', <%def name="to_windows_path(path)">${path.replace('/','\\')}</%def>\
'gpr_test_util', <%
'grpc', build_from_project_file = set(['gpr',
'grpc_test_util', 'gpr_test_util',
'grpc_test_util_unsecure', 'grpc',
'grpc_unsecure', 'grpc_test_util',
'grpc++', 'grpc_test_util_unsecure',
'grpc++_unsecure' 'grpc_unsecure',
]) 'grpc++',
buildable_targets = [ target for target in targets + libs 'grpc++_unsecure'
if target.build in ['all', 'test', 'private', 'tool', 'benchmark'] and ])
target.language in ['c', 'c++'] and buildable_targets = [ target for target in targets + libs
all([(src.endswith('.c') or src.endswith('.cc') or src.endswith('.proto')) for src in target.src]) and if target.build in ['all', 'test', 'private', 'tool', 'benchmark'] and
'windows' in target.get('platforms', ['windows']) ] target.language in ['c', 'c++'] and
c_test_targets = [ target for target in buildable_targets if target.build == 'test' and not target.language == 'c++' ] all([(src.endswith('.c') or src.endswith('.cc') or src.endswith('.proto')) for src in target.src]) and
cxx_test_targets = [ target for target in buildable_targets if target.build == 'test' and target.language == 'c++' ] 'windows' in target.get('platforms', ['windows']) ]
%>\ c_test_targets = [ target for target in buildable_targets if target.build == 'test' and not target.language == 'c++' ]
# NMake file to build secondary gRPC targets on Windows. cxx_test_targets = [ target for target in buildable_targets if target.build == 'test' and target.language == 'c++' ]
# Use grpc.sln to solution to build the gRPC libraries. %>\
# NMake file to build secondary gRPC targets on Windows.
OUT_DIR=test_bin # Use grpc.sln to solution to build the gRPC libraries.
CC=cl.exe /nologo OUT_DIR=test_bin
LINK=link.exe /nologo
LIBTOOL=lib.exe /nologo /nodefaultlib CC=cl.exe /nologo
LINK=link.exe /nologo
REPO_ROOT=.. LIBTOOL=lib.exe /nologo /nodefaultlib
OPENSSL_INCLUDES = .\packages\${get_openssl()}\build\native\include
ZLIB_INCLUDES = .\packages\${get_zlib()}\build\native\include REPO_ROOT=..
INCLUDES=/I$(REPO_ROOT) /I$(REPO_ROOT)\include /I$(OPENSSL_INCLUDES) /I$(ZLIB_INCLUDES) OPENSSL_INCLUDES = .\packages\${get_name(vsprojects, 'openssl')}\build\native\include
ZLIB_INCLUDES = .\packages\${get_name(vsprojects, 'zlib')}\build\native\include
GFLAGS_INCLUDES = .\..\third_party\gflags\include INCLUDES=/I$(REPO_ROOT) /I$(REPO_ROOT)\include /I$(OPENSSL_INCLUDES) /I$(ZLIB_INCLUDES)
GTEST_INCLUDES = .\..\third_party\gtest\include
PROTOBUF_INCLUDES = .\..\third_party\protobuf\src GFLAGS_INCLUDES = .\..\third_party\gflags\include
CXX_INCLUDES=/I$(GFLAGS_INCLUDES) /I$(GTEST_INCLUDES) /I$(PROTOBUF_INCLUDES) GTEST_INCLUDES = .\..\third_party\gtest\include
PROTOBUF_INCLUDES = .\..\third_party\protobuf\src
#_SCL_SECURE_NO_WARNINGS supresses a ton of "potentially unsafe use of std lib" warnings CXX_INCLUDES=/I$(GFLAGS_INCLUDES) /I$(GTEST_INCLUDES) /I$(PROTOBUF_INCLUDES)
DEFINES=/D WIN32 /D _LIB /D _USE_32BIT_TIME_T /D _UNICODE /D UNICODE /D _CRT_SECURE_NO_WARNINGS /D _SCL_SECURE_NO_WARNINGS
#_SCL_SECURE_NO_WARNINGS supresses a ton of "potentially unsafe use of std lib" warnings
#important options: /TC vs. /TP: compile as C vs. compile as C++ DEFINES=/D WIN32 /D _LIB /D _USE_32BIT_TIME_T /D _UNICODE /D UNICODE /D _CRT_SECURE_NO_WARNINGS /D _SCL_SECURE_NO_WARNINGS
CFLAGS=/c $(INCLUDES) /Z7 /W3 /WX- /sdl $(DEFINES) /EHsc /RTC1 /MDd /GS /fp:precise /Zc:wchar_t /Zc:forScope /Gd /TC /analyze-
CXXFLAGS=/c $(INCLUDES) $(CXX_INCLUDES) /Z7 /W3 /WX- /sdl $(DEFINES) /EHsc /RTC1 /MDd /GS /fp:precise /Zc:wchar_t /Zc:forScope /Gd /TP /analyze- #important options: /TC vs. /TP: compile as C vs. compile as C++
CFLAGS=/c $(INCLUDES) /Z7 /W3 /WX- /sdl $(DEFINES) /EHsc /RTC1 /MDd /GS /fp:precise /Zc:wchar_t /Zc:forScope /Gd /TC /analyze-
LFLAGS=/DEBUG /INCREMENTAL /SUBSYSTEM:CONSOLE /TLBID:1 /DYNAMICBASE /NXCOMPAT /MACHINE:X86 CXXFLAGS=/c $(INCLUDES) $(CXX_INCLUDES) /Z7 /W3 /WX- /sdl $(DEFINES) /EHsc /RTC1 /MDd /GS /fp:precise /Zc:wchar_t /Zc:forScope /Gd /TP /analyze-
OPENSSL_LIBS=.\packages\${get_openssl()}\build\native\lib\v120\Win32\Debug\static\ssleay32.lib .\packages\${get_openssl()}\build\native\lib\v120\Win32\Debug\static\libeay32.lib LFLAGS=/DEBUG /INCREMENTAL /SUBSYSTEM:CONSOLE /TLBID:1 /DYNAMICBASE /NXCOMPAT /MACHINE:X86
WINSOCK_LIBS=ws2_32.lib
GENERAL_LIBS=advapi32.lib comdlg32.lib gdi32.lib kernel32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib shell32.lib user32.lib uuid.lib winspool.lib OPENSSL_LIBS=.\packages\${get_name(vsprojects, 'openssl')}\build\native\lib\v120\Win32\Debug\static\ssleay32.lib .\packages\${get_name(vsprojects, 'openssl')}\build\native\lib\v120\Win32\Debug\static\libeay32.lib
ZLIB_LIBS=.\packages\${get_zlib()}\build\native\lib\v120\Win32\Debug\static\cdecl\zlib.lib WINSOCK_LIBS=ws2_32.lib
LIBS=$(OPENSSL_LIBS) $(ZLIB_LIBS) $(GENERAL_LIBS) $(WINSOCK_LIBS) GENERAL_LIBS=advapi32.lib comdlg32.lib gdi32.lib kernel32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib shell32.lib user32.lib uuid.lib winspool.lib
ZLIB_LIBS=.\packages\${get_name(vsprojects, 'zlib')}\build\native\lib\v120\Win32\Debug\static\cdecl\zlib.lib
#shlwapi.lib provides PathMatchSpec() for gflags in windows LIBS=$(OPENSSL_LIBS) $(ZLIB_LIBS) $(GENERAL_LIBS) $(WINSOCK_LIBS)
GFLAGS_LIBS=.\..\third_party\gflags\lib\Debug\gflags.lib shlwapi.lib
GTEST_LIBS=.\..\third_party\gtest\msvc\gtest\Debug\gtestd.lib #shlwapi.lib provides PathMatchSpec() for gflags in windows
PROTOBUF_LIBS=.\..\third_party\protobuf\vsprojects\Debug\libprotobuf.lib GFLAGS_LIBS=.\..\third_party\gflags\lib\Debug\gflags.lib shlwapi.lib
CXX_LIBS=$(GFLAGS_LIBS) $(GTEST_LIBS) $(PROTOBUF_LIBS) GTEST_LIBS=.\..\third_party\gtest\msvc\gtest\Debug\gtestd.lib
PROTOBUF_LIBS=.\..\third_party\protobuf\vsprojects\Debug\libprotobuf.lib
all: buildtests CXX_LIBS=$(GFLAGS_LIBS) $(GTEST_LIBS) $(PROTOBUF_LIBS)
tools: all: buildtests
tools_c: tools:
tools_cxx: tools_c:
$(OUT_DIR): tools_cxx:
mkdir $(OUT_DIR)
$(OUT_DIR):
build_libs: \ mkdir $(OUT_DIR)
% for target in buildable_targets:
% if target.build == 'private' or target.build == 'all': build_libs: \
% if target.name in build_from_project_file: % for target in buildable_targets:
build_${target.name} \ % if target.build == 'private' or target.build == 'all':
% else: % if target.name in build_from_project_file:
Debug\${target.name}.lib \ build_${target.name} \
% endif % else:
% endif Debug\${target.name}.lib \
% endfor % endif
% endif
buildtests: buildtests_c buildtests_cxx % endfor
buildtests_c: \ buildtests: buildtests_c buildtests_cxx
% for target in c_test_targets:
${target.name}.exe \ buildtests_c: \
% endfor % for target in c_test_targets:
${target.name}.exe \
echo All C tests built. % endfor
buildtests_cxx: \ echo All C tests built.
% for target in cxx_test_targets:
${target.name}.exe \ buildtests_cxx: \
% endfor % for target in cxx_test_targets:
${target.name}.exe \
echo All C++ tests built. % endfor
% for target in buildable_targets: echo All C++ tests built.
## replace all .proto includes with .pb.cc / .grpc.pb.cc % for target in buildable_targets:
%if target.src:
%for source in target.src: ## replace all .proto includes with .pb.cc / .grpc.pb.cc
%if source.endswith(".proto"): %if target.src:
<% %for source in target.src:
src_name_parts = source.split(".") %if source.endswith(".proto"):
target.src.append(src_name_parts[0] + ".pb.cc") <%
target.src.append(src_name_parts[0] + ".grpc.pb.cc") src_name_parts = source.split(".")
%>\ target.src.append(src_name_parts[0] + ".pb.cc")
%endif target.src.append(src_name_parts[0] + ".grpc.pb.cc")
%endfor %>\
%endif %endif
## remove all .proto includes %endfor
<% %endif
target.src = [item for item in target.src if not re.search('([^/]+)\.proto$', item)] ## remove all .proto includes
%>\ <%
%if target.name in build_from_project_file: target.src = [item for item in target.src if not re.search('([^/]+)\.proto$', item)]
build_${target.name}: %>\
msbuild grpc.sln /t:${target.name} /p:Configuration=Debug /p:Linkage-grpc_dependencies_zlib=static %if target.name in build_from_project_file:
%else: build_${target.name}:
%if target.build == 'private': msbuild grpc.sln /t:${target.name} /p:Configuration=Debug /p:Linkage-grpc_dependencies_zlib=static
Debug\${target.name}.lib: \ %else:
%else: %if target.build == 'private':
${target.name}.exe: \ Debug\${target.name}.lib: \
%for dep in target.get('deps', []): %else:
%if dep in build_from_project_file: ${target.name}.exe: \
build_${dep} \ %for dep in target.get('deps', []):
%else: %if dep in build_from_project_file:
Debug\${dep}.lib \ build_${dep} \
%endif %else:
%endfor Debug\${dep}.lib \
%endif %endif
$(OUT_DIR) %endfor
echo Building ${target.name} %endif
%if target.language == 'c++': $(OUT_DIR)
$(CC) $(CXXFLAGS) /Fo:$(OUT_DIR)\ \ echo Building ${target.name}
%else: %if target.language == 'c++':
$(CC) $(CFLAGS) /Fo:$(OUT_DIR)\ \ $(CC) $(CXXFLAGS) /Fo:$(OUT_DIR)\ \
%endif %else:
%for source in target.src: $(CC) $(CFLAGS) /Fo:$(OUT_DIR)\ \
$(REPO_ROOT)\${to_windows_path(source)} \ %endif
%endfor %for source in target.src:
%if not target.src: $(REPO_ROOT)\${to_windows_path(source)} \
$(REPO_ROOT)\${to_windows_path('vsprojects/dummy.c')} \ %endfor
%endif %if not target.src:
$(REPO_ROOT)\${to_windows_path('vsprojects/dummy.c')} \
%if target.build == 'private': %endif
$(LIBTOOL) /OUT:"Debug\${target.name}.lib" \
%else: %if target.build == 'private':
$(LINK) $(LFLAGS) /OUT:"$(OUT_DIR)\${target.name}.exe" \ $(LIBTOOL) /OUT:"Debug\${target.name}.lib" \
%for dep in target.get('deps', []): %else:
Debug\${dep}.lib \ $(LINK) $(LFLAGS) /OUT:"$(OUT_DIR)\${target.name}.exe" \
%endfor %for dep in target.get('deps', []):
%if target.language == 'c++': Debug\${dep}.lib \
$(CXX_LIBS) \ %endfor
%endif %if target.language == 'c++':
$(LIBS) \ $(CXX_LIBS) \
%endif %endif
%if not target.src: $(LIBS) \
$(OUT_DIR)\dummy.obj \ %endif
%else: %if not target.src:
%for source in target.src: $(OUT_DIR)\dummy.obj \
%if re.search('([^/]+)\.c{1,2}$', source): %else:
$(OUT_DIR)\${re.search('([^/]+)\.c{1,2}$', source).group(1)}.obj \ %for source in target.src:
%endif %if re.search('([^/]+)\.c{1,2}$', source):
%endfor $(OUT_DIR)\${re.search('([^/]+)\.c{1,2}$', source).group(1)}.obj \
%endif %endif
%endfor
%if target.build != 'private': %endif
${target.name}: ${target.name}.exe
echo Running ${target.name} %if target.build != 'private':
$(OUT_DIR)\${target.name}.exe ${target.name}: ${target.name}.exe
%endif echo Running ${target.name}
%endif $(OUT_DIR)\${target.name}.exe
% endfor %endif
%endif
% endfor

@ -0,0 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ImportGroup Label="PropertySheets" />
<PropertyGroup Label="UserMacros" />
<PropertyGroup />
<ItemDefinitionGroup>
<ClCompile>
<AdditionalIncludeDirectories>$(SolutionDir)\..;$(SolutionDir)\..\include;$(SolutionDir)\..\third_party\protobuf\src;$(SolutionDir)\..\third_party\gtest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<WarningLevel>EnableAllWarnings</WarningLevel>
</ClCompile>
<Link>
<AdditionalDependencies>grpc++_test_util.lib;grpc_test_util.lib;gpr_test_util.lib;gtestd.lib;gflags.lib;shlwapi.lib;gpr.lib;grpc.lib;grpc++.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(SolutionDir)\..\third_party\gtest\msvc\gtest\Debug;$(SolutionDir)\..\third_party\gflags\lib\Debug;$(SolutionDir)\..\Debug;$(SolutionDir)\..\packages\grpc.dependencies.openssl.${vspackages_dict['grpc.dependencies.openssl'].version}\build\native\lib\$(PlatformToolset)\$(Platform)\$(Configuration)\static;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Link>
</ItemDefinitionGroup>
<ItemGroup />
</Project>

@ -0,0 +1,16 @@
%YAML 1.2
--- |
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ImportGroup Label="PropertySheets" />
<PropertyGroup Label="UserMacros" />
<PropertyGroup />
<ItemDefinitionGroup>
<ClCompile>
<AdditionalIncludeDirectories>$(SolutionDir)\..;$(SolutionDir)\..\include;$(SolutionDir)\..\third_party\protobuf\src;${';'.join('$(SolutionDir)\\packages\\%s.%s\\build\\native\\include' % (p.name, p.version) for p in vspackages)};%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<WarningLevel>EnableAllWarnings</WarningLevel>
</ClCompile>
</ItemDefinitionGroup>
<ItemGroup />
</Project>

@ -1,2 +0,0 @@
<%namespace file="../vcxproj.filters_defs.include" import="gen_filters"/>\
${gen_filters('gpr', libs)}

@ -1,2 +0,0 @@
<%namespace file="../vcxproj_defs.include" import="gen_project"/>\
${gen_project('gpr', libs)}

@ -1,2 +0,0 @@
<%namespace file="../vcxproj_defs.include" import="gen_project"/>\
${gen_project('gpr_test_util', libs)}

@ -1,2 +0,0 @@
<%namespace file="../vcxproj.filters_defs.include" import="gen_filters"/>\
${gen_filters('grpc++', libs)}

@ -1,2 +0,0 @@
<%namespace file="../vcxproj_defs.include" import="gen_project"/>\
${gen_project('grpc++', libs)}

@ -1,2 +1,4 @@
<%namespace file="../vcxproj.filters_defs.include" import="gen_filters"/>\ %YAML 1.2
${gen_filters('grpc++_unsecure', libs)} --- |
<%namespace file="../vcxproj.filters_defs.include" import="gen_filters"/>\
${gen_filters('grpc++_unsecure', libs)}

@ -1,2 +1,4 @@
<%namespace file="../vcxproj_defs.include" import="gen_project"/>\ %YAML 1.2
${gen_project('grpc++_unsecure', libs)} --- |
<%namespace file="../vcxproj_defs.include" import="gen_project"/>\
${gen_project('grpc++_unsecure', libs)}

@ -0,0 +1,7 @@
%YAML 1.2
--- |
<%namespace file="sln_defs.include" import="gen_solution"/>\
<%
solution_projects = [p for p in vsprojects if p.build != 'protoc' and p.language in ['c', 'c++'] and not (p.language == 'c++' and p.build in ['private', 'test'])]
%>\
${gen_solution(solution_projects, use_dlls='yes')}

@ -1,5 +1,7 @@
<%namespace file="sln_defs.include" import="gen_solution"/>\ %YAML 1.2
<% --- |
solution_projects = [p for p in vsprojects if p.build != 'protoc' and p.language in ['c', 'c++']] <%namespace file="sln_defs.include" import="gen_solution"/>\
%>\ <%
${gen_solution(solution_projects, use_dlls='yes')} solution_projects = [p for p in vsprojects if p.build not in ['protoc', 'test'] and p.language in ['c', 'c++'] and p.vs_proj_dir == '.' and not (p.build == 'private' and p.language == 'c++')]
%>\
${gen_solution(solution_projects, use_dlls='yes')}

@ -1,2 +0,0 @@
<%namespace file="../vcxproj.filters_defs.include" import="gen_filters"/>\
${gen_filters('grpc', libs)}

@ -1,2 +0,0 @@
<%namespace file="../vcxproj_defs.include" import="gen_project"/>\
${gen_project('grpc', libs, packages=['openssl','zlib'])}

@ -1,2 +0,0 @@
<%namespace file="../packages.include" import="gen_packages_config"/>\
${gen_packages_config(['openssl','zlib'])}

@ -1,2 +1,4 @@
<%namespace file="../vcxproj_defs.include" import="gen_project"/>\ %YAML 1.2
${gen_project('grpc_cpp_plugin', targets, configuration_type='Application')} --- |
<%namespace file="../vcxproj_defs.include" import="gen_project"/>\
${gen_project('grpc_cpp_plugin', targets)}

@ -1,5 +1,7 @@
<%namespace file="sln_defs.include" import="gen_solution"/>\ %YAML 1.2
<% --- |
solution_projects = [p for p in vsprojects if p.build == 'all' and p.language in ['c', 'csharp']] <%namespace file="sln_defs.include" import="gen_solution"/>\
%>\ <%
${gen_solution(solution_projects, use_dlls='only')} solution_projects = [p for p in vsprojects if p.build == 'all' and p.language in ['c', 'csharp']]
%>\
${gen_solution(solution_projects, use_dlls='only')}

@ -1,2 +0,0 @@
<%namespace file="../vcxproj_defs.include" import="gen_project"/>\
${gen_project('grpc_csharp_ext', libs, configuration_type = 'DynamicLibrary', props=['zlib-dll'], packages=['openssl','zlib'])}

@ -1,2 +0,0 @@
<%namespace file="../packages.include" import="gen_packages_config"/>\
${gen_packages_config(['openssl','zlib'])}

@ -1,2 +1,4 @@
<%namespace file="../vcxproj_defs.include" import="gen_project"/>\ %YAML 1.2
${gen_project('grpc_csharp_plugin', targets, configuration_type='Application')} --- |
<%namespace file="../vcxproj_defs.include" import="gen_project"/>\
${gen_project('grpc_csharp_plugin', targets)}

@ -1,2 +1,4 @@
<%namespace file="../vcxproj_defs.include" import="gen_project"/>\ %YAML 1.2
${gen_project('grpc_objective_c_plugin', targets, configuration_type='Application')} --- |
<%namespace file="../vcxproj_defs.include" import="gen_project"/>\
${gen_project('grpc_objective_c_plugin', targets)}

@ -1,2 +0,0 @@
<%namespace file="../vcxproj_defs.include" import="gen_project"/>\
${gen_project('grpc_plugin_support', libs)}

@ -1,5 +1,7 @@
<%namespace file="sln_defs.include" import="gen_solution"/>\ %YAML 1.2
<% --- |
solution_projects = [p for p in vsprojects if p.build == 'protoc'] <%namespace file="sln_defs.include" import="gen_solution"/>\
%>\ <%
${gen_solution(solution_projects)} solution_projects = [p for p in vsprojects if p.build == 'protoc']
%>\
${gen_solution(solution_projects)}

@ -1,2 +1,4 @@
<%namespace file="../vcxproj_defs.include" import="gen_project"/>\ %YAML 1.2
${gen_project('grpc_python_plugin', targets, configuration_type='Application')} --- |
<%namespace file="../vcxproj_defs.include" import="gen_project"/>\
${gen_project('grpc_python_plugin', targets)}

@ -1,2 +1,4 @@
<%namespace file="../vcxproj_defs.include" import="gen_project"/>\ %YAML 1.2
${gen_project('grpc_ruby_plugin', targets, configuration_type='Application')} --- |
<%namespace file="../vcxproj_defs.include" import="gen_project"/>\
${gen_project('grpc_ruby_plugin', targets)}

@ -1,2 +0,0 @@
<%namespace file="../vcxproj_defs.include" import="gen_project"/>\
${gen_project('grpc_test_util', libs)}

@ -1,2 +0,0 @@
<%namespace file="../vcxproj_defs.include" import="gen_project"/>\
${gen_project('grpc_test_util_unsecure', libs)}

@ -1,2 +0,0 @@
<%namespace file="../vcxproj.filters_defs.include" import="gen_filters"/>\
${gen_filters('grpc_unsecure', libs)}

@ -1,2 +0,0 @@
<%namespace file="../vcxproj_defs.include" import="gen_project"/>\
${gen_project('grpc_unsecure', libs, packages=['zlib'])}

@ -1,2 +0,0 @@
<%namespace file="../packages.include" import="gen_packages_config"/>\
${gen_packages_config(['zlib'])}

@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ImportGroup Label="PropertySheets" />
<PropertyGroup Label="UserMacros" />
<PropertyGroup />
<ItemDefinitionGroup>
<Link>
<AdditionalDependencies>ssleay32.lib;libeay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(SolutionDir)\packages\grpc.dependencies.openssl.${vspackages_dict['grpc.dependencies.openssl'].version}\build\native\lib\$(PlatformToolset)\$(Platform)\$(Configuration)\static;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Link>
</ItemDefinitionGroup>
<ItemGroup />
</Project>

@ -1,54 +1,53 @@
<%! <%def name="get_name(vspackages, package)">${''.join('%s.%s' % (p.name, p.version) for p in vspackages if p.name == package)}</%def>
openssl_pkg_name = "grpc.dependencies.openssl"
openssl_pkg_version = "1.0.2.2"
zlib_pkg_name = "grpc.dependencies.zlib"
zlib_pkg_version = "1.2.8.9"
%>\
<%def name="get_openssl()">${openssl_pkg_name}.${openssl_pkg_version}</%def>\
<%def name="get_zlib()">${zlib_pkg_name}.${zlib_pkg_version}</%def>\
<%def name="gen_packages_config(packages)">\ <%def name="gen_packages_config(packages)">\
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<packages> <packages>
% if 'openssl' in packages: % for package in vspackages:
<package id="${openssl_pkg_name}" version="${openssl_pkg_version}" targetFramework="Native" /> % if packages == 'all' or package.name in packages:
<package id="${openssl_pkg_name}.redist" version="${openssl_pkg_version}" targetFramework="Native" /> <package id="${package.name}" version="${package.version}" targetFramework="Native" />
% endif % if package.redist:
% if 'zlib' in packages: <package id="${package.name}.redist" version="${package.version}" targetFramework="Native" />
<package id="${zlib_pkg_name}" version="${zlib_pkg_version}" targetFramework="Native" /> % endif
<package id="${zlib_pkg_name}.redist" version="${zlib_pkg_version}" targetFramework="Native" /> % endif
% endif % endfor
</packages> </packages>
</%def>\ </%def>\
<%def name="gen_package_props(packages)">\ <%def name="gen_package_props(packages, repo_root)">\
% if 'openssl' in packages: % for package in vspackages:
<Import Project="..\packages\${openssl_pkg_name}.${openssl_pkg_version}\build\native\${openssl_pkg_name}.props" Condition="Exists('..\packages\${openssl_pkg_name}.${openssl_pkg_version}\build\native\${openssl_pkg_name}.props')" /> % if packages == 'all' or package.name in packages:
% endif % if package.props:
<Import Project="${repo_root}\vsprojects\packages\${package.name}.${package.version}\build\native\${package.name}.props" Condition="Exists('${repo_root}\vsprojects\packages\${package.name}.${package.version}\build\native\${package.version}.props')" />
% endif
% endif
% endfor
</%def>\ </%def>\
<%def name="gen_package_targets(packages)">\ <%def name="gen_package_targets(packages, repo_root)">\
% if 'zlib' in packages: % for package in vspackages:
<Import Project="..\packages\${zlib_pkg_name}.redist.${zlib_pkg_version}\build\native\${zlib_pkg_name}.redist.targets" Condition="Exists('..\packages\${zlib_pkg_name}.redist.${zlib_pkg_version}\build\native\${zlib_pkg_name}.redist.targets')" /> % if packages == 'all' or package.name in packages:
<Import Project="..\packages\${zlib_pkg_name}.${zlib_pkg_version}\build\native\${zlib_pkg_name}.targets" Condition="Exists('..\packages\${zlib_pkg_name}.${zlib_pkg_version}\build\native\${zlib_pkg_name}.targets')" /> % if package.redist:
%endif <Import Project="${repo_root}\vsprojects\packages\${package.name}.redist.${package.version}\build\native\${package.name}.redist.targets" Condition="Exists('${repo_root}\vsprojects\packages\${package.name}.redist.${package.version}\build\native\grpc.dependencies\${package.name}.targets')" />
% if 'openssl' in packages: % endif
<Import Project="..\packages\${openssl_pkg_name}.redist.${openssl_pkg_version}\build\native\${openssl_pkg_name}.redist.targets" Condition="Exists('..\packages\${openssl_pkg_name}.redist.${openssl_pkg_version}\build\native\${openssl_pkg_name}.redist.targets')" /> <Import Project="${repo_root}\vsprojects\packages\${package.name}.${package.version}\build\native\${package.name}.targets" Condition="Exists('${repo_root}\vsprojects\packages\${package.name}.${package.version}\build\native\grpc.dependencies\${package.name}.targets')" />
<Import Project="..\packages\${openssl_pkg_name}.${openssl_pkg_version}\build\native\${openssl_pkg_name}.targets" Condition="Exists('..\packages\${openssl_pkg_name}.${openssl_pkg_version}\build\native\${openssl_pkg_name}.targets')" /> % endif
% endif % endfor
</%def>\ </%def>\
<%def name="gen_package_ensure(packages)">\ <%def name="check_file_inner(file)"><Error Condition="!Exists('${file}')" Text="$([System.String]::Format('$(ErrorText)', '${file}')" /></%def>\
% if packages: <%def name="check_file(file, repo_root, package)">${check_file_inner(file % {'root':repo_root, 'name':package.name, 'version':package.version})}</%def>\
<%def name="gen_package_ensure(packages, repo_root)">\
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup> <PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup> </PropertyGroup>
% if 'zlib' in packages: % for package in vspackages:
<Error Condition="!Exists('..\packages\${zlib_pkg_name}.redist.${zlib_pkg_version}\build\native\${zlib_pkg_name}.redist.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\${zlib_pkg_name}.redist.${zlib_pkg_version}\build\native\${zlib_pkg_name}.redist.targets'))" /> % if packages == 'all' or package.name in packages:
<Error Condition="!Exists('..\packages\${zlib_pkg_name}.${zlib_pkg_version}\build\native\${zlib_pkg_name}.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\${zlib_pkg_name}.${zlib_pkg_version}\build\native\${zlib_pkg_name}.targets'))" /> % if package.redist:
%endif ${check_file('%(root)s\\vsprojects\\packages\\%(name)s.redist.%(version)s\\build\\native\\%(name)s.redist.targets', repo_root, package)}
% if 'openssl' in packages: % endif
<Error Condition="!Exists('..\packages\${openssl_pkg_name}.redist.${openssl_pkg_version}\build\native\${openssl_pkg_name}.redist.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\${openssl_pkg_name}.redist.${openssl_pkg_version}\build\native\${openssl_pkg_name}.redist.targets'))" /> % if package.props:
<Error Condition="!Exists('..\packages\${openssl_pkg_name}.${openssl_pkg_version}\build\native\${openssl_pkg_name}.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\${openssl_pkg_name}.${openssl_pkg_version}\build\native\${openssl_pkg_name}.props'))" /> ${check_file('%(root)s\\vsprojects\\packages\\%(name)s.%(version)s\\build\\native\\%(name)s.props', repo_root, package)}
<Error Condition="!Exists('..\packages\${openssl_pkg_name}.${openssl_pkg_version}\build\native\${openssl_pkg_name}.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\${openssl_pkg_name}.${openssl_pkg_version}\build\native\${openssl_pkg_name}.targets'))" /> % endif
%endif ${check_file('%(root)s\\vsprojects\\packages\\%(name)s.%(version)s\\build\\native\\%(name)s.targets', repo_root, package)}
% endif
% endfor
</Target> </Target>
%endif
</%def>\ </%def>\

@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ImportGroup Label="PropertySheets" />
<PropertyGroup Label="UserMacros" />
<PropertyGroup />
<ItemDefinitionGroup>
<Link>
<AdditionalDependencies>libprotobuf.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(SolutionDir)\..\third_party\protobuf\cmake\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Link>
</ItemDefinitionGroup>
<ItemGroup />
</Project>

@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ImportGroup Label="PropertySheets" />
<PropertyGroup Label="UserMacros" />
<PropertyGroup />
<ItemDefinitionGroup>
<Link>
<AdditionalDependencies>libprotoc.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(SolutionDir)\..\third_party\protobuf\cmake\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Link>
</ItemDefinitionGroup>
<ItemGroup />
</Project>

@ -14,7 +14,7 @@ MinimumVisualStudioVersion = 10.0.40219.1
cpp_proj_type = "{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}" cpp_proj_type = "{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}"
%>\ %>\
% for project in solution_projects: % for project in solution_projects:
Project("${cpp_proj_type}") = "${project.name}", "${project.name}\${project.name}.vcxproj", "${project.vs_project_guid}" Project("${cpp_proj_type}") = "${project.name}", "vcxproj\${project.vs_proj_dir}\${project.name}\${project.name}.vcxproj", "${project.vs_project_guid}"
ProjectSection(myProperties) = preProject ProjectSection(myProperties) = preProject
% if project.is_library: % if project.is_library:
lib = "True" lib = "True"
@ -53,7 +53,7 @@ Global
${project.vs_project_guid}.Debug|x64.ActiveCfg = Debug|x64 ${project.vs_project_guid}.Debug|x64.ActiveCfg = Debug|x64
${project.vs_project_guid}.Release|Win32.ActiveCfg = Release|Win32 ${project.vs_project_guid}.Release|Win32.ActiveCfg = Release|Win32
${project.vs_project_guid}.Release|x64.ActiveCfg = Release|x64 ${project.vs_project_guid}.Release|x64.ActiveCfg = Release|x64
% if project.get('dll', 'no') != 'only': % if project.get('dll', False) != 'only':
${project.vs_project_guid}.Debug|Win32.Build.0 = Debug|Win32 ${project.vs_project_guid}.Debug|Win32.Build.0 = Debug|Win32
${project.vs_project_guid}.Debug|x64.Build.0 = Debug|x64 ${project.vs_project_guid}.Debug|x64.Build.0 = Debug|x64
${project.vs_project_guid}.Release|Win32.Build.0 = Release|Win32 ${project.vs_project_guid}.Release|Win32.Build.0 = Release|Win32
@ -61,7 +61,7 @@ Global
% endif % endif
% endif % endif
% if use_dlls == 'yes': % if use_dlls == 'yes':
% if project.get('dll', 'no') == 'no': % if project.get('dll', False) == False:
${project.vs_project_guid}.Debug-DLL|Win32.ActiveCfg = Debug|Win32 ${project.vs_project_guid}.Debug-DLL|Win32.ActiveCfg = Debug|Win32
${project.vs_project_guid}.Debug-DLL|Win32.Build.0 = Debug|Win32 ${project.vs_project_guid}.Debug-DLL|Win32.Build.0 = Debug|Win32
${project.vs_project_guid}.Debug-DLL|x64.ActiveCfg = Debug|x64 ${project.vs_project_guid}.Debug-DLL|x64.ActiveCfg = Debug|x64
@ -82,7 +82,7 @@ Global
% endif % endif
% endif % endif
% if use_dlls == 'only': % if use_dlls == 'only':
% if project.get('dll', 'no') == 'yes': % if project.get('dll', False) == True:
${project.vs_project_guid}.Debug|Win32.ActiveCfg = Debug-DLL|Win32 ${project.vs_project_guid}.Debug|Win32.ActiveCfg = Debug-DLL|Win32
${project.vs_project_guid}.Debug|Win32.Build.0 = Debug-DLL|Win32 ${project.vs_project_guid}.Debug|Win32.Build.0 = Debug-DLL|Win32
${project.vs_project_guid}.Debug|x64.ActiveCfg = Debug-DLL|x64 ${project.vs_project_guid}.Debug|x64.ActiveCfg = Debug-DLL|x64

@ -5,7 +5,7 @@
def calc_to_filter(path): def calc_to_filter(path):
return '\\'.join(path.split('/')[:-1]) return '\\'.join(path.split('/')[:-1])
%>\ %>\
<%def name="get_repo_root()">..\..</%def>\ <%def name="get_repo_root(proj)">${'..\..\..' + ('\..' if proj.vs_proj_dir != '.' else '')}</%def>\
<%def name="to_windows_path(path)">${path.replace('/','\\')}</%def>\ <%def name="to_windows_path(path)">${path.replace('/','\\')}</%def>\
<%def name="to_filter(path)">${calc_to_filter(path)}</%def>\ <%def name="to_filter(path)">${calc_to_filter(path)}</%def>\
<%def name="filter_to_guid(proj, filter)">${re.sub('(........)(....)(....)(....)', r'\1-\2-\3-\4-', hashlib.md5(''.join([filter, proj])).hexdigest())}</%def>\ <%def name="filter_to_guid(proj, filter)">${re.sub('(........)(....)(....)(....)', r'\1-\2-\3-\4-', hashlib.md5(''.join([filter, proj])).hexdigest())}</%def>\
@ -17,7 +17,7 @@
% if project.get('src',[]): % if project.get('src',[]):
<ItemGroup> <ItemGroup>
% for src_name in project.src: % for src_name in project.src:
<ClCompile Include="${get_repo_root()}\${to_windows_path(src_name)}"> <ClCompile Include="${get_repo_root(project)}\${to_windows_path(src_name)}">
<Filter>${to_filter(src_name)}</Filter> <Filter>${to_filter(src_name)}</Filter>
</ClCompile> </ClCompile>
% endfor % endfor
@ -26,7 +26,7 @@
% if project.get('public_headers',[]): % if project.get('public_headers',[]):
<ItemGroup> <ItemGroup>
% for public_header in project.public_headers: % for public_header in project.public_headers:
<ClInclude Include="${get_repo_root()}\${to_windows_path(public_header)}"> <ClInclude Include="${get_repo_root(project)}\${to_windows_path(public_header)}">
<Filter>${to_filter(public_header)}</Filter> <Filter>${to_filter(public_header)}</Filter>
</ClInclude> </ClInclude>
% endfor % endfor
@ -35,7 +35,7 @@
% if project.get('headers',[]): % if project.get('headers',[]):
<ItemGroup> <ItemGroup>
% for header in project.headers: % for header in project.headers:
<ClInclude Include="${get_repo_root()}\${to_windows_path(header)}"> <ClInclude Include="${get_repo_root(project)}\${to_windows_path(header)}">
<Filter>${to_filter(header)}</Filter> <Filter>${to_filter(header)}</Filter>
</ClInclude> </ClInclude>
% endfor % endfor

@ -0,0 +1,18 @@
%YAML 1.2
---
foreach: vsprojects
output_name: ${selected.vs_proj_dir}/${selected.name}/${selected.name}.vcxproj
template: |
<%namespace file="vcxproj_defs.include" import="gen_project"/>\
${gen_project(selected.name, vsprojects)}
---
foreach: vsprojects
output_name: ${selected.vs_proj_dir}/${selected.name}/${selected.name}.vcxproj.filters
template: |
<%namespace file="vcxproj.filters_defs.include" import="gen_filters"/>\
${gen_filters(selected.name, vsprojects)}
---
output_name: grpc/packages.config
template: |
<%namespace file="packages.include" import="gen_packages_config"/>\
${gen_packages_config('all')}

@ -1,8 +1,7 @@
<%namespace file="packages.include" import="gen_package_props,gen_package_targets,gen_package_ensure"/>\ <%namespace file="packages.include" import="gen_package_props,gen_package_targets,gen_package_ensure"/>\
<%def name="get_repo_root()">..\..</%def>\
<%def name="to_windows_path(path)">${path.replace('/','\\')}</%def>\ <%def name="to_windows_path(path)">${path.replace('/','\\')}</%def>\
<%def name="get_subsystem(is_library)">${'Windows' if is_library else 'Console'}</%def>\ <%def name="get_subsystem(is_library)">${'Windows' if is_library else 'Console'}</%def>\
<%def name="gen_project(name, collection, configuration_type = None, project_guid = None, props = [], packages = [])">\ <%def name="gen_project(name, collection)">\
<% <%
target = None target = None
for p in vsprojects: for p in vsprojects:
@ -11,14 +10,9 @@
for t in collection: for t in collection:
if t.name == name: if t.name == name:
target = t target = t
if not configuration_type and target: props = project.vs_props
print target.name configuration_type = project.vs_config_type
if target.build == 'test' or target.build == 'tool': project_guid = project.vs_project_guid
configuration_type = 'Application'
if not configuration_type:
configuration_type = 'StaticLibrary'
if not project_guid:
project_guid = project.vs_project_guid
if target.build == 'test' and target.language == 'c++': if target.build == 'test' and target.language == 'c++':
props.extend(['cpptest']) props.extend(['cpptest'])
if configuration_type == 'Application': if configuration_type == 'Application':
@ -29,13 +23,16 @@
else: else:
props.extend(['winsock']) props.extend(['winsock'])
props.extend(['global']) props.extend(['global'])
dll = project.get('dll', 'no') props = sorted(list(set(props)))
dll = project.get('dll', False)
packages = project.vs_packages
repo_root = '..\..\..' + ('\..' if project.vs_proj_dir != '.' else '')
%>\ %>\
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
${gen_package_props(packages)}\ ${gen_package_props(packages, repo_root)}\
<ItemGroup Label="ProjectConfigurations"> <ItemGroup Label="ProjectConfigurations">
% if dll == 'yes': % if dll and dll != 'only':
<ProjectConfiguration Include="Debug-DLL|Win32"> <ProjectConfiguration Include="Debug-DLL|Win32">
<Configuration>Debug-DLL</Configuration> <Configuration>Debug-DLL</Configuration>
<Platform>Win32</Platform> <Platform>Win32</Platform>
@ -94,7 +91,7 @@ ${gen_package_props(packages)}\
<WholeProgramOptimization>true</WholeProgramOptimization> <WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet> <CharacterSet>Unicode</CharacterSet>
</PropertyGroup> </PropertyGroup>
% if dll == 'yes': % if dll and dll != 'only':
<PropertyGroup Condition="'$(Configuration)'=='Debug-DLL'" Label="Configuration"> <PropertyGroup Condition="'$(Configuration)'=='Debug-DLL'" Label="Configuration">
<ConfigurationType>${configuration_type}</ConfigurationType> <ConfigurationType>${configuration_type}</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries> <UseDebugLibraries>true</UseDebugLibraries>
@ -113,31 +110,24 @@ ${gen_package_props(packages)}\
<ImportGroup Label="PropertySheets"> <ImportGroup Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
% for prop in props: % for prop in props:
<Import Project="..\${prop}.props" /> <Import Project="${repo_root}\vsprojects\${prop}.props" />
% endfor % endfor
</ImportGroup> </ImportGroup>
<PropertyGroup Label="UserMacros" /> <PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)'=='Debug'"> % for config in ['Debug', 'Release']:# + (['Debug-DLL', 'Release-DLL'] if dll and dll != 'only' else []):
<PropertyGroup Condition="'$(Configuration)'=='${config}'">
<TargetName>${name}</TargetName> <TargetName>${name}</TargetName>
% if "zlib" in packages: % for package in vspackages:
<Linkage-grpc_dependencies_zlib>static</Linkage-grpc_dependencies_zlib> % if packages == 'all' or package.name in packages:
<Configuration-grpc_dependencies_zlib>Debug</Configuration-grpc_dependencies_zlib> % if package.get('linkage', None) is not None:
% endif <Linkage-${package.name.replace('.', '_')}>${package.linkage}</Linkage-${package.name.replace('.', '_')}>
% if "openssl" in packages: % endif
<Configuration-grpc_dependencies_openssl>Debug</Configuration-grpc_dependencies_openssl> <Configuration-${package.name.replace('.', '_')}>Debug</Configuration-${package.name.replace('.', '_')}>
% endif % endif
</PropertyGroup> % endfor
<PropertyGroup Condition="'$(Configuration)'=='Release'">
<TargetName>${name}</TargetName>
% if "zlib" in packages:
<Linkage-grpc_dependencies_zlib>static</Linkage-grpc_dependencies_zlib>
<Configuration-grpc_dependencies_zlib>Debug</Configuration-grpc_dependencies_zlib>
% endif
% if "openssl" in packages:
<Configuration-grpc_dependencies_openssl>Debug</Configuration-grpc_dependencies_openssl>
% endif
</PropertyGroup> </PropertyGroup>
% if dll == 'yes': % endfor
% if dll and dll != 'only':
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-DLL|Win32'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-DLL|Win32'">
<ClCompile> <ClCompile>
<PrecompiledHeader>NotUsing</PrecompiledHeader> <PrecompiledHeader>NotUsing</PrecompiledHeader>
@ -270,14 +260,14 @@ ${gen_package_props(packages)}\
% if project.get('public_headers',[]): % if project.get('public_headers',[]):
<ItemGroup> <ItemGroup>
% for public_header in project.public_headers: % for public_header in project.public_headers:
<ClInclude Include="${get_repo_root()}\${to_windows_path(public_header)}" /> <ClInclude Include="${repo_root}\${to_windows_path(public_header)}" />
% endfor % endfor
</ItemGroup> </ItemGroup>
% endif % endif
% if project.get('headers',[]): % if project.get('headers',[]):
<ItemGroup> <ItemGroup>
% for header in project.headers: % for header in project.headers:
<ClInclude Include="${get_repo_root()}\${to_windows_path(header)}" /> <ClInclude Include="${repo_root}\${to_windows_path(header)}" />
% endfor % endfor
</ItemGroup> </ItemGroup>
% endif % endif
@ -286,30 +276,30 @@ ${gen_package_props(packages)}\
% for src_name in project.src: % for src_name in project.src:
% if src_name.endswith(".proto"): % if src_name.endswith(".proto"):
<% src_name_parts = src_name.split(".") %>\ <% src_name_parts = src_name.split(".") %>\
<ClCompile Include="${get_repo_root()}\${to_windows_path(src_name_parts[0] + ".pb.cc")}"> <ClCompile Include="${repo_root}\${to_windows_path(src_name_parts[0] + ".pb.cc")}">
</ClCompile> </ClCompile>
<ClInclude Include="${get_repo_root()}\${to_windows_path(src_name_parts[0] + ".pb.h")}"> <ClInclude Include="${repo_root}\${to_windows_path(src_name_parts[0] + ".pb.h")}">
</ClInclude> </ClInclude>
<ClCompile Include="${get_repo_root()}\${to_windows_path(src_name_parts[0] + ".grpc.pb.cc")}"> <ClCompile Include="${repo_root}\${to_windows_path(src_name_parts[0] + ".grpc.pb.cc")}">
</ClCompile> </ClCompile>
<ClInclude Include="${get_repo_root()}\${to_windows_path(src_name_parts[0] + ".grpc.pb.h")}"> <ClInclude Include="${repo_root}\${to_windows_path(src_name_parts[0] + ".grpc.pb.h")}">
</ClInclude> </ClInclude>
% else: % else:
<ClCompile Include="${get_repo_root()}\${to_windows_path(src_name)}"> <ClCompile Include="${repo_root}\${to_windows_path(src_name)}">
</ClCompile> </ClCompile>
% endif % endif
% endfor % endfor
</ItemGroup> </ItemGroup>
% elif configuration_type != 'StaticLibrary': % elif configuration_type != 'StaticLibrary':
<ItemGroup> <ItemGroup>
<ClCompile Include="${get_repo_root()}\${to_windows_path('vsprojects/dummy.c')}"> <ClCompile Include="${repo_root}\${to_windows_path('vsprojects/dummy.c')}">
</ClCompile> </ClCompile>
</ItemGroup> </ItemGroup>
% endif % endif
% if project.get('deps',[]): % if project.get('deps',[]):
<ItemGroup> <ItemGroup>
% for dep in project.deps: % for dep in project.deps:
<ProjectReference Include="..\${dep}\${dep}.vcxproj"> <ProjectReference Include="${repo_root}\vsprojects\vcxproj\${vsproject_dict[dep].vs_proj_dir}\${dep}\${dep}.vcxproj">
<Project>${vsproject_dict[dep].vs_project_guid}</Project> <Project>${vsproject_dict[dep].vs_project_guid}</Project>
</ProjectReference> </ProjectReference>
% endfor % endfor
@ -322,8 +312,8 @@ ${gen_package_props(packages)}\
%endif %endif
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets"> <ImportGroup Label="ExtensionTargets">
${gen_package_targets(packages)}\ ${gen_package_targets(packages, repo_root)}\
</ImportGroup> </ImportGroup>
${gen_package_ensure(packages)}\ ${gen_package_ensure(packages, repo_root)}\
</Project> </Project>
</%def>\ </%def>\

@ -0,0 +1,14 @@
%YAML 1.2
--- |
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ImportGroup Label="PropertySheets" />
<PropertyGroup Label="UserMacros" />
<PropertyGroup />
<ItemDefinitionGroup>
<Link>
<AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemGroup />
</Project>

@ -0,0 +1,15 @@
%YAML 1.2
--- |
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ImportGroup Label="PropertySheets" />
<PropertyGroup Label="UserMacros" />
<PropertyGroup />
<ItemDefinitionGroup>
<Link>
<AdditionalDependencies>zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(SolutionDir)\packages\grpc.dependencies.zlib.${vspackages_dict['grpc.dependencies.zlib'].version}\build\native\lib\$(PlatformToolset)\$(Platform)\$(Configuration)\dynamic\cdecl;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Link>
</ItemDefinitionGroup>
<ItemGroup />
</Project>

@ -0,0 +1,15 @@
%YAML 1.2
--- |
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ImportGroup Label="PropertySheets" />
<PropertyGroup Label="UserMacros" />
<PropertyGroup />
<ItemDefinitionGroup>
<Link>
<AdditionalDependencies>zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(SolutionDir)\packages\grpc.dependencies.zlib.${vspackages_dict['grpc.dependencies.zlib'].version}\build\native\lib\$(PlatformToolset)\$(Platform)\$(Configuration)\static\cdecl;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Link>
</ItemDefinitionGroup>
<ItemGroup />
</Project>

@ -32,8 +32,8 @@
"""Generates the appropriate build.json data for all the end2end tests.""" """Generates the appropriate build.json data for all the end2end tests."""
import simplejson
import collections import collections
import yaml
TestOptions = collections.namedtuple('TestOptions', 'flaky') TestOptions = collections.namedtuple('TestOptions', 'flaky')
default_test_options = TestOptions(False) default_test_options = TestOptions(False)
@ -58,6 +58,7 @@ def main():
'headers': [ 'headers': [
'test/core/bad_client/bad_client.h' 'test/core/bad_client/bad_client.h'
], ],
'vs_proj_dir': 'test',
'deps': [ 'deps': [
'grpc_test_util_unsecure', 'grpc_test_util_unsecure',
'grpc_unsecure', 'grpc_unsecure',
@ -72,7 +73,7 @@ def main():
'language': 'c', 'language': 'c',
'secure': 'no', 'secure': 'no',
'src': ['test/core/bad_client/tests/%s.c' % t], 'src': ['test/core/bad_client/tests/%s.c' % t],
'flaky': 'invoke_large_request' in t, 'vs_proj_dir': 'test',
'deps': [ 'deps': [
'bad_client_test', 'bad_client_test',
'grpc_test_util_unsecure', 'grpc_test_util_unsecure',
@ -82,7 +83,7 @@ def main():
] ]
} }
for t in sorted(BAD_CLIENT_TESTS.keys())]} for t in sorted(BAD_CLIENT_TESTS.keys())]}
print simplejson.dumps(json, sort_keys=True, indent=2 * ' ') print yaml.dump(json)
if __name__ == '__main__': if __name__ == '__main__':

@ -32,8 +32,9 @@
"""Generates the appropriate build.json data for all the end2end tests.""" """Generates the appropriate build.json data for all the end2end tests."""
import simplejson import yaml
import collections import collections
import hashlib
FixtureOptions = collections.namedtuple('FixtureOptions', 'fullstack includes_proxy dns_resolver secure platforms ci_mac') FixtureOptions = collections.namedtuple('FixtureOptions', 'fullstack includes_proxy dns_resolver secure platforms ci_mac')
@ -42,22 +43,23 @@ socketpair_unsecure_fixture_options = default_unsecure_fixture_options._replace(
default_secure_fixture_options = default_unsecure_fixture_options._replace(secure=True) default_secure_fixture_options = default_unsecure_fixture_options._replace(secure=True)
uds_fixture_options = default_unsecure_fixture_options._replace(dns_resolver=False, platforms=['linux', 'mac', 'posix']) uds_fixture_options = default_unsecure_fixture_options._replace(dns_resolver=False, platforms=['linux', 'mac', 'posix'])
# maps fixture name to whether it requires the security library # maps fixture name to whether it requires the security library
END2END_FIXTURES = { END2END_FIXTURES = {
'chttp2_fake_security': default_secure_fixture_options._replace(ci_mac=False), 'h2_fakesec': default_secure_fixture_options._replace(ci_mac=False),
'chttp2_fullstack': default_unsecure_fixture_options, 'h2_full': default_unsecure_fixture_options,
'chttp2_fullstack_compression': default_unsecure_fixture_options, 'h2_compress': default_unsecure_fixture_options,
'chttp2_fullstack_uds_posix': uds_fixture_options, 'h2_uds': uds_fixture_options,
'chttp2_fullstack_uds_posix_with_poll': uds_fixture_options._replace(platforms=['linux']), 'h2_uds+poll': uds_fixture_options._replace(platforms=['linux']),
'chttp2_fullstack_with_poll': default_unsecure_fixture_options._replace(platforms=['linux']), 'h2_full+poll': default_unsecure_fixture_options._replace(platforms=['linux']),
'chttp2_fullstack_with_proxy': default_unsecure_fixture_options._replace(includes_proxy=True, ci_mac=False), 'h2_proxy': default_unsecure_fixture_options._replace(includes_proxy=True, ci_mac=False),
'chttp2_simple_ssl_fullstack': default_secure_fixture_options, 'h2_ssl': default_secure_fixture_options,
'chttp2_simple_ssl_fullstack_with_poll': default_secure_fixture_options._replace(platforms=['linux']), 'h2_ssl+poll': default_secure_fixture_options._replace(platforms=['linux']),
'chttp2_simple_ssl_fullstack_with_proxy': default_secure_fixture_options._replace(includes_proxy=True, ci_mac=False), 'h2_ssl_proxy': default_secure_fixture_options._replace(includes_proxy=True, ci_mac=False),
'chttp2_simple_ssl_with_oauth2_fullstack': default_secure_fixture_options._replace(ci_mac=False), 'h2_oauth2': default_secure_fixture_options._replace(ci_mac=False),
'chttp2_socket_pair': socketpair_unsecure_fixture_options._replace(ci_mac=False), 'h2_sockpair': socketpair_unsecure_fixture_options._replace(ci_mac=False),
'chttp2_socket_pair_one_byte_at_a_time': socketpair_unsecure_fixture_options._replace(ci_mac=False), 'h2_sockpair_1byte': socketpair_unsecure_fixture_options._replace(ci_mac=False),
'chttp2_socket_pair_with_grpc_trace': socketpair_unsecure_fixture_options, 'h2_sockpair+trace': socketpair_unsecure_fixture_options,
} }
TestOptions = collections.namedtuple('TestOptions', 'needs_fullstack needs_dns proxyable flaky secure') TestOptions = collections.namedtuple('TestOptions', 'needs_fullstack needs_dns proxyable flaky secure')
@ -67,7 +69,7 @@ connectivity_test_options = default_test_options._replace(needs_fullstack=True)
# maps test names to options # maps test names to options
END2END_TESTS = { END2END_TESTS = {
'bad_hostname': default_test_options, 'bad_hostname': default_test_options,
'cancel_after_accept_and_writes_closed': default_test_options, 'cancel_after_client_done': default_test_options,
'cancel_after_accept': default_test_options, 'cancel_after_accept': default_test_options,
'cancel_after_invoke': default_test_options, 'cancel_after_invoke': default_test_options,
'cancel_before_invoke': default_test_options, 'cancel_before_invoke': default_test_options,
@ -76,8 +78,8 @@ END2END_TESTS = {
'channel_connectivity': connectivity_test_options._replace(proxyable=False), 'channel_connectivity': connectivity_test_options._replace(proxyable=False),
'default_host': default_test_options._replace(needs_fullstack=True, needs_dns=True), 'default_host': default_test_options._replace(needs_fullstack=True, needs_dns=True),
'disappearing_server': connectivity_test_options, 'disappearing_server': connectivity_test_options,
'early_server_shutdown_finishes_inflight_calls': default_test_options, 'shutdown_finishes_calls': default_test_options,
'early_server_shutdown_finishes_tags': default_test_options, 'shutdown_finishes_tags': default_test_options,
'empty_batch': default_test_options, 'empty_batch': default_test_options,
'graceful_server_shutdown': default_test_options, 'graceful_server_shutdown': default_test_options,
'invoke_large_request': default_test_options, 'invoke_large_request': default_test_options,
@ -86,19 +88,19 @@ END2END_TESTS = {
'no_op': default_test_options, 'no_op': default_test_options,
'ping_pong_streaming': default_test_options, 'ping_pong_streaming': default_test_options,
'registered_call': default_test_options, 'registered_call': default_test_options,
'request_response_with_binary_metadata_and_payload': default_test_options, 'binary_metadata': default_test_options,
'request_response_with_metadata_and_payload': default_test_options, 'metadata': default_test_options,
'request_response_with_payload_and_call_creds': default_test_options._replace(secure=True), 'call_creds': default_test_options._replace(secure=True),
'request_response_with_payload': default_test_options, 'payload': default_test_options,
'request_response_with_trailing_metadata_and_payload': default_test_options, 'trailing_metadata': default_test_options,
'request_with_compressed_payload': default_test_options._replace(proxyable=False), 'compressed_payload': default_test_options._replace(proxyable=False),
'request_with_flags': default_test_options._replace(proxyable=False), 'request_with_flags': default_test_options._replace(proxyable=False),
'request_with_large_metadata': default_test_options, 'large_metadata': default_test_options,
'request_with_payload': default_test_options, 'request_with_payload': default_test_options,
'server_finishes_request': default_test_options, 'server_finishes_request': default_test_options,
'simple_delayed_request': connectivity_test_options, 'simple_delayed_request': connectivity_test_options,
'simple_request': default_test_options, 'simple_request': default_test_options,
'simple_request_with_high_initial_sequence_number': default_test_options, 'high_initial_seqno': default_test_options,
} }
@ -147,6 +149,7 @@ def main():
'platforms': [ 'linux', 'mac', 'posix' ] if f.endswith('_posix') else END2END_FIXTURES[f].platforms, 'platforms': [ 'linux', 'mac', 'posix' ] if f.endswith('_posix') else END2END_FIXTURES[f].platforms,
'deps': sec_deps if END2END_FIXTURES[f].secure else unsec_deps, 'deps': sec_deps if END2END_FIXTURES[f].secure else unsec_deps,
'headers': ['test/core/end2end/end2end_tests.h'], 'headers': ['test/core/end2end/end2end_tests.h'],
'vs_proj_dir': 'test',
} }
for f in sorted(END2END_FIXTURES.keys())] + [ for f in sorted(END2END_FIXTURES.keys())] + [
{ {
@ -157,7 +160,8 @@ def main():
'src': ['test/core/end2end/tests/%s.c' % t], 'src': ['test/core/end2end/tests/%s.c' % t],
'headers': ['test/core/end2end/tests/cancel_test_helpers.h', 'headers': ['test/core/end2end/tests/cancel_test_helpers.h',
'test/core/end2end/end2end_tests.h'], 'test/core/end2end/end2end_tests.h'],
'deps': sec_deps if END2END_TESTS[t].secure else unsec_deps 'deps': sec_deps if END2END_TESTS[t].secure else unsec_deps,
'vs_proj_dir': 'test',
} }
for t in sorted(END2END_TESTS.keys())] + [ for t in sorted(END2END_TESTS.keys())] + [
{ {
@ -168,7 +172,8 @@ def main():
"test/core/end2end/data/test_root_cert.c", "test/core/end2end/data/test_root_cert.c",
"test/core/end2end/data/server1_cert.c", "test/core/end2end/data/server1_cert.c",
"test/core/end2end/data/server1_key.c" "test/core/end2end/data/server1_key.c"
] ],
'vs_proj_dir': 'test',
} }
], ],
'targets': [ 'targets': [
@ -184,13 +189,14 @@ def main():
else without(END2END_FIXTURES[f].platforms, 'mac')), else without(END2END_FIXTURES[f].platforms, 'mac')),
'deps': [ 'deps': [
'end2end_fixture_%s' % f, 'end2end_fixture_%s' % f,
'end2end_test_%s' % t] + sec_deps 'end2end_test_%s' % t] + sec_deps,
'vs_proj_dir': 'test',
} }
for f in sorted(END2END_FIXTURES.keys()) for f in sorted(END2END_FIXTURES.keys())
for t in sorted(END2END_TESTS.keys()) for t in sorted(END2END_TESTS.keys())
if compatible(f, t)] + [ if compatible(f, t)] + [
{ {
'name': '%s_%s_unsecure_test' % (f, t), 'name': '%s_%s_nosec_test' % (f, t),
'build': 'test', 'build': 'test',
'language': 'c', 'language': 'c',
'secure': 'no', 'secure': 'no',
@ -202,11 +208,12 @@ def main():
else without(END2END_FIXTURES[f].platforms, 'mac')), else without(END2END_FIXTURES[f].platforms, 'mac')),
'deps': [ 'deps': [
'end2end_fixture_%s' % f, 'end2end_fixture_%s' % f,
'end2end_test_%s' % t] + unsec_deps 'end2end_test_%s' % t] + unsec_deps,
'vs_proj_dir': 'test',
} }
for f in sorted(END2END_FIXTURES.keys()) if not END2END_FIXTURES[f].secure for f in sorted(END2END_FIXTURES.keys()) if not END2END_FIXTURES[f].secure
for t in sorted(END2END_TESTS.keys()) if compatible(f, t) and not END2END_TESTS[t].secure]} for t in sorted(END2END_TESTS.keys()) if compatible(f, t) and not END2END_TESTS[t].secure]}
print simplejson.dumps(json, sort_keys=True, indent=2 * ' ') print yaml.dump(json)
if __name__ == '__main__': if __name__ == '__main__':

@ -33,7 +33,6 @@
#include "test/core/util/reconnect_server.h" #include "test/core/util/reconnect_server.h"
#include <arpa/inet.h>
#include <grpc/grpc.h> #include <grpc/grpc.h>
#include <grpc/support/alloc.h> #include <grpc/support/alloc.h>
#include <grpc/support/host_port.h> #include <grpc/support/host_port.h>
@ -42,6 +41,7 @@
#include <grpc/support/time.h> #include <grpc/support/time.h>
#include <string.h> #include <string.h>
#include "src/core/iomgr/endpoint.h" #include "src/core/iomgr/endpoint.h"
#include "src/core/iomgr/sockaddr.h"
#include "src/core/iomgr/tcp_server.h" #include "src/core/iomgr/tcp_server.h"
#include "test/core/util/port.h" #include "test/core/util/port.h"
@ -116,7 +116,7 @@ void reconnect_server_start(reconnect_server *server, int port) {
addr.sin_family = AF_INET; addr.sin_family = AF_INET;
addr.sin_port = htons(port); addr.sin_port = htons(port);
inet_pton(AF_INET, "0.0.0.0", &addr.sin_addr); memset(&addr.sin_addr, 0, sizeof(addr.sin_addr));
server->tcp_server = grpc_tcp_server_create(); server->tcp_server = grpc_tcp_server_create();
port_added = port_added =

@ -31,8 +31,6 @@
* *
*/ */
#include <sys/signal.h>
#include <cassert> #include <cassert>
#include <chrono> #include <chrono>
#include <memory> #include <memory>

@ -31,7 +31,6 @@
* *
*/ */
#include <unistd.h>
#include <list> #include <list>
#include <thread> #include <thread>
#include <deque> #include <deque>

@ -35,9 +35,6 @@
#include <functional> #include <functional>
#include <memory> #include <memory>
#include <mutex> #include <mutex>
#include <sys/time.h>
#include <sys/resource.h>
#include <sys/signal.h>
#include <thread> #include <thread>
#include <gflags/gflags.h> #include <gflags/gflags.h>

@ -31,8 +31,6 @@
* *
*/ */
#include <sys/signal.h>
#include <unistd.h>
#include <thread> #include <thread>
#include <gflags/gflags.h> #include <gflags/gflags.h>

@ -28,16 +28,16 @@
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
# produces cleaner build.json files # produces cleaner build.yaml files
import collections import collections
import json
import os import os
import sys import sys
import yaml
TEST = (os.environ.get('TEST', 'false') == 'true') TEST = (os.environ.get('TEST', 'false') == 'true')
_TOP_LEVEL_KEYS = ['settings', 'filegroups', 'libs', 'targets'] _TOP_LEVEL_KEYS = ['settings', 'filegroups', 'libs', 'targets', 'vspackages']
_VERSION_KEYS = ['major', 'minor', 'micro', 'build'] _VERSION_KEYS = ['major', 'minor', 'micro', 'build']
_ELEM_KEYS = [ _ELEM_KEYS = [
'name', 'name',
@ -50,6 +50,11 @@ _ELEM_KEYS = [
'src', 'src',
'deps'] 'deps']
def repr_ordered_dict(dumper, odict):
return dumper.represent_mapping(u'tag:yaml.org,2002:map', odict.items())
yaml.add_representer(collections.OrderedDict, repr_ordered_dict)
def rebuild_as_ordered_dict(indict, special_keys): def rebuild_as_ordered_dict(indict, special_keys):
outdict = collections.OrderedDict() outdict = collections.OrderedDict()
for key in sorted(indict.keys()): for key in sorted(indict.keys()):
@ -75,7 +80,7 @@ def clean_elem(indict):
for filename in sys.argv[1:]: for filename in sys.argv[1:]:
with open(filename) as f: with open(filename) as f:
js = json.load(f) js = yaml.load(f)
js = rebuild_as_ordered_dict(js, _TOP_LEVEL_KEYS) js = rebuild_as_ordered_dict(js, _TOP_LEVEL_KEYS)
js['settings']['version'] = rebuild_as_ordered_dict( js['settings']['version'] = rebuild_as_ordered_dict(
js['settings']['version'], _VERSION_KEYS) js['settings']['version'], _VERSION_KEYS)
@ -83,7 +88,7 @@ for filename in sys.argv[1:]:
if grp not in js: continue if grp not in js: continue
js[grp] = sorted([clean_elem(x) for x in js[grp]], js[grp] = sorted([clean_elem(x) for x in js[grp]],
key=lambda x: (x.get('language', '_'), x['name'])) key=lambda x: (x.get('language', '_'), x['name']))
output = json.dumps(js, indent = 2) output = yaml.dump(js, indent=2, width=80)
# massage out trailing whitespace # massage out trailing whitespace
lines = [] lines = []
for line in output.splitlines(): for line in output.splitlines():

@ -28,11 +28,11 @@
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
gen_build_json_dirs="test/core/end2end test/core/bad_client" gen_build_yaml_dirs="test/core/end2end test/core/bad_client"
gen_build_files="" gen_build_files=""
for gen_build_json in $gen_build_json_dirs for gen_build_yaml in $gen_build_yaml_dirs
do do
output_file=`mktemp /tmp/genXXXXXX` output_file=`mktemp /tmp/genXXXXXX`
$gen_build_json/gen_build_json.py > $output_file $gen_build_yaml/gen_build_yaml.py > $output_file
gen_build_files="$gen_build_files $output_file" gen_build_files="$gen_build_files $output_file"
done done

@ -40,7 +40,7 @@ cd `dirname $0`/../..
mako_renderer=tools/buildgen/mako_renderer.py mako_renderer=tools/buildgen/mako_renderer.py
if [ "x$TEST" != "x" ] ; then if [ "x$TEST" != "x" ] ; then
tools/buildgen/build-cleaner.py build.json tools/buildgen/build-cleaner.py build.yaml
fi fi
. tools/buildgen/generate_build_additions.sh . tools/buildgen/generate_build_additions.sh
@ -58,8 +58,8 @@ for dir in . ; do
out=${dir}/${file#$dir/templates/} # strip templates dir prefix out=${dir}/${file#$dir/templates/} # strip templates dir prefix
out=${out%.*} # strip template extension out=${out%.*} # strip template extension
echo "generating file: $out" echo "generating file: $out"
json_files="build.json $gen_build_files" yaml_files="build.yaml $gen_build_files"
data=`for i in $json_files ; do echo $i ; done | awk ' { printf "-d %s ", $0 } '` data=`for i in $yaml_files ; do echo $i ; done | awk ' { printf "-d %s ", $0 } '`
if [ "x$TEST" = "xtrue" ] ; then if [ "x$TEST" = "xtrue" ] ; then
actual_out=$out actual_out=$out
out=`mktemp /tmp/gentXXXXXX` out=`mktemp /tmp/gentXXXXXX`

@ -40,11 +40,11 @@ cd `dirname $0`/../..
mako_renderer=tools/buildgen/mako_renderer.py mako_renderer=tools/buildgen/mako_renderer.py
if [ "x$TEST" != "x" ] ; then if [ "x$TEST" != "x" ] ; then
tools/buildgen/build-cleaner.py build.json tools/buildgen/build-cleaner.py build.yaml
fi fi
. tools/buildgen/generate_build_additions.sh . tools/buildgen/generate_build_additions.sh
tools/buildgen/generate_projects.py build.json $gen_build_files tools/buildgen/generate_projects.py build.yaml $gen_build_files
rm $gen_build_files rm $gen_build_files

@ -38,14 +38,15 @@ Just a wrapper around the mako rendering library.
import getopt import getopt
import imp import imp
import os import os
import shutil
import sys import sys
from mako.lookup import TemplateLookup from mako.lookup import TemplateLookup
from mako.runtime import Context from mako.runtime import Context
from mako.template import Template from mako.template import Template
import simplejson
import bunch import bunch
import yaml
# Imports a plugin # Imports a plugin
@ -76,6 +77,7 @@ def main(argv):
got_output = False got_output = False
output_file = sys.stdout output_file = sys.stdout
plugins = [] plugins = []
output_name = None
try: try:
opts, args = getopt.getopt(argv, 'hm:d:o:p:') opts, args = getopt.getopt(argv, 'hm:d:o:p:')
@ -95,7 +97,7 @@ def main(argv):
showhelp() showhelp()
sys.exit(3) sys.exit(3)
got_output = True got_output = True
output_file = open(arg, 'w') output_name = arg
elif opt == '-m': elif opt == '-m':
if module_directory is not None: if module_directory is not None:
out('Got more than one cache directory') out('Got more than one cache directory')
@ -104,7 +106,7 @@ def main(argv):
module_directory = arg module_directory = arg
elif opt == '-d': elif opt == '-d':
dict_file = open(arg, 'r') dict_file = open(arg, 'r')
bunch.merge_json(json_dict, simplejson.loads(dict_file.read())) bunch.merge_json(json_dict, yaml.load(dict_file.read()))
dict_file.close() dict_file.close()
elif opt == '-p': elif opt == '-p':
plugins.append(import_plugin(arg)) plugins.append(import_plugin(arg))
@ -115,14 +117,51 @@ def main(argv):
for k, v in json_dict.items(): for k, v in json_dict.items():
dictionary[k] = bunch.to_bunch(v) dictionary[k] = bunch.to_bunch(v)
ctx = Context(output_file, **dictionary) cleared_dir = False
for arg in args: for arg in args:
got_input = True got_input = True
template = Template(filename=arg, with open(arg) as f:
module_directory=module_directory, srcs = list(yaml.load_all(f.read()))
lookup=TemplateLookup(directories=['.'])) for src in srcs:
template.render_context(ctx) if isinstance(src, basestring):
assert len(srcs) == 1
template = Template(src,
filename=arg,
module_directory=module_directory,
lookup=TemplateLookup(directories=['.']))
with open(output_name, 'w') as output_file:
template.render_context(Context(output_file, **dictionary))
else:
# we have optional control data: this template represents
# a directory
if not cleared_dir:
shutil.rmtree(output_name, ignore_errors=True)
cleared_dir = True
items = []
if 'foreach' in src:
for el in dictionary[src['foreach']]:
if 'cond' in src:
args = dict(dictionary)
args['selected'] = el
if not eval(src['cond'], {}, args):
continue
items.append(el)
assert items
else:
items = [None]
for item in items:
args = dict(dictionary)
args['selected'] = item
item_output_name = os.path.join(
output_name, Template(src['output_name']).render(**args))
if not os.path.exists(os.path.dirname(item_output_name)):
os.makedirs(os.path.dirname(item_output_name))
template = Template(src['template'],
filename=arg,
module_directory=module_directory,
lookup=TemplateLookup(directories=['.']))
with open(item_output_name, 'w') as output_file:
template.render_context(Context(output_file, **args))
if not got_input: if not got_input:
out('Got nothing to do') out('Got nothing to do')

@ -37,7 +37,7 @@ This fills in any optional attributes.
def mako_plugin(dictionary): def mako_plugin(dictionary):
"""The exported plugin code for expand_filegroups. """The exported plugin code for expand_filegroups.
The list of libs in the build.json file can contain "filegroups" tags. The list of libs in the build.yaml file can contain "filegroups" tags.
These refer to the filegroups in the root object. We will expand and These refer to the filegroups in the root object. We will expand and
merge filegroups on the src, headers and public_headers properties. merge filegroups on the src, headers and public_headers properties.

@ -29,7 +29,7 @@
"""Buildgen expand filegroups plugin. """Buildgen expand filegroups plugin.
This takes the list of libs from our json dictionary, This takes the list of libs from our yaml dictionary,
and expands any and all filegroup. and expands any and all filegroup.
""" """
@ -45,7 +45,7 @@ def excluded(filename, exclude_res):
def mako_plugin(dictionary): def mako_plugin(dictionary):
"""The exported plugin code for expand_filegroups. """The exported plugin code for expand_filegroups.
The list of libs in the build.json file can contain "filegroups" tags. The list of libs in the build.yaml file can contain "filegroups" tags.
These refer to the filegroups in the root object. We will expand and These refer to the filegroups in the root object. We will expand and
merge filegroups on the src, headers and public_headers properties. merge filegroups on the src, headers and public_headers properties.

@ -57,14 +57,27 @@ def mako_plugin(dictionary):
projects = [] projects = []
projects.extend(libs) projects.extend(libs)
projects.extend(targets) projects.extend(targets)
if dictionary.get('debug', False): for target in projects:
for target in projects: if 'build' in target and target['build'] == 'test':
if not target.get('vs_project_guid', None) and 'windows' in target.get('platforms', ['windows']): default_test_dir = 'test'
name = target['name'] else:
guid = re.sub('(........)(....)(....)(....)(.*)', default_test_dir = '.'
r'{\1-\2-\3-\4-\5}', if 'vs_config_type' not in target:
hashlib.md5(name).hexdigest()) if 'build' in target and target['build'] == 'test':
target['vs_project_guid'] = guid.upper() target['vs_config_type'] = 'Application'
else:
target['vs_config_type'] = 'StaticLibrary'
if 'vs_packages' not in target:
target['vs_packages'] = []
if 'vs_props' not in target:
target['vs_props'] = []
target['vs_proj_dir'] = target.get('vs_proj_dir', default_test_dir)
if target.get('vs_project_guid', None) is None and 'windows' in target.get('platforms', ['windows']):
name = target['name']
guid = re.sub('(........)(....)(....)(....)(.*)',
r'{\1-\2-\3-\4-\5}',
hashlib.md5(name).hexdigest())
target['vs_project_guid'] = guid.upper()
# Exclude projects without a visual project guid, such as the tests. # Exclude projects without a visual project guid, such as the tests.
projects = [project for project in projects projects = [project for project in projects
if project.get('vs_project_guid', None)] if project.get('vs_project_guid', None)]
@ -74,5 +87,9 @@ def mako_plugin(dictionary):
project_dict = dict([(p['name'], p) for p in projects]) project_dict = dict([(p['name'], p) for p in projects])
packages = dictionary.get('vspackages', [])
packages_dict = dict([(p['name'], p) for p in packages])
dictionary['vsprojects'] = projects dictionary['vsprojects'] = projects
dictionary['vsproject_dict'] = project_dict dictionary['vsproject_dict'] = project_dict
dictionary['vspackages_dict'] = packages_dict

@ -29,7 +29,7 @@
"""Buildgen .proto files list plugin. """Buildgen .proto files list plugin.
This parses the list of targets from the json build file, and creates This parses the list of targets from the yaml build file, and creates
a list called "protos" that contains all of the proto file names. a list called "protos" that contains all of the proto file names.
""" """

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because one or more lines are too long

@ -1,18 +1 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ImportGroup Label="PropertySheets" /> <PropertyGroup Label="UserMacros" /> <PropertyGroup /> <ItemDefinitionGroup> <ClCompile> <AdditionalIncludeDirectories>$(SolutionDir)\..;$(SolutionDir)\..\include;$(SolutionDir)\..\third_party\protobuf\src;$(SolutionDir)\..\third_party\gtest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions> <WarningLevel>EnableAllWarnings</WarningLevel> </ClCompile> <Link> <AdditionalDependencies>grpc++_test_util.lib;grpc_test_util.lib;gpr_test_util.lib;gtestd.lib;gflags.lib;shlwapi.lib;gpr.lib;grpc.lib;grpc++.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalLibraryDirectories>$(SolutionDir)\..\third_party\gtest\msvc\gtest\Debug;$(SolutionDir)\..\third_party\gflags\lib\Debug;$(SolutionDir)\..\Debug;$(SolutionDir)\..\packages\grpc.dependencies.openssl.1.0.2.3\build\native\lib\$(PlatformToolset)\$(Platform)\$(Configuration)\static;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> </Link> </ItemDefinitionGroup> <ItemGroup /> </Project>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ImportGroup Label="PropertySheets" />
<PropertyGroup Label="UserMacros" />
<PropertyGroup />
<ItemDefinitionGroup>
<ClCompile>
<AdditionalIncludeDirectories>$(ProjectDir)\..\..;$(ProjectDir)\..\..\include;$(ProjectDir)\..\..\third_party\protobuf\src;$(ProjectDir)\..\..\third_party\gtest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<WarningLevel>EnableAllWarnings</WarningLevel>
</ClCompile>
<Link>
<AdditionalDependencies>grpc++_test_util.lib;grpc_test_util.lib;gpr_test_util.lib;gtestd.lib;gflags.lib;shlwapi.lib;gpr.lib;grpc.lib;grpc++.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(ProjectDir)\..\..\third_party\gtest\msvc\gtest\Debug;$(ProjectDir)\..\..\third_party\gflags\lib\Debug;$(ProjectDir)\..\Debug;$(ProjectDir)\..\packages\grpc.dependencies.openssl.1.0.2.2\build\native\lib\$(PlatformToolset)\$(Platform)\$(Configuration)\static;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Link>
</ItemDefinitionGroup>
<ItemGroup />
</Project>

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save