| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Add new generation option for using proto sources from other frameworks. | Thomas Van Lenten | 2016-06-17 | 5 | -127/+348 |
| | | | | | | | | | | | | | | | - Better docs in the generator for the different options that can be passed during an invoke of protoc. - Add named_framework_to_proto_path_mappings_path to pass the path to a file containing mappings of frameworks for different proto files. - Update the generation to use the mapping to change the #import directives it creates. Note: the changes in helpers is mostly moving code within the fine, and then a small change to expose the parsing so a passed on class can consume the line. Fixes https://github.com/google/protobuf/issues/1457 | ||||
| * | Merge pull request #1692 from vjpai/friendless | Feng Xiao | 2016-06-16 | 1 | -4/+7 |
| |\ | | | | | Workaround for gcc-4.4 incompatibility | ||||
| | * | Address review comments on function name | vjpai | 2016-06-16 | 1 | -2/+2 |
| | | | |||||
| | * | Remove a friend-class template that is only used for the | Vijay Pai | 2016-06-15 | 1 | -4/+7 |
| |/ | | | | | | | constructor, and instead create an _internal_only getter that gets the needed information. This is a workaround for a deficiency in gcc-4.4 that does not properly support templated friend classes. | ||||
| * | Merge pull request #1658 from yeswalrus/cmake-fixup-module | Feng Xiao | 2016-06-15 | 1 | -24/+9 |
| |\ | | | | | Cleanup protobuf-module.cmake.in | ||||
| | * | Removed handling for ALIASED targets since they are unused. | Walter Gray | 2016-06-07 | 1 | -24/+9 |
| | | | |||||
| * | | Merge pull request #1665 from yeswalrus/cmake-package-requirements | Feng Xiao | 2016-06-15 | 3 | -12/+23 |
| |\ \ | | | | | | | CMake package requirements | ||||
| | * | | make protobuf_MSVC_STATIC_RUNTIME a dependent option to reflect it's use. | Walter Gray | 2016-06-09 | 1 | -1/+3 |
| | | | | |||||
| | * | | Save the relevant options used to create a package, allow users to reject ↵ | Walter Gray | 2016-06-09 | 2 | -11/+20 |
| | |/ | | | | | | | packages based on them. | ||||
| * | | Merge pull request #1683 from thomasvl/third_party_framework | Thomas Van Lenten | 2016-06-15 | 5 | -10/+54 |
| |\ \ | | | | | | | Add support for generation sources into a framework. | ||||
| | * | | Add support for generation sources into a framework. | Thomas Van Lenten | 2016-06-15 | 5 | -10/+54 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add a protoc objc option (generate_for_named_framework) to set the name of the framework all generated sources will be in. - Tweak some comments/naming to make it clear what is the Protobuf framework vs. the framework for generated code. - Update the objc README to document the new generation option to protoc. This is working towards https://github.com/google/protobuf/issues/1457. | ||||
| * | | | Add the CocoaPods integration tests to Travis. | Sergio Campamá | 2016-06-14 | 3 | -1/+25 |
| |/ / | | | | | | | | | | | Also hotwires updating ruby as CocoaPods was crashing within a support library. Fixes #1619 | ||||
| * | | Fixes Xcode 8 analyzer warning saying that it was missing a release in ↵ | Sergio Campamá | 2016-06-14 | 1 | -0/+5 |
| | | | | | | | | | dealloc (#1678) | ||||
| * | | Merge pull request #1664 from bshaffer/patch-1 | Feng Xiao | 2016-06-10 | 1 | -1/+1 |
| |\ \ | | | | | | | proper codeblock in README | ||||
| | * | | proper codeblock in README | Brent Shaffer | 2016-06-09 | 1 | -1/+1 |
| |/ / | |||||
| * | | Merge pull request #879 from mathstuf/support-equals-in-proto-path | Feng Xiao | 2016-06-08 | 2 | -2/+22 |
| |\ \ | |/ |/| | protoc: support '=' in --proto_path arguments | ||||
| | * | protoc: support '=' in --proto_path arguments | Ben Boeckel | 2016-04-20 | 2 | -2/+22 |
| | | | |||||
| * | | Add GOOGLE_ prefix before PROTOBUF_DEPRECATED_ATTR | Bo Yang | 2016-06-07 | 3 | -3/+3 |
| | | | |||||
| * | | Fix the undefined behavior for opensource users. | Bo Yang | 2016-06-07 | 1 | -3/+5 |
| | | | |||||
| * | | Merge pull request #1624 from yeswalrus/cmake-prerelease-versioning | Feng Xiao | 2016-06-07 | 2 | -17/+30 |
| |\ \ | | | | | | | CMake prerelease versioning | ||||
| | * | | For prerelease versions, require protobuf_FIND_VERSION to be set. | Walter Gray | 2016-05-31 | 1 | -16/+22 |
| | | | | |||||
| | * | | Include the prerelease version in the protobuf_VERSION | Walter Gray | 2016-05-31 | 1 | -1/+8 |
| | | | | |||||
| * | | | Merge pull request #1643 from yeswalrus/cmake-examples | Feng Xiao | 2016-06-07 | 8 | -76/+335 |
| |\ \ \ | | | | | | | | | Build examples in CMake | ||||
| | * | | | Replace handwritten protobuf-targets with exported version. | Walter Gray | 2016-06-06 | 3 | -39/+24 |
| | | | | | |||||
| | * | | | Use ExternalProject_Add to build the examples in a stand-alone fashion. | Walter Gray | 2016-06-06 | 2 | -62/+93 |
| | | | | | |||||
| | * | | | CMake project updates | Konstantin Podsvirov | 2016-06-04 | 9 | -69/+312 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A series of improvements: - Improved Protobuf module compatibility (disabled by default); - Hide advanced settings; - Added build tree configuration; - Added build of examples. | ||||
| * | | | | Merge pull request #1541 from haberman/conformancestrict | Joshua Haberman | 2016-06-06 | 12 | -163/+155 |
| |\ \ \ \ | |/ / / |/| | | | Make conformance tests more strict about the failure list. | ||||
| | * | | | Make surrogate regex even more lenient. | Josh Haberman | 2016-06-06 | 1 | -2/+2 |
| | | | | | |||||
| | * | | | JSON surrogates Python: adjust regex for OSX error message. | Josh Haberman | 2016-06-06 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | OS X's version of Python has a slightly different error message for this error case. | ||||
| | * | | | Added test for surrogates (valid and invalid). | Josh Haberman | 2016-06-03 | 1 | -0/+21 |
| | | | | | |||||
| | * | | | Added update_failure_list.py. | Josh Haberman | 2016-06-03 | 1 | -0/+73 |
| | | | | | |||||
| | * | | | Surrogate checking is unpredictable, so always manually check. | Josh Haberman | 2016-06-03 | 2 | -24/+6 |
| | | | | | |||||
| | * | | | Fixed Python by updating failure lists and fixed a few broken tests. | Josh Haberman | 2016-06-03 | 5 | -83/+28 |
| | | | | | | | | | | | | | | | | | | | | | Python 2.x doesn't detect unpaired surrogates so we have to do that manually. | ||||
| | * | | | Make conformance tests more strict about the failure list. | Josh Haberman | 2016-06-03 | 5 | -80/+51 |
| |/ / / | | | | | | | | | | | | | | | | The failure lists were falling out of date because the tests would pass even if people forgot to remove failures from the list. | ||||
| * | | | Integrate interanl changes | Bo Yang | 2016-06-02 | 1 | -0/+1 |
| | | | | |||||
| * | | | Improving the granularity parsing errors (#1623) | Sergio Campamá | 2016-06-02 | 5 | -42/+223 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add more context to GPBCodedInputStream failures. Have GPBMessage parsing apis extract out the GPBCodedInputStream information and expose it. Update HeaderDocs with pointers to all error domains/codes. Expand the unittests to cover the full set of errors reported. Fixes https://github.com/google/protobuf/issues/1618 | ||||
| * | | | Merge pull request #1640 from os72/master | Feng Xiao | 2016-06-02 | 1 | -0/+1 |
| |\ \ \ | | | | | | | | | Add https://github.com/os72/protobuf-dynamic | ||||
| | * | | | Add https://github.com/os72/protobuf-dynamic | os72 | 2016-05-31 | 1 | -0/+1 |
| |/ / / | | | | | | | Add reference to Protocol Buffers Dynamic Schema (https://github.com/os72/protobuf-dynamic) | ||||
| * | | | Merge pull request #1625 from yeswalrus/note-versions | Feng Xiao | 2016-05-31 | 1 | -2/+7 |
| |\ \ \ | | | | | | | | | Update the list of places where the version is stored. | ||||
| | * | | | Update the list of places where the version is stored. | Walter Gray | 2016-05-28 | 1 | -2/+7 |
| | | | | | |||||
| * | | | | Merge pull request #1613 from yeswalrus/cmake-min-version | Feng Xiao | 2016-05-31 | 1 | -1/+1 |
| |\ \ \ \ | |_|/ / |/| | | | Bump cmake minimum required version to 2.8.12 | ||||
| | * | | | Bump to the *real* minimum required version. Setting CMP0022 breaks CMake ↵ | Walter Gray | 2016-05-26 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | versions < 2.8.12 | ||||
| * | | | | Merge pull request #1629 from zhongfq/patch-1 | Feng Xiao | 2016-05-31 | 1 | -0/+1 |
| |\ \ \ \ | | | | | | | | | | | add protobuf as3 lib and code generator for as3 | ||||
| | * | | | | add protobuf as3 lib and code generator for as3 | Eric Zhong | 2016-05-30 | 1 | -0/+1 |
| | | |/ / | |/| | | | | | | | | | | | | | | 1.only support proto3 2.support oneof map 3.support nested message and enum for as3 | ||||
| * | | | | Merge pull request #1614 from yeswalrus/cmake-cleanup | Feng Xiao | 2016-05-31 | 2 | -37/+27 |
| |\ \ \ \ | | | | | | | | | | | Remove unused lines from CMake files. | ||||
| | * | | | | Remove __PROTOBUF_PACKAGE_PREFIX | Walter Gray | 2016-05-28 | 1 | -5/+1 |
| | | | | | | |||||
| | * | | | | remove useless cleanup - config.cmake files are executed in their own context. | Walter Gray | 2016-05-26 | 1 | -4/+0 |
| | | | | | | |||||
| | * | | | | Remove if(TRUE) | Walter Gray | 2016-05-26 | 1 | -28/+26 |
| | | |/ / | |/| | | |||||
| * | | | | Merge pull request #1630 from google/beta-3 | Thomas Van Lenten | 2016-05-31 | 1 | -1/+1 |
| |\ \ \ \ | | | | | | | | | | | Merge beta-3 release branch into master. | ||||
| | * \ \ \ | Merge pull request #1561 from pherl/beta-3 | Thomas Van Lenten | 2016-05-18 | 1 | -1/+1 |
| | |\ \ \ \ | | | | | | | | | | | | | Bump objc podspec version number | ||||
 |
index : protobuf | |
| Protocol Buffers - Google's data interchange format |
| aboutsummaryrefslogtreecommitdiff |