Chiebot-Mirror
/
protobuf
mirror of https://github.com/protocolbuffers/protobuf.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Refactored mini_table targets into their own BUILD file.

Browse Source 
PiperOrigin-RevId: 542607918
pull/13171/head
Joshua Haberman 2 years ago committed by Copybara-Service
parent 80264f7cab
commit 34a770d13e
5 changed files with 137 additions and 106 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 136
      BUILD
  2. 1
      cmake/BUILD.bazel
  3. 4
      protos_generator/protoc-gen-upb-protos.cc
  4. 1
      python/dist/BUILD.bazel
  5. 101
      upb/mini_table/BUILD

136
BUILD
Unescape View File

@ -106,7 +106,7 @@ upb_proto_library_copts(
# you make changes to this list. # you make changes to this list.
package_group( package_group(
name = "friends", name = "friends",
packages = [], packages = ["//..."],
) )
# Public C/C++ libraries ####################################################### # Public C/C++ libraries #######################################################
@ -143,7 +143,6 @@ cc_library(
"upb/mem/arena.h", "upb/mem/arena.h",
"upb/message/extension_internal.h", "upb/message/extension_internal.h",
"upb/message/message.h", "upb/message/message.h",
"upb/mini_table/extension_registry.h",
"upb/msg.h", "upb/msg.h",
"upb/status.h", "upb/status.h",
"upb/string_view.h", "upb/string_view.h",
@ -163,9 +162,9 @@ cc_library(
":lex", ":lex",
":mem", ":mem",
":message_internal", ":message_internal",
":mini_table_internal",
":port", ":port",
":wire", ":wire",
"//upb/mini_table:mini_table_internal",
], ],
) )
@ -186,69 +185,30 @@ cc_library(
) )
cc_library( cc_library(
name = "mini_table", name = "message",
hdrs = [ hdrs = [
"upb/mini_table.h", "upb/message/message.h",
"upb/mini_table/decode.h",
"upb/mini_table/extension_registry.h",
"upb/mini_table/types.h",
], ],
copts = UPB_DEFAULT_COPTS, copts = UPB_DEFAULT_COPTS,
visibility = ["//visibility:public"], visibility = ["//visibility:public"],
deps = [ deps = [
":base",
":mem", ":mem",
":mini_table_internal", ":message_internal",
":port", ":port",
"//upb/mini_table",
], ],
) )
cc_library( alias(
name = "mini_table_internal", name = "mini_table",
srcs = [ actual = "//upb/mini_table",
"upb/mini_table/common.c", visibility = ["//:friends"],
"upb/mini_table/decode.c",
"upb/mini_table/encode.c",
"upb/mini_table/extension_registry.c",
"upb/mini_table/message_internal.c",
],
hdrs = [
"upb/mini_table/common.h",
"upb/mini_table/common_internal.h",
"upb/mini_table/decode.h",
"upb/mini_table/encode_internal.h",
"upb/mini_table/encode_internal.hpp",
"upb/mini_table/enum_internal.h",
"upb/mini_table/extension_internal.h",
"upb/mini_table/extension_registry.h",
"upb/mini_table/field_internal.h",
"upb/mini_table/file_internal.h",
"upb/mini_table/message_internal.h",
"upb/mini_table/sub_internal.h",
"upb/mini_table/types.h",
],
visibility = ["//visibility:public"],
deps = [
":base",
":hash",
":mem",
":port",
],
) )
cc_library( alias(
name = "message", name = "mini_table_internal",
hdrs = [ actual = "//upb/mini_table:mini_table_internal",
"upb/message/message.h", visibility = ["//:friends"],
],
copts = UPB_DEFAULT_COPTS,
visibility = ["//visibility:public"],
deps = [
":mem",
":message_internal",
":mini_table",
":port",
],
) )
cc_library( cc_library(
@ -267,8 +227,8 @@ cc_library(
":base", ":base",
":hash", ":hash",
":mem", ":mem",
":mini_table_internal",
":port", ":port",
"//upb/mini_table:mini_table_internal",
], ],
) )
@ -282,8 +242,8 @@ cc_library(
deps = [ deps = [
":collections_internal", ":collections_internal",
":message_internal", ":message_internal",
":mini_table_internal",
":port", ":port",
"//upb/mini_table:mini_table_internal",
], ],
) )
@ -303,11 +263,11 @@ cc_library(
":eps_copy_input_stream", ":eps_copy_input_stream",
":hash", ":hash",
":message_internal", ":message_internal",
":mini_table_internal",
":port", ":port",
":upb", ":upb",
":wire", ":wire",
":wire_reader", ":wire_reader",
"//upb/mini_table:mini_table_internal",
], ],
) )
@ -327,11 +287,11 @@ cc_library(
":hash", ":hash",
":message_accessors", ":message_accessors",
":message_internal", ":message_internal",
":mini_table_internal",
":port", ":port",
":upb", ":upb",
":wire", ":wire",
":wire_reader", ":wire_reader",
"//upb/mini_table:mini_table_internal",
], ],
) )
@ -349,9 +309,9 @@ cc_library(
":collections_internal", ":collections_internal",
":message_accessors", ":message_accessors",
":message_internal", ":message_internal",
":mini_table_internal",
":port", ":port",
":upb", ":upb",
"//upb/mini_table:mini_table_internal",
], ],
) )
@ -368,33 +328,15 @@ cc_library(
], ],
) )
cc_test(
name = "mini_table_encode_test",
srcs = [
"upb/mini_table/encode_test.cc",
],
deps = [
":collections_internal",
":hash",
":message_internal",
":mini_table_internal",
":port",
":upb",
"@com_google_absl//absl/container:flat_hash_set",
"@com_google_googletest//:gtest_main",
"@com_google_protobuf//:protobuf",
],
)
cc_test( cc_test(
name = "message_accessors_test", name = "message_accessors_test",
srcs = ["upb/message/accessors_test.cc"], srcs = ["upb/message/accessors_test.cc"],
deps = [ deps = [
":collections", ":collections",
":message_accessors", ":message_accessors",
":mini_table_internal",
":port", ":port",
":upb", ":upb",
"//upb/mini_table:mini_table_internal",
"//upb/test:test_messages_proto2_upb_proto", "//upb/test:test_messages_proto2_upb_proto",
"//upb/test:test_messages_proto3_upb_proto", "//upb/test:test_messages_proto3_upb_proto",
"//upb/test:test_upb_proto", "//upb/test:test_upb_proto",
@ -412,9 +354,9 @@ cc_test(
":message_accessors", ":message_accessors",
":message_copy", ":message_copy",
":message_promote", ":message_promote",
":mini_table_internal",
":port", ":port",
":upb", ":upb",
"//upb/mini_table:mini_table_internal",
"//upb/test:test_messages_proto2_upb_proto", "//upb/test:test_messages_proto2_upb_proto",
"//upb/test:test_messages_proto3_upb_proto", "//upb/test:test_messages_proto3_upb_proto",
"//upb/test:test_upb_proto", "//upb/test:test_upb_proto",
@ -431,8 +373,8 @@ cc_test(
":collections", ":collections",
":message_accessors", ":message_accessors",
":message_copy", ":message_copy",
":mini_table_internal",
":upb", ":upb",
"//upb/mini_table:mini_table_internal",
"//upb/test:test_messages_proto2_upb_proto", "//upb/test:test_messages_proto2_upb_proto",
"//upb/test:test_messages_proto3_upb_proto", "//upb/test:test_messages_proto3_upb_proto",
"//upb/test:test_upb_proto", "//upb/test:test_upb_proto",
@ -451,9 +393,9 @@ cc_library(
":hash", ":hash",
":mem_internal", ":mem_internal",
":message_internal", ":message_internal",
":mini_table_internal",
":port", ":port",
":wire", ":wire",
"//upb/mini_table:mini_table_internal",
], ],
) )
@ -477,9 +419,9 @@ cc_library(
":message_accessors", ":message_accessors",
":message_accessors_internal", ":message_accessors_internal",
":message_internal", ":message_internal",
":mini_table_internal",
":upb", ":upb",
":wire_internal", ":wire_internal",
"//upb/mini_table:mini_table_internal",
], ],
) )
@ -487,18 +429,7 @@ cc_library(
cc_library( cc_library(
name = "generated_cpp_support__only_for_generated_code_do_not_use__i_give_permission_to_break_me", name = "generated_cpp_support__only_for_generated_code_do_not_use__i_give_permission_to_break_me",
hdrs = [ hdrs = [
"upb/message/copy.h",
"upb/message/extension_internal.h",
"upb/message/internal.h",
"upb/message/message.h", "upb/message/message.h",
"upb/mini_table/common.h",
"upb/mini_table/enum_internal.h",
"upb/mini_table/extension_internal.h",
"upb/mini_table/field_internal.h",
"upb/mini_table/file_internal.h",
"upb/mini_table/message_internal.h",
"upb/mini_table/sub_internal.h",
"upb/mini_table/types.h",
"upb/port/def.inc", "upb/port/def.inc",
"upb/port/undef.inc", "upb/port/undef.inc",
"upb/upb.hpp", "upb/upb.hpp",
@ -513,8 +444,8 @@ cc_library(
":collections_internal", ":collections_internal",
":hash", ":hash",
":message_copy", ":message_copy",
":mini_table",
":upb", ":upb",
"//upb/mini_table",
], ],
) )
@ -532,8 +463,8 @@ cc_library(
":base", ":base",
":descriptor_upb_proto", ":descriptor_upb_proto",
":hash", ":hash",
":mini_table_internal",
":reflection_internal", ":reflection_internal",
"//upb/mini_table:mini_table_internal",
], ],
) )
@ -594,8 +525,8 @@ cc_library(
":hash", ":hash",
":mem", ":mem",
":message_internal", ":message_internal",
":mini_table_internal",
":port", ":port",
"//upb/mini_table:mini_table_internal",
], ],
) )
@ -697,9 +628,9 @@ bootstrap_cc_library(
":collections", ":collections",
":hash", ":hash",
":message_accessors", ":message_accessors",
":mini_table_internal",
":port", ":port",
":upb", ":upb",
"//upb/mini_table:mini_table_internal",
], ],
) )
@ -878,9 +809,9 @@ cc_library(
deps = [ deps = [
":mem", ":mem",
":message_internal", ":message_internal",
":mini_table_internal",
":port", ":port",
":wire_internal", ":wire_internal",
"//upb/mini_table:mini_table_internal",
], ],
) )
@ -910,10 +841,10 @@ cc_library(
":mem_internal", ":mem_internal",
":message_accessors_internal", ":message_accessors_internal",
":message_internal", ":message_internal",
":mini_table_internal",
":port", ":port",
":wire_reader", ":wire_reader",
":wire_types", ":wire_types",
"//upb/mini_table:mini_table_internal",
"@utf8_range", "@utf8_range",
], ],
) )
@ -1037,7 +968,7 @@ upb_amalgamation(
":hash", ":hash",
":lex", ":lex",
":mem_internal", ":mem_internal",
":mini_table_internal", "//upb/mini_table:mini_table_internal",
":message_accessors", ":message_accessors",
":message_internal", ":message_internal",
":port", ":port",
@ -1079,7 +1010,7 @@ upb_amalgamation(
":mem_internal", ":mem_internal",
":message_accessors", ":message_accessors",
":message_internal", ":message_internal",
":mini_table_internal", "//upb/mini_table:mini_table_internal",
":port", ":port",
":reflection", ":reflection",
":reflection_internal", ":reflection_internal",
@ -1120,7 +1051,7 @@ upb_amalgamation(
":mem_internal", ":mem_internal",
":message_accessors", ":message_accessors",
":message_internal", ":message_internal",
":mini_table_internal", "//upb/mini_table:mini_table_internal",
":port", ":port",
":reflection", ":reflection",
":reflection_internal", ":reflection_internal",
@ -1198,6 +1129,7 @@ pkg_files(
# kotlin_package = "upb", # kotlin_package = "upb",
# no_string_conversion = ["_upb_MiniTable_Build"], # no_string_conversion = ["_upb_MiniTable_Build"],
# strict_enums = ["upb_FieldType"], # strict_enums = ["upb_FieldType"],
# visibility = ["//:__subpackages__"],
# ) # )
# #
# end:google_only # end:google_only

1
cmake/BUILD.bazel
Unescape View File

@ -100,6 +100,7 @@ sh_test(
":copy_protos", ":copy_protos",
":gen_cmakelists", ":gen_cmakelists",
"//:cmake_files", "//:cmake_files",
"//upb/mini_table:cmake_files",
"@utf8_range//:utf8_range_srcs", "@utf8_range//:utf8_range_srcs",
], ],
target_compatible_with = select({ target_compatible_with = select({

4
protos_generator/protoc-gen-upb-protos.cc
Unescape View File

@ -140,8 +140,6 @@ void WriteHeader(const protobuf::FileDescriptor* file, Output& output) {
#include "absl/strings/string_view.h" #include "absl/strings/string_view.h"
#include "absl/status/statusor.h" #include "absl/status/statusor.h"
#include "upb/message/internal.h"
#include "upb/message/copy.h"
)cc", )cc",
ToPreproc(file->name())); ToPreproc(file->name()));
@ -203,8 +201,6 @@ void WriteSource(const protobuf::FileDescriptor* file, Output& output,
R"cc( R"cc(
#include <stddef.h> #include <stddef.h>
#include "absl/strings/string_view.h" #include "absl/strings/string_view.h"
#include "upb/message/copy.h"
#include "upb/message/internal.h"
#include "protos/protos.h" #include "protos/protos.h"
#include "$0" #include "$0"
)cc", )cc",

1
python/dist/BUILD.bazel vendored
Unescape View File

@ -214,6 +214,7 @@ pkg_tar(
"//:LICENSE", "//:LICENSE",
"//:upb_source_files", "//:upb_source_files",
"//python:message_extension", "//python:message_extension",
"//upb/mini_table:source_files",
"//upb/util:util_source_files", "//upb/util:util_source_files",
"@com_google_protobuf//python:python_source_files", "@com_google_protobuf//python:python_source_files",
], ],

101
upb/mini_table/BUILD
Unescape View File

@ -0,0 +1,101 @@
load(
"//bazel:build_defs.bzl",
"UPB_DEFAULT_COPTS",
)
# begin:github_only
load("@rules_pkg//:mappings.bzl", "pkg_files")
# end:github_only
cc_library(
name = "mini_table",
hdrs = [
"decode.h",
"extension_registry.h",
"types.h",
],
copts = UPB_DEFAULT_COPTS,
visibility = ["//visibility:public"],
deps = [
":mini_table_internal",
"//:base",
"//:mem",
"//:port",
],
)
cc_library(
name = "mini_table_internal",
srcs = [
"common.c",
"decode.c",
"encode.c",
"extension_registry.c",
"message_internal.c",
],
hdrs = [
"common.h",
"common_internal.h",
"decode.h",
"encode_internal.h",
"encode_internal.hpp",
"enum_internal.h",
"extension_internal.h",
"extension_registry.h",
"field_internal.h",
"file_internal.h",
"message_internal.h",
"sub_internal.h",
"types.h",
],
visibility = ["//visibility:public"],
deps = [
"//:base",
"//:hash",
"//:mem",
"//:port",
],
)
cc_test(
name = "encode_test",
srcs = ["encode_test.cc"],
deps = [
":mini_table_internal",
"//:collections_internal",
"//:hash",
"//:message_internal",
"//:port",
"//:upb",
"@com_google_absl//absl/container:flat_hash_set",
"@com_google_googletest//:gtest_main",
"@com_google_protobuf//:protobuf",
],
)
# begin:github_only
filegroup(
name = "cmake_files",
srcs = glob(
[
"**/*.c",
"**/*.h",
],
exclude = ["encode_test.cc"],
),
visibility = ["//cmake:__pkg__"],
)
pkg_files(
name = "source_files",
srcs = glob(
[
"**/*.c",
"**/*.h",
],
exclude = ["encode_test.cc"],
),
prefix = "upb/mini_table",
visibility = ["//python/dist:__pkg__"],
)
# end:github_only
Write Preview
Loading…
Cancel
Save