aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1312 from petewarden/masterJisi Liu2016-03-121-2/+43
|\ | | | | Bazel iOS build settings
| * Merge remote-tracking branch 'upstream/master'Pete Warden2016-03-0976-2393/+3886
| |\
| * | Added iOS settings to Bazel buildPete Warden2016-03-091-3/+19
| | |
| * | Updated library generation with iOS optionsPete Warden2016-02-231-2/+27
| | |
* | | Merge pull request #1278 from smparkes/masterJisi Liu2016-03-112-9/+27
|\ \ \ | | | | | | | | pass correct args to protoc for wellknown protos when used as an external repository
| * | | pass correct args to protoc for java wellknown protos when used as an ↵Steven Parkes2016-03-102-9/+27
| | |/ | |/| | | | | | | external repository
* | | Merge pull request #1317 from benvanik/patch-1Feng Xiao2016-03-111-1/+3
|\ \ \ | |/ / |/| | Fixing compilation error when building with emscripten.
| * | Fixing compilation error when building with emscripten.Ben Vanik2016-03-111-1/+3
|/ / | | | | This change was previously done in //third_party in CL 108656107 but never made it to the open source project and was overwritten in an update.
* | Merge pull request #1299 from tatraian/masterFeng Xiao2016-03-081-1/+5
|\ \ | | | | | | Fix compiling clang/libc++ builds. (Issue: #1266)
| * | Comment has been added to fix (issue #1266)Antal Tátrai2016-03-081-0/+4
| | |
| * | Fix compiling clang/libc++ builds. (Issue: #1266)Antal Tátrai2016-03-051-1/+1
| | |
* | | Merge pull request #1309 from thomasvl/leading_special_prop_namesThomas Van Lenten2016-03-084-6/+40
|\ \ \ | | | | | | | | 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.Thomas Van Lenten2016-03-084-6/+40
|/ / / | | | | | | | | | Add a compile test to confirm things are working as expected.
* | | Merge pull request #1306 from silviulica/masterJoshua Haberman2016-03-071-1/+1
|\ \ \ | | | | | | | | Update version to 3.0.0b2.post2
| * | | Update version to 3.0.0b2.post2Silviu Calinoiu2016-03-071-1/+1
| | | |
* | | | Merge pull request #1304 from thomasvl/headerdocsThomas Van Lenten2016-03-0735-1363/+1985
|\ \ \ \ | | | | | | | | | | HeaderDoc support in the library and generated sources
| * | | | HeaderDoc support in the library and generated sourcesThomas Van Lenten2016-03-0735-1363/+1985
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | - 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/masterJon Skeet2016-03-075-131/+157
|\ \ \ \ | | | | | | | | | | Replace StringBuilder with TextWriter in JsonFormatter
| * | | | Replace StringBuilder with TextWriter in JsonFormatteravgweb2016-03-065-131/+157
|/ / / /
* | | | Merge pull request #1298 from craigcitro/fix_setupJoshua Haberman2016-03-051-0/+1
|\ \ \ \ | |_|/ / |/| | | Add back the namespace_packages arg in setup.py.
| * | | Add back the namespace_packages arg in setup.py.Craig Citro2016-03-051-0/+1
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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/rubyjsoncamelJoshua Haberman2016-03-048-676/+1172
|\ \ \ | | | | | | | | Changed Ruby to properly camelCase its JSON by default.
| * | | Updated upb from latest changes.Josh Haberman2016-02-182-244/+133
| | | |
| * | | Changed Ruby to properly camelCase its JSON by default.Josh Haberman2016-02-188-561/+1168
| | | |
* | | | Merge pull request #1292 from haberman/ruby-allow-descriptorJoshua Haberman2016-03-044-87/+117
|\ \ \ \ | | | | | | | | | | Generate well-known types in Ruby extension and prune unneeded proto2 dependencies.
| * | | | Removed the generated Ruby file from Makefile.am.Josh Haberman2016-03-031-1/+0
| | | | |
| * | | | Generate well-known types in Ruby extension and prune unneeded proto2 ↵Josh Haberman2016-03-033-86/+117
|/ / / / | | | | | | | | | | | | dependencies.
* | | | Merge pull request #1260 from legrosbuffle/masterPaul Yang2016-03-021-2/+4
|\ \ \ \ | | | | | | | | | | Make cpp generated enum constants constexpr when Options::proto_h is specified
| * | | | Make cpp generated enum constants constexpr when Options::proto_h isClement Courbet2016-02-191-2/+4
| | | | | | | | | | | | | | | | | | | | specified.
* | | | | Merge pull request #1287 from jskeet/fix-typoJon Skeet2016-03-011-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Fix copy/paste typo in CodedInputStreamTest
| * | | | | Fix copy/paste typo in CodedInputStreamTestJon Skeet2016-03-011-1/+1
|/ / / / /
* | | | | Merge pull request #1274 from murgatroid99/node_relative_requiresJoshua Haberman2016-02-298-11/+160
|\ \ \ \ \ | | | | | | | | | | | | Fix CommonJS relative require generation, and test it
| * | | | | Moved CommonJS-specific files into commonjs directorymurgatroid992016-02-244-12/+15
| | | | | |
| * | | | | Fix CommonJS relative require generation, and test itmurgatroid992016-02-248-11/+157
| | |_|_|/ | |/| | |
* | | | | Merge pull request #1286 from jskeet/idisposableJan Tattermusch2016-02-295-12/+152
|\ \ \ \ \ | | | | | | | | | | | | Implement IDisposable for CodedInputStream and CodedOutputStream
| * | | | | Implement IDisposable for CodedInputStream and CodedOutputStreamJon Skeet2016-02-295-12/+152
|/ / / / / | | | | | | | | | | | | | | | | | | | | 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-pathJisi Liu2016-02-254-96/+51
|\ \ \ \ \ | | | | | | | | | | | | Remove hack for building Python support with Bazel.
| * | | | | Remove hack for building Python support with Bazel.David Z. Chen2016-02-254-96/+51
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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_supportJisi Liu2016-02-251-6/+11
|\ \ \ \ \ | | | | | | | | | | | | Fixed grpc C++ plugin support.
| * | | | | Fixed grpc C++ plugin support.Manjunath Kudlur2016-02-251-6/+11
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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}.
* | | | | Merge pull request #1259 from silviulica/masterJoshua Haberman2016-02-244-2/+14
|\ \ \ \ \ | | |_|_|/ | |/| | | Add a modified patch from craigcitro@ to handle namespace sharing.
| * | | | Add a modified patch from craigcitro@ to handle namespace sharing.Silviu Calinoiu2016-02-184-2/+14
| | | | |
* | | | | Merge pull request #1268 from keveman/grpc_supportJisi Liu2016-02-231-0/+17
|\ \ \ \ \ | |_|/ / / |/| | | | Added grpc plugin support to cc_proto_library.
| * | | | Added grpc plugin support to cc_proto_library.Manjunath Kudlur2016-02-221-0/+17
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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/vs2015Jan Tattermusch2016-02-221-3/+3
|\ \ \ \ | | | | | | | | | | Require VS2015 in the solution file
| * | | | Require VS2015 in the solution fileJon Skeet2016-02-221-3/+3
| | | | |
* | | | | Merge pull request #804 from bsilver8192/masterFeng Xiao2016-02-223-0/+160
|\ \ \ \ \ | |/ / / / |/| | | | Add atomics support for 32-bit PPC.
| * | | | Add atomics support for 32-bit PPC.Brian Silverman2015-09-093-0/+160
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was originally submitted as a patch on the Google Code issue tracker, but the original author didn't submit a pull request. They did, however, give permission for somebody else to do so. I cleaned up a few things myself and am now submitting it. I can't find any record of what the original patch was, but there is a copy of the discussion at <https://groups.google.com/forum/#!topic/protobuf/SMwF5fYHIi0>. Fixes google/protobuf#581
* | | | | Merge pull request #1215 from haberman/commonjsJoshua Haberman2016-02-1914-79/+667
|\ \ \ \ \ | | | | | | | | | | | | Added support for CommonJS require()
| * | | | | Added a bit more to README.md, and allowed custom PROTOC var in tests.Josh Haberman2016-02-192-2/+28
| | | | | |
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-26 13:04:06 +0000