AuroraMiddleware/protobuf
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity
9,477 Commits 35 Branches 138 Tags 124 MiB
e5e8378a62
Commit Graph

9477 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David L. Jones
e5e8378a62
[Bazel] Make the protobuf workspace (nearly) wildcard-buildable. (#10010) 
- Add back benchmarks/datasets/BUILD.bazel to dist archive
- Change dist/build_systems.bzl to be compatible with Bazel 4.0.0.

After this, most builds can use //..., with one exception: non-Mac environments must also exclude objectivec:
`bazel build -- //... -//objectivec/...`
 2022-05-20 19:33:42 -07:00
deannagarcia
599b08ab1c
Merge pull request #10018 from protocolbuffers/main-202205201724 
Merge 21.x into Main
 2022-05-20 15:54:17 -07:00
Deanna Garcia
38f0bd4d15 Fix bazel builds 2022-05-20 21:28:55 +00:00
David L. Jones
bb27447f42
[Bazel] Use pyenv to select Python 3.9.5 on our linux/bazel builds. (#10009) 
We still need to use python2 when running autotools.
 2022-05-20 13:04:18 -07:00
Deanna Garcia
cdfd60f63d Fix podspec errors 2022-05-20 18:03:26 +00:00
Deanna Garcia
1407efb39f Fix merge conflict 2022-05-20 17:45:47 +00:00
Deanna Garcia
da481978af Merge 21.x back to main 2022-05-20 17:39:11 +00:00
deannagarcia
6673c7c48f
Merge pull request #10006 from protocolbuffers/21.x-202205200038 
Update version.json to: 21.0-dev
 2022-05-20 10:17:11 -07:00
Chan Wen Xu
30f6c7851b
Add protoc-gen-xo to global extension registry (#9997) 2022-05-20 05:51:18 -07:00
David L. Jones
450d24ca82
Merge pull request #10005 from dlj-NaN/sync-stage 
Integrate from Piper for C++, Java, and Python
 2022-05-19 18:56:40 -07:00
Deanna Garcia
ecaeadeced Update version.json to: 21.0-dev 2022-05-20 00:38:39 +00:00
David L. Jones
42ff77e55f Restore erroneous changes to Makefile.am. 2022-05-19 17:26:06 -07:00
David L. Jones
053f698e90 Adjust constexpr qualifiers so they work in gcc < 4.9. 2022-05-19 16:57:17 -07:00
David L. Jones
7f2368933a Re-generate csharp and php golden proto files after changes to descriptor.proto. 2022-05-19 16:02:36 -07:00
David L. Jones
d0a4dc7661 Update CHANGES.txt. 2022-05-19 14:46:31 -07:00
David L. Jones
d87d99d931 Merge tag 'refs/tags/sync-piper' into sync-stage 2022-05-19 14:43:18 -07:00
David L. Jones
3740e6fa68 Sync from Piper @449836334 
PROTOBUF_SYNC_PIPER
 2022-05-19 14:43:18 -07:00
David L. Jones
cd5cc37624
Fix some style/lint issues. (#10003) 
- Starlark: ensure docstrings are present.
- python/setup.py: https://refex.readthedocs.io/en/latest/guide/fixers/superfluous_parens.html
 2022-05-19 14:22:56 -07:00
Deanna Garcia
71271ad1f8 Edit changelog 2022-05-19 20:42:46 +00:00
Protobuf Team Bot
1fa42c4be4 Updating version.json and repo version numbers to: 21.0-rc2 2022-05-19 13:35:48 -07:00
deannagarcia
d031130582
Merge pull request #10000 from jskeet/21.x 
Cherry-pick PR #9981 into 21.x branch
 2022-05-19 10:38:31 -07:00
Joshua Haberman
bf771eb540
Merge pull request #9996 from haberman/cherry-pick-php-segv-fix 
Fixed PHP SEGV by not writing to shared memory for zend_class_entry.
 2022-05-19 08:44:28 -07:00
Jan Tattermusch
70afbd3c8d regenerate C# protos 2022-05-19 16:42:21 +01:00
James Newton-King
9806b0f57b Suppress CS8981 in generated source 2022-05-19 16:42:20 +01:00
Joshua Haberman
a04d00312f Fixed PHP SEGV by not writing to shared memory for zend_class_entry. 2022-05-19 04:15:51 +00:00
Joshua Haberman
fd3b5a36ab
Merge pull request #9995 from haberman/php-segv-fix 
Fixed PHP SEGV by not writing to shared memory for zend_class_entry.
 2022-05-18 21:13:47 -07:00
Joshua Haberman
8a46882bf0 Brought the comment up to date. 2022-05-19 04:13:16 +00:00
Joshua Haberman
65a2a52df3 Fixed PHP SEGV by not writing to shared memory for zend_class_entry. 2022-05-18 21:39:30 +00:00
David L. Jones
171a6b1155
[Bazel/C++] Move core C++ implementation to //src/google/protobuf package. (#9988) 
This is somewhat of a rough cut, since it doesn't split apart the lite and full targets, or unit tests. However, it does split sources under src/google/protobuf into a separate package, which is a fairly impactful change.
 2022-05-18 13:45:22 -07:00
Jan Tattermusch
d2292fc5f6 regenerate C# protos 2022-05-18 18:18:25 +01:00
James Newton-King
40e82cbd2a Suppress CS8981 in generated source 2022-05-18 18:18:25 +01:00
David L. Jones
07303d6f54
[Bazel/C++] Factor out util library (#9987) 
This change creates new Bazel packages for the C++ util libraries (similar to #9980 and #9985).
 2022-05-17 18:13:22 -07:00
Joshua Haberman
fe3d67cb8e
Merge pull request #9986 from haberman/update-upb3 
Updated upb, which will give a better error message if generated code is out of date
 2022-05-17 17:46:50 -07:00
David L. Jones
cbd1adc6cf
[Bazel/C++] Factor out compiler packages. (#9985) 
This change adds packages for protoc sources under src/google/protobuf/compiler (this is similar to what was done in #9980).
 2022-05-17 16:39:47 -07:00
Joshua Haberman
364852e829 Throw a more helpful error if generated code is out of date, and fixed two reference leaks. 2022-05-17 22:51:01 +00:00
David L. Jones
f868799366
Use cc_dist_library targets for macos release libprotobuf. (#9966) 2022-05-17 15:36:37 -07:00
deannagarcia
22067bf523
Merge pull request #9979 from deannagarcia/fixProtocRelease 
Fix protoc_release target
 2022-05-17 13:35:43 -07:00
David L. Jones
c2c770e7ea
[Bazel/C++] Factor out stubs, io, and testing libraries. (#9980) 
This change creates packages under src/google/protobuf/{io,stubs,testing} and moves build definitions there. Future changes will handle .../util and .../compiler, and finally src/google/protobuf.
 2022-05-17 13:26:46 -07:00
zhangskz
e235147407
Delete legacy update_version.py script, which is replaced with internal update_versions library (#9983) 2022-05-17 13:49:20 -04:00
David L. Jones
b3199d62be
[Python] Handle user-provided --link-objects and --library-dirs. (#9968) 
If the user provides a `--link-objects` (or `-O`) flag that looks like it points to libprotobuf, use that for static linking instead of using the hard-coded path `../src/.libs/libprotobuf.a`. (Also, if we see such a flag, assume they want to link it statically, even if they don't provide `--compile_static_extension`.)

Similarly, if they provide a `--library-dirs=` (or `-L`), assume that is the location to search, and don't add the hard-coded path `../src/.libs`.
 2022-05-16 17:21:28 -07:00
David L. Jones
4e5b920625
[Bazel/macOS] Use the constructed environment when running libtool. (#9965) 
This fixes errors like: `SDKROOT: unbound variable` when building a cc_dist_library rule.
 2022-05-16 16:11:09 -07:00
Deanna Garcia
0f3ee3b625 Fix protoc_release target 2022-05-16 22:48:41 +00:00
Joshua Haberman
cf4075ac20
Merge pull request #9969 from johnnyshields/21.x-ruby-x64-mingw-ucrt-support 
21.x Backport: Ruby: Support x64-mingw-ucrt platform
 2022-05-16 13:34:50 -07:00
Joshua Haberman
375b984715
Merge pull request #9976 from haberman/update-upb 
Fixed win32 build and fixed str(message) on all Windows platforms.
 2022-05-16 13:34:19 -07:00
Joshua Haberman
8353e19756 Updated to the newest upb, which brings many fixes for Windows builds. 2022-05-16 17:10:27 +00:00
Deanna Garcia
d3edfa29b7 Use osx-aarch_64 artifact 2022-05-16 16:44:24 +00:00
deannagarcia
088281d84b
Merge pull request #9964 from protocolbuffers/main-202205131806 
Merge 21.x back to main
 2022-05-16 09:06:11 -07:00
Vassil Kovatchev
9d7a449e5c Fix failing FieldMask.Merge for well-known wrapper field types 2022-05-16 15:12:19 +01:00
johnnyshields
abe77ae13e Backport: Ruby: support x64-mingw-ucrt platform, which is the new platform which Windows Ruby Installer uses as of Ruby 3.1 2022-05-14 11:41:32 +09:00
deannagarcia
6da9b69efe
Merge pull request #9967 from deannagarcia/LF 
Fix c# Kokoro errors
 2022-05-13 16:40:04 -07:00