Commit Graph

6055 Commits

Author SHA1 Message Date
Jon Skeet
1711999078 Provide simple access to descriptor declarations in C#
This is primarily for access to comments, which would be expected to be available in a protoc plugin.

The implementation has two fiddly aspects:

- We use a Lazy<T> to avoid building the map before cross-linking. An alternative would be to crosslink at the end of the constructor, and remove the calls to CrossLink elsewhere. This would be generally better IMO, but deviate from the Java code.
- The casts to IReadOnlyList<DescriptorBase> are unfortunate. They'll always work, because these lists are always ReadOnlyCollection<T> for a descriptor type... but we can't use IList<DescriptorBase> as that's not covariant, and it's annoyingly fiddly to change the field to be of type ReadOnlyCollection<T>.
2018-09-22 09:09:15 +01:00
Feng Xiao
a6e1cc7e32
Merge pull request #5127 from xfxyjwf/merge
Merge 3.6.x branch to master
2018-09-17 13:41:25 -07:00
Feng Xiao
ff3891dab1
Merge pull request #5085 from scentini/compiler-flag
Route "compiler" value of config_setting through @bazel_tools/tools/cpp:compiler.
2018-09-10 16:47:22 -07:00
Jon Skeet
baa4a21130 Cross-link descriptor when building from byte strings
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.
2018-09-10 22:00:36 +01:00
Feng Xiao
f8cd9b0fac
Merge pull request #5105 from sigurdm/invoke_plugin_via_cmd
On Windows invoke plugins using cmd.exe
2018-09-10 13:47:08 -07:00
Feng Xiao
3bf0245fd2
Merge pull request #5122 from elharo/guava20
update to Guava 20
2018-09-10 13:46:38 -07:00
Benjamin Peterson
188c44b117 Remove 2to3 code from setup.py. (#5114)
Python protobuf has long been a single-source codebase. 2to3 shouldn't need to run in setup.py.
2018-09-10 13:35:38 -07:00
Feng Xiao
e49bd66034 Merge remote-tracking branch 'google/3.6.x' 2018-09-07 17:49:20 -07:00
Jan Tattermusch
f8d56e929e
Merge pull request #5125 from jtattermusch/upport_kokoro_release_python
Upport kokoro/release/python from 3.6.x branch
2018-09-07 16:47:46 -07:00
Joshua Haberman
f9d8138376
Merge pull request #5109 from haberman/integrate
Down-integrate from google3.
2018-09-07 16:15:38 -07:00
Josh Haberman
e53be9bce4 Fixed Python extension compile. 2018-09-07 13:07:20 -07:00
Jan Tattermusch
7200550afa upport kokoro/release/python from 3.6.x branch 2018-09-07 12:32:20 -07:00
Jan Tattermusch
2e7563f40e
Merge pull request #5123 from jtattermusch/collect_all_artifacts
Add experimental collect_all_artifacts script
2018-09-07 12:23:08 -07:00
Feng Xiao
4b955e69cf
Merge pull request #5111 from kykrueger/master
Update README.md with gradle instructions for java
2018-09-07 12:06:48 -07:00
Josh Haberman
f14064184c Regenerated Objective C protos. 2018-09-07 11:32:06 -07:00
Josh Haberman
986fad3eb1 Removed obsolete hash_map header that was breaking the compile. 2018-09-07 11:20:04 -07:00
Josh Haberman
4049a24f2b Reverted changes to map_lite_test.proto. 2018-09-07 09:43:14 -07:00
Jan Tattermusch
9dadb37fb2 experimental collect_all_artifacts script 2018-09-07 09:10:12 -07:00
Elliotte Rusty Harold
bb3bff0cd4 update to Guava 20 2018-09-07 08:33:14 -04:00
Paul Yang
5aeee3dc91
Add source dependency of test suite implementation to main function (#5069)
* 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
2018-09-06 15:02:04 -07:00
Kyle Krueger
21ebeed20a
Update README.md with gradle instructions for java 2018-09-06 09:43:26 +02:00
Josh Haberman
c73d689c95 Regenerated C# protos. 2018-09-04 11:49:04 -07:00
Josh Haberman
d61aede89c Down-integrate from google3. 2018-09-04 10:58:54 -07:00
Sigurd Meldgaard
4e5ae963e8 On Windows invoke plugins using cmd.exe
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..
2018-09-03 12:09:16 +00:00
Joshua Haberman
fd90f45360
Merge pull request #5103 from haberman/cmake
Added conformance test impl file to CMake.
2018-09-02 20:57:46 -07:00
Feng Xiao
37b5617d42
Merge pull request #5099 from oqton/feature/issue-5806
Fixes JSON Loading of Any messages with Unknown Fields  in C++
2018-09-02 20:33:12 -07:00
Joshua Haberman
64f5af2f9c Added conformance test impl file to CMake. 2018-09-02 14:22:52 -07:00
Joshua Haberman
d340bdf508
Merge pull request #5078 from haberman/conformance-cmake
Added cmake build files for the conformance test runner.
2018-09-02 10:07:14 -07:00
Feng Xiao
d42ec0791a
Merge pull request #5092 from xfxyjwf/contrib
Add contributing guidelines.
2018-09-01 08:59:09 -07:00
Paul Yang
d05926861b
Fix well known type class not inheriting Message (#5095)
* Fix well known type class not inheriting Message

Previously, well known types only implement Message interface but not inhert it.
Fix the problem by calling zend_do_inheritance

* Add back commented tests
2018-08-31 10:48:17 -07:00
Paul Yang
98e26a4195
Add missing reference to conformanc_test_impl.cc in Makefile (#5100)
* Add missing reference to conformanc_test_impl.cc in Makefile

* Update conformance failure list
2018-08-31 10:47:58 -07:00
Brandon Cole
52870ad8fd Also make sure known fields come across as expected 2018-08-30 11:45:39 -04:00
Brandon Cole
3d32de9b2c Code fixes for the original unit test.
Credit goes to @mercret for the fix.
2018-08-30 11:32:45 -04:00
Brandon Cole
d83a9f66bc Add unit test for loading unknown fields in Any messages
Use ./tests.sh cpp to run it
2018-08-30 11:04:55 -04:00
Feng Xiao
2102a70e51 Add constributing guidelines. 2018-08-29 15:50:16 -07:00
Feng Xiao
9a8d9b1014
Merge pull request #5082 from elharo/guava
update version
2018-08-29 14:20:31 -07:00
Feng Xiao
0bfe1ca277
Merge pull request #5079 from GobySoft/request-new-extension
Request new option extension (and update URLs for existing projects)
2018-08-29 14:15:33 -07:00
Feng Xiao
86c7786be8
Merge pull request #5077 from EmersonGaziz/patch-1
Update options.md | fix website url for C# port
2018-08-29 14:13:05 -07:00
scentini
664f9277b5
Create compiler_config_setting.bzl 2018-08-28 14:10:46 +02:00
scentini
b30ddee2aa
use flag_values = {"@bazel_tools//tools/cpp:compiler": "x"} for compiler config_settings 2018-08-28 14:07:55 +02:00
Elliotte Harold
259331566b update version 2018-08-27 21:54:07 -04:00
Josh Haberman
0e3fa28e47 Added missing file to Makefile.am. 2018-08-24 17:09:50 -07:00
Toby Schneider
4fd7bdee48
Update options.md
Update my projects' (DCCL / Goby) URLs.
Propose new extension for CGSN Mooring project.
2018-08-24 17:10:24 -04:00
Josh Haberman
4249692ce6 Added cmake build files for the conformance test runner.
I want to use the conformance tests from upb, which is switching
to CMake.
2018-08-24 12:27:21 -07:00
Gohar Aziz
f3a74befcd
Update options.md | fix website url for C# port
Update options.md | fix website url for C# port of protocol buffers.. From `http://github.com/jskeet/dotnet-protobufs` to `https://github.com/jskeet/protobuf-csharp-port`
2018-08-24 10:19:22 -04:00
Feng Xiao
45d03a9771
Merge pull request #5074 from xfxyjwf/links
Revert changed links in Dockerfiles.
2018-08-23 16:17:25 -07:00
Feng Xiao
a0a17e24d7 Fix go tests. 2018-08-23 15:35:52 -07:00
Feng Xiao
409f954673 Revert changed links in Dockerfiles.
These changes require building new docker images and without new images
our kokoro tests are all failing.
2018-08-23 12:43:35 -07:00
Feng Xiao
fd4baa91e7
Merge pull request #5068 from xfxyjwf/links
Replace repo links.
2018-08-22 18:32:11 -07:00
Feng Xiao
afe98de32a Replace repo links. 2018-08-22 11:55:30 -07:00