aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* When running unit tests, read reference files in text modeStephen Oberholtzer2018-07-197-10/+15
| | | | | This should put an end to all of the reports of unit test failures on Windows machines.
* Delete unused files. (#4942)Feng Xiao2018-07-1910-2089/+0
| | | * Delete unused files.
* Merge pull request #4934 from BSBandme/sync_internal_benchmarkYilun Chong2018-07-183-133/+153
|\ | | | | Sync internal benchmark changes
| * Sync internal benchmark changesYilun Chong2018-07-183-133/+153
| |
* | Fix C# nuget build on Kokoro (#4912)Jan Tattermusch2018-07-183-3/+3
|/ | | | * upgrade dotnet SDK to 2.1.3 on kokoro linux
* Merge pull request #4850 from BSBandme/php_benchmarkYilun Chong2018-07-164-3/+263
|\ | | | | add php benchmark
| * add php benchmarkYilun Chong2018-07-164-3/+263
| |
* | Comment out unused command from release script.Feng Xiao2018-07-151-1/+1
| |
* | Merge pull request #4922 from xfxyjwf/release2Feng Xiao2018-07-151-0/+6
|\ \ | | | | | | Run autogen.sh in release script.
| * | Run autogen.sh in release script.Feng Xiao2018-07-151-0/+6
| | |
* | | Merge pull request #4920 from xfxyjwf/releaseFeng Xiao2018-07-153-2/+39
|\| | | | | | | | Add protoc release script for Linux build.
| * | Add protoc release script for Linux build.Feng Xiao2018-07-153-2/+39
|/ /
* | Merge pull request #4916 from xfxyjwf/dockerFeng Xiao2018-07-155-107/+29
|\ \ | | | | | | Add cpp tests under release docker image.
| * | Add cpp tests under release docker image.Feng Xiao2018-07-155-107/+29
|/ / | | | | | | | | | | 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.
* | Merge pull request #4913 from xfxyjwf/protocFeng Xiao2018-07-133-166/+167
|\ \ | | | | | | Update protoc build scripts.
| * | Update protoc build scripts.Feng Xiao2018-07-133-166/+167
|/ / | | | | | | | | | | | | | | | | | | 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.
* | Merge pull request #4908 from TeBoring/php-bugFeng Xiao2018-07-136-24/+29
|\ \ | | | | | | Fix php tests
| * | Fix 32bit php testsBo Yang2018-07-134-20/+24
| | |
| * | Fix php testsBo Yang2018-07-134-5/+6
| | |
* | | Merge pull request #4905 from BSBandme/fix_kokoro_build_in_dockerFeng Xiao2018-07-134-3/+10
|\ \ \ | |/ / |/| | fix linux kokoro build in docker
| * | fix golang kokoro linux buildYilun Chong2018-07-121-1/+1
| | |
| * | fix python cpp kokoro buildYilun Chong2018-07-122-1/+4
| | |
| * | fix linux kokoro build in dockerYilun Chong2018-07-121-1/+5
| | |
* | | Merge pull request #4903 from BSBandme/fix_js_buildYilun Chong2018-07-121-1/+1
|\ \ \ | | | | | | | | fix commonjs js provide GOOGLE_CHECK
| * | | fix commonjs js provide GOOGLE_CHECKYilun Chong2018-07-121-1/+1
| |/ /
* / / Added a link for another Clojure protobuf project (#4906)Duncan McGreggor2018-07-121-0/+1
|/ /
* | Check the message to be encoded is the wrong type. (#4885)Paul Yang2018-07-122-0/+17
| |
* | Add Python 3.7 compatibility (#4862)Ben Webb2018-07-125-6/+6
| | | | | | | | | | | | 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.
* | Merge pull request #4869 from jtattermusch/csharp_artifact_buildJan Tattermusch2018-07-122-0/+16
|\ \ | | | | | | Add scripts for automated building of C# nuget on Kokoro
| * | add scripts for automated building of C# nuget on KokoroJan Tattermusch2018-07-122-0/+16
|/ /
* | Merge pull request #4899 from xfxyjwf/kokoroFeng Xiao2018-07-1110-19/+19
|\ \ | | | | | | Make ruby release configs consistent with protoc.
| * | Make ruby release configs consistent with protoc.Feng Xiao2018-07-1110-19/+19
|/ /
* | objectivec: Quash -Wself-assign and -Wvla (#4897)Benjamin Barenblat2018-07-112-1/+4
| | | | | | | | | | | | | | | | | | * 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.
* | Merge pull request #4888 from chronoxor/masterFeng Xiao2018-07-101-1/+1
|\ \ | | | | | | OnShutdownDelete shadowing issue
| * | OnShutdownDelete shadowing issueIvan Shynkarenka2018-07-101-1/+1
| | | | | | | | | | | | https://github.com/google/protobuf/issues/4887
* | | Merge pull request #4889 from hesmar/hesmar/cmakeFixProtobufConfigFeng Xiao2018-07-101-1/+1
|\ \ \ | |/ / |/| | protobuf_generate(): add relative path to output dir
| * | protobuf_generate(): add relative path to output dirMarkus Heß2018-07-101-1/+1
|/ / | | | | | | | | | | | | 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}
* | add JSON_UNESCAPED_UNICODE option (#4191)吕海涛2018-07-092-2/+2
| |
* | Enable ignoring unknown in json parsing in php (#4839)Paul Yang2018-07-0916-218/+386
| | | | | | | | | | | | | | | | | | | | * Enable ignoring unknown in json parsing in php * Update generated descriptor files * Update failure list for other languages. * Remove unnecessary php files
* | implement IComparable and comparison operators on Timestamp (#4318)Warren Falk2018-07-092-1/+205
| |
* | Merge pull request #4876 from BSBandme/fix_cpp_benchmarkYilun Chong2018-07-092-2/+1
|\ \ | | | | | | Fix cpp benchmark dependency on mac
| * | Fix cpp_distcheckBSBandme2018-07-091-2/+0
| | |
| * | Fix cpp benchmark dependency on macBSBandme2018-07-061-0/+1
| | |
* | | Merge pull request #4882 from google/3.6.xAdam Cozzette2018-07-0911-319/+132
|\ \ \ | | | | | | | | Merge 3.6.x into master
| * \ \ Merge pull request #4878 from acozzette/fix-msvc-initializationAdam Cozzette2018-07-0911-319/+132
| |\ \ \ | | | | | | | | | | Fix initialization with Visual Studio
| | * | | Fix initialization with Visual StudioAdam Cozzette2018-07-0611-319/+132
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It appears that Visual Studio does not work well with std::once_flag because it has a bug causing it to initialize that during dynamic initialization instead of constant initialization. This change works around the problem by using function static initializers instead. @gerben-s originally wrote this change for the Google-internal codebase but I am just cherry-picking it here. This fixes #4773.
* | | | Merge pull request #4879 from ejona86/protoc-artifacts-tls12Adam Cozzette2018-07-091-1/+1
|\ \ \ \ | | | | | | | | | | protoc-artifacts: Update centos base from 6.6 to 6.9
| * | | | protoc-artifacts: Update centos base from 6.6 to 6.9Eric Anderson2018-07-061-1/+1
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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/
* | | | Merge pull request #4877 from acozzette/update-docker-setupAdam Cozzette2018-07-063-10/+9
|\ \ \ \ | | | | | | | | | | Updated Docker setup to use GCC 4.8
| * | | | Updated Docker setup to use GCC 4.8Adam Cozzette2018-07-063-10/+9
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now that we depend on C++11, we need at least GCC 4.8 instead of 4.7. This change updates the Docker setup to continue using CentOS 6.6 but with GCC 4.8. I also added libm to the whitelist for dynamically linked libraries for the ARM64 protoc binary.
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-07 04:22:51 +0000