aboutsummaryrefslogtreecommitdiffhomepage
path: root/tools/buildgen/plugins
diff options
context:
space:
mode:
authorGravatar Nicolas "Pixel" Noble <pixel@nobis-crew.org>2015-01-23 02:06:18 +0100
committerGravatar Nicolas "Pixel" Noble <pixel@nobis-crew.org>2015-01-23 02:06:18 +0100
commitb049ba8fc4792f283db410caf561d05c361d43d2 (patch)
tree2d56bade7205322e7b00dc440687ad0683ce825b /tools/buildgen/plugins
parentcc0994c8cbd302aa99483e42d6d2855b0cd59fd4 (diff)
parentfdd76ba414cde7e7ae827183fcf04c9b2874adf6 (diff)
Merge branch 'master' of github.com:google/grpc into vsprojects
Conflicts: templates/vsprojects/vs2013/grpc.sln.template
Diffstat (limited to 'tools/buildgen/plugins')
-rwxr-xr-xtools/buildgen/plugins/generate_vsprojects.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/buildgen/plugins/generate_vsprojects.py b/tools/buildgen/plugins/generate_vsprojects.py
index 36eb8f7008..021b843868 100755
--- a/tools/buildgen/plugins/generate_vsprojects.py
+++ b/tools/buildgen/plugins/generate_vsprojects.py
@@ -30,7 +30,7 @@ def mako_plugin(dictionary):
projects = [project for project in projects if project.get('vs_project_guid', None)]
## Exclude C++ projects for now
- projects = [project for project in projects if not project.get('c++', False)]
+ projects = [project for project in projects if not project.language == 'c++']
project_dict = dict([(p['name'], p) for p in projects])