aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | | |
| * | | Add file information to Windows binariesJozef Izso2018-04-274-3/+63
| | | |
* | | | enable source link for csharp (#4179)Cameron Taggart2018-05-142-3/+5
| | | |
* | | | Merge pull request #4587 from chronoxor/masterFeng Xiao2018-05-143-6/+26
|\ \ \ \ | | | | | | | | | | Appveyor MinGW build
| * | | | Appveyor MinGW buildIvan Shynkarenka2018-05-033-6/+26
| | | | |
* | | | | Merge pull request #4611 from anuraaga/remove-string-moveFeng Xiao2018-05-142-35/+2
|\ \ \ \ \ | | | | | | | | | | | | [Java] Remove unsafe no-copy String allocation since it's not useful in rece…
| * | | | | Remove unsafe no-copy String allocation since it's not useful in recent Java ↵Anuraag Agrawal2018-05-112-35/+2
| | |_|/ / | |/| | | | | | | | | | | | | versions.
* | | | | fix index out of range error in C# generation using msvc (#1329)Warren Falk2018-05-141-1/+1
| |_|_|/ |/| | |
* | | | Add file option php_metadata_namespace and ruby_package (#4609)Paul Yang2018-05-116-222/+751
| | | |
* | | | Merge pull request #4538 from Mizux/patch-2Feng Xiao2018-05-102-8/+20
|\ \ \ \ | |/ / / |/| | | Add .proto files to extract_includes.bat
| * | | fix duplicate mkdir in update_file_lists.shCorentin Le Molgat2018-04-252-21/+7
| | | | | | | | | | | | | | | | | | | | - merge loop for .h and .proto includes - fix shellcheck errors
| * | | Add .proto files to extract_includes.batMizux2018-04-242-0/+26
| | | | | | | | | | | | | | | | | | | | For google/or-tools, on windows, we need to use `import "google/protobuf/wrappers.proto";` since we want "optional" int64 and in version3 POD get default value... -> so we use "google.protobuf.Int64Value" since 0 is a valid value and different from "not set" for our use case.
* | | | Throw error if user want to access message properties (#4603)Paul Yang2018-05-102-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | * Throw error if user want to access message properties * Fix typo
* | | | Avoid direct check of class name (#4601)Paul Yang2018-05-101-7/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Avoid direct check of class name So that subclasses are also ok * Use type hint in function signature.
* | | | use brew install instead of easy_install in OSX (#4537)Jie Luo2018-05-091-1/+2
| | | | | | | | | | | | use brew instead of easy_install in OSX (easy_install keep failing for a month)
* | | | Merge pull request #4590 from PetterS/undefined_fixFeng Xiao2018-05-061-4/+6
|\ \ \ \ | | | | | | | | | | Fix error in Clang UndefinedBehaviorSanitizer
| * | | | Fix error in Clang UndefinedBehaviorSanitizerPetter Strandmark2018-05-041-4/+6
|/ / / / | | | | | | | | | | | | | | | | | | | | Pointer Arguments to memcpy can not be null in UndefinedBehaviorSanitizer. In this case, both the memory and the size was zero. This change allows protoc to run under UndefinedBehaviorSanitizer.
* | | | Add VS2017 optional component dependency details to the C# readme (#4128)David Chennells2018-05-031-0/+6
| | | | | | | | | | | | Add mention to the "Build" section of the ReadMe of the requirement of installing an optional component to VS2017.
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-11 02:07:04 +0000