AuroraMiddleware/protobuf
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity
2,643 Commits 35 Branches 138 Tags 124 MiB
fb0af6d02e
Commit Graph

2643 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dan O'Reilly
6654e77f1d Merge remote-tracking branch 'upstream/master' into py2_py3_straddle 2015-08-14 14:33:13 -04:00
Thomas Van Lenten
4e43931eaf Add support for a file listing expected package to objc prefixes for validation. 
- Add a env var to pass a set of expected prefixes for validation.
- Report warnings/errors based on the expected prefixes vs. the data in the files compiled.
- Use some helpers from common directory.
 2015-08-14 13:34:51 -04:00
Joshua Haberman
53435df594 Merge pull request #716 from haberman/fixruby 
Fixed several Ruby conformance test cases through upb update.
 2015-08-13 13:40:09 -07:00
Jan Tattermusch
2093749caf Merge pull request #718 from jskeet/descriptor-descriptor 
Allow public access to descriptor.proto as a dependency.
 2015-08-13 09:23:29 -07:00
Jon Skeet
a39ababb7c Allow public access to descriptor.proto as a dependency. 
With this in place, generating APIs on github.com/google/googleapis works - previously annotations.proto failed.
Currently there's no access to the annotations (stored as extensions) but we could potentially expose those at a later date.
 2015-08-13 12:01:41 +01:00
Feng Xiao
f818183f9b Merge pull request #673 from podsvirov/topic-cmake-install 
Install protobuf from cmake project
 2015-08-12 23:07:54 -07:00
Dan O'Reilly
981d6bf2f7 Build protobuf files in as part of tox runs. 
Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
 2015-08-13 01:24:05 -04:00
Dan O'Reilly
833c046fb7 Fixing some tests 
Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
 2015-08-13 01:17:26 -04:00
Dan O'Reilly
e47cdd5a55 Merge remote-tracking branch 'upstream/master' into py2_py3_straddle 
Conflicts:
	python/google/protobuf/descriptor_pool.py
	python/google/protobuf/internal/api_implementation_default_test.py
	python/google/protobuf/internal/cpp_message.py
	python/google/protobuf/internal/descriptor_database_test.py
	python/google/protobuf/internal/descriptor_pool_test.py
	python/google/protobuf/internal/descriptor_python_test.py
	python/google/protobuf/internal/descriptor_test.py
	python/google/protobuf/internal/generator_test.py
	python/google/protobuf/internal/message_factory_python_test.py
	python/google/protobuf/internal/message_factory_test.py
	python/google/protobuf/internal/message_test.py
	python/google/protobuf/internal/proto_builder_test.py
	python/google/protobuf/internal/python_message.py
	python/google/protobuf/internal/reflection_test.py
	python/google/protobuf/internal/service_reflection_test.py
	python/google/protobuf/internal/symbol_database_test.py
	python/google/protobuf/internal/text_encoding_test.py
	python/google/protobuf/internal/text_format_test.py
	python/google/protobuf/internal/unknown_fields_test.py
	python/google/protobuf/internal/wire_format_test.py
	python/google/protobuf/pyext/descriptor_cpp2_test.py
	python/google/protobuf/pyext/message_factory_cpp2_test.py
	python/google/protobuf/pyext/reflection_cpp2_generated_test.py
	python/setup.py
	ruby/lib/google/protobuf/message_exts.rb
 2015-08-12 23:57:46 -04:00
Josh Haberman
5bdf4a4271 Fixed several Ruby conformance test cases through upb update. 
Change-Id: Ief77de7134e05e07b1a7e3970d49880c2d5e6fe9
 2015-08-12 18:50:15 -07:00
Feng Xiao
38a56ee4b1 Merge pull request #702 from jtattermusch/visual_studio_build_static_runtime 
Link runtime statically for VS build
 2015-08-12 14:11:12 -07:00
Jan Tattermusch
9bdeba479b only link runtime libraries statically for a static build 2015-08-12 12:47:02 -07:00
Feng Xiao
bd11198f69 Fix map fields parsing. 
Change-Id: If61e16cea84492474a71bbfe985131ec980b0b0a
 2015-08-11 17:19:54 -07:00
Paul Yang
edaefac5d2 Merge pull request #706 from thomasvl/revert_any_change_2 
Revert "Add packFrom, unpackTo and is in google.protobuf.Any."
 2015-08-11 13:43:45 -07:00
Thomas Van Lenten
1c33d34e34 Revert "Add packFrom, unpackTo and is in google.protobuf.Any." 
This reverts commit 7366efd81e.

Still some discussion about the api to expose the helpers with.
 2015-08-11 16:22:47 -04:00
Paul Yang
63778e537a Merge pull request #649 from cijianzy/master 
Update GPBWellKnownTypes.m
 2015-08-11 13:02:50 -07:00
Jan Tattermusch
6994b07f14 Merge pull request #703 from jskeet/more-todos 
More TODOs done.
 2015-08-10 14:39:40 -07:00
Jon Skeet
f2732c7af1 More TODOs done. 
- Removed a TODO without change in DescriptorPool.LookupSymbol - the TODOs were around performance, and this is only used during descriptor initialization
- Make the CodedInputStream limits read-only, adding a static factory method for the rare cases when this is useful
- Extracted IDeepCloneable into its own file.
 2015-08-10 19:18:18 +01:00
Jon Skeet
29fe8d223e Merge pull request #701 from jskeet/map-views 
Implement Keys and Values as views in MapField
 2015-08-10 12:44:49 +01:00
Jon Skeet
4deea8c231 Fix parameter name in exception. 2015-08-10 09:03:43 +01:00
Jon Skeet
c2c42053bc Merge pull request #699 from jskeet/validate_packed 
Make FieldDescriptor.IsPacked work appropriately.
 2015-08-10 08:47:57 +01:00
Jon Skeet
5be01ee65b Implement ICollection.CopyTo (using Array) for MapField views. 2015-08-10 08:47:07 +01:00
Jan Tattermusch
1858ac9b42 make VS build link runtime statically 2015-08-08 19:56:52 -07:00
Jan Tattermusch
5980629933 Merge pull request #700 from jskeet/remove-packed-hack 
Remove our own version of MakeTag now that the main one is fixed.
 2015-08-08 11:51:40 -07:00
Jon Skeet
3f45d7c11e Implement Keys and Values as views 2015-08-08 08:59:53 +01:00
Jon Skeet
547d8e8221 Make FieldDescriptor.IsPacked work appropriately. 
This is a bit of a grotty hack, as we need to sort of fake proto2 field presence, but with only a proto3 version of the descriptor messages (a bit like oneof detection).
Should be okay, but will need to be careful of this if we ever implement proto2.
 2015-08-08 07:27:58 +01:00
Jon Skeet
e58cdbd214 Merge pull request #695 from jskeet/remove-todos 
Tidying up
 2015-08-08 07:26:51 +01:00
Jon Skeet
c671095e91 Address review comments. 2015-08-08 07:26:26 +01:00
Jon Skeet
889b88a29f Remove reference to generic types within XML comment. 
Visual Studio is happy with it, but Mono isn't :(
 2015-08-08 07:25:29 +01:00
Jon Skeet
6f300442bc Tidying up - fix a bunch of TODOs and remove outdated ones. 2015-08-08 07:25:28 +01:00
Jon Skeet
cac4531323 Merge pull request #694 from jskeet/groups 
Fix groups handling in C#
 2015-08-08 07:24:57 +01:00
Jon Skeet
6e16037c99 Address review comments. 2015-08-08 07:24:28 +01:00
Jon Skeet
93bdf36f8b Remove our own version of MakeTag now that the main one is fixed. 
"Tested" by regenerating code and observing that there are no changes.
 2015-08-07 13:45:56 +01:00
Paul Yang
b76b76ba4f Merge pull request #645 from zsurocking/master 
Down integrate. Generate a package name suffix ".nano" for nano messages
 2015-08-06 18:12:35 -07:00
Paul Yang
914e6ace03 Merge pull request #696 from TeBoring/temp 
Remove unused .pb.h #includes.
 2015-08-06 17:46:15 -07:00
Bo Yang
5e47a68b32 Remove unused .pb.h #includes. 2015-08-06 11:23:50 -07:00
Jon Skeet
5bdc57292f Generated code for previous commit. 2015-08-06 11:40:43 +01:00
Jon Skeet
e7f88ff129 Skip groups properly. 
Now the generated code doesn't need to check for end group tags, as it will skip whole groups at a time.
Currently it will ignore extraneous end group tags, which may or may not be a good thing.
Renamed ConsumeLastField to SkipLastField as it felt more natural.
Removed WireFormat.IsEndGroupTag as it's no longer useful.

This mostly fixes issue 688.

(Generated code changes coming in next commit.)
 2015-08-06 11:40:32 +01:00
Jan Tattermusch
ad8a889d1e Merge pull request #692 from jskeet/tag-0 
Change ReadTag/PeekTag behaviour to return 0 at EOF
 2015-08-05 17:16:13 -07:00
Jon Skeet
38032688a7 Make InvalidProtocolBufferException.InvalidTag internal. 
We don't need to expose the InvalidProtocolBufferException factory method now that the generated code doesn't throw the exception.
 2015-08-05 17:48:53 +01:00
Jon Skeet
1a57ad8b41 Generated code changes for previous commit. 2015-08-05 11:23:52 +01:00
Jon Skeet
ff334a60eb Change ReadTag and PeekTag to just use 0 as a return value for "end of stream", rather than using an awkward out parameter. 
This simplifies quite a lot of code.

Generated code in next commit.
 2015-08-05 11:23:38 +01:00
Jon Skeet
607940321c Merge pull request #689 from jskeet/fix-eof 
C# conformance tests
 2015-08-05 09:11:25 +01:00
Jon Skeet
c13a612dc4 Update AssemblyInfo for conformance - mostly to fix version numbers. 2015-08-05 07:09:43 +01:00
Jon Skeet
15bf55e225 Validate that after reading a message, we've consumed as many bytes as we expected to. 
We should now have no conformance failures.
 2015-08-05 07:09:43 +01:00
Jon Skeet
fe355b26ec Generated code changes for previous commit. 2015-08-05 07:09:42 +01:00
Jon Skeet
9df2defa29 Consume unknown fields when parsing. 
This is expected to be the cause of the conformance test failures.
Generated code in next commit.
 2015-08-05 07:09:41 +01:00
Jon Skeet
b6defa7c11 Added C# conformance tests. 
The tests are run from Travis in the same way as on other
platforms. Currently some expected failures - but only expected
in that they're what we got to start with. Will try to fix them in
other pull requests.
 2015-08-05 07:09:40 +01:00
Jon Skeet
044c36ebef First pass at C# conformance tests. 
Completely untested so far - easier to get started in VS and then transfer to Linux for tweaking...
 2015-08-05 07:09:39 +01:00
Jon Skeet
d77d70d227 Merge pull request #691 from jskeet/xml-documentation 
Document everything, and turn on errors if we fail to document anything in the future
 2015-08-05 07:09:17 +01:00