From 6d639b979c854f0477e3afabbad4755feb6eeb16 Mon Sep 17 00:00:00 2001 From: OJ Kwon Date: Fri, 19 Oct 2018 16:33:44 -0700 Subject: [PATCH] feat(protobuf): update patches for 3.6.1 --- Makefile.am.patch | 720 +++++++++++++++++++++---- atomicops.h.patch | 18 - atomicops_internals_emscripten.h.patch | 104 ---- common.cc.patch | 26 +- port.h.patch | 13 - 5 files changed, 626 insertions(+), 255 deletions(-) delete mode 100644 atomicops.h.patch delete mode 100644 atomicops_internals_emscripten.h.patch delete mode 100644 port.h.patch diff --git a/Makefile.am.patch b/Makefile.am.patch index fe8dac6..53f8152 100644 --- a/Makefile.am.patch +++ b/Makefile.am.patch @@ -1,16 +1,8 @@ diff --git a/src/Makefile.am b/src/Makefile.am -index cdc2298b..4d81c008 100644 +index 4bb77452..6dbb80e1 100644 --- a/src/Makefile.am +++ b/src/Makefile.am -@@ -66,6 +66,7 @@ MAINTAINERCLEANFILES = \ - nobase_include_HEADERS = \ - google/protobuf/stubs/atomic_sequence_num.h \ - google/protobuf/stubs/atomicops.h \ -+ google/protobuf/stubs/atomicops_internals_emscripten.h \ - google/protobuf/stubs/atomicops_internals_power.h \ - google/protobuf/stubs/atomicops_internals_ppc_gcc.h \ - google/protobuf/stubs/atomicops_internals_arm64_gcc.h \ -@@ -179,7 +180,7 @@ nobase_include_HEADERS = \ +@@ -161,7 +161,7 @@ nobase_include_HEADERS = \ google/protobuf/util/type_resolver_util.h \ google/protobuf/util/message_differencer.h @@ -18,15 +10,13 @@ index cdc2298b..4d81c008 100644 +lib_LTLIBRARIES = libprotobuf-lite.la libprotobuf.la libprotobuf_lite_la_LIBADD = $(PTHREAD_LIBS) - libprotobuf_lite_la_LDFLAGS = -version-info 15:1:0 -export-dynamic -no-undefined -@@ -319,627 +320,4 @@ libprotobuf_la_SOURCES = \ - google/protobuf/util/time_util.cc \ - google/protobuf/util/type_resolver_util.cc + libprotobuf_lite_la_LDFLAGS = -version-info 17:0:0 -export-dynamic -no-undefined +@@ -300,585 +300,585 @@ libprotobuf_la_SOURCES = \ + + nodist_libprotobuf_la_SOURCES = $(nodist_libprotobuf_lite_la_SOURCES) --nodist_libprotobuf_la_SOURCES = $(nodist_libprotobuf_lite_la_SOURCES) -- -libprotoc_la_LIBADD = $(PTHREAD_LIBS) libprotobuf.la --libprotoc_la_LDFLAGS = -version-info 15:1:0 -export-dynamic -no-undefined +-libprotoc_la_LDFLAGS = -version-info 17:0:0 -export-dynamic -no-undefined -if HAVE_LD_VERSION_SCRIPT -libprotoc_la_LDFLAGS += -Wl,--version-script=$(srcdir)/libprotoc.map -EXTRA_libprotoc_la_DEPENDENCIES = libprotoc.map @@ -131,29 +121,6 @@ index cdc2298b..4d81c008 100644 - google/protobuf/compiler/java/java_doc_comment.h \ - google/protobuf/compiler/js/js_generator.cc \ - google/protobuf/compiler/js/well_known_types_embed.cc \ -- google/protobuf/compiler/javanano/javanano_enum.cc \ -- google/protobuf/compiler/javanano/javanano_enum.h \ -- google/protobuf/compiler/javanano/javanano_enum_field.cc \ -- google/protobuf/compiler/javanano/javanano_enum_field.h \ -- google/protobuf/compiler/javanano/javanano_extension.cc \ -- google/protobuf/compiler/javanano/javanano_extension.h \ -- google/protobuf/compiler/javanano/javanano_field.cc \ -- google/protobuf/compiler/javanano/javanano_field.h \ -- google/protobuf/compiler/javanano/javanano_file.cc \ -- google/protobuf/compiler/javanano/javanano_file.h \ -- google/protobuf/compiler/javanano/javanano_generator.cc \ -- google/protobuf/compiler/javanano/javanano_generator.h \ -- google/protobuf/compiler/javanano/javanano_helpers.cc \ -- google/protobuf/compiler/javanano/javanano_helpers.h \ -- google/protobuf/compiler/javanano/javanano_map_field.cc \ -- google/protobuf/compiler/javanano/javanano_map_field.h \ -- google/protobuf/compiler/javanano/javanano_message.cc \ -- google/protobuf/compiler/javanano/javanano_message.h \ -- google/protobuf/compiler/javanano/javanano_message_field.cc \ -- google/protobuf/compiler/javanano/javanano_message_field.h \ -- google/protobuf/compiler/javanano/javanano_params.h \ -- google/protobuf/compiler/javanano/javanano_primitive_field.cc \ -- google/protobuf/compiler/javanano/javanano_primitive_field.h \ - google/protobuf/compiler/objectivec/objectivec_enum.cc \ - google/protobuf/compiler/objectivec/objectivec_enum.h \ - google/protobuf/compiler/objectivec/objectivec_enum_field.cc \ @@ -217,22 +184,6 @@ index cdc2298b..4d81c008 100644 -protoc_LDADD = $(PTHREAD_LIBS) libprotobuf.la libprotoc.la -protoc_SOURCES = google/protobuf/compiler/main.cc - --# The special JS code for the well-known types is linked into the compiler via --# well_known_types_embed.cc, which is generated from .js source files. We have --# to build the js_embed binary using $(CXX_FOR_BUILD) so that it is executable --# on the build machine in a cross-compilation setup. --js_embed$(EXEEXT): $(srcdir)/google/protobuf/compiler/js/embed.cc -- $(CXX_FOR_BUILD) -o $@ $< --js_well_known_types_sources = \ -- google/protobuf/compiler/js/well_known_types/any.js \ -- google/protobuf/compiler/js/well_known_types/struct.js \ -- google/protobuf/compiler/js/well_known_types/timestamp.js --# We have to cd to $(srcdir) so that out-of-tree builds work properly. --google/protobuf/compiler/js/well_known_types_embed.cc: js_embed$(EXEEXT) $(js_well_known_types_sources) -- mkdir -p `dirname $@` && \ -- oldpwd=`pwd` && cd $(srcdir) && \ -- $$oldpwd/js_embed$(EXEEXT) $(js_well_known_types_sources) > $$oldpwd/$@ -- -# Tests ============================================================== - -protoc_inputs = \ @@ -291,11 +242,8 @@ index cdc2298b..4d81c008 100644 - $(js_well_known_types_sources) \ - solaris/libstdc++.la \ - google/protobuf/unittest_proto3.proto \ -- google/protobuf/unittest_import_public_proto3.proto \ -- google/protobuf/unittest_import_proto3.proto \ - google/protobuf/test_messages_proto3.proto \ - google/protobuf/test_messages_proto2.proto \ -- google/protobuf/map_unittest_proto3.proto \ - google/protobuf/io/gzip_stream.h \ - google/protobuf/io/gzip_stream_unittest.sh \ - google/protobuf/testdata/golden_message \ @@ -314,7 +262,6 @@ index cdc2298b..4d81c008 100644 - google/protobuf/package_info.h \ - google/protobuf/io/package_info.h \ - google/protobuf/util/package_info.h \ -- google/protobuf/compiler/js/embed.cc \ - google/protobuf/compiler/ruby/ruby_generated_code.proto \ - google/protobuf/compiler/ruby/ruby_generated_code_pb.rb \ - google/protobuf/compiler/package_info.h \ @@ -427,8 +374,6 @@ index cdc2298b..4d81c008 100644 - google/protobuf/util/message_differencer_unittest.pb.cc \ - google/protobuf/util/message_differencer_unittest.pb.h - --BUILT_SOURCES = $(protoc_outputs) google/protobuf/compiler/js/well_known_types_embed.cc -- -if USE_EXTERNAL_PROTOC - -unittest_proto_middleman: $(protoc_inputs) @@ -456,20 +401,25 @@ index cdc2298b..4d81c008 100644 - google/protobuf/map_test_util_impl.h \ - google/protobuf/test_util.cc \ - google/protobuf/test_util.h \ +- google/protobuf/test_util.inc \ - google/protobuf/testing/googletest.cc \ - google/protobuf/testing/googletest.h \ - google/protobuf/testing/file.cc \ - google/protobuf/testing/file.h - +-GOOGLETEST_BUILD_DIR=../third_party/googletest/googletest +-GOOGLEMOCK_BUILD_DIR=../third_party/googletest/googlemock +-GOOGLETEST_SRC_DIR=$(srcdir)/../third_party/googletest/googletest +-GOOGLEMOCK_SRC_DIR=$(srcdir)/../third_party/googletest/googlemock -check_PROGRAMS = protoc protobuf-test protobuf-lazy-descriptor-test \ - protobuf-lite-test test_plugin protobuf-lite-arena-test \ - no-warning-test $(GZCHECKPROGRAMS) -protobuf_test_LDADD = $(PTHREAD_LIBS) libprotobuf.la libprotoc.la \ -- ../gmock/gtest/lib/libgtest.la \ -- ../gmock/lib/libgmock.la \ -- ../gmock/lib/libgmock_main.la --protobuf_test_CPPFLAGS = -I$(srcdir)/../gmock/gtest/include \ -- -I$(srcdir)/../gmock/include +- $(GOOGLETEST_BUILD_DIR)/lib/libgtest.la \ +- $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock.la \ +- $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock_main.la +-protobuf_test_CPPFLAGS = -I$(GOOGLETEST_SRC_DIR)/include \ +- -I$(GOOGLEMOCK_SRC_DIR)/include -# Disable optimization for tests unless the user explicitly asked for it, -# since test_util.cc takes forever to compile with optimization (with GCC). -# See configure.ac for more info. @@ -479,7 +429,6 @@ index cdc2298b..4d81c008 100644 - google/protobuf/stubs/common_unittest.cc \ - google/protobuf/stubs/int128_unittest.cc \ - google/protobuf/stubs/io_win32_unittest.cc \ -- google/protobuf/stubs/once_unittest.cc \ - google/protobuf/stubs/statusor_test.cc \ - google/protobuf/stubs/status_test.cc \ - google/protobuf/stubs/stringpiece_unittest.cc \ @@ -488,7 +437,6 @@ index cdc2298b..4d81c008 100644 - google/protobuf/stubs/strutil_unittest.cc \ - google/protobuf/stubs/template_util_unittest.cc \ - google/protobuf/stubs/time_test.cc \ -- google/protobuf/stubs/type_traits_unittest.cc \ - google/protobuf/any_test.cc \ - google/protobuf/arenastring_unittest.cc \ - google/protobuf/arena_unittest.cc \ @@ -501,10 +449,11 @@ index cdc2298b..4d81c008 100644 - google/protobuf/map_field_test.cc \ - google/protobuf/map_test.cc \ - google/protobuf/message_unittest.cc \ +- google/protobuf/message_unittest.inc \ - google/protobuf/no_field_presence_test.cc \ - google/protobuf/preserve_unknown_enum_test.cc \ -- google/protobuf/proto3_arena_unittest.cc \ - google/protobuf/proto3_arena_lite_unittest.cc \ +- google/protobuf/proto3_arena_unittest.cc \ - google/protobuf/proto3_lite_unittest.cc \ - google/protobuf/reflection_ops_unittest.cc \ - google/protobuf/repeated_field_reflection_unittest.cc \ @@ -528,6 +477,7 @@ index cdc2298b..4d81c008 100644 - google/protobuf/compiler/cpp/cpp_move_unittest.cc \ - google/protobuf/compiler/cpp/cpp_unittest.h \ - google/protobuf/compiler/cpp/cpp_unittest.cc \ +- google/protobuf/compiler/cpp/cpp_unittest.inc \ - google/protobuf/compiler/cpp/cpp_plugin_unittest.cc \ - google/protobuf/compiler/cpp/metadata_test.cc \ - google/protobuf/compiler/java/java_plugin_unittest.cc \ @@ -551,24 +501,24 @@ index cdc2298b..4d81c008 100644 - google/protobuf/util/time_util_test.cc \ - google/protobuf/util/type_resolver_util_test.cc \ - $(COMMON_TEST_SOURCES) -- -- -nodist_protobuf_test_SOURCES = $(protoc_outputs) +-$(am_protobuf_test_OBJECTS): unittest_proto_middleman - -# Run cpp_unittest again with PROTOBUF_TEST_NO_DESCRIPTORS defined. -protobuf_lazy_descriptor_test_LDADD = $(PTHREAD_LIBS) libprotobuf.la \ - libprotoc.la \ -- ../gmock/gtest/lib/libgtest.la \ -- ../gmock/lib/libgmock.la \ -- ../gmock/lib/libgmock_main.la --protobuf_lazy_descriptor_test_CPPFLAGS = -I$(srcdir)/../gmock/include \ -- -I$(srcdir)/../gmock/gtest/include \ +- $(GOOGLETEST_BUILD_DIR)/lib/libgtest.la \ +- $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock.la \ +- $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock_main.la +-protobuf_lazy_descriptor_test_CPPFLAGS = -I$(GOOGLEMOCK_SRC_DIR)/include \ +- -I$(GOOGLETEST_SRC_DIR)/include \ - -DPROTOBUF_TEST_NO_DESCRIPTORS -protobuf_lazy_descriptor_test_CXXFLAGS = $(NO_OPT_CXXFLAGS) -protobuf_lazy_descriptor_test_SOURCES = \ - google/protobuf/compiler/cpp/cpp_unittest.cc \ - $(COMMON_TEST_SOURCES) -nodist_protobuf_lazy_descriptor_test_SOURCES = $(protoc_outputs) +-$(am_protobuf_lazy_descriptor_test_OBJECTS): unittest_proto_middleman - -COMMON_LITE_TEST_SOURCES = \ - google/protobuf/arena_test_util.cc \ @@ -582,37 +532,39 @@ index cdc2298b..4d81c008 100644 -# depend on gtest because our internal version of gtest depend on proto -# full runtime and we want to make sure this test builds without full -# runtime. --protobuf_lite_test_LDADD = $(PTHREAD_LIBS) libprotobuf-lite.la \ -- ../gmock/gtest/lib/libgtest.la \ -- ../gmock/lib/libgmock.la \ -- ../gmock/lib/libgmock_main.la --protobuf_lite_test_CPPFLAGS= -I$(srcdir)/../gmock/include \ -- -I$(srcdir)/../gmock/gtest/include +-protobuf_lite_test_LDADD = $(PTHREAD_LIBS) libprotobuf-lite.la \ +- $(GOOGLETEST_BUILD_DIR)/lib/libgtest.la \ +- $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock.la \ +- $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock_main.la +-protobuf_lite_test_CPPFLAGS= -I$(GOOGLEMOCK_SRC_DIR)/include \ +- -I$(GOOGLETEST_SRC_DIR)/include -protobuf_lite_test_CXXFLAGS = $(NO_OPT_CXXFLAGS) -protobuf_lite_test_SOURCES = \ - google/protobuf/lite_unittest.cc \ - $(COMMON_LITE_TEST_SOURCES) -nodist_protobuf_lite_test_SOURCES = $(protoc_lite_outputs) +-$(am_protobuf_lite_test_OBJECTS): unittest_proto_middleman - -# lite_arena_unittest depends on gtest because teboring@ found that without -# gtest when building the test internally our memory sanitizer doesn't detect -# memory leaks (don't know why). -protobuf_lite_arena_test_LDADD = $(PTHREAD_LIBS) libprotobuf-lite.la \ -- ../gmock/gtest/lib/libgtest.la \ -- ../gmock/lib/libgmock.la \ -- ../gmock/lib/libgmock_main.la --protobuf_lite_arena_test_CPPFLAGS = -I$(srcdir)/../gmock/include \ -- -I$(srcdir)/../gmock/gtest/include +- $(GOOGLETEST_BUILD_DIR)/lib/libgtest.la \ +- $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock.la \ +- $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock_main.la +-protobuf_lite_arena_test_CPPFLAGS = -I$(GOOGLEMOCK_SRC_DIR)/include \ +- -I$(GOOGLETEST_SRC_DIR)/include -protobuf_lite_arena_test_CXXFLAGS = $(NO_OPT_CXXFLAGS) -protobuf_lite_arena_test_SOURCES = \ - google/protobuf/lite_arena_unittest.cc \ - $(COMMON_LITE_TEST_SOURCES) -nodist_protobuf_lite_arena_test_SOURCES = $(protoc_lite_outputs) +-$(am_protobuf_lite_arena_test_OBJECTS): unittest_proto_middleman - -# Test plugin binary. -test_plugin_LDADD = $(PTHREAD_LIBS) libprotobuf.la libprotoc.la \ -- ../gmock/gtest/lib/libgtest.la --test_plugin_CPPFLAGS = -I$(srcdir)/../gmock/gtest/include +- $(GOOGLETEST_BUILD_DIR)/lib/libgtest.la +-test_plugin_CPPFLAGS = -I$(GOOGLETEST_SRC_DIR)/include -test_plugin_SOURCES = \ - google/protobuf/compiler/mock_code_generator.cc \ - google/protobuf/testing/file.cc \ @@ -633,9 +585,7 @@ index cdc2298b..4d81c008 100644 -no_warning_test.cc: - echo "// Generated from Makefile.am" > no_warning_test.cc - for FILE in $(nobase_include_HEADERS); do \ -- if ! echo $${FILE} | grep "atomicops"; then \ -- echo "#include <$${FILE}>" >> no_warning_test.cc; \ -- fi \ +- echo "#include <$${FILE}>" >> no_warning_test.cc; \ - done - echo "int main(int, char**) { return 0; }" >> no_warning_test.cc - @@ -647,5 +597,585 @@ index cdc2298b..4d81c008 100644 -TESTS = protobuf-test protobuf-lazy-descriptor-test protobuf-lite-test \ - google/protobuf/compiler/zip_output_unittest.sh $(GZTESTS) \ - protobuf-lite-arena-test no-warning-test -+nodist_libprotobuf_la_SOURCES = $(nodist_libprotobuf_lite_la_SOURCES) -\ No newline at end of file ++#libprotoc_la_LIBADD = $(PTHREAD_LIBS) libprotobuf.la ++#libprotoc_la_LDFLAGS = -version-info 17:0:0 -export-dynamic -no-undefined ++#if HAVE_LD_VERSION_SCRIPT ++#libprotoc_la_LDFLAGS += -Wl,--version-script=$(srcdir)/libprotoc.map ++#EXTRA_libprotoc_la_DEPENDENCIES = libprotoc.map ++#endif ++#libprotoc_la_SOURCES = \ ++# google/protobuf/compiler/code_generator.cc \ ++# google/protobuf/compiler/command_line_interface.cc \ ++# google/protobuf/compiler/plugin.cc \ ++# google/protobuf/compiler/plugin.pb.cc \ ++# google/protobuf/compiler/subprocess.cc \ ++# google/protobuf/compiler/subprocess.h \ ++# google/protobuf/compiler/zip_writer.cc \ ++# google/protobuf/compiler/zip_writer.h \ ++# google/protobuf/compiler/cpp/cpp_enum.cc \ ++# google/protobuf/compiler/cpp/cpp_enum.h \ ++# google/protobuf/compiler/cpp/cpp_enum_field.cc \ ++# google/protobuf/compiler/cpp/cpp_enum_field.h \ ++# google/protobuf/compiler/cpp/cpp_extension.cc \ ++# google/protobuf/compiler/cpp/cpp_extension.h \ ++# google/protobuf/compiler/cpp/cpp_field.cc \ ++# google/protobuf/compiler/cpp/cpp_field.h \ ++# google/protobuf/compiler/cpp/cpp_file.cc \ ++# google/protobuf/compiler/cpp/cpp_file.h \ ++# google/protobuf/compiler/cpp/cpp_generator.cc \ ++# google/protobuf/compiler/cpp/cpp_helpers.cc \ ++# google/protobuf/compiler/cpp/cpp_helpers.h \ ++# google/protobuf/compiler/cpp/cpp_map_field.cc \ ++# google/protobuf/compiler/cpp/cpp_map_field.h \ ++# google/protobuf/compiler/cpp/cpp_message.cc \ ++# google/protobuf/compiler/cpp/cpp_message.h \ ++# google/protobuf/compiler/cpp/cpp_message_field.cc \ ++# google/protobuf/compiler/cpp/cpp_message_field.h \ ++# google/protobuf/compiler/cpp/cpp_message_layout_helper.h \ ++# google/protobuf/compiler/cpp/cpp_options.h \ ++# google/protobuf/compiler/cpp/cpp_padding_optimizer.cc \ ++# google/protobuf/compiler/cpp/cpp_padding_optimizer.h \ ++# google/protobuf/compiler/cpp/cpp_primitive_field.cc \ ++# google/protobuf/compiler/cpp/cpp_primitive_field.h \ ++# google/protobuf/compiler/cpp/cpp_service.cc \ ++# google/protobuf/compiler/cpp/cpp_service.h \ ++# google/protobuf/compiler/cpp/cpp_string_field.cc \ ++# google/protobuf/compiler/cpp/cpp_string_field.h \ ++# google/protobuf/compiler/java/java_context.cc \ ++# google/protobuf/compiler/java/java_context.h \ ++# google/protobuf/compiler/java/java_enum.cc \ ++# google/protobuf/compiler/java/java_enum_lite.cc \ ++# google/protobuf/compiler/java/java_enum_field.cc \ ++# google/protobuf/compiler/java/java_enum_field.h \ ++# google/protobuf/compiler/java/java_enum_field_lite.cc \ ++# google/protobuf/compiler/java/java_enum_field_lite.h \ ++# google/protobuf/compiler/java/java_enum.h \ ++# google/protobuf/compiler/java/java_enum_lite.h \ ++# google/protobuf/compiler/java/java_extension.cc \ ++# google/protobuf/compiler/java/java_extension.h \ ++# google/protobuf/compiler/java/java_extension_lite.cc \ ++# google/protobuf/compiler/java/java_extension_lite.h \ ++# google/protobuf/compiler/java/java_field.cc \ ++# google/protobuf/compiler/java/java_field.h \ ++# google/protobuf/compiler/java/java_file.cc \ ++# google/protobuf/compiler/java/java_file.h \ ++# google/protobuf/compiler/java/java_generator.cc \ ++# google/protobuf/compiler/java/java_generator_factory.cc \ ++# google/protobuf/compiler/java/java_generator_factory.h \ ++# google/protobuf/compiler/java/java_helpers.cc \ ++# google/protobuf/compiler/java/java_helpers.h \ ++# google/protobuf/compiler/java/java_lazy_message_field.cc \ ++# google/protobuf/compiler/java/java_lazy_message_field.h \ ++# google/protobuf/compiler/java/java_lazy_message_field_lite.cc\ ++# google/protobuf/compiler/java/java_lazy_message_field_lite.h \ ++# google/protobuf/compiler/java/java_map_field.cc \ ++# google/protobuf/compiler/java/java_map_field.h \ ++# google/protobuf/compiler/java/java_map_field_lite.cc \ ++# google/protobuf/compiler/java/java_map_field_lite.h \ ++# google/protobuf/compiler/java/java_message.cc \ ++# google/protobuf/compiler/java/java_message_lite.cc \ ++# google/protobuf/compiler/java/java_message_builder.cc \ ++# google/protobuf/compiler/java/java_message_builder_lite.cc \ ++# google/protobuf/compiler/java/java_message_field.cc \ ++# google/protobuf/compiler/java/java_message_field.h \ ++# google/protobuf/compiler/java/java_message_field_lite.cc \ ++# google/protobuf/compiler/java/java_message_field_lite.h \ ++# google/protobuf/compiler/java/java_message.h \ ++# google/protobuf/compiler/java/java_message_lite.h \ ++# google/protobuf/compiler/java/java_message_builder.h \ ++# google/protobuf/compiler/java/java_message_builder_lite.h \ ++# google/protobuf/compiler/java/java_name_resolver.cc \ ++# google/protobuf/compiler/java/java_name_resolver.h \ ++# google/protobuf/compiler/java/java_options.h \ ++# google/protobuf/compiler/java/java_primitive_field.cc \ ++# google/protobuf/compiler/java/java_primitive_field.h \ ++# google/protobuf/compiler/java/java_primitive_field_lite.cc \ ++# google/protobuf/compiler/java/java_primitive_field_lite.h \ ++# google/protobuf/compiler/java/java_shared_code_generator.cc \ ++# google/protobuf/compiler/java/java_shared_code_generator.h \ ++# google/protobuf/compiler/java/java_service.cc \ ++# google/protobuf/compiler/java/java_service.h \ ++# google/protobuf/compiler/java/java_string_field.cc \ ++# google/protobuf/compiler/java/java_string_field.h \ ++# google/protobuf/compiler/java/java_string_field_lite.cc \ ++# google/protobuf/compiler/java/java_string_field_lite.h \ ++# google/protobuf/compiler/java/java_doc_comment.cc \ ++# google/protobuf/compiler/java/java_doc_comment.h \ ++# google/protobuf/compiler/js/js_generator.cc \ ++# google/protobuf/compiler/js/well_known_types_embed.cc \ ++# google/protobuf/compiler/objectivec/objectivec_enum.cc \ ++# google/protobuf/compiler/objectivec/objectivec_enum.h \ ++# google/protobuf/compiler/objectivec/objectivec_enum_field.cc \ ++# google/protobuf/compiler/objectivec/objectivec_enum_field.h \ ++# google/protobuf/compiler/objectivec/objectivec_extension.cc \ ++# google/protobuf/compiler/objectivec/objectivec_extension.h \ ++# google/protobuf/compiler/objectivec/objectivec_field.cc \ ++# google/protobuf/compiler/objectivec/objectivec_field.h \ ++# google/protobuf/compiler/objectivec/objectivec_file.cc \ ++# google/protobuf/compiler/objectivec/objectivec_file.h \ ++# google/protobuf/compiler/objectivec/objectivec_generator.cc \ ++# google/protobuf/compiler/objectivec/objectivec_helpers.cc \ ++# google/protobuf/compiler/objectivec/objectivec_helpers.h \ ++# google/protobuf/compiler/objectivec/objectivec_map_field.cc \ ++# google/protobuf/compiler/objectivec/objectivec_map_field.h \ ++# google/protobuf/compiler/objectivec/objectivec_message.cc \ ++# google/protobuf/compiler/objectivec/objectivec_message.h \ ++# google/protobuf/compiler/objectivec/objectivec_message_field.cc \ ++# google/protobuf/compiler/objectivec/objectivec_message_field.h \ ++# google/protobuf/compiler/objectivec/objectivec_oneof.cc \ ++# google/protobuf/compiler/objectivec/objectivec_oneof.h \ ++# google/protobuf/compiler/objectivec/objectivec_primitive_field.cc \ ++# google/protobuf/compiler/objectivec/objectivec_primitive_field.h \ ++# google/protobuf/compiler/php/php_generator.cc \ ++# google/protobuf/compiler/python/python_generator.cc \ ++# google/protobuf/compiler/ruby/ruby_generator.cc \ ++# google/protobuf/compiler/csharp/csharp_doc_comment.cc \ ++# google/protobuf/compiler/csharp/csharp_doc_comment.h \ ++# google/protobuf/compiler/csharp/csharp_enum.cc \ ++# google/protobuf/compiler/csharp/csharp_enum.h \ ++# google/protobuf/compiler/csharp/csharp_enum_field.cc \ ++# google/protobuf/compiler/csharp/csharp_enum_field.h \ ++# google/protobuf/compiler/csharp/csharp_field_base.cc \ ++# google/protobuf/compiler/csharp/csharp_field_base.h \ ++# google/protobuf/compiler/csharp/csharp_generator.cc \ ++# google/protobuf/compiler/csharp/csharp_helpers.cc \ ++# google/protobuf/compiler/csharp/csharp_helpers.h \ ++# google/protobuf/compiler/csharp/csharp_map_field.cc \ ++# google/protobuf/compiler/csharp/csharp_map_field.h \ ++# google/protobuf/compiler/csharp/csharp_message.cc \ ++# google/protobuf/compiler/csharp/csharp_message.h \ ++# google/protobuf/compiler/csharp/csharp_message_field.cc \ ++# google/protobuf/compiler/csharp/csharp_message_field.h \ ++# google/protobuf/compiler/csharp/csharp_options.h \ ++# google/protobuf/compiler/csharp/csharp_primitive_field.cc \ ++# google/protobuf/compiler/csharp/csharp_primitive_field.h \ ++# google/protobuf/compiler/csharp/csharp_reflection_class.cc \ ++# google/protobuf/compiler/csharp/csharp_reflection_class.h \ ++# google/protobuf/compiler/csharp/csharp_repeated_enum_field.cc \ ++# google/protobuf/compiler/csharp/csharp_repeated_enum_field.h \ ++# google/protobuf/compiler/csharp/csharp_repeated_message_field.cc \ ++# google/protobuf/compiler/csharp/csharp_repeated_message_field.h \ ++# google/protobuf/compiler/csharp/csharp_repeated_primitive_field.cc \ ++# google/protobuf/compiler/csharp/csharp_repeated_primitive_field.h \ ++# google/protobuf/compiler/csharp/csharp_source_generator_base.cc \ ++# google/protobuf/compiler/csharp/csharp_source_generator_base.h \ ++# google/protobuf/compiler/csharp/csharp_wrapper_field.cc \ ++# google/protobuf/compiler/csharp/csharp_wrapper_field.h ++# ++#bin_PROGRAMS = protoc ++#protoc_LDADD = $(PTHREAD_LIBS) libprotobuf.la libprotoc.la ++#protoc_SOURCES = google/protobuf/compiler/main.cc ++# ++## Tests ============================================================== ++# ++#protoc_inputs = \ ++# google/protobuf/any_test.proto \ ++# google/protobuf/compiler/cpp/cpp_test_bad_identifiers.proto \ ++# google/protobuf/map_lite_unittest.proto \ ++# google/protobuf/map_proto2_unittest.proto \ ++# google/protobuf/map_unittest.proto \ ++# google/protobuf/unittest_arena.proto \ ++# google/protobuf/unittest_custom_options.proto \ ++# google/protobuf/unittest_drop_unknown_fields.proto \ ++# google/protobuf/unittest_embed_optimize_for.proto \ ++# google/protobuf/unittest_empty.proto \ ++# google/protobuf/unittest_enormous_descriptor.proto \ ++# google/protobuf/unittest_import_lite.proto \ ++# google/protobuf/unittest_import.proto \ ++# google/protobuf/unittest_import_public_lite.proto \ ++# google/protobuf/unittest_import_public.proto \ ++# google/protobuf/unittest_lazy_dependencies.proto \ ++# google/protobuf/unittest_lazy_dependencies_custom_option.proto \ ++# google/protobuf/unittest_lazy_dependencies_enum.proto \ ++# google/protobuf/unittest_lite_imports_nonlite.proto \ ++# google/protobuf/unittest_lite.proto \ ++# google/protobuf/unittest_mset.proto \ ++# google/protobuf/unittest_mset_wire_format.proto \ ++# google/protobuf/unittest_no_arena_lite.proto \ ++# google/protobuf/unittest_no_arena_import.proto \ ++# google/protobuf/unittest_no_arena.proto \ ++# google/protobuf/unittest_no_field_presence.proto \ ++# google/protobuf/unittest_no_generic_services.proto \ ++# google/protobuf/unittest_optimize_for.proto \ ++# google/protobuf/unittest_preserve_unknown_enum2.proto \ ++# google/protobuf/unittest_preserve_unknown_enum.proto \ ++# google/protobuf/unittest.proto \ ++# google/protobuf/unittest_proto3_arena.proto \ ++# google/protobuf/unittest_proto3_arena_lite.proto \ ++# google/protobuf/unittest_proto3_lite.proto \ ++# google/protobuf/unittest_well_known_types.proto \ ++# google/protobuf/util/internal/testdata/anys.proto \ ++# google/protobuf/util/internal/testdata/books.proto \ ++# google/protobuf/util/internal/testdata/default_value.proto \ ++# google/protobuf/util/internal/testdata/default_value_test.proto \ ++# google/protobuf/util/internal/testdata/field_mask.proto \ ++# google/protobuf/util/internal/testdata/maps.proto \ ++# google/protobuf/util/internal/testdata/oneofs.proto \ ++# google/protobuf/util/internal/testdata/proto3.proto \ ++# google/protobuf/util/internal/testdata/struct.proto \ ++# google/protobuf/util/internal/testdata/timestamp_duration.proto \ ++# google/protobuf/util/internal/testdata/wrappers.proto \ ++# google/protobuf/util/json_format_proto3.proto \ ++# google/protobuf/util/message_differencer_unittest.proto \ ++# google/protobuf/compiler/cpp/cpp_test_large_enum_value.proto ++# ++#EXTRA_DIST = \ ++# $(protoc_inputs) \ ++# $(js_well_known_types_sources) \ ++# solaris/libstdc++.la \ ++# google/protobuf/unittest_proto3.proto \ ++# google/protobuf/test_messages_proto3.proto \ ++# google/protobuf/test_messages_proto2.proto \ ++# google/protobuf/io/gzip_stream.h \ ++# google/protobuf/io/gzip_stream_unittest.sh \ ++# google/protobuf/testdata/golden_message \ ++# google/protobuf/testdata/golden_message_maps \ ++# google/protobuf/testdata/golden_message_oneof_implemented \ ++# google/protobuf/testdata/golden_message_proto3 \ ++# google/protobuf/testdata/golden_packed_fields_message \ ++# google/protobuf/testdata/bad_utf8_string \ ++# google/protobuf/testdata/map_test_data.txt \ ++# google/protobuf/testdata/text_format_unittest_data.txt \ ++# google/protobuf/testdata/text_format_unittest_data_oneof_implemented.txt \ ++# google/protobuf/testdata/text_format_unittest_data_pointy.txt \ ++# google/protobuf/testdata/text_format_unittest_data_pointy_oneof.txt \ ++# google/protobuf/testdata/text_format_unittest_extensions_data.txt \ ++# google/protobuf/testdata/text_format_unittest_extensions_data_pointy.txt \ ++# google/protobuf/package_info.h \ ++# google/protobuf/io/package_info.h \ ++# google/protobuf/util/package_info.h \ ++# google/protobuf/compiler/ruby/ruby_generated_code.proto \ ++# google/protobuf/compiler/ruby/ruby_generated_code_pb.rb \ ++# google/protobuf/compiler/package_info.h \ ++# google/protobuf/compiler/zip_output_unittest.sh \ ++# libprotobuf-lite.map \ ++# libprotobuf.map \ ++# libprotoc.map \ ++# README.md ++# ++#protoc_lite_outputs = \ ++# google/protobuf/map_lite_unittest.pb.cc \ ++# google/protobuf/map_lite_unittest.pb.h \ ++# google/protobuf/unittest_lite.pb.cc \ ++# google/protobuf/unittest_lite.pb.h \ ++# google/protobuf/unittest_no_arena_lite.pb.cc \ ++# google/protobuf/unittest_no_arena_lite.pb.h \ ++# google/protobuf/unittest_import_lite.pb.cc \ ++# google/protobuf/unittest_import_lite.pb.h \ ++# google/protobuf/unittest_import_public_lite.pb.cc \ ++# google/protobuf/unittest_import_public_lite.pb.h ++# ++#protoc_outputs = \ ++# $(protoc_lite_outputs) \ ++# google/protobuf/any_test.pb.cc \ ++# google/protobuf/any_test.pb.h \ ++# google/protobuf/compiler/cpp/cpp_test_bad_identifiers.pb.cc \ ++# google/protobuf/compiler/cpp/cpp_test_bad_identifiers.pb.h \ ++# google/protobuf/compiler/cpp/cpp_test_large_enum_value.pb.cc \ ++# google/protobuf/compiler/cpp/cpp_test_large_enum_value.pb.h \ ++# google/protobuf/map_proto2_unittest.pb.cc \ ++# google/protobuf/map_proto2_unittest.pb.h \ ++# google/protobuf/map_unittest.pb.cc \ ++# google/protobuf/map_unittest.pb.h \ ++# google/protobuf/unittest_arena.pb.cc \ ++# google/protobuf/unittest_arena.pb.h \ ++# google/protobuf/unittest_custom_options.pb.cc \ ++# google/protobuf/unittest_custom_options.pb.h \ ++# google/protobuf/unittest_drop_unknown_fields.pb.cc \ ++# google/protobuf/unittest_drop_unknown_fields.pb.h \ ++# google/protobuf/unittest_embed_optimize_for.pb.cc \ ++# google/protobuf/unittest_embed_optimize_for.pb.h \ ++# google/protobuf/unittest_empty.pb.cc \ ++# google/protobuf/unittest_empty.pb.h \ ++# google/protobuf/unittest_enormous_descriptor.pb.cc \ ++# google/protobuf/unittest_enormous_descriptor.pb.h \ ++# google/protobuf/unittest_import.pb.cc \ ++# google/protobuf/unittest_import.pb.h \ ++# google/protobuf/unittest_import_public.pb.cc \ ++# google/protobuf/unittest_import_public.pb.h \ ++# google/protobuf/unittest_lazy_dependencies.pb.cc \ ++# google/protobuf/unittest_lazy_dependencies.pb.h \ ++# google/protobuf/unittest_lazy_dependencies_custom_option.pb.cc \ ++# google/protobuf/unittest_lazy_dependencies_custom_option.pb.h \ ++# google/protobuf/unittest_lazy_dependencies_enum.pb.cc \ ++# google/protobuf/unittest_lazy_dependencies_enum.pb.h \ ++# google/protobuf/unittest_lite_imports_nonlite.pb.cc \ ++# google/protobuf/unittest_lite_imports_nonlite.pb.h \ ++# google/protobuf/unittest_mset.pb.cc \ ++# google/protobuf/unittest_mset.pb.h \ ++# google/protobuf/unittest_mset_wire_format.pb.cc \ ++# google/protobuf/unittest_mset_wire_format.pb.h \ ++# google/protobuf/unittest_no_arena_import.pb.cc \ ++# google/protobuf/unittest_no_arena_import.pb.h \ ++# google/protobuf/unittest_no_arena.pb.cc \ ++# google/protobuf/unittest_no_arena.pb.h \ ++# google/protobuf/unittest_no_field_presence.pb.cc \ ++# google/protobuf/unittest_no_field_presence.pb.h \ ++# google/protobuf/unittest_no_generic_services.pb.cc \ ++# google/protobuf/unittest_no_generic_services.pb.h \ ++# google/protobuf/unittest_optimize_for.pb.cc \ ++# google/protobuf/unittest_optimize_for.pb.h \ ++# google/protobuf/unittest.pb.cc \ ++# google/protobuf/unittest.pb.h \ ++# google/protobuf/unittest_preserve_unknown_enum2.pb.cc \ ++# google/protobuf/unittest_preserve_unknown_enum2.pb.h \ ++# google/protobuf/unittest_preserve_unknown_enum.pb.cc \ ++# google/protobuf/unittest_preserve_unknown_enum.pb.h \ ++# google/protobuf/unittest_proto3_arena.pb.cc \ ++# google/protobuf/unittest_proto3_arena.pb.h \ ++# google/protobuf/unittest_proto3_arena_lite.pb.cc \ ++# google/protobuf/unittest_proto3_arena_lite.pb.h \ ++# google/protobuf/unittest_proto3_lite.pb.cc \ ++# google/protobuf/unittest_proto3_lite.pb.h \ ++# google/protobuf/unittest_well_known_types.pb.cc \ ++# google/protobuf/unittest_well_known_types.pb.h \ ++# google/protobuf/util/internal/testdata/anys.pb.cc \ ++# google/protobuf/util/internal/testdata/anys.pb.h \ ++# google/protobuf/util/internal/testdata/books.pb.cc \ ++# google/protobuf/util/internal/testdata/books.pb.h \ ++# google/protobuf/util/internal/testdata/default_value.pb.cc \ ++# google/protobuf/util/internal/testdata/default_value.pb.h \ ++# google/protobuf/util/internal/testdata/default_value_test.pb.cc \ ++# google/protobuf/util/internal/testdata/default_value_test.pb.h \ ++# google/protobuf/util/internal/testdata/field_mask.pb.cc \ ++# google/protobuf/util/internal/testdata/field_mask.pb.h \ ++# google/protobuf/util/internal/testdata/maps.pb.cc \ ++# google/protobuf/util/internal/testdata/maps.pb.h \ ++# google/protobuf/util/internal/testdata/oneofs.pb.cc \ ++# google/protobuf/util/internal/testdata/oneofs.pb.h \ ++# google/protobuf/util/internal/testdata/proto3.pb.cc \ ++# google/protobuf/util/internal/testdata/proto3.pb.h \ ++# google/protobuf/util/internal/testdata/struct.pb.cc \ ++# google/protobuf/util/internal/testdata/struct.pb.h \ ++# google/protobuf/util/internal/testdata/timestamp_duration.pb.cc \ ++# google/protobuf/util/internal/testdata/timestamp_duration.pb.h \ ++# google/protobuf/util/internal/testdata/wrappers.pb.cc \ ++# google/protobuf/util/internal/testdata/wrappers.pb.h \ ++# google/protobuf/util/json_format_proto3.pb.cc \ ++# google/protobuf/util/json_format_proto3.pb.h \ ++# google/protobuf/util/message_differencer_unittest.pb.cc \ ++# google/protobuf/util/message_differencer_unittest.pb.h ++# ++#if USE_EXTERNAL_PROTOC ++# ++#unittest_proto_middleman: $(protoc_inputs) ++# $(PROTOC) -I$(srcdir) --cpp_out=. $^ ++# touch unittest_proto_middleman ++# ++#else ++# ++## We have to cd to $(srcdir) before executing protoc because $(protoc_inputs) is ++## relative to srcdir, which may not be the same as the current directory when ++## building out-of-tree. ++#unittest_proto_middleman: protoc$(EXEEXT) $(protoc_inputs) ++# oldpwd=`pwd` && ( cd $(srcdir) && $$oldpwd/protoc$(EXEEXT) -I. --cpp_out=$$oldpwd $(protoc_inputs) ) ++# touch unittest_proto_middleman ++# ++#endif ++# ++#$(protoc_outputs): unittest_proto_middleman ++# ++#COMMON_TEST_SOURCES = \ ++# google/protobuf/arena_test_util.cc \ ++# google/protobuf/arena_test_util.h \ ++# google/protobuf/map_test_util.cc \ ++# google/protobuf/map_test_util.h \ ++# google/protobuf/map_test_util_impl.h \ ++# google/protobuf/test_util.cc \ ++# google/protobuf/test_util.h \ ++# google/protobuf/test_util.inc \ ++# google/protobuf/testing/googletest.cc \ ++# google/protobuf/testing/googletest.h \ ++# google/protobuf/testing/file.cc \ ++# google/protobuf/testing/file.h ++# ++#GOOGLETEST_BUILD_DIR=../third_party/googletest/googletest ++#GOOGLEMOCK_BUILD_DIR=../third_party/googletest/googlemock ++#GOOGLETEST_SRC_DIR=$(srcdir)/../third_party/googletest/googletest ++#GOOGLEMOCK_SRC_DIR=$(srcdir)/../third_party/googletest/googlemock ++#check_PROGRAMS = protoc protobuf-test protobuf-lazy-descriptor-test \ ++# protobuf-lite-test test_plugin protobuf-lite-arena-test \ ++# no-warning-test $(GZCHECKPROGRAMS) ++#protobuf_test_LDADD = $(PTHREAD_LIBS) libprotobuf.la libprotoc.la \ ++# $(GOOGLETEST_BUILD_DIR)/lib/libgtest.la \ ++# $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock.la \ ++# $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock_main.la ++#protobuf_test_CPPFLAGS = -I$(GOOGLETEST_SRC_DIR)/include \ ++# -I$(GOOGLEMOCK_SRC_DIR)/include ++## Disable optimization for tests unless the user explicitly asked for it, ++## since test_util.cc takes forever to compile with optimization (with GCC). ++## See configure.ac for more info. ++#protobuf_test_CXXFLAGS = $(NO_OPT_CXXFLAGS) ++#protobuf_test_SOURCES = \ ++# google/protobuf/stubs/bytestream_unittest.cc \ ++# google/protobuf/stubs/common_unittest.cc \ ++# google/protobuf/stubs/int128_unittest.cc \ ++# google/protobuf/stubs/io_win32_unittest.cc \ ++# google/protobuf/stubs/statusor_test.cc \ ++# google/protobuf/stubs/status_test.cc \ ++# google/protobuf/stubs/stringpiece_unittest.cc \ ++# google/protobuf/stubs/stringprintf_unittest.cc \ ++# google/protobuf/stubs/structurally_valid_unittest.cc \ ++# google/protobuf/stubs/strutil_unittest.cc \ ++# google/protobuf/stubs/template_util_unittest.cc \ ++# google/protobuf/stubs/time_test.cc \ ++# google/protobuf/any_test.cc \ ++# google/protobuf/arenastring_unittest.cc \ ++# google/protobuf/arena_unittest.cc \ ++# google/protobuf/descriptor_database_unittest.cc \ ++# google/protobuf/descriptor_unittest.cc \ ++# google/protobuf/drop_unknown_fields_test.cc \ ++# google/protobuf/dynamic_message_unittest.cc \ ++# google/protobuf/extension_set_unittest.cc \ ++# google/protobuf/generated_message_reflection_unittest.cc \ ++# google/protobuf/map_field_test.cc \ ++# google/protobuf/map_test.cc \ ++# google/protobuf/message_unittest.cc \ ++# google/protobuf/message_unittest.inc \ ++# google/protobuf/no_field_presence_test.cc \ ++# google/protobuf/preserve_unknown_enum_test.cc \ ++# google/protobuf/proto3_arena_lite_unittest.cc \ ++# google/protobuf/proto3_arena_unittest.cc \ ++# google/protobuf/proto3_lite_unittest.cc \ ++# google/protobuf/reflection_ops_unittest.cc \ ++# google/protobuf/repeated_field_reflection_unittest.cc \ ++# google/protobuf/repeated_field_unittest.cc \ ++# google/protobuf/text_format_unittest.cc \ ++# google/protobuf/unknown_field_set_unittest.cc \ ++# google/protobuf/well_known_types_unittest.cc \ ++# google/protobuf/wire_format_unittest.cc \ ++# google/protobuf/io/coded_stream_unittest.cc \ ++# google/protobuf/io/printer_unittest.cc \ ++# google/protobuf/io/tokenizer_unittest.cc \ ++# google/protobuf/io/zero_copy_stream_unittest.cc \ ++# google/protobuf/compiler/annotation_test_util.h \ ++# google/protobuf/compiler/annotation_test_util.cc \ ++# google/protobuf/compiler/command_line_interface_unittest.cc \ ++# google/protobuf/compiler/importer_unittest.cc \ ++# google/protobuf/compiler/mock_code_generator.cc \ ++# google/protobuf/compiler/mock_code_generator.h \ ++# google/protobuf/compiler/parser_unittest.cc \ ++# google/protobuf/compiler/cpp/cpp_bootstrap_unittest.cc \ ++# google/protobuf/compiler/cpp/cpp_move_unittest.cc \ ++# google/protobuf/compiler/cpp/cpp_unittest.h \ ++# google/protobuf/compiler/cpp/cpp_unittest.cc \ ++# google/protobuf/compiler/cpp/cpp_unittest.inc \ ++# google/protobuf/compiler/cpp/cpp_plugin_unittest.cc \ ++# google/protobuf/compiler/cpp/metadata_test.cc \ ++# google/protobuf/compiler/java/java_plugin_unittest.cc \ ++# google/protobuf/compiler/java/java_doc_comment_unittest.cc \ ++# google/protobuf/compiler/objectivec/objectivec_helpers_unittest.cc \ ++# google/protobuf/compiler/python/python_plugin_unittest.cc \ ++# google/protobuf/compiler/ruby/ruby_generator_unittest.cc \ ++# google/protobuf/compiler/csharp/csharp_bootstrap_unittest.cc \ ++# google/protobuf/compiler/csharp/csharp_generator_unittest.cc \ ++# google/protobuf/util/delimited_message_util_test.cc \ ++# google/protobuf/util/field_comparator_test.cc \ ++# google/protobuf/util/field_mask_util_test.cc \ ++# google/protobuf/util/internal/default_value_objectwriter_test.cc \ ++# google/protobuf/util/internal/json_objectwriter_test.cc \ ++# google/protobuf/util/internal/json_stream_parser_test.cc \ ++# google/protobuf/util/internal/protostream_objectsource_test.cc \ ++# google/protobuf/util/internal/protostream_objectwriter_test.cc \ ++# google/protobuf/util/internal/type_info_test_helper.cc \ ++# google/protobuf/util/json_util_test.cc \ ++# google/protobuf/util/message_differencer_unittest.cc \ ++# google/protobuf/util/time_util_test.cc \ ++# google/protobuf/util/type_resolver_util_test.cc \ ++# $(COMMON_TEST_SOURCES) ++#nodist_protobuf_test_SOURCES = $(protoc_outputs) ++#$(am_protobuf_test_OBJECTS): unittest_proto_middleman ++# ++## Run cpp_unittest again with PROTOBUF_TEST_NO_DESCRIPTORS defined. ++#protobuf_lazy_descriptor_test_LDADD = $(PTHREAD_LIBS) libprotobuf.la \ ++# libprotoc.la \ ++# $(GOOGLETEST_BUILD_DIR)/lib/libgtest.la \ ++# $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock.la \ ++# $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock_main.la ++#protobuf_lazy_descriptor_test_CPPFLAGS = -I$(GOOGLEMOCK_SRC_DIR)/include \ ++# -I$(GOOGLETEST_SRC_DIR)/include \ ++# -DPROTOBUF_TEST_NO_DESCRIPTORS ++#protobuf_lazy_descriptor_test_CXXFLAGS = $(NO_OPT_CXXFLAGS) ++#protobuf_lazy_descriptor_test_SOURCES = \ ++# google/protobuf/compiler/cpp/cpp_unittest.cc \ ++# $(COMMON_TEST_SOURCES) ++#nodist_protobuf_lazy_descriptor_test_SOURCES = $(protoc_outputs) ++#$(am_protobuf_lazy_descriptor_test_OBJECTS): unittest_proto_middleman ++# ++#COMMON_LITE_TEST_SOURCES = \ ++# google/protobuf/arena_test_util.cc \ ++# google/protobuf/arena_test_util.h \ ++# google/protobuf/map_lite_test_util.cc \ ++# google/protobuf/map_lite_test_util.h \ ++# google/protobuf/test_util_lite.cc \ ++# google/protobuf/test_util_lite.h ++# ++## Build lite_unittest separately, since it doesn't use gtest. It can't ++## depend on gtest because our internal version of gtest depend on proto ++## full runtime and we want to make sure this test builds without full ++## runtime. ++#protobuf_lite_test_LDADD = $(PTHREAD_LIBS) libprotobuf-lite.la \ ++# $(GOOGLETEST_BUILD_DIR)/lib/libgtest.la \ ++# $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock.la \ ++# $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock_main.la ++#protobuf_lite_test_CPPFLAGS= -I$(GOOGLEMOCK_SRC_DIR)/include \ ++# -I$(GOOGLETEST_SRC_DIR)/include ++#protobuf_lite_test_CXXFLAGS = $(NO_OPT_CXXFLAGS) ++#protobuf_lite_test_SOURCES = \ ++# google/protobuf/lite_unittest.cc \ ++# $(COMMON_LITE_TEST_SOURCES) ++#nodist_protobuf_lite_test_SOURCES = $(protoc_lite_outputs) ++#$(am_protobuf_lite_test_OBJECTS): unittest_proto_middleman ++# ++## lite_arena_unittest depends on gtest because teboring@ found that without ++## gtest when building the test internally our memory sanitizer doesn't detect ++## memory leaks (don't know why). ++#protobuf_lite_arena_test_LDADD = $(PTHREAD_LIBS) libprotobuf-lite.la \ ++# $(GOOGLETEST_BUILD_DIR)/lib/libgtest.la \ ++# $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock.la \ ++# $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock_main.la ++#protobuf_lite_arena_test_CPPFLAGS = -I$(GOOGLEMOCK_SRC_DIR)/include \ ++# -I$(GOOGLETEST_SRC_DIR)/include ++#protobuf_lite_arena_test_CXXFLAGS = $(NO_OPT_CXXFLAGS) ++#protobuf_lite_arena_test_SOURCES = \ ++# google/protobuf/lite_arena_unittest.cc \ ++# $(COMMON_LITE_TEST_SOURCES) ++#nodist_protobuf_lite_arena_test_SOURCES = $(protoc_lite_outputs) ++#$(am_protobuf_lite_arena_test_OBJECTS): unittest_proto_middleman ++# ++## Test plugin binary. ++#test_plugin_LDADD = $(PTHREAD_LIBS) libprotobuf.la libprotoc.la \ ++# $(GOOGLETEST_BUILD_DIR)/lib/libgtest.la ++#test_plugin_CPPFLAGS = -I$(GOOGLETEST_SRC_DIR)/include ++#test_plugin_SOURCES = \ ++# google/protobuf/compiler/mock_code_generator.cc \ ++# google/protobuf/testing/file.cc \ ++# google/protobuf/testing/file.h \ ++# google/protobuf/compiler/test_plugin.cc ++# ++#if HAVE_ZLIB ++#zcgzip_LDADD = $(PTHREAD_LIBS) libprotobuf.la ++#zcgzip_SOURCES = google/protobuf/testing/zcgzip.cc ++# ++#zcgunzip_LDADD = $(PTHREAD_LIBS) libprotobuf.la ++#zcgunzip_SOURCES = google/protobuf/testing/zcgunzip.cc ++#endif ++# ++## This test target is to ensure all our public header files and generated ++## code is free from warnings. We have to be more pedantic about these ++## files because they are compiled by users with different compiler flags. ++#no_warning_test.cc: ++# echo "// Generated from Makefile.am" > no_warning_test.cc ++# for FILE in $(nobase_include_HEADERS); do \ ++# echo "#include <$${FILE}>" >> no_warning_test.cc; \ ++# done ++# echo "int main(int, char**) { return 0; }" >> no_warning_test.cc ++# ++#no_warning_test_LDADD = $(PTHREAD_LIBS) libprotobuf.la libprotoc.la ++#no_warning_test_CXXFLAGS = $(PTHREAD_CFLAGS) $(PTHREAD_DEF) $(ZLIB_DEF) \ ++# -Wall -Wextra -Werror -Wno-unused-parameter ++#nodist_no_warning_test_SOURCES = no_warning_test.cc $(protoc_outputs) ++# ++#TESTS = protobuf-test protobuf-lazy-descriptor-test protobuf-lite-test \ ++# google/protobuf/compiler/zip_output_unittest.sh $(GZTESTS) \ ++# protobuf-lite-arena-test no-warning-test diff --git a/atomicops.h.patch b/atomicops.h.patch deleted file mode 100644 index 98ec934..0000000 --- a/atomicops.h.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/src/google/protobuf/stubs/atomicops.h b/src/google/protobuf/stubs/atomicops.h -index cb4553b1..be9f27da 100644 ---- a/src/google/protobuf/stubs/atomicops.h -+++ b/src/google/protobuf/stubs/atomicops.h -@@ -169,8 +169,12 @@ Atomic64 Release_Load(volatile const Atomic64* ptr); - #define GOOGLE_PROTOBUF_ATOMICOPS_ERROR \ - "Atomic operations are not supported on your platform" - -+// Emscripten support -+#if defined(__EMSCRIPTEN__) -+#include -+ - // ThreadSanitizer, http://clang.llvm.org/docs/ThreadSanitizer.html. --#if defined(THREAD_SANITIZER) -+#elif defined(THREAD_SANITIZER) - #include - // MSVC. - #elif defined(_MSC_VER) diff --git a/atomicops_internals_emscripten.h.patch b/atomicops_internals_emscripten.h.patch deleted file mode 100644 index 0f2351d..0000000 --- a/atomicops_internals_emscripten.h.patch +++ /dev/null @@ -1,104 +0,0 @@ -diff --git a/src/google/protobuf/stubs/atomicops_internals_emscripten.h b/src/google/protobuf/stubs/atomicops_internals_emscripten.h -new file mode 100644 -index 00000000..1f7ed97b ---- /dev/null -+++ b/src/google/protobuf/stubs/atomicops_internals_emscripten.h -@@ -0,0 +1,97 @@ -+// This file is an internal atomic implementation, use atomicops.h instead. -+ -+#ifndef GOOGLE_PROTOBUF_ATOMICOPS_INTERNALS_EMSCRIPTEN_H_ -+#define GOOGLE_PROTOBUF_ATOMICOPS_INTERNALS_EMSCRIPTEN_H_ -+ -+namespace google { -+namespace protobuf { -+namespace internal { -+ -+// 32-bit low-level operations on any platform. -+ -+inline Atomic32 NoBarrier_CompareAndSwap(volatile Atomic32* ptr, -+ Atomic32 old_value, -+ Atomic32 new_value) { -+ Atomic32 old_reg = *ptr; -+ if (old_reg == old_value) -+ *ptr = new_value; -+ -+ return old_reg; -+} -+ -+inline Atomic32 NoBarrier_AtomicExchange(volatile Atomic32* ptr, -+ Atomic32 new_value) { -+ Atomic32 prev = *ptr; -+ *ptr = new_value; -+ return prev; -+} -+ -+inline Atomic32 NoBarrier_AtomicIncrement(volatile Atomic32* ptr, -+ Atomic32 increment) { -+ Atomic32 prev = *ptr; -+ *ptr = *ptr + increment; -+ return prev; -+} -+ -+inline Atomic32 Barrier_AtomicIncrement(volatile Atomic32* ptr, -+ Atomic32 increment) { -+ Atomic32 prev = *ptr; -+ *ptr = *ptr + increment; -+ return prev; -+} -+ -+inline Atomic32 Acquire_CompareAndSwap(volatile Atomic32* ptr, -+ Atomic32 old_value, -+ Atomic32 new_value) { -+ Atomic32 old_reg = *ptr; -+ if (old_reg == old_value) -+ *ptr = new_value; -+ -+ return old_reg; -+} -+ -+inline Atomic32 Release_CompareAndSwap(volatile Atomic32* ptr, -+ Atomic32 old_value, -+ Atomic32 new_value) { -+ Atomic32 old_reg = *ptr; -+ if (old_reg == old_value) -+ *ptr = new_value; -+ -+ return old_reg; -+} -+ -+inline void NoBarrier_Store(volatile Atomic32* ptr, Atomic32 value) { -+ *ptr = value; -+} -+ -+inline void MemoryBarrier() { -+ -+} -+ -+inline void Acquire_Store(volatile Atomic32* ptr, Atomic32 value) { -+ *ptr = value; -+} -+ -+inline void Release_Store(volatile Atomic32* ptr, Atomic32 value) { -+ *ptr = value; -+} -+ -+inline Atomic32 NoBarrier_Load(volatile const Atomic32* ptr) { -+ return *ptr; -+} -+ -+inline Atomic32 Acquire_Load(volatile const Atomic32* ptr) { -+ Atomic32 value = *ptr; -+ return value; -+} -+ -+inline Atomic32 Release_Load(volatile const Atomic32* ptr) { -+ return *ptr; -+} -+ -+} // namespace internal -+} // namespace protobuf -+} // namespace google -+ -+ -+#endif // GOOGLE_PROTOBUF_ATOMICOPS_INTERNALS_EMSCRIPTEN_H_ -\ No newline at end of file diff --git a/common.cc.patch b/common.cc.patch index 2eb43fd..fc27fd0 100644 --- a/common.cc.patch +++ b/common.cc.patch @@ -1,5 +1,5 @@ diff --git a/src/google/protobuf/stubs/common.cc b/src/google/protobuf/stubs/common.cc -index 73822168..ae05dd74 100755 +index 6544c6ed..617be09c 100755 --- a/src/google/protobuf/stubs/common.cc +++ b/src/google/protobuf/stubs/common.cc @@ -48,6 +48,7 @@ @@ -10,27 +10,3 @@ index 73822168..ae05dd74 100755 #else #error "No suitable threading library available." #endif -@@ -356,6 +357,23 @@ void Mutex::AssertHeld() { - #endif - } - -+#elif defined(__EMSCRIPTEN__) -+ -+struct Mutex::Internal {}; -+ -+Mutex::Mutex() -+ : mInternal(new Internal) { -+} -+ -+Mutex::~Mutex() {} -+ -+void Mutex::Lock() {} -+ -+void Mutex::Unlock() {} -+ -+void Mutex::AssertHeld() {} -+ -+ - #elif defined(HAVE_PTHREAD) - - struct Mutex::Internal { diff --git a/port.h.patch b/port.h.patch deleted file mode 100644 index d40ca13..0000000 --- a/port.h.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/google/protobuf/stubs/port.h b/src/google/protobuf/stubs/port.h -index cecefdcb..a4cfbb96 100644 ---- a/src/google/protobuf/stubs/port.h -+++ b/src/google/protobuf/stubs/port.h -@@ -239,7 +239,7 @@ static const uint64 kuint64max = GOOGLE_ULONGLONG(0xFFFFFFFFFFFFFFFF); - - #if defined(__clang__) && defined(__has_cpp_attribute) \ - && !defined(GOOGLE_PROTOBUF_OS_APPLE) --# if defined(GOOGLE_PROTOBUF_OS_NACL) || defined(EMSCRIPTEN) || \ -+# if defined(GOOGLE_PROTOBUF_OS_NACL) || \ - __has_cpp_attribute(clang::fallthrough) - # define GOOGLE_FALLTHROUGH_INTENDED [[clang::fallthrough]] - # endif