aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Removed handling for ALIASED targets since they are unused.Walter Gray2016-06-071-24/+9
|
* 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
| * | | Bazel build: Keep generated sources and Python runtime in the same directory.David Z. Chen2016-05-252-14/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Users often encounter a Python import error when trying to build Python protos if protobuf is installed locally on the machine. In this case, Python ends up looking in the wrong directory when importing files (see bazelbuild/bazel#1209 and tensorflow/tensorflow#2021). It seems that the problem is caused by Python getting confused when there are Python source files that are meant to be part of the same package but are in separate directories. Prior to #1233, the Bazel build setup would copy the Python runtime sources and all generated sources for the builtin protos into the root directory (assuming that the protobuf tree is vendored in a google/protobuf directory). With #1233, the two sets of sources are kept in their respective directories but both `src/` and `python/` are added to the `PYTHONPATH` using the new `imports` attribute of the Bazel Python rules. However, both the runtime sources and the generated sources are under the same package: `google.protobuf`, causing Python to become confused when trying to import modules that are in the other directory. This patch adds a workaround to the Bazel build to add a modified version of the original `internal_copied_filegroup` macro to copy the `.proto` files under `src/` to `python/` before building the `py_proto_library` targets for the builtin protos. This ensures that the generated sources for the builtin protos will be in the same directory as the corresponding runtime sources. This patch was tested with the following: * All Python tests in protobuf * All Python tests in tensorflow * All tests in [Skydoc](https://github.com/bazelbuild/skydoc) * Importing protobuf as `//google/protobuf` * Importing and binding targets under `//external` * Importing protobuf as `//third_party/protobuf`
* | | | Merge pull request #1595 from thomasvl/objc_travis_tweaksThomas Van Lenten2016-05-253-79/+84
|\ \ \ \ | | | | | | | | | | Automated testing tweaks for ObjC
| * | | | Automated testing tweaks for ObjCThomas Van Lenten2016-05-243-79/+84
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Move the ObjC tests into the list and exclude them on linux, this will change where in the order they start, since they are longer, it will have other things run in parallel instead of them ending up last and taking the longest. - Switch to the Xcode 7.3 image. - Drop the use of xctool and stream line things through the full_mac_build.sh script. This means we end up with only one build script instead of two. - Tweaks to the mac build script: - Make iOS Xcode version support explicit - Support Debug/Release only building - Change the OS X min parallel count to 2 to better deal with VMs. - Split the travis ios tests into the two Xcode Configurations as the logs are choking travis.
* | | | Merge pull request #1593 from thomasvl/framework_includesThomas Van Lenten2016-05-2428-95/+543
|\ \ \ \ | | | | | | | | | | Better support for using the proto library from a framework.
| * | | | Better support for using the proto library from a framework.Thomas Van Lenten2016-05-2428-95/+543
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add generator constant for the default framework name. - Add generator api for making the CPP symbol from the name. - Add generator api to see if it is a bundled proto file. - Output a CPP conditional and two imports for the core library headers. - Add helper for generating the #import for file headers to deal with the framework imports. - Add a reference from the unittests to a WKT to use that to inspect how imports generate. - Update the podspec to define the CPP symbol and require pods 1.0 (or later). Fixes https://github.com/google/protobuf/issues/1457
* | | | Merge pull request #1589 from hochhaus/masterJoshua Haberman2016-05-241-0/+1
|\ \ \ \ | |/ / / |/| | | Add js/binary/encoder.js to js_EXTRA_DIST.
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-15 22:35:55 +0000