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

3866 commits

This branch
This branch
All branches
Author SHA1 Message Date
Feng Xiao
4bc1657853 Merge pull request #2079 from khingblue/fix-generate-descriptor 
Fix #2071 replacing /bin/sh with bash when generates descriptor
 2016-09-07 14:56:31 -07:00
Khing
f9fc56c42a Fix #2071 replacing /bin/sh with bash 
On Ubuntu /bin/sh is dash by default, this can cause
generate_descriptor_proto.sh fail to execute.
 2016-09-07 14:46:50 +10:00
Joshua Haberman
74638a253e Merge pull request #2047 from jonathon-love/master 
Fix to typo/oversight in reflection tests
 2016-09-06 11:14:15 -07:00
Guillaume Turri
9b8da104c1 Rm check on dependency in the C# reflection API (#2051) 
This check adds a few constraints on the way to build a project when we have
a proto file which imports another one. In particular, on projects which
build both C# and Java, it's easy to end up with exceptions like

    Expected: included.proto but was src/main/protobuf/included.proto

A user may work around this issue, but it may add unnecessary constraints
on the layout of the project.

According to f3504cf3b1 (diff-ecb0b909ed572381a1c8d1994f09a948R309)
it has already been considered to get rid of this check, for
similar considerations, and because it doesn't exist in the Java code
 2016-09-05 09:29:03 +01:00
Feng Xiao
96a9d97352 Merge pull request #2059 from chih-hung/master 
Fix #1955 clang-tidy warning misc-macro-parentheses
 2016-09-02 15:38:03 -07:00
Chih-Hung Hsieh
7c3f7c6a09 Fix #1955 clang-tidy warning misc-macro-parentheses 
clang-tidy gives warning "macro argument should be enclosed in
parentheses" to macro ZR_, the "first" parameter.
 2016-09-02 15:28:42 -07:00
Feng Xiao
fa6428ed2a Merge pull request #2045 from mike07026/master 
fix #1342 cause by ownership issues
 2016-09-02 11:01:05 -07:00
Thomas Van Lenten
85c1adf9f9 Merge pull request #2053 from thomasvl/improve_root_registry_wiring 
Make Root's +extensionRegistry generation smarter.
 2016-09-02 10:11:07 -04:00
Jonathon Love
64958cdb1d Fix to typo/oversight in python tests 
Fix to typo/oversight in python tests, only affecting python 3
 2016-09-02 12:36:11 +10:00
Thomas Van Lenten
13a41246dd Make Root's +extensionRegistry generation smarter. 
At generation time, walk the file's dependencies to see what really contains
extensions so we can generate more minimal code that only links together the
roots that provided extensions. Gets a bunch of otherwise noop code out of
the call flow when the roots are +initialized.
 2016-09-01 18:08:59 -04:00
Jisi Liu
d00cab0f8c Merge pull request #2039 from khingblue/remove-unused-vector 
Remove unused vector
 2016-09-01 09:17:43 -07:00
mike07026
df6088a7e8 detect invaild JSON encoding in bytes field 2016-09-01 20:08:45 +08:00
mike07026
5a17660ca0 detect invaild JSON encoding in bytes field 2016-09-01 20:06:55 +08:00
mike07026
e514f232a0 fix #1342 cause by ownership issues 2016-09-01 09:04:24 +08:00
Feng Xiao
b9649765f8 Merge pull request #2024 from pstavirs/master 
Restore New*Callback into google::protobuf namespace …
 2016-08-31 11:39:38 -07:00
Khing
8ee6f568ea Remove unused vector 2016-08-31 15:12:32 +10:00
Feng Xiao
c0a6a6b462 Merge pull request #2033 from frett/osgiExport 
update the OSGi metadata for the javanano package
 2016-08-30 10:31:45 -07:00
Daniel Frett
b6dec9b8d4 update the OSGi SymbolicName and ExportedPackage for the javanano library 2016-08-30 13:16:55 -04:00
Thomas Van Lenten
8c93606357 Merge pull request #2031 from thomasvl/dont_require_filegenerators 
Speed up ObjC Generation with large dependency trees
 2016-08-30 12:19:40 -04:00
Thomas Van Lenten
78a6d310de Speed up ObjC Generation with large dependency trees 
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.
 2016-08-30 10:51:59 -04:00
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
Srivats P
eedc7be680 Restore New*Callback into google::protobuf namespace since these are used by the service stubs code 
Fixes #1966
 2016-08-29 22:57:46 +05:30
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