aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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 #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.
* | Bug fix: When encoding, negative int32 values should be padded to int64 (#2660)Paul Yang2017-03-158-23/+49
| | | | | | in order to be wire compatible.
* | Ruby: build packages for Ruby 2.4.Josh Haberman2017-03-151-2/+2
| |
* | Merge pull request #2829 from afrantzis/hide-unnecessary-library-symbolsAdam Cozzette2017-03-155-0/+61
|\ \ | | | | | | Hide unnecessary exported library symbols
| * | Hide unnecessary exported library symbolsAlexandros Frantzis2017-03-135-0/+61
| | |
* | | Merge pull request #2846 from acozzette/bytestream-commentAdam Cozzette2017-03-151-1/+1
|\ \ \ | | | | | | | | Updated an outdated comment in bytestream.h
| * | | Updated an outdated comment in bytestream.hAdam Cozzette2017-03-141-1/+1
| | | |
* | | | Merge pull request #2855 from thomasvl/copy_noteThomas Van Lenten2017-03-151-0/+5
|\ \ \ \ | | | | | | | | | | Document deep copy in the header
| * | | | Document deep copy in the headerThomas Van Lenten2017-03-151-0/+5
|/ / / /
* | | | Merge pull request #2843 from haberman/checkJoshua Haberman2017-03-141-3/+4
|\ \ \ \ | |/ / / |/| | | Replace CHECK() with GOOGLE_CHECK().
| * | | Replace CHECK() with GOOGLE_CHECK().Josh Haberman2017-03-131-3/+4
|/ / / | | | | | | | | | Fixes: https://github.com/google/protobuf/issues/1175
* | | Merge pull request #2836 from xfxyjwf/i894Feng Xiao2017-03-132-123/+117
|\ \ \ | | | | | | | | Double-quote file paths in extract_includes.bat.in
| * | | Double-quote file paths in extract_includes.bat.inFeng Xiao2017-03-102-123/+117
| | | | | | | | | | | | | | | | | | | | This allows the file path to contain spaces which is very common on windows.
* | | | Merge pull request #2835 from pherl/javaepJisi Liu2017-03-131-0/+1
|\ \ \ \ | |_|/ / |/| | | Suppress the last unchecked warning.
| * | | Suppress the last unchecked warning.Jisi Liu2017-03-101-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Likely to be java language issue. Varargs are considered arrays, thus using generic with varargs will cause unchecked warning about generic array creation.
* | | | Merge pull request #2822 from anandolee/masterJie Luo2017-03-101-18/+73
|\ \ \ \ | | | | | | | | | | Detect generated code of WKT, addressbook and conformance protos
| * | | | Add auto detect for generated code of WKT protos, addressbook.proto and ↵Jie Luo2017-03-101-18/+73
| | | | | | | | | | | | | | | | | | | | conformance.proto
* | | | | Merge pull request #2832 from pherl/javaepJisi Liu2017-03-102-1/+4
|\ \ \ \ \ | | |/ / / | |/| / / | |_|/ / |/| | | Fix java code according to error prone.
| * | | Fix java code according to error prone.Jisi Liu2017-03-102-1/+4
| | | |
* | | | Merge pull request #2818 from xfxyjwf/i1470Feng Xiao2017-03-102-3/+52
|\ \ \ \ | | | | | | | | | | Don't expose gson exceptions in JsonFormat.
| * | | | Don't expose gson exceptions in JsonFormat.Feng Xiao2017-03-092-3/+52
| | | | |
* | | | | Merge pull request #2824 from xfxyjwf/i1415Feng Xiao2017-03-103-10/+45
|\ \ \ \ \ | | | | | | | | | | | | Use per-type table to lookup JSON name.
| * | | | | Use per-type table to lookup JSON name.Feng Xiao2017-03-093-10/+45
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Different fields from different messages can map to the same JSON name and the original global lookup table is only capable of mapping one of such fields. This change converts the global table to per-type tables so fields from different messages won't conflict.
* | | | | Merge pull request #2826 from xfxyjwf/i1374Feng Xiao2017-03-101-0/+1
|\ \ \ \ \ | | | | | | | | | | | | Add missing thread dependency in cmake.
| * | | | | Add missing thread dependency in cmake.Feng Xiao2017-03-091-0/+1
| |/ / / /
* | | | | Merge pull request #2827 from xfxyjwf/i1251Feng Xiao2017-03-101-3/+3
|\ \ \ \ \ | | | | | | | | | | | | Update comments for setSizeLimit.
| * | | | | Update comments for setSizeLimit.Feng Xiao2017-03-091-3/+3
| |/ / / /
* | | / / Repeated/Map field setter should accept a regular PHP array (#2817)Paul Yang2017-03-109-41/+355
| |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Accept regular PHP array for repeated/map setter. Existing map/repeated field will be swapped by a clean map/repeated field. Then, elements in the array will be added to the map/repeated field. All elements will be type checked before adding. See #2686 for detail.
* | | | Merge pull request #2825 from pherl/javawarningJisi Liu2017-03-097-0/+15
|\ \ \ \ | | | | | | | | | | Cherry-pick changes from javalite branch to also fix Java warnings in the master branch
| * | | | Fix GeneratedMessageV3 warnings.Jisi Liu2017-03-091-0/+4
| | | | |
| * | | | Fix lint warnings in the javalite branch.Jisi Liu2017-03-096-0/+11
| |/ / /
* | | | Merge pull request #2809 from xfxyjwf/i2464Feng Xiao2017-03-092-4/+11
|\ \ \ \ | |/ / / |/| | | Make JsonFormat locale independent.
| * | | Make JsonFormat locale independent.Feng Xiao2017-03-082-4/+11
| | | |
* | | | Merge pull request #2819 from haberman/pythonexceptJoshua Haberman2017-03-091-1/+1
|\ \ \ \ | | | | | | | | | | update_failure_list.py: fixed Python "raise" statement.
| * | | | update_failure_list.py: fixed Python "raise" statement.Josh Haberman2017-03-091-1/+1
| | |_|/ | |/| |
* | | | Merge pull request #2804 from acozzette/ruby-memcpyAdam Cozzette2017-03-093-1/+60
|\ \ \ \ | |_|_|/ |/| | | Ruby: wrap calls to memcpy so that gem is compatible with pre-2.14 glibc
| * | | Ruby: wrap calls to memcpy so that gem is compatible with pre-2.14 glibcAdam Cozzette2017-03-093-1/+60
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit adds a __wrap_memcpy function and a linker flag to use that in place of memcpy for our Ruby gem C extension. This allows us to always use the 2.2.5 version of memcpy, making it possible to use the gem on distributions with pre-2.14 versions of glibc. Before this change: $ objdump -T protobuf_c.so | grep memcpy 0000000000000000 DF *UND* 0000000000000000 GLIBC_2.3.4 __memcpy_chk 0000000000000000 DF *UND* 0000000000000000 GLIBC_2.14 memcpy After: $ objdump -T protobuf_c.so | grep memcpy 0000000000000000 DF *UND* 0000000000000000 GLIBC_2.2.5 memcpy 0000000000000000 DF *UND* 0000000000000000 GLIBC_2.3.4 __memcpy_chk 0000000000042450 g DF .text 0000000000000005 Base __wrap_memcpy This is based on gRPC's solution to a similar problem: https://github.com/grpc/grpc/blob/5098508d2d41a116113f7e333c516cd9ef34a943/src/core/lib/support/wrap_memcpy.c This fixes issue #2783.
* | | Merge pull request #2810 from xfxyjwf/i1994Feng Xiao2017-03-091-4/+22
|\ \ \ | | | | | | | | Avoid redundant type casts for oneof bytes fields.
| * | | Avoid redundant type casts for oneof bytes fields.Feng Xiao2017-03-081-4/+22
| | |/ | |/|
* | | Merge pull request #2775 from xfxyjwf/fixmajorFeng Xiao2017-03-092-1/+14
|\ \ \ | | | | | | | | Undef major/minor if they are defined as macro.
| * | | Undef major/minor if they are defined as macro.Feng Xiao2017-02-282-1/+14
| | | |
* | | | Merge pull request #2814 from pherl/javadeprecateJisi Liu2017-03-093-10/+28
|\ \ \ \ | |_|/ / |/| | | Add annotations for deprecated messages in Java
| * | | Add annotations for deprecated messages in JavaJisi Liu2017-03-093-10/+28
| | | |
* | | | Merge pull request #2602 from GreatFruitOmsk/issue-2428Feng Xiao2017-03-081-1/+4
|\ \ \ \ | | | | | | | | | | Method Builder#clone() has been changed to bypass Java 1.6 compiler issue.
| * | | | Update AbstractMessage.javagoorov2017-01-131-1/+1
| | | | | | | | | | | | | | | Apply review's comments.
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-13 22:29:49 +0000