Deanna Garcia
cdfd60f63d
Fix podspec errors
3 years ago
Deanna Garcia
1407efb39f
Fix merge conflict
3 years ago
Deanna Garcia
da481978af
Merge 21.x back to main
3 years ago
deannagarcia
6673c7c48f
Merge pull request #10006 from protocolbuffers/21.x-202205200038
...
Update version.json to: 21.0-dev
3 years ago
Chan Wen Xu
30f6c7851b
Add protoc-gen-xo to global extension registry ( #9997 )
3 years ago
David L. Jones
450d24ca82
Merge pull request #10005 from dlj-NaN/sync-stage
...
Integrate from Piper for C++, Java, and Python
3 years ago
Deanna Garcia
ecaeadeced
Update version.json to: 21.0-dev
3 years ago
David L. Jones
42ff77e55f
Restore erroneous changes to Makefile.am.
3 years ago
David L. Jones
053f698e90
Adjust constexpr qualifiers so they work in gcc < 4.9.
3 years ago
David L. Jones
7f2368933a
Re-generate csharp and php golden proto files after changes to descriptor.proto.
3 years ago
David L. Jones
d0a4dc7661
Update CHANGES.txt.
3 years ago
David L. Jones
d87d99d931
Merge tag 'refs/tags/sync-piper' into sync-stage
3 years ago
David L. Jones
3740e6fa68
Sync from Piper @449836334
...
PROTOBUF_SYNC_PIPER
3 years ago
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
3 years ago
Deanna Garcia
71271ad1f8
Edit changelog
3 years ago
Protobuf Team Bot
1fa42c4be4
Updating version.json and repo version numbers to: 21.0-rc2
3 years ago
deannagarcia
d031130582
Merge pull request #10000 from jskeet/21.x
...
Cherry-pick PR #9981 into 21.x branch
3 years ago
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.
3 years ago
Jan Tattermusch
70afbd3c8d
regenerate C# protos
3 years ago
James Newton-King
9806b0f57b
Suppress CS8981 in generated source
3 years ago
Joshua Haberman
a04d00312f
Fixed PHP SEGV by not writing to shared memory for zend_class_entry.
3 years ago
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.
3 years ago
Joshua Haberman
8a46882bf0
Brought the comment up to date.
3 years ago
Joshua Haberman
65a2a52df3
Fixed PHP SEGV by not writing to shared memory for zend_class_entry.
3 years ago
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.
3 years ago
Jan Tattermusch
d2292fc5f6
regenerate C# protos
3 years ago
James Newton-King
40e82cbd2a
Suppress CS8981 in generated source
3 years ago
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 ).
3 years ago
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
3 years ago
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 ).
3 years ago
Joshua Haberman
364852e829
Throw a more helpful error if generated code is out of date, and fixed two reference leaks.
3 years ago
David L. Jones
f868799366
Use cc_dist_library targets for macos release libprotobuf. ( #9966 )
3 years ago
deannagarcia
22067bf523
Merge pull request #9979 from deannagarcia/fixProtocRelease
...
Fix protoc_release target
3 years ago
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.
3 years ago
zhangskz
e235147407
Delete legacy update_version.py script, which is replaced with internal update_versions library ( #9983 )
3 years ago
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`.
3 years ago
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.
3 years ago
Deanna Garcia
0f3ee3b625
Fix protoc_release target
3 years ago
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
3 years ago
Joshua Haberman
375b984715
Merge pull request #9976 from haberman/update-upb
...
Fixed win32 build and fixed str(message) on all Windows platforms.
3 years ago
Joshua Haberman
8353e19756
Updated to the newest upb, which brings many fixes for Windows builds.
3 years ago
Deanna Garcia
d3edfa29b7
Use osx-aarch_64 artifact
3 years ago
deannagarcia
088281d84b
Merge pull request #9964 from protocolbuffers/main-202205131806
...
Merge 21.x back to main
3 years ago
Vassil Kovatchev
9d7a449e5c
Fix failing FieldMask.Merge for well-known wrapper field types
3 years ago
johnnyshields
abe77ae13e
Backport: Ruby: support x64-mingw-ucrt platform, which is the new platform which Windows Ruby Installer uses as of Ruby 3.1
3 years ago
deannagarcia
6da9b69efe
Merge pull request #9967 from deannagarcia/LF
...
Fix c# Kokoro errors
3 years ago
Joshua Haberman
9be7dd1c81
Merge pull request #9963 from johnnyshields/ruby-x64-mingw-ucrt-support
...
Ruby: Support x64-mingw-ucrt platform
3 years ago
Deanna Garcia
4049efc7b0
Move to LF
3 years ago
Nikhil Benesch
448d421250
Various fixups to warnings flags ( #9344 )
...
* Don't drop parser warnings on the floor
Fix #9343 .
* Convert "missing syntax" warning to an actual warning
For some reason this warning was emitted as a log message rather than a
structured warning. Convert it to use the AddWarning API so that it gets
emitted with a file and line number by protoc, and is visible via the
error collection interface during programmatic use.
* Remove CaptureTestStderr() call
CaptureTestStderr() and GetCapturedTestStderr() have to be paired with each other.
* Adjust tests for new warnings
A few tests now produce warnings that they didn't before, but were
expecting not to see any stderr output. Adjust the tests accordingly.
Co-authored-by: Adam Cozzette <acozzette@google.com>
3 years ago
Deanna Garcia
193da6c8a9
Merge release branch 21.x into main
3 years ago