aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAge
* Introduce a new nuget package, Google.Protobuf.Tools, basically to contain ↵Gravatar Jon Skeet2016-03-31
| | | | | | | | protoc on multiple platforms. I've moved both protoc.exe and the proto files out of Google.Protobuf. The .proto files aren't a slam-dunk, but it feels like they belong with protoc as you'd *use* them with protoc. It's not clear to me whether we really need both an x86 and x64 version of protoc.exe, as x86 would work on 64-bit Windows anyway. Discuss :)
* Merge pull request #1326 from the-alien/csharp_json_nameGravatar Jon Skeet2016-03-30
|\ | | | | csharp: add support for the json_name option
| * Merge branch 'master' of https://github.com/google/protobuf into ↵Gravatar alien2016-03-29
| |\ | |/ |/| | | csharp_json_name
| * Code review fixesGravatar alien2016-03-29
| |
* | Merge pull request #1358 from thomasvl/travis_tweaksGravatar Thomas Van Lenten2016-03-29
|\ \ | | | | | | Mark iOS tests as able to fail.
| * | Mark iOS tests as able to fail.Gravatar Thomas Van Lenten2016-03-29
|/ / | | | | | | | | Travis updated their images to include an xctool that can randomly kill tests, so mark them as flaky to avoid turning things red.
* | Merge pull request #1350 from thomasvl/over_releaseGravatar Thomas Van Lenten2016-03-24
|\ \ | | | | | | The message was autoreleased, the -releases are an over release.
| * | The message was autoreleased, the -releases are an over release.Gravatar Thomas Van Lenten2016-03-24
|/ /
* | Merge pull request #1345 from smparkes/smparkes/well-known-protosGravatar Feng Xiao2016-03-23
|\ \ | | | | | | export well known protos
| * | export well known protosGravatar Steven Parkes2016-03-22
|/ /
* | Merge pull request #1344 from topillar/patch-1Gravatar Feng Xiao2016-03-22
|\ \ | | | | | | Update coded_stream.h
| * | Update coded_stream.hGravatar topillar2016-03-22
|/ / | | | | fix warning treated as error prevents building on 64-bit windows.
* | Merge pull request #1335 from pradeepg26/masterGravatar Feng Xiao2016-03-21
|\ \ | | | | | | Allow custom URLs for Any in JsonFormat
* \ \ Merge pull request #1339 from thomasvl/delay_dispatch_semaphore_creationGravatar Thomas Van Lenten2016-03-21
|\ \ \ | | | | | | | | Only create the readonlySemaphore on demand.
| * | | Only create the readonlySemaphore on demand.Gravatar Thomas Van Lenten2016-03-21
|/ / / | | | | | | | | | | | | | | | This will lower the amount of dispatch_semaphores created per Message when the full object tree isn't walked in a way that would require them to be created. Uses a dispatch_once_t for one time init of the dispatch_semaphore.
| * / Allow custom URLs for Any in JsonFormatGravatar Pradeep Gollakota2016-03-18
|/ / | | | | | | | | | | - Using custom URL for types in Any will no longer throw an InvalidProtocolBufferException in JsonFormat - Fixes #1128
| * csharp: add support for the json_name optionGravatar alien2016-03-18
|/ | | | | Conflicts: csharp/src/Google.Protobuf/JsonFormatter.cs
* Merge pull request #1325 from thomasvl/shrink_overheadGravatar Thomas Van Lenten2016-03-17
|\ | | | | Shrink ObjC overhead (generated size and some runtime sizes)
| * Shrink ObjC overhead (generated size and some runtime sizes)Gravatar Thomas Van Lenten2016-03-17
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NOTE: This is a binary breaking change as structure sizes have changed size and/or order. - Drop capturing field options, no other options were captured and other mobile targeted languages don't try to capture this sort information (saved 8 bytes for every field defined (in static data and again in field descriptor instance size data). - No longer generate/compile in the messages/enums in descriptor.proto. If developers need it, they should generate it and compile it in. Reduced the overhead of the core library. - Compute the number of has_bits actually needs to avoid over reserving. - Let the boolean single fields store via a has_bit to avoid storage, makes the common cases of the instance size smaller. - Reorder some flags and down size the enums to contain the bits needed. - Reorder the items in the structures to manually ensure they are are packed better (especially when generating 64bit code - 8 bytes for every field, 16 bytes for every extension, instance sizes 8 bytes also). - Split off the structure initialization so when the default is zero, the generated static storage doesn't need to reserve the space. This is batched at the message level, so all the fields for the message have to have zero defaults to get the saves. By definition all proto3 syntax files fall into this case but it also saves space for the proto2 that use the standard defaults. (saves 8 bytes of static data for every field that had a zero default) - Don't track the enums defined by a message. Nothing in the runtime needs it and it was just generation and runtime overhead. (saves 8 bytes per enum) - Ensure EnumDescriptors are started up threadsafe in all cases. - Split some of the Descriptor initialization into multiple methods so the generated code isn't padded with lots of zero/nil args. - Change how oneof info is feed to the runtime enabling us to generate less static data (8 bytes saved per oneof for 64bit). - Change how enum value informat is capture to pack the data and only decode it if it ends up being needed. Avoids padding issues causing bloat of 64bit, and removes the needs for extra pointers in addition to the data (just the data and one pointer now).
* Merge pull request #1318 from smparkes/smparkes/grpcGravatar Feng Xiao2016-03-14
|\ | | | | add java/util support based on java/util/pom.xml
* \ Merge pull request #1291 from sergiocampama/develGravatar Thomas Van Lenten2016-03-14
|\ \ | | | | | | Adds more information to Objective C error.
* \ \ Merge pull request #1312 from petewarden/masterGravatar Jisi Liu2016-03-12
|\ \ \ | | | | | | | | Bazel iOS build settings
| | | * add java/util support based on java/util/pom.xmlGravatar Steven Parkes2016-03-11
| |_|/ |/| |
* | | Merge pull request #1278 from smparkes/masterGravatar Jisi Liu2016-03-11
|\ \ \ | | | | | | | | pass correct args to protoc for wellknown protos when used as an external repository
* \ \ \ Merge pull request #1317 from benvanik/patch-1Gravatar Feng Xiao2016-03-11
|\ \ \ \ | | | | | | | | | | Fixing compilation error when building with emscripten.
| * | | | Fixing compilation error when building with emscripten.Gravatar Ben Vanik2016-03-11
|/ / / / | | | | | | | | This change was previously done in //third_party in CL 108656107 but never made it to the open source project and was overwritten in an update.
| * / / pass correct args to protoc for java wellknown protos when used as an ↵Gravatar Steven Parkes2016-03-10
|/ / / | | | | | | | | | external repository
| * | Merge remote-tracking branch 'upstream/master'Gravatar Pete Warden2016-03-09
| |\ \ | |/ / |/| |
| * | Added iOS settings to Bazel buildGravatar Pete Warden2016-03-09
| | |
* | | Merge pull request #1299 from tatraian/masterGravatar Feng Xiao2016-03-08
|\ \ \ | | | | | | | | Fix compiling clang/libc++ builds. (Issue: #1266)
| * | | Comment has been added to fix (issue #1266)Gravatar Antal Tátrai2016-03-08
| | | |
* | | | Merge pull request #1309 from thomasvl/leading_special_prop_namesGravatar Thomas Van Lenten2016-03-08
|\ \ \ \ | | | | | | | | | | Fix up handing of fields with leading names that should be all caps.
| * | | | Fix up handing of fields with leading names that should be all caps.Gravatar Thomas Van Lenten2016-03-08
|/ / / / | | | | | | | | | | | | Add a compile test to confirm things are working as expected.
* | | | Merge pull request #1306 from silviulica/masterGravatar Joshua Haberman2016-03-07
|\ \ \ \ | | | | | | | | | | Update version to 3.0.0b2.post2
| * | | | Update version to 3.0.0b2.post2Gravatar Silviu Calinoiu2016-03-07
| | | | |
* | | | | Merge pull request #1304 from thomasvl/headerdocsGravatar Thomas Van Lenten2016-03-07
|\ \ \ \ \ | | | | | | | | | | | | HeaderDoc support in the library and generated sources
| * | | | | HeaderDoc support in the library and generated sourcesGravatar Thomas Van Lenten2016-03-07
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Convert most of the core library headers over to HeaderDoc format. - Switch the generated comments over to HeaderDoc. - Create GPBCodedOutputStream_PackagePrivate and move some things into there that should be more internal.
* | | | | Merge pull request #1301 from avgweb/masterGravatar Jon Skeet2016-03-07
|\ \ \ \ \ | | | | | | | | | | | | Replace StringBuilder with TextWriter in JsonFormatter
| * | | | | Replace StringBuilder with TextWriter in JsonFormatterGravatar avgweb2016-03-06
|/ / / / /
* | | | | Merge pull request #1298 from craigcitro/fix_setupGravatar Joshua Haberman2016-03-05
|\ \ \ \ \ | | | | | | | | | | | | Add back the namespace_packages arg in setup.py.
| | | * | | Fix compiling clang/libc++ builds. (Issue: #1266)Gravatar Antal Tátrai2016-03-05
| |_|/ / / |/| | | |
| * | | | Add back the namespace_packages arg in setup.py.Gravatar Craig Citro2016-03-05
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improves #1296. The problem: in the previous patch, we tweaked the __init__.py files to use namespaces, but no longer declared ourselves as a namespace package. The second half was unwise. Note that this only comes up when installing protobuf alongside another package that also installs into the google namespace; as of right now, the only PyPI package that does is googleapis-common-protos, though the GAE SDK also uses google.appengine. Installing either or both of those alongside this package now works. The case that still remains is the upgrade path, which is also what worried me in #713. It seems that if protobuf 2.6.1 is installed, there's no way to safely upgrade that to work with a newer protobuf. However, `pip uninstall` && `pip install` does the trick.
* | | | Merge pull request #1139 from haberman/rubyjsoncamelGravatar Joshua Haberman2016-03-04
|\ \ \ \ | | | | | | | | | | Changed Ruby to properly camelCase its JSON by default.
* \ \ \ \ Merge pull request #1292 from haberman/ruby-allow-descriptorGravatar Joshua Haberman2016-03-04
|\ \ \ \ \ | | | | | | | | | | | | Generate well-known types in Ruby extension and prune unneeded proto2 dependencies.
| * | | | | Removed the generated Ruby file from Makefile.am.Gravatar Josh Haberman2016-03-03
| | | | | |
| * | | | | Generate well-known types in Ruby extension and prune unneeded proto2 ↵Gravatar Josh Haberman2016-03-03
|/ / / / / | | | | | | | | | | | | | | | dependencies.
| | | | * Adds more information to Objective C error when the expected ↵Gravatar Sergio Campama2016-03-03
| |_|_|/ |/| | | | | | | | | | | objc_class_prefix option is missing.
* | | | Merge pull request #1260 from legrosbuffle/masterGravatar Paul Yang2016-03-02
|\ \ \ \ | | | | | | | | | | Make cpp generated enum constants constexpr when Options::proto_h is specified
* \ \ \ \ Merge pull request #1287 from jskeet/fix-typoGravatar Jon Skeet2016-03-01
|\ \ \ \ \ | | | | | | | | | | | | Fix copy/paste typo in CodedInputStreamTest
| * | | | | Fix copy/paste typo in CodedInputStreamTestGravatar Jon Skeet2016-03-01
|/ / / / /