Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Ruby C extension speedup: don't re-intern constant string needlessly. | Chris Fallin | 2015-05-19 | 7 | -29/+45 |
| | | | | Also fixed lines with > 80 char length. | ||||
* | Merge pull request #397 from jskeet/csharp | Jan Tattermusch | 2015-05-18 | 5 | -39464/+31319 |
|\ | | | | | Generate *all* protos in the script, applying fixups. | ||||
| * | Generate *all* protos in the script, applying fixups. | Jon Skeet | 2015-05-16 | 5 | -39464/+31319 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | We still have some protos which aren't generated how we want them to be: - Until we have an option to specify the "umbrella" class, DescriptorProtoFile will be broken. (The change of name here affects the reflection descriptor, which accounts for most of the change. That's easier than trying to work out exactly which occurrences of Descriptor need changing though.) - That change affects UnittestCustomOptions - Issue #307 breaks Unittest.cs After this commit, we don't have the record of the fixups in the files themselves any more, but one centralized record in the shell script. | ||||
* | | Merge pull request #387 from cfallin/ruby-upb-update | Joshua Haberman | 2015-05-18 | 6 | -749/+1408 |
|\ \ | | | | | | | Update MRI C Ruby extension to use new version of upb (with upb_env). | ||||
| * | | Update MRI C Ruby extension to use new version of upb. | Chris Fallin | 2015-05-15 | 6 | -749/+1408 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - Alter encode/decode paths to use the `upb_env` (environment) abstraction. - Update upb amalgamation to upstream `93791bfe`. - Fix a compilation warning (void*->char* cast). - Modify build flags so that upb doesn't produce warnings -- the Travis build logs were pretty cluttered previously. | ||||
* | | | Merge pull request #398 from thomasvl/post_csharp_quick_updates | Paul Yang | 2015-05-18 | 9 | -13/+36 |
|\ \ \ | |_|/ |/| | | Post csharp landing fixup. | ||||
| * | | Post csharp landing fixup. | Thomas Van Lenten | 2015-05-18 | 9 | -13/+36 |
|/ / | | | | | | | | | Re-add the objc prefix that got removed by accident. Regenerate the generated descriptors (C++ and ObjC). | ||||
* | | Merge pull request #351 from tamird/remove-manifest-fix-dist | Joshua Haberman | 2015-05-15 | 3 | -13/+15 |
|\ \ | | | | | | | [PYTHON] Only generate protos in development | ||||
| * | | Only generate protos in development | Tamir Duberstein | 2015-05-15 | 2 | -0/+8 |
| | | | | | | | | | | | | Fixes #333. | ||||
| * | | Allow tests to run on OS X | Tamir Duberstein | 2015-05-15 | 1 | -1/+2 |
| | | | |||||
| * | | Don't hardcode bash | Tamir Duberstein | 2015-05-15 | 2 | -2/+2 |
| | | | |||||
| * | | Use glob to simplify | Tamir Duberstein | 2015-05-15 | 1 | -10/+3 |
|/ / | |||||
* | | Merge pull request #338 from skippy/encode-decode-helpers | Chris Fallin | 2015-05-15 | 11 | -114/+182 |
|\ \ | | | | | | | ruby: Encode decode cleanup and behavior normalization | ||||
| * | | adding and simplifying encoders/decoders | Adam Greene | 2015-05-13 | 11 | -114/+182 |
| | | | | | | | | | | | | | | | | | | * 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 | ||||
* | | | Merge pull request #391 from jtattermusch/generate_protos_windows_friendly | Jie Luo | 2015-05-15 | 3 | -8/+23 |
|\ \ \ | | | | | | | | | Make generate_protos.sh Windows-friendly. | ||||
| * | | | Make generate_protos.sh Windows-friendly. | Jon Skeet | 2015-05-14 | 3 | -8/+23 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
* | | | | Merge pull request #385 from cfallin/travis-refactor | Chris Fallin | 2015-05-14 | 3 | -20/+172 |
|\ \ \ \ | | | | | | | | | | | Refactor Travis tests: split configs and run in parallel. | ||||
| * | | | | Refactor Travis tests: split configs and run in parallel. | Chris Fallin | 2015-05-14 | 3 | -20/+172 |
| | | | | | |||||
* | | | | | Merge pull request #384 from google/csharp | Jie Luo | 2015-05-14 | 314 | -55/+267908 |
|\ \ \ \ \ | | |/ / / | |/| | / | |_|_|/ |/| | | | Merge protobuf C# into master (only C# proto2 is supported) | ||||
| * | | | Merge pull request #382 from jtattermusch/integrate_from_master | Jie Luo | 2015-05-13 | 255 | -323/+84482 |
| |\ \ \ | | | | | | | | | | | Integrate changes from latest master branch into csharp branch. | ||||
| | * | | | Regenerate UnittestDropUnknownFields.cs | Jan Tattermusch | 2015-05-13 | 1 | -2/+2 |
| | | | | | |||||
| | * | | | Merge branch 'master' of github.com:google/protobuf into integrate_from_master | Jan Tattermusch | 2015-05-13 | 254 | -321/+84480 |
| | |\ \ \ | | | | |/ | | | |/| | |||||
| * | | | | Merge pull request #380 from jtattermusch/csharp | Jie Luo | 2015-05-13 | 1 | -8/+28 |
| |\ \ \ \ | | |/ / / | |/| | | | Update README.md for C# | ||||
| | * | | | Update README.md for C# | Jan Tattermusch | 2015-05-13 | 1 | -8/+28 |
| |/ / / | |||||
| * | | | Merge pull request #379 from jskeet/csharp | Jie Luo | 2015-05-13 | 7 | -810/+3781 |
| |\ \ \ | | | | | | | | | | | Remove the C#-specific field_presence_test.proto, using unittest_no_field_presence.proto instead. | ||||
| | * | | | Update C# code generation script | Jon Skeet | 2015-05-13 | 1 | -3/+1 |
| | | | | | |||||
| | * | | | Remove the C#-specific field_presence_test.proto, using ↵ | Jon Skeet | 2015-05-13 | 6 | -807/+3780 |
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
| * | | | Merge pull request #373 from jtattermusch/csharp_generate_proto | Jon Skeet | 2015-05-13 | 19 | -12118/+147 |
| |\ \ \ | | | | | | | | | | | C# generate_proto.sh and buildall.sh scripts | ||||
| | * | | | regenerated UnittestImportLite.cs | Jan Tattermusch | 2015-05-12 | 1 | -1/+3 |
| | | | | | |||||
| | * | | | regenerated UnittestImportPublicLite | Jan Tattermusch | 2015-05-12 | 1 | -1/+3 |
| | | | | | |||||
| | * | | | Regenerated UnittestExtrasLite.cs | Jan Tattermusch | 2015-05-12 | 1 | -51/+48 |
| | | | | | |||||
| | * | | | Regenerated UnittestDropUnknownFields.cs | Jan Tattermusch | 2015-05-12 | 1 | -77/+18 |
| | | | | | |||||
| | * | | | remove C# files not referenced in any project | Jan Tattermusch | 2015-05-12 | 5 | -11783/+0 |
| | | | | | |||||
| | * | | | Regenerate some proto files after ClsCompliance has been dropped | Jan Tattermusch | 2015-05-12 | 3 | -47/+0 |
| | | | | | |||||
| | * | | | rename FieldPresence to correct name | Jan Tattermusch | 2015-05-12 | 2 | -1/+1 |
| | | | | | |||||
| | * | | | got rid of the outdated mono subdirectory | Jan Tattermusch | 2015-05-12 | 3 | -157/+0 |
| | | | | | |||||
| | * | | | draft of generate_protos.sh | Jan Tattermusch | 2015-05-12 | 1 | -0/+52 |
| | | | | | |||||
| | * | | | add buildall script for mono | Jan Tattermusch | 2015-05-12 | 1 | -0/+22 |
| |/ / / | |||||
| * | | | Merge pull request #372 from jtattermusch/csharp_cleanup | Jie Luo | 2015-05-12 | 2 | -13/+2 |
| |\ \ \ | | | | | | | | | | | C# cleanup | ||||
| | * | | | adding what was missing in .gitignore | Jan Tattermusch | 2015-05-12 | 1 | -0/+2 |
| | | | | | |||||
| | * | | | lib subdir is not needed anymore | Jan Tattermusch | 2015-05-12 | 1 | -13/+0 |
| |/ / / | |||||
| * | | | Merge pull request #370 from jtattermusch/mono_fixes | Jie Luo | 2015-05-12 | 8 | -15/+2 |
| |\ \ \ | | | | | | | | | | | Fixes for Mono | ||||
| | * | | | Fix newline assertion in TestJsonFormatted on mono | Jan Tattermusch | 2015-05-12 | 1 | -1/+2 |
| | | | | | |||||
| | * | | | remove TreatWarningsAsError setting to allow building in Monodevelop | Jan Tattermusch | 2015-05-12 | 7 | -14/+0 |
| |/ / / | |||||
| * | | | Merge pull request #366 from jskeet/csharp | Jan Tattermusch | 2015-05-12 | 48 | -3039/+3049 |
| |\ \ \ | | | | | | | | | | | Convert back to using NUnit, which is now loaded via NuGet. | ||||
| | * | | | Convert back to using NUnit, which is now loaded via NuGet. | Jon Skeet | 2015-05-12 | 48 | -3039/+3049 |
| |/ / / | | | | | | | | | | | | | | | | | 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. | ||||
| * | | | Merge pull request #352 from jtattermusch/csharp_performance_fix | Jon Skeet | 2015-05-09 | 1 | -4/+24 |
| |\ \ \ | | | | | | | | | | | Performance optimization for small messages without unknown fields | ||||
| | * | | | Performance optimization for small messages without unknown fields | Jan Tattermusch | 2015-05-07 | 1 | -4/+24 |
| | | | | | |||||
| * | | | | Merge pull request #348 from jskeet/csharp | Jon Skeet | 2015-05-07 | 30 | -9/+44 |
| |\ \ \ \ | | |/ / / | |/| | | | Add C# namespace to .proto files (e.g. descriptors, unit tests) | ||||
| | * | | | Regenerate descriptor.pb.cc after csharp_namespace change | Jon Skeet | 2015-05-07 | 1 | -2/+3 |
| | | | | |