aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAge
* Merge pull request #410 from thomasvl/objc_alpha2_dropGravatar Paul Yang2015-05-22
|\ | | | | Objective C Second Alpha Drop
| * Objective C Second Alpha DropGravatar Thomas Van Lenten2015-05-22
| | | | | | | | | | | | | | | | | | | | - Style fixups in the code. - map<> serialization fixes and more tests. - Autocreation of map<> fields (to match repeated fields). - @@protoc_insertion_point(global_scope|imports). - Fixup proto2 syntax extension support. - Move all startup code to +initialize so it happen on class usage and not app startup. - Have generated headers use forward declarations and move imports into generated code, reduces what is need at compile time to speed up compiled and avoid pointless rippling of rebuilds.
* | Merge pull request #413 from TeBoring/masterGravatar Paul Yang2015-05-21
|\ \ | | | | | | down-integrate internal changes
| * | down-integrate internal changesGravatar Bo Yang2015-05-21
| | |
* | | Merge pull request #411 from xfxyjwf/masterGravatar Paul Yang2015-05-21
|\ \ \ | | | | | | | | Add default import paths for descriptor.proto and well-known protos.
* \ \ \ Merge pull request #412 from xfxyjwf/java_wktGravatar Paul Yang2015-05-21
|\ \ \ \ | |_|/ / |/| | | Include well-known types in Java runtime.
| * | | Include well-known types in Java runtime.Gravatar Feng Xiao2015-05-21
|/ / / | | | | | | | | | Change-Id: I816fe2fac7fccbcd96dd8510c7c9b5e7996aeadc
| * / Add default import paths for descriptor.proto and other well-known types to ↵Gravatar Feng Xiao2015-05-21
|/ / | | | | | | | | | | protoc. Change-Id: I4afa295de4c8ed2a4cd0919cf84aedcd1327d9a5
* | Merge pull request #389 from jcanizales/add-podspecGravatar Paul Yang2015-05-21
|\ \ | |/ |/| Adds a podspec for the proto3 Objective-C runtime.
* | Merge pull request #402 from thomasvl/objc_on_winGravatar Paul Yang2015-05-21
|\ \ | | | | | | Getting the ObjC generator building on Windows.
* \ \ Merge pull request #394 from ironhidegames/csharp-aot-iosGravatar Jan Tattermusch2015-05-21
|\ \ \ | | | | | | | | Solves AOT compilation issue for Unity - iOS
| * | | added concrete IEqualityComparer<ExtensionIntPair> implementation in ↵Gravatar Ruben Garat2015-05-20
| | | | | | | | | | | | | | | | ExtensionRegistryLite.cs to prevent AOT compilation issue with unity in iOS
* | | | Merge pull request #406 from AustinSchuh/unsigned_has_bitsGravatar Feng Xiao2015-05-20
|\ \ \ \ | | | | | | | | | | Marked compiler literal unsigned.
* \ \ \ \ Merge pull request #399 from jtattermusch/csharp_travisGravatar Jie Luo2015-05-20
|\ \ \ \ \ | | | | | | | | | | | | C# travis integration
| | * | | | Marked compiler literal unsigned.Gravatar Austin Schuh2015-05-19
| |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When compiling a protobuf with gcc 3.3.2 for powerpc, I ran into the following warning message: INFO: From Compiling my_proto.pb.cc powerpc-603e-linux-gcc: bazel-out/local_linux-dbg/genfiles/my_proto.pb.cc: In member function `virtual void MyProto::Clear()': bazel-out/local_linux-dbg/genfiles/my_proto.pb.cc:223: warning: this decimal constant is unsigned only in ISO C90 The line in the proto file that was triggering it was: if (_has_bits_[24 / 32] & 4278190080) { ZR_(field1_, field2_); } _has_bits_ is a uint32. The constant mask should therefore be unsigned. This change updates the constant to be generated as unsigned.
| | | * | Getting the ObjC generator building on Windows.Gravatar Thomas Van Lenten2015-05-19
| |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the ClassList support (maybe bring it back in the future). Trim the includes to hopefully get a working Window build. Add some more returns after switches for compilers that warn even when all values of the enum are handled. Use ghtonl instead of htonl. Change the use of [u]int(8,32)_t within the ObjC generator code to [u]int(8,32) to match the rest of the compiler. Add objective-c generator files to Visual Studio project.
* | | | Merge pull request #405 from cfallin/ruby-speedGravatar Joshua Haberman2015-05-19
|\ \ \ \ | | | | | | | | | | Ruby C extension speedup: don't re-intern constant string needlessly.
| * | | | Ruby C extension speedup: don't re-intern constant string needlessly.Gravatar Chris Fallin2015-05-19
|/ / / / | | | | | | | | | | | | Also fixed lines with > 80 char length.
| * / / csharp travis integrationGravatar Jan Tattermusch2015-05-18
|/ / /
* | | Merge pull request #397 from jskeet/csharpGravatar Jan Tattermusch2015-05-18
|\ \ \ | | | | | | | | Generate *all* protos in the script, applying fixups.
* \ \ \ Merge pull request #387 from cfallin/ruby-upb-updateGravatar Joshua Haberman2015-05-18
|\ \ \ \ | | | | | | | | | | Update MRI C Ruby extension to use new version of upb (with upb_env).
* \ \ \ \ Merge pull request #398 from thomasvl/post_csharp_quick_updatesGravatar Paul Yang2015-05-18
|\ \ \ \ \ | | | | | | | | | | | | Post csharp landing fixup.
| * | | | | Post csharp landing fixup.Gravatar Thomas Van Lenten2015-05-18
|/ / / / / | | | | | | | | | | | | | | | | | | | | Re-add the objc prefix that got removed by accident. Regenerate the generated descriptors (C++ and ObjC).
| | * / / Generate *all* protos in the script, applying fixups.Gravatar Jon Skeet2015-05-16
| |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 #351 from tamird/remove-manifest-fix-distGravatar Joshua Haberman2015-05-15
|\ \ \ \ | |_|/ / |/| | | [PYTHON] Only generate protos in development
| * | | Only generate protos in developmentGravatar Tamir Duberstein2015-05-15
| | | | | | | | | | | | | | | | Fixes #333.
| * | | Allow tests to run on OS XGravatar Tamir Duberstein2015-05-15
| | | |
| * | | Don't hardcode bashGravatar Tamir Duberstein2015-05-15
| | | |
| * | | Use glob to simplifyGravatar Tamir Duberstein2015-05-15
|/ / /
| * | Update MRI C Ruby extension to use new version of upb.Gravatar Chris Fallin2015-05-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | - 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 #338 from skippy/encode-decode-helpersGravatar Chris Fallin2015-05-15
|\ \ \ | | | | | | | | ruby: Encode decode cleanup and behavior normalization
* \ \ \ Merge pull request #391 from jtattermusch/generate_protos_windows_friendlyGravatar Jie Luo2015-05-15
|\ \ \ \ | | | | | | | | | | Make generate_protos.sh Windows-friendly.
| | | | * Adds the podspec to objectivec_EXTRA_DIST in Makefile.amGravatar Jorge Canizales2015-05-14
| | | | |
| | | | * Undo previous commit: Make all headers public instead.Gravatar Jorge Canizales2015-05-14
| | | | | | | | | | | | | | | | | | | | | | | | | Apparently, in Cocoapods, all recursive #imports of public headers need to be public.
| | | | * Restricts public headers to GPBProtocolBuffers.h and ↵Gravatar Jorge Canizales2015-05-14
| | | | | | | | | | | | | | | | | | | | GPBProtocolBuffers_RuntimeSupport.h
* | | | | Merge pull request #385 from cfallin/travis-refactorGravatar Chris Fallin2015-05-14
|\ \ \ \ \ | | | | | | | | | | | | Refactor Travis tests: split configs and run in parallel.
* \ \ \ \ \ Merge pull request #384 from google/csharpGravatar Jie Luo2015-05-14
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | Merge protobuf C# into master (only C# proto2 is supported)
| | | | | * Makes _PackagePrivate.h files privateGravatar Jorge Canizales2015-05-14
| | | | | |
| | | | | * Adds the initial version of the podspec for the proto3 Objective-C runtime.Gravatar Jorge Canizales2015-05-14
| | | | | |
| | * | | | Refactor Travis tests: split configs and run in parallel.Gravatar Chris Fallin2015-05-14
| | | | | |
* | | | | | Merge pull request #340 from skippy/add-array-like-methodsGravatar Chris Fallin2015-05-14
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | ruby: make repeated_field quack like an array
| * | | | | make repeated_field quack like an arrayGravatar Adam Greene2015-05-14
|/ / / / /
| | | * / Make generate_protos.sh Windows-friendly.Gravatar Jon Skeet2015-05-14
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 branch 'gerrit'Gravatar Feng Xiao2015-05-13
|\ \ \ \ | |_|/ / |/| | |
* | | | Merge pull request #383 from cfallin/ruby-travisGravatar Chris Fallin2015-05-13
|\ \ \ \ | | | | | | | | | | Add Ruby to Travis testing
| | | * \ Merge pull request #382 from jtattermusch/integrate_from_masterGravatar Jie Luo2015-05-13
| | | |\ \ | | | | | | | | | | | | Integrate changes from latest master branch into csharp branch.
| * | | | | Added Ruby to Travis testing.Gravatar Chris Fallin2015-05-13
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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.
| | * | | Merge pull request #380 from jtattermusch/csharpGravatar Jie Luo2015-05-13
| | |\ \ \ | | | | | | | | | | | | Update README.md for C#
| | | | * | Regenerate UnittestDropUnknownFields.csGravatar Jan Tattermusch2015-05-13
| | | | | |
| | | | * | Merge branch 'master' of github.com:google/protobuf into integrate_from_masterGravatar Jan Tattermusch2015-05-13
| | | |/| | | | |/|/ / | |_|/| | |/| | | |
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-06 17:10:51 +0000