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

2075 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ruben Garat
83bcfefb0b added concrete IEqualityComparer<ExtensionIntPair> implementation in ExtensionRegistryLite.cs to prevent AOT compilation issue with unity in iOS 2015-05-20 18:07:09 -03:00
Chris Fallin
a526605aec Merge pull request #338 from skippy/encode-decode-helpers 
ruby: Encode decode cleanup and behavior normalization
 2015-05-15 10:52:56 -07:00
Jie Luo
09e584b57a Merge pull request #391 from jtattermusch/generate_protos_windows_friendly 
Make generate_protos.sh Windows-friendly.
 2015-05-15 10:07:04 -07:00
Chris Fallin
e96b5b6b7b Merge pull request #385 from cfallin/travis-refactor 
Refactor Travis tests: split configs and run in parallel.
 2015-05-14 15:05:08 -07:00
Jie Luo
aa8c951ef5 Merge pull request #384 from google/csharp 
Merge protobuf C# into master (only C# proto2 is supported)
 2015-05-14 14:54:36 -07:00
Chris Fallin
20e94b24dd Refactor Travis tests: split configs and run in parallel. 2015-05-14 11:48:21 -07:00
Chris Fallin
b481a4f920 Merge pull request #340 from skippy/add-array-like-methods 
ruby: make repeated_field quack like an array
 2015-05-14 10:55:35 -07:00
Adam Greene
cd7ebbe54f make repeated_field quack like an array 2015-05-14 10:38:11 -07:00
Jon Skeet
734393d0f9 Make generate_protos.sh Windows-friendly. 
To my surprise, executing generate_protos.sh used the version of Bash installed with Git for Windows by default.
After a few modifications to detect the most appropriate protoc to use, this worked pretty simply.
This change also:
- adds generation of the address book tutorial proto,
- fixes the addressbook.proto to specify proto2 explicitly (to avoid a warning from protoc; I don't think we want warnings...)
- fixes the addressbook.proto C# namespace (which I thought I'd done before, but apparently hadn't)
- includes the regenerated UnittestCustomOptions.cs apart from the DescriptorProtoFIle => Descriptor change
 2015-05-14 09:11:57 +01:00
Feng Xiao
5bd8b680ba Merge branch 'gerrit' 2015-05-13 16:18:56 -07:00
Chris Fallin
2fe0483848 Merge pull request #383 from cfallin/ruby-travis 
Add Ruby to Travis testing
 2015-05-13 15:39:45 -07:00
Jie Luo
2d9b1c592f Merge pull request #382 from jtattermusch/integrate_from_master 
Integrate changes from latest master branch into csharp branch.
 2015-05-13 15:24:42 -07:00
Chris Fallin
eb37551ae4 Added Ruby to Travis testing. 
- Added RVM-based Ruby test driver that tests MRI and JRuby.
- Fixed JRuby compilation (at least in my current setup): force source
  version to 1.6 (Java 6) to allow generics and annotations.
- Modify the skipped JRuby JSON tests so that the exit code is 0 (skip()
  results in a failing exit code from `rake test`). An upcoming PR
  should fix JSON under JRuby in general soon.
 2015-05-13 14:58:48 -07:00
Jie Luo
8a888922a9 Merge pull request #380 from jtattermusch/csharp 
Update README.md for C#
 2015-05-13 14:35:37 -07:00
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
Jan Tattermusch
ff172ca8eb Update README.md for C# 2015-05-13 11:44:17 -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
Adam Greene
d1b52a00e0 adding and simplifying encoders/decoders 
* make consistent between mri and jruby
* create a #to_h and have it use symbols for keys
* add #to_json and #to_proto helpers on the Google::Protobuf message classes
 2015-05-13 10:03:56 -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
Feng Xiao
33c92803d5 Include generated code of well-known types in protobuf C++ runtime. 
Change-Id: I23dee1c1d27b6440658680e9c273b6250213123c
 2015-05-11 13:47:41 -07: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