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

Fix cmake installation location of java and go features #19773

Merged
merged 2 commits into from
Dec 23, 2024
+50 −8
Merged

Fix cmake installation location of java and go features #19773

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
c3e847d
Fix cmake installation location of java and go features
mkruskal-google Dec 20, 2024
fae97eb
Regenerate stale files
mkruskal-google Dec 20, 2024
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
23 changes: 16 additions & 7 deletions cmake/install.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ set(protobuf_HEADERS
${descriptor_proto_proto_srcs}
${plugin_proto_proto_srcs}
${java_features_proto_proto_srcs}
${go_features_proto_proto_srcs}
)
if (protobuf_BUILD_LIBUPB)
list(APPEND protobuf_HEADERS ${libupb_hdrs})
Expand All @@ -101,14 +102,22 @@ if (protobuf_BUILD_LIBUPB)
COMPONENT protobuf-headers
)
endif ()
set(protobuf_STRIP_PREFIXES
"/src"
"/java/core/src/main/resources"
"/go"
"/"
)
foreach(_header ${protobuf_HEADERS})
string(FIND ${_header} "${protobuf_SOURCE_DIR}/src" _find_src)
string(FIND ${_header} "${protobuf_SOURCE_DIR}" _find_nosrc)
if (_find_src GREATER -1)
set(_from_dir "${protobuf_SOURCE_DIR}/src")
elseif (_find_nosrc GREATER -1)
set(_from_dir "${protobuf_SOURCE_DIR}")
endif()
foreach(_strip_prefix ${protobuf_STRIP_PREFIXES})
string(FIND ${_header} "${protobuf_SOURCE_DIR}${_strip_prefix}" _find_src)
if(_find_src GREATER -1)
set(_from_dir "${protobuf_SOURCE_DIR}${_strip_prefix}")
break()
endif()
endforeach()
message(${_from_dir} "-" ${_header})

# Escape _from_dir for regex special characters in the directory name.
string(REGEX REPLACE "([$^.[|*+?()]|])" "\\\\\\1" _from_dir_regexp "${_from_dir}")
# On some platforms `_form_dir` ends up being just "protobuf", which can
Expand Down
14 changes: 13 additions & 1 deletion go/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,17 @@
load("//bazel:proto_library.bzl", "proto_library")

filegroup(
name = "go_features_proto_srcs",
srcs = ["go_features.proto"],
srcs = ["google/protobuf/go_features.proto"],
visibility = ["//:__subpackages__"],
)

proto_library(
name = "go_features_proto",
srcs = ["google/protobuf/go_features.proto"],
strip_import_prefix = "/go",
visibility = [
"//pkg:__pkg__",
],
deps = ["//:descriptor_proto"],
)
0 go/go_features.proto → go/google/protobuf/go_features.proto
View file
Open in desktop
File renamed without changes.
1 change: 1 addition & 0 deletions pkg/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,7 @@ gen_file_lists(
"//src/google/protobuf:descriptor_proto": "descriptor_proto",
"//src/google/protobuf/compiler:plugin_proto": "plugin_proto",
"//java/core:java_features_proto": "java_features_proto,src/google/protobuf/compiler/java/",
"//go:go_features_proto": "go_features_proto,go/",

# Test libraries:
":common_test": "common_test",
Expand Down
20 changes: 20 additions & 0 deletions src/file_lists.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -928,6 +928,26 @@ set(java_features_proto_files
${protobuf_SOURCE_DIR}/java/core/java_features_proto-descriptor-set.proto.bin
)

# @//go:go_features_proto
set(go_features_proto_proto_srcs
${protobuf_SOURCE_DIR}/go/google/protobuf/go_features.proto
)

# @//go:go_features_proto
set(go_features_proto_srcs
${protobuf_SOURCE_DIR}/go/go_features.proto.pb.cc
)

# @//go:go_features_proto
set(go_features_proto_hdrs
${protobuf_SOURCE_DIR}/go/go_features.proto.pb.h
)

# @//go:go_features_proto
set(go_features_proto_files
${protobuf_SOURCE_DIR}/go/go_features_proto-descriptor-set.proto.bin
)

# @//pkg:common_test
set(common_test_srcs
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/command_line_interface_tester.cc
Expand Down
Loading