Commit Graph

8289 Commits

Author SHA1 Message Date
Deanna Garcia
1b827fa114 Run update_file_lists.sh 2021-05-20 18:52:08 +00:00
Deanna Garcia
ff7178ddf9 Merge branch 'master' into sync-stage 2021-05-19 23:00:22 +00:00
Deanna Garcia
4793f80ad3 Merge branch 'sync-stage' of https://github.com/deannagarcia/protobuf into sync-stage 2021-05-19 22:25:08 +00:00
Deanna Garcia
8d65655494 Fix maybe uninitialized error 2021-05-19 22:24:22 +00:00
Charles Mita
f1fe79dd12
Use cfg="exec" instead of cfg="host" in internal rules. (#8626)
Bazel has switched its protobuf rules to make them use the proto
compiler in the exec configuration instead of the host configuration.

However, if rules in protobuf still use the host configuration then
multiple copies of the compiler can end up being built.

cfg="host" is deprecated in any case and being replaced with cfg="exec"
where possible.
https://docs.bazel.build/versions/master/skylark/rules.html#configurations
2021-05-19 11:11:13 -07:00
deannagarcia
d1098000ce
Merge branch 'master' into sync-stage 2021-05-18 13:48:32 -07:00
Deanna Garcia
d43433d20f Updating makefile to pass the tests 2021-05-18 20:44:04 +00:00
Thomas Klausner
f71a662db4
Fix unportable test(1) operator. (#8616) 2021-05-18 07:24:59 -07:00
Joshua Haberman
dd69a484c0
Updated version of upb for Ruby (#8624)
* Updated upb.

* Preserve legacy behavior for unset messages.

* Updated failure list.

* Updated CHANGES.txt.

* Added erroneously-deleted test file.

* Fixed condition on compatibility code.

* Re-introduced deleted file again, and fixed Rakefile to not delete it.

* Fix generation of test protos.
2021-05-17 22:40:33 -07:00
Joshua Haberman
7611164792
Updated upb version and fixed PHP to not get unset message field. (#8621)
* Updated upb version and fixed PHP to not get unset message field.

* Updated changelog.

* Fixed preproc test to handle old versions of Clang withot __has_attribute().

* A second try at fixing __has_attribute().

* Copy __has_attribute() fix to cc file also.

* Updated failure list for PHP for fixed test.
2021-05-17 15:27:05 -07:00
Dennis Shao
0710536d30
Merge pull request #8623 from shaod2/kotlin-gen-docs
Kotlin: update pom.xml to include dokka
2021-05-17 17:01:14 -05:00
Dennis Shao
3b5f123537
Update pom.xml 2021-05-17 16:57:04 -05:00
Josh Kelley
8aaf4d2a40
Build updates (#5300)
* Make language instructions' documentation links clickable

See 86208c52.

* Add a `git submodules` check to autogen.sh

Running `./autogen.sh && make` happens to work without initializing git
submodules - but autogen.sh writes to what is supposed to be a git
submodules directory, so trying to later initialize git submodules
fails.

This change makes building a bit more reliable for people who miss this
step.

* Revise third_party googletest logic

As discussed in PR, instead of requiring that `git submodule --init` be
run, correctly handle the case where it isn't run.
2021-05-17 14:53:27 -07:00
Dennis Shao
ecbdbbaaf0
Merge branch 'master' into kotlin-gen-docs 2021-05-17 16:52:39 -05:00
Dennis Shao
31d3098af6
Update pom.xml
Add plugin to generate Kotlin docs
2021-05-17 16:51:42 -05:00
Chen WANG
939569ac9c
Add more description on unspecified directory in javascript readme (release notes: no) (#6393)
* Add more description on unspecified directory

In the example code, the "js" folder appeared for the first time and there is no clue where the current folder is. Therefore, there should be some comments describing what the folder is. Otherwise, like me, spent a lot of time guessing what codes - some release version or the source code - should be downloaded to go to the "js" directory.

* Add detailed description on how to run js tests

The test files are directly in the Protocol Buffer project js folder. Add more detailed instruction on how and where to run the tests.

* Correct two spelling mistakes

The two spelling mistakes mentioned in your comments are corrected.
2021-05-17 14:43:17 -07:00
David L. Jones
24935638ea
Revert "Merge branch 'kotlin' into master" (#8622)
This reverts commit 716621a222, reversing
changes made to f0da89d8b6.
2021-05-17 14:26:10 -07:00
Dennis Shao
716621a222
Merge branch 'kotlin' into master 2021-05-17 15:58:53 -05:00
Dennis Shao
45aca8d7a0 Update pom.xml for kotlin doc generateor 2021-05-17 20:56:02 +00:00
Jan Tattermusch
f0da89d8b6
Merge pull request #8473 from Jensaarai/ReadOnlySpan
C#: Add ParseFrom/MergeFrom ReadOnlySpan<byte>
2021-05-17 12:52:57 +02:00
Joshua Haberman
7e95c64dfb
[PHP] Fixed $msg->setMessage(null) to properly clear the message. (#8472)
* [PHP] Fixed $msg->setMessage(null) to properly clear the message.

Fixes: https://github.com/protocolbuffers/protobuf/issues/8457

* Changed pure PHP to throw TypeError, and added a test for null.

* Added more tests and fixed null in setter for oneof.
2021-05-14 16:48:45 -07:00
Deanna Garcia
879bc6f6db Get rid of merging tags 2021-05-14 23:44:53 +00:00
Deanna Garcia
d0ea861a74 Add another file to Makefile 2021-05-14 23:21:52 +00:00
Deanna Garcia
f1b0d4e29f Add another header to Makefile 2021-05-14 23:08:04 +00:00
Deanna Garcia
7a1b30166f Add headerfiles to Makefile 2021-05-14 22:58:57 +00:00
Deanna Garcia
cab253ec5e Removing python_protobuf.h/cc 2021-05-14 22:35:38 +00:00
Deanna Garcia
6da55b2d6b Add changes to CHANGES.txt 2021-05-14 22:20:48 +00:00
Deanna Garcia
f66dea481d Merge tag 'refs/tags/sync-piper' into sync-stage
# Conflicts:
#	java/kotlin/src/test/kotlin/com/google/protobuf/Proto2Test.kt
#	src/google/protobuf/repeated_field_unittest.cc
2021-05-14 21:56:03 +00:00
Deanna Garcia
094d18944e Sync from Piper @373871284
PROTOBUF_SYNC_PIPER
2021-05-14 21:55:47 +00:00
Deanna Garcia
380e352b0b Sync from Piper @373820256
PROTOBUF_SYNC_PIPER
2021-05-14 17:50:31 +00:00
deannagarcia
361ac449d6
Merge pull request #8597 from deannagarcia/updateKotlinCompiler
Updating Kotlin compiler version and testing new functionality it allows
2021-05-14 10:41:02 -07:00
Deanna Garcia
8fbfa35330 Merge branch 'master' into updateKotlinCompiler 2021-05-14 16:51:46 +00:00
Twig
c7d2a97879
Sets SKIP_INSTALL to YES for the ProtocolBuffers target (#8560) 2021-05-14 12:17:42 -04:00
Thomas Van Lenten
23fd8e0791 Use correct enum values.
The clang Xcode 12.5 seems to actually detect this long standing mistake.
2021-05-14 11:48:54 -04:00
Joshua Haberman
b0d90e3abe
Fixed PHP memory leaks and arginfo errors (#8614)
* Fixed a bunch of incorrect arginfo and a few incorrect error messages.

* Passes mem check test with no leaks!

* WIP.

* Fix build warning that was causing Bazel build to fail.

* Added compatibility code for PHP <8.0.

* Added test_valgrind target and made tests Valgrind-clean.

* Updated Valgrind test to fail if memory leaks are detected.

* Removed intermediate shell script so commands are easier to cut, paste, and modify.

* Passing all Valgrind tests!

* Hoist addref into ObjCache_Get().

* Removed special case of map descriptors by keying object map on upb_msgdef.

* Removed all remaining RETURN_ZVAL() macros.

* Removed all explicit reference add/del operations.

* Added REFCOUNTING.md to Makefile.am.
2021-05-13 23:16:49 -07:00
Deanna Garcia
a36efdefa3 Merge branch 'master' into updateKotlinCompiler 2021-05-13 22:47:03 +00:00
John M Duffy
63d2aca3b5
Update generated_message_table_driven.h (#8571)
Export SerializeInternalToArray referenced by TableSerializeToArray
2021-05-13 12:22:24 -07:00
Twice
9344e0b724
Fix compile error on darwin GCC due to an unsupported attribute init_priority (#8600) 2021-05-13 11:50:54 -07:00
Adam Cozzette
7bbfd14b7f
Merge pull request #8603 from acozzette/merge-3.17.x
Merge 3.17.x into master
2021-05-13 08:59:12 -07:00
Adam Cozzette
086aa97385 Merge branch '3.17.x' into merge-3.17.x 2021-05-12 16:26:13 -07:00
Adam Cozzette
652d99a8ee
Update protobuf version (#8606) 2021-05-12 16:20:18 -07:00
Deanna Garcia
92e504e660 Merge remote-tracking branch 'upstream/master' into updateKotlinCompiler 2021-05-12 21:58:09 +00:00
Adam Cozzette
ca295506c5
Make the dist_install test use Java 8 (#8609)
This is necessary because the Kotlin support requires Java 8 or
higher.

Making this test use Java 8 required switching it to the java_stretch
Docker image and updating that image to include some Python
dependencies.
2021-05-12 14:42:15 -07:00
Deanna Garcia
4a5e765fe3 Adding more repeated extension tests 2021-05-12 17:50:59 +00:00
Joshua Haberman
45e9707871
Some more updates to PHP testing infrastructure (#8576)
* WIP.

* Added build config for all of the tests.

* Use ../src/protoc if it is available, for cases where Bazel isn't available.

* Added test_php.sh.

* Fix for the broken macOS tests.

* Move all jobs to use php80 instead of lots of separate jobs.

* Only pass -t flag if we are running in a terminal.

* Updated php_all job to use new Docker stuff.
2021-05-12 10:42:16 -07:00
Adam Cozzette
0aabf89420 Remove some redundant language prefixes from the changelog for 3.17 2021-05-12 09:58:30 -07:00
Adam Cozzette
5a9367ac57 Update tests.sh to skip the Kotlin tests on Oracle 7 2021-05-12 09:58:30 -07:00
Adam Cozzette
a4866d34f9 Updated .gitignore to include Kotlin directories 2021-05-12 09:58:30 -07:00
Yuriy Chernyshov
ca7f54aa1a
Fix -Wunused-parameter in java_names.h (#8601)
* Fix -Wunused-parameter in java_names.h

* Apply review comments
2021-05-11 14:58:29 -07:00
Adam Cozzette
3133828c7f Merge branch '3.17.x' into merge-3.17.x 2021-05-11 10:50:07 -07:00