Commit Graph

9588 Commits

Author SHA1 Message Date
Elliotte Rusty Harold
4d96482e72 Merge tag 'refs/tags/sync-piper' into sync-stage 2022-06-08 12:49:35 -04:00
Elliotte Rusty Harold
3ba3c6a36f Sync from Piper @453701696
PROTOBUF_SYNC_PIPER
2022-06-08 12:49:35 -04:00
strangewiz
c0fc2e881b
Remove use of sprintf in strutil.cc (#10112)
Co-authored-by: Justin Cohen <justincohen@google.com>
2022-06-07 16:13:33 -07:00
secup
d37cbfd448
Update inlined_string_field.h (#10107)
Modify to #ifdef to prevent certain projects to report warnings are errors. thx u
2022-06-07 16:12:13 -07:00
mkruskal-google
3380463ff8
Deleting python release kokoro setup. This has been replaced by upb's python release (#10055) 2022-06-03 14:50:53 -07:00
Thanet (Knack) Praneenararat
594f2a9b0d Fixes bugs of isSynthetic and makes containing_oneof work 2022-06-04 01:40:22 +09:00
Thanet (Knack) Praneenararat
238331b359 Added support for getRealContainingOneof() and getContainingOneof() 2022-06-03 17:19:23 +09:00
zhangskz
0663080c5a
Revert third party/benchmark commit from Piper integrate and add ignore=dirty to submodule (#10104)
* Revert change to third_party/benchmark from Piper->Github sync

* Add ignore=dirty to third_party/benchmark submodule
2022-06-02 18:32:45 -04:00
Namgoo Lee
e7cc1aa970
remove const from function return type if returning const value (#10101) 2022-06-02 12:38:35 -07:00
zhangskz
4548b4ac0e
Merge pull request #10103 from zhangskz/sync-stage
Integrate from Piper for C++, Java, and Python
2022-06-02 18:28:15 +00:00
Sandy Zhang
f138d5de25 Sync from Piper @452551755
PROTOBUF_SYNC_PIPER
2022-06-02 16:14:25 +00:00
Sandy Zhang
2ad33999ee Merge tag 'refs/tags/sync-piper' into sync-stage 2022-06-02 16:14:25 +00:00
Thanet (Knack) Praneenararat
b27dd18676 Exposed more functions in FieldDescriptor and OneofDescriptor. 2022-06-03 00:08:44 +09:00
David L. Jones
67f46d2495
Switch normal macos build to use cmake. (#10092) 2022-06-01 18:24:53 -07:00
David L. Jones
dc14b4be42
Change update_file_lists.sh to work based on Bazel-generated file lists (#10091)
This commit changes update_file_lists.sh to use Bazel as the source of truth. Currently, only the cmake build is actually affected, but Automake should be fairly straightforward to convert.

The file lists were originally factored out in PR#10027. This commit actually switches over to the Bazel-generated lists.
2022-06-01 18:23:05 -07:00
appledragon
45b7f62b1b
use char to find instead of string (#10094)
* [Bazel] Add a doc explaining our C++ build systems and distribution archives. (#10073)

* use char to find instead of string

Co-authored-by: David L. Jones <dlj@google.com>
2022-06-01 14:18:16 -07:00
David L. Jones
bd85edfbd9
[Bazel] Add a doc explaining our C++ build systems and distribution archives. (#10073) 2022-05-31 17:52:26 -07:00
David L. Jones
74b2c7c7ce
Move cmake file lists into src/file_lists.cmake. (#10027)
This is in preparation for generating file lists automatically.

I am putting the list of files under src/, not under cmake/, so that it will be next to the file list for automake (see #10029). I can certainly put the list back under cmake/, but in general, I think we probably want to move the cmake targets e.g. to src/CMakeLists.txt anyhow.
2022-05-31 16:16:02 -07:00
David L. Jones
c2e99db90b
Add filegroups for test sources and include them in file lists. (#10049)
These will be used to generate lists of sources for non-Bazel builds.
2022-05-31 15:59:28 -07:00
zhangskz
1ec6f26ce7
Remove expected cmake failure due to missing abseil sources, since ab… (#10089)
* Remove expected cmake failure due to missing abseil sources, since absl dep was rolled back

* Add back cmake.sh run using extracted sources
2022-05-31 16:45:44 -04:00
bttk
85fcd02e32
Remove merge markers from BUILD.bazel and fix incorrect merge (#10084)
* Remove merge markers from BUILD.bazel

* fix build errors
2022-05-31 15:34:59 -04:00
zhangskz
045172f35a
Merge pull request #10072 from protocolbuffers/main-202205272356
Merge 21.x to main after 21.1 release
2022-05-31 16:13:37 +00:00
Dennis Shao
a11fa4529f
Merge pull request #10059 from shaod2/sync-stage
Integrate from Piper for C++, Java, and Python
2022-05-31 11:12:11 -05:00
Sandy Zhang
e16d9348d7 Fix php generator merge to include php revert change from 21.x 2022-05-28 00:27:59 +00:00
Sandy Zhang
15e09f56b0 Fix unsaved merge resolution 2022-05-28 00:17:14 +00:00
Sandy Zhang
258514019f Merge 21.x into main 2022-05-28 00:06:34 +00:00
zhangskz
55fe00e35e
Merge pull request #10071 from protocolbuffers/21.x-202205272218
Update version.json to 21.2-dev
2022-05-27 23:25:37 +00:00
zhangskz
fd896733a5
Merge branch '21.x' into 21.x-202205272218 2022-05-27 23:24:44 +00:00
Sandy Zhang
6bd7c2e48c Update version.json to: 21.2-dev 2022-05-27 23:19:49 +00:00
Adam Cozzette
7f02c3b16b
Fix continuous aarch64 builds (#10067)
Some of the continuous aarch64 builds started failing yesterday because
the autotools -> CMake change caused the protoc binary to end up in an
unexpected location. This change fixes the problem by putting a symlink
in the src/ directory.
2022-05-27 11:11:05 -07:00
Sandy Zhang
569a0517fa Updated changelog 2022-05-27 14:07:46 -04:00
Protobuf Team Bot
38e3a11a29 Updating version.json and repo version numbers to: 21.1 2022-05-27 14:07:46 -04:00
Protobuf Team Bot
e73ed1630f Updating version.json and repo version numbers to: 21.1 2022-05-27 09:37:14 -07:00
zhangskz
5bbb8f7b2c
Update upb commit to include fix for segmentation fault when instantiating field via repeated field assignment (#10066) 2022-05-27 12:16:33 -04:00
deannagarcia
d4e1c668ad
Merge pull request #10047 from protocolbuffers/temp
Update version.json to: 21.1-dev
2022-05-27 16:02:45 +00:00
David L. Jones
ceaae1b6a3
[Bazel] Add back a filegroup for :well_known_protos. (#10061)
This was removed in #9915, since it is misleadingly named (the set of sources is "well known," but not the same as the Well-Known Types).
2022-05-26 16:32:15 -07:00
Adam Cozzette
3b029b1f4f
Revert "Fix cmake install targets (#9822)" (#10060)
This reverts commit c80808ce1d.

Thix fixes #10045. Somehow the change caused these four .cmake files to
stop being installed:

protobuf-config.cmake
protobuf-config-version.cmake
protobuf-module.cmake
protobuf-options.cmake

After reverting the change, I confirmed that the files are being
installed again.
2022-05-26 14:11:37 -07:00
zhangskz
16a86804c0
Update upb commit/sha256 to include updated python wheel (#10058) 2022-05-26 15:36:41 -04:00
Dennis Shao
6dd8af4ecf Sync from Piper @451217119
PROTOBUF_SYNC_PIPER
2022-05-26 19:21:41 +00:00
Dennis Shao
0e8b241eb4 Merge tag 'refs/tags/sync-piper' into sync-stage 2022-05-26 19:21:41 +00:00
Adam Cozzette
f7e2e0b301
Remove Abseil dependency from CMake build (#10056)
* Revert "Added cmake abseil include guard"

This reverts commit b6ee841d7c.

* Revert "Update CMake configuration to add a dependency on Abseil (#9793)"

This reverts commit e9246cd789.
2022-05-26 12:13:41 -07:00
Adam Cozzette
30f446820d
Add endian.h to includes list (#10057)
Client code is breaking due to missing include.  (endian.h was added in 9e09343 but didn't make it into this list, so it wasn't getting installed)

Co-authored-by: boscosiu <boscosiu@users.noreply.github.com>
2022-05-26 12:09:49 -07:00
mkruskal-google
f2e06fe042
Migrate linux-aarch64 tests away from autotools (#10015)
Autotools support is being deprecated, so this moves some of our kokoro tests to cmake
2022-05-26 09:54:30 -07:00
Deanna Garcia
698d760f8d Update version.json to: 21.1-dev 2022-05-26 01:24:35 +00:00
deannagarcia
e7e8f04a4f
Merge pull request #10044 from protocolbuffers/21.x-202205252102
Update versions and changelog for 21.x
2022-05-25 21:50:17 +00:00
David L. Jones
0e42bf9f58
[Bazel/C++] Split apart protobuf_test rule (#10039)
This splits the `protobuf_test` target into several other test targets, and adds `lite_unittest` and `lite_arena_unittest`, which were missing previously.

[Side note:] I did a pass over the new tests to thin their dependencies, and also split out `lite_test_util` from the existing `test_util`  target. I have left the `protobuf_test` target in place (but empty) for now... it is almost certainly safe to remove, but that can be done in a follow-up to reduce risk from this commit.
2022-05-25 14:28:03 -07:00
Deanna Garcia
7062d0a2d0 Updated changelog 2022-05-25 21:15:04 +00:00
Protobuf Team Bot
59c6ff83e9 Updating version.json and repo version numbers to: 21.0 2022-05-25 13:51:01 -07:00
David L. Jones
34d749df72
Fix headers for protobuf and protobuf_lite so they are the proper lists of files, not just globs. (#10031)
This change makes the headers into actual lists of files, rather than globs. These lists are based on the current cmake definitions.
2022-05-25 12:02:31 -07:00
cjtallman
043ee2e4e6
Adding a DEPENDENCIES option to the protobuf_generate cmake function (#10014) 2022-05-25 11:00:25 -07:00