Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Better support for using the proto library from a framework. | Thomas Van Lenten | 2016-05-24 | 28 | -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 #1588 from jeffmvr/master | Feng Xiao | 2016-05-22 | 1 | -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 88 | Jeff Merver | 2016-05-21 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #1578 from wal-rus/cmake-install-namespace | Feng Xiao | 2016-05-20 | 1 | -0/+1 |
|\ | | | | | Add protobuf:: namespace to installed targets | ||||
| * | add protobuf:: namespace to installed targets | Walter Gray | 2016-05-20 | 1 | -0/+1 |
|/ | |||||
* | Merge pull request #1523 from xfxyjwf/compatibility_tests | Feng Xiao | 2016-05-20 | 78 | -0/+19521 |
|\ | | | | | Add compatibilty tests against v2.5.0 | ||||
| * | Describe platform requirements for the compatibility tests. | Feng Xiao | 2016-05-20 | 1 | -0/+4 |
| | | |||||
| * | Add compatiblity tests against v2.5.0 | Feng Xiao | 2016-05-17 | 78 | -0/+19517 |
| | | |||||
* | | Merge pull request #1583 from thomasvl/pods_integration_followup | Thomas Van Lenten | 2016-05-20 | 5 | -14/+36 |
|\ \ | | | | | | | Make the CocoaPods integration tests more robust | ||||
| * | | Make the CocoaPods integration tests more robust | Thomas Van Lenten | 2016-05-20 | 5 | -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-versionfile | Feng Xiao | 2016-05-20 | 1 | -0/+35 |
|\ \ \ | | | | | | | | | Make protobuf-config-version.cmake.in set the required variables | ||||
| * | | | Update protobuf-config-version.cmake.in to correctly set the required ↵ | Walter Gray | 2016-05-19 | 1 | -0/+35 |
| |/ / | | | | | | | | | | variables (PACKAGE_VERSION_EXACT, PACKAGE_VERSION_COMPATIBLE, PACKAGE_VERSION_UNSUITABLE) | ||||
* | | | Merge pull request #1575 from wal-rus/cmake-install-msvc | Feng Xiao | 2016-05-20 | 1 | -2/+8 |
|\ \ \ | |/ / |/| | | Make cmake configuration file install path configurable | ||||
| * | | Fix the cmake configuration file install path to be more standards compliant ↵ | Walter Gray | 2016-05-19 | 1 | -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_schemes | Thomas Van Lenten | 2016-05-19 | 2 | -0/+182 |
|\ \ | | | | | | | Add shared schemes for the CocoaPods integration tests | ||||
| * | | Add shared schemes for the CocoaPods integration tests | Thomas Van Lenten | 2016-05-19 | 2 | -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_2 | Thomas Van Lenten | 2016-05-19 | 25 | -7/+2091 |
|\ \ | | | | | | | OS X gitignore cleanup and cocoapods integration tests | ||||
| * | | CocoaPod Integration Tests | Thomas Van Lenten | 2016-05-19 | 23 | -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 gitignores | Thomas Van Lenten | 2016-05-19 | 2 | -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/rubyoneof | Joshua Haberman | 2016-05-19 | 3 | -24/+59 |
|\ \ \ | |/ / |/| | | Ruby oneofs: return default instead of nil for unset fields. | ||||
| * | | Fixed oneof behavior for enums and fixed JRuby. | Josh Haberman | 2016-05-18 | 3 | -11/+24 |
| | | | |||||
| * | | Ruby oneofs: return default instead of nil for unset fields. | Josh Haberman | 2016-05-18 | 2 | -20/+42 |
| | | | |||||
* | | | Merge pull request #1549 from xyzzyz/arena_export | Joshua Haberman | 2016-05-18 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Export class Arena to shared library. | ||||
| * | | | Export class Arena to shared library. | Adam Michalik | 2016-05-17 | 1 | -1/+1 |
| | |/ | |/| | | | | | | | | | | This got broken in commit 6ef984af4b0c63c1c33127a12dcfc8e6359f0c9e which integrated changes from internal branch. | ||||
* | | | Merge pull request #1547 from xyzzyz/js_generator | Joshua Haberman | 2016-05-18 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Fix #include in js_generator.cc | ||||
| * | | | Fix #include in js_generator.cc | Adam Michalik | 2016-05-17 | 1 | -1/+1 |
| |/ / | | | | | | | | | | | | | The commit 3b3c8abb9635eb3ea078a821a99c9ef29d66dff7 has replaced the <> with "" in #include statement in js_generator.cc | ||||
* | | | Merge pull request #1559 from google/beta-3 | Jisi Liu | 2016-05-18 | 2 | -1/+2 |
|\ \ \ | |_|/ |/| | | Merge beta-3 release branch again. | ||||
| * | | Merge pull request #1551 from pherl/beta-3 | Jisi Liu | 2016-05-17 | 1 | -1/+1 |
| |\ \ | | | | | | | | | Fix protoc artifact pom version | ||||
| | * | | Fix protoc artifact pom version | Jisi Liu | 2016-05-17 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge pull request #1546 from pherl/beta-3 | Jisi Liu | 2016-05-17 | 1 | -0/+1 |
| |\| | | | | | | | | | | Added download_url to be able to upload to pypi. | ||||
| | * | | Added download_url to be able to upload to pypi. | Jisi Liu | 2016-05-17 | 1 | -0/+1 |
| |/ / | |||||
* | | | Merge pull request #1412 from google/internal | Paul Yang | 2016-05-18 | 2 | -1/+2 |
|\ \ \ | | | | | | | | | Integrate interanl changes | ||||
| * | | | Integrate interanl changes | Bo Yang | 2016-05-18 | 2 | -1/+2 |
|/ / / | |||||
* | | | Merge pull request #1548 from anandolee/master | Joshua Haberman | 2016-05-17 | 2 | -1/+22 |
|\ \ \ | |_|/ |/| | | JSON format for Any message must print @type first | ||||
| * | | JSON format for Any message must print @type first, use OrderedDict instead ↵ | Jie Luo | 2016-05-17 | 2 | -1/+22 |
| | | | | | | | | | | | | of {} | ||||
* | | | Merge pull request #1542 from google/beta-3 | Jisi Liu | 2016-05-16 | 16 | -23/+206 |
|\ \ \ | | |/ | |/| | Merge Beta 3 release branch into master | ||||
| * | | Merge pull request #1540 from pherl/changelogv3.0.0-beta-3 | Jisi Liu | 2016-05-16 | 1 | -2/+8 |
| |\ \ | | | | | | | | | Update changes for lite | ||||
| | * | | Update changes for lite | Jisi Liu | 2016-05-16 | 1 | -2/+8 |
| | | | | |||||
| * | | | Merge pull request #1533 from pherl/mapcomment | Jisi Liu | 2016-05-16 | 1 | -3/+1 |
| |\ \ \ | | | | | | | | | | | Remove the comments about iterator validation | ||||
| | * | | | Remove the comments about iterator validation | Jisi Liu | 2016-05-13 | 1 | -3/+1 |
| |/ / / | | | | | | | | | | | | | As it may be implementation dependent. | ||||
| * | | | Merge pull request #1532 from pherl/changelog | Jisi Liu | 2016-05-13 | 1 | -1/+6 |
| |\| | | | | | | | | | | Update changelogs for C++ maps | ||||
| | * | | Update changelogs for C++ maps | Jisi Liu | 2016-05-13 | 1 | -1/+6 |
| |/ / | |||||
| * | | Merge pull request #1527 from haberman/changelog | Jisi Liu | 2016-05-12 | 1 | -1/+14 |
| |\ \ | | | | | | | | | Added release notes for Ruby and JavaScript. | ||||
| | * | | Added release notes for Ruby and JavaScript. | Josh Haberman | 2016-05-12 | 1 | -1/+14 |
| |/ / | |||||
| * | | Merge pull request #1520 from pherl/hashmapvs2008 | Jisi Liu | 2016-05-12 | 1 | -3/+55 |
| |\ \ | | | | | | | | | Bridge vs2008 hashmaps. | ||||
| | * | | Bridge vs2008 hashmaps. | Jisi Liu | 2016-05-11 | 1 | -3/+55 |
| | | | | |||||
| * | | | Merge pull request #1524 from anandolee/master | Jisi Liu | 2016-05-12 | 1 | -1/+5 |
| |\ \ \ | | | |/ | | |/| | python changes | ||||
| | * | | python changes | Jie Luo | 2016-05-11 | 1 | -1/+5 |
| | | | | |||||
| | * | | Merge pull request #1 from google/beta-3 | Jie Luo | 2016-05-11 | 862 | -26667/+104755 |
| | |\ \ | | |/ / | |/| | | Beta 3 | ||||
| * | | | Merge pull request #1515 from pherl/changelog-beta3 | Jisi Liu | 2016-05-11 | 1 | -0/+104 |
| |\ \ \ | | | | | | | | | | | Initial draft for changelog. |