aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | 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.
| * | | | | Add js/binary/encoder.js to js_EXTRA_DIST.Andy Hochhaus2016-05-221-0/+1
| | | | | |
* | | | | | Merge pull request #1588 from jeffmvr/masterFeng Xiao2016-05-221-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | | added missing closing bracket for _cmakedir_desc in cmake/install.cmake:88
| * | | | | added missing closing bracket for _cmakedir_desc in cmake/install.cmake line 88Jeff Merver2016-05-211-1/+1
|/ / / / /
* | | | | Merge pull request #1578 from wal-rus/cmake-install-namespaceFeng Xiao2016-05-201-0/+1
|\ \ \ \ \ | |/ / / / |/| | | | Add protobuf:: namespace to installed targets
| * | | | add protobuf:: namespace to installed targetsWalter Gray2016-05-201-0/+1
|/ / / /
* | | | Merge pull request #1523 from xfxyjwf/compatibility_testsFeng Xiao2016-05-2078-0/+19521
|\ \ \ \ | | | | | | | | | | Add compatibilty tests against v2.5.0
| * | | | Describe platform requirements for the compatibility tests.Feng Xiao2016-05-201-0/+4
| | | | |
| * | | | Add compatiblity tests against v2.5.0Feng Xiao2016-05-1778-0/+19517
| | | | |
* | | | | Merge pull request #1583 from thomasvl/pods_integration_followupThomas Van Lenten2016-05-205-14/+36
|\ \ \ \ \ | | | | | | | | | | | | Make the CocoaPods integration tests more robust
| * | | | | Make the CocoaPods integration tests more robustThomas Van Lenten2016-05-205-14/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Env solution doesn't seem to always work, use template pod files and copy them in place instead. - Flush the pods cache before and after runs. - Make pod install verbose to have the info incase something goes wrong.
* | | | | | Merge pull request #1576 from wal-rus/cmake-versionfileFeng Xiao2016-05-201-0/+35
|\ \ \ \ \ \ | | | | | | | | | | | | | | Make protobuf-config-version.cmake.in set the required variables
| * | | | | | Update protobuf-config-version.cmake.in to correctly set the required ↵Walter Gray2016-05-191-0/+35
| |/ / / / / | | | | | | | | | | | | | | | | | | variables (PACKAGE_VERSION_EXACT, PACKAGE_VERSION_COMPATIBLE, PACKAGE_VERSION_UNSUITABLE)
* | | | | | Merge pull request #1575 from wal-rus/cmake-install-msvcFeng Xiao2016-05-201-2/+8
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Make cmake configuration file install path configurable
| * | | | | Fix the cmake configuration file install path to be more standards compliant ↵Walter Gray2016-05-191-2/+8
|/ / / / / | | | | | | | | | | | | | | | (See the description of cmake's config search behavior on https://cmake.org/cmake/help/v3.4/command/find_package.html)
* | | | | Merge pull request #1574 from thomasvl/test_schemesThomas Van Lenten2016-05-192-0/+182
|\ \ \ \ \ | | | | | | | | | | | | Add shared schemes for the CocoaPods integration tests
| * | | | | Add shared schemes for the CocoaPods integration testsThomas Van Lenten2016-05-192-0/+182
|/ / / / / | | | | | | | | | | | | | | | | | | | | Otherwise the projects have to be opened once to create user schemes for the command line builds to work.
* | | | | Merge pull request #1572 from thomasvl/podspec_tests_2Thomas Van Lenten2016-05-1925-7/+2091
|\ \ \ \ \ | | | | | | | | | | | | OS X gitignore cleanup and cocoapods integration tests
| * | | | | CocoaPod Integration TestsThomas Van Lenten2016-05-1923-0/+2063
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add an Xcode 6.3 created default iOS Project. - Add an Xcode 6.3 created default OS X Project. - Add Podfiles to for both that use Protobufs from within the tree. - Add a script to run the tests (and cleanup) to help confirm the state of the Protobuf.podspec and sources.
| * | | | | Expand the OS X/Xcode gitignoresThomas Van Lenten2016-05-192-7/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add the folder CocoaPods will add to the root folder. - Move and expand the entries in the objectivec directory.
* | | | | | Merge pull request #1558 from haberman/rubyoneofJoshua Haberman2016-05-193-24/+59
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Ruby oneofs: return default instead of nil for unset fields.
| * | | | | Fixed oneof behavior for enums and fixed JRuby.Josh Haberman2016-05-183-11/+24
| | | | | |
| * | | | | Ruby oneofs: return default instead of nil for unset fields.Josh Haberman2016-05-182-20/+42
| | | | | |
* | | | | | Merge pull request #1549 from xyzzyz/arena_exportJoshua Haberman2016-05-181-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Export class Arena to shared library.
| * | | | | | Export class Arena to shared library.Adam Michalik2016-05-171-1/+1
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | This got broken in commit 6ef984af4b0c63c1c33127a12dcfc8e6359f0c9e which integrated changes from internal branch.
generated by cgit v1.2.3 (git 2.39.1) at 2024-08-24 09:37:27 +0000