aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAge
...
* | | | | | | | | | | | Update code to work for Xcode 10b1 (#4729)Gravatar Sergio Campamá2018-06-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Update code to work for Xcode 10b * Update README and test scripts to mention that Xcode 7 is no longer supported
| * | | | | | | | | | | Remove cycle in dependency graphGravatar Thomas Colthurst2018-06-04
|/ / / / / / / / / / /
* | | | | | | | | | | Merge pull request #4699 from BSBandme/add_proto2_to_proto3_pluginGravatar Yilun Chong2018-06-04
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add proto2 to proto3 util
| * | | | | | | | | | | FixGravatar Yilun Chong2018-06-04
| | | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #4698 from ThomasColthurst/proto_c_apiGravatar Feng Xiao2018-06-03
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Introduce Proto C API; based on cl/198113115 by amauryfa
* \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #4714 from dcarp/reference_protobuf_dGravatar Feng Xiao2018-06-03
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add reference to protobuf-d
| * | | | | | | | | | | | | Add reference to protobuf-dGravatar Dragos Carp2018-06-02
|/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/dcarp/protobuf-d is a conformance tested proto3 runtime library and code generator for D.
* | | | | | | | | | | | | Remove js_embed binary. (#4709)Gravatar Feng Xiao2018-06-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Remove js_embed binary.
* | | | | | | | | | | | | Merge pull request #4710 from jtattermusch/upport_4706Gravatar Adam Cozzette2018-06-01
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upport to master: Require C++11 and pass -std=c++11
| * | | | | | | | | | | | | Require C++11 and pass -std=c++11Gravatar Adam Cozzette2018-06-01
|/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit updates the Autotools build to require a C++11 compiler and explicitly pass -std=c++11. This seems to be necessary for enabling C++11 support in older compilers.
* | | | | | | | | | | | | Merge pull request #4703 from acozzette/thread-safety-annotationsGravatar Adam Cozzette2018-05-31
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added Clang thread-safety annotations in mutex.h
| | | * | | | | | | | | | | Add proto2 to proto3 utilGravatar Yilun Chong2018-05-30
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Added Clang thread-safety annotations in mutex.hGravatar Adam Cozzette2018-05-30
|/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For Clang's thread safety analysis (-Wthread-safety) to pass without warnings, we need to annotate WrappedMutex to indicate that Lock() acquires the lock and Unlock() releases it. This CL adds the annotations and guards them with an ifdef to make sure they're a no-op on compilers other than Clang. This is a cherry-pick of a change I already made to the Google-internal codebase.
* | | | | | | | | | | | | Merge pull request #4676 from acozzette/update-changelog-scriptGravatar Adam Cozzette2018-05-30
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated generate_changelog.py
* \ \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #4643 from acozzette/merge-3-5-xGravatar Adam Cozzette2018-05-30
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge 3.5.x branch into master
| | | * | | | | | | | | | | | Introduce Proto C API; based on cl/198113115 by amauryfaGravatar Thomas Colthurst2018-05-30
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Move methods out of class (#4697)Gravatar Paul Yang2018-05-29
| |_|/ / / / / / / / / / / / |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | Fix php memory leak test (#4692)Gravatar Paul Yang2018-05-29
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | [ObjC] Add ability to introspect list of enum values (#4678)Gravatar leovitch2018-05-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added new API to GPBEnumDescriptor to enable introspection of enum values. Refactored implementation so that this contains a minimum of added code. Clarified comments regarding behavior in the presence of the alias_allowed option. Added unit tests for new functionality and for the alias case.
* | | | | | | | | | | | | | Add back GeneratedClassName to public (#4686)Gravatar Paul Yang2018-05-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These methods are used by grpc
* | | | | | | | | | | | | | Merge pull request #4677 from xfxyjwf/bazelGravatar Feng Xiao2018-05-24
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove jruby from kokoro tests
* \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #4659 from calder/bazel-python-namespace-fixGravatar Feng Xiao2018-05-24
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Declare 'google' namespace when importing Python protobuf via Bazel
| | * | | | | | | | | | | | | | Remove jruby badge from our README.md.Gravatar Feng Xiao2018-05-24
| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Delete jruby kokoro tests.Gravatar Feng Xiao2018-05-24
| |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge pull request #4674 from xfxyjwf/bazelGravatar Feng Xiao2018-05-24
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add kokoro configs for bazel build.
| | | | * | | | | | | | | | | | Updated generate_changelog.pyGravatar Adam Cozzette2018-05-24
| |_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I removed references to javanano, since that implementation no longer exists. While I was at it I found a couple places where it looked like the wrong directory was used by mistake and I fixed them.
| * | | | | | | | | | | | | | Add kokoro configs for bazel build.Gravatar Feng Xiao2018-05-24
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Fix array constructor in c extension for compatibility (#4667)Gravatar Paul Yang2018-05-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In old generated code, the constructor of message doesn't provide a default null to parent's constructor. Previously, in c extesnion, this case was not handled.
* | | | | | | | | | | | | | | PHP namespaces for nested messages and enums (#4536)Gravatar Brent Shaffer2018-05-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * uses namespaces for nested messages and enums * fixes namespaces for PHP dist * fixes namespace for Descriptors, adds Cardinality and Kind * fixes nested namespaces for reserved words and adds tests * adds tests and generator fix for php class prefixes * fixes escaping of protobuf packages, enum comments, misc others * nice refactor of generated code * adds class files for backwards compatibility * simplifies code with templates * adds compatibility files to makefile * cleanup of generator and fixes nested namespace bug * regenerates proto types * remove internal BC classes * adds deprecated warning, adds methods back * simplifies if statement * fixes dist files * addresses review comments * adds back TYPE_URL_PREFIX constant * adds @deprecated to old nested class files * skips tests which require a separate process when protobuf.so is enabled * Adds tests for legacy nested classes that do not require separate processes to test * uses legacy names for GPBUtil message check * adds block for IDE @deprecated message * Namespace for nested message/enum in c extension * Remove unused code
* | | | | | | | | | | | | | | Implement array constructor in php c extension.Gravatar Bo Yang2018-05-24
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | PHP array constructors for protobuf messages (#4530)Gravatar Brent Shaffer2018-05-24
|/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP array constructors for protobuf messages * removes Descriptor from error message * allows mergeFrom to accept an array * only use initWithDescriptor if instanceof MapEntry * adds doc comments * removes ability for constructors to take arrays for submessages * Revert "allows mergeFrom to accept an array" This reverts commit b7b72182d561634af12c5c5c56a7cda3b33241f9. * makes mergeFromArray protected and fixes mergeFrom whitespace * Separates merging from JSON and merging from PHP array * removes well-known types and json keys from array construction * Addresses PR review comments * cleans up tests * fixes exception messages
* | | | | | | | | | | | | | Merge pull request #4669 from jtattermusch/fix_bazel_build_syntaxGravatar Feng Xiao2018-05-24
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix syntax error in BUILD file
| * | | | | | | | | | | | | | fix syntax error in BUILD fileGravatar Jan Tattermusch2018-05-24
|/ / / / / / / / / / / / / /
| * / / / / / / / / / / / / Declare 'google' namespace when importing Python protobuf via Bazel.Gravatar Calder Coalson2018-05-22
|/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `python/google/__init__.py` declares the top-level 'google' namespace so that `google.protobuf` can be imported alongside other Google Python modules like `google.auth`. This works well when installing protobuf via Pip, but the Bazel `//:python_srcs` rule doesn't include this file in its `srcs`. Bazel implicitly creates an empty `google/__init__.py`, which does *not* set up a namespace. The result is that consuming Python protobuf via Bazel breaks all other Google Python libraries. This fixes #4658.
* | | | | | | | | | | | | Merge pull request #4663 from TeBoring/ruby-distcheckGravatar Feng Xiao2018-05-22
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add missing ruby/tests/test_ruby_package.proto
* | | | | | | | | | | | | | CMake OSX rpath management (#4620)Gravatar Mizux2018-05-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * CMake: Add comment for CMP0048 * CMake: osx use @rpath/ as target's install name (CMP0042) On MacoS library should use @rpath/ as prefix path instead of absolute build path e.g. otool -L libprotobuf.dylib libprotobuf.dylib: @rpath/libprotobuf.dylib (...) ... * CMake: add rpath to target for LINUX and APPLE
* | | | | | | | | | | | | | Merge pull request #4660 from BSBandme/fix_kokoro_benchmark_buildGravatar Yilun Chong2018-05-22
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | | Fix python benchmark build
* | | | | | | | | | | | | | Merge pull request #3984 from laszlocsomor/wildcardGravatar Feng Xiao2018-05-22
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Windows: expand wildcard arguments
| | | * | | | | | | | | | | | Add missing ruby/tests/test_ruby_package.protoGravatar Bo Yang2018-05-22
| |_|/ / / / / / / / / / / / |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | Allows the json marshaller to be passed json marshal options (#4252)Gravatar Erik Benoist2018-05-22
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Windows: expand wildcard argumentsGravatar Laszlo Csomor2018-05-22
|/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes https://github.com/google/protobuf/issues/3957
| * | | | | | | | | | | | Fix python benchmark buildGravatar Yilun Chong2018-05-21
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #4634 from BSBandme/fix_kokoro_benchmark_buildGravatar Yilun Chong2018-05-21
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix java benchmark bug, fix python lib cache
| * | | | | | | | | | | | Fix java benchmark bug, fix python library_pathGravatar Yilun Chong2018-05-21
| | | | | | | | | | | | |
* | | | | | | | | | | | | remove PACKAGE_NAME and REPOSITORY_NAME deprecated usage (#4650)Gravatar Ittai Zeidman2018-05-21
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #4644 from acozzette/php-timestampGravatar Adam Cozzette2018-05-18
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated PHP generated code for timestamp.proto
* | | | | | | | | | | | | | Adopt ruby_package in ruby generated code. (#4627)Gravatar Paul Yang2018-05-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Adopt ruby_package in ruby generated code. * Add test for ruby_package
| * | | | | | | | | | | | | Updated PHP generated code for timestamp.protoGravatar Adam Cozzette2018-05-17
|/ / / / / / / / / / / / /
| | * | | | | | | | | | | Merge branch '3.5.x' into merge-3-5-xGravatar Adam Cozzette2018-05-17
| |/| | | | | | | | | | | |/| | | | | | | | | | | |
* | | | | | | | | | | | | re-write int128 long division to avoid license impact from stackoverflow ↵Gravatar NickFengIBM2018-05-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | references (#4633) * rewrite int128 long divison to avoid stackoverflow hit Protobuf was showing Stackoverflow hits in the code base, primarily code written to calculate long division. This code was copied from a stackoverflow post, which means it would be licensed under CC BY-SA 3.0. Due to this license, IBM Legal did not want to include this OSS in our products and advised us to re-write this particular piece of code to avoid the license restriction. We have re-written the code for our own distribution, and are willing to merge it into the main code base for others who want to avoid the stackoverflow license issues to benefit as well.