diff options
author | Thomas Van Lenten <thomasvl@google.com> | 2016-05-09 13:53:20 -0400 |
---|---|---|
committer | Bo Yang <teboring@google.com> | 2016-06-13 13:55:00 -0700 |
commit | 72df8446975d018616a4ff97f1d79f55c6d21af8 (patch) | |
tree | 832b81f7f30d6915221b4087b265cfb4b61b4ad5 /objectivec/Tests | |
parent | 1445ce2809511d2af2ef0f80685a16385c3fff71 (diff) | |
download | protobuf-72df8446975d018616a4ff97f1d79f55c6d21af8.tar.gz protobuf-72df8446975d018616a4ff97f1d79f55c6d21af8.tar.bz2 protobuf-72df8446975d018616a4ff97f1d79f55c6d21af8.zip |
Better support for using the proto library from a framework.
- Add generator constant for the default framework name.
- Add generator api for making the CPP symbol from the name.
- Add generator api to see if it is a bundled proto file.
- Output a CPP conditional and two imports for the core library headers.
- Add helper for generating the #import for file headers to deal with the
framework imports.
- Add a reference from the unittests to a WKT to use that to inspect how
imports generate.
- Update the podspec to define the CPP symbol and require pods 1.0 (or later).
Fixes https://github.com/google/protobuf/issues/1457
Diffstat (limited to 'objectivec/Tests')
-rw-r--r-- | objectivec/Tests/unittest_objc.proto | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/objectivec/Tests/unittest_objc.proto b/objectivec/Tests/unittest_objc.proto index f6ab6a24..914945eb 100644 --- a/objectivec/Tests/unittest_objc.proto +++ b/objectivec/Tests/unittest_objc.proto @@ -29,6 +29,7 @@ syntax = "proto2"; +import "google/protobuf/any.proto"; import "google/protobuf/unittest.proto"; package protobuf_unittest; @@ -447,3 +448,11 @@ message BoolOnlyMessage { optional bool bool_field_31 = 31; optional bool bool_field_32 = 32; } + +// Reference to a WKT to test (via generated code inspection), the handling +// of #imports. Within the WKTs, references to each other are just path +// based imports, but when reference from another proto file, they should be +// conditional to support the framework import style. +message WKTRefereceMessage { + optional google.protobuf.Any an_any = 1; +} |