organicmaps/protobuf
13
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions
2058 commits 28 branches 36 tags 41 MiB
Commit graph

2058 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jan Tattermusch
38da6583b1 Regenerate UnittestDropUnknownFields.cs 2015-05-13 13:38:54 -07:00
Jan Tattermusch
4111310830 Merge branch 'master' of github.com:google/protobuf into integrate_from_master 2015-05-13 13:35:02 -07:00
Jie Luo
3bc162a8ac Merge pull request #379 from jskeet/csharp 
Remove the C#-specific field_presence_test.proto, using unittest_no_field_presence.proto instead.
 2015-05-13 10:58:58 -07:00
Jon Skeet
fd1693a3fb Update C# code generation script 2015-05-13 17:56:52 +01:00
Jon Skeet
998b5ba20d Remove the C#-specific field_presence_test.proto, using unittest_no_field_presence.proto instead. 
This is the start of establishing a C# namespace of "Google.ProtocolBuffers.TestProtos.Proto3" for proto3-syntax protos.
We could optionally split the directory structure as well into Proto2 and Proto3 for clarity.
 2015-05-13 17:34:02 +01:00
Jon Skeet
98de125a7c Merge pull request #373 from jtattermusch/csharp_generate_proto 
C# generate_proto.sh and buildall.sh scripts
 2015-05-13 10:04:21 +01:00
Jan Tattermusch
881995352d regenerated UnittestImportLite.cs 2015-05-12 22:00:38 -07:00
Jan Tattermusch
4083104aa4 regenerated UnittestImportPublicLite 2015-05-12 21:58:59 -07:00
Jan Tattermusch
3aa5808557 Regenerated UnittestExtrasLite.cs 2015-05-12 21:56:40 -07:00
Jan Tattermusch
6f7a782934 Regenerated UnittestDropUnknownFields.cs 2015-05-12 21:54:23 -07:00
Jan Tattermusch
766036f231 remove C# files not referenced in any project 2015-05-12 21:42:40 -07:00
Jan Tattermusch
385afba572 Regenerate some proto files after ClsCompliance has been dropped 2015-05-12 21:42:40 -07:00
Jan Tattermusch
a39dc6d5be rename FieldPresence to correct name 2015-05-12 21:42:40 -07:00
Jan Tattermusch
3e0e54943b got rid of the outdated mono subdirectory 2015-05-12 21:42:40 -07:00
Jan Tattermusch
dfefe9a4c1 draft of generate_protos.sh 2015-05-12 21:42:40 -07:00
Jan Tattermusch
b1a921c7b3 add buildall script for mono 2015-05-12 21:42:39 -07:00
Jie Luo
d1183bba4d Merge pull request #372 from jtattermusch/csharp_cleanup 
C# cleanup
 2015-05-12 16:25:34 -07:00
Jan Tattermusch
6f4bdffbe5 adding what was missing in .gitignore 2015-05-12 15:21:59 -07:00
Jan Tattermusch
86f97e3246 lib subdir is not needed anymore 2015-05-12 15:21:22 -07:00
Jisi Liu
23bb79d4a3 Merge pull request #371 from zhangkun83/docker 
Dockerfile for building protoc on Centos 6.6
 2015-05-12 15:11:31 -07:00
Kun Zhang
2aaf5c603a Dockerfile for building protoc on Centos 6.6 2015-05-12 15:07:36 -07:00
Jie Luo
5e68a75fa7 Merge pull request #370 from jtattermusch/mono_fixes 
Fixes for Mono
 2015-05-12 14:06:00 -07:00
Jan Tattermusch
3ccbf4b893 Fix newline assertion in TestJsonFormatted on mono 2015-05-12 11:54:23 -07:00
Feng Xiao
8543073871 Merge pull request #369 from ensonic/master 
Uncomment conflict fields from pkg-config files.
 2015-05-12 11:39:28 -07:00
Jan Tattermusch
7149cee282 remove TreatWarningsAsError setting to allow building in Monodevelop 2015-05-12 11:23:35 -07:00
Jan Tattermusch
d26cef6285 Merge pull request #366 from jskeet/csharp 
Convert back to using NUnit, which is now loaded via NuGet.
 2015-05-12 11:08:46 -07:00
Stefan Sauer
37e7a3c4b8 Uncomment conflict fields from pkg-config files. 
The referenced bug was fixed in 2007 and has been released in pkg-config-0.23
(16.Jan.2008). The fixed version is widely available.
 2015-05-12 17:50:05 +02:00
Jon Skeet
90c8932fc7 Convert back to using NUnit, which is now loaded via NuGet. 
This includes the NUnit test adapter which allows NUnit tests to be run under VS without any extra plugins.
Unfortunate the compatibility tests using the abstract test fixture class show up as "external" tests, and aren't well presented - but they do run.
 2015-05-12 09:48:02 +01:00
Jon Skeet
c58b2c6644 Merge pull request #352 from jtattermusch/csharp_performance_fix 
Performance optimization for small messages without unknown fields
 2015-05-09 19:00:23 +01:00
Joshua Haberman
cd141089a1 Merge pull request #255 from btabibian/master 
adding globals() to exec call for python3 compatibility
 2015-05-07 21:45:15 -07:00
Feng Xiao
de5d45500c Merge branch 'gerrit' to 'master' 2015-05-07 14:07:30 -07:00
Jisi Liu
699db2d51a Merge pull request #345 from brianduff/update_aosp_again 
Handle 0-length byte buffers in micro and nano protobufs
 2015-05-07 13:13:10 -07:00
Feng Xiao
03e170446b Merge pull request #101 from fizbin/fix_large_proto_java_code 
Fix java compilation issues when processing large .proto files
 2015-05-07 10:28:52 -07:00
Behzad Tabibian
2bf92b3be9 mend 2015-05-07 19:04:56 +02:00
Jon Skeet
34fb666955 Merge pull request #348 from jskeet/csharp 
Add C# namespace to .proto files (e.g. descriptors, unit tests)
 2015-05-07 16:47:55 +01:00
Jan Tattermusch
6f9da37b0d Performance optimization for small messages without unknown fields 2015-05-07 08:40:36 -07:00
Jon Skeet
8172561995 Regenerate descriptor.pb.cc after csharp_namespace change 2015-05-07 09:14:00 +01:00
Joshua Haberman
048f123ed6 Merge pull request #349 from haberman/conformance-java-travis 
Run conformance tests against Java for the Travis build.
 2015-05-06 18:18:28 -07:00
Josh Haberman
9681ef4273 Run conformance tests against Java for the Travis build. 
Change-Id: I8ef8664f7facf86028be3f4f0d5d2efc8a685d6d
 2015-05-06 17:32:10 -07:00
Paul Yang
b89de5f6e0 Merge pull request #331 from thomasvl/objc_alpha1_drop 
Objective C compiler plugin and runtime
 2015-05-06 17:32:07 -07:00
Joshua Haberman
f47db47cd9 Merge pull request #281 from tamird/cleanup-setup-py 
Cleanup setup.py
 2015-05-06 16:38:05 -07:00
Tamir Duberstein
21a7cf965a Noramlize 'setup.py' to fit conventions: 
- Comply with flake8, except for indentation width, which is 2.

- Move human-centric metadata to top of 'setup()' call.

- Add Trove classifiers for supported Python versions.

- Use 'find_packages()' + MANIFEST.in to avoid errors in listing
  modules and packages.

Closes #131 and #161.
 2015-05-06 17:02:57 -04:00
Tamir Duberstein
6d3e61676a [PYTHON] gitignore eggs 2015-05-06 17:02:57 -04:00
Tamir Duberstein
4f5cbe6ead Whitespace 2015-05-06 17:02:57 -04:00
Tamir Duberstein
9d9d0b70de Don't hard-code the python path 2015-05-06 17:02:57 -04:00
Josh Haberman
1f34eb6e7a Merge Gerrit master into GitHub master. 
Adds conformance test support for Java.
 2015-05-06 13:16:57 -07:00
Jon Skeet
7879f82ddc Add C# namespace to .proto files (e.g. descriptors, unit tests) 2015-05-06 19:07:14 +01:00
Thomas Van Lenten
30650d81d9 Alpha 1 drop of Google's Objective C plugin and runtime support for protobufs. 2015-05-06 13:19:14 -04:00
Andre Eisenbach
15bff99de6 Handle 0-length byte buffers in micro and nano protobufs 
Change-Id: I845ee1ab1005d25c8d77a8c2ed801c0f7b7c847b
 2015-05-04 17:58:26 -07:00
Chris Fallin
16a283f794 Merge pull request #334 from skippy/allow-msg-to-accept-nil 
ruby: allow a message field to be unset
 2015-05-02 19:02:08 -07:00