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

3233 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jisi Liu
3b3c8abb96 Integrate google internal changes. 2016-03-30 11:39:59 -07:00
Paul Yang
78105897a8 Merge pull request #1260 from legrosbuffle/master 
Make cpp generated enum constants constexpr when Options::proto_h is specified
 2016-03-02 10:16:20 -08:00
Jon Skeet
584233bd04 Merge pull request #1287 from jskeet/fix-typo 
Fix copy/paste typo in CodedInputStreamTest
 2016-03-01 07:53:27 +00:00
Jon Skeet
f222a9a5e6 Fix copy/paste typo in CodedInputStreamTest 2016-03-01 07:30:40 +00:00
Joshua Haberman
52f62e3652 Merge pull request #1274 from murgatroid99/node_relative_requires 
Fix CommonJS relative require generation, and test it
 2016-02-29 10:09:56 -08:00
Jan Tattermusch
9f775a82cd Merge pull request #1286 from jskeet/idisposable 
Implement IDisposable for CodedInputStream and CodedOutputStream
 2016-02-29 09:27:06 -08:00
Jon Skeet
c0cf71bec9 Implement IDisposable for CodedInputStream and CodedOutputStream 
This fixes issue #679 and issue #1282.
(The .gitignore change is just around ncrunch; I can put it in a separate PR if you really want.)
 2016-02-29 11:51:56 +00:00
Jisi Liu
60a0d41a29 Merge pull request #1233 from davidzchen/python-path 
Remove hack for building Python support with Bazel.
 2016-02-25 13:02:55 -08:00
David Z. Chen
985c968443 Remove hack for building Python support with Bazel. 
This change makes use of new imports attribute for Bazel's Python rules, which
enable adding directories to the PYTHONPATH. This allows us to remove
the hack for building protobuf's Python support with Bazel and now
allows projects to include protobuf using a Bazel external repository
rather than requiring it to be imported directly into the source tree as
//google/protobuf.

This change also updates the protobuf BUILD file to use a named
repository, @python//, for including Python headers rather than
//util/python. This allows projects to specify their own package for
Python headers when including protobuf with an external repository.

Fixes #1230
 2016-02-25 12:52:21 -08:00
Jisi Liu
fb714b3606 Merge pull request #1275 from keveman/grpc_support 
Fixed grpc C++ plugin support.
 2016-02-25 12:34:27 -08:00
Manjunath Kudlur
f5c736352e Fixed grpc C++ plugin support. 
grpc C++ plugin generates additional files, namely .grpc.pb.cc and
.grpc.pb.h. Adding these files to the outs of the _proto_gen rule, so
dependents don't complain about undeclared inclusions. Also, compiling
the .grpc.pb.cc requires additional header files from the grpc library,
so added //external:grpc_lib to the deps of the
cc_library. Clients are expected to declare that in their bazel
WORKSPACE, pointing it to @grpc//:grpc++{_unsecure}.
 2016-02-25 08:50:50 -08:00
murgatroid99
c9f8a1b006 Moved CommonJS-specific files into commonjs directory 2016-02-24 14:23:08 -08:00
murgatroid99
a862b6b77f Fix CommonJS relative require generation, and test it 2016-02-24 13:44:57 -08:00
Joshua Haberman
cc775f7ac1 Merge pull request #1259 from silviulica/master 
Add a modified patch from craigcitro@ to handle namespace sharing.
 2016-02-24 10:50:03 -08:00
Jisi Liu
fc51bdc033 Merge pull request #1268 from keveman/grpc_support 
Added grpc plugin support to cc_proto_library.
 2016-02-23 10:53:45 -08:00
Manjunath Kudlur
f0966a746e Added grpc plugin support to cc_proto_library. 
cc_proto_library now supports use_grpc_plugin flag that passes
--plugin=protoc-gen-grpc=grpc_cpp_plugin to protoc compiler
invocation. grpc_cpp_plugin is assumed to be present as
//external:grpc_cpp_plugin, so clients can setup their WORKSPACE files
appropriately to point to grpc location using bind.
 2016-02-22 14:30:43 -08:00
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
Clement Courbet
b3d802d215 Make cpp generated enum constants constexpr when Options::proto_h is 
specified.
 2016-02-19 08:24:29 +01:00
Silviu Calinoiu
786f80fe66 Add a modified patch from craigcitro@ to handle namespace sharing. 2016-02-18 16:12:11 -08: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