aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | Add support for generation sources into a framework.Thomas Van Lenten2016-06-155-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-143-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-141-0/+5
| | | | | | | | | | | | dealloc (#1678)
* | | Merge pull request #1664 from bshaffer/patch-1Feng Xiao2016-06-101-1/+1
|\ \ \ | | | | | | | | proper codeblock in README
| * | | proper codeblock in READMEBrent Shaffer2016-06-091-1/+1
|/ / /
* | | Merge pull request #879 from mathstuf/support-equals-in-proto-pathFeng Xiao2016-06-082-2/+22
|\ \ \ | |/ / |/| | protoc: support '=' in --proto_path arguments
| * | protoc: support '=' in --proto_path argumentsBen Boeckel2016-04-202-2/+22
| | |
* | | Add GOOGLE_ prefix before PROTOBUF_DEPRECATED_ATTRBo Yang2016-06-073-3/+3
| | |
* | | Fix the undefined behavior for opensource users.Bo Yang2016-06-071-3/+5
| | |
* | | Merge pull request #1624 from yeswalrus/cmake-prerelease-versioningFeng Xiao2016-06-072-17/+30
|\ \ \ | | | | | | | | CMake prerelease versioning
| * | | For prerelease versions, require protobuf_FIND_VERSION to be set.Walter Gray2016-05-311-16/+22
| | | |
| * | | Include the prerelease version in the protobuf_VERSIONWalter Gray2016-05-311-1/+8
| | | |
* | | | Merge pull request #1643 from yeswalrus/cmake-examplesFeng Xiao2016-06-078-76/+335
|\ \ \ \ | | | | | | | | | | Build examples in CMake
| * | | | Replace handwritten protobuf-targets with exported version.Walter Gray2016-06-063-39/+24
| | | | |
| * | | | Use ExternalProject_Add to build the examples in a stand-alone fashion.Walter Gray2016-06-062-62/+93
| | | | |
| * | | | CMake project updatesKonstantin Podsvirov2016-06-049-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/conformancestrictJoshua Haberman2016-06-0612-163/+155
|\ \ \ \ \ | |/ / / / |/| | | | Make conformance tests more strict about the failure list.
| * | | | Make surrogate regex even more lenient.Josh Haberman2016-06-061-2/+2
| | | | |
| * | | | JSON surrogates Python: adjust regex for OSX error message.Josh Haberman2016-06-061-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 Haberman2016-06-031-0/+21
| | | | |
| * | | | Added update_failure_list.py.Josh Haberman2016-06-031-0/+73
| | | | |
| * | | | Surrogate checking is unpredictable, so always manually check.Josh Haberman2016-06-032-24/+6
| | | | |
| * | | | Fixed Python by updating failure lists and fixed a few broken tests.Josh Haberman2016-06-035-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 Haberman2016-06-035-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 changesBo Yang2016-06-021-0/+1
| | | |
* | | | Improving the granularity parsing errors (#1623)Sergio Campamá2016-06-025-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/masterFeng Xiao2016-06-021-0/+1
|\ \ \ \ | | | | | | | | | | Add https://github.com/os72/protobuf-dynamic
| * | | | Add https://github.com/os72/protobuf-dynamicos722016-05-311-0/+1
|/ / / / | | | | | | | | Add reference to Protocol Buffers Dynamic Schema (https://github.com/os72/protobuf-dynamic)
* | | | Merge pull request #1625 from yeswalrus/note-versionsFeng Xiao2016-05-311-2/+7
|\ \ \ \ | | | | | | | | | | Update the list of places where the version is stored.
| * | | | Update the list of places where the version is stored.Walter Gray2016-05-281-2/+7
| | | | |
* | | | | Merge pull request #1613 from yeswalrus/cmake-min-versionFeng Xiao2016-05-311-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | | Bump cmake minimum required version to 2.8.12
| * | | | Bump to the *real* minimum required version. Setting CMP0022 breaks CMake ↵Walter Gray2016-05-261-1/+1
| | | | | | | | | | | | | | | | | | | | versions < 2.8.12
* | | | | Merge pull request #1629 from zhongfq/patch-1Feng Xiao2016-05-311-0/+1
|\ \ \ \ \ | | | | | | | | | | | | add protobuf as3 lib and code generator for as3
| * | | | | add protobuf as3 lib and code generator for as3Eric Zhong2016-05-301-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-cleanupFeng Xiao2016-05-312-37/+27
|\ \ \ \ \ | | | | | | | | | | | | Remove unused lines from CMake files.
| * | | | | Remove __PROTOBUF_PACKAGE_PREFIXWalter Gray2016-05-281-5/+1
| | | | | |
| * | | | | remove useless cleanup - config.cmake files are executed in their own context.Walter Gray2016-05-261-4/+0
| | | | | |
| * | | | | Remove if(TRUE)Walter Gray2016-05-261-28/+26
| | |/ / / | |/| | |
* | | | | Merge pull request #1630 from google/beta-3Thomas Van Lenten2016-05-311-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Merge beta-3 release branch into master.
| * \ \ \ \ Merge pull request #1561 from pherl/beta-3Thomas Van Lenten2016-05-181-1/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | Bump objc podspec version number
| | * | | | | Bump objc podspec version numberJisi Liu2016-05-181-1/+1
| |/ / / / /
* | | | | | Merge pull request #1620 from sergiocampama/cleanup1Thomas Van Lenten2016-05-302-12/+0
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | Removing unused GPBExceptionMessageKey
| * | | | | Removing unused GPBExceptionMessageKeySergio Campama2016-05-272-12/+0
| | | | | | | | | | | | | | | | | | | | | | | | https://github.com/google/protobuf/issues/1618
* | | | | | Merge pull request #1617 from thomasvl/more_warningsThomas Van Lenten2016-05-276-172/+249
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Add -Woverriding-method-mismatch.
| * | | | | Add -Woverriding-method-mismatch.Thomas Van Lenten2016-05-276-172/+249
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes up the code to avoid some issues with isEqual: methods. Opened https://github.com/google/protobuf/issues/1616 to track the KVC collision.
* | | | | | Merge pull request #1604 from jonwallg/repeated_typesThomas Van Lenten2016-05-272-2/+29
|\ \ \ \ \ \ | |/ / / / / |/| | | | | fix expected class checking in GPBSetMessageRepeatedField
| * | | | | fix expected class checking in GPBSetMessageRepeatedFieldJon Wall2016-05-262-2/+29
|/ / / / / | | | | | | | | | | | | | | | | | | | | This is currently checking for the wrong class for enums and NSMutableArray fields.
* | | | | Merge pull request #1600 from thomasvl/objc_tighter_warningsThomas Van Lenten2016-05-2623-32/+269
|\ \ \ \ \ | | | | | | | | | | | | Add more warnings to for the ObjC runtime build
| * | | | | Add more warnings to for the ObjC runtime buildThomas Van Lenten2016-05-2523-32/+269
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Working on https://github.com/google/protobuf/issues/1599, specifically: - Turn on more warnings that the Xcode UI calls out with individual controls. - Manually add: -Wundef -Wswitch-enum - Manually add and then diable in the unittests because of XCTest's headers: -Wreserved-id-macro -Wdocumentation-unknown-command - Manually add -Wdirect-ivar-access, but disable it for the unittests and in the library code (via #pragmas to suppress it). This is done so proto users can enable the warning.
* | | | | | Merge pull request #1586 from davidzchen/pythonJisi Liu2016-05-252-14/+76
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Bazel build: Keep generated sources and Python runtime in the same directory