Skip to content

fix: allow generated files to be in a subfolder #213

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

Closed
wants to merge 1 commit into from
Closed

fix: allow generated files to be in a subfolder #213

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions rules/proto_compile.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
This runs the protoc tool and generates output source files.
"""

load("@bazel_skylib//lib:paths.bzl", "paths")
load("@rules_proto//proto:defs.bzl", "ProtoInfo")
load(":providers.bzl", "ProtoCompileInfo", "ProtoPluginInfo")

Expand Down Expand Up @@ -126,7 +127,7 @@ def _proto_compile_impl(ctx):
outs = {_plugin_label_key(Label(k)): v for k, v in ctx.attr.outs.items()}

# const <dict<string,File>. outputs indexed by basename.
outputs_by_basename = {f.basename: f for f in outputs}
outputs_by_basename = {paths.relativize(f.short_path, ctx.label.package): f for f in outputs}

# mut <list<File>> set of descriptors for the compile action
descriptors = proto_info.transitive_descriptor_sets.to_list()
Expand Down Expand Up @@ -313,7 +314,7 @@ def _proto_compile_impl(ctx):
inputs = inputs,
mnemonic = "Protoc",
outputs = outputs,
progress_message = "Compiling protoc outputs for %r" % [f.basename for f in protos],
progress_message = "Compiling protoc outputs for %r" % [paths.relativize(f.short_path, ctx.label.package) for f in protos],
tools = tools,
)

Expand Down