aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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.
* | | Merge pull request #1547 from xyzzyz/js_generatorJoshua Haberman2016-05-181-1/+1
|\ \ \ | | | | | | | | Fix #include in js_generator.cc
| * | | Fix #include in js_generator.ccAdam Michalik2016-05-171-1/+1
| |/ / | | | | | | | | | | | | The commit 3b3c8abb9635eb3ea078a821a99c9ef29d66dff7 has replaced the <> with "" in #include statement in js_generator.cc
* | | Merge pull request #1559 from google/beta-3Jisi Liu2016-05-182-1/+2
|\ \ \ | |_|/ |/| | Merge beta-3 release branch again.
| * | Merge pull request #1551 from pherl/beta-3Jisi Liu2016-05-171-1/+1
| |\ \ | | | | | | | | Fix protoc artifact pom version
| | * | Fix protoc artifact pom versionJisi Liu2016-05-171-1/+1
| | | |
| * | | Merge pull request #1546 from pherl/beta-3Jisi Liu2016-05-171-0/+1
| |\| | | | | | | | | | Added download_url to be able to upload to pypi.
| | * | Added download_url to be able to upload to pypi.Jisi Liu2016-05-171-0/+1
| |/ /
* | | Merge pull request #1412 from google/internalPaul Yang2016-05-182-1/+2
|\ \ \ | | | | | | | | Integrate interanl changes
| * | | Integrate interanl changesBo Yang2016-05-182-1/+2
|/ / /
* | | Merge pull request #1548 from anandolee/masterJoshua Haberman2016-05-172-1/+22
|\ \ \ | |_|/ |/| | JSON format for Any message must print @type first
| * | JSON format for Any message must print @type first, use OrderedDict instead ↵Jie Luo2016-05-172-1/+22
| | | | | | | | | | | | of {}
* | | Merge pull request #1542 from google/beta-3Jisi Liu2016-05-1616-23/+206
|\ \ \ | | |/ | |/| Merge Beta 3 release branch into master
| * | Merge pull request #1540 from pherl/changelogv3.0.0-beta-3Jisi Liu2016-05-161-2/+8
| |\ \ | | | | | | | | Update changes for lite
| | * | Update changes for liteJisi Liu2016-05-161-2/+8
| | | |
| * | | Merge pull request #1533 from pherl/mapcommentJisi Liu2016-05-161-3/+1
| |\ \ \ | | | | | | | | | | Remove the comments about iterator validation
| | * | | Remove the comments about iterator validationJisi Liu2016-05-131-3/+1
| |/ / / | | | | | | | | | | | | As it may be implementation dependent.
| * | | Merge pull request #1532 from pherl/changelogJisi Liu2016-05-131-1/+6
| |\| | | | | | | | | | Update changelogs for C++ maps
| | * | Update changelogs for C++ mapsJisi Liu2016-05-131-1/+6
| |/ /
| * | Merge pull request #1527 from haberman/changelogJisi Liu2016-05-121-1/+14
| |\ \ | | | | | | | | Added release notes for Ruby and JavaScript.
| | * | Added release notes for Ruby and JavaScript.Josh Haberman2016-05-121-1/+14
| |/ /
| * | Merge pull request #1520 from pherl/hashmapvs2008Jisi Liu2016-05-121-3/+55
| |\ \ | | | | | | | | Bridge vs2008 hashmaps.
generated by cgit v1.2.3 (git 2.39.1) at 2024-08-27 03:28:17 +0000