aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Bump version number to beta-3.1v3.0.0-beta-3.1objc-framework-fixBo Yang2016-06-131-1/+1
|
* Automated testing tweaks for ObjCThomas Van Lenten2016-06-133-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.
* Better support for using the proto library from a framework.Thomas Van Lenten2016-06-1328-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
* Make the CocoaPods integration tests more robustThomas Van Lenten2016-06-135-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.
* Add shared schemes for the CocoaPods integration testsThomas Van Lenten2016-06-132-0/+182
| | | | | Otherwise the projects have to be opened once to create user schemes for the command line builds to work.
* Expand the OS X/Xcode gitignoresThomas Van Lenten2016-06-132-7/+28
| | | | | - Add the folder CocoaPods will add to the root folder. - Move and expand the entries in the objectivec directory.
* CocoaPod Integration TestsThomas Van Lenten2016-06-1323-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.
* 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.
| * Bridge vs2008 hashmaps.Jisi Liu2016-05-111-3/+55
| |
* | Merge pull request #1524 from anandolee/masterJisi Liu2016-05-121-1/+5
|\ \ | | | | | | python changes
| * | python changesJie Luo2016-05-111-1/+5
| | |
| * | Merge pull request #1 from google/beta-3Jie Luo2016-05-11862-26667/+104755
| |\ \ | |/ / |/| | Beta 3
* | | Merge pull request #1515 from pherl/changelog-beta3Jisi Liu2016-05-111-0/+104
|\ \ \ | | | | | | | | Initial draft for changelog.
| * | | Update comments for csharp, zero-copy and objc.Jisi Liu2016-05-111-3/+55
| | | |
| * | | Fix typo.Jisi Liu2016-05-111-1/+1
| | | |
| * | | Initial draft for changelog.Jisi Liu2016-05-101-0/+52
| | |/ | |/|
* | | Merge pull request #1512 from pherl/beta-3Jisi Liu2016-05-1112-14/+14
|\ \ \ | | | | | | | | Update version numbers for beta3
| * | | Fix csharp versionJisi Liu2016-05-111-1/+1
| | | |
| * | | Update version numbers for other languagesJisi Liu2016-05-108-10/+10
| | | |
| * | | Update version numbers for beta3Jisi Liu2016-05-103-3/+3
| |/ /
* | | Merge pull request #1514 from pherl/fix_heap_checkJisi Liu2016-05-101-3/+4
|\ \ \ | | | | | | | | Fix the command line interface unittest again
| * | | Fix the command line interface unittest againJisi Liu2016-05-101-3/+4
| |/ / | | | | | | | | | | | | This time move the macro inside namespaces; hopefully will work with the integration script.
* | | Merge pull request #1513 from pherl/fix-build-protocJisi Liu2016-05-101-1/+1
|\ \ \ | |/ / |/| | Fix protoc build artifact script.
| * | Fix protoc build artifact script.Jisi Liu2016-05-101-1/+1
|/ / | | | | | | pbconfig.h has gone. This commit removes the target.
* | Merge pull request #1510 from thomasvl/nonnullv3.0.0-beta-3-pre-1Thomas Van Lenten2016-05-102-65/+90
|\ \ | | | | | | Declare an init and avoid passing NULL to initWithValue:count:
| * | Declare an init and avoid passing NULL to initWithValue:count:Thomas Van Lenten2016-05-102-65/+90
| | | | | | | | | | | | Fixes https://github.com/google/protobuf/issues/1189
* | | Merge pull request #1498 from thomasvl/build_cleanupJoshua Haberman2016-05-093-3/+110
|\ \ \ | |/ / |/| | Build cleanup
| * | Add the missing maintiner-clean entry for benchmarksThomas Van Lenten2016-05-061-0/+3
| | |
| * | Properly express all outputs for the conformance buildThomas Van Lenten2016-05-061-3/+105
| | | | | | | | | | | | | | | - Fixes up `make distclean` and `make maintainer-clean` - Fixes the build so make is more likely to notice if one of those files is stale/missing.
| * | Add two missing ignores for conformance directory.Thomas Van Lenten2016-05-061-0/+2
| | |
* | | Merge pull request #1502 from pherl/masterJisi Liu2016-05-066-1492/+0
|\ \ \ | | | | | | | | Remove accidentally restored deleted files.
| * | | Remove accidentally restored deleted files.Jisi Liu2016-05-066-1492/+0
| | | |
* | | | Merge pull request #1494 from pherl/masterJisi Liu2016-05-065-6/+6
|\| | | | | | | | | | | Fix the std::string error introduced in integration.
| * | | Fix using std::shared_ptrJisi Liu2016-05-055-5/+5
| | | |
| * | | Fix the std::string error introduced in integration.Jisi Liu2016-05-051-1/+1
| | | |
* | | | Merge pull request #1499 from beardedN5rd/masterFeng Xiao2016-05-061-1/+4
|\ \ \ \ | | | | | | | | | | updated README
| * | | | after comment of Feng Xiao changed the entry to g++beardedn5rd2016-05-061-2/+2
| | | | |
| * | | | updated READMEbeardedn5rd2016-05-061-1/+4
| | | | |
* | | | | Merge pull request #1496 from ozkuran/masterFeng Xiao2016-05-061-1/+1
|\ \ \ \ \ | |_|_|/ / |/| | | | Updated README.md
| * | | | Updated README.mdMahmut Ali ÖZKURAN2016-05-061-1/+1
|/ / / / | | | | | | | | Added relative link to cmake guide.
* | | | Merge pull request #1471 from jskeet/any-hostJon Skeet2016-05-066-23/+88
|\ \ \ \ | |_|/ / |/| | | Allow custom type URL prefixes in Any.Pack
| * | | Allow custom type URL prefixes in Any.PackJon Skeet2016-04-296-23/+88
| | | | | | | | | | | | | | | | | | | | | | | | (And likewise ignore the prefix in unpack.) Fixes issue #1459.
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-15 14:25:58 +0000