aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add tests to confirm strings/bytes are copied.HEADmasterThomas Van Lenten2018-10-021-0/+66
|
* Copy the value when setting message/data fields.Thomas Van Lenten2018-10-022-6/+62
| | | | | Follow ObjC conventions and how the generated header labels things by copying NSStrings/NSData fields when setting them.
* Turn off ALWAYS_SEARCH_USER_PATHS.Thomas Van Lenten2018-10-022-4/+4
| | | | Causes a warning in newer Xcodes.
* Remove stray 'return'.Thomas Van Lenten2018-10-021-1/+1
|
* Merge pull request #5210 from jstandish/patch-1Adam Cozzette2018-10-011-0/+1
|\ | | | | Added VSCode extension link
| * Update third_party.mdJohn Standish2018-10-011-0/+1
|/ | | Added link to VSCode-Proto3 extension in Other Utilities section
* Fixed typo (#5206)Nazarbek Altybay2018-09-301-1/+1
|
* Merge pull request #4816 from hrsht/hrsht/zanker-proto2Joshua Haberman2018-09-2723-1535/+3298
|\ | | | | Basic Proto2 support for Ruby gem
| * Adds support for proto2 syntax for Ruby gem.Harshit Chopra2018-09-2723-1535/+3298
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change only adds basic proto2 support without advanced features like extensions, custom options, maps, etc. The protoc binary now generates ruby code for proto2 syntax. However, for now, it is restricted to proto2 files without advanced features like extensions, in which case it still errors out. This change also modifies the DSL to add proto messages to the DescriptorPool. There is a new DSL Builder#add_file to create a new FileDescriptor. With this, the generated ruby DSL looks something like: Google::Protobuf::DescriptorPool.generated_pool.build do add_file "test.proto" do add_message "foo" do optional :val, :int32, 1 end end end
* | Merge pull request #5172 from shields/smear-commentsAdam Cozzette2018-09-243-33/+39
|\ \ | | | | | | Smear comments
| * | Regenerate C# and Objective-C.Michael Shields2018-09-192-22/+26
| | |
| * | Update comments to discuss leap smearing in detail.Michael Shields2018-09-181-11/+13
| | | | | | | | | | | | Fixes #1890.
* | | C# Proto2 feature : Field presence and default values (#4642)Sydney Acksman2018-09-2451-2375/+3777
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Compiler changes * Generated code changes * Library changes * Compiler style changes * Generated style changes * Fix Windows build errors * Implement changes from review * Reintroduce proto2 check * Compiler changes (required handling review) * Generated code changes (required handling review) * Library changes (required handling review * Field presence rewrite (compiler changes) * Field presence rewrite (generated code changes) * Compiler comment * IFieldAccessor.HasValue library implementation * Remove Clear methods and default values from proto3 code (Compiler) * Remove Clear methods and default values from proto3 code (Generated) * Remove Clear methods and default values from proto3 code (Library) * Fix distcheck error * Rewrite default string values to use base64 and convert * Library changes (IMessage2) * Compiler changes (IMessage2) * Generated changes (IMessage2) * Rebased and regenerated * Compiler changes (initialized extension) * Generated changes (initialized extension) * Library changes (initialized extension) * Refactor MessageExtensions.IsRequired * Move string default value creator and bytes default value creator back to seperate methods * Dead code cleanup * Fixed segmentation fault Removed unused header method declarations
* | | Merge pull request #5180 from mit-mit/patch-1Feng Xiao2018-09-241-1/+1
|\ \ \ | | | | | | | | Dart build status
| * | | Dart build statusMichael Thomsen2018-09-211-1/+1
| |/ / | | | | | | Add build status badge for Dart
* | | Merge pull request #5182 from BSBandme/test_benchmarkYilun Chong2018-09-231-1/+1
|\ \ \ | | | | | | | | fix java build by changing mvn to online
| * | | fix java build by changing mvn to onlineYilun Chong2018-09-231-1/+1
| |/ /
* | | Adopt upb change for timestamp and duration json to php (#5106)Paul Yang2018-09-227-3672/+3282
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Adopt upb change for timestamp and duration json to php * Remove unused code * Re-sync upb * Fix php implementation timestamp json parsing * Fix strptime use local timezone on mac. * Remove succeeding tests * Resync * Add tests for values * Fix php tests * Fix encoder handlers change default value Previously, oneofsubmsg_handler and submsg_handler change zval's default value directly. The fix use REPLACE_ZVAL_VALUE which create a copy of parsed value and assign it to zval.
* | | Test locations, and add comment to clarify testingJon Skeet2018-09-221-0/+21
| | |
* | | Add more detailed comments for declaration propertiesJon Skeet2018-09-221-5/+11
| | |
* | | Add files to Makefile.am to fix dist targetsJon Skeet2018-09-221-0/+3
| | |
* | | Simplify descriptor testsJon Skeet2018-09-221-13/+13
| | | | | | | | | | | | | | | Rather than converting the proto to a ByteString again, use the existing SerializedData property.
* | | Add comment about FileDescriptor not exposing a declarationJon Skeet2018-09-221-0/+3
| | |
* | | Provide simple access to descriptor declarations in C#Jon Skeet2018-09-2212-35/+755
|/ / | | | | | | | | | | | | | | | | This is primarily for access to comments, which would be expected to be available in a protoc plugin. The implementation has two fiddly aspects: - We use a Lazy<T> to avoid building the map before cross-linking. An alternative would be to crosslink at the end of the constructor, and remove the calls to CrossLink elsewhere. This would be generally better IMO, but deviate from the Java code. - The casts to IReadOnlyList<DescriptorBase> are unfortunate. They'll always work, because these lists are always ReadOnlyCollection<T> for a descriptor type... but we can't use IList<DescriptorBase> as that's not covariant, and it's annoyingly fiddly to change the field to be of type ReadOnlyCollection<T>.
* | Merge pull request #5127 from xfxyjwf/mergeFeng Xiao2018-09-171-3/+19
|\ \ | | | | | | Merge 3.6.x branch to master
| * \ Merge remote-tracking branch 'google/3.6.x'Feng Xiao2018-09-071-3/+19
| |\ \
| | * \ Merge pull request #5048 from jozefizso/fix/4579_backport_for_3.6.x3.6.xFeng Xiao2018-08-207-4/+80
| | |\ \ | | | | | | | | | | Include version information in Windows binaries (backport #4579 for 3.6.x)
| | | * | Backport the PR #4579 to 3.6.x branchJozef Izso2018-08-157-4/+80
| | | | | | | | | | | | | | | | | | | | Implements #3380
| | * | | Merge pull request #5049 from nehaljwani/backport-4854Adam Cozzette2018-08-162-4/+4
| | |\ \ \ | | | |/ / | | |/| | Backport #4854 to 3.6.x
| | | * | Set LIBPROTOBUF_EXPORT on GenericTypeHandler<class google::protobuf::Message>Nehal J Wani2018-08-151-3/+3
| | | | | | | | | | | | | | | | | | | | This should fix https://github.com/google/protobuf/issues/4717
| | | * | Set LIBPROTOBUF_EXPORT on GzipOutputStream::OptionsAdam Cozzette2018-08-151-1/+1
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | This fixes issue #2610. This was originally fixed in a101fa52895fc2ad83d8b5d610243531b1608a08 , but got reverted by d36c0c538a545fac5d9db6ba65c525246d4efa95
| | * | Python wheel kokoro for windows (#5034)Paul Yang2018-08-133-0/+123
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add kokoro config for building python wheels on windows * Move script to root * Debug * Debug * Change working directory * Add msbuild to path * Debug * Fix python dir name * Debug * Move artifacts to targeted directory * Update artifact directory * Debug * Debug * Automatic generation of version * Reduce file numbers
| | * | Python wheel kokoro for mac (#5017)Paul Yang2018-08-082-0/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add config for building python wheel on mac * Specify os name * Clean up venv * Debug * Recover old path
| | * | Python wheel kokoro dev (#5002)Paul Yang2018-08-063-0/+101
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add config for building python wheel * Update submodules * Fix setup.py to use c++11 * Fix syntax error * Fix syntax error * Add dir for artifact * Update artifact dirctory * Remove python 3.3 * Clean up virtual env * Clean up env * Test environment * Test env variable * Automatic update version number * Remove dependency on python-wheel branch
| | * | Update php package.xml to 3.6.1 (#5000)Paul Yang2018-08-031-3/+19
| | | |
| | * | Merge pull request #4997 from jtattermusch/backport_nuget_buildingFeng Xiao2018-08-034-2/+18
| | |\ \ | | | | | | | | | | Backport building C# nuget to 3.6.x branch
| | | * | upgrade dotnet SDK to 2.1.3 on kokoro linuxJan Tattermusch2018-08-031-1/+1
| | | | |
| | | * | Revert "overcome the global.json constraint with a hack"Jan Tattermusch2018-08-031-9/+0
| | | | | | | | | | | | | | | | | | | | This reverts commit c02346c72aafd1826b0397dbbce4ce04bf252f50.
| | | * | use SDK version available on KokoroJan Tattermusch2018-08-031-1/+1
| | | | |
| | | * | overcome the global.json constraint with a hackJan Tattermusch2018-08-031-0/+9
| | | | |
| | | * | fix build_nuget.batJan Tattermusch2018-08-031-1/+1
| | | | |
| | | * | add scripts for automated building of C# nuget on KokoroJan Tattermusch2018-08-032-0/+16
| | |/ /
* | | | Merge pull request #5085 from scentini/compiler-flagFeng Xiao2018-09-102-4/+24
|\ \ \ \ | | | | | | | | | | Route "compiler" value of config_setting through @bazel_tools/tools/cpp:compiler.
| * | | | Create compiler_config_setting.bzlscentini2018-08-281-0/+21
| | | | |
| * | | | use flag_values = {"@bazel_tools//tools/cpp:compiler": "x"} for compiler ↵scentini2018-08-281-4/+3
| | | | | | | | | | | | | | | | | | | | config_settings
* | | | | Cross-link descriptor when building from byte stringsJon Skeet2018-09-102-12/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This performs more testing for field descriptors built from byte strings too, but that's mostly incidental. The chief intent is to check that cross-linking occurs.
* | | | | Merge pull request #5105 from sigurdm/invoke_plugin_via_cmdFeng Xiao2018-09-101-4/+5
|\ \ \ \ \ | | | | | | | | | | | | On Windows invoke plugins using cmd.exe
| * | | | | On Windows invoke plugins using cmd.exeSigurd Meldgaard2018-09-031-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will find .bat files as well as .exe. Only affects the case when plugins are invoked from PATH. This does not change behaviour when compiled under Cygwin..
* | | | | | Merge pull request #5122 from elharo/guava20Feng Xiao2018-09-101-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | update to Guava 20
| * | | | | | update to Guava 20Elliotte Rusty Harold2018-09-071-1/+1
| | | | | | |