aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | Build ruby gem on kokoro (#4819)Paul Yang2018-06-257-1/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Install rake compiler * Add kokoro config to build ruby gem on linux * Rename from linix to linux * Fix prepare_build.sh name * Clean up * Install bundler * Install bundler * Use c99 in order to build gem on mingw-32 on ruby 2.0.0 See https://github.com/rake-compiler/rake-compiler-dock/issues/4 * Move c99 config to extcofig.rb
| | * | | | Rename build_artifacts.cfg to release.cfg (#4818)Paul Yang2018-06-221-0/+0
| | | | | |
| | * | | | Add files to build ruby artifact for mac on kokoro (#4814)Paul Yang2018-06-224-0/+98
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add files to build ruby artifact for mac on kokoro * Move ruby specific stuff to ruby dir
| | * | | | Added Kokoro protoc release build for OS X (#4770)Adam Cozzette2018-06-182-0/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This configuration builds both 32-bit and 64-bit binaries for Mac OS X. One thing I had to change was to increase our minimum supported version for 10.7 to 10.9, because 10.9 (Mavericks) appears to be the earliest version supporting C++11.
| | * | | | Work around MSVC issue with std::atomic initialization (#4777)Adam Cozzette2018-06-182-3/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Work around MSVC issue with std::atomic initialization MSVC seems to have a bug where it does not use constant initialization for std::atomic, which ends up causing crashes during initialization. This change introduces a workaround by putting the std::atomic inside a union, which causes the compiler to use constant initialization for it. * Added an AppVeyor test for static linking with MSVC
| | * | | | Added Kokoro Windows release build config for protoc (#4766)Adam Cozzette2018-06-142-0/+35
| | | | | | | | | | | | | | | | | | | | | | | | This should make it easy to automatically build 32-bit and 64-bit Windows protoc binaries.
| | * | | | Use legacy name in php runtime (#4741)v3.6.0.1Paul Yang2018-06-077-22/+134
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Use legacy name in php runtime Old generated code cannot work with new runtime, because the new runtime assumes new class name for nested message. For details see #4738. * Remove unused method
| | * | | | Update php version to 3.6.0 (#4736)Paul Yang2018-06-062-4/+20
| | | | | |
| | * | | | Merge pull request #4713 from acozzette/changelogv3.6.0Adam Cozzette2018-06-062-1/+89
| | |\ \ \ \ | | | | | | | | | | | | | | Updated the change log with changes for 3.6.0
| | | * | | | Removed javanano from post_process_dist.shAdam Cozzette2018-06-051-1/+1
| | | | | | |
| | | * | | | Updated the change log with changes for 3.6.0Adam Cozzette2018-06-011-0/+88
| | | | | | |
| | * | | | | Merge pull request #4730 from acozzette/xcodeAdam Cozzette2018-06-065-10/+9
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | | Cherry-picked XCode 10 fixes into 3.6.x branch
| | | * | | | Update code to work for Xcode 10b1 (#4729)Sergio Campamá2018-06-055-10/+9
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Update code to work for Xcode 10b * Update README and test scripts to mention that Xcode 7 is no longer supported
| | * | | | Merge pull request #4706 from acozzette/cxx-11Adam Cozzette2018-05-311-2/+2
| | |\ \ \ \ | | | | | | | | | | | | | | Require C++11 and pass -std=c++11
| | | * | | | Require C++11 and pass -std=c++11Adam Cozzette2018-05-311-2/+2
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 #4702 from TeBoring/3.6.xv3.6.0rc2Paul Yang2018-05-302-5/+26
| | |\ \ \ \ | | | | | | | | | | | | | | Cherry-pick changes into 3.6.x
| | | * | | | Move methods out of class (#4697)Paul Yang2018-05-302-15/+26
| | | | | | |
| | | * | | | Add back GeneratedClassName to public (#4686)Paul Yang2018-05-301-0/+10
| | | | | | | | | | | | | | | | | | | | | These methods are used by grpc
| | * | | | | Merge pull request #4696 from acozzette/csharp-fixAdam Cozzette2018-05-301-4/+0
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | | Removed duplicate using statement from ReflectionUtil.cs
| | | * | | | Removed duplicate using statement from ReflectionUtil.csAdam Cozzette2018-05-291-4/+0
| | | | | | |
| | * | | | | Merge pull request #4695 from TeBoring/3.6.xPaul Yang2018-05-292-4/+18
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | | Fix php memory leak test (#4692)
| | | * | | | Fix php memory leak test (#4692)Paul Yang2018-05-292-4/+18
| | |/ / / /
| | * | | | Merge pull request #4687 from acozzette/js-map-parsing-fixAdam Cozzette2018-05-254-6/+87
| | |\ \ \ \ | | | | | | | | | | | | | | Fixed JS parsing of unspecified map keys
| | | * | | | Fixed JS parsing of unspecified map keysAdam Cozzette2018-05-254-6/+87
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need to use a default of 0 when parsing unspecified map keys, instead of failing an assertion. This change was written by Michael Aaron (michaelaaron@google.com) but I am cherry-picking it directly instead of waiting for the next sync of Google-internal changes.
| | * | | | Always add -std=c++11 for mac (#4684)Paul Yang2018-05-251-4/+2
| | | | | |
| | * | | | Merge pull request #4675 from TeBoring/3.6.xPaul Yang2018-05-25101-832/+2738
| | |\ \ \ \ | | | | | | | | | | | | | | Cherry-pick php generated code changes into 3.6.x
| | | * | | | Fix array constructor in c extension for compatibility (#4667)Paul Yang2018-05-251-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-2577-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-253-85/+173
| | | | | | |
| | | * | | | PHP array constructors for protobuf messages (#4530)Brent Shaffer2018-05-2531-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
| | | * | | | Add missing ruby/tests/test_ruby_package.protoBo Yang2018-05-251-0/+1
| | | | | | |
| | | * | | | Allows the json marshaller to be passed json marshal options (#4252)Erik Benoist2018-05-253-4/+28
| | | | | | |
| | | * | | | Adopt ruby_package in ruby generated code. (#4627)Paul Yang2018-05-255-3/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Adopt ruby_package in ruby generated code. * Add test for ruby_package
| | | * | | | Adopt php_metadata_namespace in php code generator (#4622)Paul Yang2018-05-254-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 #4673 from acozzette/memory-leak-fixv3.6.0rc1Adam Cozzette2018-05-241-8/+6
| | |\ \ \ \ | | | | | | | | | | | | | | Make sure to delete temporary maps used by FileDescriptorTables
| | | * | | | Make sure to delete temporary maps used by FileDescriptorTablesAdam Cozzette2018-05-241-8/+6
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I ran the tcmalloc heap checker in draconian mode, and it reported some heap allocations that were still reachable when protobuf-test exited. To fix that, I updated FileDescriptorTables to make sure its temporary heap-allocated maps are deleted when it is destroyed.
| | * | | | Merge pull request #4625 from liujisi/3.6.xJisi Liu2018-05-1525-43/+43
| | |\ \ \ \ | | | | | | | | | | | | | | Update version number to 3.6.0
| | | * | | | Update version number to 3.6.0Jisi Liu2018-05-1425-43/+43
| | |/ / / /
* | | | | | Remove protoc conditional properties (#4817)Sydney Acksman2018-06-251-14/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Remove protoc conditional properties * Fix duplicate brace
* | | | | | Update minimal Python version to 2.7 (#4207)Yuchen Xie2018-06-254-13/+5
| | | | | |
* | | | | | rename duplicate testMessageSetNullFail function (#3669)Pat Moroney2018-06-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | the testMessageSetNullFail function was declared twice. So I renamed one to testMessageSetNullFailMap
* | | | | | Merge pull request #4824 from sschuberth/remove-exec-bitFeng Xiao2018-06-2522-0/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | Remove the executable bit from several source code files
| * | | | | | Remove the executable bit from several source code filesSebastian Schuberth2018-06-2522-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This potentially avoids compiler warnings.
* | | | | | | Merge pull request #4826 from ↵Feng Xiao2018-06-251-1/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | wittmeie/wittmeie/fix-for-protobuf-generate-output-definitions Fixed protobuf_generate output definition
| * | | | | | | Fixed protobuf_generate output definition for files relative to the ↵Steffen Wittmeier2018-06-251-1/+3
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | protobuf_generate command
* | | | | | | Improved install command. (#4106)Vladimir Kovpak2018-06-251-1/+1
| | | | | | | | | | | | | | | | | | | | | Added `-y` flag to `sudo apt-get` command.
* | | | | | | Merge pull request #4608 from khuzemap/masterFeng Xiao2018-06-2536-448/+473
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Add "override" keyword for overridden virtual functions
| * | | | | | | Add "override" for overridden virtual functionsKhuzema Pithewan2018-06-1936-449/+474
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add "override" for overridden virtual functions. Please refer following issue for discussion on this. https://github.com/google/protobuf/issues/67
* | | | | | | | Merge pull request #4172 from OskarKinomoto/masterAdam Cozzette2018-06-251-0/+8
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | Add guards against bswap_XX redefnitions
| * | | | | | | Add guards against bswap_XX redefnitionsOskar Świtalski2018-01-151-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Oskar Świtalski <oskar.switalski@indoorway.com>