Commit Graph

3845 Commits

Author SHA1 Message Date
Joshua Haberman
e721ce66cf Merge pull request #2012 from haberman/rubymapgcfix
Ruby: make sure map parsing frames are GC-rooted.
2016-08-29 17:05:43 -07:00
Josh Haberman
3a674ffe05 upb bugfix: JSON map entry keys were passing the wrong closure. 2016-08-29 15:28:59 -07:00
Joshua Haberman
7e627738b3 Merge pull request #1920 from gegles/master
Fix missing import of jspb.Map (#1885)
2016-08-29 10:07:25 -07:00
Thomas Van Lenten
c32b9dd474 Merge pull request #2018 from thomasvl/support_generate_all
ObjC support for GenerateAll().
2016-08-29 11:55:08 -04:00
Thomas Van Lenten
2e66a61b54 Support GenerateAll().
- Expect calls on GenerateAll() and not Generate().
- Parse the prefix validation file once, and then check all the files.
2016-08-26 13:54:00 -04:00
Josh Haberman
d4213d839f Ruby: make sure map parsing frames are GC-rooted. 2016-08-26 09:03:55 -07:00
Feng Xiao
3d9d1a1255 Merge pull request #2013 from xfxyjwf/gmock
Update gmock links.
2016-08-25 20:09:20 -07:00
Feng Xiao
c4a84abcb6 Update links in appveyor.yml
Change-Id: I3d44e3c6877e00cfea5a903568fde1e6f597aac1
2016-08-25 14:34:45 -07:00
Feng Xiao
bba446bbf2 Update gmock links.
The original link is no longer available.

Change-Id: I2976d3f19c8e818689549fb31ff20af8eae92a07
2016-08-25 14:28:59 -07:00
Feng Xiao
08951c3c3a Merge pull request #2011 from tomas-abrahamsson/patch-1
Add an Erlang project, gpb, to third_party.md
2016-08-25 11:34:47 -07:00
Tomas Abrahamsson
4d04fcdaf6 Add an Erlang project, gpb, to third_party.md 2016-08-25 15:11:45 +02:00
Joshua Haberman
b97a4a53cd Merge pull request #2001 from nicolasnoble/patch-1
Fixing regular expression...
2016-08-24 10:40:50 -07:00
Nicolas Noble
866d3e5327 Fixing regular expression...
This will allow loading the extension for Ruby 2.1.10...
2016-08-23 22:46:26 -07:00
Thomas Van Lenten
569d5ce65b Merge pull request #1997 from thomasvl/move_include_package_into_helpers
Move ImportWriter into helpers for sharing
2016-08-23 15:06:10 -04:00
Thomas Van Lenten
290d26b462 Remove the compiler options from ImportWriter.
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.
2016-08-23 11:19:38 -04:00
Thomas Van Lenten
93362a5aa5 Move the ImportWriter into the ObjC Helpers.
grpc likely needs to provide the same sorta handling, so expose the class so
the logic can be reused.
2016-08-23 10:19:03 -04:00
Thomas Van Lenten
80f65d2df8 Add note about JSON tests maybe being wrong. (#1992)
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.
2016-08-23 08:19:45 -04:00
Thomas Van Lenten
b5794ed024 Merge pull request #1984 from thomasvl/more_json_tests
More tests to shake out some cases in the json parsing
2016-08-22 15:37:25 -04:00
Thomas Van Lenten
7437774a27 More JSON tests
- String behaviors
- Testing only valid JSON is allowed
2016-08-22 12:07:33 -04:00
Sergio Campamá
ff2a6600e5 Adds better support for protos without packages (#1979)
Adds better support for protos without packages and more warnings on possible improvements
2016-08-19 09:35:33 -04:00
Thomas Van Lenten
549dde1928 Merge pull request #1967 from sergiocampama/cast
Fixes #1844
2016-08-16 12:42:55 -04:00
Sergio Campama
e505098875 Adding casts so that code importing protobug using -Wconversion does not generate warnings. 2016-08-16 08:56:50 -07:00
Thomas Van Lenten
e389165586 Add more JSON tests around underscores (#1963)
Add more JSON tests around underscores
2016-08-16 09:02:27 -04:00
Feng Xiao
4763e64eb1 Merge pull request #1957 from xfxyjwf/jenkins_badge
Add a jenkins test status badge.
2016-08-15 17:49:21 -07:00
Thomas Van Lenten
d9ccf4d0b1 Merge pull request #1964 from thomasvl/missing_ignores
Fix up ignores and conformance generation
2016-08-15 16:38:44 -04:00
Thomas Van Lenten
81564101ee Fix up ignores and conformance generation
- 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.
2016-08-15 16:33:22 -04:00
Thomas Van Lenten
336ee28b34 Merge pull request #1960 from jskeet/oneof
Regenerate conformance files to include extra oneof fields.
2016-08-15 13:31:04 -04:00
Jon Skeet
f9d93f358d Regenerate conformance files to include extra oneof fields.
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...
2016-08-15 16:45:27 +01:00
Feng Xiao
f8c37b97da Add a jenkins test status badge.
[ci skip]

Change-Id: I5bf4f204e7ef0144d8fc984a985d502f92ce95ce
2016-08-12 16:43:47 -07:00
Sergio Campamá
a2484208c3 Fixes extra whitespace on generated comments. (#1950)
Fixes extra whitespace on generated comments.
2016-08-12 14:44:03 -04:00
Thomas Van Lenten
cd561dddc9 Merge pull request #1949 from thomasvl/objc_more_reset_tests
Objc more reset tests
2016-08-12 12:23:12 -04:00
Thomas Van Lenten
ff85a1735f More complete nil/reset tests within a oneof 2016-08-12 11:59:07 -04:00
Thomas Van Lenten
a0df678df9 Fix some constants to be correct for the message class in use. 2016-08-12 11:53:04 -04:00
Thomas Van Lenten
17d601a2b6 More explicit tests for nil behaviors on fields.
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.
2016-08-12 11:46:55 -04:00
Thomas Van Lenten
91b6d04e2d Merge pull request #1942 from thomasvl/objc_fix_oneof_zeros
Objc fix oneof zeros and more oneof zero conformance tests
2016-08-11 16:20:49 -04:00
Thomas Van Lenten
27c8962505 Add more types to the zero oneof cases.
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.
2016-08-11 13:15:01 -04:00
Thomas Van Lenten
ca5b7751e5 Record zero for "has" for proto3 if in a oneof.
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.
2016-08-11 13:14:15 -04:00
Thomas Van Lenten
ac3df39c22 Add conformance test for zero fields in oneofs. (#1939)
* Add conformance test for zero fields in oneofs.
* Add failures to the "expected" files.
2016-08-11 09:44:07 -04:00
Thomas Van Lenten
30bbbe99e2 Merge pull request #1934 from thomasvl/objc_strings_with_null
Never use strlen on utf8 runs so null characters work.
2016-08-09 12:32:56 -04:00
Thomas Van Lenten
1a6c1d092d Never use strlen on utf8 runs so null characters work.
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.
2016-08-09 10:37:16 -04:00
Sergio Campamá
237f321e33 Adds support for appledoc in generated code. (#1928)
Convert mapping of proto comments to appledoc format so they show up in Xcode and cocoadocs.

Fixes https://github.com/google/protobuf/issues/1866
2016-08-09 08:26:24 -04:00
Feng Xiao
56b8f44eed Merge pull request #1842 from udnaan/master
fixed cmake config files install path
2016-08-08 13:43:45 -07:00
Sergio Campamá
32fadc0d49 Migrating documentation of the ObjectiveC runtime code to appledoc. (#1867)
Work for #1866 

Migrates all the public class docs over to appledoc format.  While Xcode is fine with blank lines in `///` comments, appledoc (used by cocoadocs) isn't and was leaving a bunch of info off the doc pages.

The generator still needs to be updated to do this also; that will be a follow up CL.
2016-08-08 10:15:02 -04:00
Feng Xiao
1102a8a767 Merge pull request #1923 from bryongloden/patch-1
close opened file descriptors properly
2016-08-05 15:28:42 -07:00
Bryon Gloden, CISSP®
a375e1acfd close opened file descriptors properly 2016-08-05 17:30:19 -04:00
Jisi Liu
e30b7b4461 Merge pull request #1924 from PiotrSikora/export_license
Bazel: export LICENSE file.
2016-08-05 14:02:42 -07:00
Feng Xiao
f1f30b53cc Merge pull request #1926 from hotpxl/master
[master] Add dependency cl. Fixes google/protobuf#295.
2016-08-05 10:45:28 -07:00
Yutian Li
ddf6d1eb75 [master] Add dependency cl. Fixes google/protobuf#295. 2016-08-05 15:13:12 +08:00
Piotr Sikora
faea19c359 Bazel: export LICENSE file.
Signed-off-by: Piotr Sikora <piotrsikora@google.com>
2016-08-04 15:32:14 -07:00
Feng Xiao
c59473d53e Merge pull request #1044 from mark-whiting/master
Adding missing generic gcc 64-bit atomicops.
2016-08-04 11:21:40 -07:00