aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Support Unicode build on WindowsWei-Yin Chen (陳威尹)2016-08-314-9/+14
|
* Merge pull request #2024 from pstavirs/masterFeng Xiao2016-08-317-12/+8
|\ | | | | Restore New*Callback into google::protobuf namespace …
| * Restore New*Callback into google::protobuf namespace since these are used by ↵Srivats P2016-08-297-12/+8
| | | | | | | | | | | | the service stubs code Fixes #1966
* | Merge pull request #2033 from frett/osgiExportFeng Xiao2016-08-301-2/+2
|\ \ | | | | | | update the OSGi metadata for the javanano package
| * | update the OSGi SymbolicName and ExportedPackage for the javanano libraryDaniel Frett2016-08-301-2/+2
| | |
* | | Merge pull request #2031 from thomasvl/dont_require_filegeneratorsThomas Van Lenten2016-08-302-54/+14
|\ \ \ | |/ / |/| | Speed up ObjC Generation with large dependency trees
| * | Speed up ObjC Generation with large dependency treesThomas Van Lenten2016-08-302-54/+14
|/ / | | | | | | | | | | | | | | | | Don't create FileGenerators for each dep. FileGenerators will deeply create all the message, enum, and field generators; but those aren't needed when doing the imports for dependencies. Instead directly generate the imports off the FileDescriptors so no extra objects are created. The only other use was when chaining together the *Roots for the file extension registry, but that also can be generate off the name of the FileDescriptor directly.
* | Merge pull request #2012 from haberman/rubymapgcfixJoshua Haberman2016-08-294-9/+59
|\ \ | | | | | | Ruby: make sure map parsing frames are GC-rooted.
| * | upb bugfix: JSON map entry keys were passing the wrong closure.Josh Haberman2016-08-291-1/+1
| | |
| * | Ruby: make sure map parsing frames are GC-rooted.Josh Haberman2016-08-263-8/+58
| |/
* | Merge pull request #1920 from gegles/masterJoshua Haberman2016-08-291-0/+2
|\ \ | | | | | | Fix missing import of jspb.Map (#1885)
| * | Fix missing import of jspb.Map (#1885)Guillaume Egles2016-08-031-0/+2
| | |
* | | Merge pull request #2018 from thomasvl/support_generate_allThomas Van Lenten2016-08-295-58/+98
|\ \ \ | |_|/ |/| | ObjC support for GenerateAll().
| * | Support GenerateAll().Thomas Van Lenten2016-08-265-58/+98
| | | | | | | | | | | | | | | - Expect calls on GenerateAll() and not Generate(). - Parse the prefix validation file once, and then check all the files.
* | | Merge pull request #2013 from xfxyjwf/gmockFeng Xiao2016-08-252-7/+18
|\ \ \ | | | | | | | | Update gmock links.
| * | | Update links in appveyor.ymlFeng Xiao2016-08-251-3/+9
| | | | | | | | | | | | | | | | Change-Id: I3d44e3c6877e00cfea5a903568fde1e6f597aac1
| * | | Update gmock links.Feng Xiao2016-08-251-4/+9
|/ / / | | | | | | | | | | | | | | | The original link is no longer available. Change-Id: I2976d3f19c8e818689549fb31ff20af8eae92a07
* | | Merge pull request #2011 from tomas-abrahamsson/patch-1Feng Xiao2016-08-251-0/+1
|\ \ \ | |/ / |/| | Add an Erlang project, gpb, to third_party.md
| * | Add an Erlang project, gpb, to third_party.mdTomas Abrahamsson2016-08-251-0/+1
|/ /
* | Merge pull request #2001 from nicolasnoble/patch-1Joshua Haberman2016-08-241-1/+1
|\ \ | | | | | | Fixing regular expression...
| * | Fixing regular expression...Nicolas Noble2016-08-231-1/+1
|/ / | | | | This will allow loading the extension for Ruby 2.1.10...
* | Merge pull request #1997 from thomasvl/move_include_package_into_helpersThomas Van Lenten2016-08-234-207/+224
|\ \ | | | | | | Move ImportWriter into helpers for sharing
| * | Remove the compiler options from ImportWriter.Thomas Van Lenten2016-08-233-22/+42
| | | | | | | | | | | | | | | | | | | | | | | | Breaks the tie of the ImportWriter to the ObjC generation, allow grpc to use a different extension and to relay the values they need for these. - Pass in the two framework options to the ctor. - Pass in the header extension to AddFile.
| * | Move the ImportWriter into the ObjC Helpers.Thomas Van Lenten2016-08-234-205/+202
|/ / | | | | | | | | grpc likely needs to provide the same sorta handling, so expose the class so the logic can be reused.
* | Add note about JSON tests maybe being wrong. (#1992)Thomas Van Lenten2016-08-238-16/+35
| | | | | | | | | | | | | | | | Add note about JSON tests maybe being wrong. - Add note about the JSON test maybe not being correct yet. - Add test to checks the generated names for double underscores to be sure they are what is expected.
* | Merge pull request #1984 from thomasvl/more_json_testsThomas Van Lenten2016-08-224-0/+85
|\ \ | | | | | | More tests to shake out some cases in the json parsing
| * | More JSON testsThomas Van Lenten2016-08-224-0/+85
|/ / | | | | | | | | - String behaviors - Testing only valid JSON is allowed
* | Adds better support for protos without packages (#1979)Sergio Campamá2016-08-191-17/+51
| | | | | | | | Adds better support for protos without packages and more warnings on possible improvements
* | Merge pull request #1967 from sergiocampama/castThomas Van Lenten2016-08-161-4/+4
|\ \ | | | | | | Fixes #1844
| * | Adding casts so that code importing protobug using -Wconversion does not ↵Sergio Campama2016-08-161-4/+4
|/ / | | | | | | generate warnings.
* | Add more JSON tests around underscores (#1963)Thomas Van Lenten2016-08-165-39/+259
| | | | | | | | Add more JSON tests around underscores
* | Merge pull request #1957 from xfxyjwf/jenkins_badgeFeng Xiao2016-08-151-1/+1
|\ \ | | | | | | Add a jenkins test status badge.
| * | Add a jenkins test status badge.Feng Xiao2016-08-121-1/+1
| | | | | | | | | | | | | | | | | | [ci skip] Change-Id: I5bf4f204e7ef0144d8fc984a985d502f92ce95ce
* | | Merge pull request #1964 from thomasvl/missing_ignoresThomas Van Lenten2016-08-152-2/+4
|\ \ \ | | | | | | | | Fix up ignores and conformance generation
| * | | Fix up ignores and conformance generationThomas Van Lenten2016-08-152-2/+4
|/ / / | | | | | | | | | | | | | | | - Update ruby conformance generation for rename of generated files that seems to have happened. - Update gitignores for the above and for the no-warnings-test.
* | | Merge pull request #1960 from jskeet/oneofThomas Van Lenten2016-08-152-103/+242
|\ \ \ | |/ / |/| | Regenerate conformance files to include extra oneof fields.
| * | Regenerate conformance files to include extra oneof fields.Jon Skeet2016-08-152-103/+242
|/ / | | | | | | | | | | This should fix the failures in the conformance tests - although it highlights the problem that we need to do this when changing the conformance.proto file...
* | Fixes extra whitespace on generated comments. (#1950)Sergio Campamá2016-08-1210-123/+131
| | | | | | | | Fixes extra whitespace on generated comments.
* | Merge pull request #1949 from thomasvl/objc_more_reset_testsThomas Van Lenten2016-08-121-29/+152
|\ \ | | | | | | Objc more reset tests
| * | More complete nil/reset tests within a oneofThomas Van Lenten2016-08-121-6/+12
| | |
| * | Fix some constants to be correct for the message class in use.Thomas Van Lenten2016-08-121-21/+23
| | |
| * | More explicit tests for nil behaviors on fields.Thomas Van Lenten2016-08-121-4/+119
|/ / | | | | | | | | Code already works, but make a bank of tests that call it out so things are very clean in the future just to be safe.
* | Merge pull request #1942 from thomasvl/objc_fix_oneof_zerosThomas Van Lenten2016-08-117-31/+357
|\ \ | | | | | | Objc fix oneof zeros and more oneof zero conformance tests
| * | Add more types to the zero oneof cases.Thomas Van Lenten2016-08-114-0/+61
| | | | | | | | | | | | | | | | | | Incase the different runtimes have different generation/implementations for for the different primitive field types, cover a larger range of the proto types in the oneof zero tests.
| * | Record zero for "has" for proto3 if in a oneof.Thomas Van Lenten2016-08-113-31/+296
|/ / | | | | | | | | | | | | If a message is proto3, then the zero values still count as being set one the field is in a oneof. Add tests to confirm oneofs work as expected in both syntaxes.
* | Add conformance test for zero fields in oneofs. (#1939)Thomas Van Lenten2016-08-116-2/+57
| | | | | | | | * Add conformance test for zero fields in oneofs. * Add failures to the "expected" files.
* | Merge pull request #1934 from thomasvl/objc_strings_with_nullThomas Van Lenten2016-08-093-33/+100
|\ \ | | | | | | Never use strlen on utf8 runs so null characters work.
| * | Never use strlen on utf8 runs so null characters work.Thomas Van Lenten2016-08-093-33/+100
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes https://github.com/google/protobuf/issues/1933 Add a new test that forces strings into two different implementations from the NSString class cluster to help confirm we're exercising both paths by which CodedOutputStream will extract data from an NSString. Move the old +load test (that was flawed because the behavior really depends on the type of string from the NSString class cluster); into a unittest that targets the specific case we're adding a behavior confirmation on. As a bonus, improve the TextFormat generation of string characters < 0x20.
* | Adds support for appledoc in generated code. (#1928)Sergio Campamá2016-08-0920-851/+1041
| | | | | | | | | | | | Convert mapping of proto comments to appledoc format so they show up in Xcode and cocoadocs. Fixes https://github.com/google/protobuf/issues/1866
* | Merge pull request #1842 from udnaan/masterFeng Xiao2016-08-081-1/+1
|\ \ | | | | | | fixed cmake config files install path
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-22 10:18:16 +0000