Break dependency on protobuf.bzl from google/protobuf for C++ #92
+120
−119
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This replaces the use of cc_proto_library / proto_gen from the @com_google_protobuf//:protobuf.bzl. The reason for doing so is that newer versions of google/protobuf have changed cc_proto_library + proto_gen so that they no longer work with pgv_cc_proto_library. pgv_proto_library now takes a proto_library containing the protos instead of a list of proto files. The approach for generating the protoc command line arguments was taken from bazelbuild/rules_go The py_proto_library imported from @com_google_protobuf//:protobuf.bzl is used by Envoy, so we left it in. Signed-off-by: Andrew Keesler <[email protected]> Signed-off-by: Amin Jamali <[email protected]>
htuch
reviewed
Aug 7, 2018
There was a problem hiding this comment.
This looks like a fantastic improvement; moving to proto_library inputs was the long term vision, nice to see it happening. @akonradi can you take a quick look and see how this aligns with earlier work that you did in this area?
akonradi
reviewed
Aug 7, 2018
bazel/pgv_proto_library.bzl
Outdated
| """Bazel rule to create a C++ protobuf validation library from proto source files | ||
| Args: | ||
| name: the name of the pgv_cc_proto_library. | ||
| proto: a single proto_library rule which contains the necessary .proto files. Note that this |
There was a problem hiding this comment.
Bazel's native cc_proto_library rule uses deps for the set of proto_library dependencies. It might be worth doing the same here, and using cc_deps or similar for C++ dependencies.
bazel/protobuf.bzl
Outdated
| outputs=out_files, | ||
| arguments=args + [_proto_path(proto) for proto in protos], | ||
| executable=ctx.executable._protoc, | ||
| mnemonic="ProtoGenValidateCompile", |
There was a problem hiding this comment.
"Compile" seems inaccurate. What do you think about "CcGenerate"?
- change mnemonic to ProtoGenValidateCcGenerate - accept array of proto_library rules as argument Signed-off-by: Sam Smith <[email protected]>
akonradi
approved these changes
Aug 7, 2018
rodaine
approved these changes
Aug 8, 2018
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This replaces the use of cc_proto_library / proto_gen from the
@com_google_protobuf//:protobuf.bzl. The reason for doing so is that
newer versions of google/protobuf have changed cc_proto_library +
proto_gen so that they no longer work with pgv_cc_proto_library.
pgv_proto_library now takes a proto_library containing the protos
instead of a list of proto files. The approach for generating the protoc
command line arguments was taken from bazelbuild/rules_go
The py_proto_library imported from @com_google_protobuf//:protobuf.bzl
is used by Envoy, so we left it in.
Note: when integrating this commit with Envoy, we see the error:
It looks like that error should be fixed by lyft/protoc-gen-star#28, however