aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Raise the recursion limit to 100 to match other languages.Thomas Van Lenten2017-03-282-10/+23
|
* Merge pull request #2858 from haberman/gopackageJoshua Haberman2017-03-272-4/+5
|\ | | | | Changed go_package for plugin.proto.
| * Properly regenerated descriptor.proto.Josh Haberman2017-03-161-3/+4
| |
| * Changed go_package for plugin.proto.Josh Haberman2017-03-151-1/+1
| | | | | | | | For more info see: https://github.com/google/protobuf/issues/1289
* | Merge pull request #1662 from haberman/jsconformanceJoshua Haberman2017-03-277-9/+237
|\ \ | | | | | | Conformance tests for JavaScript (Node.js). 15 tests are failing.
| * | Removed obsolete comments and added docs.Josh Haberman2017-03-162-5/+30
| | |
| * | Build system fixes for JS conformance tests.Josh Haberman2017-03-141-3/+5
| | |
| * | Conformance test for JS now work, though 15 tests fail.Josh Haberman2017-03-133-27/+49
| | |
| * | Added JavaScript conformance tests. All tests pass!Josh Haberman2017-03-065-1/+180
| | |
| * | WIP.Josh Haberman2017-03-061-4/+4
| | |
* | | Merge pull request #2884 from anandolee/masterJie Luo2017-03-273-19/+78
|\ \ \ | | | | | | | | Add FormatEnumsAsIntegers support for Json Format. Scale JsonFormatter.Settings for multi options.
| * | | Add FormatEnumAsInt support for Json Format. And scale ↵Jie Luo2017-03-243-19/+78
| | | | | | | | | | | | | | | | JsonFormatter.Settings to multiple options.
* | | | Merge pull request #2897 from cgrushko/patch-5Feng Xiao2017-03-221-0/+1
|\ \ \ \ | | | | | | | | | | Compile the Java proto runtime with Java 6
| * | | | Compile the Java proto runtime with Java 6cgrushko2017-03-221-0/+1
|/ / / / | | | | | | | | | | | | in order to avoid errors related to generics when building user code in newer versions of Java.
* | | | Update commit number in Docker to update composer dependency (#2869)Paul Yang2017-03-215-6/+8
| | | |
* | | | Merge pull request #2861 from byronyi/#710Adam Cozzette2017-03-207-0/+209
|\ \ \ \ | | | | | | | | | | migrate delimited messages functions to util package
| * | | | Update BUILDBairen Yi2017-03-211-0/+1
| | | | |
| * | | | Update delimited_message_util_test.ccBairen Yi2017-03-181-1/+1
| | | | |
| * | | | fix several issuesByron Yi2017-03-173-15/+15
| | | | |
| * | | | add delimited_message_util.cc to libprotobuf.cmakeByron Yi2017-03-161-0/+1
| | | | |
| * | | | add LIBPROTOBUF_EXPORT to make msvc happyByron Yi2017-03-161-6/+6
| | | | |
| * | | | migrate delimited messages functions to util packageByron Yi2017-03-166-0/+207
| | |_|/ | |/| |
* | | | Merge pull request #2860 from prehistoric-penguin/masterFeng Xiao2017-03-203-90/+0
|\ \ \ \ | | | | | | | | | | Remove duplicated copyright statement
| * | | | Remove duplicated copyright statementprehistoric-penguin2017-03-163-90/+0
| |/ / /
* | | | Merge pull request #2854 from hesmar/attributesFixAdam Cozzette2017-03-203-31/+31
|\ \ \ \ | | | | | | | | | | fix attributes warning
| * | | | fix attributes warningMarkus Heß2017-03-153-31/+31
| | | | |
* | | | | Merge pull request #2870 from acozzette/memcpy-memmoveAdam Cozzette2017-03-201-5/+5
|\ \ \ \ \ | | | | | | | | | | | | Ruby: only link against specific version of memcpy if we're using glibc
| * | | | | Ruby: only link against specific version of memcpy if we're using glibcAdam Cozzette2017-03-171-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We have some special code in wrap_memcpy.c to ensure that we use the 2.2.5 version of memcpy, for compatibility with older versions of glibc. However, we need to make sure we only attempt to do this when we are actually building with glibc, so that the code can also build successfully against other libc implementations such as musl.
* | | | | | Merge pull request #2867 from mojoBrendan/masterFeng Xiao2017-03-177-9/+86
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add preserve_proto_field_names option to JsonPrintOptions
| * | | | | | Add option to preserve original proto field namesBrendan McCarthy2017-03-179-28/+87
| | | | | | |
| * | | | | | Add use_snake_case_for_field_names option to JsonPrintOptionsBrendan McCarthy2017-03-174-3/+21
| |/ / / / /
* | | | | | Merge pull request #2837 from anandolee/masterJie Luo2017-03-172-2/+19
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | DefaultValueObjectWriter should populate oneof message field
| * | | | | DefaultValueObjectWriter should populate oneof message fieldJie Luo2017-03-102-2/+19
| | | | | |
* | | | | | Add file option php_class_prefix (#2849)Paul Yang2017-03-1745-665/+943
| | | | | | | | | | | | | | | | | | | | | | | | This option will be prepended to generated classes of all messages in the containing file.
* | | | | | Merge pull request #2848 from xfxyjwf/freebsdFeng Xiao2017-03-174-0/+63
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Fix freebsd build.
| * | | | | Fix freebsd build.Feng Xiao2017-03-144-0/+63
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It turns out system headers included by generated plugin.pb.h file already contains major/minor macro definitions when built on FreeBSD and we need to add #undefs to the generated header file. This change also fixes another compile error regarding EXPECT_DEATH on FreeBSD.
* | | | | Merge pull request #2866 from xfxyjwf/nanoFeng Xiao2017-03-161-0/+3
|\ \ \ \ \ | | | | | | | | | | | | Add a notice for nano.
| * | | | | Add a notice for nano.Feng Xiao2017-03-161-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We no longer supports nano and recommend protobuf lite over nano for Android users.
* | | | | | Merge pull request #2859 from haberman/junit-dep-scopeJoshua Haberman2017-03-161-0/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | Changed scope of Java deps to "test".
| * | | | | | Changed scope of Java deps to "test".Josh Haberman2017-03-151-0/+3
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | This is per: https://github.com/google/protobuf/issues/2019
* | | | | | Merge pull request #2847 from haberman/ruby-tohJoshua Haberman2017-03-164-2/+55
|\ \ \ \ \ \ | | | | | | | | | | | | | | Ruby: fixed Message#to_h for map fields.
| * | | | | | Made formatting more consistent.Josh Haberman2017-03-151-2/+2
| | | | | | |
| * | | | | | Ruby: fixed Message#to_h for map fields.Josh Haberman2017-03-144-2/+55
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #2794 from acozzette/jspb-extensionsAdam Cozzette2017-03-163-7/+6
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | JS: ensure that extension values are serialized even if they're falsy
| * | | | | JS: ensure that extension values are serialized even if they're falsyAdam Cozzette2017-03-063-7/+6
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There was a bug where for JavaScript we would only serialize an extension value if it evaluated as truthy, which meant that values like 0 would get silently dropped (even in proto2, where field presence is significant). This fixes issue #2605, and takes care of the output of toObject() in addition to the binary format.
* | | | | Merge pull request #2023 from odeke-em/fix-print-help-to-stdoutJoshua Haberman2017-03-152-8/+18
|\ \ \ \ \ | |_|_|/ / |/| | | | compiler/cli: PrintHelpText prints to stdout instead of stderr
| * | | | compiler/cli: PrintHelpText prints to stdout instead of stderrEmmanuel Odeke2017-03-082-8/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #698. PrintHelpText now prints to standard output instead of to standard error. The purpose of this CL is to make it easy for users to grep for matches otherwise stderr output has to be awkwardly redirectly to stdout using this shell trick `2>&1`, for example ```shell protoc --help 2>&1 | grep cpp ``` of which we shouldn't be making users have to work that hard just to get use of --help. + Exhibits: * Before: ```shell $ protoc --help | grep cpp Usage: protoc [OPTION] PROTO_FILES Parse PROTO_FILES and generate output based on the options given: -IPATH, --proto_path=PATH Specify the directory in which to search for imports. May be specified multiple times; directories will be searched in order. If not given, the current working directory is used. --version Show version info and exit. -h, --help Show this text and exit. --encode=MESSAGE_TYPE Read a text-format message of the given type from standard input and write it in binary to standard output. The message type must be defined in PROTO_FILES or their imports. --decode=MESSAGE_TYPE Read a binary message of the given type from standard input and write it in text format to standard output. The message type must be defined in PROTO_FILES or their imports. --decode_raw Read an arbitrary protocol message from standard input and write the raw tag/value pairs in text format to standard output. No PROTO_FILES should be given when using this flag. -oFILE, Writes a FileDescriptorSet (a protocol buffer, --descriptor_set_out=FILE defined in descriptor.proto) containing all of the input files to FILE. --include_imports When using --descriptor_set_out, also include all dependencies of the input files in the set, so that the set is self-contained. --include_source_info When using --descriptor_set_out, do not strip SourceCodeInfo from the FileDescriptorProto. This results in vastly larger descriptors that include information about the original location of each decl in the source file as well as surrounding comments. --dependency_out=FILE Write a dependency output file in the format expected by make. This writes the transitive set of input file paths to FILE --error_format=FORMAT Set the format in which to print errors. FORMAT may be 'gcc' (the default) or 'msvs' (Microsoft Visual Studio format). --print_free_field_numbers Print the free field numbers of the messages defined in the given proto files. Groups share the same field number space with the parent message. Extension ranges are counted as occupied fields numbers. --plugin=EXECUTABLE Specifies a plugin executable to use. Normally, protoc searches the PATH for plugins, but you may specify additional executables not in the path using this flag. Additionally, EXECUTABLE may be of the form NAME=PATH, in which case the given plugin name is mapped to the given executable even if the executable's own name differs. --cpp_out=OUT_DIR Generate C++ header and source. --csharp_out=OUT_DIR Generate C# source file. --java_out=OUT_DIR Generate Java source file. --javanano_out=OUT_DIR Generate Java Nano source file. --js_out=OUT_DIR Generate JavaScript source. --objc_out=OUT_DIR Generate Objective C header and source. --python_out=OUT_DIR Generate Python source file. --ruby_out=OUT_DIR Generate Ruby source file. ``` * After: ```shell $ protoc --help | grep cpp --plugin=EXECUTABLE Specifies a plugin executable to use. Normally, protoc searches the PATH for plugins, but you may specify additional executables not in the path using this flag. Additionally, EXECUTABLE may be of the form NAME=PATH, in which case the given plugin name is mapped to the given executable even if the executable's own name differs. --cpp_out=OUT_DIR Generate C++ header and source. --csharp_out=OUT_DIR Generate C# source file. --java_out=OUT_DIR Generate Java source file. --javanano_out=OUT_DIR Generate Java Nano source file. --js_out=OUT_DIR Generate JavaScript source. --objc_out=OUT_DIR Generate Objective C header and source. --python_out=OUT_DIR Generate Python source file. --ruby_out=OUT_DIR Generate Ruby source file. ```
* | | | | Incremented Ruby version number to 3.2.0.1Adam Cozzette2017-03-151-1/+1
| | | | |
* | | | | Ruby: update Gemspec.Josh Haberman2017-03-151-3/+3
| | | | |
* | | | | Fix libprotoc.cmake to generate well_known_types_embed.ccKonstantin Podsvirov2017-03-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unfortunate typo. Just one extra ',' symbol, has led to the hidden implicit behavior. Now everything will be fine.