aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Updating Xcode Settings to use iOS 9.3Geoffrey Wiseman2016-04-061-0/+8
| | | | Update the simulators used for some tests under Xcode 7.3 to be iOS 9.3.
* Merge pull request #1349 from gvaish/masterJon Skeet2016-04-0532-84/+177
|\ | | | | Added CLI option internal_access for types (C#)
| * Added access_level for typesGaurav Vaish2016-04-0532-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-2Feng Xiao2016-04-051-2/+12
|\ \ | | | | | | Do not link in pthread library for Android builds.
| * | Update BUILDAndrew Harp2016-04-041-1/+1
| | |
| * | Do not link in pthread library for Android builds.Andrew Harp2016-04-041-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/masterThomas Van Lenten2016-04-045-11/+41
|\ \ | |/ |/| Added deprecated option handling to objective-c
| * Added deprecated option handling for objective-c generatorOleg Vereshko2016-04-045-11/+41
| |
* | Merge pull request #1353 from keveman/masterJoshua Haberman2016-04-012-17/+30
|\ \ | | | | | | Linking the cpp implementation extension statically with libprotobuf
| * | Linking the cpp implementation extension statically with libprotobufManjunath Kudlur2016-04-012-17/+30
| | |
* | | Merge pull request #1377 from jskeet/remove-duplicate-testsJon Skeet2016-04-012-2/+0
|\ \ \ | | | | | | | | Remove duplicate test cases.
| * | | Remove duplicate test cases.Jon Skeet2016-04-012-2/+0
| | |/ | |/| | | | | | | (NCrunch noticed these.)
* | | Merge pull request #1378 from thomasvl/manual_stream_parsing_helpersThomas Van Lenten2016-04-012-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 Lenten2016-04-012-0/+17
|/ /
* | Merge pull request #1369 from jskeet/tools-nuspecJan Tattermusch2016-03-312-14/+37
|\ \ | |/ |/| Introduce a new nuget package, Google.Protobuf.Tools, basically to contain protoc on multiple platforms.
| * Remove duplicate lineJon Skeet2016-03-311-1/+0
| |
| * Introduce a new nuget package, Google.Protobuf.Tools, basically to contain ↵Jon Skeet2016-03-312-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_protosJoshua Haberman2016-03-312-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 PythonManjunath Kudlur2016-03-312-11/+94
| | |
* | | Merge pull request #1366 from xyzzyz/int128_ostreamFeng Xiao2016-03-311-1/+1
|\ \ \ | |/ / |/| | Replace #include <iostream> with #include <ostream> in int128.cc
| * | Replace #include <iostream> with #include <ostream>Adam Michalik2016-03-301-1/+1
| | | | | | | | | | | | | | | iostream is not actually necessary here, and it introduces unnecessary static initializers.
* | | Merge pull request #1362 from jskeet/tweak_json_nameJan Tattermusch2016-03-301-61/+39
|\ \ \ | |/ / |/| | Refactoring of FieldDescriptor
| * | Refactoring of FieldDescriptorJon Skeet2016-03-301-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/masterJisi Liu2016-03-301-1/+1
|\ \ | | | | | | Use the T() instead of NULL for the default value.
| * | Use the T() instead of NULL for the default value.Jisi Liu2016-03-291-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/dockerJoshua Haberman2016-03-309-36/+448
|\ \ \ | |_|/ |/| | Add support for running on Jenkins
| * | Merge branch 'master' into dockerJosh Haberman2016-03-29101-6889/+4074
| |\|
| * | Rearranged and commented files for running under Jenkins.Josh Haberman2016-03-0411-140/+115
| | |
| * | Disable attempt to use ccache for docker build.Josh Haberman2016-03-033-20/+13
| | |
| * | Properly report C++ build time.Josh Haberman2016-03-033-8/+15
| | |
| * | Use a local Maven repository to avoid network fetches during tests.Josh Haberman2016-03-032-0/+31
| | |
| * | Make Java copy into separate directories so the tests can run concurrently.Josh Haberman2016-03-021-5/+9
| | |
| * | Added code to generate XML output file for more granular results.Josh Haberman2016-03-025-11/+122
| | |
| * | Added Ruby 2.1, Oracle Java, and C#.Josh Haberman2016-03-023-21/+76
| | |
| * | Upgrade Python packages using pip.Josh Haberman2016-03-021-1/+7
| | |
| * | Work around tox bug.Josh Haberman2016-03-021-0/+4
| | |
| * | Configure ccache directory.Josh Haberman2016-03-022-2/+8
| | |
| * | Put Maven in batch mode to avoid spamming the logs.Josh Haberman2016-03-021-4/+7
| | |
| * | Install Python deps in Docker image.Josh Haberman2016-03-023-13/+25
| | |
| * | Add another test (javanano), but run it in parallel.Josh Haberman2016-03-022-5/+13
| | |
| * | Properly add JDK deps in the Docker image.Josh Haberman2016-03-023-5/+19
| | |
| * | Try running multiple tests in a row.Josh Haberman2016-03-024-51/+57
| | |
| * | Added ccache support.Josh Haberman2016-03-024-6/+22
| | |
| * | Added some initial shell scripts and docker file.Josh Haberman2016-03-027-39/+200
| | |
* | | Merge pull request #1326 from the-alien/csharp_json_nameJon Skeet2016-03-306-9/+206
|\ \ \ | |_|/ |/| | csharp: add support for the json_name option
| * | Merge branch 'master' of https://github.com/google/protobuf into ↵alien2016-03-298-17/+39
| |\ \ | |/ / |/| | | | | csharp_json_name
* | | Merge pull request #1358 from thomasvl/travis_tweaksThomas Van Lenten2016-03-292-7/+10
|\ \ \ | | | | | | | | Mark iOS tests as able to fail.
| * | | Mark iOS tests as able to fail.Thomas Van Lenten2016-03-292-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_releaseThomas Van Lenten2016-03-241-2/+0
|\ \ \ | | | | | | | | The message was autoreleased, the -releases are an over release.
| * | | The message was autoreleased, the -releases are an over release.Thomas Van Lenten2016-03-241-2/+0
|/ / /
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-24 03:48:19 +0000