commit f05c58309c66535eb20a6a8ac0c94c4ecdd65c1b
author Alexei Frolov <frolv@pigweed.infra.roller.google.com> Tue Oct 22 21:21:08 2024 +0000
committer CQ Bot Account <pigweed-scoped@luci-project-accounts.iam.gserviceaccount.com> Tue Oct 22 21:21:08 2024 +0000
tree cac5c1b0b5c372397db1aff4dfb4e3c90e481e32
parent b9dc7b5eac986c426cf3155ebc61484206065e73

roll: pigweed pw_protobuf: Allow .pwpb_options as an options file extension

pw_protobuf allows providing code generator options through a separate
options file. These files are typically found automatically by the
compiler by scanning the source proto directory for a file matching the
name of an input proto file with an options file extension.

Previously, the only supported options extension was `.options`. This
was inspired by Nanopb. However, this results in conflicts with Nanopb
in projects which use it alongside pw_protobuf (such as Pigweed itself).
This change adds `.pwpb_options` as the primary options file extension
for pw_protobuf. `.options` is still supported by default, but a
code generator flag is offered to disable it for projects choosing to
strictly separate Nanopb and pw_protobuf options.

Original-Reviewed-on: https://pigweed-review.googlesource.com/c/pigweed/pigweed/+/241137
Original-Revision: 9525d75843cede1c67f78de7c2f86bb30ac98efe

Rolled-Repo: https://pigweed.googlesource.com/pigweed/pigweed
Rolled-Commits: 19ba505b67fd82..9525d75843cede
Roll-Count: 1
Roller-URL: https://cr-buildbucket.appspot.com/build/8733344025195122561
GitWatcher: ignore
CQ-Do-Not-Cancel-Tryjobs: true
Change-Id: I7c51a6c3b8fa6ffe9144cd38d2d82eeb387ae4d3
Reviewed-on: https://pigweed-review.googlesource.com/c/pigweed/showcase/sense/+/243821
Bot-Commit: Pigweed Roller <pigweed-roller@pigweed-service-accounts.iam.gserviceaccount.com>
Commit-Queue: Pigweed Roller <pigweed-roller@pigweed-service-accounts.iam.gserviceaccount.com>
Lint: Lint 🤖 <android-build-ayeaye@system.gserviceaccount.com>