Skip to content

Restore generator headers in cmake install until the next breaking C++ release #20749

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

Merged
mkruskal-google merged 2 commits into from
Mar 19, 2025
Merged

Restore generator headers in cmake install until the next breaking C++ release #20749

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5fc7530
Restore generator headers in cmake install until the next breaking C+…
mkruskal-google Mar 18, 2025
5bfa9d7
Regenerate stale files
mkruskal-google Mar 19, 2025
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
7 changes: 7 additions & 0 deletions cmake/installed_include_golden.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,11 @@ google/protobuf/arenaz_sampler.h
google/protobuf/compiler/code_generator.h
google/protobuf/compiler/code_generator_lite.h
google/protobuf/compiler/command_line_interface.h
google/protobuf/compiler/cpp/generator.h
google/protobuf/compiler/cpp/helpers.h
google/protobuf/compiler/cpp/names.h
google/protobuf/compiler/cpp/options.h
google/protobuf/compiler/csharp/csharp_generator.h
google/protobuf/compiler/csharp/names.h
google/protobuf/compiler/importer.h
google/protobuf/compiler/java/context.h
Expand All @@ -25,7 +27,9 @@ google/protobuf/compiler/java/java_features.pb.h
google/protobuf/compiler/java/name_resolver.h
google/protobuf/compiler/java/names.h
google/protobuf/compiler/java/options.h
google/protobuf/compiler/kotlin/generator.h
google/protobuf/compiler/notices.h
google/protobuf/compiler/objectivec/generator.h
google/protobuf/compiler/objectivec/line_consumer.h
google/protobuf/compiler/objectivec/names.h
google/protobuf/compiler/objectivec/nsobject_methods.h
Expand All @@ -35,7 +39,10 @@ google/protobuf/compiler/php/php_generator.h
google/protobuf/compiler/plugin.h
google/protobuf/compiler/plugin.pb.h
google/protobuf/compiler/plugin.proto
google/protobuf/compiler/python/generator.h
google/protobuf/compiler/python/pyi_generator.h
google/protobuf/compiler/retention.h
google/protobuf/compiler/ruby/ruby_generator.h
google/protobuf/compiler/scc.h
google/protobuf/compiler/subprocess.h
google/protobuf/compiler/versions.h
Expand Down
Binary file modified csharp/src/Google.Protobuf.Test/testprotos.pb
View file
Open in desktop
Binary file not shown.
9 changes: 8 additions & 1 deletion pkg/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,8 +224,15 @@ cc_dist_library(
"//src/google/protobuf/compiler/java:names",
"//src/google/protobuf/compiler/objectivec:names",
"//src/google/protobuf/compiler/php:names",
# TODO Make this private once gRPC migrates off it.
# TODO Make these private in the next breaking C++ release.
"//src/google/protobuf/compiler/cpp:generator_headers",
"//src/google/protobuf/compiler/csharp:generator_headers",
"//src/google/protobuf/compiler/java:generator_headers",
"//src/google/protobuf/compiler/kotlin:generator_headers",
"//src/google/protobuf/compiler/objectivec:generator_headers",
"//src/google/protobuf/compiler/php",
"//src/google/protobuf/compiler/python:generator_headers",
"//src/google/protobuf/compiler/ruby:generator_headers",
],
)

Expand Down
7 changes: 7 additions & 0 deletions src/file_lists.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,9 +316,11 @@ set(libprotoc_public_hdrs
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/code_generator.h
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/code_generator_lite.h
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/command_line_interface.h
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/cpp/generator.h
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/cpp/helpers.h
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/cpp/names.h
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/cpp/options.h
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/csharp/csharp_generator.h
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/csharp/names.h
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/context.h
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/doc_comment.h
Expand All @@ -328,15 +330,20 @@ set(libprotoc_public_hdrs
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/name_resolver.h
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/names.h
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/options.h
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/kotlin/generator.h
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/notices.h
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/objectivec/generator.h
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/objectivec/line_consumer.h
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/objectivec/names.h
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/objectivec/nsobject_methods.h
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/php/names.h
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/php/php_generator.h
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/plugin.h
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/plugin.pb.h
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/python/generator.h
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/python/pyi_generator.h
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/retention.h
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/ruby/ruby_generator.h
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/scc.h
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/subprocess.h
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/versions.h
Expand Down
14 changes: 14 additions & 0 deletions src/google/protobuf/compiler/cpp/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,20 @@ cc_library(
],
)

cc_library(
name = "generator_headers",
hdrs = ["generator.h"],
copts = COPTS,
strip_include_prefix = "/src",
visibility = ["//pkg:__pkg__"],
deps = [
"//src/google/protobuf",
"//src/google/protobuf/compiler:code_generator",
"@abseil-cpp//absl/status",
"@abseil-cpp//absl/strings",
],
)

cc_library(
name = "names_internal",
srcs = [
Expand Down
12 changes: 12 additions & 0 deletions src/google/protobuf/compiler/csharp/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,18 @@ cc_library(
],
)

cc_library(
name = "generator_headers",
hdrs = ["csharp_generator.h"],
copts = COPTS,
strip_include_prefix = "/src",
visibility = ["//pkg:__pkg__"],
deps = [
"//src/google/protobuf",
"//src/google/protobuf/compiler:code_generator",
],
)

cc_library(
name = "csharp",
srcs = [
Expand Down
12 changes: 12 additions & 0 deletions src/google/protobuf/compiler/java/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,18 @@ cc_library(
],
)

cc_library(
name = "generator_headers",
hdrs = ["generator.h"],
copts = COPTS,
strip_include_prefix = "/src",
visibility = ["//pkg:__pkg__"],
deps = [
"//src/google/protobuf",
"//src/google/protobuf/compiler:code_generator",
],
)

cc_library(
name = "helpers",
srcs = [
Expand Down
12 changes: 12 additions & 0 deletions src/google/protobuf/compiler/kotlin/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,17 @@
load("//build_defs:cpp_opts.bzl", "COPTS")

cc_library(
name = "generator_headers",
hdrs = ["generator.h"],
copts = COPTS,
strip_include_prefix = "/src",
visibility = ["//pkg:__pkg__"],
deps = [
"//src/google/protobuf",
"//src/google/protobuf/compiler:code_generator",
],
)

cc_library(
name = "kotlin",
srcs = ["generator.cc"],
Expand Down
12 changes: 12 additions & 0 deletions src/google/protobuf/compiler/objectivec/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,18 @@ cc_library(
],
)

cc_library(
name = "generator_headers",
hdrs = ["generator.h"],
copts = COPTS,
strip_include_prefix = "/src",
visibility = ["//pkg:__pkg__"],
deps = [
"//src/google/protobuf",
"//src/google/protobuf/compiler:code_generator",
],
)

cc_library(
name = "names_internal",
srcs = [
Expand Down
20 changes: 20 additions & 0 deletions src/google/protobuf/compiler/python/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,26 @@ load("@rules_cc//cc:defs.bzl", "cc_library", "cc_test")
load("@rules_pkg//pkg:mappings.bzl", "pkg_files", "strip_prefix")
load("//build_defs:cpp_opts.bzl", "COPTS")

cc_library(
name = "generator_headers",
hdrs = [
"generator.h",
"pyi_generator.h",
],
copts = COPTS,
strip_include_prefix = "/src",
visibility = ["//pkg:__pkg__"],
deps = [
"//src/google/protobuf",
"//src/google/protobuf/compiler:code_generator",
"@abseil-cpp//absl/container:flat_hash_map",
"@abseil-cpp//absl/container:flat_hash_set",
"@abseil-cpp//absl/memory",
"@abseil-cpp//absl/strings",
"@abseil-cpp//absl/synchronization",
],
)

cc_library(
name = "python",
srcs = [
Expand Down
12 changes: 12 additions & 0 deletions src/google/protobuf/compiler/ruby/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,18 @@ load("@rules_cc//cc:defs.bzl", "cc_library", "cc_test")
load("@rules_pkg//pkg:mappings.bzl", "pkg_files", "strip_prefix")
load("//build_defs:cpp_opts.bzl", "COPTS")

cc_library(
name = "generator_headers",
hdrs = ["ruby_generator.h"],
copts = COPTS,
strip_include_prefix = "/src",
visibility = ["//pkg:__pkg__"],
deps = [
"//src/google/protobuf",
"//src/google/protobuf/compiler:code_generator",
],
)

cc_library(
name = "ruby",
srcs = ["ruby_generator.cc"],
Expand Down
Loading