AuroraMiddleware/protobuf
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity
3,782 Commits 35 Branches 138 Tags 124 MiB
4041ed4c0d
Commit Graph

3782 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jisi Liu
4041ed4c0d objc change log 2016-09-02 11:24:58 -07:00
Jisi Liu
9befe47924 Merge pull request #1978 from pherl/cp 
Cherry-pick into 3.0.0-GA branch: Add a jenkins test status badge.
 2016-09-02 11:12:43 -07:00
Jisi Liu
9d30a98893 Merge pull request #2026 from pherl/cpjs 
Fix missing import of jspb.Map (#1885)
 2016-09-02 11:12:25 -07:00
Feng Xiao
52e491b3bb Use 64-bit protoc binaries in compatibility tests. 
Turns out travis doesn't have the library dependencies to run a 32-bit
binary.

Change-Id: I5fadbcade2eb71c1e9ce21d90fa9459797df0e81
 2016-08-31 11:36:37 -07:00
Joshua Haberman
dd45c0b9fd Merge pull request #2012 from haberman/rubymapgcfix 
Ruby: make sure map parsing frames are GC-rooted.
 2016-08-30 09:57:50 -07:00
Guillaume Egles
8335b7d93e Fix missing import of jspb.Map (#1885) 2016-08-29 16:30:48 -07:00
Jisi Liu
4fd4471de2 Merge pull request #2014 from pherl/fixgmock 
Change autogen.sh to download the zip from github
 2016-08-26 14:54:44 -07:00
Feng Xiao
1760feb621 Update gmock links. 
The original link is no longer available.

Change-Id: I2976d3f19c8e818689549fb31ff20af8eae92a07
 2016-08-26 09:42:33 -07:00
Feng Xiao
1e6dc7d2c3 Update links in appveyor.yml 
Change-Id: I3d44e3c6877e00cfea5a903568fde1e6f597aac1
 2016-08-26 09:42:33 -07:00
Feng Xiao
8b301451bc Add a jenkins test status badge. 
[ci skip]

Change-Id: I5bf4f204e7ef0144d8fc984a985d502f92ce95ce
 2016-08-18 10:34:44 -07:00
Thomas Van Lenten
45d04d0296 Merge pull request #1977 from thomasvl/bump_cocoapod_spec 
Bump the version in prep for the 3.0.2 tag being cut
 2016-08-18 08:32:20 -04:00
Thomas Van Lenten
584917fe84 Bump the version in prep for the 3.0.2 tag being cut 
Also pull the watchos support info from master.
 2016-08-17 16:53:14 -04:00
Thomas Van Lenten
564c02f5cb Merge pull request #1975 from pherl/cp 
Cherry pick objc changes into 3.0.0-GA branch
 2016-08-17 16:11:53 -04:00
Thomas Van Lenten
a877fdfafe Record zero for "has" for proto3 if in a oneof. 
If a message is proto3, then the zero values still count as being set one the
field is in a oneof.

Add tests to confirm oneofs work as expected in both syntaxes.
 2016-08-17 10:54:52 -07:00
Thomas Van Lenten
116596a4e6 Never use strlen on utf8 runs so null characters work. 
Fixes https://github.com/google/protobuf/issues/1933

Add a new test that forces strings into two different implementations from the
NSString class cluster to help confirm we're exercising both paths by which
CodedOutputStream will extract data from an NSString.

Move the old +load test (that was flawed because the behavior really depends on
the type of string from the NSString class cluster); into a unittest that
targets the specific case we're adding a behavior confirmation on.

As a bonus, improve the TextFormat generation of string characters < 0x20.
 2016-08-17 10:51:07 -07:00
Sergio Campamá
62f2ff86b5 Fixes extra whitespace on generated comments. (#1950) 
Fixes extra whitespace on generated comments.
 2016-08-17 10:50:58 -07:00
Sergio Campamá
a989501f47 Adds support for appledoc in generated code. (#1928) 
Convert mapping of proto comments to appledoc format so they show up in Xcode and cocoadocs.

Fixes https://github.com/google/protobuf/issues/1866
 2016-08-17 10:50:52 -07:00
Sergio Campamá
42ab9b4442 Migrating documentation of the ObjectiveC runtime code to appledoc. (#1867) 
Work for #1866 

Migrates all the public class docs over to appledoc format.  While Xcode is fine with blank lines in `///` comments, appledoc (used by cocoadocs) isn't and was leaving a bunch of info off the doc pages.

The generator still needs to be updated to do this also; that will be a follow up CL.
 2016-08-17 10:50:06 -07:00
Jisi Liu
cf42b608e0 Merge pull request #1905 from pherl/fixdoc 
Add and fix C++ runtime docs
 2016-08-02 12:46:00 -07:00
Jisi Liu
3916a0aa99 Add and fix C++ runtime docs 2016-08-02 10:13:05 -07:00
Jisi Liu
3ef07568cd Merge pull request #1894 from pherl/fixdist 
Add python/setup.cfg into dist files
 2016-07-29 14:43:52 -07:00
Jisi Liu
e139117108 Add python/setup.cfg into dist files 2016-07-29 14:40:05 -07:00
Jisi Liu
c4790429fc Merge pull request #1892 from xfxyjwf/compatibility_tests 
Run Java compatibility tests on Travis.
 2016-07-29 14:24:42 -07:00
Feng Xiao
baa4023cd5 Run Java compatibility tests on Travis. 
The test is testing the binary/source compatibility between 3.0.0-beta-4
and the current version (right now it's 3.0.0).

Change-Id: Ic410b535758b38cee7baa99a15a0433734df44e6
 2016-07-29 14:11:21 -07:00
Jisi Liu
f3449e5f57 Merge pull request #1891 from pherl/python 
add setup.cfg for building wheels
 2016-07-29 14:04:26 -07:00
Jisi Liu
811674f479 add setup.cfg for building wheels 2016-07-29 14:02:07 -07:00
Jisi Liu
7e93458bb7 Merge pull request #1888 from pherl/fixbuildzip 
Fix the build-zip.sh to add .exe for win packages.
 2016-07-29 11:47:47 -07:00
Jisi Liu
6a59ac94e1 Fix the build-zip.sh to add .exe for win packages. 2016-07-29 11:44:05 -07:00
Jisi Liu
de30c56391 Merge pull request #1874 from pherl/buildzip 
Change the build.zip.sh to support lite
 2016-07-28 14:48:46 -07:00
Jisi Liu
e3fac65add Change the build.zip.sh to support lite 2016-07-28 14:24:05 -07:00
Jisi Liu
2662fd3d0c Merge pull request #1871 from pherl/fixwin 
Fix build protoc script for windows
 2016-07-28 12:53:42 -07:00
Jisi Liu
1b1a8f4017 Fix build protoc script for windows 2016-07-28 19:07:54 +00:00
Jisi Liu
e8ae137c96 Merge pull request #1864 from pherl/galogs 
Change log for 3.0 GA release.
 2016-07-27 14:40:30 -07:00
Jisi Liu
e0d817e0de Change log for 3.0 GA release. 2016-07-27 12:08:01 -07:00
Jisi Liu
7ba044a1c0 Merge pull request #1853 from pherl/3.0.0-GA 
Make protoc-artifacts able to build plugins.
 2016-07-26 16:51:47 -07:00
Jisi Liu
7c9c314ca7 fix comments. 2016-07-26 16:51:30 -07:00
Jisi Liu
0750797db4 Merge remote-tracking branch 'origin/3.0.0-GA' into 3.0.0-GA 2016-07-26 16:36:37 -07:00
Jisi Liu
54feb9ac24 Fix the script comments. 2016-07-26 16:35:28 -07:00
Jisi Liu
b1aac0b4ed Make protoc-artifacts able to build plugin. 2016-07-26 16:34:30 -07:00
Jisi Liu
032fb914e2 Merge branch 'master' of github.com:google/protobuf into 3.0.0-GA 2016-07-26 12:29:03 -07:00
Feng Xiao
b6b521b6b7 Merge pull request #1851 from xfxyjwf/cint 
Fixes traivs cpp build.
 2016-07-26 12:15:31 -07:00
Feng Xiao
12581b4c8e Fixes traivs cpp build. 
Remove the use of INT64_C/UINT64_C and add static_cast when neccessary.
 2016-07-26 11:59:39 -07:00
Joshua Haberman
234ec01795 Merge pull request #1847 from haberman/GAfixes 
GA fixes
 2016-07-26 10:55:34 -07:00
Josh Haberman
43b36dd983 Fixed Makefile.am for Ruby file rename. 2016-07-26 10:28:18 -07:00
Jisi Liu
f11a4f1fe4 Merge pull request #1841 from pherl/3.0.0-GA 
Bump version number for GA
 2016-07-26 10:01:16 -07:00
Josh Haberman
b3b07cd851 Merge branch 'master' into 3.0.0-GA 
We need to pick up some of the last-minute Ruby fixes.
 2016-07-25 17:39:07 -07:00
Joshua Haberman
ba52f2b678 Merge pull request #1788 from google/rubypackagecap 
Ruby: translate package names from snake_case -> PascalCase.
 2016-07-25 16:48:32 -07:00
Feng Xiao
c43f71886d Merge pull request #1846 from xfxyjwf/zip 
Add a script to build protoc zip packages.
 2016-07-25 15:35:13 -07:00
Josh Haberman
97e20261ac Added new file to ruby_EXTRA_DIST. 2016-07-25 15:16:23 -07:00
Josh Haberman
6d92233e72 Added unit test for PascalCasing package names in Ruby. 2016-07-25 15:16:23 -07:00