aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAge
* Merge pull request #4878 from acozzette/fix-msvc-initializationGravatar Adam Cozzette2018-07-09
|\ | | | | Fix initialization with Visual Studio
| * Fix initialization with Visual StudioGravatar Adam Cozzette2018-07-06
|/ | | | | | | | | | | | It appears that Visual Studio does not work well with std::once_flag because it has a bug causing it to initialize that during dynamic initialization instead of constant initialization. This change works around the problem by using function static initializers instead. @gerben-s originally wrote this change for the Google-internal codebase but I am just cherry-picking it here. This fixes #4773.
* Build ruby gem on kokoro (#4819)Gravatar Paul Yang2018-06-25
| | | | | | | | | | | | | | | | | | | | | | * 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)Gravatar Paul Yang2018-06-22
|
* Add files to build ruby artifact for mac on kokoro (#4814)Gravatar Paul Yang2018-06-22
| | | | | | * 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)Gravatar Adam Cozzette2018-06-18
| | | | | | 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)Gravatar Adam Cozzette2018-06-18
| | | | | | | | | | | * 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)Gravatar Adam Cozzette2018-06-14
| | | | This should make it easy to automatically build 32-bit and 64-bit Windows protoc binaries.
* Use legacy name in php runtime (#4741)Gravatar Paul Yang2018-06-07
| | | | | | | | | * 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)Gravatar Paul Yang2018-06-06
|
* Merge pull request #4713 from acozzette/changelogGravatar Adam Cozzette2018-06-06
|\ | | | | Updated the change log with changes for 3.6.0
* \ Merge pull request #4730 from acozzette/xcodeGravatar Adam Cozzette2018-06-06
|\ \ | | | | | | Cherry-picked XCode 10 fixes into 3.6.x branch
| * | 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
| * Removed javanano from post_process_dist.shGravatar Adam Cozzette2018-06-05
| |
| * Updated the change log with changes for 3.6.0Gravatar Adam Cozzette2018-06-01
|/
* Merge pull request #4706 from acozzette/cxx-11Gravatar Adam Cozzette2018-05-31
|\ | | | | Require C++11 and pass -std=c++11
| * Require C++11 and pass -std=c++11Gravatar Adam Cozzette2018-05-31
|/ | | | | | 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.xGravatar Paul Yang2018-05-30
|\ | | | | Cherry-pick changes into 3.6.x
| * Move methods out of class (#4697)Gravatar Paul Yang2018-05-30
| |
| * Add back GeneratedClassName to public (#4686)Gravatar Paul Yang2018-05-30
| | | | | | These methods are used by grpc
* | Merge pull request #4696 from acozzette/csharp-fixGravatar Adam Cozzette2018-05-30
|\ \ | |/ |/| Removed duplicate using statement from ReflectionUtil.cs
* | Merge pull request #4695 from TeBoring/3.6.xGravatar Paul Yang2018-05-29
|\ \ | | | | | | Fix php memory leak test (#4692)
| | * Removed duplicate using statement from ReflectionUtil.csGravatar Adam Cozzette2018-05-29
| |/ |/|
| * Fix php memory leak test (#4692)Gravatar Paul Yang2018-05-29
|/
* Merge pull request #4687 from acozzette/js-map-parsing-fixGravatar Adam Cozzette2018-05-25
|\ | | | | Fixed JS parsing of unspecified map keys
| * Fixed JS parsing of unspecified map keysGravatar Adam Cozzette2018-05-25
|/ | | | | | | | | 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)Gravatar Paul Yang2018-05-25
|
* Merge pull request #4675 from TeBoring/3.6.xGravatar Paul Yang2018-05-25
|\ | | | | Cherry-pick php generated code changes into 3.6.x
| * Fix array constructor in c extension for compatibility (#4667)Gravatar Paul Yang2018-05-25
| | | | | | | | | | 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-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-25
| |
| * PHP array constructors for protobuf messages (#4530)Gravatar Brent Shaffer2018-05-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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.protoGravatar Bo Yang2018-05-25
| |
| * Allows the json marshaller to be passed json marshal options (#4252)Gravatar Erik Benoist2018-05-25
| |
| * Adopt ruby_package in ruby generated code. (#4627)Gravatar Paul Yang2018-05-25
| | | | | | | | | | | | * Adopt ruby_package in ruby generated code. * Add test for ruby_package
| * Adopt php_metadata_namespace in php code generator (#4622)Gravatar Paul Yang2018-05-25
|/ | | | | | | | | | | * 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-fixGravatar Adam Cozzette2018-05-24
|\ | | | | Make sure to delete temporary maps used by FileDescriptorTables
| * Make sure to delete temporary maps used by FileDescriptorTablesGravatar Adam Cozzette2018-05-24
|/ | | | | | | 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.xGravatar Jisi Liu2018-05-15
|\ | | | | Update version number to 3.6.0
| * Update version number to 3.6.0Gravatar Jisi Liu2018-05-14
|/
* Add file option php_metadata_namespace and ruby_package (#4609)Gravatar Paul Yang2018-05-11
|
* Merge pull request #4538 from Mizux/patch-2Gravatar Feng Xiao2018-05-10
|\ | | | | Add .proto files to extract_includes.bat
* | Throw error if user want to access message properties (#4603)Gravatar Paul Yang2018-05-10
| | | | | | | | | | | | * Throw error if user want to access message properties * Fix typo
* | Avoid direct check of class name (#4601)Gravatar Paul Yang2018-05-10
| | | | | | | | | | | | | | | | * 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)Gravatar Jie Luo2018-05-09
| | | | | | use brew instead of easy_install in OSX (easy_install keep failing for a month)
* | Merge pull request #4590 from PetterS/undefined_fixGravatar Feng Xiao2018-05-06
|\ \ | | | | | | Fix error in Clang UndefinedBehaviorSanitizer
| * | Fix error in Clang UndefinedBehaviorSanitizerGravatar Petter Strandmark2018-05-04
|/ / | | | | | | | | | | 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)Gravatar David Chennells2018-05-03
| | | | | | Add mention to the "Build" section of the ReadMe of the requirement of installing an optional component to VS2017.
* | Fix python ext build on kokoro (#4527)Gravatar Yilun Chong2018-05-03
| |
* | Merge pull request #4586 from chronoxor/masterGravatar Feng Xiao2018-05-02
|\ \ | | | | | | Fix MinGW build