Chiebot-Mirror
/
protobuf
mirror of https://github.com/protocolbuffers/protobuf.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity
Protocol Buffers - Google's data interchange format (grpc依赖) https://developers.google.com/protocol-buffers/
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
356 Commits
201 Branches
346 Tags
254 MiB
Tag: Branch: Tree: 24095cc7e5
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from '24095cc7e5'
${ noResults }
protobuf/src/Makefile.am

416 lines
23 KiB
Raw Normal View History Unescape

Initial checkin.
17 years ago
## Process this file with automake to produce Makefile.in
Commit Brian Olson's gzip stream implementations.
16 years ago
if HAVE_ZLIB
GZCHECKPROGRAMS = zcgzip zcgunzip
GZHEADERS = google/protobuf/io/gzip_stream.h
GZTESTS = google/protobuf/io/gzip_stream_unittest.sh
else
GZCHECKPROGRAMS =
GZHEADERS =
GZTESTS =
endif
Initial checkin.
17 years ago
if GCC
# These are good warnings to turn on by default
Set better default CXXFLAGS and don't use optimization when compiling tests (takes too long).
16 years ago
NO_OPT_CXXFLAGS = $(PTHREAD_CFLAGS) -Wall -Wwrite-strings -Woverloaded-virtual -Wno-sign-compare
Initial checkin.
17 years ago
else
Set better default CXXFLAGS and don't use optimization when compiling tests (takes too long).
16 years ago
NO_OPT_CXXFLAGS = $(PTHREAD_CFLAGS)
Initial checkin.
17 years ago
endif
Set better default CXXFLAGS and don't use optimization when compiling tests (takes too long).
16 years ago
AM_CXXFLAGS = $(NO_OPT_CXXFLAGS) $(PROTOBUF_OPT_FLAG)
Initial checkin.
17 years ago
AM_LDFLAGS = $(PTHREAD_CFLAGS)
# If I say "dist_include_DATA", automake complains that $(includedir) is not
# a "legitimate" directory for DATA. Screw you, automake.
protodir = $(includedir)
Massive roll-up of changes. See CHANGES.txt.
15 years ago
nobase_dist_proto_DATA = google/protobuf/descriptor.proto \
google/protobuf/compiler/plugin.proto
Initial checkin.
17 years ago
# Not sure why these don't get cleaned automatically.
clean-local:
rm -f *.loT
Improve zip/jar support: - Don't support par or war since par is not a standard format and outputting to war doesn't make sense. - Add boilerplate manifest when outputting to Jar. - Remove "XXX check conversion" comments because I don't care. - Add a test.
15 years ago
CLEANFILES = $(protoc_outputs) unittest_proto_middleman \
testzip.jar testzip.list testzip.proto testzip.zip
Initial checkin.
17 years ago
MAINTAINERCLEANFILES = \
Makefile.in
Merge from tags/2.5.0rc1 to trunk
12 years ago
nobase_include_HEADERS = \
google/protobuf/stubs/atomicops.h \
google/protobuf/stubs/atomicops_internals_arm_gcc.h \
down integrate to svn
11 years ago
google/protobuf/stubs/atomicops_internals_arm64_gcc.h \
Add arm_qnx atomic ops support and add missing header files in Makefile.am
12 years ago
google/protobuf/stubs/atomicops_internals_arm_qnx.h \
Merge from tags/2.5.0rc1 to trunk
12 years ago
google/protobuf/stubs/atomicops_internals_atomicword_compat.h \
google/protobuf/stubs/atomicops_internals_macosx.h \
google/protobuf/stubs/atomicops_internals_mips_gcc.h \
Fix a typo of nacl file name.
12 years ago
google/protobuf/stubs/atomicops_internals_pnacl.h \
down integrate to svn
11 years ago
google/protobuf/stubs/atomicops_internals_tsan.h \
Merge from tags/2.5.0rc1 to trunk
12 years ago
google/protobuf/stubs/atomicops_internals_x86_gcc.h \
google/protobuf/stubs/atomicops_internals_x86_msvc.h \
google/protobuf/stubs/common.h \
google/protobuf/stubs/platform_macros.h \
google/protobuf/stubs/once.h \
google/protobuf/stubs/template_util.h \
google/protobuf/stubs/type_traits.h \
google/protobuf/descriptor.h \
google/protobuf/descriptor.pb.h \
google/protobuf/descriptor_database.h \
google/protobuf/dynamic_message.h \
google/protobuf/extension_set.h \
google/protobuf/generated_enum_reflection.h \
google/protobuf/generated_message_util.h \
google/protobuf/generated_message_reflection.h \
google/protobuf/message.h \
google/protobuf/message_lite.h \
google/protobuf/reflection_ops.h \
google/protobuf/repeated_field.h \
google/protobuf/service.h \
google/protobuf/text_format.h \
google/protobuf/unknown_field_set.h \
google/protobuf/wire_format.h \
google/protobuf/wire_format_lite.h \
google/protobuf/wire_format_lite_inl.h \
google/protobuf/io/coded_stream.h \
$(GZHEADERS) \
google/protobuf/io/printer.h \
down integrate to svn
11 years ago
google/protobuf/io/strtod.h \
Merge from tags/2.5.0rc1 to trunk
12 years ago
google/protobuf/io/tokenizer.h \
google/protobuf/io/zero_copy_stream.h \
google/protobuf/io/zero_copy_stream_impl.h \
google/protobuf/io/zero_copy_stream_impl_lite.h \
google/protobuf/compiler/code_generator.h \
google/protobuf/compiler/command_line_interface.h \
google/protobuf/compiler/importer.h \
google/protobuf/compiler/parser.h \
google/protobuf/compiler/plugin.h \
google/protobuf/compiler/plugin.pb.h \
google/protobuf/compiler/cpp/cpp_generator.h \
google/protobuf/compiler/java/java_generator.h \
Initial checkin.
17 years ago
google/protobuf/compiler/python/python_generator.h
Define libprotobuf-lite in Makefile.am. TODO: Compile conditionally? Provide a way to omit ExtensionSet? Should libprotobuf depend on libprotobuf-lite instead of being a stand-alone lib?
16 years ago
lib_LTLIBRARIES = libprotobuf-lite.la libprotobuf.la libprotoc.la
Initial checkin.
17 years ago
Define libprotobuf-lite in Makefile.am. TODO: Compile conditionally? Provide a way to omit ExtensionSet? Should libprotobuf depend on libprotobuf-lite instead of being a stand-alone lib?
16 years ago
libprotobuf_lite_la_LIBADD = $(PTHREAD_LIBS)
Update version number in trunk
12 years ago
libprotobuf_lite_la_LDFLAGS = -version-info 9:0:0 -export-dynamic -no-undefined
Define libprotobuf-lite in Makefile.am. TODO: Compile conditionally? Provide a way to omit ExtensionSet? Should libprotobuf depend on libprotobuf-lite instead of being a stand-alone lib?
16 years ago
libprotobuf_lite_la_SOURCES = \
Add atomicops from V8.
13 years ago
google/protobuf/stubs/atomicops_internals_x86_gcc.cc \
Merge from tags/2.5.0rc1 to trunk
12 years ago
google/protobuf/stubs/atomicops_internals_x86_msvc.cc \
Initial checkin.
17 years ago
google/protobuf/stubs/common.cc \
Integrate recent changes from Google-internal code tree. See CHANGES.txt for details.
16 years ago
google/protobuf/stubs/once.cc \
Initial checkin.
17 years ago
google/protobuf/stubs/hash.h \
down integrate to svn
11 years ago
google/protobuf/stubs/map_util.h \
down integrate python opensource to svn
10 years ago
google/protobuf/stubs/shared_ptr.h \
Down-integrate from internal branch
12 years ago
google/protobuf/stubs/stl_util.h \
google/protobuf/stubs/stringprintf.cc \
google/protobuf/stubs/stringprintf.h \
Define libprotobuf-lite in Makefile.am. TODO: Compile conditionally? Provide a way to omit ExtensionSet? Should libprotobuf depend on libprotobuf-lite instead of being a stand-alone lib?
16 years ago
google/protobuf/extension_set.cc \
google/protobuf/generated_message_util.cc \
google/protobuf/message_lite.cc \
google/protobuf/repeated_field.cc \
google/protobuf/wire_format_lite.cc \
google/protobuf/io/coded_stream.cc \
Massive roll-up of changes. See CHANGES.txt.
15 years ago
google/protobuf/io/coded_stream_inl.h \
Define libprotobuf-lite in Makefile.am. TODO: Compile conditionally? Provide a way to omit ExtensionSet? Should libprotobuf depend on libprotobuf-lite instead of being a stand-alone lib?
16 years ago
google/protobuf/io/zero_copy_stream.cc \
google/protobuf/io/zero_copy_stream_impl_lite.cc
libprotobuf_la_LIBADD = $(PTHREAD_LIBS)
Update version number in trunk
12 years ago
libprotobuf_la_LDFLAGS = -version-info 9:0:0 -export-dynamic -no-undefined
Define libprotobuf-lite in Makefile.am. TODO: Compile conditionally? Provide a way to omit ExtensionSet? Should libprotobuf depend on libprotobuf-lite instead of being a stand-alone lib?
16 years ago
libprotobuf_la_SOURCES = \
$(libprotobuf_lite_la_SOURCES) \
Decouple strutil from C++ lite library for a further 23k reduction.
16 years ago
google/protobuf/stubs/strutil.cc \
google/protobuf/stubs/strutil.h \
google/protobuf/stubs/substitute.cc \
google/protobuf/stubs/substitute.h \
Integrate changes from internal code. protoc * Enum values may now have custom options, using syntax similar to field options. * Fixed bug where .proto files which use custom options but don't actually define them (i.e. they import another .proto file defining the options) had to explicitly import descriptor.proto. * Adjacent string literals in .proto files will now be concatenated, like in C. C++ * Generated message classes now have a Swap() method which efficiently swaps the contents of two objects. * All message classes now have a SpaceUsed() method which returns an estimate of the number of bytes of allocated memory currently owned by the object. This is particularly useful when you are reusing a single message object to improve performance but want to make sure it doesn't bloat up too large. * New method Message::SerializeAsString() returns a string containing the serialized data. May be more convenient than calling SerializeToString(string*). * In debug mode, log error messages when string-type fields are found to contain bytes that are not valid UTF-8. * Fixed bug where a message with multiple extension ranges couldn't parse extensions. * Fixed bug where MergeFrom(const Message&) didn't do anything if invoked on a message that contained no fields (but possibly contained extensions). * Fixed ShortDebugString() to not be O(n^2). Durr. * Fixed crash in TextFormat parsing if the first token in the input caused a tokenization error. Java * New overload of mergeFrom() which parses a slice of a byte array instead of the whole thing. * New method ByteString.asReadOnlyByteBuffer() does what it sounds like. * Improved performance of isInitialized() when optimizing for code size. Python * Corrected ListFields() signature in Message base class to match what subclasses actually implement. * Some minor refactoring.
16 years ago
google/protobuf/stubs/structurally_valid.cc \
Initial checkin.
17 years ago
google/protobuf/descriptor.cc \
google/protobuf/descriptor.pb.cc \
google/protobuf/descriptor_database.cc \
google/protobuf/dynamic_message.cc \
Submit recent changes from internal branch, including "lite mode" for C++ and Java. See CHANGES.txt for more details.
16 years ago
google/protobuf/extension_set_heavy.cc \
Initial checkin.
17 years ago
google/protobuf/generated_message_reflection.cc \
google/protobuf/message.cc \
google/protobuf/reflection_ops.cc \
google/protobuf/service.cc \
google/protobuf/text_format.cc \
google/protobuf/unknown_field_set.cc \
google/protobuf/wire_format.cc \
Commit Brian Olson's gzip stream implementations.
16 years ago
google/protobuf/io/gzip_stream.cc \
Initial checkin.
17 years ago
google/protobuf/io/printer.cc \
down integrate to svn
11 years ago
google/protobuf/io/strtod.cc \
Initial checkin.
17 years ago
google/protobuf/io/tokenizer.cc \
google/protobuf/io/zero_copy_stream_impl.cc \
google/protobuf/compiler/importer.cc \
google/protobuf/compiler/parser.cc
libprotoc_la_LIBADD = $(PTHREAD_LIBS) libprotobuf.la
Update version number in trunk
12 years ago
libprotoc_la_LDFLAGS = -version-info 9:0:0 -export-dynamic -no-undefined
Initial checkin.
17 years ago
libprotoc_la_SOURCES = \
google/protobuf/compiler/code_generator.cc \
google/protobuf/compiler/command_line_interface.cc \
Massive roll-up of changes. See CHANGES.txt.
15 years ago
google/protobuf/compiler/plugin.cc \
google/protobuf/compiler/plugin.pb.cc \
google/protobuf/compiler/subprocess.cc \
google/protobuf/compiler/subprocess.h \
Allow protoc to output directly to zip/jar/par/war files.
15 years ago
google/protobuf/compiler/zip_writer.cc \
google/protobuf/compiler/zip_writer.h \
Initial checkin.
17 years ago
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_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 \
Down-integrate from internal branch
12 years ago
google/protobuf/compiler/cpp/cpp_options.h \
Initial checkin.
17 years ago
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 \
down integrate to svn
11 years ago
google/protobuf/compiler/java/java_context.cc \
google/protobuf/compiler/java/java_context.h \
Initial checkin.
17 years ago
google/protobuf/compiler/java/java_enum.cc \
google/protobuf/compiler/java/java_enum.h \
google/protobuf/compiler/java/java_enum_field.cc \
google/protobuf/compiler/java/java_enum_field.h \
google/protobuf/compiler/java/java_extension.cc \
google/protobuf/compiler/java/java_extension.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 \
down integrate to svn
11 years ago
google/protobuf/compiler/java/java_generator_factory.cc \
google/protobuf/compiler/java/java_generator_factory.h \
Initial checkin.
17 years ago
google/protobuf/compiler/java/java_helpers.cc \
google/protobuf/compiler/java/java_helpers.h \
down integrate to svn
11 years ago
google/protobuf/compiler/java/java_lazy_message_field.cc \
google/protobuf/compiler/java/java_lazy_message_field.h \
Initial checkin.
17 years ago
google/protobuf/compiler/java/java_message.cc \
google/protobuf/compiler/java/java_message.h \
google/protobuf/compiler/java/java_message_field.cc \
google/protobuf/compiler/java/java_message_field.h \
down integrate to svn
11 years ago
google/protobuf/compiler/java/java_name_resolver.cc \
google/protobuf/compiler/java/java_name_resolver.h \
Initial checkin.
17 years ago
google/protobuf/compiler/java/java_primitive_field.cc \
google/protobuf/compiler/java/java_primitive_field.h \
down integrate to svn
11 years ago
google/protobuf/compiler/java/java_shared_code_generator.cc \
google/protobuf/compiler/java/java_shared_code_generator.h \
Initial checkin.
17 years ago
google/protobuf/compiler/java/java_service.cc \
google/protobuf/compiler/java/java_service.h \
Submit recent changes from internal branch. See CHANGES.txt for more details.
14 years ago
google/protobuf/compiler/java/java_string_field.cc \
google/protobuf/compiler/java/java_string_field.h \
Down-integrate from internal branch
12 years ago
google/protobuf/compiler/java/java_doc_comment.cc \
google/protobuf/compiler/java/java_doc_comment.h \
Initial checkin.
17 years ago
google/protobuf/compiler/python/python_generator.cc
bin_PROGRAMS = protoc
protoc_LDADD = $(PTHREAD_LIBS) libprotobuf.la libprotoc.la
protoc_SOURCES = google/protobuf/compiler/main.cc
# Tests ==============================================================
protoc_inputs = \
google/protobuf/unittest.proto \
Integrate recent changes from Google-internal code tree. See CHANGES.txt for details.
16 years ago
google/protobuf/unittest_empty.proto \
Initial checkin.
17 years ago
google/protobuf/unittest_import.proto \
Down-integrate from internal branch
12 years ago
google/protobuf/unittest_import_public.proto \
Initial checkin.
17 years ago
google/protobuf/unittest_mset.proto \
google/protobuf/unittest_optimize_for.proto \
google/protobuf/unittest_embed_optimize_for.proto \
Integrate changes from internal Google-internal branch. General * License changed from Apache 2.0 to New BSD. * It is now possible to define custom "options", which are basically annotations which may be placed on definitions in a .proto file. For example, you might define a field option called "foo" like so: import "google/protobuf/descriptor.proto" extend google.protobuf.FieldOptions { optional string foo = 12345; } Then you annotate a field using the "foo" option: message MyMessage { optional int32 some_field = 1 [(foo) = "bar"] } The value of this option is then visible via the message's Descriptor: const FieldDescriptor* field = MyMessage::descriptor()->FindFieldByName("some_field"); assert(field->options().GetExtension(foo) == "bar"); This feature has been implemented and tested in C++ and Java. Other languages may or may not need to do extra work to support custom options, depending on how they construct descriptors. C++ * Fixed some GCC warnings that only occur when using -pedantic. * Improved static initialization code, making ordering more predictable among other things. * TextFormat will no longer accept messages which contain multiple instances of a singular field. Previously, the latter instance would overwrite the former. * Now works on systems that don't have hash_map. Python * Strings now use the "unicode" type rather than the "str" type. String fields may still be assigned ASCII "str" values; they will automatically be converted. * Adding a property to an object representing a repeated field now raises an exception. For example: # No longer works (and never should have). message.some_repeated_field.foo = 1
16 years ago
google/protobuf/unittest_custom_options.proto \
Submit recent changes from internal branch, including "lite mode" for C++ and Java. See CHANGES.txt for more details.
16 years ago
google/protobuf/unittest_lite.proto \
google/protobuf/unittest_import_lite.proto \
Down-integrate from internal branch
12 years ago
google/protobuf/unittest_import_public_lite.proto \
Submit recent changes from internal branch, including "lite mode" for C++ and Java. See CHANGES.txt for more details.
16 years ago
google/protobuf/unittest_lite_imports_nonlite.proto \
Massive roll-up of changes. See CHANGES.txt.
15 years ago
google/protobuf/unittest_no_generic_services.proto \
Initial checkin.
17 years ago
google/protobuf/compiler/cpp/cpp_test_bad_identifiers.proto
EXTRA_DIST = \
$(protoc_inputs) \
solaris/libstdc++.la \
Commit Brian Olson's gzip stream implementations.
16 years ago
google/protobuf/io/gzip_stream.h \
google/protobuf/io/gzip_stream_unittest.sh \
Initial checkin.
17 years ago
google/protobuf/testdata/golden_message \
down integrate to svn
11 years ago
google/protobuf/testdata/golden_message_oneof_implemented \
Push out changes from internal codebase. All Languages * Repeated fields of primitive types (types other that string, group, and nested messages) may now use the option [packed = true] to get a more efficient encoding. In the new encoding, the entire list is written as a single byte blob using the "length-delimited" wire type. Within this blob, the individual values are encoded the same way they would be normally except without a tag before each value (thus, they are tightly "packed"). C++ * UnknownFieldSet now supports STL-like iteration. * Message interface has method ParseFromBoundedZeroCopyStream() which parses a limited number of bytes from an input stream rather than parsing until EOF. Java * Fixed bug where Message.mergeFrom(Message) failed to merge extensions. * Message interface has new method toBuilder() which is equivalent to newBuilderForType().mergeFrom(this). * All enums now implement the ProtocolMessageEnum interface. * Setting a field to null now throws NullPointerException. * Fixed tendency for TextFormat's parsing to overflow the stack when parsing large string values. The underlying problem is with Java's regex implementation (which unfortunately uses recursive backtracking rather than building an NFA). Worked around by making use of possesive quantifiers. Python * Updated RPC interfaces to allow for blocking operation. A client may now pass None for a callback when making an RPC, in which case the call will block until the response is received, and the response object will be returned directly to the caller. This interface change cannot be used in practice until RPC implementations are updated to implement it.
16 years ago
google/protobuf/testdata/golden_packed_fields_message \
down integrate to svn
11 years ago
google/protobuf/testdata/text_format_unittest_data_oneof_implemented.txt \
down integrate python opensource to svn
10 years ago
google/protobuf/testdata/text_format_unittest_data_pointy.txt \
google/protobuf/testdata/text_format_unittest_data_pointy_oneof_implemented.txt \
down integrate to svn
11 years ago
google/protobuf/testdata/text_format_unittest_extensions_data.txt \
down integrate python opensource to svn
10 years ago
google/protobuf/testdata/text_format_unittest_extensions_data_pointy.txt \
Initial checkin.
17 years ago
google/protobuf/package_info.h \
google/protobuf/io/package_info.h \
Oops, unittest_enormous_descriptor.proto still needs to be in the dist.
16 years ago
google/protobuf/compiler/package_info.h \
Add missing file to dist.
15 years ago
google/protobuf/compiler/zip_output_unittest.sh \
Oops, unittest_enormous_descriptor.proto still needs to be in the dist.
16 years ago
google/protobuf/unittest_enormous_descriptor.proto
Initial checkin.
17 years ago
Submit recent changes from internal branch, including "lite mode" for C++ and Java. See CHANGES.txt for more details.
16 years ago
protoc_lite_outputs = \
google/protobuf/unittest_lite.pb.cc \
google/protobuf/unittest_lite.pb.h \
google/protobuf/unittest_import_lite.pb.cc \
Down-integrate from internal branch
12 years ago
google/protobuf/unittest_import_lite.pb.h \
google/protobuf/unittest_import_public_lite.pb.cc \
google/protobuf/unittest_import_public_lite.pb.h
Submit recent changes from internal branch, including "lite mode" for C++ and Java. See CHANGES.txt for more details.
16 years ago
Initial checkin.
17 years ago
protoc_outputs = \
Submit recent changes from internal branch, including "lite mode" for C++ and Java. See CHANGES.txt for more details.
16 years ago
$(protoc_lite_outputs) \
Initial checkin.
17 years ago
google/protobuf/unittest.pb.cc \
google/protobuf/unittest.pb.h \
Integrate recent changes from Google-internal code tree. See CHANGES.txt for details.
16 years ago
google/protobuf/unittest_empty.pb.cc \
google/protobuf/unittest_empty.pb.h \
Initial checkin.
17 years ago
google/protobuf/unittest_import.pb.cc \
google/protobuf/unittest_import.pb.h \
Down-integrate from internal branch
12 years ago
google/protobuf/unittest_import_public.pb.cc \
google/protobuf/unittest_import_public.pb.h \
Initial checkin.
17 years ago
google/protobuf/unittest_mset.pb.cc \
google/protobuf/unittest_mset.pb.h \
google/protobuf/unittest_optimize_for.pb.cc \
google/protobuf/unittest_optimize_for.pb.h \
google/protobuf/unittest_embed_optimize_for.pb.cc \
google/protobuf/unittest_embed_optimize_for.pb.h \
Integrate changes from internal Google-internal branch. General * License changed from Apache 2.0 to New BSD. * It is now possible to define custom "options", which are basically annotations which may be placed on definitions in a .proto file. For example, you might define a field option called "foo" like so: import "google/protobuf/descriptor.proto" extend google.protobuf.FieldOptions { optional string foo = 12345; } Then you annotate a field using the "foo" option: message MyMessage { optional int32 some_field = 1 [(foo) = "bar"] } The value of this option is then visible via the message's Descriptor: const FieldDescriptor* field = MyMessage::descriptor()->FindFieldByName("some_field"); assert(field->options().GetExtension(foo) == "bar"); This feature has been implemented and tested in C++ and Java. Other languages may or may not need to do extra work to support custom options, depending on how they construct descriptors. C++ * Fixed some GCC warnings that only occur when using -pedantic. * Improved static initialization code, making ordering more predictable among other things. * TextFormat will no longer accept messages which contain multiple instances of a singular field. Previously, the latter instance would overwrite the former. * Now works on systems that don't have hash_map. Python * Strings now use the "unicode" type rather than the "str" type. String fields may still be assigned ASCII "str" values; they will automatically be converted. * Adding a property to an object representing a repeated field now raises an exception. For example: # No longer works (and never should have). message.some_repeated_field.foo = 1
16 years ago
google/protobuf/unittest_custom_options.pb.cc \
google/protobuf/unittest_custom_options.pb.h \
Submit recent changes from internal branch, including "lite mode" for C++ and Java. See CHANGES.txt for more details.
16 years ago
google/protobuf/unittest_lite_imports_nonlite.pb.cc \
google/protobuf/unittest_lite_imports_nonlite.pb.h \
Massive roll-up of changes. See CHANGES.txt.
15 years ago
google/protobuf/unittest_no_generic_services.pb.cc \
google/protobuf/unittest_no_generic_services.pb.h \
Initial checkin.
17 years ago
google/protobuf/compiler/cpp/cpp_test_bad_identifiers.pb.cc \
google/protobuf/compiler/cpp/cpp_test_bad_identifiers.pb.h
BUILT_SOURCES = $(protoc_outputs)
enable cross-compiling
16 years ago
if USE_EXTERNAL_PROTOC
unittest_proto_middleman: $(protoc_inputs)
Fix cross-compiling when building in a dedicated build directory. Fix pointed out by Pierre Kestener.
15 years ago
$(PROTOC) -I$(srcdir) --cpp_out=. $^
enable cross-compiling
16 years ago
touch unittest_proto_middleman
else
Minor compatibility tweaks for FreeBSD.
15 years ago
# 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.
Initial checkin.
17 years ago
unittest_proto_middleman: protoc$(EXEEXT) $(protoc_inputs)
Minor compatibility tweaks for FreeBSD.
15 years ago
oldpwd=`pwd` && ( cd $(srcdir) && $$oldpwd/protoc$(EXEEXT) -I. --cpp_out=$$oldpwd $(protoc_inputs) )
Initial checkin.
17 years ago
touch unittest_proto_middleman
enable cross-compiling
16 years ago
endif
Initial checkin.
17 years ago
$(protoc_outputs): unittest_proto_middleman
Add second run of cpp_unittest which verifies that descriptors are constructed lazily. This is accomplished by avoiding any use of descriptors while testing a bunch of other operations, then checking at the end that descriptors have not been constructed.
16 years ago
COMMON_TEST_SOURCES = \
google/protobuf/test_util.cc \
google/protobuf/test_util.h \
google/protobuf/testing/googletest.cc \
google/protobuf/testing/googletest.h \
google/protobuf/testing/file.cc \
google/protobuf/testing/file.h
Improve zip/jar support: - Don't support par or war since par is not a standard format and outputting to war doesn't make sense. - Add boilerplate manifest when outputting to Jar. - Remove "XXX check conversion" comments because I don't care. - Add a test.
15 years ago
check_PROGRAMS = protoc protobuf-test protobuf-lazy-descriptor-test \
protobuf-lite-test test_plugin $(GZCHECKPROGRAMS)
Update bundled gtest to latest version (1.3.0) and include it as a nested autoconf package rather than as raw source. This way we can trivially update it again in the future. Actually, this change doesn't even include gtest in protobuf's SVN. Instead, we auto-download it when autogen.sh is invoked. Note that it will be included in release distributions, though. TODO: * Add a configure option to use the system's installed gtest rather than the bundled copy. Apparently the gtest maintainers are working on some general-purpose autoconf macros which will do this automagically. * Update MSVC project files.
16 years ago
protobuf_test_LDADD = $(PTHREAD_LIBS) libprotobuf.la libprotoc.la \
$(top_builddir)/gtest/lib/libgtest.la \
$(top_builddir)/gtest/lib/libgtest_main.la
protobuf_test_CPPFLAGS = -I$(top_srcdir)/gtest/include \
-I$(top_builddir)/gtest/include
Set better default CXXFLAGS and don't use optimization when compiling tests (takes too long).
16 years ago
# 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)
Initial checkin.
17 years ago
protobuf_test_SOURCES = \
google/protobuf/stubs/common_unittest.cc \
Integrate recent changes from Google-internal code tree. See CHANGES.txt for details.
16 years ago
google/protobuf/stubs/once_unittest.cc \
Initial checkin.
17 years ago
google/protobuf/stubs/strutil_unittest.cc \
Integrate changes from internal code. protoc * Enum values may now have custom options, using syntax similar to field options. * Fixed bug where .proto files which use custom options but don't actually define them (i.e. they import another .proto file defining the options) had to explicitly import descriptor.proto. * Adjacent string literals in .proto files will now be concatenated, like in C. C++ * Generated message classes now have a Swap() method which efficiently swaps the contents of two objects. * All message classes now have a SpaceUsed() method which returns an estimate of the number of bytes of allocated memory currently owned by the object. This is particularly useful when you are reusing a single message object to improve performance but want to make sure it doesn't bloat up too large. * New method Message::SerializeAsString() returns a string containing the serialized data. May be more convenient than calling SerializeToString(string*). * In debug mode, log error messages when string-type fields are found to contain bytes that are not valid UTF-8. * Fixed bug where a message with multiple extension ranges couldn't parse extensions. * Fixed bug where MergeFrom(const Message&) didn't do anything if invoked on a message that contained no fields (but possibly contained extensions). * Fixed ShortDebugString() to not be O(n^2). Durr. * Fixed crash in TextFormat parsing if the first token in the input caused a tokenization error. Java * New overload of mergeFrom() which parses a slice of a byte array instead of the whole thing. * New method ByteString.asReadOnlyByteBuffer() does what it sounds like. * Improved performance of isInitialized() when optimizing for code size. Python * Corrected ListFields() signature in Message base class to match what subclasses actually implement. * Some minor refactoring.
16 years ago
google/protobuf/stubs/structurally_valid_unittest.cc \
Down-integrate from internal branch
12 years ago
google/protobuf/stubs/stringprintf_unittest.cc \
google/protobuf/stubs/template_util_unittest.cc \
google/protobuf/stubs/type_traits_unittest.cc \
Initial checkin.
17 years ago
google/protobuf/descriptor_database_unittest.cc \
google/protobuf/descriptor_unittest.cc \
google/protobuf/dynamic_message_unittest.cc \
google/protobuf/extension_set_unittest.cc \
google/protobuf/generated_message_reflection_unittest.cc \
google/protobuf/message_unittest.cc \
google/protobuf/reflection_ops_unittest.cc \
google/protobuf/repeated_field_unittest.cc \
Down-integrate from internal branch
12 years ago
google/protobuf/repeated_field_reflection_unittest.cc \
Initial checkin.
17 years ago
google/protobuf/text_format_unittest.cc \
google/protobuf/unknown_field_set_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/command_line_interface_unittest.cc \
google/protobuf/compiler/importer_unittest.cc \
Massive roll-up of changes. See CHANGES.txt.
15 years ago
google/protobuf/compiler/mock_code_generator.cc \
google/protobuf/compiler/mock_code_generator.h \
Initial checkin.
17 years ago
google/protobuf/compiler/parser_unittest.cc \
google/protobuf/compiler/cpp/cpp_bootstrap_unittest.cc \
Down-integrate from internal branch
12 years ago
google/protobuf/compiler/cpp/cpp_unittest.h \
Initial checkin.
17 years ago
google/protobuf/compiler/cpp/cpp_unittest.cc \
Massive roll-up of changes. See CHANGES.txt.
15 years ago
google/protobuf/compiler/cpp/cpp_plugin_unittest.cc \
google/protobuf/compiler/java/java_plugin_unittest.cc \
Down-integrate from internal branch
12 years ago
google/protobuf/compiler/java/java_doc_comment_unittest.cc \
Massive roll-up of changes. See CHANGES.txt.
15 years ago
google/protobuf/compiler/python/python_plugin_unittest.cc \
Add second run of cpp_unittest which verifies that descriptors are constructed lazily. This is accomplished by avoiding any use of descriptors while testing a bunch of other operations, then checking at the end that descriptors have not been constructed.
16 years ago
$(COMMON_TEST_SOURCES)
nodist_protobuf_test_SOURCES = $(protoc_outputs)
# Run cpp_unittest again with PROTOBUF_TEST_NO_DESCRIPTORS defined.
protobuf_lazy_descriptor_test_LDADD = $(PTHREAD_LIBS) libprotobuf.la \
down integrate to svn
11 years ago
libprotoc.la \
$(top_builddir)/gtest/lib/libgtest.la \
Add second run of cpp_unittest which verifies that descriptors are constructed lazily. This is accomplished by avoiding any use of descriptors while testing a bunch of other operations, then checking at the end that descriptors have not been constructed.
16 years ago
$(top_builddir)/gtest/lib/libgtest_main.la
protobuf_lazy_descriptor_test_CPPFLAGS = -I$(top_srcdir)/gtest/include \
-I$(top_builddir)/gtest/include \
-DPROTOBUF_TEST_NO_DESCRIPTORS
Decouple strutil from C++ lite library for a further 23k reduction.
16 years ago
protobuf_lazy_descriptor_test_CXXFLAGS = $(NO_OPT_CXXFLAGS)
Add second run of cpp_unittest which verifies that descriptors are constructed lazily. This is accomplished by avoiding any use of descriptors while testing a bunch of other operations, then checking at the end that descriptors have not been constructed.
16 years ago
protobuf_lazy_descriptor_test_SOURCES = \
google/protobuf/compiler/cpp/cpp_unittest.cc \
$(COMMON_TEST_SOURCES)
nodist_protobuf_lazy_descriptor_test_SOURCES = $(protoc_outputs)
Initial checkin.
17 years ago
Submit recent changes from internal branch, including "lite mode" for C++ and Java. See CHANGES.txt for more details.
16 years ago
# Build lite_unittest separately, since it doesn't use gtest.
Define libprotobuf-lite in Makefile.am. TODO: Compile conditionally? Provide a way to omit ExtensionSet? Should libprotobuf depend on libprotobuf-lite instead of being a stand-alone lib?
16 years ago
protobuf_lite_test_LDADD = $(PTHREAD_LIBS) libprotobuf-lite.la
Decouple strutil from C++ lite library for a further 23k reduction.
16 years ago
protobuf_lite_test_CXXFLAGS = $(NO_OPT_CXXFLAGS)
Submit recent changes from internal branch, including "lite mode" for C++ and Java. See CHANGES.txt for more details.
16 years ago
protobuf_lite_test_SOURCES = \
google/protobuf/lite_unittest.cc \
google/protobuf/test_util_lite.cc \
google/protobuf/test_util_lite.h
nodist_protobuf_lite_test_SOURCES = $(protoc_lite_outputs)
Massive roll-up of changes. See CHANGES.txt.
15 years ago
# Test plugin binary.
test_plugin_LDADD = $(PTHREAD_LIBS) libprotobuf.la libprotoc.la \
$(top_builddir)/gtest/lib/libgtest.la
Point test_plugin at the correct gtest headers.
15 years ago
test_plugin_CPPFLAGS = -I$(top_srcdir)/gtest/include \
-I$(top_builddir)/gtest/include
Massive roll-up of changes. See CHANGES.txt.
15 years ago
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
Commit Brian Olson's gzip stream implementations.
16 years ago
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
Improve zip/jar support: - Don't support par or war since par is not a standard format and outputting to war doesn't make sense. - Add boilerplate manifest when outputting to Jar. - Remove "XXX check conversion" comments because I don't care. - Add a test.
15 years ago
TESTS = protobuf-test protobuf-lazy-descriptor-test protobuf-lite-test \
google/protobuf/compiler/zip_output_unittest.sh $(GZTESTS)