aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAge
...
* | | | Merge pull request #977 from lberki/masterGravatar Jisi Liu2015-11-19
|\ \ \ \ | | | | | | | | | | add headers
| | | * | Removed redundant comment.Gravatar Gabriel Kliot2015-11-19
| | | | |
| | * | | Rename "umbrella" to "reflection" consistently.Gravatar Jon Skeet2015-11-19
| |/ / / |/| | | | | | | | | | | This changes csharp_names.h, which will require a corresponding change in GRPC.
* | | | Merge pull request #974 from jskeet/parserGravatar Jon Skeet2015-11-19
|\ \ \ \ | | | | | | | | | | Parser property in MessageDescriptor
| * | | | Finished an implementation commentGravatar Jon Skeet2015-11-19
| | | | |
| * | | | Generated code from previous commit.Gravatar Jon Skeet2015-11-19
| | | | |
| * | | | Introduce a Parser property into MessageDescriptor, and populate it from ↵Gravatar Jon Skeet2015-11-19
|/ / / / | | | | | | | | | | | | | | | | | | | | generated types. Generated code coming in next commit - in a subsequent PR I want to do a bit of renaming and redocumenting around this, in anticipation of DynamicMessage.
* | | | Merge pull request #944 from jskeet/umbrella-classnameGravatar Jon Skeet2015-11-19
|\ \ \ \ | | | | | | | | | | Change the way the "umbrella class" (descriptors) is named/namespaced
| | | * | Fixed a bug in CSharp SampleUsage.Gravatar Gabriel Kliot2015-11-18
| |_|/ / |/| | |
| | | * Add support for the conformance test for objc when run on OS XGravatar Thomas Van Lenten2015-11-18
| |_|/ |/| |
* | | Merge pull request #984 from thomasvl/prefix_validation_tweaksGravatar Thomas Van Lenten2015-11-18
|\ \ \ | | | | | | | | Reorder the checks so anything in the expected file is an implicit whitelisting
| * | | Reorder the checks so anything in the expected file is an implicit whitelisting.Gravatar Thomas Van Lenten2015-11-17
| | | | | | | | | | | | | | | | | | | | | | | | In the old flow, any 2 char prefix in the expected file was still generating a warning about being a poor prefix. Now we check the expected file first, so anything expected is let through.
* | | | Merge pull request #982 from pherl/bazel_testGravatar Jisi Liu2015-11-17
|\ \ \ \ | |/ / / |/| | | Make the cc wkt proto target public.
| * | | Make the cc wkt proto target public.Gravatar Jisi Liu2015-11-17
| | | |
* | | | Merge pull request #978 from thomasvl/conformance_tweaksGravatar Joshua Haberman2015-11-17
|\ \ \ \ | | | | | | | | | | Cleanups of deps and ignores for conformance
| * | | | Cleanups of deps and ignores for conformanceGravatar Thomas Van Lenten2015-11-16
|/ / / / | | | | | | | | | | | | | | | | | | | | - Hopefully complete the deps for other languages for the generated conformance proto sources. - List the generated sources for cleanup by make's clean rules. - Make the toplevel nuke the pyc files that can get created in the ObjC dir.
| | | * add headersGravatar Lukacs T. Berki2015-11-16
| |_|/ |/| |
* | | Merge pull request #960 from thomasvl/xctool_supportGravatar Thomas Van Lenten2015-11-09
|\ \ \ | | | | | | | | Switch ObjC Travis testing to using xctool
| * | | Switch ObjC Travis testing to using xctoolGravatar Thomas Van Lenten2015-11-09
|/ / / | | | | | | | | | | | | | | | | | | | | | xctool is preinstalled on the Travis OS X images and it seems to do better with iOS simulator flake, so use it instead of xcodebuild. xctool also is less chatty compared to xcodebuild, so it makes the logs a little easier to read.
* | | Merge pull request #959 from thomasvl/travis_mac2Gravatar Thomas Van Lenten2015-11-09
|\ \ \ | | | | | | | | Add ObjC build to travis setup
| * | | Add ObjC build to travis setupGravatar Thomas Van Lenten2015-11-09
|/ / / | | | | | | | | | | | | - Add objc for iOS and OS X builds to travis configs. - Update handing of python install to deal with newer OS X versions.
| | * Generated code changes and manual changes for previous commit.Gravatar Jon Skeet2015-11-09
| | |
| | * Change how the reflection descriptor class is generated.Gravatar Jon Skeet2015-11-09
| |/ |/| | | | | | | Instead of having a Proto nested namespace to avoid conflicts between the descriptor-holding static class and message classes, just append "Reflection" to the name. Generated code changes (and corresponding manual changes) in following commit.
* | Merge pull request #954 from jskeet/blank-lines-in-commentsGravatar Jan Tattermusch2015-11-08
|\ \ | | | | | | Stop removing all blank lines in doc comments.
* \ \ Merge pull request #949 from thomasvl/newer_simsGravatar Paul Yang2015-11-06
|\ \ \ | | | | | | | | Tweaks to the Mac build script
| | * | Generated code for previous commit.Gravatar Jon Skeet2015-11-06
| | | |
| | * | Stop removing all blank lines in doc comments.Gravatar Jon Skeet2015-11-06
| |/ / |/| | | | | | | | | | | | | | This fixes issue #832. Generated code changes in next commit.
* | | Merge pull request #941 from jskeet/recursion-limitGravatar Jan Tattermusch2015-11-05
|\ \ \ | | | | | | | | Add recursion limit handling to JSON parsing.
* \ \ \ Merge pull request #950 from jhump/jh/plugin-proto-in-java-runtimeGravatar Feng Xiao2015-11-05
|\ \ \ \ | | | | | | | | | | include plugin.proto and generated code in protobuf-java
| | | * | Tweaks to the Mac build scriptGravatar Thomas Van Lenten2015-11-05
| |_|/ / |/| | | | | | | | | | | | | | | | | | | - Support building with Xcode 6.4 or 7.x - Fix an error in usage info. - Add a flag to build the core parts of protobuf only.
| * | | include plugin.proto and generated code in protobuf-javaGravatar Joshua Humphries2015-11-05
|/ / /
| * | Reimplement JSON recursion by detecting the depth in the tokenizer.Gravatar Jon Skeet2015-11-05
| | | | | | | | | | | | Added a TODO around a possible change to the tokenizer API, changing PushBack(token) into just Rewind() or something similar.
* | | Merge pull request #940 from jskeet/json-namesGravatar Jon Skeet2015-11-05
|\ \ \ | | | | | | | | Move the creation of the "fields by JSON name" dictionary to the descriptor
* \ \ \ Merge pull request #942 from jskeet/json-exceptionGravatar Jan Tattermusch2015-11-05
|\ \ \ \ | | | | | | | | | | Created a new exception for JSON failures.
* \ \ \ \ Merge pull request #943 from thomasvl/conformanceGravatar Paul Yang2015-11-05
|\ \ \ \ \ | | | | | | | | | | | | Update the Mac build script to include the conformance tests
| | * | | | Created a new exception for JSON failures.Gravatar Jon Skeet2015-11-05
| |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | This is only thrown directly by JsonTokenizer, but surfaces from JsonParser as well. I've added doc comments to hopefully make everything clear. The exception is actually thrown by the reader within JsonTokenizer, in anticipation of keeping track of the location within the document, but that change is not within this PR.
| * | | | Update the Mac build script to include the conformance testsGravatar Thomas Van Lenten2015-11-04
|/ / / / | | | | | | | | | | | | | | | | - Kick off the conformance tests - Add missing ignore for something generated by a build on the conformance directory.
| | * / Add recursion limit handling to JSON parsing.Gravatar Jon Skeet2015-11-04
| |/ / |/| | | | | | | | Fixes issue #932.
| * | Move the creation of the "fields by JSON name" dictionary to the descriptor.Gravatar Jon Skeet2015-11-04
|/ /
* | Merge pull request #923 from jskeet/json-parsingGravatar Jon Skeet2015-11-03
|\ \ | | | | | | Implement JSON parsing in C#.
* \ \ Merge pull request #936 from andrewharp/patch-1Gravatar Feng Xiao2015-11-03
|\ \ \ | | | | | | | | Build protoc for host platform to enable cross-compilation.
* \ \ \ Merge pull request #939 from dougkwan/masterGravatar Feng Xiao2015-11-03
|\ \ \ \ | | | | | | | | | | Add support for POWER Linux
| * | | | Add support for POWER LinuxGravatar Doug Kwan2015-11-03
|/ / / /
| * / / Build protoc for host platform to enable cross-compilation.Gravatar Andrew Harp2015-11-03
|/ / / | | | | | | This is necessary to run protoc on the host as a dependency for Android BUILD targets with Bazel.
| * / Implement JSON parsing in C#.Gravatar Jon Skeet2015-11-03
|/ / | | | | | | | | | | | | | | | | | | This includes all the well-known types except Any. Some aspects are likely to require further work when the details of the JSON parsing expectations are hammered out in more detail. Some of these have "ignored" tests already. Note that the choice *not* to use Json.NET was made for two reasons: - Going from 0 dependencies to 1 dependency is a big hit, and there's not much benefit here - Json.NET parses more leniently than we'd want; accommodating that would be nearly as much work as writing the tokenizer This only really affects the JsonTokenizer, which could be replaced by Json.NET. The JsonParser code would be about the same length with Json.NET... but I wouldn't be as confident in it.
* | Merge pull request #930 from pherl/bazel_testGravatar Jisi Liu2015-11-02
|\| | | | | add warning notes for cc|py_proto_library rules.
* | Merge pull request #931 from xfxyjwf/fix_compileGravatar Feng Xiao2015-11-02
|\ \ | | | | | | Fix compilation errors when built internally.
| * | Fix compilation errors when built internally.Gravatar Feng Xiao2015-11-02
|/ / | | | | | | | | | | | | | | 1. mathlimits.h must be included before the inclusion of cmath (which gtest/gtest.h seems to include). 2. hash function for StringPiece doesn't work. Change-Id: I358a25d941a25b10b39fe76780eda41557699811
| * add warning notes for cc|py_proto_library rules.Gravatar Jisi Liu2015-11-02
|/ | | | | To mention that the interface may change or be removed when bazel has support it natively.
* Merge pull request #929 from jskeet/unsafe-internalGravatar Jan Tattermusch2015-11-02
|\ | | | | Make BytesString.Unsafe internal (which it should have been all along)