aboutsummaryrefslogtreecommitdiff
path: root/Makefile.am
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/3.5.x' into masterJisi Liu2018-01-031-0/+1
|\
| * Cherrypick for csharp, including:Jie Luo2017-12-191-1/+13
| | | | | | | | | | | | Add preserve UnknownFields Compare floating point values bitwise Add auto-generated header to C# generated files
| * Add discard unknown API in ruby. (#3990)Paul Yang2017-12-071-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | * Add discard unknown API in ruby. * Add test for oneof message field. * Add TestUnknown to represent unknown field data clearly. * Only serialize the message with unknown fields itself in test. * Move discard_unknown from Message to Google.Protobuf
* | Add unknown field support for csharp (#3936)Jie Luo2017-12-131-1/+5
| | | | | | Add unknown field support for csharp
* | Compare floating point values bitwise in C#Jon Skeet2017-12-091-0/+3
| | | | | | | | | | This is the manual code part of the Google.Protobuf library, and tests. Some tests will fail until codegen is changed and rerun.
* | Updated Makefile.am to add a new file to EXTRA_DISTAdam Cozzette2017-12-011-0/+1
| |
* | Add a UTF-8 decoder that uses Unsafe to directly decode a byte buffer.Anuraag Agrawal2017-11-291-0/+1
| |
* | Fix up warnings from Xcode 9.1 (#3887)dmaclach2017-11-161-9/+14
| | | | | | | | Fix up warnings from Xcode 9.1
* | Move C#-only test protos to csharp/protosJon Skeet2017-11-121-0/+5
|/ | | | | | | | | | unittest_proto3 had been changed in a very backward-incompatible way which was never going to work with C# as it imports proto2 messages. This is now a copy of the old file, but with a package name change for compatibility with the remaining files in src/google/protobuf. The other moves are for files that are only used by C#.
* Merge remote-tracking branch 'origin/3.4.x' into masterJisi Liu2017-10-251-0/+1
|\
| * Merge pull request #3578 from pherl/filedeprecationJisi Liu2017-10-181-0/+1
| |\ | | | | | | Add @Deprecated annotation support for proto file.
| | * Fix dist checkJisi Liu2017-08-311-0/+1
| | |
* | | Fix distcheckJisi Liu2017-10-111-0/+1
| | |
* | | Merge remote-tracking branch 'origin/3.4.x' into masterJisi Liu2017-10-111-0/+11
|\| |
| * | Exclude valid constant name from reserved name.Bo Yang2017-09-121-0/+2
| | |
| * | Add prefix to php reserved keywords.Bo Yang2017-09-081-0/+4
| | |
| * | change the field number of php_generic_service to fix the conflict with (#3576)Paul Yang2017-08-301-0/+1
| |/ | | | | internal descriptor.proto
| * Add mising cmake files in distJisi Liu2017-08-241-0/+2
| |
* | Add well known types to php runtime. (#3697)Paul Yang2017-10-051-42/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add well known types to php runtime. * Fix php7.0 tests * No longer generate empty.proto in test as it has been included in runtime. * Fix zts build * Clean code * Rename g_p_b_empty to empty. * Don't generate code for empty.proto in compatibility test * Fix 32-bit * Fix mac build * Fix Makefile.am to add new files
* | Fix ruby segment fault (#3708)Paul Yang2017-10-031-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fix ruby segment fault 1) rb_ary_new cannot be called during allocate function. During allocate fucntion, the containing object hasn't been marked and rb_ary_new may invoke gc to collect containing object. 2) The global map should be marked before allocating it. Otherwise it may be garbage collected. * Add test * Remove commented code * Fix grammer error
* | Enforce all error report for php tests. (#3670)Paul Yang2017-09-221-0/+1
| | | | | | | | | | | | * Enforce all error report for php tests. * Import vendor/autoload.php in tests/bootstrap_phpunit.php
* | Integrated internal changes from GoogleAdam Cozzette2017-09-141-0/+1
| |
* | Update examples file list.Feng Xiao2017-09-111-6/+7
| |
* | Add native php support for Duration. (#3583)Paul Yang2017-09-051-0/+2
| |
* | Add php support for Timestamp. (#3575)Paul Yang2017-08-311-0/+2
| | | | | | | | | | | | * Add php support for Timestamp. * Fix comments
* | Add any support in php runtime. (#3486)Paul Yang2017-08-251-0/+2
|/ | | | | | | | | | | | * Add any support in php runtime. * Remove unused file in config.m4 * Fix comments * Fix error for tsrmls build * Add newly added file to Makefile.am
* Merge branch 'master' into 3.4.xBo Yang2017-08-051-1/+10
|\
| * Update PHP descriptors (#3391)michaelbausor2017-08-041-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add descriptors test * Update descriptors tests * Add public descriptors * Add test_desriptors.proto to test script * Update composer files * Remove references to GPBType, update tests to be compatible with c * Update for c extension compatibility * Remove nested enums for descriptor, update tests * Strip leading '.' from descriptor name * Update tests with test for getClass, fix OneofDescriptor * Add new files to Makefile.am
| * Expose descriptor API in php c extension (#3422)Paul Yang2017-08-021-0/+2
| |
* | Add lite and python extra_dist filesJisi Liu2017-07-191-0/+4
| |
* | Add java and JS dist files.Jisi Liu2017-07-191-0/+23
| |
* | Merge master into 3.4.xJisi Liu2017-07-181-52/+71
|\|
| * Support PHP generic services (#3269)Matt A2017-07-181-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 json encode/decode for php. (#3226)Paul Yang2017-06-301-44/+48
| | | | | | | | | | | | | | | | | | | | * Add json encode/decode for php. * Fix php conformance test on 32-bit machines. * Fix conformance test for c extension. * Fix comments
| * Add scripts to build python wheel for linux. (#2693)Paul Yang2017-06-281-0/+5
| | | | | | | | | | | | | | | | | | * Add scripts to build python wheel for linux. Followed PEP513. * Fix dist check for new added files. * Update README for usage example.
| * adds PHPDoc @return and @param for getters and setters respectively (#3131)Brent Shaffer2017-06-271-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * adds PHPDoc @return and @param for getters and setters respectively * addresses changes in PR review * adds documentation tests * Update php_generator: - Prepend \ to names where required - Remove <pre> tags - Update protobuf field comments * Updates class files with the protobuf changes * Addresses review comments * removes Protobuf Type line from PHP generated classes * fixes phpdoc test * adds array types to phpdoc
| * Follows proper autoloading standards (#3123)Brent Shaffer2017-06-141-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * Follows proper autoloading standards - Splits PHP classes in descriptor.php into separate files - Splits MapFieldIter and RepeatedFieldIter into separate files - Moves descriptor.php to Internal/functions.php - Moves all namespaced functions into Iternal/functions.php * fixes Makefile.am for added php files * [PHP] moves all functions to GPBUtil * removes description.php from the makefile
| * Add new file option php_namespace. (#3162)Paul Yang2017-06-051-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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.
| * Convert C# projects to MSBuild (csproj) formatJon Skeet2017-05-241-13/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This has one important packaging change: the netstandard version now depends (implicitly) on netstandard1.6.1 rather than on individual packages. This is the preferred style of dependency, and shouldn't affect any users - see http://stackoverflow.com/questions/42946951 for details. The tests are still NUnit, but NUnit doesn't support "dotnet test" yet; the test project is now an executable using NUnitLite. (When NUnit supports dotnet test, we can adapt to it.) Note that the project will now only work in Visual Studio 2017 (and Visual Studio Code, and from the command line with the .NET Core 1.0.0 SDK); Visual Studio 2015 does *not* support this project file format.
| * Fix ExtensionRegistry copying and add tests.Thomas Van Lenten2017-05-171-0/+1
| | | | | | | | | | | | | | | | | | - Fix up -copyWithZone: to not leave the two registries sharing some of the storage by using -addExtensions:. - Improve -addExtensions: to clone the sub dict when there is nothing to merge into. - A ExtensionRegistry unittests. - Update project schemes to not have extra things in perf scheme.
| * Add compatibility test for php. (#3041)Paul Yang2017-05-051-0/+1
| | | | | | | | | | | | * Add compatibility test for php. * Revert API incompatible change.
* | Merge from Google internal for 3.4 releaseJisi Liu2017-07-181-2/+0
|/
* Merge remote-tracking branch 'remotes/google/3.3.x' into merge-3.3-to-masterAdam Cozzette2017-04-271-1/+5
|\
| * Throw exception when parsing invalid data. (#3000)Paul Yang2017-04-211-0/+1
| |
| * Allow proto files to import descriptor.proto (#2995)Paul Yang2017-04-201-0/+1
| | | | | | | | | | | | | | | | | | descriptor.proto uses proto2 syntax, which is not ready for external usage. However, some proto3 files import descriptor.proto and cannot be used. In this PR, all references (We cheated by only removing extensions, which is enough for now. User should avoid using messages defined in descriptor.proto as field type.) to content in descriptor.proto are removed from generated files. Those that import descriptor.proto can be used like other proto files.
| * Down-integrate from google3.Feng Xiao2017-03-291-1/+3
| |
* | Added compatibility tests for version 3.0.0Adam Cozzette2017-04-031-45/+74
|/
* Add file option php_class_prefix (#2849)Paul Yang2017-03-171-21/+23
| | | | This option will be prepended to generated classes of all messages in the containing file.
* Ruby: wrap calls to memcpy so that gem is compatible with pre-2.14 glibcAdam Cozzette2017-03-091-0/+1
| | | | | | | | | | | | | | | | | | | | | | | This commit adds a __wrap_memcpy function and a linker flag to use that in place of memcpy for our Ruby gem C extension. This allows us to always use the 2.2.5 version of memcpy, making it possible to use the gem on distributions with pre-2.14 versions of glibc. Before this change: $ objdump -T protobuf_c.so | grep memcpy 0000000000000000 DF *UND* 0000000000000000 GLIBC_2.3.4 __memcpy_chk 0000000000000000 DF *UND* 0000000000000000 GLIBC_2.14 memcpy After: $ objdump -T protobuf_c.so | grep memcpy 0000000000000000 DF *UND* 0000000000000000 GLIBC_2.2.5 memcpy 0000000000000000 DF *UND* 0000000000000000 GLIBC_2.3.4 __memcpy_chk 0000000000042450 g DF .text 0000000000000005 Base __wrap_memcpy This is based on gRPC's solution to a similar problem: https://github.com/grpc/grpc/blob/5098508d2d41a116113f7e333c516cd9ef34a943/src/core/lib/support/wrap_memcpy.c This fixes issue #2783.
* Add Ruby compatibilty test against 3.0.0.Feng Xiao2017-02-271-0/+9
|
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-12 08:59:07 +0000