Commit Graph

5896 Commits

Author SHA1 Message Date
Feng Xiao
6bbe197e9c Down-integrate from google3. 2018-08-08 17:00:41 -07:00
Leonard Hecker
e7746f487c php: Added nanosecond support for Timestamp (#3972)
* php: Added nanosecond support for Timestamp

* php: Fixed compatibility test
2018-07-20 13:03:00 -07:00
Adam Cozzette
656f64ec0b
Merge pull request #4943 from Stevie-O/fix-unit-tests-on-win32
When running unit tests, read reference files in text mode
2018-07-20 10:47:01 -07:00
Stephen Oberholtzer
f5f1796c5d When running unit tests, read reference files in text mode
This should put an end to all of the reports of unit test failures on
Windows machines.
2018-07-19 21:39:10 -04:00
Feng Xiao
b1c5503022
Delete unused files. (#4942)
* Delete unused files.
2018-07-19 17:30:15 -07:00
Yilun Chong
88795f64e4
Merge pull request #4934 from BSBandme/sync_internal_benchmark
Sync internal benchmark changes
2018-07-18 14:44:16 -07:00
Yilun Chong
3783a4ca17 Sync internal benchmark changes 2018-07-18 13:45:32 -07:00
Jan Tattermusch
f50be7de91 Fix C# nuget build on Kokoro (#4912)
* upgrade dotnet SDK to 2.1.3 on kokoro linux
2018-07-18 11:04:59 -07:00
Yilun Chong
d2980062c8
Merge pull request #4850 from BSBandme/php_benchmark
add php benchmark
2018-07-16 14:40:57 -07:00
Yilun Chong
7f57d13c22 add php benchmark 2018-07-16 13:53:22 -07:00
Feng Xiao
c7442b27cf Comment out unused command from release script. 2018-07-15 20:31:54 -07:00
Feng Xiao
ba40b4b8f2
Merge pull request #4922 from xfxyjwf/release2
Run autogen.sh in release script.
2018-07-15 19:14:56 -07:00
Feng Xiao
1fc53afaa7 Run autogen.sh in release script. 2018-07-15 19:13:00 -07:00
Feng Xiao
03e05bb056
Merge pull request #4920 from xfxyjwf/release
Add protoc release script for Linux build.
2018-07-15 18:20:19 -07:00
Feng Xiao
bbbe422fab Add protoc release script for Linux build. 2018-07-15 18:18:36 -07:00
Feng Xiao
07d69d04a6
Merge pull request #4916 from xfxyjwf/docker
Add cpp tests under release docker image.
2018-07-15 18:13:34 -07:00
Feng Xiao
9de4e64cf2 Add cpp tests under release docker image.
1. Added C++ tests under the release docker image.
2. Fixed a compile issue with the docker image.
3. Cleaned up tests.sh and removed traivis stuff.
2018-07-15 16:41:25 -07:00
Feng Xiao
78944e1403
Merge pull request #4913 from xfxyjwf/protoc
Update protoc build scripts.
2018-07-13 15:43:05 -07:00
Feng Xiao
6fa17eb35e Update protoc build scripts.
1. Changed maven script to only do artifact uploading and removed build
script invocation from it. We didn't use maven to invoke the build
script before (we built protoc manually and editted pom.xml to only do
uploading for previous releases), and will not use it in the future (we
will use kokoro to build artifacts).
2. Cleaned up build-protoc.sh and README.md: removed the part about
using maven to build and listed supported platforms explicitly.
2018-07-13 12:41:37 -07:00
Feng Xiao
4a0ad7b06f
Merge pull request #4908 from TeBoring/php-bug
Fix php tests
2018-07-13 09:55:17 -07:00
Feng Xiao
1ccb8d4b39
Merge pull request #4905 from BSBandme/fix_kokoro_build_in_docker
fix linux kokoro build in docker
2018-07-13 09:54:43 -07:00
Bo Yang
d779301670 Fix 32bit php tests 2018-07-13 09:10:16 +00:00
Bo Yang
51c188c2cc Fix php tests 2018-07-13 05:47:10 +00:00
Yilun Chong
517190a7d9 fix golang kokoro linux build 2018-07-12 16:52:16 -07:00
Yilun Chong
14bc658175 fix python cpp kokoro build 2018-07-12 16:49:26 -07:00
Yilun Chong
f21d4d6830
Merge pull request #4903 from BSBandme/fix_js_build
fix commonjs js provide GOOGLE_CHECK
2018-07-12 15:45:17 -07:00
Duncan McGreggor
84752ff316 Added a link for another Clojure protobuf project (#4906) 2018-07-12 15:01:17 -07:00
Yilun Chong
a2618376f2 fix linux kokoro build in docker 2018-07-12 14:22:14 -07:00
Yilun Chong
f42ddff0dd fix commonjs js provide GOOGLE_CHECK 2018-07-12 13:47:16 -07:00
Paul Yang
40f9ef2f56
Check the message to be encoded is the wrong type. (#4885) 2018-07-12 11:04:29 -07:00
Ben Webb
0a59054c30 Add Python 3.7 compatibility (#4862)
Compilation of Python wrappers fails with Python 3.7 because
the Python folks changed their C API such that
PyUnicode_AsUTF8AndSize() now returns a const char* rather
than a char*. Add a patch to work around. Relates #4086.
2018-07-12 10:58:10 -07:00
Jan Tattermusch
029dbfd714
Merge pull request #4869 from jtattermusch/csharp_artifact_build
Add scripts for automated building of C# nuget on Kokoro
2018-07-12 16:27:23 +02:00
Jan Tattermusch
f3d3bfc01e add scripts for automated building of C# nuget on Kokoro 2018-07-12 10:17:25 +02:00
Feng Xiao
39aabeab54
Merge pull request #4899 from xfxyjwf/kokoro
Make ruby release configs consistent with protoc.
2018-07-11 17:42:06 -07:00
Feng Xiao
5fa1f6b2e9 Make ruby release configs consistent with protoc. 2018-07-11 16:25:55 -07:00
Benjamin Barenblat
048f5c26a7 objectivec: Quash -Wself-assign and -Wvla (#4897)
* objectivec: Quash -Wself-assign

* objectivec: Set -Wno-vla when building

Objective-C protobuf uses VLAs for performance reasons. Ensure Clang
doesn’t complain about them.
2018-07-11 13:20:01 -04:00
Feng Xiao
237938ac6a
Merge pull request #4888 from chronoxor/master
OnShutdownDelete shadowing issue
2018-07-10 14:17:11 -07:00
Feng Xiao
5b03316153
Merge pull request #4889 from hesmar/hesmar/cmakeFixProtobufConfig
protobuf_generate(): add relative path to output dir
2018-07-10 14:15:53 -07:00
Markus Heß
93f6b67eb2 protobuf_generate(): add relative path to output dir
Without this fix, protobuf_generate() sets the variable _generated_srcs to
${protobuf_generate_PROTOC_OUT_DIR}/${_rel_dir}/${_basename}${_ext}
but generates the files in
${protobuf_generate_PROTOC_OUT_DIR}/${_basename}${_ext}
2018-07-10 18:23:53 +02:00
Ivan Shynkarenka
a3f0973979 OnShutdownDelete shadowing issue
https://github.com/google/protobuf/issues/4887
2018-07-10 13:19:51 +03:00
吕海涛
3beb19945b add JSON_UNESCAPED_UNICODE option (#4191) 2018-07-09 17:00:02 -07:00
Paul Yang
26eeec93e4
Enable ignoring unknown in json parsing in php (#4839)
* Enable ignoring unknown in json parsing in php

* Update generated descriptor files

* Update failure list for other languages.

* Remove unnecessary php files
2018-07-09 14:29:23 -07:00
Warren Falk
96833b8f4b implement IComparable and comparison operators on Timestamp (#4318) 2018-07-09 14:26:36 -07:00
Yilun Chong
5524c53e60
Merge pull request #4876 from BSBandme/fix_cpp_benchmark
Fix cpp benchmark dependency on mac
2018-07-09 13:57:55 -07:00
Adam Cozzette
4129b6aaad
Merge pull request #4882 from google/3.6.x
Merge 3.6.x into master
2018-07-09 11:45:39 -07:00
BSBandme
82b490f6fd Fix cpp_distcheck 2018-07-09 11:37:39 -07:00
Adam Cozzette
e1845779ed
Merge pull request #4878 from acozzette/fix-msvc-initialization
Fix initialization with Visual Studio
2018-07-09 09:35:48 -07:00
Adam Cozzette
61476b8e74
Merge pull request #4879 from ejona86/protoc-artifacts-tls12
protoc-artifacts: Update centos base from 6.6 to 6.9
2018-07-09 09:32:17 -07:00
Eric Anderson
fa39467705 protoc-artifacts: Update centos base from 6.6 to 6.9
This avoids the need to use "yum update && yum upgrade" in the container
to be able to contact GitHub, which requires TLS 1.2[1].

I have verified that binaries built with this container still run in the
previous container; no errors like "/lib64/libc.so.6: version
`GLIBC_2.14' not found", which occur if using too new of a glibc when
compiling. CentOS 6.6 has glibc version 2.12 release 1.209.el6. CentOS
6.9 has glibc version 2.12 release 1.149.el6. Both would upgrade to
release 1.212.el6 via "yum update && yum upgrade".

1. https://githubengineering.com/crypto-deprecation-notice/
2018-07-06 17:37:52 -07:00
Adam Cozzette
458651fb44
Merge pull request #4877 from acozzette/update-docker-setup
Updated Docker setup to use GCC 4.8
2018-07-06 15:50:49 -07:00