Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(109)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: third_party/protobuf/BUILD.gn

Issue 1322483002: Revert https://codereview.chromium.org/1291903002 (protobuf roll). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/protobuf/BUILD ('k') | third_party/protobuf/CHANGES.txt » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/protobuf/BUILD.gn
diff --git a/third_party/protobuf/BUILD.gn b/third_party/protobuf/BUILD.gn
index bcfdca19692676e61f4bdfd5f8faeac73e50721c..2c8d34688e5ae09a2a7d565e08dbb90bf9b22f25 100644
--- a/third_party/protobuf/BUILD.gn
+++ b/third_party/protobuf/BUILD.gn
@@ -2,20 +2,21 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
+if (is_win) {
+ config_h_dir = "vsprojects"
+} else {
+ config_h_dir = "."
+}
+
config("protobuf_config") {
- include_dirs = [ "src" ]
+ include_dirs = [
+ "src",
+ config_h_dir,
+ ]
defines = [
"GOOGLE_PROTOBUF_NO_RTTI",
"GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER",
- "HAVE_PTHREAD",
]
-
- if (is_mac || (current_toolchain == host_toolchain && host_os == "mac")) {
- # Chromium builds don't yet support __thread on Mac -- not sure if the
- # limiting factor is using libc++ or having OS X >=10.7. Remove this once
- # the above aren't issues.
- defines += [ "GOOGLE_PROTOBUF_NO_THREADLOCAL" ]
- }
}
if (is_component_build) {
@@ -34,16 +35,8 @@ config("using_proto") {
}
protobuf_lite_sources = [
- "src/google/protobuf/arena.cc",
- "src/google/protobuf/arena.h",
- "src/google/protobuf/arenastring.cc",
- "src/google/protobuf/arenastring.h",
- "src/google/protobuf/descriptor.h",
- "src/google/protobuf/descriptor.pb.h",
"src/google/protobuf/extension_set.cc",
"src/google/protobuf/extension_set.h",
- "src/google/protobuf/generated_enum_reflection.h",
- "src/google/protobuf/generated_enum_util.h",
"src/google/protobuf/generated_message_util.cc",
"src/google/protobuf/generated_message_util.h",
"src/google/protobuf/io/coded_stream.cc",
@@ -53,82 +46,42 @@ protobuf_lite_sources = [
"src/google/protobuf/io/zero_copy_stream.h",
"src/google/protobuf/io/zero_copy_stream_impl_lite.cc",
"src/google/protobuf/io/zero_copy_stream_impl_lite.h",
- "src/google/protobuf/message.h",
"src/google/protobuf/message_lite.cc",
"src/google/protobuf/message_lite.h",
- "src/google/protobuf/metadata.cc",
- "src/google/protobuf/metadata.h",
"src/google/protobuf/repeated_field.cc",
"src/google/protobuf/repeated_field.h",
- "src/google/protobuf/stubs/atomic_sequence_num.h",
"src/google/protobuf/stubs/atomicops.h",
- "src/google/protobuf/stubs/atomicops_internals_aix.h",
- "src/google/protobuf/stubs/atomicops_internals_arm64_gcc.h",
"src/google/protobuf/stubs/atomicops_internals_arm_gcc.h",
- "src/google/protobuf/stubs/atomicops_internals_arm_qnx.h",
"src/google/protobuf/stubs/atomicops_internals_atomicword_compat.h",
- "src/google/protobuf/stubs/atomicops_internals_generic_gcc.h",
"src/google/protobuf/stubs/atomicops_internals_macosx.h",
"src/google/protobuf/stubs/atomicops_internals_mips_gcc.h",
- "src/google/protobuf/stubs/atomicops_internals_pnacl.h",
- "src/google/protobuf/stubs/atomicops_internals_solaris.h",
- "src/google/protobuf/stubs/atomicops_internals_tsan.h",
"src/google/protobuf/stubs/atomicops_internals_x86_gcc.cc",
"src/google/protobuf/stubs/atomicops_internals_x86_gcc.h",
"src/google/protobuf/stubs/atomicops_internals_x86_msvc.cc",
"src/google/protobuf/stubs/atomicops_internals_x86_msvc.h",
- "src/google/protobuf/stubs/bytestream.cc",
- "src/google/protobuf/stubs/bytestream.h",
- "src/google/protobuf/stubs/callback.h",
- "src/google/protobuf/stubs/casts.h",
"src/google/protobuf/stubs/common.cc",
"src/google/protobuf/stubs/common.h",
- "src/google/protobuf/stubs/fastmem.h",
"src/google/protobuf/stubs/hash.h",
- "src/google/protobuf/stubs/logging.h",
- "src/google/protobuf/stubs/macros.h",
- "src/google/protobuf/stubs/map_util.h",
- "src/google/protobuf/stubs/mathlimits.h",
- "src/google/protobuf/stubs/mutex.h",
+ "src/google/protobuf/stubs/map-util.h",
"src/google/protobuf/stubs/once.cc",
"src/google/protobuf/stubs/once.h",
"src/google/protobuf/stubs/platform_macros.h",
- "src/google/protobuf/stubs/port.h",
- "src/google/protobuf/stubs/scoped_ptr.h",
- "src/google/protobuf/stubs/status.cc",
- "src/google/protobuf/stubs/status.h",
- "src/google/protobuf/stubs/statusor.cc",
- "src/google/protobuf/stubs/statusor.h",
- "src/google/protobuf/stubs/stl_util.h",
- "src/google/protobuf/stubs/stringpiece.cc",
- "src/google/protobuf/stubs/stringpiece.h",
- "src/google/protobuf/stubs/stringprintf.cc",
- "src/google/protobuf/stubs/stringprintf.h",
- "src/google/protobuf/stubs/strutil.cc",
- "src/google/protobuf/stubs/strutil.h",
- "src/google/protobuf/stubs/template_util.h",
- "src/google/protobuf/stubs/time.cc",
- "src/google/protobuf/stubs/time.h",
- "src/google/protobuf/stubs/type_traits.h",
- "src/google/protobuf/testing/googletest.h",
"src/google/protobuf/unknown_field_set.cc",
"src/google/protobuf/unknown_field_set.h",
"src/google/protobuf/wire_format_lite.cc",
"src/google/protobuf/wire_format_lite.h",
"src/google/protobuf/wire_format_lite_inl.h",
+ "$config_h_dir/config.h",
]
protobuf_lite_cflags = []
if (is_win) {
protobuf_lite_cflags = [
"/wd4018", # Signed/unsigned mismatch in comparison.
- "/wd4065", # Switch statement contains 'default' but no 'case' labels
- "/wd4146", # Unary minus operator applied to unsigned type
"/wd4244", # Implicit conversion, possible loss of data.
+ "/wd4355", # 'this' used in base member initializer list.
"/wd4267", # Size_t to int truncation.
"/wd4291", # No matching operator delete for a placement new.
- "/wd4355", # 'this' used in base member initializer list.
- "/wd4506", # No definition for inline function.
]
}
@@ -166,120 +119,57 @@ source_set("protobuf_full") {
sources = protobuf_lite_sources
sources += [
- "src/google/protobuf/any.cc",
- "src/google/protobuf/any.h",
- "src/google/protobuf/any.pb.cc",
- "src/google/protobuf/any.pb.h",
- "src/google/protobuf/api.pb.cc",
- "src/google/protobuf/api.pb.h",
- "src/google/protobuf/compiler/importer.cc",
+ "src/google/protobuf/compiler/code_generator.h",
+ "src/google/protobuf/compiler/command_line_interface.h",
"src/google/protobuf/compiler/importer.h",
- "src/google/protobuf/compiler/parser.cc",
+ "src/google/protobuf/compiler/java/java_doc_comment.cc",
+ "src/google/protobuf/compiler/java/java_doc_comment.h",
"src/google/protobuf/compiler/parser.h",
"src/google/protobuf/descriptor.cc",
+ "src/google/protobuf/descriptor.h",
"src/google/protobuf/descriptor.pb.cc",
+ "src/google/protobuf/descriptor.pb.h",
"src/google/protobuf/descriptor_database.cc",
"src/google/protobuf/descriptor_database.h",
- "src/google/protobuf/duration.pb.cc",
- "src/google/protobuf/duration.pb.h",
"src/google/protobuf/dynamic_message.cc",
"src/google/protobuf/dynamic_message.h",
- "src/google/protobuf/empty.pb.cc",
- "src/google/protobuf/empty.pb.h",
"src/google/protobuf/extension_set_heavy.cc",
- "src/google/protobuf/field_mask.pb.cc",
- "src/google/protobuf/field_mask.pb.h",
+ "src/google/protobuf/generated_enum_reflection.h",
"src/google/protobuf/generated_message_reflection.cc",
"src/google/protobuf/generated_message_reflection.h",
-
- # gzip_stream.cc pulls in zlib, but it's not actually used by protoc, just
- # by test code; so instead of compiling zlib for the host, let's just
- # exclude these.
- # "src/google/protobuf/io/gzip_stream.cc",
- # "src/google/protobuf/io/gzip_stream.h",
- "src/google/protobuf/io/printer.cc",
+ "src/google/protobuf/io/gzip_stream.h",
"src/google/protobuf/io/printer.h",
- "src/google/protobuf/io/strtod.cc",
- "src/google/protobuf/io/strtod.h",
- "src/google/protobuf/io/tokenizer.cc",
"src/google/protobuf/io/tokenizer.h",
- "src/google/protobuf/io/zero_copy_stream_impl.cc",
"src/google/protobuf/io/zero_copy_stream_impl.h",
- "src/google/protobuf/map.h",
- "src/google/protobuf/map_entry_lite.h",
- "src/google/protobuf/map_field.cc",
- "src/google/protobuf/map_field.h",
- "src/google/protobuf/map_field_inl.h",
- "src/google/protobuf/map_field_lite.h",
- "src/google/protobuf/map_type_handler.h",
"src/google/protobuf/message.cc",
+ "src/google/protobuf/message.h",
"src/google/protobuf/reflection_ops.cc",
"src/google/protobuf/reflection_ops.h",
"src/google/protobuf/service.cc",
"src/google/protobuf/service.h",
- "src/google/protobuf/source_context.pb.cc",
- "src/google/protobuf/source_context.pb.h",
- "src/google/protobuf/struct.pb.cc",
- "src/google/protobuf/struct.pb.h",
- "src/google/protobuf/stubs/mathlimits.cc",
- "src/google/protobuf/stubs/mathutil.h",
- "src/google/protobuf/stubs/shared_ptr.h",
- "src/google/protobuf/stubs/singleton.h",
- "src/google/protobuf/stubs/status_macros.h",
+ "src/google/protobuf/stubs/stl_util.h",
+ "src/google/protobuf/stubs/stringprintf.cc",
+ "src/google/protobuf/stubs/stringprintf.h",
"src/google/protobuf/stubs/structurally_valid.cc",
+ "src/google/protobuf/stubs/strutil.cc",
+ "src/google/protobuf/stubs/strutil.h",
"src/google/protobuf/stubs/substitute.cc",
"src/google/protobuf/stubs/substitute.h",
+ "src/google/protobuf/stubs/template_util.h",
+ "src/google/protobuf/stubs/type_traits.h",
"src/google/protobuf/text_format.cc",
"src/google/protobuf/text_format.h",
- "src/google/protobuf/timestamp.pb.cc",
- "src/google/protobuf/timestamp.pb.h",
- "src/google/protobuf/type.pb.cc",
- "src/google/protobuf/type.pb.h",
- "src/google/protobuf/util/field_comparator.cc",
- "src/google/protobuf/util/field_comparator.h",
- "src/google/protobuf/util/internal/constants.h",
- "src/google/protobuf/util/internal/datapiece.cc",
- "src/google/protobuf/util/internal/datapiece.h",
- "src/google/protobuf/util/internal/default_value_objectwriter.cc",
- "src/google/protobuf/util/internal/default_value_objectwriter.h",
- "src/google/protobuf/util/internal/error_listener.cc",
- "src/google/protobuf/util/internal/error_listener.h",
- "src/google/protobuf/util/internal/field_mask_utility.cc",
- "src/google/protobuf/util/internal/field_mask_utility.h",
- "src/google/protobuf/util/internal/json_escaping.cc",
- "src/google/protobuf/util/internal/json_escaping.h",
- "src/google/protobuf/util/internal/json_objectwriter.cc",
- "src/google/protobuf/util/internal/json_objectwriter.h",
- "src/google/protobuf/util/internal/json_stream_parser.cc",
- "src/google/protobuf/util/internal/json_stream_parser.h",
- "src/google/protobuf/util/internal/location_tracker.h",
- "src/google/protobuf/util/internal/object_location_tracker.h",
- "src/google/protobuf/util/internal/object_source.h",
- "src/google/protobuf/util/internal/object_writer.cc",
- "src/google/protobuf/util/internal/object_writer.h",
- "src/google/protobuf/util/internal/protostream_objectsource.cc",
- "src/google/protobuf/util/internal/protostream_objectsource.h",
- "src/google/protobuf/util/internal/protostream_objectwriter.cc",
- "src/google/protobuf/util/internal/protostream_objectwriter.h",
- "src/google/protobuf/util/internal/snake2camel_objectwriter.h",
- "src/google/protobuf/util/internal/structured_objectwriter.h",
- "src/google/protobuf/util/internal/type_info.cc",
- "src/google/protobuf/util/internal/type_info.h",
- "src/google/protobuf/util/internal/type_info_test_helper.cc",
- "src/google/protobuf/util/internal/type_info_test_helper.h",
- "src/google/protobuf/util/internal/utility.cc",
- "src/google/protobuf/util/internal/utility.h",
- "src/google/protobuf/util/json_util.cc",
- "src/google/protobuf/util/json_util.h",
- "src/google/protobuf/util/message_differencer.cc",
- "src/google/protobuf/util/message_differencer.h",
- "src/google/protobuf/util/type_resolver.h",
- "src/google/protobuf/util/type_resolver_util.cc",
- "src/google/protobuf/util/type_resolver_util.h",
"src/google/protobuf/wire_format.cc",
"src/google/protobuf/wire_format.h",
- "src/google/protobuf/wrappers.pb.cc",
- "src/google/protobuf/wrappers.pb.h",
+
+ # This file pulls in zlib, but it's not actually used by protoc, so
+ # instead of compiling zlib for the host, let's just exclude this.
+ # "src/src/google/protobuf/io/gzip_stream.cc",
+ "src/google/protobuf/compiler/importer.cc",
+ "src/google/protobuf/compiler/parser.cc",
+ "src/google/protobuf/io/printer.cc",
+ "src/google/protobuf/io/tokenizer.cc",
+ "src/google/protobuf/io/zero_copy_stream_impl.cc",
]
configs -= [ "//build/config/compiler:chromium_code" ]
@@ -302,9 +192,7 @@ if (current_toolchain == host_toolchain) {
executable("protoc") {
sources = [
"src/google/protobuf/compiler/code_generator.cc",
- "src/google/protobuf/compiler/code_generator.h",
"src/google/protobuf/compiler/command_line_interface.cc",
- "src/google/protobuf/compiler/command_line_interface.h",
"src/google/protobuf/compiler/cpp/cpp_enum.cc",
"src/google/protobuf/compiler/cpp/cpp_enum.h",
"src/google/protobuf/compiler/cpp/cpp_enum_field.cc",
@@ -316,63 +204,22 @@ if (current_toolchain == host_toolchain) {
"src/google/protobuf/compiler/cpp/cpp_file.cc",
"src/google/protobuf/compiler/cpp/cpp_file.h",
"src/google/protobuf/compiler/cpp/cpp_generator.cc",
- "src/google/protobuf/compiler/cpp/cpp_generator.h",
"src/google/protobuf/compiler/cpp/cpp_helpers.cc",
"src/google/protobuf/compiler/cpp/cpp_helpers.h",
- "src/google/protobuf/compiler/cpp/cpp_map_field.cc",
- "src/google/protobuf/compiler/cpp/cpp_map_field.h",
"src/google/protobuf/compiler/cpp/cpp_message.cc",
"src/google/protobuf/compiler/cpp/cpp_message.h",
"src/google/protobuf/compiler/cpp/cpp_message_field.cc",
"src/google/protobuf/compiler/cpp/cpp_message_field.h",
- "src/google/protobuf/compiler/cpp/cpp_options.h",
"src/google/protobuf/compiler/cpp/cpp_primitive_field.cc",
"src/google/protobuf/compiler/cpp/cpp_primitive_field.h",
"src/google/protobuf/compiler/cpp/cpp_service.cc",
"src/google/protobuf/compiler/cpp/cpp_service.h",
"src/google/protobuf/compiler/cpp/cpp_string_field.cc",
"src/google/protobuf/compiler/cpp/cpp_string_field.h",
- "src/google/protobuf/compiler/csharp/csharp_enum.cc",
- "src/google/protobuf/compiler/csharp/csharp_enum.h",
- "src/google/protobuf/compiler/csharp/csharp_enum_field.cc",
- "src/google/protobuf/compiler/csharp/csharp_enum_field.h",
- "src/google/protobuf/compiler/csharp/csharp_field_base.cc",
- "src/google/protobuf/compiler/csharp/csharp_field_base.h",
- "src/google/protobuf/compiler/csharp/csharp_generator.cc",
- "src/google/protobuf/compiler/csharp/csharp_generator.h",
- "src/google/protobuf/compiler/csharp/csharp_helpers.cc",
- "src/google/protobuf/compiler/csharp/csharp_helpers.h",
- "src/google/protobuf/compiler/csharp/csharp_map_field.cc",
- "src/google/protobuf/compiler/csharp/csharp_map_field.h",
- "src/google/protobuf/compiler/csharp/csharp_message.cc",
- "src/google/protobuf/compiler/csharp/csharp_message.h",
- "src/google/protobuf/compiler/csharp/csharp_message_field.cc",
- "src/google/protobuf/compiler/csharp/csharp_message_field.h",
- "src/google/protobuf/compiler/csharp/csharp_names.h",
- "src/google/protobuf/compiler/csharp/csharp_primitive_field.cc",
- "src/google/protobuf/compiler/csharp/csharp_primitive_field.h",
- "src/google/protobuf/compiler/csharp/csharp_repeated_enum_field.cc",
- "src/google/protobuf/compiler/csharp/csharp_repeated_enum_field.h",
- "src/google/protobuf/compiler/csharp/csharp_repeated_message_field.cc",
- "src/google/protobuf/compiler/csharp/csharp_repeated_message_field.h",
- "src/google/protobuf/compiler/csharp/csharp_repeated_primitive_field.cc",
- "src/google/protobuf/compiler/csharp/csharp_repeated_primitive_field.h",
- "src/google/protobuf/compiler/csharp/csharp_source_generator_base.cc",
- "src/google/protobuf/compiler/csharp/csharp_source_generator_base.h",
- "src/google/protobuf/compiler/csharp/csharp_umbrella_class.cc",
- "src/google/protobuf/compiler/csharp/csharp_umbrella_class.h",
- "src/google/protobuf/compiler/csharp/csharp_wrapper_field.cc",
- "src/google/protobuf/compiler/csharp/csharp_wrapper_field.h",
- "src/google/protobuf/compiler/java/java_context.cc",
- "src/google/protobuf/compiler/java/java_context.h",
- "src/google/protobuf/compiler/java/java_doc_comment.cc",
- "src/google/protobuf/compiler/java/java_doc_comment.h",
"src/google/protobuf/compiler/java/java_enum.cc",
"src/google/protobuf/compiler/java/java_enum.h",
"src/google/protobuf/compiler/java/java_enum_field.cc",
"src/google/protobuf/compiler/java/java_enum_field.h",
- "src/google/protobuf/compiler/java/java_enum_field_lite.cc",
- "src/google/protobuf/compiler/java/java_enum_field_lite.h",
"src/google/protobuf/compiler/java/java_extension.cc",
"src/google/protobuf/compiler/java/java_extension.h",
"src/google/protobuf/compiler/java/java_field.cc",
@@ -380,101 +227,22 @@ if (current_toolchain == host_toolchain) {
"src/google/protobuf/compiler/java/java_file.cc",
"src/google/protobuf/compiler/java/java_file.h",
"src/google/protobuf/compiler/java/java_generator.cc",
- "src/google/protobuf/compiler/java/java_generator.h",
- "src/google/protobuf/compiler/java/java_generator_factory.cc",
- "src/google/protobuf/compiler/java/java_generator_factory.h",
"src/google/protobuf/compiler/java/java_helpers.cc",
"src/google/protobuf/compiler/java/java_helpers.h",
- "src/google/protobuf/compiler/java/java_lazy_message_field.cc",
- "src/google/protobuf/compiler/java/java_lazy_message_field.h",
- "src/google/protobuf/compiler/java/java_lazy_message_field_lite.cc",
- "src/google/protobuf/compiler/java/java_lazy_message_field_lite.h",
- "src/google/protobuf/compiler/java/java_map_field.cc",
- "src/google/protobuf/compiler/java/java_map_field.h",
- "src/google/protobuf/compiler/java/java_map_field_lite.cc",
- "src/google/protobuf/compiler/java/java_map_field_lite.h",
"src/google/protobuf/compiler/java/java_message.cc",
"src/google/protobuf/compiler/java/java_message.h",
- "src/google/protobuf/compiler/java/java_message_builder.cc",
- "src/google/protobuf/compiler/java/java_message_builder.h",
- "src/google/protobuf/compiler/java/java_message_builder_lite.cc",
- "src/google/protobuf/compiler/java/java_message_builder_lite.h",
"src/google/protobuf/compiler/java/java_message_field.cc",
"src/google/protobuf/compiler/java/java_message_field.h",
- "src/google/protobuf/compiler/java/java_message_field_lite.cc",
- "src/google/protobuf/compiler/java/java_message_field_lite.h",
- "src/google/protobuf/compiler/java/java_message_lite.cc",
- "src/google/protobuf/compiler/java/java_message_lite.h",
- "src/google/protobuf/compiler/java/java_name_resolver.cc",
- "src/google/protobuf/compiler/java/java_name_resolver.h",
"src/google/protobuf/compiler/java/java_primitive_field.cc",
"src/google/protobuf/compiler/java/java_primitive_field.h",
- "src/google/protobuf/compiler/java/java_primitive_field_lite.cc",
- "src/google/protobuf/compiler/java/java_primitive_field_lite.h",
"src/google/protobuf/compiler/java/java_service.cc",
"src/google/protobuf/compiler/java/java_service.h",
- "src/google/protobuf/compiler/java/java_shared_code_generator.cc",
- "src/google/protobuf/compiler/java/java_shared_code_generator.h",
"src/google/protobuf/compiler/java/java_string_field.cc",
"src/google/protobuf/compiler/java/java_string_field.h",
- "src/google/protobuf/compiler/java/java_string_field_lite.cc",
- "src/google/protobuf/compiler/java/java_string_field_lite.h",
- "src/google/protobuf/compiler/javanano/javanano_enum.cc",
- "src/google/protobuf/compiler/javanano/javanano_enum.h",
- "src/google/protobuf/compiler/javanano/javanano_enum_field.cc",
- "src/google/protobuf/compiler/javanano/javanano_enum_field.h",
- "src/google/protobuf/compiler/javanano/javanano_extension.cc",
- "src/google/protobuf/compiler/javanano/javanano_extension.h",
- "src/google/protobuf/compiler/javanano/javanano_field.cc",
- "src/google/protobuf/compiler/javanano/javanano_field.h",
- "src/google/protobuf/compiler/javanano/javanano_file.cc",
- "src/google/protobuf/compiler/javanano/javanano_file.h",
- "src/google/protobuf/compiler/javanano/javanano_generator.cc",
- "src/google/protobuf/compiler/javanano/javanano_generator.h",
- "src/google/protobuf/compiler/javanano/javanano_helpers.cc",
- "src/google/protobuf/compiler/javanano/javanano_helpers.h",
- "src/google/protobuf/compiler/javanano/javanano_map_field.cc",
- "src/google/protobuf/compiler/javanano/javanano_map_field.h",
- "src/google/protobuf/compiler/javanano/javanano_message.cc",
- "src/google/protobuf/compiler/javanano/javanano_message.h",
- "src/google/protobuf/compiler/javanano/javanano_message_field.cc",
- "src/google/protobuf/compiler/javanano/javanano_message_field.h",
- "src/google/protobuf/compiler/javanano/javanano_params.h",
- "src/google/protobuf/compiler/javanano/javanano_primitive_field.cc",
- "src/google/protobuf/compiler/javanano/javanano_primitive_field.h",
"src/google/protobuf/compiler/main.cc",
- "src/google/protobuf/compiler/objectivec/objectivec_enum.cc",
- "src/google/protobuf/compiler/objectivec/objectivec_enum.h",
- "src/google/protobuf/compiler/objectivec/objectivec_enum_field.cc",
- "src/google/protobuf/compiler/objectivec/objectivec_enum_field.h",
- "src/google/protobuf/compiler/objectivec/objectivec_extension.cc",
- "src/google/protobuf/compiler/objectivec/objectivec_extension.h",
- "src/google/protobuf/compiler/objectivec/objectivec_field.cc",
- "src/google/protobuf/compiler/objectivec/objectivec_field.h",
- "src/google/protobuf/compiler/objectivec/objectivec_file.cc",
- "src/google/protobuf/compiler/objectivec/objectivec_file.h",
- "src/google/protobuf/compiler/objectivec/objectivec_generator.cc",
- "src/google/protobuf/compiler/objectivec/objectivec_generator.h",
- "src/google/protobuf/compiler/objectivec/objectivec_helpers.cc",
- "src/google/protobuf/compiler/objectivec/objectivec_helpers.h",
- "src/google/protobuf/compiler/objectivec/objectivec_map_field.cc",
- "src/google/protobuf/compiler/objectivec/objectivec_map_field.h",
- "src/google/protobuf/compiler/objectivec/objectivec_message.cc",
- "src/google/protobuf/compiler/objectivec/objectivec_message.h",
- "src/google/protobuf/compiler/objectivec/objectivec_message_field.cc",
- "src/google/protobuf/compiler/objectivec/objectivec_message_field.h",
- "src/google/protobuf/compiler/objectivec/objectivec_oneof.cc",
- "src/google/protobuf/compiler/objectivec/objectivec_oneof.h",
- "src/google/protobuf/compiler/objectivec/objectivec_primitive_field.cc",
- "src/google/protobuf/compiler/objectivec/objectivec_primitive_field.h",
"src/google/protobuf/compiler/plugin.cc",
- "src/google/protobuf/compiler/plugin.h",
"src/google/protobuf/compiler/plugin.pb.cc",
- "src/google/protobuf/compiler/plugin.pb.h",
"src/google/protobuf/compiler/python/python_generator.cc",
- "src/google/protobuf/compiler/python/python_generator.h",
- "src/google/protobuf/compiler/ruby/ruby_generator.cc",
- "src/google/protobuf/compiler/ruby/ruby_generator.h",
"src/google/protobuf/compiler/subprocess.cc",
"src/google/protobuf/compiler/subprocess.h",
"src/google/protobuf/compiler/zip_writer.cc",
@@ -501,7 +269,7 @@ google_python_dir = "$root_out_dir/pyproto/google"
copy("copy_google") {
sources = [
- "python/google/__init__.py",
+ "__init__.py",
]
outputs = [
"$google_python_dir/{{source_file_part}}",
@@ -513,23 +281,23 @@ copy("copy_google_protobuf") {
"python/google/protobuf/__init__.py",
"python/google/protobuf/descriptor.py",
"python/google/protobuf/descriptor_database.py",
-
- # TODO(ncarter): protoc's python generator treats descriptor.proto
- # specially, but only when the input path is exactly
- # "google/protobuf/descriptor.proto". I'm not sure how to execute a rule
- # from a different directory. For now, use a manually-generated copy of
- # descriptor_pb2.py.
- "python/google/protobuf/descriptor_pb2.py",
"python/google/protobuf/descriptor_pool.py",
"python/google/protobuf/message.py",
"python/google/protobuf/message_factory.py",
- "python/google/protobuf/proto_builder.py",
"python/google/protobuf/reflection.py",
"python/google/protobuf/service.py",
"python/google/protobuf/service_reflection.py",
- "python/google/protobuf/symbol_database.py",
- "python/google/protobuf/text_encoding.py",
"python/google/protobuf/text_format.py",
+
+ # TODO(ncarter): protoc"s python generator treats
+ # descriptor.proto specially, but it's not possible to trigger
+ # the special treatment unless you run protoc from ./src/src
+ # (the treatment is based on the path to the .proto file
+ # matching a constant exactly). I'm not sure how to convince
+ # gyp to execute a rule from a different directory. Until this
+ # is resolved, use a copy of descriptor_pb2.py that I manually
+ # generated.
+ "descriptor_pb2.py",
]
outputs = [
"$google_python_dir/protobuf/{{source_file_part}}",
@@ -541,6 +309,7 @@ copy("copy_google_protobuf_internal") {
"python/google/protobuf/internal/__init__.py",
"python/google/protobuf/internal/api_implementation.py",
"python/google/protobuf/internal/containers.py",
+ "python/google/protobuf/internal/cpp_message.py",
"python/google/protobuf/internal/decoder.py",
"python/google/protobuf/internal/encoder.py",
"python/google/protobuf/internal/enum_type_wrapper.py",
@@ -555,16 +324,6 @@ copy("copy_google_protobuf_internal") {
]
}
-copy("copy_google_protobuf_pyext") {
- sources = [
- "python/google/protobuf/pyext/__init__.py",
- "python/google/protobuf/pyext/cpp_message.py",
- ]
- outputs = [
- "$google_python_dir/protobuf/pyext/{{source_file_part}}",
- ]
-}
-
group("py_proto") {
public_deps = [
":copy_google",
« no previous file with comments | « third_party/protobuf/BUILD ('k') | third_party/protobuf/CHANGES.txt » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698