Commit Graph

4569 Commits

Author SHA1 Message Date
Thomas Van Lenten
ddb438855a Raise the recursion limit to 100 to match other languages. 2017-03-28 09:10:20 -04:00
Joshua Haberman
d9e0119f2c Merge pull request #2858 from haberman/gopackage
Changed go_package for plugin.proto.
2017-03-27 12:04:08 -07:00
Joshua Haberman
c565e25c7d Merge pull request #1662 from haberman/jsconformance
Conformance tests for JavaScript (Node.js). 15 tests are failing.
2017-03-27 12:03:09 -07:00
Jie Luo
7610f101e8 Merge pull request #2884 from anandolee/master
Add FormatEnumsAsIntegers support for Json Format. Scale JsonFormatter.Settings for multi options.
2017-03-27 11:05:38 -07:00
Jie Luo
689e4bf5f4 Add FormatEnumAsInt support for Json Format. And scale JsonFormatter.Settings to multiple options. 2017-03-24 12:05:52 -07:00
Feng Xiao
373809e5f5 Merge pull request #2897 from cgrushko/patch-5
Compile the Java proto runtime with Java 6
2017-03-22 13:35:52 -07:00
cgrushko
6f21e29268 Compile the Java proto runtime with Java 6
in order to avoid errors related to generics when 
building user code in newer versions of Java.
2017-03-22 14:27:51 -04:00
Paul Yang
1387a6795c Update commit number in Docker to update composer dependency (#2869) 2017-03-21 10:18:49 -07:00
Adam Cozzette
ffa932bf10 Merge pull request #2861 from byronyi/#710
migrate delimited messages functions to util package
2017-03-20 13:02:40 -07:00
Bairen Yi
312e2dbcfb Update BUILD 2017-03-21 03:52:37 +08:00
Feng Xiao
db3ef48ede Merge pull request #2860 from prehistoric-penguin/master
Remove duplicated copyright statement
2017-03-20 10:49:48 -07:00
Adam Cozzette
20181f6a1a Merge pull request #2854 from hesmar/attributesFix
fix attributes warning
2017-03-20 09:51:31 -07:00
Adam Cozzette
4d273f28dc Merge pull request #2870 from acozzette/memcpy-memmove
Ruby: only link against specific version of memcpy if we're using glibc
2017-03-20 08:26:06 -07:00
Feng Xiao
15b60bccf8 Merge pull request #2867 from mojoBrendan/master
Add preserve_proto_field_names option to JsonPrintOptions
2017-03-17 15:05:58 -07:00
Adam Cozzette
ea5ef14aa0 Ruby: only link against specific version of memcpy if we're using glibc
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.
2017-03-17 11:23:01 -07:00
Jie Luo
c12cc3490b Merge pull request #2837 from anandolee/master
DefaultValueObjectWriter should populate oneof message field
2017-03-17 11:10:24 -07:00
Paul Yang
6b27c1f981 Add file option php_class_prefix (#2849)
This option will be prepended to generated classes of all messages in
the containing file.
2017-03-17 11:08:06 -07:00
Feng Xiao
c0871aa49c Merge pull request #2848 from xfxyjwf/freebsd
Fix freebsd build.
2017-03-17 10:42:20 -07:00
Bairen Yi
e8e6aa2864 Update delimited_message_util_test.cc 2017-03-18 00:32:43 +08:00
Brendan McCarthy
89eb4e51b2 Add option to preserve original proto field names 2017-03-17 22:47:38 +10:00
Brendan McCarthy
1eee3202fc Add use_snake_case_for_field_names option to JsonPrintOptions 2017-03-17 18:46:18 +10:00
Byron Yi
c415a1445b fix several issues 2017-03-17 10:00:59 +08:00
Feng Xiao
44dc55587e Merge pull request #2866 from xfxyjwf/nano
Add a notice for nano.
2017-03-16 16:47:10 -07:00
Feng Xiao
ddc00963c0 Add a notice for nano.
We no longer supports nano and recommend protobuf lite over nano for
Android users.
2017-03-16 16:09:41 -07:00
Josh Haberman
1b0db1cb83 Removed obsolete comments and added docs. 2017-03-16 15:19:09 -07:00
Josh Haberman
0df20284d0 Properly regenerated descriptor.proto. 2017-03-16 15:07:22 -07:00
Joshua Haberman
89c3c456d2 Merge pull request #2859 from haberman/junit-dep-scope
Changed scope of Java deps to "test".
2017-03-16 12:25:42 -07:00
Joshua Haberman
2957703a01 Merge pull request #2847 from haberman/ruby-toh
Ruby: fixed Message#to_h for map fields.
2017-03-16 09:28:09 -07:00
Adam Cozzette
0fad0e138f Merge pull request #2794 from acozzette/jspb-extensions
JS: ensure that extension values are serialized even if they're falsy
2017-03-16 09:23:32 -07:00
Byron Yi
acaa9407e3 add delimited_message_util.cc to libprotobuf.cmake 2017-03-16 20:52:58 +08:00
Byron Yi
7008a88e2b add LIBPROTOBUF_EXPORT to make msvc happy 2017-03-16 20:35:35 +08:00
Byron Yi
cb3e84b78e migrate delimited messages functions to util package 2017-03-16 20:01:22 +08:00
prehistoric-penguin
33cc25f36c Remove duplicated copyright statement 2017-03-16 11:23:07 +08:00
Josh Haberman
496cd481fa Changed scope of Java deps to "test".
This is per: https://github.com/google/protobuf/issues/2019
2017-03-15 18:27:05 -07:00
Josh Haberman
e62e30c309 Changed go_package for plugin.proto.
For more info see: https://github.com/google/protobuf/issues/1289
2017-03-15 17:48:46 -07:00
Joshua Haberman
4842363ee6 Merge pull request #2023 from odeke-em/fix-print-help-to-stdout
compiler/cli: PrintHelpText prints to stdout instead of stderr
2017-03-15 14:45:03 -07:00
Adam Cozzette
e77a09e1e9 Incremented Ruby version number to 3.2.0.1 2017-03-15 14:16:49 -07:00
Josh Haberman
8c40b5149a Ruby: update Gemspec. 2017-03-15 14:16:49 -07:00
Konstantin Podsvirov
97cbc42621 Fix libprotoc.cmake to generate well_known_types_embed.cc
Unfortunate typo. Just one extra ',' symbol, has led to the hidden implicit behavior.

Now everything will be fine.
2017-03-15 14:16:49 -07:00
Paul Yang
f23869c615 Bug fix: When encoding, negative int32 values should be padded to int64 (#2660)
in order to be wire compatible.
2017-03-15 14:16:49 -07:00
Josh Haberman
014a5507fb Ruby: build packages for Ruby 2.4. 2017-03-15 14:16:49 -07:00
Adam Cozzette
c57c77b4b7 Merge pull request #2829 from afrantzis/hide-unnecessary-library-symbols
Hide unnecessary exported library symbols
2017-03-15 11:41:14 -07:00
Josh Haberman
324a299a55 Made formatting more consistent. 2017-03-15 10:35:15 -07:00
Adam Cozzette
ed0ef54045 Merge pull request #2846 from acozzette/bytestream-comment
Updated an outdated comment in bytestream.h
2017-03-15 09:13:44 -07:00
Thomas Van Lenten
d18df81488 Merge pull request #2855 from thomasvl/copy_note
Document deep copy in the header
2017-03-15 11:07:05 -04:00
Thomas Van Lenten
5e4f14fae4 Document deep copy in the header 2017-03-15 10:50:31 -04:00
Markus Heß
b4b855cde4 fix attributes warning 2017-03-15 15:20:54 +01:00
Feng Xiao
416f90939d Fix freebsd build.
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.
2017-03-14 23:41:54 +00:00
Josh Haberman
9c6b8cb9bf Ruby: fixed Message#to_h for map fields. 2017-03-14 14:27:16 -07:00
Josh Haberman
95b4427d39 Build system fixes for JS conformance tests. 2017-03-14 12:45:57 -07:00