Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #1349 from gvaish/master | Jon Skeet | 2016-04-05 | 32 | -84/+177 |
|\ | | | | | Added CLI option internal_access for types (C#) | ||||
| * | Added access_level for types | Gaurav Vaish | 2016-04-05 | 32 | -84/+177 |
| | | | | | | | | | | | | | | | | | | | | | | * `csharp_options`: Added `Options` to encapsulate generator options. Supported options for now - file_extension, base_namespace * `{Blah}Generator`: Now accept `Options*` as parameter to constructor * `csharp_generator.cc`: Parse and populate options * `Makefile.am`: Added `csharp_options.h` * `extract_includes.bat.in`: Added `csharp_options.h` Refactoring code to two commits. This is the first commit | ||||
* | | Merge pull request #1386 from andrewharp/patch-2 | Feng Xiao | 2016-04-05 | 1 | -2/+12 |
|\ \ | | | | | | | Do not link in pthread library for Android builds. | ||||
| * | | Update BUILD | Andrew Harp | 2016-04-04 | 1 | -1/+1 |
| | | | |||||
| * | | Do not link in pthread library for Android builds. | Andrew Harp | 2016-04-04 | 1 | -2/+12 |
|/ / | | | | | This is required to allow Tensorflow to build on Android without hacks. Currently we create a dummy pthread library just to satisfy this dependency for a library that does not exist on Android. See https://github.com/google/protobuf/issues/1373 for more context. | ||||
* | | Merge pull request #852 from qzix/master | Thomas Van Lenten | 2016-04-04 | 5 | -11/+41 |
|\ \ | |/ |/| | Added deprecated option handling to objective-c | ||||
| * | Added deprecated option handling for objective-c generator | Oleg Vereshko | 2016-04-04 | 5 | -11/+41 |
| | | |||||
* | | Merge pull request #1353 from keveman/master | Joshua Haberman | 2016-04-01 | 2 | -17/+30 |
|\ \ | | | | | | | Linking the cpp implementation extension statically with libprotobuf | ||||
| * | | Linking the cpp implementation extension statically with libprotobuf | Manjunath Kudlur | 2016-04-01 | 2 | -17/+30 |
| | | | |||||
* | | | Merge pull request #1377 from jskeet/remove-duplicate-tests | Jon Skeet | 2016-04-01 | 2 | -2/+0 |
|\ \ \ | | | | | | | | | Remove duplicate test cases. | ||||
| * | | | Remove duplicate test cases. | Jon Skeet | 2016-04-01 | 2 | -2/+0 |
| | |/ | |/| | | | | | | | (NCrunch noticed these.) | ||||
* | | | Merge pull request #1378 from thomasvl/manual_stream_parsing_helpers | Thomas Van Lenten | 2016-04-01 | 2 | -0/+17 |
|\ \ \ | |/ / |/| | | Add -position and -isAtEnd for use when manually parsing input streams. | ||||
| * | | Add -position and -isAtEnd for use when manually parsing input streams. | Thomas Van Lenten | 2016-04-01 | 2 | -0/+17 |
|/ / | |||||
* | | Merge pull request #1369 from jskeet/tools-nuspec | Jan Tattermusch | 2016-03-31 | 2 | -14/+37 |
|\ \ | |/ |/| | Introduce a new nuget package, Google.Protobuf.Tools, basically to contain protoc on multiple platforms. | ||||
| * | Remove duplicate line | Jon Skeet | 2016-03-31 | 1 | -1/+0 |
| | | |||||
| * | Introduce a new nuget package, Google.Protobuf.Tools, basically to contain ↵ | Jon Skeet | 2016-03-31 | 2 | -14/+38 |
| | | | | | | | | | | | | | | | | 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 #1371 from keveman/oversize_protos | Joshua Haberman | 2016-03-31 | 2 | -11/+94 |
|\ \ | | | | | | | Added an API to allow oversize protos when using C++ extension in Python | ||||
| * | | Added an API to allow oversize protos when using C++ extension in Python | Manjunath Kudlur | 2016-03-31 | 2 | -11/+94 |
| | | | |||||
* | | | Merge pull request #1366 from xyzzyz/int128_ostream | Feng Xiao | 2016-03-31 | 1 | -1/+1 |
|\ \ \ | |/ / |/| | | Replace #include <iostream> with #include <ostream> in int128.cc | ||||
| * | | Replace #include <iostream> with #include <ostream> | Adam Michalik | 2016-03-30 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | iostream is not actually necessary here, and it introduces unnecessary static initializers. | ||||
* | | | Merge pull request #1362 from jskeet/tweak_json_name | Jan Tattermusch | 2016-03-30 | 1 | -61/+39 |
|\ \ \ | |/ / |/| | | Refactoring of FieldDescriptor | ||||
| * | | Refactoring of FieldDescriptor | Jon Skeet | 2016-03-30 | 1 | -61/+39 |
| |/ | | | | | | | | | | | | | | | This makes no externally visible behavioral changes. Internally and non-behaviorally: - We use a field (compiler-generated) to store the JsonName to avoid recomputing it repeatedly - The documentation for JsonName is updated to reflect the meaning better - Readonly autoprops and expression-bodied properties used where possible | ||||
* | | Merge pull request #1360 from pherl/master | Jisi Liu | 2016-03-30 | 1 | -1/+1 |
|\ \ | | | | | | | Use the T() instead of NULL for the default value. | ||||
| * | | Use the T() instead of NULL for the default value. | Jisi Liu | 2016-03-29 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | The template can be specialized on primitives, e.g. double, where converting NULL will trigger a warning. | ||||
* | | | Merge pull request #1295 from haberman/docker | Joshua Haberman | 2016-03-30 | 9 | -36/+448 |
|\ \ \ | |_|/ |/| | | Add support for running on Jenkins | ||||
| * | | Merge branch 'master' into docker | Josh Haberman | 2016-03-29 | 101 | -6889/+4074 |
| |\| | |||||
| * | | Rearranged and commented files for running under Jenkins. | Josh Haberman | 2016-03-04 | 11 | -140/+115 |
| | | | |||||
| * | | Disable attempt to use ccache for docker build. | Josh Haberman | 2016-03-03 | 3 | -20/+13 |
| | | | |||||
| * | | Properly report C++ build time. | Josh Haberman | 2016-03-03 | 3 | -8/+15 |
| | | | |||||
| * | | Use a local Maven repository to avoid network fetches during tests. | Josh Haberman | 2016-03-03 | 2 | -0/+31 |
| | | | |||||
| * | | Make Java copy into separate directories so the tests can run concurrently. | Josh Haberman | 2016-03-02 | 1 | -5/+9 |
| | | | |||||
| * | | Added code to generate XML output file for more granular results. | Josh Haberman | 2016-03-02 | 5 | -11/+122 |
| | | | |||||
| * | | Added Ruby 2.1, Oracle Java, and C#. | Josh Haberman | 2016-03-02 | 3 | -21/+76 |
| | | | |||||
| * | | Upgrade Python packages using pip. | Josh Haberman | 2016-03-02 | 1 | -1/+7 |
| | | | |||||
| * | | Work around tox bug. | Josh Haberman | 2016-03-02 | 1 | -0/+4 |
| | | | |||||
| * | | Configure ccache directory. | Josh Haberman | 2016-03-02 | 2 | -2/+8 |
| | | | |||||
| * | | Put Maven in batch mode to avoid spamming the logs. | Josh Haberman | 2016-03-02 | 1 | -4/+7 |
| | | | |||||
| * | | Install Python deps in Docker image. | Josh Haberman | 2016-03-02 | 3 | -13/+25 |
| | | | |||||
| * | | Add another test (javanano), but run it in parallel. | Josh Haberman | 2016-03-02 | 2 | -5/+13 |
| | | | |||||
| * | | Properly add JDK deps in the Docker image. | Josh Haberman | 2016-03-02 | 3 | -5/+19 |
| | | | |||||
| * | | Try running multiple tests in a row. | Josh Haberman | 2016-03-02 | 4 | -51/+57 |
| | | | |||||
| * | | Added ccache support. | Josh Haberman | 2016-03-02 | 4 | -6/+22 |
| | | | |||||
| * | | Added some initial shell scripts and docker file. | Josh Haberman | 2016-03-02 | 7 | -39/+200 |
| | | | |||||
* | | | Merge pull request #1326 from the-alien/csharp_json_name | Jon Skeet | 2016-03-30 | 6 | -9/+206 |
|\ \ \ | |_|/ |/| | | csharp: add support for the json_name option | ||||
| * | | Merge branch 'master' of https://github.com/google/protobuf into ↵ | alien | 2016-03-29 | 8 | -17/+39 |
| |\ \ | |/ / |/| | | | | | csharp_json_name | ||||
* | | | Merge pull request #1358 from thomasvl/travis_tweaks | Thomas Van Lenten | 2016-03-29 | 2 | -7/+10 |
|\ \ \ | | | | | | | | | Mark iOS tests as able to fail. | ||||
| * | | | Mark iOS tests as able to fail. | Thomas Van Lenten | 2016-03-29 | 2 | -7/+10 |
|/ / / | | | | | | | | | | | | | 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_release | Thomas Van Lenten | 2016-03-24 | 1 | -2/+0 |
|\ \ \ | | | | | | | | | The message was autoreleased, the -releases are an over release. | ||||
| * | | | The message was autoreleased, the -releases are an over release. | Thomas Van Lenten | 2016-03-24 | 1 | -2/+0 |
|/ / / | |||||
* | | | Merge pull request #1345 from smparkes/smparkes/well-known-protos | Feng Xiao | 2016-03-23 | 1 | -0/+6 |
|\ \ \ | | | | | | | | | export well known protos |