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

3215 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jan Tattermusch
8f67b165f0 Merge pull request #1267 from jskeet/vs2015 
Require VS2015 in the solution file
 2016-02-22 12:46:36 -08:00
Feng Xiao
513a8a69df Merge pull request #804 from bsilver8192/master 
Add atomics support for 32-bit PPC.
 2016-02-22 09:27:27 -08:00
Jon Skeet
42371463de Require VS2015 in the solution file 2016-02-22 13:04:01 +00:00
Joshua Haberman
32daf513ce Merge pull request #1215 from haberman/commonjs 
Added support for CommonJS require()
 2016-02-19 14:39:17 -08:00
Josh Haberman
24c5424be5 Added a bit more to README.md, and allowed custom PROTOC var in tests. 2016-02-19 11:46:03 -08:00
Thomas Van Lenten
894c4d6a8b Merge pull request #1257 from thomasvl/objc_generics 
Support ObjC Generic Collections
 2016-02-19 10:45:32 -05:00
Jan Tattermusch
c003abb40d Merge pull request #1240 from jskeet/validate_group 
Validate that end-group tags match their corresponding start-group tags
 2016-02-18 14:38:06 -08:00
Joshua Haberman
4ab9186743 Merge pull request #1258 from haberman/releasenotes 
Some fixes for the most recent release notes.
 2016-02-18 14:15:34 -08:00
Josh Haberman
81e75c1f99 Some fixes for the most recent release notes. 2016-02-18 13:59:33 -08:00
Thomas Van Lenten
2480acb6d9 Support ObjC Generic Collections 
- Extend GPB*ObjectDictionary to support generic syntax.
- Update the generator to output generics so the enclosed type is exposed for compiler checks.
- Use generics in a the public interfaces.
- Update the generated sources that are checked in.
 2016-02-18 13:55:59 -05:00
Josh Haberman
907ad4a004 Properly camelCase when translating to CommonJS. 2016-02-18 10:46:44 -08:00
Josh Haberman
29d58d3392 Removed unused directives from tests that aren't run under CommonJS. 2016-02-18 10:40:07 -08:00
Josh Haberman
c348af2fc0 Addressed more code review comments. 2016-02-18 10:30:21 -08:00
Josh Haberman
7726cd207c Integrate review comments. 2016-02-18 10:30:21 -08:00
Josh Haberman
5195b7f296 Greatly expanded README.md. 2016-02-18 10:30:21 -08:00
Josh Haberman
59ea5000bb Use "node" as binary instead of "nodejs". 
"nodejs" does not exist on Travis, it appears.
 2016-02-18 10:30:21 -08:00
Josh Haberman
35298f9779 Fixed definition of extensions, and added CommonJS tests to Travis. 2016-02-18 10:30:21 -08:00
Josh Haberman
77af5d04b1 Fixed nested message scopes for CommonJS. 2016-02-18 10:30:21 -08:00
Josh Haberman
d6a186a8f1 Added some documentation in comments. 2016-02-18 10:30:21 -08:00
Josh Haberman
9e60036c1b Moved CommonJS-specific files to commonjs/. 2016-02-18 10:30:21 -08:00
Josh Haberman
e9f31ee3d7 CommonJS tests are now passing. 2016-02-18 10:30:21 -08:00
Josh Haberman
55cc3aa987 WIP. 2016-02-18 10:30:21 -08:00
Thomas Van Lenten
9ab11c6561 Merge pull request #1255 from thomasvl/mark_os_x_python_cpp_failing 
List python_cpp as failing on OS X
 2016-02-18 13:23:06 -05:00
Thomas Van Lenten
e0dd14cd3c List python_cpp as failing on OS X 2016-02-18 13:22:05 -05:00
Thomas Van Lenten
507213b472 Merge pull request #1254 from thomasvl/disable_xctool_updates 
Disable the xctool updates
 2016-02-18 13:12:43 -05:00
Thomas Van Lenten
8c784506aa Disable the xctool updates 
In light of https://github.com/google/protobuf/issues/1232, disable the xctool
update so we stay on 0.2.7 which seems to work better.

Remove the passing of -newSimulatorInstance since the older xctool doesn't
support it.
 2016-02-18 12:13:20 -05:00
Jon Skeet
abc09f795e Merge pull request #1239 from jskeet/call_generate_protos 
Generate C# code whenever descriptor.proto changes
 2016-02-18 06:45:51 +00:00
Joshua Haberman
c40f8c1f54 Merge pull request #1229 from keveman/unlimited_binary_proto 
Added ALLOW_UNLIMITED_BINARY_PROTO macro and setting it when
 2016-02-17 16:09:35 -08:00
Jan Tattermusch
61e8e2186f Merge pull request #1241 from jskeet/more-merge-wrapper-tests 
Add more tests around merging wrappers
 2016-02-17 16:07:50 -08:00
Joshua Haberman
d41db75dcb Merge pull request #260 from ejsd1989/issue-#242 
Removes redundant null pointer checks checks
 2016-02-16 16:47:46 -08:00
Joshua Haberman
8fc045d8d2 Merge pull request #1224 from google/rubysentinel 
Removed 'optional' from proto3 syntax file.
 2016-02-16 15:43:21 -08:00
Manjunath Kudlur
99a3e30bd7 Added PROTOBUF_PYTHON_ALLOW_OVERSIZE_PROTOS macro and setting it when 
--allow_oversize_protos=true is passed to bazel build.
When this macro is set, SetTotalBytesLimit is called to remove
the 64MB limit on binary protos when during ParseFromString.
 2016-02-16 15:17:10 -08:00
Thomas Van Lenten
7cf5b817cb Merge pull request #1247 from thomasvl/xctool_plain_output 
Move the xctool use of -reporter into a common spot and always use "plain" to get more readable logs on travis.
 2016-02-16 16:03:17 -05:00
Thomas Van Lenten
efca368939 Move the xctool use of -reporter into a common spot and always use "plain" to get more readable logs on travis. 2016-02-16 15:10:14 -05:00
Thomas Van Lenten
ee819ea724 Merge pull request #1245 from thomasvl/tweak_xctool_ios_run 
Tweak the xctool run for iOS tests to try and sort out flake
 2016-02-16 14:27:57 -05:00
Thomas Van Lenten
30e645b6b6 Tweak the xctool run for iOS tests to try and sort out flake 
- Use the plain reporter for slightly more readable logs.
- Add -newSimulatorInstance to the run-tests to see if it helps with flake.
 2016-02-16 11:16:42 -05:00
Thomas Van Lenten
7d1cc109cf Merge pull request #1244 from thomasvl/bump_xcode_version 
Bump up travis to Xcode 7.2
 2016-02-16 11:14:47 -05:00
Thomas Van Lenten
1324119a42 Bump up travis to Xcode 7.2 
- Update simulator versions used.
- Mark the iOS tests as flaky while trying to dig out the root cause.
 2016-02-16 09:19:50 -05:00
Jon Skeet
0262e04dbb Add more tests around merging wrappers 
This was in an attempt to fix the wrapper handling corner case, but it's really fiddly.
 2016-02-15 14:17:02 +00:00
Jon Skeet
9bdc848832 Validate that end-group tags match their corresponding start-group tags 
This detects:
- An end-group tag with the wrong field number (doesn't match the start-group field)
- An end-group tag with no preceding start-group tag

Fixes issue #688.
 2016-02-15 11:58:01 +00:00
Jon Skeet
957e877d52 Generate C# code whenever descriptor.proto changes 
This is a start to fixing issue #1212. It won't help for test protos,
conformance etc, but it will definitely be better than nothing, and
would have highlighted a change in descriptor.proto which broken C#
earlier.
 2016-02-15 10:33:13 +00:00
Paul Yang
e35e24800f Merge pull request #1226 from jcanizales/patch-1 
Include 'source' attribute in the podspec
 2016-02-12 15:00:38 -08:00
Joshua Haberman
3ee2e20539 Merge pull request #1144 from dongjoon-hyun/remove_redundant_the 
Remove redundant `the`.
 2016-02-11 17:17:48 -08:00
Dongjoon Hyun
86325d7c95 Rewrap the line 2016-02-11 12:47:52 -08:00
Joshua Haberman
caf1fb7197 Merge pull request #997 from anderscarling/better_errors 
ruby: Better exception text for common cases
 2016-02-11 12:41:34 -08:00
Joshua Haberman
e088c2cf4b Merge pull request #1178 from lebauce/fix-readme-typos 
Fix typos in README.md
 2016-02-11 12:35:40 -08:00
Joshua Haberman
635ce854ed Merge pull request #1179 from ParthKolekar/python-examples-with 
Updated python examples to use with.
 2016-02-11 12:32:42 -08:00
Joshua Haberman
d2c7fe6bc5 Merge pull request #1194 from Photonios/master 
Fixed unused parameters and extra ';'
 2016-02-11 11:36:34 -08:00
Joshua Haberman
655a9d667f Merge pull request #1217 from jhump/jh/make-warning-useful 
make 'no syntax' warning useful by showing which file
 2016-02-11 10:43:47 -08:00
Jan Tattermusch
2d3f79f7d6 Merge pull request #1218 from jskeet/nuspec-dependencies 
nuspec dependency fixes
 2016-02-11 10:38:35 -08:00