Skip to content

Commit 40db3da

Browse files
dlj-NaNdlj-NaN
committed
Sync from Piper @436871048
PROTOBUF_SYNC_PIPER
2 parents a4c9eff + 744baa9 commit 40db3da

130 files changed

Lines changed: 589 additions & 538 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Makefile.am‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -837,6 +837,7 @@ php_EXTRA_DIST= \
837837
php/ext/google/protobuf/package.xml \
838838
php/ext/google/protobuf/php-upb.c \
839839
php/ext/google/protobuf/php-upb.h \
840+
php/ext/google/protobuf/php_protobuf.h \
840841
php/ext/google/protobuf/protobuf.c \
841842
php/ext/google/protobuf/protobuf.h \
842843
php/ext/google/protobuf/wkt.inc \
@@ -1113,13 +1114,16 @@ python_EXTRA_DIST= \
11131114
python/google/protobuf/pyext/repeated_scalar_container.h \
11141115
python/google/protobuf/pyext/safe_numerics.h \
11151116
python/google/protobuf/pyext/scoped_pyobject_ptr.h \
1117+
python/google/protobuf/pyext/unknown_field_set.cc \
1118+
python/google/protobuf/pyext/unknown_field_set.h \
11161119
python/google/protobuf/python_protobuf.h \
11171120
python/google/protobuf/reflection.py \
11181121
python/google/protobuf/service.py \
11191122
python/google/protobuf/service_reflection.py \
11201123
python/google/protobuf/symbol_database.py \
11211124
python/google/protobuf/text_encoding.py \
11221125
python/google/protobuf/text_format.py \
1126+
python/google/protobuf/unknown_fields.py \
11231127
python/google/protobuf/util/__init__.py \
11241128
python/release.sh \
11251129
python/mox.py \

‎benchmarks/README.md‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -69,18 +69,6 @@ solution. It requires the .NET Core SDK, and depends on
6969
[BenchmarkDotNet](https://github.com/dotnet/BenchmarkDotNet), which
7070
will be downloaded automatically.
7171

72-
### Big data
73-
74-
There's some optional big testing data which is not included in the directory
75-
initially, you need to run the following command to download the testing data:
76-
77-
```
78-
$ ./download_data.sh
79-
```
80-
81-
After doing this the big data file will automatically generated in the
82-
benchmark directory.
83-
8472
## Run instructions
8573

8674
To run all the benchmark dataset:

‎cmake/extract_includes.bat.in‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,28 +22,28 @@ copy "${PROTOBUF_SOURCE_WIN32_PATH}\src\google\protobuf\arenastring.h" include\g
2222
copy "${PROTOBUF_SOURCE_WIN32_PATH}\src\google\protobuf\arenaz_sampler.h" include\google\protobuf\arenaz_sampler.h
2323
copy "${PROTOBUF_SOURCE_WIN32_PATH}\src\google\protobuf\compiler\code_generator.h" include\google\protobuf\compiler\code_generator.h
2424
copy "${PROTOBUF_SOURCE_WIN32_PATH}\src\google\protobuf\compiler\command_line_interface.h" include\google\protobuf\compiler\command_line_interface.h
25-
copy "${PROTOBUF_SOURCE_WIN32_PATH}\src\google\protobuf\compiler\cpp\cpp_file.h" include\google\protobuf\compiler\cpp\cpp_file.h
26-
copy "${PROTOBUF_SOURCE_WIN32_PATH}\src\google\protobuf\compiler\cpp\cpp_generator.h" include\google\protobuf\compiler\cpp\cpp_generator.h
27-
copy "${PROTOBUF_SOURCE_WIN32_PATH}\src\google\protobuf\compiler\cpp\cpp_helpers.h" include\google\protobuf\compiler\cpp\cpp_helpers.h
28-
copy "${PROTOBUF_SOURCE_WIN32_PATH}\src\google\protobuf\compiler\cpp\cpp_names.h" include\google\protobuf\compiler\cpp\cpp_names.h
25+
copy "${PROTOBUF_SOURCE_WIN32_PATH}\src\google\protobuf\compiler\cpp\file.h" include\google\protobuf\compiler\cpp\cpp_file.h
26+
copy "${PROTOBUF_SOURCE_WIN32_PATH}\src\google\protobuf\compiler\cpp\generator.h" include\google\protobuf\compiler\cpp\cpp_generator.h
27+
copy "${PROTOBUF_SOURCE_WIN32_PATH}\src\google\protobuf\compiler\cpp\helpers.h" include\google\protobuf\compiler\cpp\cpp_helpers.h
28+
copy "${PROTOBUF_SOURCE_WIN32_PATH}\src\google\protobuf\compiler\cpp\names.h" include\google\protobuf\compiler\cpp\cpp_names.h
2929
copy "${PROTOBUF_SOURCE_WIN32_PATH}\src\google\protobuf\compiler\csharp\csharp_doc_comment.h" include\google\protobuf\compiler\csharp\csharp_doc_comment.h
3030
copy "${PROTOBUF_SOURCE_WIN32_PATH}\src\google\protobuf\compiler\csharp\csharp_generator.h" include\google\protobuf\compiler\csharp\csharp_generator.h
3131
copy "${PROTOBUF_SOURCE_WIN32_PATH}\src\google\protobuf\compiler\csharp\csharp_names.h" include\google\protobuf\compiler\csharp\csharp_names.h
3232
copy "${PROTOBUF_SOURCE_WIN32_PATH}\src\google\protobuf\compiler\csharp\csharp_options.h" include\google\protobuf\compiler\csharp\csharp_options.h
3333
copy "${PROTOBUF_SOURCE_WIN32_PATH}\src\google\protobuf\compiler\importer.h" include\google\protobuf\compiler\importer.h
34-
copy "${PROTOBUF_SOURCE_WIN32_PATH}\src\google\protobuf\compiler\java\java_generator.h" include\google\protobuf\compiler\java\java_generator.h
35-
copy "${PROTOBUF_SOURCE_WIN32_PATH}\src\google\protobuf\compiler\java\java_kotlin_generator.h" include\google\protobuf\compiler\java\java_kotlin_generator.h
36-
copy "${PROTOBUF_SOURCE_WIN32_PATH}\src\google\protobuf\compiler\java\java_names.h" include\google\protobuf\compiler\java\java_names.h
34+
copy "${PROTOBUF_SOURCE_WIN32_PATH}\src\google\protobuf\compiler\java\generator.h" include\google\protobuf\compiler\java\java_generator.h
35+
copy "${PROTOBUF_SOURCE_WIN32_PATH}\src\google\protobuf\compiler\java\kotlin_generator.h" include\google\protobuf\compiler\java\java_kotlin_generator.h
36+
copy "${PROTOBUF_SOURCE_WIN32_PATH}\src\google\protobuf\compiler\java\names.h" include\google\protobuf\compiler\java\java_names.h
3737
copy "${PROTOBUF_SOURCE_WIN32_PATH}\src\google\protobuf\compiler\js\js_generator.h" include\google\protobuf\compiler\js\js_generator.h
3838
copy "${PROTOBUF_SOURCE_WIN32_PATH}\src\google\protobuf\compiler\objectivec\objectivec_generator.h" include\google\protobuf\compiler\objectivec\objectivec_generator.h
3939
copy "${PROTOBUF_SOURCE_WIN32_PATH}\src\google\protobuf\compiler\objectivec\objectivec_helpers.h" include\google\protobuf\compiler\objectivec\objectivec_helpers.h
4040
copy "${PROTOBUF_SOURCE_WIN32_PATH}\src\google\protobuf\compiler\parser.h" include\google\protobuf\compiler\parser.h
4141
copy "${PROTOBUF_SOURCE_WIN32_PATH}\src\google\protobuf\compiler\php\php_generator.h" include\google\protobuf\compiler\php\php_generator.h
4242
copy "${PROTOBUF_SOURCE_WIN32_PATH}\src\google\protobuf\compiler\plugin.h" include\google\protobuf\compiler\plugin.h
4343
copy "${PROTOBUF_SOURCE_WIN32_PATH}\src\google\protobuf\compiler\plugin.pb.h" include\google\protobuf\compiler\plugin.pb.h
44-
copy "${PROTOBUF_SOURCE_WIN32_PATH}\src\google\protobuf\compiler\python\python_generator.h" include\google\protobuf\compiler\python\python_generator.h
45-
copy "${PROTOBUF_SOURCE_WIN32_PATH}\src\google\protobuf\compiler\python\python_pyi_generator.h" include\google\protobuf\compiler\python\python_pyi_generator.h
46-
copy "${PROTOBUF_SOURCE_WIN32_PATH}\src\google\protobuf\compiler\python\python_helpers.h" include\google\protobuf\compiler\python\python_helpers.h
44+
copy "${PROTOBUF_SOURCE_WIN32_PATH}\src\google\protobuf\compiler\python\generator.h" include\google\protobuf\compiler\python\python_generator.h
45+
copy "${PROTOBUF_SOURCE_WIN32_PATH}\src\google\protobuf\compiler\python\pyi_generator.h" include\google\protobuf\compiler\python\python_pyi_generator.h
46+
copy "${PROTOBUF_SOURCE_WIN32_PATH}\src\google\protobuf\compiler\python\helpers.h" include\google\protobuf\compiler\python\python_helpers.h
4747
copy "${PROTOBUF_SOURCE_WIN32_PATH}\src\google\protobuf\compiler\ruby\ruby_generator.h" include\google\protobuf\compiler\ruby\ruby_generator.h
4848
copy "${PROTOBUF_SOURCE_WIN32_PATH}\src\google\protobuf\descriptor.h" include\google\protobuf\descriptor.h
4949
copy "${PROTOBUF_SOURCE_WIN32_PATH}\src\google\protobuf\descriptor.pb.h" include\google\protobuf\descriptor.pb.h

‎cmake/install.cmake‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ foreach(_extract_string ${_extract_strings})
5151
string(REPLACE "\\" "/" _header ${_header})
5252
get_filename_component(_extract_from "${protobuf_SOURCE_DIR}/src/${_header}" ABSOLUTE)
5353
get_filename_component(_extract_name ${_header} NAME)
54-
get_filename_component(_extract_to "${CMAKE_INSTALL_INCLUDEDIR}/${_header}" PATH)
54+
get_filename_component(_extract_to "${CMAKE_INSTALL_INCLUDEDIR}/${_header}" DIRECTORY)
5555
if(EXISTS "${_extract_from}")
5656
install(FILES "${_extract_from}"
5757
DESTINATION "${_extract_to}"
@@ -88,10 +88,10 @@ _protobuf_auto_list("${protobuf_SOURCE_DIR}/src/Makefile.am" nobase_dist_proto_D
8888
foreach(_file ${nobase_dist_proto_DATA})
8989
get_filename_component(_file_from "${protobuf_SOURCE_DIR}/src/${_file}" ABSOLUTE)
9090
get_filename_component(_file_name ${_file} NAME)
91-
get_filename_component(_file_path ${_file} PATH)
91+
get_filename_component(_dir ${_file} DIRECTORY)
9292
if(EXISTS "${_file_from}")
9393
install(FILES "${_file_from}"
94-
DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/${_file_path}"
94+
DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/${_dir}"
9595
COMPONENT protobuf-protos
9696
RENAME "${_file_name}")
9797
else()

‎cmake/libprotoc.cmake‎

Lines changed: 57 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
set(libprotoc_files
22
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/code_generator.cc
33
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/command_line_interface.cc
4-
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/cpp/cpp_enum.cc
5-
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/cpp/cpp_enum_field.cc
6-
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/cpp/cpp_extension.cc
7-
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/cpp/cpp_field.cc
8-
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/cpp/cpp_file.cc
9-
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/cpp/cpp_generator.cc
10-
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/cpp/cpp_helpers.cc
11-
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/cpp/cpp_map_field.cc
12-
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/cpp/cpp_message.cc
13-
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/cpp/cpp_message_field.cc
14-
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/cpp/cpp_padding_optimizer.cc
15-
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/cpp/cpp_parse_function_generator.cc
16-
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/cpp/cpp_primitive_field.cc
17-
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/cpp/cpp_service.cc
18-
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/cpp/cpp_string_field.cc
4+
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/cpp/enum.cc
5+
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/cpp/enum_field.cc
6+
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/cpp/extension.cc
7+
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/cpp/field.cc
8+
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/cpp/file.cc
9+
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/cpp/generator.cc
10+
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/cpp/helpers.cc
11+
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/cpp/map_field.cc
12+
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/cpp/message.cc
13+
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/cpp/message_field.cc
14+
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/cpp/padding_optimizer.cc
15+
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/cpp/parse_function_generator.cc
16+
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/cpp/primitive_field.cc
17+
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/cpp/service.cc
18+
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/cpp/string_field.cc
1919
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/csharp/csharp_doc_comment.cc
2020
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/csharp/csharp_enum.cc
2121
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/csharp/csharp_enum_field.cc
@@ -32,36 +32,36 @@ set(libprotoc_files
3232
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/csharp/csharp_repeated_primitive_field.cc
3333
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/csharp/csharp_source_generator_base.cc
3434
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/csharp/csharp_wrapper_field.cc
35-
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/java_context.cc
36-
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/java_doc_comment.cc
37-
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/java_enum.cc
38-
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/java_enum_field.cc
39-
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/java_enum_field.h
40-
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/java_enum_field_lite.cc
41-
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/java_enum_lite.cc
42-
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/java_extension.cc
43-
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/java_extension_lite.cc
44-
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/java_field.cc
45-
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/java_file.cc
46-
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/java_generator.cc
47-
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/java_generator_factory.cc
48-
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/java_helpers.cc
49-
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/java_kotlin_generator.cc
50-
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/java_map_field.cc
51-
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/java_map_field_lite.cc
52-
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/java_message.cc
53-
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/java_message_builder.cc
54-
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/java_message_builder_lite.cc
55-
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/java_message_field.cc
56-
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/java_message_field_lite.cc
57-
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/java_message_lite.cc
58-
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/java_name_resolver.cc
59-
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/java_primitive_field.cc
60-
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/java_primitive_field_lite.cc
61-
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/java_service.cc
62-
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/java_shared_code_generator.cc
63-
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/java_string_field.cc
64-
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/java_string_field_lite.cc
35+
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/context.cc
36+
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/doc_comment.cc
37+
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/enum.cc
38+
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/enum_field.cc
39+
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/enum_field.h
40+
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/enum_field_lite.cc
41+
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/enum_lite.cc
42+
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/extension.cc
43+
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/extension_lite.cc
44+
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/field.cc
45+
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/file.cc
46+
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/generator.cc
47+
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/generator_factory.cc
48+
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/helpers.cc
49+
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/kotlin_generator.cc
50+
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/map_field.cc
51+
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/map_field_lite.cc
52+
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/message.cc
53+
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/message_builder.cc
54+
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/message_builder_lite.cc
55+
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/message_field.cc
56+
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/message_field_lite.cc
57+
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/message_lite.cc
58+
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/name_resolver.cc
59+
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/primitive_field.cc
60+
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/primitive_field_lite.cc
61+
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/service.cc
62+
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/shared_code_generator.cc
63+
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/string_field.cc
64+
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/string_field_lite.cc
6565
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/js/js_generator.cc
6666
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/js/well_known_types_embed.cc
6767
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/objectivec/objectivec_enum.cc
@@ -90,9 +90,9 @@ set(libprotoc_files
9090
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/php/php_generator.cc
9191
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/plugin.cc
9292
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/plugin.pb.cc
93-
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/python/python_generator.cc
94-
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/python/python_helpers.cc
95-
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/python/python_pyi_generator.cc
93+
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/python/generator.cc
94+
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/python/helpers.cc
95+
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/python/pyi_generator.cc
9696
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/ruby/ruby_generator.cc
9797
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/subprocess.cc
9898
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/zip_writer.cc
@@ -102,24 +102,24 @@ set(libprotoc_files
102102
set(libprotoc_headers
103103
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/code_generator.h
104104
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/command_line_interface.h
105-
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/cpp/cpp_file.h
106-
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/cpp/cpp_generator.h
107-
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/cpp/cpp_helpers.h
108-
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/cpp/cpp_names.h
105+
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/cpp/file.h
106+
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/cpp/generator.h
107+
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/cpp/helpers.h
108+
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/cpp/names.h
109109
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/csharp/csharp_doc_comment.h
110110
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/csharp/csharp_generator.h
111111
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/csharp/csharp_names.h
112112
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/csharp/csharp_options.h
113-
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/java_generator.h
114-
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/java_kotlin_generator.h
115-
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/java_names.h
113+
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/generator.h
114+
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/kotlin_generator.h
115+
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/names.h
116116
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/js/js_generator.h
117117
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/objectivec/objectivec_generator.h
118118
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/objectivec/objectivec_helpers.h
119119
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/php/php_generator.h
120120
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/plugin.h
121-
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/python/python_generator.h
122-
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/python/python_pyi_generator.h
121+
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/python/generator.h
122+
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/python/pyi_generator.h
123123
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/ruby/ruby_generator.h
124124
)
125125

0 commit comments

Comments
 (0)