aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | | Move methods out of class (#4697)Paul Yang2018-05-292-15/+26
| |_|_|/ / / / / / / |/| | | | | | | | |
* | | | | | | | | | Fix php memory leak test (#4692)Paul Yang2018-05-292-4/+18
| | | | | | | | | |
* | | | | | | | | | [ObjC] Add ability to introspect list of enum values (#4678)leovitch2018-05-294-14/+119
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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)Paul Yang2018-05-251-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These methods are used by grpc
* | | | | | | | | | Merge pull request #4677 from xfxyjwf/bazelFeng Xiao2018-05-244-22/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Remove jruby from kokoro tests
| * | | | | | | | | | Remove jruby badge from our README.md.Feng Xiao2018-05-241-1/+1
| | | | | | | | | | |
| * | | | | | | | | | Delete jruby kokoro tests.Feng Xiao2018-05-243-21/+0
| | | | | | | | | | |
* | | | | | | | | | | Merge pull request #4659 from calder/bazel-python-namespace-fixFeng Xiao2018-05-241-0/+1
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | Declare 'google' namespace when importing Python protobuf via Bazel
| * | | | | | | | | | Declare 'google' namespace when importing Python protobuf via Bazel.Calder Coalson2018-05-221-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `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 #4674 from xfxyjwf/bazelFeng Xiao2018-05-243-0/+19
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / |/| | | | | | | | | | Add kokoro configs for bazel build.
| * | | | | | | | | | Add kokoro configs for bazel build.Feng Xiao2018-05-243-0/+19
| | | | | | | | | | |
* | | | | | | | | | | Fix array constructor in c extension for compatibility (#4667)Paul Yang2018-05-241-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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)Brent Shaffer2018-05-2477-657/+1477
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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.Bo Yang2018-05-243-85/+173
| | | | | | | | | | |
* | | | | | | | | | | PHP array constructors for protobuf messages (#4530)Brent Shaffer2018-05-2431-161/+1082
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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_syntaxFeng Xiao2018-05-241-1/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | Fix syntax error in BUILD file
| * | | | | | | | | fix syntax error in BUILD fileJan Tattermusch2018-05-241-1/+1
|/ / / / / / / / /
* | | | | | | | | Merge pull request #4663 from TeBoring/ruby-distcheckFeng Xiao2018-05-221-0/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Add missing ruby/tests/test_ruby_package.proto
| * | | | | | | | | Add missing ruby/tests/test_ruby_package.protoBo Yang2018-05-221-0/+1
| | | | | | | | | |
* | | | | | | | | | CMake OSX rpath management (#4620)Mizux2018-05-222-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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_buildYilun Chong2018-05-221-6/+6
|\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | | Fix python benchmark build
| * | | | | | | | | Fix python benchmark buildYilun Chong2018-05-211-6/+6
| | | | | | | | | |
* | | | | | | | | | Merge pull request #3984 from laszlocsomor/wildcardFeng Xiao2018-05-221-1/+13
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | Windows: expand wildcard arguments
| * | | | | | | | | Windows: expand wildcard argumentsLaszlo Csomor2018-05-221-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes https://github.com/google/protobuf/issues/3957
* | | | | | | | | | Allows the json marshaller to be passed json marshal options (#4252)Erik Benoist2018-05-223-4/+28
|/ / / / / / / / /
* | | | | | | | | Merge pull request #4634 from BSBandme/fix_kokoro_benchmark_buildYilun Chong2018-05-214-36/+27
|\| | | | | | | | | | | | | | | | | | | | | | | | | | Fix java benchmark bug, fix python lib cache
| * | | | | | | | Fix java benchmark bug, fix python library_pathYilun Chong2018-05-214-36/+27
| | | | | | | | |
* | | | | | | | | remove PACKAGE_NAME and REPOSITORY_NAME deprecated usage (#4650)Ittai Zeidman2018-05-211-2/+2
| | | | | | | | |
* | | | | | | | | Merge pull request #4644 from acozzette/php-timestampAdam Cozzette2018-05-181-3/+5
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Updated PHP generated code for timestamp.proto
| * | | | | | | | | Updated PHP generated code for timestamp.protoAdam Cozzette2018-05-171-3/+5
| | |/ / / / / / / | |/| | | | | | |
* / | | | | | | | Adopt ruby_package in ruby generated code. (#4627)Paul Yang2018-05-175-3/+31
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Adopt ruby_package in ruby generated code. * Add test for ruby_package
* | | | | | | | re-write int128 long division to avoid license impact from stackoverflow ↵NickFengIBM2018-05-171-34/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | | Merge pull request #4619 from ccvca/cmake_protobuf_generate_changesFeng Xiao2018-05-171-8/+12
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | cmake: protobuf_generate fix GENERATE_EXTENSIONS, fix DEPENDS, add PROTOC_OUT_DIR
| * | | | | | | | cmake: Fix DEPENDS of add_custom_command in protobuf_generateChristian von Arnim2018-05-151-1/+1
| | | | | | | | |
| * | | | | | | | cmake: Add parameter PROTOC_OUT_DIR to protobuf_generateChristian von Arnim2018-05-141-3/+7
| | | | | | | | |
| * | | | | | | | cmake: Use GENERATE_EXTENSIONS parameter in protobuf_generateChristian von Arnim2018-05-141-4/+4
| | | | | | | | |
* | | | | | | | | Merge pull request #4631 from banshee/fix_4615Adam Cozzette2018-05-161-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix 4615
| * | | | | | | | | Don't look for sched_yield on Android.James Moore2018-05-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem is that sched_yield is available on the target, but configure.ac is asking to build a host binary using the AC_SEARCH_LIBS macro. It can't configure for Android, since sched_yield isn't available on the host.
* | | | | | | | | | Merge pull request #4624 from eughermann/hash-ub-fixAdam Cozzette2018-05-151-7/+7
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Fix undefined behavior in hash function.
| * | | | | | | | | | Remove undefined behavior from the hash function.Eugene Hermann2018-05-141-7/+7
| | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed integer overflow creates undefined behavior that may lead to unpredictable fails on different platforms. One known example of the hardware where this code did fail is Apple A6 (32-bit Apple Swift CPU) 16777619, 16777499 - two prime numbers that typically used to get better dispersion.
* | | | | | | | | | Merge pull request #4632 from chronoxor/masterFeng Xiao2018-05-154-0/+8
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Fix issue with version.rc
| * | | | | | | | | | Fix issue with version.rcIvan Shynkarenka2018-05-154-0/+8
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #4574 from jozefizso/patch-1Feng Xiao2018-05-151-3/+3
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | Fix appveyor documentation
| * | | | | | | | | Fix appveyor documentationJozef Izso2018-05-151-3/+3
|/ / / / / / / / /
* | | | | | | | | Merge pull request #4623 from BSBandme/fix_kokoro_benchmark_buildYilun Chong2018-05-141-2/+3
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | Fix python install, cat java error log for kokoro build
| * | | | | | | | Fix python install, cat java error log for kokoro buildYilun Chong2018-05-141-2/+3
| | | | | | | | |
* | | | | | | | | Adopt php_metadata_namespace in php code generator (#4622)Paul Yang2018-05-144-17/+41
| |_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Adopt php_metadata_namespace in php code generator The php_metadata_namespace is corresponded to the relative directory of the metadata file. e.g., previously, the metadata file of foo.proto was GPBMetadata/Foo.php. If the php_metadata_namespace is "Metadata\\Bar", the metadata file will be Metadata/Bar/Foo.php. * Handle empty php_metadata_namespace
* | | | | | | | Merge pull request #4579 from jozefizso/dev/3380_version_infoFeng Xiao2018-05-147-4/+80
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Include version information in Windows binaries #3380
| * | | | | | | | Include version.rc.in in distribution packageJozef Izso2018-04-281-0/+1
| | | | | | | | |
| * | | | | | | | Include file information in all DLL and EXE outputsJozef Izso2018-04-284-5/+20
| | | | | | | | |
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-15 06:45:01 +0000