Commit Graph

3252 Commits

Author SHA1 Message Date
Steven Parkes
ea1886661e pass correct args to protoc for java wellknown protos when used as an external repository 2016-03-10 15:04:46 -08:00
Feng Xiao
48ebb29a8e Merge pull request #1299 from tatraian/master
Fix compiling clang/libc++ builds. (Issue: #1266)
2016-03-08 11:15:24 -08:00
Antal Tátrai
e2fb1d9822 Comment has been added to fix (issue #1266) 2016-03-08 20:01:42 +01:00
Thomas Van Lenten
a8db268d8f Merge pull request #1309 from thomasvl/leading_special_prop_names
Fix up handing of fields with leading names that should be all caps.
2016-03-08 09:30:37 -05:00
Thomas Van Lenten
1bf4b38f29 Fix up handing of fields with leading names that should be all caps.
Add a compile test to confirm things are working as expected.
2016-03-08 09:29:49 -05:00
Joshua Haberman
3dd3238189 Merge pull request #1306 from silviulica/master
Update version to 3.0.0b2.post2
2016-03-07 16:31:48 -08:00
Silviu Calinoiu
4573edba76 Update version to 3.0.0b2.post2 2016-03-07 14:33:57 -08:00
Thomas Van Lenten
6a8815bef9 Merge pull request #1304 from thomasvl/headerdocs
HeaderDoc support in the library and generated sources
2016-03-07 15:11:18 -05:00
Thomas Van Lenten
36650a07cf HeaderDoc support in the library and generated sources
- Convert most of the core library headers over to HeaderDoc format.
- Switch the generated comments over to HeaderDoc.
- Create GPBCodedOutputStream_PackagePrivate and move some things into there
  that should be more internal.
2016-03-07 12:07:03 -05:00
Jon Skeet
f2d3408676 Merge pull request #1301 from avgweb/master
Replace StringBuilder with TextWriter in JsonFormatter
2016-03-07 09:37:43 +00:00
avgweb
ad2d775e1b Replace StringBuilder with TextWriter in JsonFormatter 2016-03-06 17:50:02 -08:00
Joshua Haberman
9242d9b7f4 Merge pull request #1298 from craigcitro/fix_setup
Add back the namespace_packages arg in setup.py.
2016-03-05 13:33:24 -08:00
Antal Tátrai
3cc35adb6d Fix compiling clang/libc++ builds. (Issue: #1266) 2016-03-05 09:32:59 +01:00
Craig Citro
0e7c0c2fb8 Add back the namespace_packages arg in setup.py.
Improves #1296.

The problem: in the previous patch, we tweaked the __init__.py files to use
namespaces, but no longer declared ourselves as a namespace package. The
second half was unwise.

Note that this only comes up when installing protobuf alongside another
package that also installs into the google namespace; as of right now, the
only PyPI package that does is googleapis-common-protos, though the GAE SDK
also uses google.appengine. Installing either or both of those alongside this
package now works.

The case that still remains is the upgrade path, which is also what worried me
in #713. It seems that if protobuf 2.6.1 is installed, there's no way to
safely upgrade that to work with a newer protobuf. However, `pip uninstall` &&
`pip install` does the trick.
2016-03-05 00:10:11 -08:00
Joshua Haberman
e70f9256af Merge pull request #1139 from haberman/rubyjsoncamel
Changed Ruby to properly camelCase its JSON by default.
2016-03-04 17:31:11 -08:00
Joshua Haberman
37663e861b Merge pull request #1292 from haberman/ruby-allow-descriptor
Generate well-known types in Ruby extension and prune unneeded proto2 dependencies.
2016-03-04 13:09:25 -08:00
Josh Haberman
35227b4f31 Removed the generated Ruby file from Makefile.am. 2016-03-03 23:52:31 -08:00
Josh Haberman
513875da77 Generate well-known types in Ruby extension and prune unneeded proto2 dependencies. 2016-03-03 14:08:54 -08: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
Josh Haberman
f654d49dd6 Updated upb from latest changes. 2016-02-18 11:48:54 -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
78da66698b Changed Ruby to properly camelCase its JSON by default. 2016-02-18 10:50:14 -08: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