Hand-written changes

templates/BUILD.template

+%YAML 1.2
+--- |
   # GRPC Bazel BUILD file.
   # This currently builds C, C++ and Objective-C code.
   # This file has been automatically generated from a template file.
@@ -41,7 +43,7 @@ package(default_visibility = ["//visibility:public"])
   <%!
   def get_deps(target_dict):
     deps = []
-  if target_dict.get('secure', 'no') == 'yes':
+    if target_dict.get('secure', False):
       deps = [
         "//external:libssl",
       ]
@@ -129,7 +131,7 @@ objc_library(
   % for dep in lib.get("deps", []):
       ":${dep}_objc",
   % endfor
-% if lib.get('secure', 'no') == 'yes':
+  % if lib.get('secure', False):
       "//external:libssl_objc",
   % endif
     ],

templates/Makefile.template

+%YAML 1.2
+--- |
   # GRPC global makefile
   # This currently builds C and C++ code.
   # This file has been automatically generated from a template file.
@@ -1529,7 +1531,7 @@ PUBLIC_HEADERS_C += \\
   LIB${lib.name.upper()}_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIB${lib.name.upper()}_SRC))))
 
   ## If the library requires OpenSSL, let's add some restrictions.
-% if lib.get('secure', 'check') == 'yes' or lib.get('secure', 'check') == 'check':
+  % if lib.get('secure', 'check') == True or lib.get('secure', 'check') == 'check':
   ifeq ($(NO_SECURE),true)
 
   # You can't build secure libraries if you don't have OpenSSL.
@@ -1596,7 +1598,7 @@ $(LIBDIR)/$(CONFIG)/lib${lib.name}.a: $(ZLIB_DEP)\
   	$(Q) rm -f $(LIBDIR)/$(CONFIG)/lib${lib.name}.a
   	$(Q) $(AR) rcs $(LIBDIR)/$(CONFIG)/lib${lib.name}.a $(LIB${lib.name.upper()}_OBJS)
   % if lib.get('baselib', False):
-% if lib.get('secure', 'check') == 'yes':
+  % if lib.get('secure', 'check') == True:
   	$(Q) rm -rf tmp-merge-${lib.name}
   	$(Q) mkdir tmp-merge-${lib.name}
   	$(Q) ( cd tmp-merge-${lib.name} ; $(AR) x ../$(LIBDIR)/$(CONFIG)/lib${lib.name}.a )
@@ -1636,10 +1638,10 @@ endif
       mingw_lib_deps = mingw_lib_deps + ' $(LIBDIR)/$(CONFIG)/' + dep + '.$(SHARED_EXT)'
 
     security = lib.get('secure', 'check')
-  if security == 'yes':
+    if security == True:
       common = common + ' $(OPENSSL_MERGE_LIBS) $(LDLIBS_SECURE)'
 
-  if security in ['yes', 'check']:
+    if security in [True, 'check']:
       for src in lib.src:
         if not proto_re.match(src):
           sources_that_need_openssl.add(src)
@@ -1650,7 +1652,7 @@ endif
     if 'zookeeper' in lib.get('external_deps', []):
       libs = libs + ' -lzookeeper_mt'
 
-  if lib.get('secure', 'check') == 'yes' or lib.get('secure', 'check') == 'check':
+    if lib.get('secure', 'check') == True or lib.get('secure', 'check') == 'check':
       lib_deps = lib_deps + ' $(OPENSSL_DEP)'
       mingw_lib_deps = mingw_lib_deps + ' $(OPENSSL_DEP)'
 
@@ -1677,7 +1679,7 @@ else
   endif
   endif
   % endif
-% if lib.get('secure', 'check') == 'yes' or lib.get('secure', 'check') == 'check':
+  % if lib.get('secure', 'check') == True or lib.get('secure', 'check') == 'check':
   ## If the lib was secure, we have to close the Makefile's if that tested
   ## the presence of OpenSSL.
 
@@ -1690,13 +1692,13 @@ endif
   endif
   % endif
 
-% if lib.get('secure', 'check') == 'yes' or lib.get('secure', 'check') == 'check':
+  % if lib.get('secure', 'check') == True or lib.get('secure', 'check') == 'check':
   ifneq ($(NO_SECURE),true)
   % endif
   ifneq ($(NO_DEPS),true)
   -include $(LIB${lib.name.upper()}_OBJS:.o=.dep)
   endif
-% if lib.get('secure', 'check') == 'yes' or lib.get('secure', 'check') == 'check':
+  % if lib.get('secure', 'check') == True or lib.get('secure', 'check') == 'check':
   endif
   % endif
   % for src in lib.src:
@@ -1717,7 +1719,7 @@ ${tgt.name.upper()}_SRC = \\
 
   ${tgt.name.upper()}_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(${tgt.name.upper()}_SRC))))
   % endif
-% if tgt.get('secure', 'check') == 'yes' or tgt.get('secure', 'check') == 'check':
+  % if tgt.get('secure', 'check') == True or tgt.get('secure', 'check') == 'check':
   ifeq ($(NO_SECURE),true)
 
   # You can't build secure targets if you don't have OpenSSL.
@@ -1806,7 +1808,7 @@ $(${tgt.name.upper()}_OBJS)\
   % endif
   % if tgt.build == 'protoc':
    $(HOST_LDLIBS_PROTOC)\
-% elif tgt.get('secure', 'check') == 'yes' or tgt.get('secure', 'check') == 'check':
+  % elif tgt.get('secure', 'check') == True or tgt.get('secure', 'check') == 'check':
    $(LDLIBS_SECURE)\
   % endif
   % if tgt.language == 'c++' and tgt.build == 'test':
@@ -1819,7 +1821,7 @@ $(${tgt.name.upper()}_OBJS)\
 
   endif
   % endif
-% if tgt.get('secure', 'check') == 'yes' or tgt.get('secure', 'check') == 'check':
+  % if tgt.get('secure', 'check') == True or tgt.get('secure', 'check') == 'check':
 
   endif
   % endif
@@ -1836,13 +1838,13 @@ deps_${tgt.name}: $(${tgt.name.upper()}_OBJS:.o=.dep)
   % endif
 
   % if not has_no_sources:
-% if tgt.get('secure', 'check') == 'yes' or tgt.get('secure', 'check') == 'check':
+  % if tgt.get('secure', 'check') == True or tgt.get('secure', 'check') == 'check':
   ifneq ($(NO_SECURE),true)
   % endif
   ifneq ($(NO_DEPS),true)
   -include $(${tgt.name.upper()}_OBJS:.o=.dep)
   endif
-% if tgt.get('secure', 'check') == 'yes' or tgt.get('secure', 'check') == 'check':
+  % if tgt.get('secure', 'check') == True or tgt.get('secure', 'check') == 'check':
   endif
   % endif
   % endif

templates/gRPC.podspec.template

+%YAML 1.2
+--- |
   # GRPC CocoaPods podspec
   # This file has been automatically generated from a template file.
   # Please look at the templates directory instead.

templates/src/core/surface/version.c.template

+%YAML 1.2
+--- |
   /*
    *
    * Copyright 2015, Google Inc.

templates/tools/doxygen/Doxyfile.c++.internal.template

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

templates/tools/doxygen/Doxyfile.c++.template

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

templates/tools/doxygen/Doxyfile.core.internal.template

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

templates/tools/doxygen/Doxyfile.core.template

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

templates/tools/run_tests/sources_and_headers.json.template

+%YAML 1.2
+--- |
   <%!
   import json
   import os

templates/tools/run_tests/tests.json.template

+%YAML 1.2
+--- |
   <%!
   import json
   %>

templates/vsprojects/Grpc.mak.template

+%YAML 1.2
+--- |
   # Copyright 2015, Google Inc.
   # All rights reserved.
   #
@@ -29,7 +31,7 @@
   <%!
     import re
   %>\
-<%namespace file="packages.include" import="get_openssl,get_zlib"/>\
+  <%namespace file="packages.include" import="get_name"/>\
   <%def name="to_windows_path(path)">${path.replace('/','\\')}</%def>\
   <%
     build_from_project_file = set(['gpr',
@@ -59,8 +61,8 @@ LINK=link.exe /nologo
   LIBTOOL=lib.exe /nologo /nodefaultlib
   
   REPO_ROOT=..
-OPENSSL_INCLUDES = .\packages\${get_openssl()}\build\native\include
-ZLIB_INCLUDES = .\packages\${get_zlib()}\build\native\include
+  OPENSSL_INCLUDES = .\packages\${get_name(vsprojects, 'openssl')}\build\native\include
+  ZLIB_INCLUDES = .\packages\${get_name(vsprojects, 'zlib')}\build\native\include
   INCLUDES=/I$(REPO_ROOT) /I$(REPO_ROOT)\include /I$(OPENSSL_INCLUDES) /I$(ZLIB_INCLUDES)
   
   GFLAGS_INCLUDES = .\..\third_party\gflags\include
@@ -77,10 +79,10 @@ CXXFLAGS=/c $(INCLUDES) $(CXX_INCLUDES) /Z7 /W3 /WX- /sdl $(DEFINES) /EHsc /RTC1
   
   LFLAGS=/DEBUG /INCREMENTAL /SUBSYSTEM:CONSOLE /TLBID:1 /DYNAMICBASE /NXCOMPAT /MACHINE:X86
   
-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
+  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
   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
-ZLIB_LIBS=.\packages\${get_zlib()}\build\native\lib\v120\Win32\Debug\static\cdecl\zlib.lib
+  ZLIB_LIBS=.\packages\${get_name(vsprojects, 'zlib')}\build\native\lib\v120\Win32\Debug\static\cdecl\zlib.lib
   LIBS=$(OPENSSL_LIBS) $(ZLIB_LIBS) $(GENERAL_LIBS) $(WINSOCK_LIBS)
   
   #shlwapi.lib provides PathMatchSpec() for gflags in windows

templates/vsprojects/cpptest.props.template

+<?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>

templates/vsprojects/global.props.template

+%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>

templates/vsprojects/gpr/gpr.vcxproj.filters.template

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

templates/vsprojects/gpr/gpr.vcxproj.template

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

templates/vsprojects/gpr_test_util/gpr_test_util.vcxproj.template

-<%namespace file="../vcxproj_defs.include" import="gen_project"/>\
-${gen_project('gpr_test_util', libs)}
\ No newline at end of file

templates/vsprojects/grpc++/grpc++.vcxproj.filters.template

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

templates/vsprojects/grpc++/grpc++.vcxproj.template

-<%namespace file="../vcxproj_defs.include" import="gen_project"/>\
-${gen_project('grpc++', libs)}
\ No newline at end of file

templates/vsprojects/grpc++_unsecure/grpc++_unsecure.vcxproj.filters.template

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

templates/vsprojects/grpc++_unsecure/grpc++_unsecure.vcxproj.template

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