aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* fix java build by changing mvn to onlineYilun Chong2018-09-231-1/+1
|
* Merge pull request #5127 from xfxyjwf/mergeFeng Xiao2018-09-171-3/+19
|\ | | | | Merge 3.6.x branch to master
| * Merge remote-tracking branch 'google/3.6.x'Feng Xiao2018-09-071-3/+19
| |\
| | * Merge pull request #5048 from jozefizso/fix/4579_backport_for_3.6.x3.6.xFeng Xiao2018-08-207-4/+80
| | |\ | | | | | | | | Include version information in Windows binaries (backport #4579 for 3.6.x)
| | | * Backport the PR #4579 to 3.6.x branchJozef Izso2018-08-157-4/+80
| | | | | | | | | | | | | | | | Implements #3380
| | * | Merge pull request #5049 from nehaljwani/backport-4854Adam Cozzette2018-08-162-4/+4
| | |\ \ | | | |/ | | |/| Backport #4854 to 3.6.x
| | | * Set LIBPROTOBUF_EXPORT on GenericTypeHandler<class google::protobuf::Message>Nehal J Wani2018-08-151-3/+3
| | | | | | | | | | | | | | | | This should fix https://github.com/google/protobuf/issues/4717
| | | * Set LIBPROTOBUF_EXPORT on GzipOutputStream::OptionsAdam Cozzette2018-08-151-1/+1
| | |/ | | | | | | | | | | | | | | | | | | This fixes issue #2610. This was originally fixed in a101fa52895fc2ad83d8b5d610243531b1608a08 , but got reverted by d36c0c538a545fac5d9db6ba65c525246d4efa95
| | * Python wheel kokoro for windows (#5034)Paul Yang2018-08-133-0/+123
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add kokoro config for building python wheels on windows * Move script to root * Debug * Debug * Change working directory * Add msbuild to path * Debug * Fix python dir name * Debug * Move artifacts to targeted directory * Update artifact directory * Debug * Debug * Automatic generation of version * Reduce file numbers
| | * Python wheel kokoro for mac (#5017)Paul Yang2018-08-082-0/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add config for building python wheel on mac * Specify os name * Clean up venv * Debug * Recover old path
| | * Python wheel kokoro dev (#5002)Paul Yang2018-08-063-0/+101
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add config for building python wheel * Update submodules * Fix setup.py to use c++11 * Fix syntax error * Fix syntax error * Add dir for artifact * Update artifact dirctory * Remove python 3.3 * Clean up virtual env * Clean up env * Test environment * Test env variable * Automatic update version number * Remove dependency on python-wheel branch
| | * Update php package.xml to 3.6.1 (#5000)Paul Yang2018-08-031-3/+19
| | |
| | * Merge pull request #4997 from jtattermusch/backport_nuget_buildingFeng Xiao2018-08-034-2/+18
| | |\ | | | | | | | | Backport building C# nuget to 3.6.x branch
| | | * upgrade dotnet SDK to 2.1.3 on kokoro linuxJan Tattermusch2018-08-031-1/+1
| | | |
| | | * Revert "overcome the global.json constraint with a hack"Jan Tattermusch2018-08-031-9/+0
| | | | | | | | | | | | | | | | This reverts commit c02346c72aafd1826b0397dbbce4ce04bf252f50.
| | | * use SDK version available on KokoroJan Tattermusch2018-08-031-1/+1
| | | |
| | | * overcome the global.json constraint with a hackJan Tattermusch2018-08-031-0/+9
| | | |
| | | * fix build_nuget.batJan Tattermusch2018-08-031-1/+1
| | | |
| | | * add scripts for automated building of C# nuget on KokoroJan Tattermusch2018-08-032-0/+16
| | |/
* | | Merge pull request #5085 from scentini/compiler-flagFeng Xiao2018-09-102-4/+24
|\ \ \ | | | | | | | | Route "compiler" value of config_setting through @bazel_tools/tools/cpp:compiler.
| * | | Create compiler_config_setting.bzlscentini2018-08-281-0/+21
| | | |
| * | | use flag_values = {"@bazel_tools//tools/cpp:compiler": "x"} for compiler ↵scentini2018-08-281-4/+3
| | | | | | | | | | | | | | | | config_settings
* | | | Cross-link descriptor when building from byte stringsJon Skeet2018-09-102-12/+44
| | | | | | | | | | | | | | | | | | | | | | | | This performs more testing for field descriptors built from byte strings too, but that's mostly incidental. The chief intent is to check that cross-linking occurs.
* | | | Merge pull request #5105 from sigurdm/invoke_plugin_via_cmdFeng Xiao2018-09-101-4/+5
|\ \ \ \ | | | | | | | | | | On Windows invoke plugins using cmd.exe
| * | | | On Windows invoke plugins using cmd.exeSigurd Meldgaard2018-09-031-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will find .bat files as well as .exe. Only affects the case when plugins are invoked from PATH. This does not change behaviour when compiled under Cygwin..
* | | | | Merge pull request #5122 from elharo/guava20Feng Xiao2018-09-101-1/+1
|\ \ \ \ \ | | | | | | | | | | | | update to Guava 20
| * | | | | update to Guava 20Elliotte Rusty Harold2018-09-071-1/+1
| | | | | |
* | | | | | Remove 2to3 code from setup.py. (#5114)Benjamin Peterson2018-09-101-7/+1
| |_|_|/ / |/| | | | | | | | | Python protobuf has long been a single-source codebase. 2to3 shouldn't need to run in setup.py.
* | | | | Merge pull request #5125 from jtattermusch/upport_kokoro_release_pythonJan Tattermusch2018-09-078-0/+279
|\ \ \ \ \ | | | | | | | | | | | | Upport kokoro/release/python from 3.6.x branch
| * | | | | upport kokoro/release/python from 3.6.x branchJan Tattermusch2018-09-078-0/+279
| | | | | |
* | | | | | Merge pull request #5109 from haberman/integrateJoshua Haberman2018-09-07364-15969/+15849
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Down-integrate from google3.
| * | | | | Fixed Python extension compile.Josh Haberman2018-09-072-7/+7
| | | | | |
| * | | | | Regenerated Objective C protos.Josh Haberman2018-09-072-2/+3
| | | | | |
| * | | | | Removed obsolete hash_map header that was breaking the compile.Josh Haberman2018-09-071-1/+0
| | | | | |
| * | | | | Reverted changes to map_lite_test.proto.Josh Haberman2018-09-071-2/+3
| | | | | |
| * | | | | Regenerated C# protos.Josh Haberman2018-09-042-2/+3
| | | | | |
| * | | | | Down-integrate from google3.Josh Haberman2018-09-04363-15969/+15847
| | |_|/ / | |/| | |
* | | | | Merge pull request #5123 from jtattermusch/collect_all_artifactsJan Tattermusch2018-09-072-0/+69
|\ \ \ \ \ | | | | | | | | | | | | Add experimental collect_all_artifacts script
| * | | | | experimental collect_all_artifacts scriptJan Tattermusch2018-09-072-0/+69
| | |/ / / | |/| | |
* | | | | Merge pull request #5111 from kykrueger/masterFeng Xiao2018-09-071-1/+13
|\ \ \ \ \ | |/ / / / |/| | | | Update README.md with gradle instructions for java
| * | | | Update README.md with gradle instructions for javaKyle Krueger2018-09-061-1/+13
| | |/ / | |/| |
* / | | Add source dependency of test suite implementation to main function (#5069)Paul Yang2018-09-064-230/+202
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fix conformance running nothing issue This change adds a source dependency of the test suite implementaion class in the main function. For generality reason, the main function is moved to the file of the test suite implemetation. New test suite implementation will need to implement the main function. In order to make it easy for test suite implementation to implement the main function, this change also refactor out the common code out of the main function. * Fix typo
* | | Merge pull request #5103 from haberman/cmakeJoshua Haberman2018-09-021-0/+1
|\ \ \ | | | | | | | | Added conformance test impl file to CMake.
| * | | Added conformance test impl file to CMake.Joshua Haberman2018-09-021-0/+1
| | | |
* | | | Merge pull request #5099 from oqton/feature/issue-5806Feng Xiao2018-09-023-1/+41
|\ \ \ \ | |/ / / |/| | | Fixes JSON Loading of Any messages with Unknown Fields in C++
| * | | Also make sure known fields come across as expectedBrandon Cole2018-08-301-1/+6
| | | |
| * | | Code fixes for the original unit test.Brandon Cole2018-08-302-1/+18
| | | | | | | | | | | | | | | | Credit goes to @mercret for the fix.
| * | | Add unit test for loading unknown fields in Any messagesBrandon Cole2018-08-301-0/+18
| |/ / | | | | | | | | | Use ./tests.sh cpp to run it
* | | Merge pull request #5078 from haberman/conformance-cmakeJoshua Haberman2018-09-023-0/+53
|\ \ \ | | | | | | | | Added cmake build files for the conformance test runner.
| * | | Added missing file to Makefile.am.Josh Haberman2018-08-241-0/+1
| | | |
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-02 20:46:00 +0000