Deanna Garcia
ab2593041d
Merge branch 'sync-stage' of github.com:deannagarcia/protobuf into sync-stage
3 years ago
Deanna Garcia
369388b472
More test fixes.
3 years ago
Deanna Garcia
b2ff4f82c2
Fixing tests
3 years ago
deannagarcia
fa4ba87aff
Merge branch 'master' into sync-stage
3 years ago
Stephen Kennedy
8495372e1e
[cleanup] Msvc warnings ( #9263 )
...
* Fix and reenable signed/unsigned warning C4018
* Only disable unary minus warning C4146 in tests
3 years ago
Deanna Garcia
2d87ce3cfe
Fix test
3 years ago
Deanna Garcia
a2f7cfab27
Fixing more tests
3 years ago
Joshua Haberman
8c8fb0ec97
Merge pull request #9370 from brettmc/bugfix/php-8.1-deprecations
...
fixing php 8.1 deprecation warnings
3 years ago
Deanna Garcia
7dff52929f
Fixing tests
3 years ago
Deanna Garcia
000da39ada
Fix python tests
3 years ago
Deanna Garcia
d2ca349c2a
Fix python tests
3 years ago
Deanna Garcia
e56d6936f3
Fix spelling
3 years ago
JCooky
55645ca513
Add cmake option protobuf_INSTALL for installation files ( #7123 )
3 years ago
Deanna Garcia
fc9fb726f1
Fix python and kotlin tests
3 years ago
Joel Johnson
a9cf69a0ed
Use matching soname when building with CMake as Makefile ( #9178 )
...
This updates the CMake support to additionally symlink the soversion value
to the generated shared library when so generated. This aligns the
generated soversion with that traditionally used by the Makefile build
workflow and provides cross-compatibility irrespective of build approach
used.
The primary version of the non-symlink library retains the actual
(non-SO) project version for clarity and compatibility with
installations built using prior versions of CMake support. An example of
the net resulting symlink structures is shown below, where the most
important aspect is that the symlink matching the embedded SONAME is
present (libprotobuf.so.30 in the example case).
Makefile:
libprotobuf.so -> libprotobuf.so.30.0.0
libprotobuf.so.30 -> libprotobuf.so.30.0.0
libprotobuf.so.30.0.0
CMake:
libprotobuf.so -> libprotobuf.so.30
libprotobuf.so.30 -> libprotobuf.so.3.19.0.0
libprotobuf.so.3.19.0.0
Fixes : #8635
3 years ago
Deanna Garcia
349738dde5
Fixing java and protoc builds
3 years ago
Biswapriyo Nath
7e5bfe8883
Fix checking Windows platform with preprocessor ( #9460 )
...
Check _WIN32 instead of _MSC_VER because the later one is for MSVC only.
This fixes building with mingw-w64 toolchain which uses GCC or Clang.
3 years ago
Deanna Garcia
b7fe12e367
Syncing from internal
3 years ago
Deanna Garcia
ab4585a695
Sync from Piper @425656941
...
PROTOBUF_SYNC_PIPER
3 years ago
deannagarcia
aa896f6389
Merge pull request #9459 from protocolbuffers/deannagarcia-patch-2
...
Update package.xml
3 years ago
deannagarcia
a6a66a9ac8
Update package.xml
...
Have PHP release notes link back to general release notes .
3 years ago
deannagarcia
c756e61878
Merge pull request #9430 from xoofx/fix-csharp-fielddesc-ispacked
...
Fixes NullReferenceException when accessing FieldDescriptor.IsPacked
3 years ago
Ivo List
15add1af49
Selectively add source or gen dir to includes. ( #9438 )
...
When both directories are added this results in protoc emitting a
"warning: directory does not exist.". This makes sense because when
there are no inputs from the other directory, it is also not present
n the sandbox where protoc is executed.
3 years ago
Adam Cozzette
fa57149caa
Merge pull request #9452 from acozzette/merge-3.19.x
...
Merge 3.19.x into master
3 years ago
Elliotte Rusty Harold
749243db7e
Must build project before running benchmarks ( #9454 )
...
* Must build project before running benchmarks
That is, it does not test the version downloaded from Maven central.
* Update README.md
3 years ago
Adam Cozzette
18521f6055
Merge branch '3.19.x' into merge-3.19.x
3 years ago
Jon Skeet
b926a7d209
Add ToProto() method to all C# descriptor classes
...
Fixes #9425 .
3 years ago
Adam Cozzette
22d0e265de
Update protobuf version for 3.19.4 ( #9449 )
...
I also updated the PHP release notes in
php/ext/google/protobuf/package.xml.
3 years ago
Joshua Haberman
afeb6d8181
Merge pull request #9451 from haberman/ruby-dataloss-bugfix
...
Fixed data loss bug in Ruby extension
3 years ago
Joshua Haberman
98b8e055d5
Merge branch '3.19.x' into ruby-dataloss-bugfix
3 years ago
Joshua Haberman
eb301e1a33
Merge pull request #9450 from haberman/php-dataloss-bugfix
...
Fixed data loss bug in PHP C extension
3 years ago
Joshua Haberman
aceff710f4
Fixed data loss bug in Ruby extension.
3 years ago
Joshua Haberman
35a21c1249
Added CHANGES.txt entry.
3 years ago
Joshua Haberman
67995fb4e9
Fixed data loss bug with PHP C extension.
3 years ago
Adam Cozzette
779b97260d
Update CHANGES.txt for 3.19.4 release ( #9448 )
3 years ago
Joshua Haberman
b48ba578dd
Merge pull request #9422 from ngg/disable-musttail-winx86
...
Disable [[clang::musttail]] attribute on Windows x86
3 years ago
Elliotte Rusty Harold
a30167f016
simplify mergeable UI messages ( #9445 )
...
No "Please"
see https://docs.google.com/document/d/1mIHBZQXI3F5VEPPmR54PySixl8wSsdwVciSENJ0Unxg/edit#heading=h.vvb6vlxagbv8 for justification
also make the and clause a little simpler. That is, this is now "Include release notes: yes AND at least a language label" instead of "Please include release notes: yes AND Please include at least a language label"
3 years ago
Brett McBride
4c03fcf8fb
php8.1 testing
3 years ago
Maximilian
82372d8fe6
Use proper SPDX license identifier ( #9441 )
...
The previously used term "3-Clause BSD License" is not properly
standarized. A common standard is SPDX, therefore "3-Clause BSD License"
is substituted with "BSD-3-Clause" which is a SPDX identifier.
`grep -rl "3-Clause BSD License" | xargs -n1 sed -i "s/3-Clause BSD
License/BSD-3-Clause/g"`
3 years ago
Adam Cozzette
a035bd0882
Make libprotobuf symbols local on OSX ( #8346 ) ( #9435 )
...
@gnossen gave a great overview in https://github.com/grpc/grpc/pull/24992 of the overall problem.
If a python process using both protobuf _and_ another native library linking in libprotobuf
frequently can cause crashes. This seems to frequently affect tensorflow as well:
tensorflow/tensorflow#8394 ,
tensorflow/tensorflow#9525 (comment)
tensorflow/tensorflow#24976 ,
tensorflow/tensorflow#35573 ,
https://github.com/tensorflow/tensorflow/blob/v2.0.0/tensorflow/contrib/makefile/rename_protobuf.sh ,
tensorflow/tensorflow#16104
Testing locally this fixes both crashes when linking in multiple versions of protobuf
and fixes `DescriptorPool` clashes as well (e.g. Python and Native code import different versions of the same message).
Co-authored-by: Roy Williams <roy.williams.iii@gmail.com>
3 years ago
Brett McBride
a78b89ef2a
removing ext-bcmath require
...
I think it _should_ be required, but a test (linux, 32bit, 7.0-zts) is choking
on composer install, so putting things back to how I found them
3 years ago
Joshua Haberman
b696347f80
Merge pull request #9436 from haberman/ruby-upb2
...
Updated Ruby to the current version of upb
3 years ago
David Geldreich
f180289c46
link with correct C runtime on MSVC ( #9437 )
...
when using CMake >= 3.15, we use CMAKE_MSVC_RUNTIME_LIBRARY
to reproduce the /MT vs /MD when protobuf_MSVC_STATIC_RUNTIME
is TRUE or FALSE
MultiThreaded is for /MT
MultiThreadedDebug is for /MTd
MultiThreadedDLL is for /MD
MultiThreadedDebugDLL is for /MDd
3 years ago
Brett McBride
3e724d8a2e
formatting
3 years ago
Brett McBride
6a3f3840f6
tidy
3 years ago
Brett McBride
110d6c10b2
polyfill ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX
3 years ago
Joshua Haberman
5ef010cb85
Fixed spelling errors in comments.
3 years ago
Joshua Haberman
012c8892ab
Added utf8_range.
3 years ago
Joshua Haberman
79951dac84
Added changelog entries.
3 years ago
Joshua Haberman
90065d39a7
Fixed crash bug with proto2 enums.
3 years ago