Commit Graph

7725 Commits

Author SHA1 Message Date
Joshua Haberman
a1486fc89d Merge branch 'master' into php-wkt 2020-10-29 10:44:56 -07:00
Joshua Haberman
fdc35840b9
Merge pull request #7925 from haberman/sync-stage
Integrate from Piper for C++, Java, and Python
2020-10-28 12:02:24 -07:00
Joshua Haberman
709775b67e Added missing semicolon. 2020-10-28 10:56:51 -07:00
Joshua Haberman
69b245e63a Added Python 2.7-specific failure list for Python/C++ also. 2020-10-28 10:35:06 -07:00
Joshua Haberman
ee68c9b29c Added text format failure list for Python 2.7. 2020-10-28 10:05:07 -07:00
Joshua Haberman
036865fa7f Add C++ text format failure list, and a Python 2.7 text format failure list. 2020-10-28 09:49:55 -07:00
lakshayg
3cff48db79 Spell check only comments and strings in vim 2020-10-27 10:15:05 -07:00
Jan Tattermusch
9d9c670589
Merge pull request #7701 from basvdlinden/safe_bytestring_copyfrom_span
annotate ByteString.CopyFrom(ReadOnlySpan<byte>) as SecuritySafeCritical
2020-10-27 12:01:32 +01:00
Jichan
022078d3ee Fix a CMake module for support RelWithDebInfo and MinSizeRel install 2020-10-26 16:53:47 -07:00
Thomas Van Lenten
2123ed5df7 Switch to atomic for setting autocreated objects.
- Update semaphore comment to new scope.
- Use an atomic swap to avoid needing to use the semaphore.

This means the semaphore is create only when extension are auto created (less
memory usage).
2020-10-26 11:28:17 -04:00
Joshua Haberman
356d59ab57 Merge tag 'refs/tags/sync-piper' into sync-stage 2020-10-23 14:23:43 -07:00
Joshua Haberman
56ae807dbd Sync from Piper @338744130
PROTOBUF_SYNC_PIPER
2020-10-23 14:23:43 -07:00
Joshua Haberman
9d69c754a8 Merge tag 'refs/tags/sync-piper' into sync-stage 2020-10-23 12:03:10 -07:00
Joshua Haberman
4cd56bdef8 Sync from Piper @338718276
PROTOBUF_SYNC_PIPER
2020-10-23 12:03:10 -07:00
Joshua Haberman
981be5be20 Python/C++ text_format conformance test fix.
Pass the Python/C++ text_format failure list to the conformance runner.
2020-10-23 11:59:56 -07:00
Joshua Haberman
90021b813f Updated changelog. 2020-10-23 11:11:46 -07:00
Joshua Haberman
b70695dd68 Sync from Piper @338707351
PROTOBUF_SYNC_PIPER
2020-10-23 11:07:04 -07:00
Joshua Haberman
73ac11febe Merge tag 'refs/tags/sync-piper' into sync-stage 2020-10-23 11:07:04 -07:00
Joshua Haberman
3fff95e1bd Updated changelog. 2020-10-23 11:04:54 -07:00
Joshua Haberman
510cdff1f0 Merge branch 'master' into php-wkt 2020-10-22 15:53:02 -07:00
Adam Cozzette
de5d1b98c2 Updated compiler code to fully qualify std::string
This is one step toward removing the "using std::string" statement from
stubs/common.h.
2020-10-22 15:31:54 -07:00
dependabot[bot]
74de188815 Bump junit from 4.13 to 4.13.1 in /java
Bumps [junit](https://github.com/junit-team/junit4) from 4.13 to 4.13.1.
- [Release notes](https://github.com/junit-team/junit4/releases)
- [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.13.1.md)
- [Commits](https://github.com/junit-team/junit4/compare/r4.13...r4.13.1)

Signed-off-by: dependabot[bot] <support@github.com>
2020-10-22 14:43:37 -07:00
Alexander Morozov
2558c5deef
Fix finding google/protobuf/descriptor.proto on FreeBSD (#7954) 2020-10-22 13:18:07 -07:00
Jan Tattermusch
151d49436a upgrade System.Memory dependency to 4.5.3 2020-10-22 09:45:39 -07:00
Thomas Van Lenten
666b592e36 Remove some extra newlines to warning/note output.
Should make output a little more compact, easier to see common things in one
block when generating multiple files at once.
2020-10-21 15:42:09 -04:00
Thomas Van Lenten
a645d7176b Update the iOS project for Xcode 12.
- Move the min up to iOS 9.  Things should still work with 8, just can't have
  the project set to that and be able to run the tests, so moving it up to
  support running the tests.
- Remove the bitcode setting from the unittest bundle, was causing an error
  with Xcode 12.
2020-10-21 15:42:09 -04:00
Thomas Van Lenten
676ea98902 Update the build/testing script for Xcode 12. 2020-10-21 15:42:09 -04:00
Thomas Van Lenten
9c27f6a479 Add cast to avoid warning on Xcode 12. 2020-10-21 15:42:09 -04:00
Joshua Haberman
de371235c9 Sync from Piper @338284531
PROTOBUF_SYNC_PIPER
2020-10-21 10:04:14 -07:00
Joshua Haberman
820d1ca5af Merge tag 'refs/tags/sync-piper' into sync-stage 2020-10-21 10:04:14 -07:00
RPG3D
ce66f6047d Update libprotobuf.cmake 2020-10-13 15:15:08 -07:00
RPG3D
6aaa40f2a9 Update libprotobuf.cmake
link log library on Android
2020-10-13 15:15:08 -07:00
RPG3D
6eedd1a519 Update libprotobuf-lite.cmake
link log library on Android
2020-10-13 15:15:08 -07:00
Misha Seltzer
7daf0aa7b0 Removed the unnecessary setuptools package dependency for Python package.
The setuptools package was added to allow definition of namespaces using
the now outdated (and discouraged from use) pkg_resources-style.

The code here, for a long while now, uses a try/except (`ImportError`)
protection around the setuptools code, and falls back to the more
encoraged pkgutil-style.

Removing this library won't affect any current workflow, and in the case
of setuptools not found, it'll actually use a more modern (and
encouraged) flow.
2020-10-12 17:27:33 -07:00
Daniel Joos
c8f76331ab
Adds a CMake option to build libprotoc separately (#7949)
This exposes the variable `protobuf_BUILD_LIBPROTOC` as CMake option to be able to build libprotoc without building the protoc binary.
2020-10-09 15:54:39 -07:00
Paul Yang
4eea2b00a3
Remove php 5 tests on mac (#7956) 2020-10-09 15:53:12 -07:00
Paul Yang
9ccde30967
Add cmake and protoc to mergeable config (#7955) 2020-10-09 15:45:46 -07:00
Paul Yang
0a648daaca
Use the https address for git clone (#7951)
The previous git address failed for no access
2020-10-08 14:56:27 -07:00
Paul Yang
7ab0be202d
Merge pull request #7952 from TeBoring/3.13.x-merge
Merge 3.13.x into master
2020-10-08 14:09:03 -07:00
Bo Yang
37e69bcddf Merge branch '3.13.x' 2020-10-08 13:32:41 -07:00
Paul Yang
d1eca4e4b4
Update version number to 3.13.0.1 for php (#7950) 2020-10-08 11:17:30 -07:00
Joshua Haberman
8308aa0c31 Properly terminate method array. 2020-10-06 14:18:21 -07:00
Joshua Haberman
5a98ff98d7 Create a separate InternalDescriptorPool method to see if that fixes preloading. 2020-10-06 10:57:33 -07:00
Joshua Haberman
e62cf76b94 Added missing base classes. 2020-10-05 22:50:15 -07:00
Joshua Haberman
05644f0313 Revert upb changes to minimize changes as we evaluate performance. 2020-10-05 22:31:50 -07:00
Joshua Haberman
ec4b194608 Regenerated protos with new script. 2020-10-05 22:27:56 -07:00
Joshua Haberman
cfc0c2b5e0 Passes all tests. 2020-10-05 22:24:34 -07:00
David L. Jones
f5a3b92cf7
Update default dependency for gtest. (#7907)
The gtest source was changed in #7237 on an opt-in basis, and has been
released since 3.12.0. The comments state that the default should change
in 3.13.0, but that didn't quite happen.

This change does flip the default, and updates comments to say 3.14.0.
2020-10-02 20:10:51 -07:00
David L. Jones
ad29d402c4
Enhance documentation for generate_py_protobufs. (#7937)
This change updates the README.md to describe the order of resolution
between `options['generate_py_protobufs']`, `--protoc`, and the `PROTOC`
env var.

Since the `setup.py` script is not the main way to find docs, this change
deletes the parts of the docstring that are redundant with `README.md`.
2020-10-02 13:36:49 -07:00
Joshua Haberman
a93d840881 WIP. 2020-10-01 23:17:10 -07:00