aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAge
* pass correct args to protoc for java wellknown protos when used as an ↵Gravatar Steven Parkes2016-03-10
| | | | external repository
* Merge pull request #1299 from tatraian/masterGravatar Feng Xiao2016-03-08
|\ | | | | Fix compiling clang/libc++ builds. (Issue: #1266)
| * Comment has been added to fix (issue #1266)Gravatar Antal Tátrai2016-03-08
| |
* | Merge pull request #1309 from thomasvl/leading_special_prop_namesGravatar Thomas Van Lenten2016-03-08
|\ \ | | | | | | Fix up handing of fields with leading names that should be all caps.
| * | Fix up handing of fields with leading names that should be all caps.Gravatar Thomas Van Lenten2016-03-08
|/ / | | | | | | Add a compile test to confirm things are working as expected.
* | Merge pull request #1306 from silviulica/masterGravatar Joshua Haberman2016-03-07
|\ \ | | | | | | Update version to 3.0.0b2.post2
| * | Update version to 3.0.0b2.post2Gravatar Silviu Calinoiu2016-03-07
| | |
* | | Merge pull request #1304 from thomasvl/headerdocsGravatar Thomas Van Lenten2016-03-07
|\ \ \ | | | | | | | | HeaderDoc support in the library and generated sources
| * | | HeaderDoc support in the library and generated sourcesGravatar Thomas Van Lenten2016-03-07
|/ / / | | | | | | | | | | | | | | | | | | - 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.
* | | Merge pull request #1301 from avgweb/masterGravatar Jon Skeet2016-03-07
|\ \ \ | | | | | | | | Replace StringBuilder with TextWriter in JsonFormatter
| * | | Replace StringBuilder with TextWriter in JsonFormatterGravatar avgweb2016-03-06
|/ / /
* | | Merge pull request #1298 from craigcitro/fix_setupGravatar Joshua Haberman2016-03-05
|\ \ \ | | | | | | | | Add back the namespace_packages arg in setup.py.
| | | * Fix compiling clang/libc++ builds. (Issue: #1266)Gravatar Antal Tátrai2016-03-05
| |_|/ |/| |
| * | Add back the namespace_packages arg in setup.py.Gravatar Craig Citro2016-03-05
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | Merge pull request #1139 from haberman/rubyjsoncamelGravatar Joshua Haberman2016-03-04
|\ \ | | | | | | Changed Ruby to properly camelCase its JSON by default.
* \ \ Merge pull request #1292 from haberman/ruby-allow-descriptorGravatar Joshua Haberman2016-03-04
|\ \ \ | | | | | | | | Generate well-known types in Ruby extension and prune unneeded proto2 dependencies.
| * | | Removed the generated Ruby file from Makefile.am.Gravatar Josh Haberman2016-03-03
| | | |
| * | | Generate well-known types in Ruby extension and prune unneeded proto2 ↵Gravatar Josh Haberman2016-03-03
|/ / / | | | | | | | | | dependencies.
* | | Merge pull request #1260 from legrosbuffle/masterGravatar Paul Yang2016-03-02
|\ \ \ | | | | | | | | Make cpp generated enum constants constexpr when Options::proto_h is specified
* \ \ \ Merge pull request #1287 from jskeet/fix-typoGravatar Jon Skeet2016-03-01
|\ \ \ \ | | | | | | | | | | Fix copy/paste typo in CodedInputStreamTest
| * | | | Fix copy/paste typo in CodedInputStreamTestGravatar Jon Skeet2016-03-01
|/ / / /
* | | | Merge pull request #1274 from murgatroid99/node_relative_requiresGravatar Joshua Haberman2016-02-29
|\ \ \ \ | | | | | | | | | | Fix CommonJS relative require generation, and test it
* \ \ \ \ Merge pull request #1286 from jskeet/idisposableGravatar Jan Tattermusch2016-02-29
|\ \ \ \ \ | | | | | | | | | | | | Implement IDisposable for CodedInputStream and CodedOutputStream
| * | | | | Implement IDisposable for CodedInputStream and CodedOutputStreamGravatar Jon Skeet2016-02-29
|/ / / / / | | | | | | | | | | | | | | | | | | | | 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.)
* | | | | Merge pull request #1233 from davidzchen/python-pathGravatar Jisi Liu2016-02-25
|\ \ \ \ \ | | | | | | | | | | | | Remove hack for building Python support with Bazel.
| * | | | | Remove hack for building Python support with Bazel.Gravatar David Z. Chen2016-02-25
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | Merge pull request #1275 from keveman/grpc_supportGravatar Jisi Liu2016-02-25
|\ \ \ \ \ | | | | | | | | | | | | Fixed grpc C++ plugin support.
| * | | | | Fixed grpc C++ plugin support.Gravatar Manjunath Kudlur2016-02-25
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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}.
| * | | | Moved CommonJS-specific files into commonjs directoryGravatar murgatroid992016-02-24
| | | | |
| * | | | Fix CommonJS relative require generation, and test itGravatar murgatroid992016-02-24
| | | | |
* | | | | Merge pull request #1259 from silviulica/masterGravatar Joshua Haberman2016-02-24
|\ \ \ \ \ | | |_|_|/ | |/| | | Add a modified patch from craigcitro@ to handle namespace sharing.
* | | | | Merge pull request #1268 from keveman/grpc_supportGravatar Jisi Liu2016-02-23
|\ \ \ \ \ | |_|/ / / |/| | | | Added grpc plugin support to cc_proto_library.
| * | | | Added grpc plugin support to cc_proto_library.Gravatar Manjunath Kudlur2016-02-22
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | Merge pull request #1267 from jskeet/vs2015Gravatar Jan Tattermusch2016-02-22
|\ \ \ \ | | | | | | | | | | Require VS2015 in the solution file
* \ \ \ \ Merge pull request #804 from bsilver8192/masterGravatar Feng Xiao2016-02-22
|\ \ \ \ \ | | | | | | | | | | | | Add atomics support for 32-bit PPC.
| | * | | | Require VS2015 in the solution fileGravatar Jon Skeet2016-02-22
| |/ / / / |/| | | |
* | | | | Merge pull request #1215 from haberman/commonjsGravatar Joshua Haberman2016-02-19
|\ \ \ \ \ | | | | | | | | | | | | Added support for CommonJS require()
| * | | | | Added a bit more to README.md, and allowed custom PROTOC var in tests.Gravatar Josh Haberman2016-02-19
| | | | | |
* | | | | | Merge pull request #1257 from thomasvl/objc_genericsGravatar Thomas Van Lenten2016-02-19
|\ \ \ \ \ \ | | | | | | | | | | | | | | Support ObjC Generic Collections
| | | | | * | Make cpp generated enum constants constexpr when Options::proto_h isGravatar Clement Courbet2016-02-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | specified.
| | | | * | | Add a modified patch from craigcitro@ to handle namespace sharing.Gravatar Silviu Calinoiu2016-02-18
| |_|_|/ / / |/| | | | |
* | | | | | Merge pull request #1240 from jskeet/validate_groupGravatar Jan Tattermusch2016-02-18
|\ \ \ \ \ \ | | | | | | | | | | | | | | Validate that end-group tags match their corresponding start-group tags
* \ \ \ \ \ \ Merge pull request #1258 from haberman/releasenotesGravatar Joshua Haberman2016-02-18
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | Some fixes for the most recent release notes.
| * | | | | | Some fixes for the most recent release notes.Gravatar Josh Haberman2016-02-18
|/ / / / / /
| | | | | * Updated upb from latest changes.Gravatar Josh Haberman2016-02-18
| | | | | |
| | * | | | Support ObjC Generic CollectionsGravatar Thomas Van Lenten2016-02-18
| |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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.
| | | | * Changed Ruby to properly camelCase its JSON by default.Gravatar Josh Haberman2016-02-18
| | | | |
| | * | | Properly camelCase when translating to CommonJS.Gravatar Josh Haberman2016-02-18
| | | | |
| | * | | Removed unused directives from tests that aren't run under CommonJS.Gravatar Josh Haberman2016-02-18
| | | | |
| | * | | Addressed more code review comments.Gravatar Josh Haberman2016-02-18
| | | | |