diff options
author | Jorge Canizales <jcanizales@google.com> | 2015-06-28 15:23:02 -0700 |
---|---|---|
committer | Jorge Canizales <jcanizales@google.com> | 2015-07-06 11:17:39 -0700 |
commit | d5d7bb3bfbe3702617f604834d61d3357c8c87fb (patch) | |
tree | a7cd08f716f3eaf6b470a0737d422eb3965dcf7b /Protobuf.podspec | |
parent | d40a0db202433ba002a3e104165d4414e8929432 (diff) | |
download | protobuf-d5d7bb3bfbe3702617f604834d61d3357c8c87fb.tar.gz protobuf-d5d7bb3bfbe3702617f604834d61d3357c8c87fb.tar.bz2 protobuf-d5d7bb3bfbe3702617f604834d61d3357c8c87fb.zip |
Add Bazel target for protobuf ObjC runtime
Also add WKT headers to the umbrella file, and simplify Podspec with it.
Plus some layout improvements to the BUILD file.
Diffstat (limited to 'Protobuf.podspec')
-rw-r--r-- | Protobuf.podspec | 24 |
1 files changed, 5 insertions, 19 deletions
diff --git a/Protobuf.podspec b/Protobuf.podspec index b6b831c2..6aa89902 100644 --- a/Protobuf.podspec +++ b/Protobuf.podspec @@ -11,25 +11,11 @@ Pod::Spec.new do |s| s.license = 'New BSD' s.authors = { 'The Protocol Buffers contributors' => 'protobuf@googlegroups.com' } - s.source_files = 'objectivec/*.{h,m}', - 'objectivec/google/protobuf/Any.pbobjc.{h,m}', - 'objectivec/google/protobuf/Api.pbobjc.{h,m}', - 'objectivec/google/protobuf/Descriptor.pbobjc.{h,m}', - 'objectivec/google/protobuf/Duration.pbobjc.h', - 'objectivec/google/protobuf/Empty.pbobjc.{h,m}', - 'objectivec/google/protobuf/FieldMask.pbobjc.{h,m}', - 'objectivec/google/protobuf/SourceContext.pbobjc.{h,m}', - 'objectivec/google/protobuf/Struct.pbobjc.{h,m}', - 'objectivec/google/protobuf/Timestamp.pbobjc.h', - 'objectivec/google/protobuf/Type.pbobjc.{h,m}' - 'objectivec/google/protobuf/Wrappers.pbobjc.{h,m}' - # Timestamp.pbobjc.m and Duration.pbobjc.m are #imported by GPBWellKnownTypes.m. So we can't - # compile them (duplicate symbols), but we need them available for the importing: - s.preserve_paths = 'objectivec/google/protobuf/Duration.pbobjc.m', - 'objectivec/google/protobuf/Timestamp.pbobjc.m' - # The following would cause duplicate symbol definitions. GPBProtocolBuffers is expected to be - # left out, as it's an umbrella implementation file. - s.exclude_files = 'objectivec/GPBProtocolBuffers.m' + s.source_files = 'objectivec/GPBProtocolBuffers.{h,m}' + # GPBProtocolBuffers.{h,m} are umbrella files. We need Cocoapods to preserve the files imported by + # them. + s.preserve_paths = 'objectivec/*.{h,m}', + 'objectivec/google/protobuf/*.pbobjc.{h,m}' s.header_mappings_dir = 'objectivec' s.ios.deployment_target = '6.0' |