organicmaps/protobuf
13
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions
3477 commits 28 branches 36 tags 41 MiB
Commit graph

3477 commits

This branch
This branch
All branches
Author SHA1 Message Date
Bo Yang
137d6a09bb Bump version number to beta-3.1 2016-06-13 17:02:01 -07:00
Thomas Van Lenten
98f0f37ba0 Automated testing tweaks for ObjC 
- 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.
 2016-06-13 13:55:20 -07:00
Thomas Van Lenten
72df844697 Better support for using the proto library from a framework. 
- 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
 2016-06-13 13:55:00 -07:00
Thomas Van Lenten
1445ce2809 Make the CocoaPods integration tests more robust 
- 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.
 2016-06-13 13:53:59 -07:00
Thomas Van Lenten
61fa92df65 Add shared schemes for the CocoaPods integration tests 
Otherwise the projects have to be opened once to create user schemes for the
command line builds to work.
 2016-06-13 13:53:26 -07:00
Thomas Van Lenten
9e91571bb9 Expand the OS X/Xcode gitignores 
- Add the folder CocoaPods will add to the root folder.
- Move and expand the entries in the objectivec directory.
 2016-06-13 13:52:50 -07:00
Thomas Van Lenten
7e4fb76ac0 CocoaPod Integration Tests 
- 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.
 2016-06-13 13:52:32 -07:00
Jisi Liu
3470b6895a Merge pull request #1540 from pherl/changelog 
Update changes for lite
 2016-05-16 11:34:04 -07:00
Jisi Liu
cf1fd7ed65 Merge pull request #1533 from pherl/mapcomment 
Remove the comments about iterator validation
 2016-05-16 11:33:46 -07:00
Jisi Liu
0ec34bfbc1 Update changes for lite 2016-05-16 11:20:33 -07:00
Jisi Liu
5e7c4cb3f6 Remove the comments about iterator validation 
As it may be implementation dependent.
 2016-05-13 18:12:57 -07:00
Jisi Liu
f2db1e0e39 Merge pull request #1532 from pherl/changelog 
Update changelogs for C++ maps
 2016-05-13 17:47:10 -07:00
Jisi Liu
034867f762 Update changelogs for C++ maps 2016-05-13 16:16:14 -07:00
Jisi Liu
b126706cf0 Merge pull request #1527 from haberman/changelog 
Added release notes for Ruby and JavaScript.
 2016-05-12 17:57:29 -07:00
Josh Haberman
d346f4998d Added release notes for Ruby and JavaScript. 2016-05-12 17:55:56 -07:00
Jisi Liu
9f84114864 Merge pull request #1520 from pherl/hashmapvs2008 
Bridge vs2008 hashmaps.
 2016-05-12 10:34:40 -07:00
Jisi Liu
f9fd4509f6 Merge pull request #1524 from anandolee/master 
python changes
 2016-05-12 10:29:32 -07:00
Jie Luo
e4ca694cdf python changes 2016-05-11 16:39:50 -07:00
Jie Luo
e1f588ae3c Merge pull request #1 from google/beta-3 
Beta 3
 2016-05-11 16:07:43 -07:00
Jisi Liu
71dd9c4a5e Merge pull request #1515 from pherl/changelog-beta3 
Initial draft for changelog.
 2016-05-11 15:32:19 -07:00
Jisi Liu
ede9cc4bd5 Update comments for csharp, zero-copy and objc. 2016-05-11 15:30:21 -07:00
Jisi Liu
19472bf5cb Merge pull request #1512 from pherl/beta-3 
Update version numbers for beta3
 2016-05-11 15:10:24 -07:00
Jisi Liu
017d390d65 Fix csharp version 2016-05-11 15:09:43 -07:00
Jisi Liu
dbdf6d9085 Bridge vs2008 hashmaps. 2016-05-11 14:59:55 -07:00
Jisi Liu
5668e2e426 Fix typo. 2016-05-11 14:57:06 -07:00
Jisi Liu
c67879b9fa Merge pull request #1514 from pherl/fix_heap_check 
Fix the command line interface unittest again
 2016-05-10 17:35:08 -07:00
Jisi Liu
0e4d1ea116 Initial draft for changelog. 2016-05-10 17:32:35 -07:00
Jisi Liu
e8737d8676 Fix the command line interface unittest again 
This time move the macro inside namespaces; hopefully will work with the
integration script.
 2016-05-10 16:20:08 -07:00
Jisi Liu
cdd3ec7c2f Merge pull request #1513 from pherl/fix-build-protoc 
Fix protoc build artifact script.
 2016-05-10 15:51:32 -07:00
Jisi Liu
25dd69002f Fix protoc build artifact script. 
pbconfig.h has gone. This commit removes the target.
 2016-05-10 15:48:54 -07:00
Jisi Liu
5dea2017db Update version numbers for other languages 2016-05-10 15:43:39 -07:00
Jisi Liu
dbed8a0154 Update version numbers for beta3 2016-05-10 14:49:42 -07:00
Thomas Van Lenten
a1938b2aa9 Merge pull request #1510 from thomasvl/nonnull 
Declare an init and avoid passing NULL to initWithValue:count:
 2016-05-10 11:24:56 -04:00
Thomas Van Lenten
4755bdc5f9 Declare an init and avoid passing NULL to initWithValue:count: 
Fixes https://github.com/google/protobuf/issues/1189
 2016-05-10 11:15:51 -04:00
Joshua Haberman
4c6259bbe8 Merge pull request #1498 from thomasvl/build_cleanup 
Build cleanup
 2016-05-09 13:27:27 -07:00
Jisi Liu
d392ed4577 Merge pull request #1502 from pherl/master 
Remove accidentally restored deleted files.
 2016-05-06 16:25:39 -07:00
Jisi Liu
ce6bec74fd Remove accidentally restored deleted files. 2016-05-06 15:57:06 -07:00
Jisi Liu
9d0f56058a Merge pull request #1494 from pherl/master 
Fix the std::string error introduced in integration.
 2016-05-06 15:40:58 -07:00
Feng Xiao
76a96d4690 Merge pull request #1499 from beardedN5rd/master 
updated README
 2016-05-06 15:23:45 -07:00
beardedn5rd
2eb774e602 after comment of Feng Xiao changed the entry to g++ 2016-05-06 22:47:17 +02:00
Feng Xiao
ace2690be1 Merge pull request #1496 from ozkuran/master 
Updated README.md
 2016-05-06 13:36:37 -07:00
Thomas Van Lenten
b661fb5000 Add the missing maintiner-clean entry for benchmarks 2016-05-06 12:47:41 -04:00
Thomas Van Lenten
ce2ef0d705 Properly express all outputs for the conformance build 
- 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.
 2016-05-06 12:41:23 -04:00
Thomas Van Lenten
f367642103 Add two missing ignores for conformance directory. 2016-05-06 11:44:42 -04:00
beardedn5rd
b12f630e81 updated README 2016-05-06 14:49:52 +02:00
Mahmut Ali ÖZKURAN
9b3357ddac Updated README.md 
Added relative link to cmake guide.
 2016-05-06 10:16:28 +03:00
Jon Skeet
5b5e369b18 Merge pull request #1471 from jskeet/any-host 
Allow custom type URL prefixes in Any.Pack
 2016-05-06 06:29:03 +01:00
Jisi Liu
f8a5c5f746 Fix using std::shared_ptr 2016-05-05 16:34:42 -07:00
Jisi Liu
75e5898513 Fix the std::string error introduced in integration. 2016-05-05 16:04:30 -07:00
Feng Xiao
17b6fc31eb Merge pull request #1409 from eeight/fix_enum_corruption 
Fix bug with silent message corruption in LITE_RUNTIME.
 2016-05-04 10:55:13 -07:00