Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Grpc.Tools add support for env variable GRPC_PROTOC_PLUGIN (fix #27099) #30411

Merged
merged 3 commits into from
Sep 5, 2022
Merged

Grpc.Tools add support for env variable GRPC_PROTOC_PLUGIN (fix #27099) #30411

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1e5b3af
issue 27099 Grpc.Tools add env GRPC_TOOL_PLUGIN
tonydnewell Jul 26, 2022
a6aab19
Merge branch 'grpc:master' into bugfix/issue-27099-grpc.tools-env-var…
tonydnewell Aug 23, 2022
5031394
Change GRPC_TOOL_PLUGIN to GRPC_PROTOC_PLUGIN
tonydnewell Aug 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 4 additions & 0 deletions src/csharp/Grpc.Tools/build/_grpc/_Grpc.Tools.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@
<Target Name="gRPC_ResolvePluginFullPath" AfterTargets="Protobuf_ResolvePlatform">
<PropertyGroup>
<!-- TODO(kkm): Do not use Protobuf_PackagedToolsPath, roll gRPC's own. -->

<!-- First try environment variable. -->
<gRPC_PluginFullPath Condition=" '$(gRPC_PluginFullPath)' == '' ">$(GRPC_TOOL_PLUGIN)</gRPC_PluginFullPath>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The newly added logic looks good, but I think we should use a different name for the env variable.
How does these options sound?

  • GRPC_TOOLS_PLUGIN (at least the prefix matches the nuget name)
  • GRPC_TOOLS_PROTOC_PLUGIN (even more specific)
  • GRPC_PROTOC_PLUGIN (describes well what the thing is)
  • PROTOBUF_PROTOC_PLUGIN (since PROTOBUF_PROTOC is the env variable used for protoc binary - the name isn't great, but at least this would be consistent with the existing setting)

I'm leaning towards GRPC_PROTOC_PLUGIN.


<gRPC_PluginFullPath Condition=" '$(gRPC_PluginFullPath)' == '' and '$(Protobuf_ToolsOs)' == 'windows' "
>$(Protobuf_PackagedToolsPath)\$(Protobuf_ToolsOs)_$(Protobuf_ToolsCpu)\$(gRPC_PluginFileName).exe</gRPC_PluginFullPath>
<gRPC_PluginFullPath Condition=" '$(gRPC_PluginFullPath)' == '' "
Expand Down