aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/google/protobuf/descriptor.proto
Commit message (Collapse)AuthorAge
* Add file option php_metadata_namespace and ruby_package (#4609)Gravatar Paul Yang2018-05-11
|
* Merge from google internalGravatar Jisi Liu2017-10-18
|
* Integrated internal changes from GoogleGravatar Adam Cozzette2017-09-14
|
* Merge master into 3.4.xGravatar Jisi Liu2017-07-18
|\
* | Merge from Google internal for 3.4 releaseGravatar Jisi Liu2017-07-18
| |
| * Support PHP generic services (#3269)Gravatar Matt A2017-07-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add php_generic_services option * Generate PHP generic services * Respect namespaces for generated PHP services * Test PHP generated services * Rename PHP generator service method doc comment function * Correct phpdoc service method case * Test namespaced PHP generic services * Always use the FQCN for PHP generic service input/output * Add generated_service_test to php test.sh * Add php service test protos to CI * Add php service files to php_EXTRA_DIST * Use Interface suffix for php generic services
| * Add new file option php_namespace. (#3162)Gravatar Paul Yang2017-06-05
|/ | | | | | | | | | | | | | | | * Add new file option php_namespace. Use this option to change the namespace of php generated classes. Default is empty. When this option is empty, the package name will be used for determining the namespace. * Uncomment commented tests * Revert gdb test change * Update csharp descriptor. * Add test for empty php_namespace.
* Down-integrate from google3.Gravatar Feng Xiao2017-03-29
|
* Add file option php_class_prefix (#2849)Gravatar Paul Yang2017-03-17
| | | | This option will be prepended to generated classes of all messages in the containing file.
* Merge 3.2.x branch into master (#2648)Gravatar Paul Yang2017-01-31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Down-integrate internal changes to github. * Update conformance test failure list. * Explicitly import used class in nano test to avoid random test fail. * Update _GNUC_VER to use the correct implementation of atomic operation on Mac. * maps_test.js: check whether Symbol is defined before using it (#2524) Symbol is not yet available on older versions of Node.js and so this test fails with them. This change just directly checks whether Symbol is available before we try to use it. * Added well_known_types_embed.cc to CLEANFILES so that it gets cleaned up * Updated Makefile.am to fix out-of-tree builds * Added Bazel genrule for generating well_known_types_embed.cc In pull request #2517 I made this change for the CMake and autotools builds but forgot to do it for the Bazel build. * Update _GNUC_VER to use the correct implementation of atomic operation on Mac. * Add new js file in extra dist. * Bump version number to 3.2.0 * Fixed issue with autoloading - Invalid paths (#2538) * PHP fix int64 decoding (#2516) * fix int64 decoding * fix int64 decoding + tests * Fix int64 decoding on 32-bit machines. * Fix warning in compiler/js/embed.cc embed.cc: In function ‘std::string CEscape(const string&)’: embed.cc:51:32: warning: comparison between signed and unsigned integer expressions [-Wsign-compare] for (int i = 0; i < str.size(); ++i) { ^ * Fix include in auto-generated well_known_types_embed.cc Restore include style fix (e3da722) that has been trampled by auto-generation of well_known_types_embed.cc * Fixed cross compilations with the Autotools build Pull request #2517 caused cross compilations to start failing, because the js_embed binary was being built to run on the target platform instead of on the build machine. This change updates the Autotools build to use the AX_PROG_CXX_FOR_BUILD macro to find a suitable compiler for the build machine and always use that when building js_embed. * Minor fix for autocreated object repeated fields and maps. - If setting/clearing a repeated field/map that was objects, check the class before checking the autocreator. - Just to be paranoid, don’t mutate within copy/mutableCopy for the autocreated classes to ensure there is less chance of issues if someone does something really crazy threading wise. - Some more tests for the internal AutocreatedArray/AutocreatedDictionary classes to ensure things are working as expected. - Add Xcode 8.2 to the full_mac_build.sh supported list. * Fix generation of extending nested messages in JavaScript (#2439) * Fix generation of extending nested messages in JavaScript * Added missing test8.proto to build * Fix generated code when there is no namespace but there is enum definition. * Decoding unknown field should succeed. * Add embed.cc in src/Makefile.am to fix dist check. * Fixed "make distcheck" for the Autotools build To make the test pass I needed to fix out-of-tree builds and update EXTRA_DIST and CLEANFILES. * Remove redundent embed.cc from src/Makefile.am * Update version number to 3.2.0-rc.1 (#2578) * Change protoc-artifacts version to 3.2.0-rc.1 * Update version number to 3.2.0rc2 * Update change logs for 3.2.0 release. * Update php README * Update upb, fixes some bugs (including a hash table problem). (#2611) * Update upb, fixes some bugs (including a hash table problem). * Ruby: added a test for the previous hash table corruption. Verified that this triggers the bug in the currently released version. * Ruby: bugfix for SEGV. * Ruby: removed old code for dup'ing defs. * Reverting deployment target to 7.0 (#2618) The Protobuf library doesn’t require the 7.1 deployment target so reverting it back to 7.0 * Fix typo that breaks builds on big-endian (#2632) * Bump version number to 3.2.0
* update descriptor.proto's go_packageGravatar Michael Darakananda2016-12-07
| | | | | This change has already been made in google's repo. Replicating the change here to unblock work on genproto.
* Add a swift_prefix file option.Gravatar Thomas Van Lenten2016-11-30
| | | | | | | | Swift generators should default to CamelCasing the proto package and prefixing symbols with that, but this option allows developers to override that behavior with something custom if they desire. Fixes https://github.com/google/protobuf/issues/1833
* Integrated internal changes from GoogleGravatar Adam Cozzette2016-11-17
|
* Add back removed descriptor field.Gravatar Bo Yang2016-10-10
|
* Integrate internal changesGravatar Bo Yang2016-10-10
|
* Integrate from internal code base.Gravatar Feng Xiao2016-07-13
|
* Integrated internal changes from GoogleGravatar Adam Cozzette2016-06-29
| | | | This includes all internal changes from around May 20 to now.
* Integrate google internal changes.Gravatar Jisi Liu2016-03-30
|
* Integrate from google internal.Gravatar Jisi Liu2016-01-29
| | | | | Java files are moved to un-do the hack in the prevous commit, which moved the java files to the original position for integration.
* Merge remote-tracking branch 'origin/master' into fix-authorGravatar Jisi Liu2015-10-05
|\
* | Down-integrate from google internal.Gravatar Jisi Liu2015-10-05
| |
| * Specify csharp_namespace in descriptor.protoGravatar Jon Skeet2015-09-01
|/
* Down-integrate from google3.Gravatar Feng Xiao2015-08-22
|
* Merge remote-tracking branch 'upstream/master'Gravatar Xiao Hang2015-08-04
|\
* | Generate a package name suffix ".nano" for nano messagesGravatar Xiao Hang2015-07-29
| | | | | | | | Also introducing an option javanano_use_deprecated_package to allow users to disable the suffix
| * Changing reflection namespace (part 3)Gravatar Jon Skeet2015-07-14
| | | | | | | | | | | | | | | | Change the C# namespace in descriptor.proto to Google.Protobuf.Reflection. This then means changing where the generated code lives, which means updating the project file... It also involves regenerating the C++ - which has updated the well-known types as well, for no terribly obvious reason...
| * Merged masterGravatar Jon Skeet2015-06-17
| |\ | |/ |/|
* | Give descriptor.proto a go packageGravatar Tamir Duberstein2015-06-12
| | | | | | | | | | This is currently done in golang/protobuf using `sed`. This change should simplify things.
| * First pass at the mutable API. Quite a bit more to do - in particular, it's ↵Gravatar Jon Skeet2015-06-09
|/ | | | pretty slow right now.
* down-integrate internal changesGravatar Bo Yang2015-05-21
|
* Merge branch 'master' of github.com:google/protobuf into integrate_from_masterGravatar Jan Tattermusch2015-05-13
|\
* | Add C# namespace to .proto files (e.g. descriptors, unit tests)Gravatar Jon Skeet2015-05-06
| |
| * Alpha 1 drop of Google's Objective C plugin and runtime support for protobufs.Gravatar Thomas Van Lenten2015-05-06
| |
* | temporarily removing csharp_umbrella_namespace file optionGravatar Jan Tattermusch2015-04-17
| |
* | removing csharp_property_name field optionGravatar Jan Tattermusch2015-04-17
| |
* | one more fix to csharp_umbrella_namespace commentGravatar Jan Tattermusch2015-04-17
| |
* | fix: do not mention umbrella_classname in commentGravatar Jan Tattermusch2015-04-17
| |
* | Fixed comment for csharp_umbrella_namespace (nest_classes has been removed)Gravatar Jan Tattermusch2015-04-16
| |
* | fixing field number of csharp_umbrella_namespace optionGravatar Jan Tattermusch2015-04-16
| |
* | restricted number of csharp options and regenerated descriptor.protoGravatar Jan Tattermusch2015-04-13
| |
* | Rewrote C# protogen to C++ (initial version)Gravatar Jan Tattermusch2015-03-26
|/
* Down integrate from Google internal branch for C++ and Java.Gravatar Jisi Liu2015-02-28
| | | | | | | | - Maps for C++ lite - C++ Arena optimizations. - Java Lite runtime code size optimization. Change-Id: I7537a4357c1cb385d23f9e8aa7ffdfeefe079f13
* Down-integrate from internal code base.Gravatar Feng Xiao2014-11-20
|
* Down-integrate from internal code base (C++ maps support).Gravatar Feng Xiao2014-11-14
|
* Down-integrate from internal code base.Gravatar Feng Xiao2014-11-10
|
* Replace links to code.google.com/protobuf with ↵Gravatar Feng Xiao2014-10-01
| | | | developers.google.com/protocol-buffers
* down integrate to svnGravatar jieluo@google.com2014-07-18
|
* Down-integrate from internal branchGravatar xiaofeng@google.com2012-09-22
|
* Update comments for globally unique extension number for custom options.Gravatar liujisi@google.com2011-05-25
|
* Submit recent changes from internal branch. See CHANGES.txt for more details.Gravatar liujisi@google.com2010-11-02
|